remove auto-generated files and fix gitignores

62 files changed, 10 insertions, 6066 deletions

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/.gitignore b/Application/hu.bme.mit.inf.dslreasoner.application.ide/.gitignore
index ae3c1726..b33f6aff 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/.gitignore
+++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/.gitignore
@@ -1 +1,2 @@
 /bin/
+/xtend-gen/
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin
deleted file mode 100644
index 1c86e38f..00000000
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin
+++ /dev/null
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin
deleted file mode 100644
index 57c8ab25..00000000
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin
+++ /dev/null
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.gitignore b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.gitignore
deleted file mode 100644
index c41377d5..00000000
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/.ApplicationConfigurationIdeModule.java._trace
-/.ApplicationConfigurationIdeSetup.java._trace
-/.ApplicationConfigurationIdeModule.xtendbin
-/.ApplicationConfigurationIdeSetup.xtendbin
-/ApplicationConfigurationIdeModule.java
-/ApplicationConfigurationIdeSetup.java
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/ApplicationConfigurationIdeModule.java b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/ApplicationConfigurationIdeModule.java
deleted file mode 100644
index f4d40594..00000000
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/ApplicationConfigurationIdeModule.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * generated by Xtext 2.12.0
- */
-package hu.bme.mit.inf.dslreasoner.application.ide;
-
-import hu.bme.mit.inf.dslreasoner.application.ide.AbstractApplicationConfigurationIdeModule;
-
-/**
- * Use this class to register ide components.
- */
-@SuppressWarnings("all")
-public class ApplicationConfigurationIdeModule extends AbstractApplicationConfigurationIdeModule {
-}
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/ApplicationConfigurationIdeSetup.java b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/ApplicationConfigurationIdeSetup.java
deleted file mode 100644
index 2281147c..00000000
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/ApplicationConfigurationIdeSetup.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * generated by Xtext 2.12.0
- */
-package hu.bme.mit.inf.dslreasoner.application.ide;
-
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import hu.bme.mit.inf.dslreasoner.application.ApplicationConfigurationRuntimeModule;
-import hu.bme.mit.inf.dslreasoner.application.ApplicationConfigurationStandaloneSetup;
-import hu.bme.mit.inf.dslreasoner.application.ide.ApplicationConfigurationIdeModule;
-import org.eclipse.xtext.util.Modules2;
-
-/**
- * Initialization support for running Xtext languages as language servers.
- */
-@SuppressWarnings("all")
-public class ApplicationConfigurationIdeSetup extends ApplicationConfigurationStandaloneSetup {
-  @Override
-  public Injector createInjector() {
-    ApplicationConfigurationRuntimeModule _applicationConfigurationRuntimeModule = new ApplicationConfigurationRuntimeModule();
-    ApplicationConfigurationIdeModule _applicationConfigurationIdeModule = new ApplicationConfigurationIdeModule();
-    return Guice.createInjector(Modules2.mixin(_applicationConfigurationRuntimeModule, _applicationConfigurationIdeModule));
-  }
-}
diff --git a/Application/org.eclipse.viatra.solver.language.ui/.gitignore b/Application/org.eclipse.viatra.solver.language.ui/.gitignore
index ae3c1726..b33f6aff 100644
--- a/Application/org.eclipse.viatra.solver.language.ui/.gitignore
+++ b/Application/org.eclipse.viatra.solver.language.ui/.gitignore
@@ -1 +1,2 @@
 /bin/
+/xtend-gen/
diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/.gitignore b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/.gitignore
deleted file mode 100644
index 54297e9d..00000000
--- a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.SolverLanguageUiModule.java._trace
-/.SolverLanguageUiModule.xtendbin
-/SolverLanguageUiModule.java
diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/contentassist/.gitignore b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/contentassist/.gitignore
deleted file mode 100644
index 7bf487b6..00000000
--- a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/contentassist/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.SolverLanguageProposalProvider.java._trace
-/.SolverLanguageProposalProvider.xtendbin
-/SolverLanguageProposalProvider.java
diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/highlight/.gitignore b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/highlight/.gitignore
deleted file mode 100644
index 682fd167..00000000
--- a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/highlight/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/.SolverSemanticHighlightCalculator.java._trace
-/.SolverSemanticHighlightCalculator.xtendbin
-/.SolverSemanticTextAttributeProvider.java._trace
-/.SolverSemanticTextAttributeProvider.xtendbin
-/SolverSemanticHighlightCalculator.java
-/SolverSemanticTextAttributeProvider.java
diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/labeling/.gitignore b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/labeling/.gitignore
deleted file mode 100644
index 4f407d4c..00000000
--- a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/labeling/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/.SolverLanguageDescriptionLabelProvider.java._trace
-/.SolverLanguageDescriptionLabelProvider.xtendbin
-/.SolverLanguageLabelProvider.java._trace
-/.SolverLanguageLabelProvider.xtendbin
-/SolverLanguageDescriptionLabelProvider.java
-/SolverLanguageLabelProvider.java
diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/outline/.gitignore b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/outline/.gitignore
deleted file mode 100644
index 63ce4740..00000000
--- a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/outline/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.SolverLanguageOutlineTreeProvider.java._trace
-/.SolverLanguageOutlineTreeProvider.xtendbin
-/SolverLanguageOutlineTreeProvider.java
diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/quickfix/.gitignore b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/quickfix/.gitignore
deleted file mode 100644
index 37dbeadb..00000000
--- a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/quickfix/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.SolverLanguageQuickfixProvider.java._trace
-/.SolverLanguageQuickfixProvider.xtendbin
-/SolverLanguageQuickfixProvider.java
diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticHighlightCalculator.xtendbin b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticHighlightCalculator.xtendbin
deleted file mode 100644
index a107bf27..00000000
--- a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticHighlightCalculator.xtendbin
+++ /dev/null
diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticTextAttributeProvider.xtendbin b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticTextAttributeProvider.xtendbin
deleted file mode 100644
index 994dbd52..00000000
--- a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticTextAttributeProvider.xtendbin
+++ /dev/null
diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.gitignore b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.gitignore
deleted file mode 100644
index 61ce5bef..00000000
--- a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/.SolverSemanticHighlightCalculator.java._trace
-/.SolverSemanticTextAttributeProvider.java._trace
-/.SolverSemanticHighlightCalculator.xtendbin
-/.SolverSemanticTextAttributeProvider.xtendbin
-/SolverSemanticHighlightCalculator.java
-/SolverSemanticTextAttributeProvider.java
diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/SolverSemanticHighlightCalculator.java b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/SolverSemanticHighlightCalculator.java
deleted file mode 100644
index 2935dfd7..00000000
--- a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/SolverSemanticHighlightCalculator.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.eclipse.viatra.solver.language.ui.syntaxcoloring;
-
-import com.google.common.collect.Iterators;
-import java.util.Iterator;
-import java.util.Random;
-import java.util.WeakHashMap;
-import org.eclipse.viatra.solver.language.solverLanguage.Reference;
-import org.eclipse.xtend2.lib.StringConcatenation;
-import org.eclipse.xtext.ide.editor.syntaxcoloring.DefaultSemanticHighlightingCalculator;
-import org.eclipse.xtext.ide.editor.syntaxcoloring.IHighlightedPositionAcceptor;
-import org.eclipse.xtext.nodemodel.ICompositeNode;
-import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
-import org.eclipse.xtext.resource.XtextResource;
-import org.eclipse.xtext.util.CancelIndicator;
-
-@SuppressWarnings("all")
-public class SolverSemanticHighlightCalculator extends DefaultSemanticHighlightingCalculator {
-  public static final String SYMBOL_CODE = "SymbolCode::";
-  
-  private final WeakHashMap<String, String> symbolName2ID = new WeakHashMap<String, String>();
-  
-  @Override
-  public void provideHighlightingFor(final XtextResource resource, final IHighlightedPositionAcceptor acceptor, final CancelIndicator cancelIndicator) {
-    if (((resource == null) || (resource.getParseResult() == null))) {
-      return;
-    } else {
-      final Iterator<Reference> modelSymbols = Iterators.<Reference>filter(resource.getAllContents(), Reference.class);
-      while (modelSymbols.hasNext()) {
-        {
-          final Reference symbolElement = modelSymbols.next();
-          final ICompositeNode node = NodeModelUtils.getNode(symbolElement);
-          acceptor.addPosition(
-            node.getOffset(), 
-            node.getLength(), 
-            this.getSymbolCode(node.getText()));
-        }
-      }
-    }
-  }
-  
-  public String getSymbolCode(final String name) {
-    boolean _containsKey = this.symbolName2ID.containsKey(name);
-    if (_containsKey) {
-      return this.symbolName2ID.get(name);
-    } else {
-      final String id = this.calculateSymbolCode(name);
-      this.symbolName2ID.put(name, id);
-      return id;
-    }
-  }
-  
-  public String calculateSymbolCode(final String name) {
-    int _hashCode = name.hashCode();
-    final Random random = new Random(_hashCode);
-    final float hue = this.huePick(random.nextFloat());
-    float _nextFloat = random.nextFloat();
-    double _multiply = (_nextFloat * 0.3);
-    final double saturation = (0.2 + _multiply);
-    float _nextFloat_1 = random.nextFloat();
-    double _multiply_1 = (_nextFloat_1 * 0.2);
-    final double brightness = (_multiply_1 + 0.7f);
-    StringConcatenation _builder = new StringConcatenation();
-    _builder.append(SolverSemanticHighlightCalculator.SYMBOL_CODE);
-    _builder.append(" ");
-    _builder.append(hue);
-    _builder.append(" ");
-    _builder.append(saturation);
-    _builder.append(" ");
-    _builder.append(brightness);
-    return _builder.toString();
-  }
-  
-  private float huePick(final float random) {
-    final int pink = 300;
-    final int tolerance = 10;
-    final float degree = (random * (360 - (2 * tolerance)));
-    if ((degree < (pink - tolerance))) {
-      return degree;
-    } else {
-      return (degree + (2 * tolerance));
-    }
-  }
-}
diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/SolverSemanticTextAttributeProvider.java b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/SolverSemanticTextAttributeProvider.java
deleted file mode 100644
index 04824ad1..00000000
--- a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/SolverSemanticTextAttributeProvider.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.eclipse.viatra.solver.language.ui.syntaxcoloring;
-
-import com.google.inject.Inject;
-import java.util.WeakHashMap;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.viatra.solver.language.ui.syntaxcoloring.SolverSemanticHighlightCalculator;
-import org.eclipse.xtext.ui.editor.preferences.IPreferenceStoreAccess;
-import org.eclipse.xtext.ui.editor.syntaxcoloring.IHighlightingConfiguration;
-import org.eclipse.xtext.ui.editor.syntaxcoloring.PreferenceStoreAccessor;
-import org.eclipse.xtext.ui.editor.syntaxcoloring.TextAttributeProvider;
-import org.eclipse.xtext.ui.editor.utils.EditorUtils;
-import org.eclipse.xtext.ui.editor.utils.TextStyle;
-
-@SuppressWarnings("all")
-public class SolverSemanticTextAttributeProvider extends TextAttributeProvider {
-  private final TextStyle defaultTextStyle = new TextStyle();
-  
-  private final WeakHashMap<String, TextAttribute> colorID2TextAttribute = new WeakHashMap<String, TextAttribute>();
-  
-  @Inject
-  public SolverSemanticTextAttributeProvider(final IHighlightingConfiguration highlightingConfig, final IPreferenceStoreAccess preferenceStoreAccess, final PreferenceStoreAccessor prefStoreAccessor) {
-    super(highlightingConfig, preferenceStoreAccess, prefStoreAccessor);
-  }
-  
-  @Override
-  public TextAttribute getAttribute(final String id) {
-    TextAttribute _xifexpression = null;
-    boolean _isMetamodelElementColorID = this.isMetamodelElementColorID(id);
-    if (_isMetamodelElementColorID) {
-      boolean _containsKey = this.colorID2TextAttribute.containsKey(id);
-      if (_containsKey) {
-        return this.colorID2TextAttribute.get(id);
-      } else {
-        final TextAttribute style = this.metamodelElementTextStyle(id);
-        this.colorID2TextAttribute.put(id, style);
-        return style;
-      }
-    } else {
-      _xifexpression = super.getAttribute(id);
-    }
-    return _xifexpression;
-  }
-  
-  private boolean isMetamodelElementColorID(final String id) {
-    return id.startsWith(SolverSemanticHighlightCalculator.SYMBOL_CODE);
-  }
-  
-  private TextAttribute metamodelElementTextStyle(final String id) {
-    final String[] texts = id.split(" ");
-    float _parseFloat = Float.parseFloat(texts[1]);
-    float _parseFloat_1 = Float.parseFloat(texts[2]);
-    float _parseFloat_2 = Float.parseFloat(texts[3]);
-    final RGB backgroundColor = new RGB(_parseFloat, _parseFloat_1, _parseFloat_2);
-    Color _colorFromRGB = EditorUtils.colorFromRGB(this.defaultTextStyle.getColor());
-    Color _colorFromRGB_1 = EditorUtils.colorFromRGB(backgroundColor);
-    int _style = this.defaultTextStyle.getStyle();
-    Font _fontFromFontData = EditorUtils.fontFromFontData(this.defaultTextStyle.getFontData());
-    return new TextAttribute(_colorFromRGB, _colorFromRGB_1, _style, _fontFromFontData);
-  }
-}
diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/.SolverLanguageValidator.xtendbin b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/.SolverLanguageValidator.xtendbin
deleted file mode 100644
index 9839769e..00000000
--- a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/.SolverLanguageValidator.xtendbin
+++ /dev/null
diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/.gitignore b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/.gitignore
deleted file mode 100644
index 565d4b27..00000000
--- a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.SolverLanguageValidator.java._trace
-/.SolverLanguageValidator.xtendbin
-/SolverLanguageValidator.java
diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/SolverLanguageValidator.java b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/SolverLanguageValidator.java
deleted file mode 100644
index 2b8f158a..00000000
--- a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/SolverLanguageValidator.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.validation;
-
-import org.eclipse.viatra.solver.language.validation.AbstractSolverLanguageValidator;
-
-/**
- * This class contains custom validation rules.
- * 
- * See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#validation
- */
-@SuppressWarnings("all")
-public class SolverLanguageValidator extends AbstractSolverLanguageValidator {
-}
diff --git a/Application/org.eclipse.viatra.solver.language/.gitignore b/Application/org.eclipse.viatra.solver.language/.gitignore
index ae3c1726..b33f6aff 100644
--- a/Application/org.eclipse.viatra.solver.language/.gitignore
+++ b/Application/org.eclipse.viatra.solver.language/.gitignore
@@ -1 +1,2 @@
 /bin/
+/xtend-gen/
diff --git a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/.gitignore b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/.gitignore
deleted file mode 100644
index 82298938..00000000
--- a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/.SolverLanguageRuntimeModule.java._trace
-/.SolverLanguageRuntimeModule.xtendbin
-/.SolverLanguageStandaloneSetup.java._trace
-/.SolverLanguageStandaloneSetup.xtendbin
-/SolverLanguageRuntimeModule.java
-/SolverLanguageStandaloneSetup.java
diff --git a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/generator/.gitignore b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/generator/.gitignore
deleted file mode 100644
index a9345b80..00000000
--- a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/generator/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.SolverLanguageGenerator.java._trace
-/.SolverLanguageGenerator.xtendbin
-/SolverLanguageGenerator.java
diff --git a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.SolverLanguageTokenDefInjectingParser.xtendbin b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.SolverLanguageTokenDefInjectingParser.xtendbin
deleted file mode 100644
index d2fd056e..00000000
--- a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.SolverLanguageTokenDefInjectingParser.xtendbin
+++ /dev/null
diff --git a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.gitignore b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.gitignore
deleted file mode 100644
index 5fbb81c3..00000000
--- a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-/.SolverLangaugeSyntheticTokenParser.java._trace
-/.SolverLanguageSyntheticTokenTokenSource.java._trace
-/.LastTokenState.java._trace
-/.SolverLangusgeSyntheticTokenParser.java._trace
-/.SolverLanguageSyntheticTokenParser.java._trace
-/.SolverLanguageTokenSource.java._trace
-/.SolverLanguageTokenDefInjectingParser.java._trace
-/.SolverLanguageTokenDefInjectingParser.xtendbin
-/SolverLanguageTokenDefInjectingParser.java
diff --git a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/SolverLanguageTokenDefInjectingParser.java b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/SolverLanguageTokenDefInjectingParser.java
deleted file mode 100644
index 12c92733..00000000
--- a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/SolverLanguageTokenDefInjectingParser.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.eclipse.viatra.solver.language.parser.antlr;
-
-import com.google.inject.Inject;
-import org.antlr.runtime.CharStream;
-import org.antlr.runtime.TokenSource;
-import org.eclipse.viatra.solver.language.parser.antlr.SolverLanguageParser;
-import org.eclipse.viatra.solver.language.parser.antlr.SolverLanguageTokenSource;
-import org.eclipse.xtext.parser.antlr.ITokenDefProvider;
-
-@SuppressWarnings("all")
-public class SolverLanguageTokenDefInjectingParser extends SolverLanguageParser {
-  @Inject
-  private ITokenDefProvider tokenDefProvider;
-  
-  @Override
-  protected TokenSource createLexer(final CharStream stream) {
-    SolverLanguageTokenSource _xblockexpression = null;
-    {
-      TokenSource _createLexer = super.createLexer(stream);
-      final SolverLanguageTokenSource tokenSource = ((SolverLanguageTokenSource) _createLexer);
-      tokenSource.initializeTokenDefsFrom(this.tokenDefProvider);
-      _xblockexpression = tokenSource;
-    }
-    return _xblockexpression;
-  }
-}
diff --git a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/scoping/.gitignore b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/scoping/.gitignore
deleted file mode 100644
index 16497231..00000000
--- a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/scoping/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.SolverLanguageScopeProvider.java._trace
-/.SolverLanguageScopeProvider.xtendbin
-/SolverLanguageScopeProvider.java
diff --git a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.SolverLanguageSyntheticTokenSyntacticSequencer.xtendbin b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.SolverLanguageSyntheticTokenSyntacticSequencer.xtendbin
deleted file mode 100644
index 30cf1dbd..00000000
--- a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.SolverLanguageSyntheticTokenSyntacticSequencer.xtendbin
+++ /dev/null
diff --git a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.gitignore b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.gitignore
deleted file mode 100644
index 1f04090d..00000000
--- a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.SolverLanguageSyntheticTokenSyntacticSequencer.java._trace
-/.SolverLanguageSyntheticTokenSyntacticSequencer.xtendbin
-/SolverLanguageSyntheticTokenSyntacticSequencer.java
diff --git a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/SolverLanguageSyntheticTokenSyntacticSequencer.java b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/SolverLanguageSyntheticTokenSyntacticSequencer.java
deleted file mode 100644
index af761a86..00000000
--- a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/SolverLanguageSyntheticTokenSyntacticSequencer.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.eclipse.viatra.solver.language.serializer;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.viatra.solver.language.serializer.SolverLanguageSyntacticSequencer;
-import org.eclipse.xtext.RuleCall;
-import org.eclipse.xtext.nodemodel.INode;
-
-@SuppressWarnings("all")
-public class SolverLanguageSyntheticTokenSyntacticSequencer extends SolverLanguageSyntacticSequencer {
-  @Override
-  protected String getTRANSITIVE_CLOSUREToken(final EObject semanticObject, final RuleCall ruleCall, final INode node) {
-    return "+";
-  }
-  
-  @Override
-  protected String getREFLEXIVE_TRANSITIVE_CLOSUREToken(final EObject semanticObject, final RuleCall ruleCall, final INode node) {
-    return "*";
-  }
-  
-  @Override
-  protected String getFULL_STOPToken(final EObject semanticObject, final RuleCall ruleCall, final INode node) {
-    return ".";
-  }
-}
diff --git a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/validation/.gitignore b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/validation/.gitignore
deleted file mode 100644
index 565d4b27..00000000
--- a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/validation/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.SolverLanguageValidator.java._trace
-/.SolverLanguageValidator.xtendbin
-/SolverLanguageValidator.java
diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.dse/.gitignore b/Solvers/VIATRA-Solver/org.eclipse.viatra.dse/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.dse/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.model/.gitignore b/Tests/MODELS2020-CaseStudies/case.study.familyTree.model/.gitignore
new file mode 100644
index 00000000..65776c32
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.model/.gitignore
@@ -0,0 +1 @@
+/bin/
\ No newline at end of file
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/.gitignore b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/.gitignore
new file mode 100644
index 00000000..5f222777
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/.gitignore
@@ -0,0 +1,3 @@
+/src-gen/
+/bin/
+/outputs/
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore
deleted file mode 100644
index 7050a7e3..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/queries/
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.FamilyTreeConstraints.java._trace b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.FamilyTreeConstraints.java._trace
deleted file mode 100644
index b000501e..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.FamilyTreeConstraints.java._trace
+++ /dev/null
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.MemberIsItsOwnParent.java._trace b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.MemberIsItsOwnParent.java._trace
deleted file mode 100644
index aaf4d0c2..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.MemberIsItsOwnParent.java._trace
+++ /dev/null
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.gitignore b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.gitignore
deleted file mode 100644
index 19bc3cc8..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-/.FamilyTreeConstraints.java._trace
-/.MemberIsItsOwnParent.java._trace
-/FamilyTreeConstraints.java
-/MemberIsItsOwnParent.java
-/.ParentTooYoung.java._trace
-/.MemberHasNoParent.java._trace
-/.MemberHasParent.java._trace
-/.TwoMembersHaveNoParent.java._trace
-/.NegativeAge.java._trace
-/MemberHasParent.java
-/NegativeAge.java
-/ParentTooYoung.java
-/TwoMembersHaveNoParent.java
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/familyTreeConstraints.vql b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/familyTreeConstraints.vql
deleted file mode 100644
index fdbac640..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/familyTreeConstraints.vql
+++ /dev/null
@@ -1,41 +0,0 @@
-package queries

- 

-import "http://www.example.org/familytree"

-

-@Constraint(message="memberIsItsOwnParent", severity="error", key={m})

-pattern memberIsItsOwnParent(m: Member) = {

-        FamilyTree.members(_, m);

-        Member.parents(m, p);

-        m == p;

-}

-

-@Constraint(message="twoMembersHaveNoParent", severity="error", key={m1, m2})

-pattern twoMembersHaveNoParent(m1:Member, m2:Member) = {

-        neg find memberHasParent(m1);

-        neg find memberHasParent(m2);

-        m1 != m2;

-}

-

-pattern memberHasParent(m: Member) = {

-        Member.parents(m, _);

-}

-

-@Constraint(message="negativeAge", severity="error",key={m})

-pattern negativeAge(m: Member) {

-        Member.age(m,mage);

-        check(mage<0);

-}

-

-@Constraint(message="parentTooYoung", severity="error", key={c, p})

-pattern parentTooYoung(c: Member, p: Member) = {

-        FamilyTree.members(_, c);

-        Member.parents(c, p);

-        Member.age(c, cAge);

-        Member.age(p, pAge);

-        check (pAge <= (cAge + 12));

-}

-

-

-

-

-

diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/debug/errors.txt b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/debug/errors.txt
deleted file mode 100644
index 87a7ed57..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/debug/errors.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Error occured (IllegalArgumentException): TypeConstraint applicable for enumerable input keys only; received instead org.eclipse.viatra.query.patternlanguage.emf.types.BottomTypeKey@3ba3f40d
-    org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint.<init>(TypeConstraint.java:42)
-    org.eclipse.viatra.query.patternlanguage.emf.specification.internal.EPMToPBody.acceptTypeConstraint(EPMToPBody.java:115)
-    org.eclipse.viatra.query.patternlanguage.emf.specification.internal.PatternBodyTransformer.preprocessParameters(PatternBodyTransformer.java:168)
-    org.eclipse.viatra.query.patternlanguage.emf.specification.internal.PatternBodyTransformer.transform(PatternBodyTransformer.java:123)
-    org.eclipse.viatra.query.patternlanguage.emf.specification.SpecificationBuilder.getBodies(SpecificationBuilder.java:300)
-    org.eclipse.viatra.query.patternlanguage.emf.specification.SpecificationBuilder.buildBodies(SpecificationBuilder.java:286)
-    org.eclipse.viatra.query.patternlanguage.emf.specification.SpecificationBuilder.buildSpecification(SpecificationBuilder.java:197)
-    org.eclipse.viatra.query.patternlanguage.emf.specification.SpecificationBuilder.lambda$4(SpecificationBuilder.java:157)
-    java.util.Optional.orElseGet(Optional.java:267)
-    org.eclipse.viatra.query.patternlanguage.emf.specification.SpecificationBuilder.getOrCreateSpecification(SpecificationBuilder.java:157)
-    hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.util.ParseUtil.createSpecification(ParseUtil.java:114)
-    hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.util.ParseUtil.parse(ParseUtil.java:101)
-    hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PatternProvider.generateQueries(PatternProvider.java:66)
-    hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ModelGenerationMethodProvider.createModelGenerationMethod(ModelGenerationMethodProvider.java:57)
-    hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasoner.solve(ViatraReasoner.java:97)
-    hu.bme.mit.inf.dslreasoner.application.execution.GenerationTaskExecutor.executeGenerationTask(GenerationTaskExecutor.java:316)
-    hu.bme.mit.inf.dslreasoner.application.execution.ScriptExecutor._execute(ScriptExecutor.java:129)
-    hu.bme.mit.inf.dslreasoner.application.execution.ScriptExecutor.execute(ScriptExecutor.java:338)
-    hu.bme.mit.inf.dslreasoner.application.execution.ScriptExecutor.executeScript(ScriptExecutor.java:110)
-    hu.bme.mit.inf.dslreasoner.application.execution.StandaloneScriptExecutor.executeScript(StandaloneScriptExecutor.java:149)
-    run.FamilyTreeGen.main(FamilyTreeGen.java:7)
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/debug/generated3valued.vql_deactivated b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/debug/generated3valued.vql_deactivated
deleted file mode 100644
index 315a1e15..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/debug/generated3valued.vql_deactivated
+++ /dev/null
@@ -1,792 +0,0 @@
-import epackage "http://www.bme.hu/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage"
-import epackage "http://www.bme.hu/mit/inf/dslreasoner/logic/model/problem"
-import epackage "http://www.bme.hu/mit/inf/dslreasoner/logic/model/language"
-
-//////////
-// 0. Util
-//////////
-private pattern interpretation(problem:LogicProblem, interpretation:PartialInterpretation) {
-        PartialInterpretation.problem(interpretation,problem);
-}
-        
-/////////////////////////
-// 0.1 Existence
-/////////////////////////
-/** [[exist(element)]]=1 */
-private pattern mustExist(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement) {
-        find interpretation(problem,interpretation);
-        LogicProblem.elements(problem,element);
-} or {
-        find interpretation(problem,interpretation);
-        PartialInterpretation.newElements(interpretation,element);
-}
-
-/** [[exist(element)]]>=1/2 */
-private pattern mayExist(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement) {
-    find mustExist(problem,interpretation,element);
-} or {
-    find interpretation(problem,interpretation);
-    neg find elementCloseWorld(element);
-    PartialInterpretation.openWorldElements(interpretation,element);
-}
-
-private pattern elementCloseWorld(element:DefinedElement) {
-        PartialInterpretation.openWorldElements(i,element);
-    PartialInterpretation.maxNewElements(i,0);
-} or {
-        Scope.targetTypeInterpretation(scope,interpretation);
-        PartialTypeInterpratation.elements(interpretation,element);
-        Scope.maxNewElements(scope,0);
-}
-
-////////////////////////
-// 0.2 Equivalence
-////////////////////////
-pattern mayEquivalent(problem:LogicProblem, interpretation:PartialInterpretation, a: DefinedElement, b: DefinedElement)
-// For non-primitive type. Boolean types always must equivalent or cannot equivalent
-{
-        find mayExist(problem,interpretation,a);
-        find mayExist(problem,interpretation,b);
-        a == b;
-} or {
-        find mayExist(problem,interpretation,a);
-        find mayExist(problem,interpretation,b);
-        IntegerElement(a);
-        IntegerElement(b);
-        PrimitiveElement.valueSet(a,false);
-} or {
-        find mayExist(problem,interpretation,a);
-        find mayExist(problem,interpretation,b);
-        IntegerElement(a);
-        IntegerElement(b);
-        PrimitiveElement.valueSet(b,false);
-} or {
-        find mayExist(problem,interpretation,a);
-        find mayExist(problem,interpretation,b);
-        RealElement(a);
-        RealElement(b);
-        PrimitiveElement.valueSet(a,false);
-} or {
-        find mayExist(problem,interpretation,a);
-        find mayExist(problem,interpretation,b);
-        RealElement(a);
-        RealElement(b);
-        PrimitiveElement.valueSet(b,false);
-} or {
-        find mayExist(problem,interpretation,a);
-        find mayExist(problem,interpretation,b);
-        RealElement(a);
-        IntegerElement(b);
-        PrimitiveElement.valueSet(a,false);
-} or {
-        find mayExist(problem,interpretation,a);
-        find mayExist(problem,interpretation,b);
-        RealElement(a);
-        IntegerElement(b);
-        PrimitiveElement.valueSet(b,false);
-} or {
-        find mayExist(problem,interpretation,a);
-        find mayExist(problem,interpretation,b);
-        IntegerElement(a);
-        RealElement(b);
-        PrimitiveElement.valueSet(a,false);
-} or {
-        find mayExist(problem,interpretation,a);
-        find mayExist(problem,interpretation,b);
-        IntegerElement(a);
-        RealElement(b);
-        PrimitiveElement.valueSet(b,false);
-} or {
-        find mayExist(problem,interpretation,a);
-        find mayExist(problem,interpretation,b);
-        StringElement(a);
-        StringElement(b);
-        PrimitiveElement.valueSet(a,false);
-} or {
-        find mayExist(problem,interpretation,a);
-        find mayExist(problem,interpretation,b);
-        StringElement(a);
-        StringElement(b);
-        PrimitiveElement.valueSet(b,false);
-}
-
-pattern mustEquivalent(problem:LogicProblem, interpretation:PartialInterpretation, a: DefinedElement, b: DefinedElement) {
-// For non-primitive and Boolean primitive type
-        find mustExist(problem,interpretation,a);
-        find mustExist(problem,interpretation,b);
-        a == b;
-} or {
-        find mustExist(problem,interpretation,a);
-        find mustExist(problem,interpretation,b);
-        PrimitiveElement.valueSet(a,true);
-        PrimitiveElement.valueSet(b,true);
-        IntegerElement.value(a,value);
-        IntegerElement.value(b,value);
-} or {
-        find mustExist(problem,interpretation,a);
-        find mustExist(problem,interpretation,b);
-        PrimitiveElement.valueSet(a,true);
-        PrimitiveElement.valueSet(b,true);
-        RealElement.value(a,value);
-        RealElement.value(b,value);
-} or {
-        find mustExist(problem,interpretation,a);
-        find mustExist(problem,interpretation,b);
-        PrimitiveElement.valueSet(a,true);
-        PrimitiveElement.valueSet(b,true);
-        RealElement.value(a,value);
-        IntegerElement.value(b,value);
-} or {
-        find mustExist(problem,interpretation,a);
-        find mustExist(problem,interpretation,b);
-        PrimitiveElement.valueSet(a,true);
-        PrimitiveElement.valueSet(b,true);
-        IntegerElement.value(a,value);
-        RealElement.value(b,value);
-} or {
-        find mustExist(problem,interpretation,a);
-        find mustExist(problem,interpretation,b);
-        PrimitiveElement.valueSet(a,true);
-        PrimitiveElement.valueSet(b,true);
-        StringElement.value(a,value);
-        StringElement.value(b,value);
-}
-
-//////////
-// 1. Problem-Specific Base Indexers
-//////////
-// 1.1 Type Indexers
-//////////
-// 1.1.1 Required Patterns by TypeIndexer
-//////////
-private pattern typeInterpretation(problem:LogicProblem, interpretation:PartialInterpretation, type:TypeDeclaration, typeInterpretation:PartialComplexTypeInterpretation) {
-        find interpretation(problem,interpretation);
-        LogicProblem.types(problem,type);
-        PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);
-        PartialComplexTypeInterpretation.interpretationOf(typeInterpretation,type);
-}
-
-private pattern directInstanceOf(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement, type:Type) {
-        find interpretation(problem,interpretation);
-        LogicProblem.types(problem,type);
-        TypeDefinition.elements(type,element);
-} or {
-        find interpretation(problem,interpretation);
-        find typeInterpretation(problem,interpretation,type,typeInterpretation);
-        PartialComplexTypeInterpretation.elements(typeInterpretation,element);
-}
-
-private pattern isPrimitive(element: PrimitiveElement) {
-        PrimitiveElement(element);
-}
-//////////
-// 1.1.2 primitive Type Indexers
-//////////
-// Currently unused. Refer primitive types as:
-// > PrimitiveElement(element)
-// specific types are referred as:
-// > BooleanElement(variableName)
-// > IntegerElement(variableName)
-// > RealElement(variableName)
-// > StringElement(variableName)
-// And their value as
-// > BooleanElement.value(variableName,value)
-// > IntegerElement.value(variableName,value)
-// > RealElement.value(variableName,value)
-// > StringElement.value(variableName,value)
-// Whether a value is set is defined by:
-// > PrimitiveElement.valueSet(variableName,isFilled);
-//////////
-// 1.1.3 domain-specific Type Indexers
-//////////
-/**
- * An element must be an instance of type "FamilyTree class".
- */
-private pattern mustInstanceOfFamilyTree_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement) {
-        Type.name(type,"FamilyTree class");
-        find directInstanceOf(problem,interpretation,element,type);
-}
-private pattern scopeDisallowsNewFamilyTree_class(problem:LogicProblem, interpretation:PartialInterpretation) {
-        find interpretation(problem,interpretation);
-        PartialInterpretation.scopes(interpretation,scope);
-        Scope.targetTypeInterpretation(scope,typeInterpretation);
-        Scope.maxNewElements(scope,0);
-        PartialComplexTypeInterpretation.interpretationOf(typeInterpretation,type);
-        Type.name(type,"FamilyTree class");
-}
-
-/**
- * An element may be an instance of type "FamilyTree class".
- */
-private pattern mayInstanceOfFamilyTree_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement)
-{
-        find interpretation(problem,interpretation);
-        PartialInterpretation.newElements(interpretation,element);
-        neg find mustInstanceOfMember_class(problem,interpretation,element);
-        neg find scopeDisallowsNewFamilyTree_class(problem, interpretation);
-        neg find isPrimitive(element);
-} or {
-        find interpretation(problem,interpretation);
-        PartialInterpretation.openWorldElements(interpretation,element);
-        neg find mustInstanceOfMember_class(problem,interpretation,element);
-        neg find scopeDisallowsNewFamilyTree_class(problem, interpretation);
-        neg find isPrimitive(element);
-} or
-{ find mustInstanceOfFamilyTree_class(problem,interpretation,element); }
-/**
- * An element must be an instance of type "Member class".
- */
-private pattern mustInstanceOfMember_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement) {
-        Type.name(type,"Member class");
-        find directInstanceOf(problem,interpretation,element,type);
-}
-private pattern scopeDisallowsNewMember_class(problem:LogicProblem, interpretation:PartialInterpretation) {
-        find interpretation(problem,interpretation);
-        PartialInterpretation.scopes(interpretation,scope);
-        Scope.targetTypeInterpretation(scope,typeInterpretation);
-        Scope.maxNewElements(scope,0);
-        PartialComplexTypeInterpretation.interpretationOf(typeInterpretation,type);
-        Type.name(type,"Member class");
-}
-
-/**
- * An element may be an instance of type "Member class".
- */
-private pattern mayInstanceOfMember_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement)
-{
-        find interpretation(problem,interpretation);
-        PartialInterpretation.newElements(interpretation,element);
-        neg find mustInstanceOfFamilyTree_class(problem,interpretation,element);
-        neg find scopeDisallowsNewMember_class(problem, interpretation);
-        neg find isPrimitive(element);
-} or {
-        find interpretation(problem,interpretation);
-        PartialInterpretation.openWorldElements(interpretation,element);
-        neg find mustInstanceOfFamilyTree_class(problem,interpretation,element);
-        neg find scopeDisallowsNewMember_class(problem, interpretation);
-        neg find isPrimitive(element);
-} or
-{ find mustInstanceOfMember_class(problem,interpretation,element); }
-
-//////////
-// 1.2 Relation Declaration Indexers
-//////////
-/**
- * Matcher for detecting tuples t where []members reference FamilyTree(source,target)
- */
-private pattern mustInRelationmembers_reference_FamilyTree(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        source: DefinedElement, target:DefinedElement)
-{
-        find interpretation(problem,interpretation);
-        PartialInterpretation.partialrelationinterpretation(interpretation,relationIterpretation);
-        PartialRelationInterpretation.interpretationOf.name(relationIterpretation,"members reference FamilyTree");
-        PartialRelationInterpretation.relationlinks(relationIterpretation,link);
-        BinaryElementRelationLink.param1(link,source);
-        BinaryElementRelationLink.param2(link,target);
-}
-/**
- * Matcher for detecting tuples t where <>members reference FamilyTree(source,target)
- */
-private pattern mayInRelationmembers_reference_FamilyTree(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        source: DefinedElement, target:DefinedElement)
-{
-        find interpretation(problem,interpretation);
-        // The two endpoint of the link have to exist
-        find mayExist(problem, interpretation, source);
-        find mayExist(problem, interpretation, target);
-        // Type consistency
-        find mayInstanceOfFamilyTree_class(problem,interpretation,source);
-        find mayInstanceOfMember_class(problem,interpretation,target);
-        // The reference is containment, then a new reference cannot be create if:
-        // 1. Multiple parents
-        neg find mustContains4(problem,interpretation,_,target);
-        // 2. Circle in the containment hierarchy
-        neg find mustTransitiveContains(source,target);
-} or {
-        find mustInRelationmembers_reference_FamilyTree(problem,interpretation,source,target);
-}
-/**
- * Matcher for detecting tuples t where []children reference Member(source,target)
- */
-private pattern mustInRelationchildren_reference_Member(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        source: DefinedElement, target:DefinedElement)
-{
-        find interpretation(problem,interpretation);
-        PartialInterpretation.partialrelationinterpretation(interpretation,relationIterpretation);
-        PartialRelationInterpretation.interpretationOf.name(relationIterpretation,"children reference Member");
-        PartialRelationInterpretation.relationlinks(relationIterpretation,link);
-        BinaryElementRelationLink.param1(link,source);
-        BinaryElementRelationLink.param2(link,target);
-}
-/**
- * Matcher for detecting tuples t where <>children reference Member(source,target)
- */
-private pattern mayInRelationchildren_reference_Member(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        source: DefinedElement, target:DefinedElement)
-{
-        find interpretation(problem,interpretation);
-        // The two endpoint of the link have to exist
-        find mayExist(problem, interpretation, source);
-        find mayExist(problem, interpretation, target);
-        // Type consistency
-        find mayInstanceOfMember_class(problem,interpretation,source);
-        find mayInstanceOfMember_class(problem,interpretation,target);
-        // There are "numberOfExistingReferences" currently existing instances of the reference to the target,
-        // the upper bound of the opposite reference multiplicity should be considered.
-        numberOfExistingOppositeReferences == count find mustInRelationparents_reference_Member(problem,interpretation,target,_);
-        check(numberOfExistingOppositeReferences < 2);
-} or {
-        find mustInRelationchildren_reference_Member(problem,interpretation,source,target);
-}
-/**
- * Matcher for detecting tuples t where []parents reference Member(source,target)
- */
-private pattern mustInRelationparents_reference_Member(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        source: DefinedElement, target:DefinedElement)
-{
-        find interpretation(problem,interpretation);
-        PartialInterpretation.partialrelationinterpretation(interpretation,relationIterpretation);
-        PartialRelationInterpretation.interpretationOf.name(relationIterpretation,"parents reference Member");
-        PartialRelationInterpretation.relationlinks(relationIterpretation,link);
-        BinaryElementRelationLink.param1(link,source);
-        BinaryElementRelationLink.param2(link,target);
-}
-/**
- * Matcher for detecting tuples t where <>parents reference Member(source,target)
- */
-private pattern mayInRelationparents_reference_Member(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        source: DefinedElement, target:DefinedElement)
-{
-        find interpretation(problem,interpretation);
-        // The two endpoint of the link have to exist
-        find mayExist(problem, interpretation, source);
-        find mayExist(problem, interpretation, target);
-        // Type consistency
-        find mayInstanceOfMember_class(problem,interpretation,source);
-        find mayInstanceOfMember_class(problem,interpretation,target);
-        // There are "numberOfExistingReferences" currently existing instances of the reference from the source,
-        // the upper bound of the multiplicity should be considered.
-        numberOfExistingReferences == count find mustInRelationparents_reference_Member(problem,interpretation,source,_);
-        check(numberOfExistingReferences < 2);
-} or {
-        find mustInRelationparents_reference_Member(problem,interpretation,source,target);
-}
-/**
- * Matcher for detecting tuples t where []name attribute Member(source,target)
- */
-private pattern mustInRelationname_attribute_Member(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        source: DefinedElement, target:DefinedElement)
-{
-        find interpretation(problem,interpretation);
-        PartialInterpretation.partialrelationinterpretation(interpretation,relationIterpretation);
-        PartialRelationInterpretation.interpretationOf.name(relationIterpretation,"name attribute Member");
-        PartialRelationInterpretation.relationlinks(relationIterpretation,link);
-        BinaryElementRelationLink.param1(link,source);
-        BinaryElementRelationLink.param2(link,target);
-}
-/**
- * Matcher for detecting tuples t where <>name attribute Member(source,target)
- */
-private pattern mayInRelationname_attribute_Member(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        source: DefinedElement, target:DefinedElement)
-{
-        find interpretation(problem,interpretation);
-        // The two endpoint of the link have to exist
-        find mayExist(problem, interpretation, source);
-        find mayExist(problem, interpretation, target);
-        // Type consistency
-        find mayInstanceOfMember_class(problem,interpretation,source);
-        StringElement(target);
-        // There are "numberOfExistingReferences" currently existing instances of the reference from the source,
-        // the upper bound of the multiplicity should be considered.
-        numberOfExistingReferences == count find mustInRelationname_attribute_Member(problem,interpretation,source,_);
-        check(numberOfExistingReferences < 1);
-} or {
-        find mustInRelationname_attribute_Member(problem,interpretation,source,target);
-}
-/**
- * Matcher for detecting tuples t where []age attribute Member(source,target)
- */
-private pattern mustInRelationage_attribute_Member(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        source: DefinedElement, target:DefinedElement)
-{
-        find interpretation(problem,interpretation);
-        PartialInterpretation.partialrelationinterpretation(interpretation,relationIterpretation);
-        PartialRelationInterpretation.interpretationOf.name(relationIterpretation,"age attribute Member");
-        PartialRelationInterpretation.relationlinks(relationIterpretation,link);
-        BinaryElementRelationLink.param1(link,source);
-        BinaryElementRelationLink.param2(link,target);
-}
-/**
- * Matcher for detecting tuples t where <>age attribute Member(source,target)
- */
-private pattern mayInRelationage_attribute_Member(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        source: DefinedElement, target:DefinedElement)
-{
-        find interpretation(problem,interpretation);
-        // The two endpoint of the link have to exist
-        find mayExist(problem, interpretation, source);
-        find mayExist(problem, interpretation, target);
-        // Type consistency
-        find mayInstanceOfMember_class(problem,interpretation,source);
-        IntegerElement(target);
-        // There are "numberOfExistingReferences" currently existing instances of the reference from the source,
-        // the upper bound of the multiplicity should be considered.
-        numberOfExistingReferences == count find mustInRelationage_attribute_Member(problem,interpretation,source,_);
-        check(numberOfExistingReferences < 1);
-} or {
-        find mustInRelationage_attribute_Member(problem,interpretation,source,target);
-}
-
-//////////
-// 1.3 Relation Definition Indexers
-//////////
-// Must, May and Current queries for pattern queries memberIsItsOwnParent
-private pattern mustInRelation_pattern_queries_memberIsItsOwnParent(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        var_m)
-{
-        find interpretation(problem,interpretation);
-        var_m == var_p;
-        find mustInRelationmembers_reference_FamilyTree(problem,interpretation,_var__0,var_p);
-        find mustInRelationparents_reference_Member(problem,interpretation,var_p,var_p);
-}
-private pattern mayInRelation_pattern_queries_memberIsItsOwnParent(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        var_m)
-{
-        find interpretation(problem,interpretation);
-        var_m == var_p;
-        find mayInRelationmembers_reference_FamilyTree(problem,interpretation,_var__0,var_p);
-        find mayInRelationparents_reference_Member(problem,interpretation,var_p,var_p);
-}
-private pattern currentInRelation_pattern_queries_memberIsItsOwnParent(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        var_m)
-{
-        find interpretation(problem,interpretation);
-        var_m == var_p;
-        find mustInRelationmembers_reference_FamilyTree(problem,interpretation,_var__0,var_p);
-        find mustInRelationparents_reference_Member(problem,interpretation,var_p,var_p);
-}
-// Must, May and Current queries for pattern queries twoMembersHaveNoParent
-private pattern mustInRelation_pattern_queries_twoMembersHaveNoParent(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        var_m1, var_m2)
-{
-        find interpretation(problem,interpretation);
-        // var_m1 exported
-        // var_m2 exported
-        find mustInstanceOfMember_class(problem,interpretation,var_m1);
-        find mustInstanceOfMember_class(problem,interpretation,var_m2);
-        neg find mayInRelation_pattern_queries_memberHasParent(problem,interpretation,var_m1);
-        neg find mayInRelation_pattern_queries_memberHasParent(problem,interpretation,var_m2);
-        neg find mayEquivalent(problem, interpretation, var_m1, var_m2);
-}
-private pattern mayInRelation_pattern_queries_twoMembersHaveNoParent(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        var_m1, var_m2)
-{
-        find interpretation(problem,interpretation);
-        // var_m1 exported
-        // var_m2 exported
-        find mayInstanceOfMember_class(problem,interpretation,var_m1);
-        find mayInstanceOfMember_class(problem,interpretation,var_m2);
-        neg find mustInRelation_pattern_queries_memberHasParent(problem,interpretation,var_m1);
-        neg find mustInRelation_pattern_queries_memberHasParent(problem,interpretation,var_m2);
-        neg find mustEquivalent(problem, interpretation, var_m1, var_m2);
-}
-private pattern currentInRelation_pattern_queries_twoMembersHaveNoParent(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        var_m1, var_m2)
-{
-        find interpretation(problem,interpretation);
-        // var_m1 exported
-        // var_m2 exported
-        find mustInstanceOfMember_class(problem,interpretation,var_m1);
-        find mustInstanceOfMember_class(problem,interpretation,var_m2);
-        neg find currentInRelation_pattern_queries_memberHasParent(problem,interpretation,var_m1);
-        neg find currentInRelation_pattern_queries_memberHasParent(problem,interpretation,var_m2);
-        neg find mustEquivalent(problem, interpretation, var_m1, var_m2);
-}
-// Must, May and Current queries for pattern queries memberHasParent
-private pattern mustInRelation_pattern_queries_memberHasParent(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        var_m)
-{
-        find interpretation(problem,interpretation);
-        // var_m exported
-        find mustInRelationparents_reference_Member(problem,interpretation,var_m,var__0);
-        find mustInstanceOfMember_class(problem,interpretation,var__0);
-}
-private pattern mayInRelation_pattern_queries_memberHasParent(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        var_m)
-{
-        find interpretation(problem,interpretation);
-        // var_m exported
-        find mayInRelationparents_reference_Member(problem,interpretation,var_m,var__0);
-        find mayInstanceOfMember_class(problem,interpretation,var__0);
-}
-private pattern currentInRelation_pattern_queries_memberHasParent(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        var_m)
-{
-        find interpretation(problem,interpretation);
-        // var_m exported
-        find mustInRelationparents_reference_Member(problem,interpretation,var_m,var__0);
-        find mustInstanceOfMember_class(problem,interpretation,var__0);
-}
-// Must, May and Current queries for pattern queries parentTooYoung
-private pattern mustInRelation_pattern_queries_parentTooYoung(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        var_m, var_p)
-{
-        find interpretation(problem,interpretation);
-        // var_m exported
-        // var_p exported
-        find mustInRelationmembers_reference_FamilyTree(problem,interpretation,_var__0,var_m);
-        find mustInRelationparents_reference_Member(problem,interpretation,var_m,var_p);
-        find mustInRelationage_attribute_Member(problem,interpretation,var_m,var_mAge);
-        find mustInRelationage_attribute_Member(problem,interpretation,var_p,var_pAge);
-        PrimitiveElement.valueSet(var_mAge,true); IntegerElement.value(var_mAge,value_var_mAge);
-        PrimitiveElement.valueSet(var_pAge,true); IntegerElement.value(var_pAge,value_var_pAge);
-        check((value_var_mAge<=(value_var_pAge+12)));
-}
-private pattern mayInRelation_pattern_queries_parentTooYoung(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        var_m, var_p)
-{
-        find interpretation(problem,interpretation);
-        // var_m exported
-        // var_p exported
-        find mayInRelationmembers_reference_FamilyTree(problem,interpretation,_var__0,var_m);
-        find mayInRelationparents_reference_Member(problem,interpretation,var_m,var_p);
-        find mayInRelationage_attribute_Member(problem,interpretation,var_m,var_mAge);
-        find mayInRelationage_attribute_Member(problem,interpretation,var_p,var_pAge);
-        PrimitiveElement.valueSet(var_mAge,setted_var_mAge); IntegerElement.value(var_mAge,value_var_mAge);
-        PrimitiveElement.valueSet(var_pAge,setted_var_pAge); IntegerElement.value(var_pAge,value_var_pAge);
-        check(
-                !setted_var_mAge || !setted_var_pAge
-                ||
-                ((value_var_mAge<=(value_var_pAge+12)))
-        );
-}
-private pattern currentInRelation_pattern_queries_parentTooYoung(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        var_m, var_p)
-{
-        find interpretation(problem,interpretation);
-        // var_m exported
-        // var_p exported
-        find mustInRelationmembers_reference_FamilyTree(problem,interpretation,_var__0,var_m);
-        find mustInRelationparents_reference_Member(problem,interpretation,var_m,var_p);
-        find mustInRelationage_attribute_Member(problem,interpretation,var_m,var_mAge);
-        find mustInRelationage_attribute_Member(problem,interpretation,var_p,var_pAge);
-        PrimitiveElement.valueSet(var_mAge,true); IntegerElement.value(var_mAge,value_var_mAge);
-        PrimitiveElement.valueSet(var_pAge,true); IntegerElement.value(var_pAge,value_var_pAge);
-        check((value_var_mAge<=(value_var_pAge+12)));
-}
-
-//////////
-// 1.4 Containment Indexer
-//////////
-private pattern mustContains2(source: DefinedElement, target: DefinedElement) {
-        find mustContains4(_,_,source,target);
-}
-        
-private pattern mustContains4(problem:LogicProblem, interpretation:PartialInterpretation,
-        source: DefinedElement, target: DefinedElement)
-        { find mustInRelationmembers_reference_FamilyTree(problem,interpretation,source,target); }
-
-private pattern mustTransitiveContains(source,target) {
-        find mustContains2+(source,target);
-}
-
-//////////
-// 2. Invalidation Indexers
-//////////
-// 2.1 Invalidated by WF Queries
-//////////
-pattern invalidatedBy_pattern_queries_memberIsItsOwnParent(problem:LogicProblem, interpretation:PartialInterpretation,
-        var_m)
-{
-        find mustInRelation_pattern_queries_memberIsItsOwnParent(problem,interpretation,var_m);
-}
-pattern invalidatedBy_pattern_queries_twoMembersHaveNoParent(problem:LogicProblem, interpretation:PartialInterpretation,
-        var_m1, var_m2)
-{
-        find mustInRelation_pattern_queries_twoMembersHaveNoParent(problem,interpretation,var_m1,var_m2);
-}
-pattern invalidatedBy_pattern_queries_parentTooYoung(problem:LogicProblem, interpretation:PartialInterpretation,
-        var_m, var_p)
-{
-        find mustInRelation_pattern_queries_parentTooYoung(problem,interpretation,var_m,var_p);
-}
-
-//////////
-// 3. Unfinishedness Indexers
-//////////
-// 3.1 Unfinishedness Measured by Multiplicity
-//////////
-
-//////////
-// 3.2 Unfinishedness Measured by WF Queries
-//////////
-pattern unfinishedBy_pattern_queries_memberIsItsOwnParent(problem:LogicProblem, interpretation:PartialInterpretation,
-        var_m)
-{
-        find currentInRelation_pattern_queries_memberIsItsOwnParent(problem,interpretation,var_m);
-}
-pattern unfinishedBy_pattern_queries_twoMembersHaveNoParent(problem:LogicProblem, interpretation:PartialInterpretation,
-        var_m1, var_m2)
-{
-        find currentInRelation_pattern_queries_twoMembersHaveNoParent(problem,interpretation,var_m1,var_m2);
-}
-pattern unfinishedBy_pattern_queries_parentTooYoung(problem:LogicProblem, interpretation:PartialInterpretation,
-        var_m, var_p)
-{
-        find currentInRelation_pattern_queries_parentTooYoung(problem,interpretation,var_m,var_p);
-}
-
-//////////
-// 4. Refinement Indexers
-//////////
-// 4.1 Object constructors
-//////////
-private pattern hasElementInContainment(problem:LogicProblem, interpretation:PartialInterpretation)
-{
-        find interpretation(problem,interpretation);
-        find mustInstanceOfFamilyTree_class(problem,interpretation,root);
-        find mustExist(problem, interpretation, root);
-}or{
-        find interpretation(problem,interpretation);
-        find mustInstanceOfMember_class(problem,interpretation,root);
-        find mustExist(problem, interpretation, root);
-}
-pattern createObject_Member_class_by_members_reference_FamilyTree(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        relationInterpretation:PartialRelationInterpretation, typeInterpretation:PartialComplexTypeInterpretation,
-        container:DefinedElement)
-{
-        find interpretation(problem,interpretation);
-        PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);
-        PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"Member class");
-        PartialInterpretation.partialrelationinterpretation(interpretation,relationInterpretation);
-        PartialRelationInterpretation.interpretationOf.name(relationInterpretation,"members reference FamilyTree");
-        find mustInstanceOfFamilyTree_class(problem,interpretation,container);
-        find mayInstanceOfMember_class(problem,interpretation,newObject);
-        find mayInRelationmembers_reference_FamilyTree(problem,interpretation,container,newObject);
-        find mustExist(problem, interpretation, container);
-        neg find mustExist(problem, interpretation, newObject);
-}
-pattern createObject_Member_class(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        typeInterpretation:PartialComplexTypeInterpretation)
-{
-        find interpretation(problem,interpretation);
-        neg find hasElementInContainment(problem,interpretation);
-        PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);
-        PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"Member class");
-        find mayInstanceOfMember_class(problem,interpretation,newObject);
-        find mayExist(problem, interpretation, newObject);
-        neg find mustExist(problem, interpretation, newObject);
-}
-pattern createObject_FamilyTree_class(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        typeInterpretation:PartialComplexTypeInterpretation)
-{
-        find interpretation(problem,interpretation);
-        neg find hasElementInContainment(problem,interpretation);
-        PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);
-        PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"FamilyTree class");
-        find mayInstanceOfFamilyTree_class(problem,interpretation,newObject);
-        find mayExist(problem, interpretation, newObject);
-        neg find mustExist(problem, interpretation, newObject);
-}
-
-//////////
-// 4.2 Type refinement
-//////////
-pattern refineTypeTo_Member_class(problem:LogicProblem, interpretation:PartialInterpretation, element: DefinedElement) {
-        find interpretation(problem,interpretation);
-        PartialInterpretation.newElements(interpretation,element);
-        find mayInstanceOfMember_class(problem,interpretation,element);
-        neg find mustInstanceOfMember_class(problem,interpretation,element);
-        neg find mustInstanceOfFamilyTree_class(problem,interpretation,element);
-}
-pattern refineTypeTo_FamilyTree_class(problem:LogicProblem, interpretation:PartialInterpretation, element: DefinedElement) {
-        find interpretation(problem,interpretation);
-        PartialInterpretation.newElements(interpretation,element);
-        find mayInstanceOfFamilyTree_class(problem,interpretation,element);
-        neg find mustInstanceOfMember_class(problem,interpretation,element);
-        neg find mustInstanceOfFamilyTree_class(problem,interpretation,element);
-}
-
-//////////
-// 4.3 Relation refinement
-//////////
-pattern refineRelation_children_reference_Member_and_parents_reference_Member(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        relationIterpretation:PartialRelationInterpretation, oppositeInterpretation:PartialRelationInterpretation,
-        from: DefinedElement, to: DefinedElement)
-{
-        find interpretation(problem,interpretation);
-        PartialInterpretation.partialrelationinterpretation(interpretation,relationIterpretation);
-        PartialRelationInterpretation.interpretationOf.name(relationIterpretation,"children reference Member");
-        PartialInterpretation.partialrelationinterpretation(interpretation,oppositeInterpretation);
-        PartialRelationInterpretation.interpretationOf.name(oppositeInterpretation,"parents reference Member");
-        find mustExist(problem, interpretation, from);
-        find mustExist(problem, interpretation, to);
-        find mustInstanceOfMember_class(problem,interpretation,from);
-        find mustInstanceOfMember_class(problem,interpretation,to);
-        find mayInRelationchildren_reference_Member(problem,interpretation,from,to);
-        neg find mustInRelationchildren_reference_Member(problem,interpretation,from,to);
-}
-pattern refineRelation_name_attribute_Member(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        relationIterpretation:PartialRelationInterpretation,
-        from: DefinedElement, to: DefinedElement)
-{
-        find interpretation(problem,interpretation);
-        PartialInterpretation.partialrelationinterpretation(interpretation,relationIterpretation);
-        PartialRelationInterpretation.interpretationOf.name(relationIterpretation,"name attribute Member");
-        find mustExist(problem, interpretation, from);
-        find mustExist(problem, interpretation, to);
-        find mustInstanceOfMember_class(problem,interpretation,from);
-        StringElement(to);
-        find mayInRelationname_attribute_Member(problem,interpretation,from,to);
-        neg find mustInRelationname_attribute_Member(problem,interpretation,from,to);
-}
-pattern refineRelation_age_attribute_Member(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        relationIterpretation:PartialRelationInterpretation,
-        from: DefinedElement, to: DefinedElement)
-{
-        find interpretation(problem,interpretation);
-        PartialInterpretation.partialrelationinterpretation(interpretation,relationIterpretation);
-        PartialRelationInterpretation.interpretationOf.name(relationIterpretation,"age attribute Member");
-        find mustExist(problem, interpretation, from);
-        find mustExist(problem, interpretation, to);
-        find mustInstanceOfMember_class(problem,interpretation,from);
-        IntegerElement(to);
-        find mayInRelationage_attribute_Member(problem,interpretation,from,to);
-        neg find mustInRelationage_attribute_Member(problem,interpretation,from,to);
-}
-
-//////////
-// 5 Unit Propagations
-//////////
-
-// Main propagations:
-
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/debug/generation.logicproblem b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/debug/generation.logicproblem
deleted file mode 100644
index d15360ce..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/debug/generation.logicproblem
+++ /dev/null
@@ -1,340 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<language:LogicProblem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore2logicannotations="http://www.bme.hu/mit/inf/dslreasoner/logic/model/language/ecore2logicannotation" xmlns:language="http://www.bme.hu/mit/inf/dslreasoner/logic/model/problem" xmlns:language_1="http://www.bme.hu/mit/inf/dslreasoner/logic/model/language" xmlns:viatra2logicannotations="http://www.bme.hu/mit/inf/dslreasoner/logic/model/language/viatra2logicannotation">
-  <types xsi:type="language_1:TypeDeclaration" name="FamilyTree class"/>
-  <types xsi:type="language_1:TypeDeclaration" name="Member class"/>
-  <assertions name="upperMultiplicity parents Member" annotations="//@annotations.0">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="src">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-      </quantifiedVariables>
-      <quantifiedVariables name="trg 1">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-      </quantifiedVariables>
-      <quantifiedVariables name="trg 2">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-      </quantifiedVariables>
-      <quantifiedVariables name="trg 3">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Impl">
-        <leftOperand xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.0/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.0/@value/@quantifiedVariables.1"/>
-          </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.0/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.0/@value/@quantifiedVariables.2"/>
-          </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.0/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.0/@value/@quantifiedVariables.3"/>
-          </operands>
-        </leftOperand>
-        <rightOperand xsi:type="language_1:Not">
-          <operand xsi:type="language_1:Distinct">
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.0/@value/@quantifiedVariables.1"/>
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.0/@value/@quantifiedVariables.2"/>
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.0/@value/@quantifiedVariables.3"/>
-          </operand>
-        </rightOperand>
-      </expression>
-    </value>
-  </assertions>
-  <assertions name="oppositeReference children Member" annotations="//@annotations.1">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="src">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-      </quantifiedVariables>
-      <quantifiedVariables name="trg">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Iff">
-        <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.1">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.1/@value/@quantifiedVariables.0"/>
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.1/@value/@quantifiedVariables.1"/>
-        </leftOperand>
-        <rightOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.1/@value/@quantifiedVariables.1"/>
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.1/@value/@quantifiedVariables.0"/>
-        </rightOperand>
-      </expression>
-    </value>
-  </assertions>
-  <assertions name="upperMultiplicity name Member" annotations="//@annotations.2">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="src">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-      </quantifiedVariables>
-      <quantifiedVariables name="trg 1">
-        <range xsi:type="language_1:StringTypeReference"/>
-      </quantifiedVariables>
-      <quantifiedVariables name="trg 2">
-        <range xsi:type="language_1:StringTypeReference"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Impl">
-        <leftOperand xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.3">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.2/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.2/@value/@quantifiedVariables.1"/>
-          </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.3">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.2/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.2/@value/@quantifiedVariables.2"/>
-          </operands>
-        </leftOperand>
-        <rightOperand xsi:type="language_1:Not">
-          <operand xsi:type="language_1:Distinct">
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.2/@value/@quantifiedVariables.1"/>
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.2/@value/@quantifiedVariables.2"/>
-          </operand>
-        </rightOperand>
-      </expression>
-    </value>
-  </assertions>
-  <assertions name="upperMultiplicity age Member" annotations="//@annotations.3">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="src">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-      </quantifiedVariables>
-      <quantifiedVariables name="trg 1">
-        <range xsi:type="language_1:IntTypeReference"/>
-      </quantifiedVariables>
-      <quantifiedVariables name="trg 2">
-        <range xsi:type="language_1:IntTypeReference"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Impl">
-        <leftOperand xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.4">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.3/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.3/@value/@quantifiedVariables.1"/>
-          </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.4">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.3/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.3/@value/@quantifiedVariables.2"/>
-          </operands>
-        </leftOperand>
-        <rightOperand xsi:type="language_1:Not">
-          <operand xsi:type="language_1:Distinct">
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.3/@value/@quantifiedVariables.1"/>
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.3/@value/@quantifiedVariables.2"/>
-          </operand>
-        </rightOperand>
-      </expression>
-    </value>
-  </assertions>
-  <assertions name="errorpattern queries memberIsItsOwnParent" annotations="//@annotations.8">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="p0">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.4/@value/@quantifiedVariables.0"/>
-        </operand>
-      </expression>
-    </value>
-  </assertions>
-  <assertions name="errorpattern queries twoMembersHaveNoParent" annotations="//@annotations.9">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="p0">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-      </quantifiedVariables>
-      <quantifiedVariables name="p1">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.5/@value/@quantifiedVariables.0"/>
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.5/@value/@quantifiedVariables.1"/>
-        </operand>
-      </expression>
-    </value>
-  </assertions>
-  <assertions name="errorpattern queries parentTooYoung" annotations="//@annotations.10">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="p0">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-      </quantifiedVariables>
-      <quantifiedVariables name="p1">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.6/@value/@quantifiedVariables.0"/>
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.6/@value/@quantifiedVariables.1"/>
-        </operand>
-      </expression>
-    </value>
-  </assertions>
-  <relations xsi:type="language_1:RelationDeclaration" name="members reference FamilyTree">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-  </relations>
-  <relations xsi:type="language_1:RelationDeclaration" name="children reference Member">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-  </relations>
-  <relations xsi:type="language_1:RelationDeclaration" name="parents reference Member">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-  </relations>
-  <relations xsi:type="language_1:RelationDeclaration" name="name attribute Member">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-    <parameters xsi:type="language_1:StringTypeReference"/>
-  </relations>
-  <relations xsi:type="language_1:RelationDeclaration" name="age attribute Member">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-    <parameters xsi:type="language_1:IntTypeReference"/>
-  </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern queries memberIsItsOwnParent" annotations="//@annotations.4">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-    <variables name="parameter m">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-    </variables>
-    <value xsi:type="language_1:Or">
-      <operands xsi:type="language_1:Exists">
-        <quantifiedVariables name="variable 0">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-        </quantifiedVariables>
-        <expression xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.0">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5/@value/@operands.0/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5/@variables.0"/>
-          </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5/@variables.0"/>
-          </operands>
-        </expression>
-      </operands>
-    </value>
-  </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern queries twoMembersHaveNoParent" annotations="//@annotations.5">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-    <variables name="parameter m1">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-    </variables>
-    <variables name="parameter m2">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-    </variables>
-    <value xsi:type="language_1:Or">
-      <operands xsi:type="language_1:And">
-        <operands xsi:type="language_1:InstanceOf">
-          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6/@variables.0"/>
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-        </operands>
-        <operands xsi:type="language_1:InstanceOf">
-          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6/@variables.1"/>
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-        </operands>
-        <operands xsi:type="language_1:Not">
-          <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6/@variables.0"/>
-          </operand>
-        </operands>
-        <operands xsi:type="language_1:Not">
-          <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6/@variables.1"/>
-          </operand>
-        </operands>
-        <operands xsi:type="language_1:Distinct">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6/@variables.0"/>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6/@variables.1"/>
-        </operands>
-      </operands>
-    </value>
-  </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern queries memberHasParent" annotations="//@annotations.6">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-    <variables name="parameter m">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-    </variables>
-    <value xsi:type="language_1:Or">
-      <operands xsi:type="language_1:Exists">
-        <quantifiedVariables name="variable 0">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-        </quantifiedVariables>
-        <expression xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7/@value/@operands.0/@quantifiedVariables.0"/>
-          </operands>
-          <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7/@value/@operands.0/@quantifiedVariables.0"/>
-            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-          </operands>
-        </expression>
-      </operands>
-    </value>
-  </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern queries parentTooYoung" annotations="//@annotations.7">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-    <variables name="parameter m">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-    </variables>
-    <variables name="parameter p">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-    </variables>
-    <value xsi:type="language_1:Or">
-      <operands xsi:type="language_1:Exists">
-        <quantifiedVariables name="variable 0">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-        </quantifiedVariables>
-        <quantifiedVariables name="variable mAge">
-          <range xsi:type="language_1:IntTypeReference"/>
-        </quantifiedVariables>
-        <quantifiedVariables name="variable pAge">
-          <range xsi:type="language_1:IntTypeReference"/>
-        </quantifiedVariables>
-        <expression xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.0">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8/@value/@operands.0/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8/@variables.0"/>
-          </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8/@variables.1"/>
-          </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.4">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8/@value/@operands.0/@quantifiedVariables.1"/>
-          </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.4">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8/@variables.1"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8/@value/@operands.0/@quantifiedVariables.2"/>
-          </operands>
-          <operands xsi:type="language_1:LessOrEqualThan">
-            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8/@value/@operands.0/@quantifiedVariables.1"/>
-            <rightOperand xsi:type="language_1:Plus">
-              <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8/@value/@operands.0/@quantifiedVariables.2"/>
-              <rightOperand xsi:type="language_1:IntLiteral" value="12"/>
-            </rightOperand>
-          </operands>
-        </expression>
-      </operands>
-    </value>
-  </relations>
-  <containmentHierarchies typesOrderedInHierarchy="//@types.0 //@types.1" containmentRelations="//@relations.0"/>
-  <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.0" relation="//@relations.2" upper="2"/>
-  <annotations xsi:type="ecore2logicannotations:InverseRelationAssertion" target="//@assertions.1" inverseA="//@relations.1" inverseB="//@relations.2"/>
-  <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.2" relation="//@relations.3" upper="1"/>
-  <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.3" relation="//@relations.4" upper="1"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.5" patternFullyQualifiedName="queries.memberIsItsOwnParent">
-    <variableTrace targetLogicVariable="//@relations.5/@value/@operands.0/@quantifiedVariables.0"/>
-  </annotations>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.6" patternFullyQualifiedName="queries.twoMembersHaveNoParent"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.7" patternFullyQualifiedName="queries.memberHasParent">
-    <variableTrace targetLogicVariable="//@relations.7/@value/@operands.0/@quantifiedVariables.0"/>
-  </annotations>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.8" patternFullyQualifiedName="queries.parentTooYoung">
-    <variableTrace targetLogicVariable="//@relations.8/@value/@operands.0/@quantifiedVariables.0"/>
-    <variableTrace targetLogicVariable="//@relations.8/@value/@operands.0/@quantifiedVariables.1"/>
-    <variableTrace targetLogicVariable="//@relations.8/@value/@operands.0/@quantifiedVariables.2"/>
-  </annotations>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.4" query="//@annotations.4"/>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.5" query="//@annotations.5"/>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.6" query="//@annotations.7"/>
-</language:LogicProblem>
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/debug/init.partialmodel b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/debug/init.partialmodel
deleted file mode 100644
index df908518..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/debug/init.partialmodel
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<partialinterpretation:PartialInterpretation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:language="http://www.bme.hu/mit/inf/dslreasoner/logic/model/language" xmlns:partialinterpretation="http://www.bme.hu/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage" minNewElements="6" maxNewElements="6">
-  <problem href="outputs/debug/generation.logicproblem#/"/>
-  <partialrelationinterpretation>
-    <interpretationOf href="outputs/debug/generation.logicproblem#//@relations.0"/>
-    <param1 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.0/@parameters.0"/>
-    <param2 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.0/@parameters.1"/>
-  </partialrelationinterpretation>
-  <partialrelationinterpretation>
-    <interpretationOf href="outputs/debug/generation.logicproblem#//@relations.1"/>
-    <param1 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.1/@parameters.0"/>
-    <param2 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.1/@parameters.1"/>
-  </partialrelationinterpretation>
-  <partialrelationinterpretation>
-    <interpretationOf href="outputs/debug/generation.logicproblem#//@relations.2"/>
-    <param1 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.2/@parameters.0"/>
-    <param2 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.2/@parameters.1"/>
-  </partialrelationinterpretation>
-  <partialrelationinterpretation>
-    <interpretationOf href="outputs/debug/generation.logicproblem#//@relations.3"/>
-    <param1 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.3/@parameters.0"/>
-    <param2 xsi:type="language:StringTypeReference" href="outputs/debug/generation.logicproblem#//@relations.3/@parameters.1"/>
-  </partialrelationinterpretation>
-  <partialrelationinterpretation>
-    <interpretationOf href="outputs/debug/generation.logicproblem#//@relations.4"/>
-    <param1 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.4/@parameters.0"/>
-    <param2 xsi:type="language:IntTypeReference" href="outputs/debug/generation.logicproblem#//@relations.4/@parameters.1"/>
-  </partialrelationinterpretation>
-  <newElements xsi:type="partialinterpretation:BooleanElement" name="true" valueSet="true" value="true"/>
-  <newElements xsi:type="partialinterpretation:BooleanElement" name="false" valueSet="true"/>
-  <newElements xsi:type="partialinterpretation:IntegerElement" name="1" valueSet="true" value="1"/>
-  <newElements xsi:type="partialinterpretation:IntegerElement" name="2" valueSet="true" value="2"/>
-  <newElements xsi:type="partialinterpretation:IntegerElement" name="3" valueSet="true" value="3"/>
-  <newElements xsi:type="partialinterpretation:IntegerElement" name="4" valueSet="true" value="4"/>
-  <newElements xsi:type="partialinterpretation:IntegerElement" name="5" valueSet="true" value="5"/>
-  <partialtypeinterpratation xsi:type="partialinterpretation:PartialBooleanInterpretation" elements="//@newElements.0 //@newElements.1"/>
-  <partialtypeinterpratation xsi:type="partialinterpretation:PartialIntegerInterpretation" elements="//@newElements.2 //@newElements.3 //@newElements.4 //@newElements.5 //@newElements.6"/>
-  <partialtypeinterpratation xsi:type="partialinterpretation:PartialRealInterpretation" elements="//@openWorldElements.0"/>
-  <partialtypeinterpratation xsi:type="partialinterpretation:PartialStringInterpretation" elements="//@openWorldElements.1"/>
-  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.0">
-    <interpretationOf href="outputs/debug/generation.logicproblem#//@types.0"/>
-  </partialtypeinterpratation>
-  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.1">
-    <interpretationOf href="outputs/debug/generation.logicproblem#//@types.1"/>
-  </partialtypeinterpratation>
-  <openWorldElements xsi:type="partialinterpretation:RealElement" name="New Reals"/>
-  <openWorldElements xsi:type="partialinterpretation:StringElement" name="New Strings"/>
-  <openWorldElements name="New Objects"/>
-  <scopes targetTypeInterpretation="//@partialtypeinterpratation.4"/>
-  <scopes targetTypeInterpretation="//@partialtypeinterpratation.5"/>
-</partialinterpretation:PartialInterpretation>
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/log.txt b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/log.txt
deleted file mode 100644
index 67589bd9..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/log.txt
+++ /dev/null
@@ -1 +0,0 @@
-Model generation finished
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/models/1.gml b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/models/1.gml
deleted file mode 100644
index a187635b..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/models/1.gml
+++ /dev/null
@@ -1,916 +0,0 @@
-graph
-[
-        node
-                [
-                        id      0
-                        graphics
-                        [
-                                w       41.800000000000004
-                                h       26
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "true"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      1
-                        graphics
-                        [
-                                w       50.6
-                                h       26
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "false"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      2
-                        graphics
-                        [
-                                w       15.400000000000002
-                                h       26
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "1"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      3
-                        graphics
-                        [
-                                w       15.400000000000002
-                                h       26
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "2"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      4
-                        graphics
-                        [
-                                w       15.400000000000002
-                                h       26
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "3"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      5
-                        graphics
-                        [
-                                w       15.400000000000002
-                                h       26
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "4"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      6
-                        graphics
-                        [
-                                w       15.400000000000002
-                                h       26
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "5"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      7
-                        graphics
-                        [
-                                w       138.60000000000002
-                                h       40
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "null"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        FamilyTree class
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      8
-                        graphics
-                        [
-                                w       107.80000000000001
-                                h       40
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "null"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        Member class
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      9
-                        graphics
-                        [
-                                w       107.80000000000001
-                                h       40
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "null"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        Member class
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      10
-                        graphics
-                        [
-                                w       107.80000000000001
-                                h       40
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "null"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        Member class
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      11
-                        graphics
-                        [
-                                w       107.80000000000001
-                                h       40
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "null"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        Member class
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      12
-                        graphics
-                        [
-                                w       107.80000000000001
-                                h       40
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "null"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        Member class
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      13
-                        graphics
-                        [
-                                w       85.80000000000001
-                                h       26
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "New Reals"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      14
-                        graphics
-                        [
-                                w       103.4
-                                h       26
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "New Strings"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      15
-                        graphics
-                        [
-                                w       103.4
-                                h       26
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "New Objects"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        edge
-        [
-                source  7
-                target  8
-                graphics
-                [
-                        fill    "#000000"
-                        width   3
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "members reference FamilyTree"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  7
-                target  9
-                graphics
-                [
-                        fill    "#000000"
-                        width   3
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "members reference FamilyTree"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  7
-                target  10
-                graphics
-                [
-                        fill    "#000000"
-                        width   3
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "members reference FamilyTree"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  7
-                target  11
-                graphics
-                [
-                        fill    "#000000"
-                        width   3
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "members reference FamilyTree"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  7
-                target  12
-                graphics
-                [
-                        fill    "#000000"
-                        width   3
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "members reference FamilyTree"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  9
-                target  8
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "children reference Member"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  8
-                target  9
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "children reference Member"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  9
-                target  10
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "children reference Member"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  11
-                target  9
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "children reference Member"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  9
-                target  11
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "children reference Member"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  8
-                target  9
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "parents reference Member"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  9
-                target  8
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "parents reference Member"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  10
-                target  9
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "parents reference Member"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  9
-                target  11
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "parents reference Member"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  11
-                target  9
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "parents reference Member"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  8
-                target  6
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "age attribute Member"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  10
-                target  3
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "age attribute Member"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  11
-                target  3
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "age attribute Member"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-]
-
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/models/1.png b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/models/1.png
deleted file mode 100644
index e99dc418..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/models/1.png
+++ /dev/null
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/models/1.xmi b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/models/1.xmi
deleted file mode 100644
index c3ca6161..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/models/1.xmi
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree inputs/familytree.ecore">
-  <members age="2" children="//@members.4" parents="//@members.4"/>
-  <members age="5" children="//@members.4" parents="//@members.4"/>
-  <members age="2" parents="//@members.4"/>
-  <members/>
-  <members children="//@members.0 //@members.1 //@members.2" parents="//@members.0 //@members.1"/>
-</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/.FamilyTreeConstraints.java._trace b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/.FamilyTreeConstraints.java._trace
deleted file mode 100644
index b000501e..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/.FamilyTreeConstraints.java._trace
+++ /dev/null
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/.MemberIsItsOwnParent.java._trace b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/.MemberIsItsOwnParent.java._trace
deleted file mode 100644
index aaf4d0c2..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/.MemberIsItsOwnParent.java._trace
+++ /dev/null
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/.gitignore b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/.gitignore
deleted file mode 100644
index 19bc3cc8..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-/.FamilyTreeConstraints.java._trace
-/.MemberIsItsOwnParent.java._trace
-/FamilyTreeConstraints.java
-/MemberIsItsOwnParent.java
-/.ParentTooYoung.java._trace
-/.MemberHasNoParent.java._trace
-/.MemberHasParent.java._trace
-/.TwoMembersHaveNoParent.java._trace
-/.NegativeAge.java._trace
-/MemberHasParent.java
-/NegativeAge.java
-/ParentTooYoung.java
-/TwoMembersHaveNoParent.java
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/FamilyTreeConstraints.java b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/FamilyTreeConstraints.java
deleted file mode 100644
index 1d991140..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/FamilyTreeConstraints.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * Generated from platform:/resource/case.study.familyTree.run/src/queries/familyTreeConstraints.vql
- */
-package queries;
-
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedPatternGroup;
-import queries.MemberHasParent;
-import queries.MemberIsItsOwnParent;
-import queries.NegativeAge;
-import queries.ParentTooYoung;
-import queries.TwoMembersHaveNoParent;
-
-/**
- * A pattern group formed of all public patterns defined in familyTreeConstraints.vql.
- * 
- * <p>Use the static instance as any {@link interface org.eclipse.viatra.query.runtime.api.IQueryGroup}, to conveniently prepare
- * a VIATRA Query engine for matching all patterns originally defined in file familyTreeConstraints.vql,
- * in order to achieve better performance than one-by-one on-demand matcher initialization.
- * 
- * <p> From package queries, the group contains the definition of the following patterns: <ul>
- * <li>memberIsItsOwnParent</li>
- * <li>twoMembersHaveNoParent</li>
- * <li>memberHasParent</li>
- * <li>negativeAge</li>
- * <li>parentTooYoung</li>
- * </ul>
- * 
- * @see IQueryGroup
- * 
- */
-@SuppressWarnings("all")
-public final class FamilyTreeConstraints extends BaseGeneratedPatternGroup {
-  /**
-   * Access the pattern group.
-   * 
-   * @return the singleton instance of the group
-   * @throws ViatraQueryRuntimeException if there was an error loading the generated code of pattern specifications
-   * 
-   */
-  public static FamilyTreeConstraints instance() {
-    if (INSTANCE == null) {
-        INSTANCE = new FamilyTreeConstraints();
-    }
-    return INSTANCE;
-  }
-  
-  private static FamilyTreeConstraints INSTANCE;
-  
-  private FamilyTreeConstraints() {
-    querySpecifications.add(MemberIsItsOwnParent.instance());
-    querySpecifications.add(TwoMembersHaveNoParent.instance());
-    querySpecifications.add(MemberHasParent.instance());
-    querySpecifications.add(NegativeAge.instance());
-    querySpecifications.add(ParentTooYoung.instance());
-  }
-  
-  public MemberIsItsOwnParent getMemberIsItsOwnParent() {
-    return MemberIsItsOwnParent.instance();
-  }
-  
-  public MemberIsItsOwnParent.Matcher getMemberIsItsOwnParent(final ViatraQueryEngine engine) {
-    return MemberIsItsOwnParent.Matcher.on(engine);
-  }
-  
-  public TwoMembersHaveNoParent getTwoMembersHaveNoParent() {
-    return TwoMembersHaveNoParent.instance();
-  }
-  
-  public TwoMembersHaveNoParent.Matcher getTwoMembersHaveNoParent(final ViatraQueryEngine engine) {
-    return TwoMembersHaveNoParent.Matcher.on(engine);
-  }
-  
-  public MemberHasParent getMemberHasParent() {
-    return MemberHasParent.instance();
-  }
-  
-  public MemberHasParent.Matcher getMemberHasParent(final ViatraQueryEngine engine) {
-    return MemberHasParent.Matcher.on(engine);
-  }
-  
-  public NegativeAge getNegativeAge() {
-    return NegativeAge.instance();
-  }
-  
-  public NegativeAge.Matcher getNegativeAge(final ViatraQueryEngine engine) {
-    return NegativeAge.Matcher.on(engine);
-  }
-  
-  public ParentTooYoung getParentTooYoung() {
-    return ParentTooYoung.instance();
-  }
-  
-  public ParentTooYoung.Matcher getParentTooYoung(final ViatraQueryEngine engine) {
-    return ParentTooYoung.Matcher.on(engine);
-  }
-}
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/MemberHasParent.java b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/MemberHasParent.java
deleted file mode 100644
index 83bb4aac..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/MemberHasParent.java
+++ /dev/null
@@ -1,551 +0,0 @@
-/**
- * Generated from platform:/resource/case.study.familyTree.run/src/queries/familyTreeConstraints.vql
- */
-package queries;
-
-import familytree.Member;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import org.apache.log4j.Logger;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.query.runtime.api.IPatternMatch;
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-
-/**
- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
- * 
- * <p>Original source:
- *         <code><pre>
- *         pattern memberHasParent(m: Member) = {
- *              Member.parents(m, _);
- *         }
- * </pre></code>
- * 
- * @see Matcher
- * @see Match
- * 
- */
-@SuppressWarnings("all")
-public final class MemberHasParent extends BaseGeneratedEMFQuerySpecification<MemberHasParent.Matcher> {
-  /**
-   * Pattern-specific match representation of the queries.memberHasParent pattern,
-   * to be used in conjunction with {@link Matcher}.
-   * 
-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
-   * Each instance is a (possibly partial) substitution of pattern parameters,
-   * usable to represent a match of the pattern in the result of a query,
-   * or to specify the bound (fixed) input parameters when issuing a query.
-   * 
-   * @see Matcher
-   * 
-   */
-  public static abstract class Match extends BasePatternMatch {
-    private Member fM;
-    
-    private static List<String> parameterNames = makeImmutableList("m");
-    
-    private Match(final Member pM) {
-      this.fM = pM;
-    }
-    
-    @Override
-    public Object get(final String parameterName) {
-      switch(parameterName) {
-          case "m": return this.fM;
-          default: return null;
-      }
-    }
-    
-    @Override
-    public Object get(final int index) {
-      switch(index) {
-          case 0: return this.fM;
-          default: return null;
-      }
-    }
-    
-    public Member getM() {
-      return this.fM;
-    }
-    
-    @Override
-    public boolean set(final String parameterName, final Object newValue) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      if ("m".equals(parameterName) ) {
-          this.fM = (Member) newValue;
-          return true;
-      }
-      return false;
-    }
-    
-    public void setM(final Member pM) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      this.fM = pM;
-    }
-    
-    @Override
-    public String patternName() {
-      return "queries.memberHasParent";
-    }
-    
-    @Override
-    public List<String> parameterNames() {
-      return MemberHasParent.Match.parameterNames;
-    }
-    
-    @Override
-    public Object[] toArray() {
-      return new Object[]{fM};
-    }
-    
-    @Override
-    public MemberHasParent.Match toImmutable() {
-      return isMutable() ? newMatch(fM) : this;
-    }
-    
-    @Override
-    public String prettyPrint() {
-      StringBuilder result = new StringBuilder();
-      result.append("\"m\"=" + prettyPrintValue(fM));
-      return result.toString();
-    }
-    
-    @Override
-    public int hashCode() {
-      return Objects.hash(fM);
-    }
-    
-    @Override
-    public boolean equals(final Object obj) {
-      if (this == obj)
-          return true;
-      if (obj == null) {
-          return false;
-      }
-      if ((obj instanceof MemberHasParent.Match)) {
-          MemberHasParent.Match other = (MemberHasParent.Match) obj;
-          return Objects.equals(fM, other.fM);
-      } else {
-          // this should be infrequent
-          if (!(obj instanceof IPatternMatch)) {
-              return false;
-          }
-          IPatternMatch otherSig  = (IPatternMatch) obj;
-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
-      }
-    }
-    
-    @Override
-    public MemberHasParent specification() {
-      return MemberHasParent.instance();
-    }
-    
-    /**
-     * Returns an empty, mutable match.
-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-     * 
-     * @return the empty match.
-     * 
-     */
-    public static MemberHasParent.Match newEmptyMatch() {
-      return new Mutable(null);
-    }
-    
-    /**
-     * Returns a mutable (partial) match.
-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-     * 
-     * @param pM the fixed value of pattern parameter m, or null if not bound.
-     * @return the new, mutable (partial) match object.
-     * 
-     */
-    public static MemberHasParent.Match newMutableMatch(final Member pM) {
-      return new Mutable(pM);
-    }
-    
-    /**
-     * Returns a new (partial) match.
-     * This can be used e.g. to call the matcher with a partial match.
-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-     * @param pM the fixed value of pattern parameter m, or null if not bound.
-     * @return the (partial) match object.
-     * 
-     */
-    public static MemberHasParent.Match newMatch(final Member pM) {
-      return new Immutable(pM);
-    }
-    
-    private static final class Mutable extends MemberHasParent.Match {
-      Mutable(final Member pM) {
-        super(pM);
-      }
-      
-      @Override
-      public boolean isMutable() {
-        return true;
-      }
-    }
-    
-    private static final class Immutable extends MemberHasParent.Match {
-      Immutable(final Member pM) {
-        super(pM);
-      }
-      
-      @Override
-      public boolean isMutable() {
-        return false;
-      }
-    }
-  }
-  
-  /**
-   * Generated pattern matcher API of the queries.memberHasParent pattern,
-   * providing pattern-specific query methods.
-   * 
-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
-   * 
-   * <p>Matches of the pattern will be represented as {@link Match}.
-   * 
-   * <p>Original source:
-   * <code><pre>
-   * pattern memberHasParent(m: Member) = {
-   *    Member.parents(m, _);
-   * }
-   * </pre></code>
-   * 
-   * @see Match
-   * @see MemberHasParent
-   * 
-   */
-  public static class Matcher extends BaseMatcher<MemberHasParent.Match> {
-    /**
-     * Initializes the pattern matcher within an existing VIATRA Query engine.
-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-     * 
-     * @param engine the existing VIATRA Query engine in which this matcher will be created.
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * 
-     */
-    public static MemberHasParent.Matcher on(final ViatraQueryEngine engine) {
-      // check if matcher already exists
-      Matcher matcher = engine.getExistingMatcher(querySpecification());
-      if (matcher == null) {
-          matcher = (Matcher)engine.getMatcher(querySpecification());
-      }
-      return matcher;
-    }
-    
-    /**
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * @return an initialized matcher
-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
-     * 
-     */
-    public static MemberHasParent.Matcher create() {
-      return new Matcher();
-    }
-    
-    private static final int POSITION_M = 0;
-    
-    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(MemberHasParent.Matcher.class);
-    
-    /**
-     * Initializes the pattern matcher within an existing VIATRA Query engine.
-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-     * 
-     * @param engine the existing VIATRA Query engine in which this matcher will be created.
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * 
-     */
-    private Matcher() {
-      super(querySpecification());
-    }
-    
-    /**
-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
-     * @param pM the fixed value of pattern parameter m, or null if not bound.
-     * @return matches represented as a Match object.
-     * 
-     */
-    public Collection<MemberHasParent.Match> getAllMatches(final Member pM) {
-      return rawStreamAllMatches(new Object[]{pM}).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     * @param pM the fixed value of pattern parameter m, or null if not bound.
-     * @return a stream of matches represented as a Match object.
-     * 
-     */
-    public Stream<MemberHasParent.Match> streamAllMatches(final Member pM) {
-      return rawStreamAllMatches(new Object[]{pM});
-    }
-    
-    /**
-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-     * Neither determinism nor randomness of selection is guaranteed.
-     * @param pM the fixed value of pattern parameter m, or null if not bound.
-     * @return a match represented as a Match object, or null if no match is found.
-     * 
-     */
-    public Optional<MemberHasParent.Match> getOneArbitraryMatch(final Member pM) {
-      return rawGetOneArbitraryMatch(new Object[]{pM});
-    }
-    
-    /**
-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
-     * under any possible substitution of the unspecified parameters (if any).
-     * @param pM the fixed value of pattern parameter m, or null if not bound.
-     * @return true if the input is a valid (partial) match of the pattern.
-     * 
-     */
-    public boolean hasMatch(final Member pM) {
-      return rawHasMatch(new Object[]{pM});
-    }
-    
-    /**
-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
-     * @param pM the fixed value of pattern parameter m, or null if not bound.
-     * @return the number of pattern matches found.
-     * 
-     */
-    public int countMatches(final Member pM) {
-      return rawCountMatches(new Object[]{pM});
-    }
-    
-    /**
-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-     * Neither determinism nor randomness of selection is guaranteed.
-     * @param pM the fixed value of pattern parameter m, or null if not bound.
-     * @param processor the action that will process the selected match.
-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
-     * 
-     */
-    public boolean forOneArbitraryMatch(final Member pM, final Consumer<? super MemberHasParent.Match> processor) {
-      return rawForOneArbitraryMatch(new Object[]{pM}, processor);
-    }
-    
-    /**
-     * Returns a new (partial) match.
-     * This can be used e.g. to call the matcher with a partial match.
-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-     * @param pM the fixed value of pattern parameter m, or null if not bound.
-     * @return the (partial) match object.
-     * 
-     */
-    public MemberHasParent.Match newMatch(final Member pM) {
-      return MemberHasParent.Match.newMatch(pM);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for m.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    protected Stream<Member> rawStreamAllValuesOfm(final Object[] parameters) {
-      return rawStreamAllValues(POSITION_M, parameters).map(Member.class::cast);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for m.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<Member> getAllValuesOfm() {
-      return rawStreamAllValuesOfm(emptyArray()).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for m.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<Member> streamAllValuesOfm() {
-      return rawStreamAllValuesOfm(emptyArray());
-    }
-    
-    @Override
-    protected MemberHasParent.Match tupleToMatch(final Tuple t) {
-      try {
-          return MemberHasParent.Match.newMatch((Member) t.get(POSITION_M));
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in tuple not properly typed!",e);
-          return null;
-      }
-    }
-    
-    @Override
-    protected MemberHasParent.Match arrayToMatch(final Object[] match) {
-      try {
-          return MemberHasParent.Match.newMatch((Member) match[POSITION_M]);
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in array not properly typed!",e);
-          return null;
-      }
-    }
-    
-    @Override
-    protected MemberHasParent.Match arrayToMatchMutable(final Object[] match) {
-      try {
-          return MemberHasParent.Match.newMutableMatch((Member) match[POSITION_M]);
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in array not properly typed!",e);
-          return null;
-      }
-    }
-    
-    /**
-     * @return the singleton instance of the query specification of this pattern
-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-     * 
-     */
-    public static IQuerySpecification<MemberHasParent.Matcher> querySpecification() {
-      return MemberHasParent.instance();
-    }
-  }
-  
-  private MemberHasParent() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-   * 
-   */
-  public static MemberHasParent instance() {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  @Override
-  protected MemberHasParent.Matcher instantiate(final ViatraQueryEngine engine) {
-    return MemberHasParent.Matcher.on(engine);
-  }
-  
-  @Override
-  public MemberHasParent.Matcher instantiate() {
-    return MemberHasParent.Matcher.create();
-  }
-  
-  @Override
-  public MemberHasParent.Match newEmptyMatch() {
-    return MemberHasParent.Match.newEmptyMatch();
-  }
-  
-  @Override
-  public MemberHasParent.Match newMatch(final Object... parameters) {
-    return MemberHasParent.Match.newMatch((familytree.Member) parameters[0]);
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link MemberHasParent} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link MemberHasParent#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private static final MemberHasParent INSTANCE = new MemberHasParent();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private static final Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternal();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final MemberHasParent.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_m = new PParameter("m", "familytree.Member", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/familytree", "Member")), PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_m);
-    
-    private GeneratedPQuery() {
-      super(PVisibility.PUBLIC);
-    }
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "queries.memberHasParent";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("m");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() {
-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
-      Set<PBody> bodies = new LinkedHashSet<>();
-      {
-          PBody body = new PBody(this);
-          PVariable var_m = body.getOrCreateVariableByName("m");
-          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_m), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/familytree", "Member")));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_m, parameter_m)
-          ));
-          //    Member.parents(m, _)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_m), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/familytree", "Member")));
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_m, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/familytree", "Member", "parents")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/familytree", "Member")));
-          new Equality(body, var__virtual_0_, var___0_);
-          bodies.add(body);
-      }
-      return bodies;
-    }
-  }
-}
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/MemberIsItsOwnParent.java b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/MemberIsItsOwnParent.java
deleted file mode 100644
index 63cb882d..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/MemberIsItsOwnParent.java
+++ /dev/null
@@ -1,577 +0,0 @@
-/**
- * Generated from platform:/resource/case.study.familyTree.run/src/queries/familyTreeConstraints.vql
- */
-package queries;
-
-import familytree.Member;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import org.apache.log4j.Logger;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.query.runtime.api.IPatternMatch;
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-
-/**
- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
- * 
- * <p>Original source:
- *         <code><pre>
- *         {@literal @}Constraint(message="memberIsItsOwnParent", severity="error", key={m})
- *         pattern memberIsItsOwnParent(m: Member) = {
- *              FamilyTree.members(_, m);
- *              Member.parents(m, p);
- *              m == p;
- *         }
- * </pre></code>
- * 
- * @see Matcher
- * @see Match
- * 
- */
-@SuppressWarnings("all")
-public final class MemberIsItsOwnParent extends BaseGeneratedEMFQuerySpecification<MemberIsItsOwnParent.Matcher> {
-  /**
-   * Pattern-specific match representation of the queries.memberIsItsOwnParent pattern,
-   * to be used in conjunction with {@link Matcher}.
-   * 
-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
-   * Each instance is a (possibly partial) substitution of pattern parameters,
-   * usable to represent a match of the pattern in the result of a query,
-   * or to specify the bound (fixed) input parameters when issuing a query.
-   * 
-   * @see Matcher
-   * 
-   */
-  public static abstract class Match extends BasePatternMatch {
-    private Member fM;
-    
-    private static List<String> parameterNames = makeImmutableList("m");
-    
-    private Match(final Member pM) {
-      this.fM = pM;
-    }
-    
-    @Override
-    public Object get(final String parameterName) {
-      switch(parameterName) {
-          case "m": return this.fM;
-          default: return null;
-      }
-    }
-    
-    @Override
-    public Object get(final int index) {
-      switch(index) {
-          case 0: return this.fM;
-          default: return null;
-      }
-    }
-    
-    public Member getM() {
-      return this.fM;
-    }
-    
-    @Override
-    public boolean set(final String parameterName, final Object newValue) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      if ("m".equals(parameterName) ) {
-          this.fM = (Member) newValue;
-          return true;
-      }
-      return false;
-    }
-    
-    public void setM(final Member pM) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      this.fM = pM;
-    }
-    
-    @Override
-    public String patternName() {
-      return "queries.memberIsItsOwnParent";
-    }
-    
-    @Override
-    public List<String> parameterNames() {
-      return MemberIsItsOwnParent.Match.parameterNames;
-    }
-    
-    @Override
-    public Object[] toArray() {
-      return new Object[]{fM};
-    }
-    
-    @Override
-    public MemberIsItsOwnParent.Match toImmutable() {
-      return isMutable() ? newMatch(fM) : this;
-    }
-    
-    @Override
-    public String prettyPrint() {
-      StringBuilder result = new StringBuilder();
-      result.append("\"m\"=" + prettyPrintValue(fM));
-      return result.toString();
-    }
-    
-    @Override
-    public int hashCode() {
-      return Objects.hash(fM);
-    }
-    
-    @Override
-    public boolean equals(final Object obj) {
-      if (this == obj)
-          return true;
-      if (obj == null) {
-          return false;
-      }
-      if ((obj instanceof MemberIsItsOwnParent.Match)) {
-          MemberIsItsOwnParent.Match other = (MemberIsItsOwnParent.Match) obj;
-          return Objects.equals(fM, other.fM);
-      } else {
-          // this should be infrequent
-          if (!(obj instanceof IPatternMatch)) {
-              return false;
-          }
-          IPatternMatch otherSig  = (IPatternMatch) obj;
-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
-      }
-    }
-    
-    @Override
-    public MemberIsItsOwnParent specification() {
-      return MemberIsItsOwnParent.instance();
-    }
-    
-    /**
-     * Returns an empty, mutable match.
-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-     * 
-     * @return the empty match.
-     * 
-     */
-    public static MemberIsItsOwnParent.Match newEmptyMatch() {
-      return new Mutable(null);
-    }
-    
-    /**
-     * Returns a mutable (partial) match.
-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-     * 
-     * @param pM the fixed value of pattern parameter m, or null if not bound.
-     * @return the new, mutable (partial) match object.
-     * 
-     */
-    public static MemberIsItsOwnParent.Match newMutableMatch(final Member pM) {
-      return new Mutable(pM);
-    }
-    
-    /**
-     * Returns a new (partial) match.
-     * This can be used e.g. to call the matcher with a partial match.
-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-     * @param pM the fixed value of pattern parameter m, or null if not bound.
-     * @return the (partial) match object.
-     * 
-     */
-    public static MemberIsItsOwnParent.Match newMatch(final Member pM) {
-      return new Immutable(pM);
-    }
-    
-    private static final class Mutable extends MemberIsItsOwnParent.Match {
-      Mutable(final Member pM) {
-        super(pM);
-      }
-      
-      @Override
-      public boolean isMutable() {
-        return true;
-      }
-    }
-    
-    private static final class Immutable extends MemberIsItsOwnParent.Match {
-      Immutable(final Member pM) {
-        super(pM);
-      }
-      
-      @Override
-      public boolean isMutable() {
-        return false;
-      }
-    }
-  }
-  
-  /**
-   * Generated pattern matcher API of the queries.memberIsItsOwnParent pattern,
-   * providing pattern-specific query methods.
-   * 
-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
-   * 
-   * <p>Matches of the pattern will be represented as {@link Match}.
-   * 
-   * <p>Original source:
-   * <code><pre>
-   * {@literal @}Constraint(message="memberIsItsOwnParent", severity="error", key={m})
-   * pattern memberIsItsOwnParent(m: Member) = {
-   *    FamilyTree.members(_, m);
-   *    Member.parents(m, p);
-   *    m == p;
-   * }
-   * </pre></code>
-   * 
-   * @see Match
-   * @see MemberIsItsOwnParent
-   * 
-   */
-  public static class Matcher extends BaseMatcher<MemberIsItsOwnParent.Match> {
-    /**
-     * Initializes the pattern matcher within an existing VIATRA Query engine.
-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-     * 
-     * @param engine the existing VIATRA Query engine in which this matcher will be created.
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * 
-     */
-    public static MemberIsItsOwnParent.Matcher on(final ViatraQueryEngine engine) {
-      // check if matcher already exists
-      Matcher matcher = engine.getExistingMatcher(querySpecification());
-      if (matcher == null) {
-          matcher = (Matcher)engine.getMatcher(querySpecification());
-      }
-      return matcher;
-    }
-    
-    /**
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * @return an initialized matcher
-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
-     * 
-     */
-    public static MemberIsItsOwnParent.Matcher create() {
-      return new Matcher();
-    }
-    
-    private static final int POSITION_M = 0;
-    
-    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(MemberIsItsOwnParent.Matcher.class);
-    
-    /**
-     * Initializes the pattern matcher within an existing VIATRA Query engine.
-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-     * 
-     * @param engine the existing VIATRA Query engine in which this matcher will be created.
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * 
-     */
-    private Matcher() {
-      super(querySpecification());
-    }
-    
-    /**
-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
-     * @param pM the fixed value of pattern parameter m, or null if not bound.
-     * @return matches represented as a Match object.
-     * 
-     */
-    public Collection<MemberIsItsOwnParent.Match> getAllMatches(final Member pM) {
-      return rawStreamAllMatches(new Object[]{pM}).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     * @param pM the fixed value of pattern parameter m, or null if not bound.
-     * @return a stream of matches represented as a Match object.
-     * 
-     */
-    public Stream<MemberIsItsOwnParent.Match> streamAllMatches(final Member pM) {
-      return rawStreamAllMatches(new Object[]{pM});
-    }
-    
-    /**
-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-     * Neither determinism nor randomness of selection is guaranteed.
-     * @param pM the fixed value of pattern parameter m, or null if not bound.
-     * @return a match represented as a Match object, or null if no match is found.
-     * 
-     */
-    public Optional<MemberIsItsOwnParent.Match> getOneArbitraryMatch(final Member pM) {
-      return rawGetOneArbitraryMatch(new Object[]{pM});
-    }
-    
-    /**
-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
-     * under any possible substitution of the unspecified parameters (if any).
-     * @param pM the fixed value of pattern parameter m, or null if not bound.
-     * @return true if the input is a valid (partial) match of the pattern.
-     * 
-     */
-    public boolean hasMatch(final Member pM) {
-      return rawHasMatch(new Object[]{pM});
-    }
-    
-    /**
-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
-     * @param pM the fixed value of pattern parameter m, or null if not bound.
-     * @return the number of pattern matches found.
-     * 
-     */
-    public int countMatches(final Member pM) {
-      return rawCountMatches(new Object[]{pM});
-    }
-    
-    /**
-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-     * Neither determinism nor randomness of selection is guaranteed.
-     * @param pM the fixed value of pattern parameter m, or null if not bound.
-     * @param processor the action that will process the selected match.
-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
-     * 
-     */
-    public boolean forOneArbitraryMatch(final Member pM, final Consumer<? super MemberIsItsOwnParent.Match> processor) {
-      return rawForOneArbitraryMatch(new Object[]{pM}, processor);
-    }
-    
-    /**
-     * Returns a new (partial) match.
-     * This can be used e.g. to call the matcher with a partial match.
-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-     * @param pM the fixed value of pattern parameter m, or null if not bound.
-     * @return the (partial) match object.
-     * 
-     */
-    public MemberIsItsOwnParent.Match newMatch(final Member pM) {
-      return MemberIsItsOwnParent.Match.newMatch(pM);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for m.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    protected Stream<Member> rawStreamAllValuesOfm(final Object[] parameters) {
-      return rawStreamAllValues(POSITION_M, parameters).map(Member.class::cast);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for m.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<Member> getAllValuesOfm() {
-      return rawStreamAllValuesOfm(emptyArray()).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for m.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<Member> streamAllValuesOfm() {
-      return rawStreamAllValuesOfm(emptyArray());
-    }
-    
-    @Override
-    protected MemberIsItsOwnParent.Match tupleToMatch(final Tuple t) {
-      try {
-          return MemberIsItsOwnParent.Match.newMatch((Member) t.get(POSITION_M));
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in tuple not properly typed!",e);
-          return null;
-      }
-    }
-    
-    @Override
-    protected MemberIsItsOwnParent.Match arrayToMatch(final Object[] match) {
-      try {
-          return MemberIsItsOwnParent.Match.newMatch((Member) match[POSITION_M]);
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in array not properly typed!",e);
-          return null;
-      }
-    }
-    
-    @Override
-    protected MemberIsItsOwnParent.Match arrayToMatchMutable(final Object[] match) {
-      try {
-          return MemberIsItsOwnParent.Match.newMutableMatch((Member) match[POSITION_M]);
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in array not properly typed!",e);
-          return null;
-      }
-    }
-    
-    /**
-     * @return the singleton instance of the query specification of this pattern
-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-     * 
-     */
-    public static IQuerySpecification<MemberIsItsOwnParent.Matcher> querySpecification() {
-      return MemberIsItsOwnParent.instance();
-    }
-  }
-  
-  private MemberIsItsOwnParent() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-   * 
-   */
-  public static MemberIsItsOwnParent instance() {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  @Override
-  protected MemberIsItsOwnParent.Matcher instantiate(final ViatraQueryEngine engine) {
-    return MemberIsItsOwnParent.Matcher.on(engine);
-  }
-  
-  @Override
-  public MemberIsItsOwnParent.Matcher instantiate() {
-    return MemberIsItsOwnParent.Matcher.create();
-  }
-  
-  @Override
-  public MemberIsItsOwnParent.Match newEmptyMatch() {
-    return MemberIsItsOwnParent.Match.newEmptyMatch();
-  }
-  
-  @Override
-  public MemberIsItsOwnParent.Match newMatch(final Object... parameters) {
-    return MemberIsItsOwnParent.Match.newMatch((familytree.Member) parameters[0]);
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link MemberIsItsOwnParent} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link MemberIsItsOwnParent#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private static final MemberIsItsOwnParent INSTANCE = new MemberIsItsOwnParent();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private static final Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternal();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final MemberIsItsOwnParent.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_m = new PParameter("m", "familytree.Member", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/familytree", "Member")), PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_m);
-    
-    private GeneratedPQuery() {
-      super(PVisibility.PUBLIC);
-    }
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "queries.memberIsItsOwnParent";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("m");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() {
-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
-      Set<PBody> bodies = new LinkedHashSet<>();
-      {
-          PBody body = new PBody(this);
-          PVariable var_m = body.getOrCreateVariableByName("m");
-          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
-          PVariable var_p = body.getOrCreateVariableByName("p");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_m), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/familytree", "Member")));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_m, parameter_m)
-          ));
-          //    FamilyTree.members(_, m)
-          new TypeConstraint(body, Tuples.flatTupleOf(var___0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/familytree", "FamilyTree")));
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var___0_, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/familytree", "FamilyTree", "members")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/familytree", "Member")));
-          new Equality(body, var__virtual_0_, var_m);
-          //    Member.parents(m, p)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_m), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/familytree", "Member")));
-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_m, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/familytree", "Member", "parents")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/familytree", "Member")));
-          new Equality(body, var__virtual_1_, var_p);
-          //    m == p
-          new Equality(body, var_m, var_p);
-          bodies.add(body);
-      }
-      {
-          PAnnotation annotation = new PAnnotation("Constraint");
-          annotation.addAttribute("message", "memberIsItsOwnParent");
-          annotation.addAttribute("severity", "error");
-          annotation.addAttribute("key", Arrays.asList(new Object[] {
-                              new ParameterReference("m")
-                              }));
-          addAnnotation(annotation);
-      }
-      return bodies;
-    }
-  }
-}
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/NegativeAge.java b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/NegativeAge.java
deleted file mode 100644
index 44ae6496..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/NegativeAge.java
+++ /dev/null
@@ -1,593 +0,0 @@
-/**
- * Generated from platform:/resource/case.study.familyTree.run/src/queries/familyTreeConstraints.vql
- */
-package queries;
-
-import familytree.Member;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import org.apache.log4j.Logger;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.viatra.query.runtime.api.IPatternMatch;
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EDataTypeInSlotsKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.IExpressionEvaluator;
-import org.eclipse.viatra.query.runtime.matchers.psystem.IValueProvider;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-
-/**
- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
- * 
- * <p>Original source:
- *         <code><pre>
- *         {@literal @}Constraint(message="negativeAge", severity="error",key={m})
- *         pattern negativeAge(m: Member) {
- *              Member.age(m,mage);
- *              check(mage{@literal <}0);
- *         }
- * </pre></code>
- * 
- * @see Matcher
- * @see Match
- * 
- */
-@SuppressWarnings("all")
-public final class NegativeAge extends BaseGeneratedEMFQuerySpecification<NegativeAge.Matcher> {
-  /**
-   * Pattern-specific match representation of the queries.negativeAge pattern,
-   * to be used in conjunction with {@link Matcher}.
-   * 
-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
-   * Each instance is a (possibly partial) substitution of pattern parameters,
-   * usable to represent a match of the pattern in the result of a query,
-   * or to specify the bound (fixed) input parameters when issuing a query.
-   * 
-   * @see Matcher
-   * 
-   */
-  public static abstract class Match extends BasePatternMatch {
-    private Member fM;
-    
-    private static List<String> parameterNames = makeImmutableList("m");
-    
-    private Match(final Member pM) {
-      this.fM = pM;
-    }
-    
-    @Override
-    public Object get(final String parameterName) {
-      switch(parameterName) {
-          case "m": return this.fM;
-          default: return null;
-      }
-    }
-    
-    @Override
-    public Object get(final int index) {
-      switch(index) {
-          case 0: return this.fM;
-          default: return null;
-      }
-    }
-    
-    public Member getM() {
-      return this.fM;
-    }
-    
-    @Override
-    public boolean set(final String parameterName, final Object newValue) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      if ("m".equals(parameterName) ) {
-          this.fM = (Member) newValue;
-          return true;
-      }
-      return false;
-    }
-    
-    public void setM(final Member pM) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      this.fM = pM;
-    }
-    
-    @Override
-    public String patternName() {
-      return "queries.negativeAge";
-    }
-    
-    @Override
-    public List<String> parameterNames() {
-      return NegativeAge.Match.parameterNames;
-    }
-    
-    @Override
-    public Object[] toArray() {
-      return new Object[]{fM};
-    }
-    
-    @Override
-    public NegativeAge.Match toImmutable() {
-      return isMutable() ? newMatch(fM) : this;
-    }
-    
-    @Override
-    public String prettyPrint() {
-      StringBuilder result = new StringBuilder();
-      result.append("\"m\"=" + prettyPrintValue(fM));
-      return result.toString();
-    }
-    
-    @Override
-    public int hashCode() {
-      return Objects.hash(fM);
-    }
-    
-    @Override
-    public boolean equals(final Object obj) {
-      if (this == obj)
-          return true;
-      if (obj == null) {
-          return false;
-      }
-      if ((obj instanceof NegativeAge.Match)) {
-          NegativeAge.Match other = (NegativeAge.Match) obj;
-          return Objects.equals(fM, other.fM);
-      } else {
-          // this should be infrequent
-          if (!(obj instanceof IPatternMatch)) {
-              return false;
-          }
-          IPatternMatch otherSig  = (IPatternMatch) obj;
-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
-      }
-    }
-    
-    @Override
-    public NegativeAge specification() {
-      return NegativeAge.instance();
-    }
-    
-    /**
-     * Returns an empty, mutable match.
-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-     * 
-     * @return the empty match.
-     * 
-     */
-    public static NegativeAge.Match newEmptyMatch() {
-      return new Mutable(null);
-    }
-    
-    /**
-     * Returns a mutable (partial) match.
-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-     * 
-     * @param pM the fixed value of pattern parameter m, or null if not bound.
-     * @return the new, mutable (partial) match object.
-     * 
-     */
-    public static NegativeAge.Match newMutableMatch(final Member pM) {
-      return new Mutable(pM);
-    }
-    
-    /**
-     * Returns a new (partial) match.
-     * This can be used e.g. to call the matcher with a partial match.
-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-     * @param pM the fixed value of pattern parameter m, or null if not bound.
-     * @return the (partial) match object.
-     * 
-     */
-    public static NegativeAge.Match newMatch(final Member pM) {
-      return new Immutable(pM);
-    }
-    
-    private static final class Mutable extends NegativeAge.Match {
-      Mutable(final Member pM) {
-        super(pM);
-      }
-      
-      @Override
-      public boolean isMutable() {
-        return true;
-      }
-    }
-    
-    private static final class Immutable extends NegativeAge.Match {
-      Immutable(final Member pM) {
-        super(pM);
-      }
-      
-      @Override
-      public boolean isMutable() {
-        return false;
-      }
-    }
-  }
-  
-  /**
-   * Generated pattern matcher API of the queries.negativeAge pattern,
-   * providing pattern-specific query methods.
-   * 
-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
-   * 
-   * <p>Matches of the pattern will be represented as {@link Match}.
-   * 
-   * <p>Original source:
-   * <code><pre>
-   * {@literal @}Constraint(message="negativeAge", severity="error",key={m})
-   * pattern negativeAge(m: Member) {
-   *    Member.age(m,mage);
-   *    check(mage{@literal <}0);
-   * }
-   * </pre></code>
-   * 
-   * @see Match
-   * @see NegativeAge
-   * 
-   */
-  public static class Matcher extends BaseMatcher<NegativeAge.Match> {
-    /**
-     * Initializes the pattern matcher within an existing VIATRA Query engine.
-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-     * 
-     * @param engine the existing VIATRA Query engine in which this matcher will be created.
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * 
-     */
-    public static NegativeAge.Matcher on(final ViatraQueryEngine engine) {
-      // check if matcher already exists
-      Matcher matcher = engine.getExistingMatcher(querySpecification());
-      if (matcher == null) {
-          matcher = (Matcher)engine.getMatcher(querySpecification());
-      }
-      return matcher;
-    }
-    
-    /**
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * @return an initialized matcher
-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
-     * 
-     */
-    public static NegativeAge.Matcher create() {
-      return new Matcher();
-    }
-    
-    private static final int POSITION_M = 0;
-    
-    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(NegativeAge.Matcher.class);
-    
-    /**
-     * Initializes the pattern matcher within an existing VIATRA Query engine.
-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-     * 
-     * @param engine the existing VIATRA Query engine in which this matcher will be created.
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * 
-     */
-    private Matcher() {
-      super(querySpecification());
-    }
-    
-    /**
-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
-     * @param pM the fixed value of pattern parameter m, or null if not bound.
-     * @return matches represented as a Match object.
-     * 
-     */
-    public Collection<NegativeAge.Match> getAllMatches(final Member pM) {
-      return rawStreamAllMatches(new Object[]{pM}).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     * @param pM the fixed value of pattern parameter m, or null if not bound.
-     * @return a stream of matches represented as a Match object.
-     * 
-     */
-    public Stream<NegativeAge.Match> streamAllMatches(final Member pM) {
-      return rawStreamAllMatches(new Object[]{pM});
-    }
-    
-    /**
-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-     * Neither determinism nor randomness of selection is guaranteed.
-     * @param pM the fixed value of pattern parameter m, or null if not bound.
-     * @return a match represented as a Match object, or null if no match is found.
-     * 
-     */
-    public Optional<NegativeAge.Match> getOneArbitraryMatch(final Member pM) {
-      return rawGetOneArbitraryMatch(new Object[]{pM});
-    }
-    
-    /**
-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
-     * under any possible substitution of the unspecified parameters (if any).
-     * @param pM the fixed value of pattern parameter m, or null if not bound.
-     * @return true if the input is a valid (partial) match of the pattern.
-     * 
-     */
-    public boolean hasMatch(final Member pM) {
-      return rawHasMatch(new Object[]{pM});
-    }
-    
-    /**
-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
-     * @param pM the fixed value of pattern parameter m, or null if not bound.
-     * @return the number of pattern matches found.
-     * 
-     */
-    public int countMatches(final Member pM) {
-      return rawCountMatches(new Object[]{pM});
-    }
-    
-    /**
-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-     * Neither determinism nor randomness of selection is guaranteed.
-     * @param pM the fixed value of pattern parameter m, or null if not bound.
-     * @param processor the action that will process the selected match.
-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
-     * 
-     */
-    public boolean forOneArbitraryMatch(final Member pM, final Consumer<? super NegativeAge.Match> processor) {
-      return rawForOneArbitraryMatch(new Object[]{pM}, processor);
-    }
-    
-    /**
-     * Returns a new (partial) match.
-     * This can be used e.g. to call the matcher with a partial match.
-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-     * @param pM the fixed value of pattern parameter m, or null if not bound.
-     * @return the (partial) match object.
-     * 
-     */
-    public NegativeAge.Match newMatch(final Member pM) {
-      return NegativeAge.Match.newMatch(pM);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for m.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    protected Stream<Member> rawStreamAllValuesOfm(final Object[] parameters) {
-      return rawStreamAllValues(POSITION_M, parameters).map(Member.class::cast);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for m.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<Member> getAllValuesOfm() {
-      return rawStreamAllValuesOfm(emptyArray()).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for m.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<Member> streamAllValuesOfm() {
-      return rawStreamAllValuesOfm(emptyArray());
-    }
-    
-    @Override
-    protected NegativeAge.Match tupleToMatch(final Tuple t) {
-      try {
-          return NegativeAge.Match.newMatch((Member) t.get(POSITION_M));
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in tuple not properly typed!",e);
-          return null;
-      }
-    }
-    
-    @Override
-    protected NegativeAge.Match arrayToMatch(final Object[] match) {
-      try {
-          return NegativeAge.Match.newMatch((Member) match[POSITION_M]);
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in array not properly typed!",e);
-          return null;
-      }
-    }
-    
-    @Override
-    protected NegativeAge.Match arrayToMatchMutable(final Object[] match) {
-      try {
-          return NegativeAge.Match.newMutableMatch((Member) match[POSITION_M]);
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in array not properly typed!",e);
-          return null;
-      }
-    }
-    
-    /**
-     * @return the singleton instance of the query specification of this pattern
-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-     * 
-     */
-    public static IQuerySpecification<NegativeAge.Matcher> querySpecification() {
-      return NegativeAge.instance();
-    }
-  }
-  
-  private NegativeAge() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-   * 
-   */
-  public static NegativeAge instance() {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  @Override
-  protected NegativeAge.Matcher instantiate(final ViatraQueryEngine engine) {
-    return NegativeAge.Matcher.on(engine);
-  }
-  
-  @Override
-  public NegativeAge.Matcher instantiate() {
-    return NegativeAge.Matcher.create();
-  }
-  
-  @Override
-  public NegativeAge.Match newEmptyMatch() {
-    return NegativeAge.Match.newEmptyMatch();
-  }
-  
-  @Override
-  public NegativeAge.Match newMatch(final Object... parameters) {
-    return NegativeAge.Match.newMatch((familytree.Member) parameters[0]);
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link NegativeAge} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link NegativeAge#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private static final NegativeAge INSTANCE = new NegativeAge();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private static final Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternal();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final NegativeAge.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_m = new PParameter("m", "familytree.Member", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/familytree", "Member")), PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_m);
-    
-    private GeneratedPQuery() {
-      super(PVisibility.PUBLIC);
-    }
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "queries.negativeAge";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("m");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() {
-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
-      Set<PBody> bodies = new LinkedHashSet<>();
-      {
-          PBody body = new PBody(this);
-          PVariable var_m = body.getOrCreateVariableByName("m");
-          PVariable var_mage = body.getOrCreateVariableByName("mage");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_m), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/familytree", "Member")));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_m, parameter_m)
-          ));
-          //    Member.age(m,mage)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_m), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/familytree", "Member")));
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_m, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/familytree", "Member", "age")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EInt")));
-          new Equality(body, var__virtual_0_, var_mage);
-          //    check(mage<0)
-          new ExpressionEvaluation(body, new IExpressionEvaluator() {
-          
-              @Override
-              public String getShortDescription() {
-                  return "Expression evaluation from pattern negativeAge";
-              }
-              
-              @Override
-              public Iterable<String> getInputParameterNames() {
-                  return Arrays.asList("mage");}
-          
-              @Override
-              public Object evaluateExpression(IValueProvider provider) throws Exception {
-                  Integer mage = (Integer) provider.getValue("mage");
-                  return evaluateExpression_1_1(mage);
-              }
-          },  null); 
-          bodies.add(body);
-      }
-      {
-          PAnnotation annotation = new PAnnotation("Constraint");
-          annotation.addAttribute("message", "negativeAge");
-          annotation.addAttribute("severity", "error");
-          annotation.addAttribute("key", Arrays.asList(new Object[] {
-                              new ParameterReference("m")
-                              }));
-          addAnnotation(annotation);
-      }
-      return bodies;
-    }
-  }
-  
-  private static boolean evaluateExpression_1_1(final Integer mage) {
-    return ((mage).intValue() < 0);
-  }
-}
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/ParentTooYoung.java b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/ParentTooYoung.java
deleted file mode 100644
index 5ed9df5e..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/ParentTooYoung.java
+++ /dev/null
@@ -1,775 +0,0 @@
-/**
- * Generated from platform:/resource/case.study.familyTree.run/src/queries/familyTreeConstraints.vql
- */
-package queries;
-
-import familytree.Member;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import org.apache.log4j.Logger;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.viatra.query.runtime.api.IPatternMatch;
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EDataTypeInSlotsKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.IExpressionEvaluator;
-import org.eclipse.viatra.query.runtime.matchers.psystem.IValueProvider;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-
-/**
- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
- * 
- * <p>Original source:
- *         <code><pre>
- *         {@literal @}Constraint(message="parentTooYoung", severity="error", key={c, p})
- *         pattern parentTooYoung(c: Member, p: Member) = {
- *              FamilyTree.members(_, c);
- *              Member.parents(c, p);
- *              Member.age(c, cAge);
- *              Member.age(p, pAge);
- *              check (pAge {@literal <}= (cAge + 12));
- *         }
- * </pre></code>
- * 
- * @see Matcher
- * @see Match
- * 
- */
-@SuppressWarnings("all")
-public final class ParentTooYoung extends BaseGeneratedEMFQuerySpecification<ParentTooYoung.Matcher> {
-  /**
-   * Pattern-specific match representation of the queries.parentTooYoung pattern,
-   * to be used in conjunction with {@link Matcher}.
-   * 
-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
-   * Each instance is a (possibly partial) substitution of pattern parameters,
-   * usable to represent a match of the pattern in the result of a query,
-   * or to specify the bound (fixed) input parameters when issuing a query.
-   * 
-   * @see Matcher
-   * 
-   */
-  public static abstract class Match extends BasePatternMatch {
-    private Member fC;
-    
-    private Member fP;
-    
-    private static List<String> parameterNames = makeImmutableList("c", "p");
-    
-    private Match(final Member pC, final Member pP) {
-      this.fC = pC;
-      this.fP = pP;
-    }
-    
-    @Override
-    public Object get(final String parameterName) {
-      switch(parameterName) {
-          case "c": return this.fC;
-          case "p": return this.fP;
-          default: return null;
-      }
-    }
-    
-    @Override
-    public Object get(final int index) {
-      switch(index) {
-          case 0: return this.fC;
-          case 1: return this.fP;
-          default: return null;
-      }
-    }
-    
-    public Member getC() {
-      return this.fC;
-    }
-    
-    public Member getP() {
-      return this.fP;
-    }
-    
-    @Override
-    public boolean set(final String parameterName, final Object newValue) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      if ("c".equals(parameterName) ) {
-          this.fC = (Member) newValue;
-          return true;
-      }
-      if ("p".equals(parameterName) ) {
-          this.fP = (Member) newValue;
-          return true;
-      }
-      return false;
-    }
-    
-    public void setC(final Member pC) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      this.fC = pC;
-    }
-    
-    public void setP(final Member pP) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      this.fP = pP;
-    }
-    
-    @Override
-    public String patternName() {
-      return "queries.parentTooYoung";
-    }
-    
-    @Override
-    public List<String> parameterNames() {
-      return ParentTooYoung.Match.parameterNames;
-    }
-    
-    @Override
-    public Object[] toArray() {
-      return new Object[]{fC, fP};
-    }
-    
-    @Override
-    public ParentTooYoung.Match toImmutable() {
-      return isMutable() ? newMatch(fC, fP) : this;
-    }
-    
-    @Override
-    public String prettyPrint() {
-      StringBuilder result = new StringBuilder();
-      result.append("\"c\"=" + prettyPrintValue(fC) + ", ");
-      result.append("\"p\"=" + prettyPrintValue(fP));
-      return result.toString();
-    }
-    
-    @Override
-    public int hashCode() {
-      return Objects.hash(fC, fP);
-    }
-    
-    @Override
-    public boolean equals(final Object obj) {
-      if (this == obj)
-          return true;
-      if (obj == null) {
-          return false;
-      }
-      if ((obj instanceof ParentTooYoung.Match)) {
-          ParentTooYoung.Match other = (ParentTooYoung.Match) obj;
-          return Objects.equals(fC, other.fC) && Objects.equals(fP, other.fP);
-      } else {
-          // this should be infrequent
-          if (!(obj instanceof IPatternMatch)) {
-              return false;
-          }
-          IPatternMatch otherSig  = (IPatternMatch) obj;
-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
-      }
-    }
-    
-    @Override
-    public ParentTooYoung specification() {
-      return ParentTooYoung.instance();
-    }
-    
-    /**
-     * Returns an empty, mutable match.
-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-     * 
-     * @return the empty match.
-     * 
-     */
-    public static ParentTooYoung.Match newEmptyMatch() {
-      return new Mutable(null, null);
-    }
-    
-    /**
-     * Returns a mutable (partial) match.
-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-     * 
-     * @param pC the fixed value of pattern parameter c, or null if not bound.
-     * @param pP the fixed value of pattern parameter p, or null if not bound.
-     * @return the new, mutable (partial) match object.
-     * 
-     */
-    public static ParentTooYoung.Match newMutableMatch(final Member pC, final Member pP) {
-      return new Mutable(pC, pP);
-    }
-    
-    /**
-     * Returns a new (partial) match.
-     * This can be used e.g. to call the matcher with a partial match.
-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-     * @param pC the fixed value of pattern parameter c, or null if not bound.
-     * @param pP the fixed value of pattern parameter p, or null if not bound.
-     * @return the (partial) match object.
-     * 
-     */
-    public static ParentTooYoung.Match newMatch(final Member pC, final Member pP) {
-      return new Immutable(pC, pP);
-    }
-    
-    private static final class Mutable extends ParentTooYoung.Match {
-      Mutable(final Member pC, final Member pP) {
-        super(pC, pP);
-      }
-      
-      @Override
-      public boolean isMutable() {
-        return true;
-      }
-    }
-    
-    private static final class Immutable extends ParentTooYoung.Match {
-      Immutable(final Member pC, final Member pP) {
-        super(pC, pP);
-      }
-      
-      @Override
-      public boolean isMutable() {
-        return false;
-      }
-    }
-  }
-  
-  /**
-   * Generated pattern matcher API of the queries.parentTooYoung pattern,
-   * providing pattern-specific query methods.
-   * 
-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
-   * 
-   * <p>Matches of the pattern will be represented as {@link Match}.
-   * 
-   * <p>Original source:
-   * <code><pre>
-   * {@literal @}Constraint(message="parentTooYoung", severity="error", key={c, p})
-   * pattern parentTooYoung(c: Member, p: Member) = {
-   *    FamilyTree.members(_, c);
-   *    Member.parents(c, p);
-   *    Member.age(c, cAge);
-   *    Member.age(p, pAge);
-   *    check (pAge {@literal <}= (cAge + 12));
-   * }
-   * </pre></code>
-   * 
-   * @see Match
-   * @see ParentTooYoung
-   * 
-   */
-  public static class Matcher extends BaseMatcher<ParentTooYoung.Match> {
-    /**
-     * Initializes the pattern matcher within an existing VIATRA Query engine.
-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-     * 
-     * @param engine the existing VIATRA Query engine in which this matcher will be created.
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * 
-     */
-    public static ParentTooYoung.Matcher on(final ViatraQueryEngine engine) {
-      // check if matcher already exists
-      Matcher matcher = engine.getExistingMatcher(querySpecification());
-      if (matcher == null) {
-          matcher = (Matcher)engine.getMatcher(querySpecification());
-      }
-      return matcher;
-    }
-    
-    /**
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * @return an initialized matcher
-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
-     * 
-     */
-    public static ParentTooYoung.Matcher create() {
-      return new Matcher();
-    }
-    
-    private static final int POSITION_C = 0;
-    
-    private static final int POSITION_P = 1;
-    
-    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(ParentTooYoung.Matcher.class);
-    
-    /**
-     * Initializes the pattern matcher within an existing VIATRA Query engine.
-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-     * 
-     * @param engine the existing VIATRA Query engine in which this matcher will be created.
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * 
-     */
-    private Matcher() {
-      super(querySpecification());
-    }
-    
-    /**
-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
-     * @param pC the fixed value of pattern parameter c, or null if not bound.
-     * @param pP the fixed value of pattern parameter p, or null if not bound.
-     * @return matches represented as a Match object.
-     * 
-     */
-    public Collection<ParentTooYoung.Match> getAllMatches(final Member pC, final Member pP) {
-      return rawStreamAllMatches(new Object[]{pC, pP}).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     * @param pC the fixed value of pattern parameter c, or null if not bound.
-     * @param pP the fixed value of pattern parameter p, or null if not bound.
-     * @return a stream of matches represented as a Match object.
-     * 
-     */
-    public Stream<ParentTooYoung.Match> streamAllMatches(final Member pC, final Member pP) {
-      return rawStreamAllMatches(new Object[]{pC, pP});
-    }
-    
-    /**
-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-     * Neither determinism nor randomness of selection is guaranteed.
-     * @param pC the fixed value of pattern parameter c, or null if not bound.
-     * @param pP the fixed value of pattern parameter p, or null if not bound.
-     * @return a match represented as a Match object, or null if no match is found.
-     * 
-     */
-    public Optional<ParentTooYoung.Match> getOneArbitraryMatch(final Member pC, final Member pP) {
-      return rawGetOneArbitraryMatch(new Object[]{pC, pP});
-    }
-    
-    /**
-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
-     * under any possible substitution of the unspecified parameters (if any).
-     * @param pC the fixed value of pattern parameter c, or null if not bound.
-     * @param pP the fixed value of pattern parameter p, or null if not bound.
-     * @return true if the input is a valid (partial) match of the pattern.
-     * 
-     */
-    public boolean hasMatch(final Member pC, final Member pP) {
-      return rawHasMatch(new Object[]{pC, pP});
-    }
-    
-    /**
-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
-     * @param pC the fixed value of pattern parameter c, or null if not bound.
-     * @param pP the fixed value of pattern parameter p, or null if not bound.
-     * @return the number of pattern matches found.
-     * 
-     */
-    public int countMatches(final Member pC, final Member pP) {
-      return rawCountMatches(new Object[]{pC, pP});
-    }
-    
-    /**
-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-     * Neither determinism nor randomness of selection is guaranteed.
-     * @param pC the fixed value of pattern parameter c, or null if not bound.
-     * @param pP the fixed value of pattern parameter p, or null if not bound.
-     * @param processor the action that will process the selected match.
-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
-     * 
-     */
-    public boolean forOneArbitraryMatch(final Member pC, final Member pP, final Consumer<? super ParentTooYoung.Match> processor) {
-      return rawForOneArbitraryMatch(new Object[]{pC, pP}, processor);
-    }
-    
-    /**
-     * Returns a new (partial) match.
-     * This can be used e.g. to call the matcher with a partial match.
-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-     * @param pC the fixed value of pattern parameter c, or null if not bound.
-     * @param pP the fixed value of pattern parameter p, or null if not bound.
-     * @return the (partial) match object.
-     * 
-     */
-    public ParentTooYoung.Match newMatch(final Member pC, final Member pP) {
-      return ParentTooYoung.Match.newMatch(pC, pP);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for c.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    protected Stream<Member> rawStreamAllValuesOfc(final Object[] parameters) {
-      return rawStreamAllValues(POSITION_C, parameters).map(Member.class::cast);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for c.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<Member> getAllValuesOfc() {
-      return rawStreamAllValuesOfc(emptyArray()).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for c.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<Member> streamAllValuesOfc() {
-      return rawStreamAllValuesOfc(emptyArray());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for c.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     *      
-     * @return the Stream of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<Member> streamAllValuesOfc(final ParentTooYoung.Match partialMatch) {
-      return rawStreamAllValuesOfc(partialMatch.toArray());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for c.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     *      
-     * @return the Stream of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<Member> streamAllValuesOfc(final Member pP) {
-      return rawStreamAllValuesOfc(new Object[]{null, pP});
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for c.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<Member> getAllValuesOfc(final ParentTooYoung.Match partialMatch) {
-      return rawStreamAllValuesOfc(partialMatch.toArray()).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for c.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<Member> getAllValuesOfc(final Member pP) {
-      return rawStreamAllValuesOfc(new Object[]{null, pP}).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for p.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    protected Stream<Member> rawStreamAllValuesOfp(final Object[] parameters) {
-      return rawStreamAllValues(POSITION_P, parameters).map(Member.class::cast);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for p.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<Member> getAllValuesOfp() {
-      return rawStreamAllValuesOfp(emptyArray()).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for p.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<Member> streamAllValuesOfp() {
-      return rawStreamAllValuesOfp(emptyArray());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for p.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     *      
-     * @return the Stream of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<Member> streamAllValuesOfp(final ParentTooYoung.Match partialMatch) {
-      return rawStreamAllValuesOfp(partialMatch.toArray());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for p.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     *      
-     * @return the Stream of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<Member> streamAllValuesOfp(final Member pC) {
-      return rawStreamAllValuesOfp(new Object[]{pC, null});
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for p.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<Member> getAllValuesOfp(final ParentTooYoung.Match partialMatch) {
-      return rawStreamAllValuesOfp(partialMatch.toArray()).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for p.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<Member> getAllValuesOfp(final Member pC) {
-      return rawStreamAllValuesOfp(new Object[]{pC, null}).collect(Collectors.toSet());
-    }
-    
-    @Override
-    protected ParentTooYoung.Match tupleToMatch(final Tuple t) {
-      try {
-          return ParentTooYoung.Match.newMatch((Member) t.get(POSITION_C), (Member) t.get(POSITION_P));
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in tuple not properly typed!",e);
-          return null;
-      }
-    }
-    
-    @Override
-    protected ParentTooYoung.Match arrayToMatch(final Object[] match) {
-      try {
-          return ParentTooYoung.Match.newMatch((Member) match[POSITION_C], (Member) match[POSITION_P]);
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in array not properly typed!",e);
-          return null;
-      }
-    }
-    
-    @Override
-    protected ParentTooYoung.Match arrayToMatchMutable(final Object[] match) {
-      try {
-          return ParentTooYoung.Match.newMutableMatch((Member) match[POSITION_C], (Member) match[POSITION_P]);
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in array not properly typed!",e);
-          return null;
-      }
-    }
-    
-    /**
-     * @return the singleton instance of the query specification of this pattern
-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-     * 
-     */
-    public static IQuerySpecification<ParentTooYoung.Matcher> querySpecification() {
-      return ParentTooYoung.instance();
-    }
-  }
-  
-  private ParentTooYoung() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-   * 
-   */
-  public static ParentTooYoung instance() {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  @Override
-  protected ParentTooYoung.Matcher instantiate(final ViatraQueryEngine engine) {
-    return ParentTooYoung.Matcher.on(engine);
-  }
-  
-  @Override
-  public ParentTooYoung.Matcher instantiate() {
-    return ParentTooYoung.Matcher.create();
-  }
-  
-  @Override
-  public ParentTooYoung.Match newEmptyMatch() {
-    return ParentTooYoung.Match.newEmptyMatch();
-  }
-  
-  @Override
-  public ParentTooYoung.Match newMatch(final Object... parameters) {
-    return ParentTooYoung.Match.newMatch((familytree.Member) parameters[0], (familytree.Member) parameters[1]);
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link ParentTooYoung} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link ParentTooYoung#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private static final ParentTooYoung INSTANCE = new ParentTooYoung();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private static final Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternal();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final ParentTooYoung.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_c = new PParameter("c", "familytree.Member", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/familytree", "Member")), PParameterDirection.INOUT);
-    
-    private final PParameter parameter_p = new PParameter("p", "familytree.Member", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/familytree", "Member")), PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_c, parameter_p);
-    
-    private GeneratedPQuery() {
-      super(PVisibility.PUBLIC);
-    }
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "queries.parentTooYoung";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("c","p");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() {
-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
-      Set<PBody> bodies = new LinkedHashSet<>();
-      {
-          PBody body = new PBody(this);
-          PVariable var_c = body.getOrCreateVariableByName("c");
-          PVariable var_p = body.getOrCreateVariableByName("p");
-          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
-          PVariable var_cAge = body.getOrCreateVariableByName("cAge");
-          PVariable var_pAge = body.getOrCreateVariableByName("pAge");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_c), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/familytree", "Member")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var_p), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/familytree", "Member")));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_c, parameter_c),
-             new ExportedParameter(body, var_p, parameter_p)
-          ));
-          //    FamilyTree.members(_, c)
-          new TypeConstraint(body, Tuples.flatTupleOf(var___0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/familytree", "FamilyTree")));
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var___0_, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/familytree", "FamilyTree", "members")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/familytree", "Member")));
-          new Equality(body, var__virtual_0_, var_c);
-          //    Member.parents(c, p)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_c), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/familytree", "Member")));
-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_c, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/familytree", "Member", "parents")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/familytree", "Member")));
-          new Equality(body, var__virtual_1_, var_p);
-          //    Member.age(c, cAge)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_c), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/familytree", "Member")));
-          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_c, var__virtual_2_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/familytree", "Member", "age")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EInt")));
-          new Equality(body, var__virtual_2_, var_cAge);
-          //    Member.age(p, pAge)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_p), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/familytree", "Member")));
-          PVariable var__virtual_3_ = body.getOrCreateVariableByName(".virtual{3}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_p, var__virtual_3_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/familytree", "Member", "age")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_3_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EInt")));
-          new Equality(body, var__virtual_3_, var_pAge);
-          //    check (pAge <= (cAge + 12))
-          new ExpressionEvaluation(body, new IExpressionEvaluator() {
-          
-              @Override
-              public String getShortDescription() {
-                  return "Expression evaluation from pattern parentTooYoung";
-              }
-              
-              @Override
-              public Iterable<String> getInputParameterNames() {
-                  return Arrays.asList("cAge", "pAge");}
-          
-              @Override
-              public Object evaluateExpression(IValueProvider provider) throws Exception {
-                  Integer cAge = (Integer) provider.getValue("cAge");
-                  Integer pAge = (Integer) provider.getValue("pAge");
-                  return evaluateExpression_1_1(cAge, pAge);
-              }
-          },  null); 
-          bodies.add(body);
-      }
-      {
-          PAnnotation annotation = new PAnnotation("Constraint");
-          annotation.addAttribute("message", "parentTooYoung");
-          annotation.addAttribute("severity", "error");
-          annotation.addAttribute("key", Arrays.asList(new Object[] {
-                              new ParameterReference("c"), 
-                              new ParameterReference("p")
-                              }));
-          addAnnotation(annotation);
-      }
-      return bodies;
-    }
-  }
-  
-  private static boolean evaluateExpression_1_1(final Integer cAge, final Integer pAge) {
-    return ((pAge).intValue() <= ((cAge).intValue() + 12));
-  }
-}
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/TwoMembersHaveNoParent.java b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/TwoMembersHaveNoParent.java
deleted file mode 100644
index 365939dd..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/TwoMembersHaveNoParent.java
+++ /dev/null
@@ -1,723 +0,0 @@
-/**
- * Generated from platform:/resource/case.study.familyTree.run/src/queries/familyTreeConstraints.vql
- */
-package queries;
-
-import familytree.Member;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import org.apache.log4j.Logger;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.query.runtime.api.IPatternMatch;
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Inequality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import queries.MemberHasParent;
-
-/**
- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
- * 
- * <p>Original source:
- *         <code><pre>
- *         {@literal @}Constraint(message="twoMembersHaveNoParent", severity="error", key={m1, m2})
- *         pattern twoMembersHaveNoParent(m1:Member, m2:Member) = {
- *              neg find memberHasParent(m1);
- *              neg find memberHasParent(m2);
- *              m1 != m2;
- *         }
- * </pre></code>
- * 
- * @see Matcher
- * @see Match
- * 
- */
-@SuppressWarnings("all")
-public final class TwoMembersHaveNoParent extends BaseGeneratedEMFQuerySpecification<TwoMembersHaveNoParent.Matcher> {
-  /**
-   * Pattern-specific match representation of the queries.twoMembersHaveNoParent pattern,
-   * to be used in conjunction with {@link Matcher}.
-   * 
-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
-   * Each instance is a (possibly partial) substitution of pattern parameters,
-   * usable to represent a match of the pattern in the result of a query,
-   * or to specify the bound (fixed) input parameters when issuing a query.
-   * 
-   * @see Matcher
-   * 
-   */
-  public static abstract class Match extends BasePatternMatch {
-    private Member fM1;
-    
-    private Member fM2;
-    
-    private static List<String> parameterNames = makeImmutableList("m1", "m2");
-    
-    private Match(final Member pM1, final Member pM2) {
-      this.fM1 = pM1;
-      this.fM2 = pM2;
-    }
-    
-    @Override
-    public Object get(final String parameterName) {
-      switch(parameterName) {
-          case "m1": return this.fM1;
-          case "m2": return this.fM2;
-          default: return null;
-      }
-    }
-    
-    @Override
-    public Object get(final int index) {
-      switch(index) {
-          case 0: return this.fM1;
-          case 1: return this.fM2;
-          default: return null;
-      }
-    }
-    
-    public Member getM1() {
-      return this.fM1;
-    }
-    
-    public Member getM2() {
-      return this.fM2;
-    }
-    
-    @Override
-    public boolean set(final String parameterName, final Object newValue) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      if ("m1".equals(parameterName) ) {
-          this.fM1 = (Member) newValue;
-          return true;
-      }
-      if ("m2".equals(parameterName) ) {
-          this.fM2 = (Member) newValue;
-          return true;
-      }
-      return false;
-    }
-    
-    public void setM1(final Member pM1) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      this.fM1 = pM1;
-    }
-    
-    public void setM2(final Member pM2) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      this.fM2 = pM2;
-    }
-    
-    @Override
-    public String patternName() {
-      return "queries.twoMembersHaveNoParent";
-    }
-    
-    @Override
-    public List<String> parameterNames() {
-      return TwoMembersHaveNoParent.Match.parameterNames;
-    }
-    
-    @Override
-    public Object[] toArray() {
-      return new Object[]{fM1, fM2};
-    }
-    
-    @Override
-    public TwoMembersHaveNoParent.Match toImmutable() {
-      return isMutable() ? newMatch(fM1, fM2) : this;
-    }
-    
-    @Override
-    public String prettyPrint() {
-      StringBuilder result = new StringBuilder();
-      result.append("\"m1\"=" + prettyPrintValue(fM1) + ", ");
-      result.append("\"m2\"=" + prettyPrintValue(fM2));
-      return result.toString();
-    }
-    
-    @Override
-    public int hashCode() {
-      return Objects.hash(fM1, fM2);
-    }
-    
-    @Override
-    public boolean equals(final Object obj) {
-      if (this == obj)
-          return true;
-      if (obj == null) {
-          return false;
-      }
-      if ((obj instanceof TwoMembersHaveNoParent.Match)) {
-          TwoMembersHaveNoParent.Match other = (TwoMembersHaveNoParent.Match) obj;
-          return Objects.equals(fM1, other.fM1) && Objects.equals(fM2, other.fM2);
-      } else {
-          // this should be infrequent
-          if (!(obj instanceof IPatternMatch)) {
-              return false;
-          }
-          IPatternMatch otherSig  = (IPatternMatch) obj;
-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
-      }
-    }
-    
-    @Override
-    public TwoMembersHaveNoParent specification() {
-      return TwoMembersHaveNoParent.instance();
-    }
-    
-    /**
-     * Returns an empty, mutable match.
-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-     * 
-     * @return the empty match.
-     * 
-     */
-    public static TwoMembersHaveNoParent.Match newEmptyMatch() {
-      return new Mutable(null, null);
-    }
-    
-    /**
-     * Returns a mutable (partial) match.
-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-     * 
-     * @param pM1 the fixed value of pattern parameter m1, or null if not bound.
-     * @param pM2 the fixed value of pattern parameter m2, or null if not bound.
-     * @return the new, mutable (partial) match object.
-     * 
-     */
-    public static TwoMembersHaveNoParent.Match newMutableMatch(final Member pM1, final Member pM2) {
-      return new Mutable(pM1, pM2);
-    }
-    
-    /**
-     * Returns a new (partial) match.
-     * This can be used e.g. to call the matcher with a partial match.
-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-     * @param pM1 the fixed value of pattern parameter m1, or null if not bound.
-     * @param pM2 the fixed value of pattern parameter m2, or null if not bound.
-     * @return the (partial) match object.
-     * 
-     */
-    public static TwoMembersHaveNoParent.Match newMatch(final Member pM1, final Member pM2) {
-      return new Immutable(pM1, pM2);
-    }
-    
-    private static final class Mutable extends TwoMembersHaveNoParent.Match {
-      Mutable(final Member pM1, final Member pM2) {
-        super(pM1, pM2);
-      }
-      
-      @Override
-      public boolean isMutable() {
-        return true;
-      }
-    }
-    
-    private static final class Immutable extends TwoMembersHaveNoParent.Match {
-      Immutable(final Member pM1, final Member pM2) {
-        super(pM1, pM2);
-      }
-      
-      @Override
-      public boolean isMutable() {
-        return false;
-      }
-    }
-  }
-  
-  /**
-   * Generated pattern matcher API of the queries.twoMembersHaveNoParent pattern,
-   * providing pattern-specific query methods.
-   * 
-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
-   * 
-   * <p>Matches of the pattern will be represented as {@link Match}.
-   * 
-   * <p>Original source:
-   * <code><pre>
-   * {@literal @}Constraint(message="twoMembersHaveNoParent", severity="error", key={m1, m2})
-   * pattern twoMembersHaveNoParent(m1:Member, m2:Member) = {
-   *    neg find memberHasParent(m1);
-   *    neg find memberHasParent(m2);
-   *    m1 != m2;
-   * }
-   * </pre></code>
-   * 
-   * @see Match
-   * @see TwoMembersHaveNoParent
-   * 
-   */
-  public static class Matcher extends BaseMatcher<TwoMembersHaveNoParent.Match> {
-    /**
-     * Initializes the pattern matcher within an existing VIATRA Query engine.
-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-     * 
-     * @param engine the existing VIATRA Query engine in which this matcher will be created.
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * 
-     */
-    public static TwoMembersHaveNoParent.Matcher on(final ViatraQueryEngine engine) {
-      // check if matcher already exists
-      Matcher matcher = engine.getExistingMatcher(querySpecification());
-      if (matcher == null) {
-          matcher = (Matcher)engine.getMatcher(querySpecification());
-      }
-      return matcher;
-    }
-    
-    /**
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * @return an initialized matcher
-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
-     * 
-     */
-    public static TwoMembersHaveNoParent.Matcher create() {
-      return new Matcher();
-    }
-    
-    private static final int POSITION_M1 = 0;
-    
-    private static final int POSITION_M2 = 1;
-    
-    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(TwoMembersHaveNoParent.Matcher.class);
-    
-    /**
-     * Initializes the pattern matcher within an existing VIATRA Query engine.
-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-     * 
-     * @param engine the existing VIATRA Query engine in which this matcher will be created.
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * 
-     */
-    private Matcher() {
-      super(querySpecification());
-    }
-    
-    /**
-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
-     * @param pM1 the fixed value of pattern parameter m1, or null if not bound.
-     * @param pM2 the fixed value of pattern parameter m2, or null if not bound.
-     * @return matches represented as a Match object.
-     * 
-     */
-    public Collection<TwoMembersHaveNoParent.Match> getAllMatches(final Member pM1, final Member pM2) {
-      return rawStreamAllMatches(new Object[]{pM1, pM2}).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     * @param pM1 the fixed value of pattern parameter m1, or null if not bound.
-     * @param pM2 the fixed value of pattern parameter m2, or null if not bound.
-     * @return a stream of matches represented as a Match object.
-     * 
-     */
-    public Stream<TwoMembersHaveNoParent.Match> streamAllMatches(final Member pM1, final Member pM2) {
-      return rawStreamAllMatches(new Object[]{pM1, pM2});
-    }
-    
-    /**
-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-     * Neither determinism nor randomness of selection is guaranteed.
-     * @param pM1 the fixed value of pattern parameter m1, or null if not bound.
-     * @param pM2 the fixed value of pattern parameter m2, or null if not bound.
-     * @return a match represented as a Match object, or null if no match is found.
-     * 
-     */
-    public Optional<TwoMembersHaveNoParent.Match> getOneArbitraryMatch(final Member pM1, final Member pM2) {
-      return rawGetOneArbitraryMatch(new Object[]{pM1, pM2});
-    }
-    
-    /**
-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
-     * under any possible substitution of the unspecified parameters (if any).
-     * @param pM1 the fixed value of pattern parameter m1, or null if not bound.
-     * @param pM2 the fixed value of pattern parameter m2, or null if not bound.
-     * @return true if the input is a valid (partial) match of the pattern.
-     * 
-     */
-    public boolean hasMatch(final Member pM1, final Member pM2) {
-      return rawHasMatch(new Object[]{pM1, pM2});
-    }
-    
-    /**
-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
-     * @param pM1 the fixed value of pattern parameter m1, or null if not bound.
-     * @param pM2 the fixed value of pattern parameter m2, or null if not bound.
-     * @return the number of pattern matches found.
-     * 
-     */
-    public int countMatches(final Member pM1, final Member pM2) {
-      return rawCountMatches(new Object[]{pM1, pM2});
-    }
-    
-    /**
-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-     * Neither determinism nor randomness of selection is guaranteed.
-     * @param pM1 the fixed value of pattern parameter m1, or null if not bound.
-     * @param pM2 the fixed value of pattern parameter m2, or null if not bound.
-     * @param processor the action that will process the selected match.
-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
-     * 
-     */
-    public boolean forOneArbitraryMatch(final Member pM1, final Member pM2, final Consumer<? super TwoMembersHaveNoParent.Match> processor) {
-      return rawForOneArbitraryMatch(new Object[]{pM1, pM2}, processor);
-    }
-    
-    /**
-     * Returns a new (partial) match.
-     * This can be used e.g. to call the matcher with a partial match.
-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-     * @param pM1 the fixed value of pattern parameter m1, or null if not bound.
-     * @param pM2 the fixed value of pattern parameter m2, or null if not bound.
-     * @return the (partial) match object.
-     * 
-     */
-    public TwoMembersHaveNoParent.Match newMatch(final Member pM1, final Member pM2) {
-      return TwoMembersHaveNoParent.Match.newMatch(pM1, pM2);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for m1.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    protected Stream<Member> rawStreamAllValuesOfm1(final Object[] parameters) {
-      return rawStreamAllValues(POSITION_M1, parameters).map(Member.class::cast);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for m1.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<Member> getAllValuesOfm1() {
-      return rawStreamAllValuesOfm1(emptyArray()).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for m1.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<Member> streamAllValuesOfm1() {
-      return rawStreamAllValuesOfm1(emptyArray());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for m1.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     *      
-     * @return the Stream of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<Member> streamAllValuesOfm1(final TwoMembersHaveNoParent.Match partialMatch) {
-      return rawStreamAllValuesOfm1(partialMatch.toArray());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for m1.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     *      
-     * @return the Stream of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<Member> streamAllValuesOfm1(final Member pM2) {
-      return rawStreamAllValuesOfm1(new Object[]{null, pM2});
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for m1.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<Member> getAllValuesOfm1(final TwoMembersHaveNoParent.Match partialMatch) {
-      return rawStreamAllValuesOfm1(partialMatch.toArray()).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for m1.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<Member> getAllValuesOfm1(final Member pM2) {
-      return rawStreamAllValuesOfm1(new Object[]{null, pM2}).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for m2.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    protected Stream<Member> rawStreamAllValuesOfm2(final Object[] parameters) {
-      return rawStreamAllValues(POSITION_M2, parameters).map(Member.class::cast);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for m2.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<Member> getAllValuesOfm2() {
-      return rawStreamAllValuesOfm2(emptyArray()).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for m2.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<Member> streamAllValuesOfm2() {
-      return rawStreamAllValuesOfm2(emptyArray());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for m2.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     *      
-     * @return the Stream of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<Member> streamAllValuesOfm2(final TwoMembersHaveNoParent.Match partialMatch) {
-      return rawStreamAllValuesOfm2(partialMatch.toArray());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for m2.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     *      
-     * @return the Stream of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<Member> streamAllValuesOfm2(final Member pM1) {
-      return rawStreamAllValuesOfm2(new Object[]{pM1, null});
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for m2.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<Member> getAllValuesOfm2(final TwoMembersHaveNoParent.Match partialMatch) {
-      return rawStreamAllValuesOfm2(partialMatch.toArray()).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for m2.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<Member> getAllValuesOfm2(final Member pM1) {
-      return rawStreamAllValuesOfm2(new Object[]{pM1, null}).collect(Collectors.toSet());
-    }
-    
-    @Override
-    protected TwoMembersHaveNoParent.Match tupleToMatch(final Tuple t) {
-      try {
-          return TwoMembersHaveNoParent.Match.newMatch((Member) t.get(POSITION_M1), (Member) t.get(POSITION_M2));
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in tuple not properly typed!",e);
-          return null;
-      }
-    }
-    
-    @Override
-    protected TwoMembersHaveNoParent.Match arrayToMatch(final Object[] match) {
-      try {
-          return TwoMembersHaveNoParent.Match.newMatch((Member) match[POSITION_M1], (Member) match[POSITION_M2]);
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in array not properly typed!",e);
-          return null;
-      }
-    }
-    
-    @Override
-    protected TwoMembersHaveNoParent.Match arrayToMatchMutable(final Object[] match) {
-      try {
-          return TwoMembersHaveNoParent.Match.newMutableMatch((Member) match[POSITION_M1], (Member) match[POSITION_M2]);
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in array not properly typed!",e);
-          return null;
-      }
-    }
-    
-    /**
-     * @return the singleton instance of the query specification of this pattern
-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-     * 
-     */
-    public static IQuerySpecification<TwoMembersHaveNoParent.Matcher> querySpecification() {
-      return TwoMembersHaveNoParent.instance();
-    }
-  }
-  
-  private TwoMembersHaveNoParent() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-   * 
-   */
-  public static TwoMembersHaveNoParent instance() {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  @Override
-  protected TwoMembersHaveNoParent.Matcher instantiate(final ViatraQueryEngine engine) {
-    return TwoMembersHaveNoParent.Matcher.on(engine);
-  }
-  
-  @Override
-  public TwoMembersHaveNoParent.Matcher instantiate() {
-    return TwoMembersHaveNoParent.Matcher.create();
-  }
-  
-  @Override
-  public TwoMembersHaveNoParent.Match newEmptyMatch() {
-    return TwoMembersHaveNoParent.Match.newEmptyMatch();
-  }
-  
-  @Override
-  public TwoMembersHaveNoParent.Match newMatch(final Object... parameters) {
-    return TwoMembersHaveNoParent.Match.newMatch((familytree.Member) parameters[0], (familytree.Member) parameters[1]);
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link TwoMembersHaveNoParent} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link TwoMembersHaveNoParent#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private static final TwoMembersHaveNoParent INSTANCE = new TwoMembersHaveNoParent();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private static final Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternal();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final TwoMembersHaveNoParent.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_m1 = new PParameter("m1", "familytree.Member", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/familytree", "Member")), PParameterDirection.INOUT);
-    
-    private final PParameter parameter_m2 = new PParameter("m2", "familytree.Member", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/familytree", "Member")), PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_m1, parameter_m2);
-    
-    private GeneratedPQuery() {
-      super(PVisibility.PUBLIC);
-    }
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "queries.twoMembersHaveNoParent";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("m1","m2");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() {
-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
-      Set<PBody> bodies = new LinkedHashSet<>();
-      {
-          PBody body = new PBody(this);
-          PVariable var_m1 = body.getOrCreateVariableByName("m1");
-          PVariable var_m2 = body.getOrCreateVariableByName("m2");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_m1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/familytree", "Member")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var_m2), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/familytree", "Member")));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_m1, parameter_m1),
-             new ExportedParameter(body, var_m2, parameter_m2)
-          ));
-          //    neg find memberHasParent(m1)
-          new NegativePatternCall(body, Tuples.flatTupleOf(var_m1), MemberHasParent.instance().getInternalQueryRepresentation());
-          //    neg find memberHasParent(m2)
-          new NegativePatternCall(body, Tuples.flatTupleOf(var_m2), MemberHasParent.instance().getInternalQueryRepresentation());
-          //    m1 != m2
-          new Inequality(body, var_m1, var_m2);
-          bodies.add(body);
-      }
-      {
-          PAnnotation annotation = new PAnnotation("Constraint");
-          annotation.addAttribute("message", "twoMembersHaveNoParent");
-          annotation.addAttribute("severity", "error");
-          annotation.addAttribute("key", Arrays.asList(new Object[] {
-                              new ParameterReference("m1"), 
-                              new ParameterReference("m2")
-                              }));
-          addAnnotation(annotation);
-      }
-      return bodies;
-    }
-  }
-}
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/.gitignore b/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/.gitignore
index 3197db31..b33f6aff 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/.gitignore
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/.gitignore
@@ -1,2 +1,2 @@
 /bin/
-/xtend-gen/
\ No newline at end of file
+/xtend-gen/
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/.UML2TGF.xtendbin b/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/.UML2TGF.xtendbin
deleted file mode 100644
index 23513b51..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/.UML2TGF.xtendbin
+++ /dev/null
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/.gitignore b/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/.gitignore
deleted file mode 100644
index 7a39cb70..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.UML2TGF.java._trace
-/.UML2TGF.xtendbin
-/UML2TGF.java
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/UML2TGF.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/UML2TGF.java
deleted file mode 100644
index 9081c3af..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/UML2TGF.java
+++ /dev/null
@@ -1,234 +0,0 @@
-package converter;

-

-import java.io.PrintWriter;

-import java.text.SimpleDateFormat;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Date;

-import java.util.HashMap;

-import java.util.HashSet;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.EnumerationLiteral;

-import org.eclipse.uml2.uml.InstanceSpecification;

-import org.eclipse.uml2.uml.InstanceValue;

-import org.eclipse.uml2.uml.Model;

-import org.eclipse.uml2.uml.Slot;

-import org.eclipse.uml2.uml.StructuralFeature;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.eclipse.uml2.uml.ValueSpecification;

-import org.eclipse.uml2.uml.resource.UMLResource;

-import org.eclipse.xtend2.lib.StringConcatenation;

-import org.eclipse.xtext.xbase.lib.Conversions;

-import org.eclipse.xtext.xbase.lib.Exceptions;

-import org.eclipse.xtext.xbase.lib.Functions.Function1;

-import org.eclipse.xtext.xbase.lib.InputOutput;

-import org.eclipse.xtext.xbase.lib.IterableExtensions;

-

-@SuppressWarnings("all")

-public class UML2TGF {

-  public static void main(final String[] args) {

-    try {

-      final ResourceSetImpl resourceSet = new ResourceSetImpl();

-      resourceSet.getPackageRegistry().put(UMLPackage.eNS_URI, UMLPackage.eINSTANCE);

-      resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(UMLResource.FILE_EXTENSION, 

-        UMLResource.Factory.INSTANCE);

-      final Resource res = resourceSet.getResource(URI.createFileURI("instance//Instance_model_A.uml"), true);

-      EObject _get = res.getContents().get(0);

-      final Model docRoot = ((Model) _get);

-      final Function1<Element, Boolean> _function = (Element it) -> {

-        return Boolean.valueOf((it instanceof InstanceSpecification));

-      };

-      final Iterable<Element> nodes = IterableExtensions.<Element>filter(docRoot.allOwnedElements(), _function);

-      final HashSet<Object> allTypes = new HashSet<Object>();

-      for (final Element e : nodes) {

-        allTypes.add(e.getClass());

-      }

-      long _currentTimeMillis = System.currentTimeMillis();

-      final Date date = new Date(_currentTimeMillis);

-      final SimpleDateFormat format = new SimpleDateFormat("dd-HHmm");

-      final String formattedDate = format.format(date);

-      final HashMap<InstanceSpecification, Integer> map = new HashMap<InstanceSpecification, Integer>();

-      final HashSet<String> set = new HashSet<String>();

-      final ArrayList<Object> unidentified = new ArrayList<Object>();

-      final ArrayList<Object> enums = new ArrayList<Object>();

-      final PrintWriter writer = new PrintWriter((("output//graph-" + formattedDate) + ".gml"));

-      InputOutput.<String>println("begin Writing");

-      writer.append("graph\n[\n");

-      int ind = 0;

-      int numNodes = ((Object[])Conversions.unwrapArray(nodes, Object.class)).length;

-      int numEdges = 0;

-      for (final Element node : nodes) {

-        {

-          final InstanceSpecification n = ((InstanceSpecification) node);

-          boolean _contains = map.keySet().contains(n);

-          if (_contains) {

-            System.err.println("contained");

-          }

-          map.put(n, Integer.valueOf(ind));

-          StringConcatenation _builder = new StringConcatenation();

-          _builder.append("  ");

-          _builder.append("node");

-          _builder.newLine();

-          _builder.append("  ");

-          _builder.append("[");

-          _builder.newLine();

-          _builder.append("   ");

-          _builder.append("id ");

-          _builder.append(ind, "   ");

-          _builder.newLineIfNotEmpty();

-          _builder.append("   ");

-          _builder.append("label \"");

-          {

-            String _name = n.getName();

-            boolean _tripleNotEquals = (_name != null);

-            if (_tripleNotEquals) {

-              String _name_1 = n.getName();

-              _builder.append(_name_1, "   ");

-            }

-          }

-          _builder.append("\"");

-          _builder.newLineIfNotEmpty();

-          {

-            if (((n.getName() != null) && (n.getName().contains("Household") || n.getName().contains("Household")))) {

-              _builder.append("     graphics");

-              _builder.newLineIfNotEmpty();

-              _builder.append("       ");

-              _builder.append("[");

-              _builder.newLine();

-              _builder.append("         ");

-              _builder.append("fill\t\"#00FF00\"");

-              _builder.newLine();

-              _builder.append("       ");

-              _builder.append("]");

-              _builder.newLine();

-            }

-          }

-          _builder.append(" ");

-          {

-            if ((node instanceof EnumerationLiteral)) {

-              _builder.append("     graphics");

-              _builder.newLineIfNotEmpty();

-              _builder.append(" ");

-              _builder.append("      ");

-              _builder.append("[");

-              _builder.newLine();

-              _builder.append(" ");

-              _builder.append("        ");

-              _builder.append("fill\t\"#FF0000\"");

-              _builder.newLine();

-              _builder.append(" ");

-              _builder.append("      ");

-              _builder.append("]");

-              _builder.newLine();

-            }

-          }

-          _builder.append("  ");

-          _builder.append("]");

-          _builder.newLine();

-          writer.append(_builder);

-          ind++;

-        }

-      }

-      Slot s = null;

-      try {

-        for (final Element node_1 : nodes) {

-          {

-            final InstanceSpecification n = ((InstanceSpecification) node_1);

-            final Integer nind = map.get(n);

-            EList<Slot> _slots = n.getSlots();

-            for (final Slot slot : _slots) {

-              {

-                s = slot;

-                String fname = "";

-                StructuralFeature _definingFeature = slot.getDefiningFeature();

-                boolean _tripleNotEquals = (_definingFeature != null);

-                if (_tripleNotEquals) {

-                  fname = slot.getDefiningFeature().getName();

-                }

-                EList<ValueSpecification> _values = slot.getValues();

-                for (final ValueSpecification v : _values) {

-                  if ((v instanceof InstanceValue)) {

-                    final InstanceValue value = ((InstanceValue) v);

-                    boolean _containsKey = map.containsKey(value.getInstance());

-                    if (_containsKey) {

-                      InstanceSpecification _instance = value.getInstance();

-                      boolean _notEquals = ((_instance instanceof EnumerationLiteral) != true);

-                      if (_notEquals) {

-                        final Integer vind = map.get(value.getInstance());

-                        StringConcatenation _builder = new StringConcatenation();

-                        _builder.append("  ");

-                        _builder.append("edge");

-                        _builder.newLine();

-                        _builder.append("  ");

-                        _builder.append("[");

-                        _builder.newLine();

-                        _builder.append("   ");

-                        _builder.append("source ");

-                        _builder.append(nind, "   ");

-                        _builder.newLineIfNotEmpty();

-                        _builder.append("   ");

-                        _builder.append("target ");

-                        _builder.append(vind, "   ");

-                        _builder.newLineIfNotEmpty();

-                        _builder.append("   ");

-                        _builder.append("label \"");

-                        _builder.append(fname, "   ");

-                        _builder.append("\"");

-                        _builder.newLineIfNotEmpty();

-                        _builder.append("  ");

-                        _builder.append("]");

-                        _builder.newLine();

-                        writer.append(_builder);

-                        numEdges++;

-                      } else {

-                        String _plus = (value + " -> ");

-                        InstanceSpecification _instance_1 = value.getInstance();

-                        String _plus_1 = (_plus + _instance_1);

-                        enums.add(_plus_1);

-                      }

-                    } else {

-                      String _plus_2 = (value + " -> ");

-                      InstanceSpecification _instance_2 = value.getInstance();

-                      String _plus_3 = (_plus_2 + _instance_2);

-                      unidentified.add(_plus_3);

-                    }

-                  } else {

-                    set.add(v.getClass().toString());

-                  }

-                }

-              }

-            }

-          }

-        }

-      } catch (final Throwable _t) {

-        if (_t instanceof Exception) {

-          InputOutput.<StructuralFeature>println(s.getDefiningFeature());

-        } else {

-          throw Exceptions.sneakyThrow(_t);

-        }

-      }

-      UML2TGF.printset("Unhandled Edges", set);

-      UML2TGF.printset("Unidentified trgs", unidentified);

-      UML2TGF.printset("Enums:", enums);

-      writer.append("]");

-      writer.close();

-      InputOutput.<String>println("End");

-      InputOutput.<String>println(((("#nodes:" + Integer.valueOf(numNodes)) + ", #edges:") + Integer.valueOf(numEdges)));

-    } catch (Throwable _e) {

-      throw Exceptions.sneakyThrow(_e);

-    }

-  }

-  

-  public static void printset(final String name, final Collection s) {

-    InputOutput.<String>println((name + ":"));

-    for (final Object k : s) {

-      InputOutput.<String>println(("- " + k));

-    }

-    InputOutput.println();

-  }

-}

diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/.gitignore b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/.gitignore
index ecef25ad..7d464a77 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/.gitignore
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/.gitignore
@@ -4,3 +4,4 @@
 /xtend-gen/
 /bin/
 /x/
+/archives/
\ No newline at end of file