SUport for run sets and other significant improvements to parameterizaton and testing.
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/icons/etool16/test_clipboard.gif b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/icons/etool16/test_clipboard.gif
new file mode 100644
index 0000000..96028b3
--- /dev/null
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/icons/etool16/test_clipboard.gif
Binary files differ
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/icons/etool16/test_file.gif b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/icons/etool16/test_file.gif
new file mode 100644
index 0000000..79a554e
--- /dev/null
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/icons/etool16/test_file.gif
Binary files differ
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/icons/etool16/test_run.gif b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/icons/etool16/test_run.gif
new file mode 100644
index 0000000..0e74548
--- /dev/null
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/icons/etool16/test_run.gif
Binary files differ
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/plugin.xml b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/plugin.xml
index f71433e..1df7f40 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/plugin.xml
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/plugin.xml
@@ -6,12 +6,13 @@
     <extension
             point="org.eclipse.ui.editors">
         <editor
-            class="org.eclipse.amp.amf.testing.ATestExecutableExtensionFactory:org.eclipse.xtext.ui.core.editor.XtextEditor"
-            contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
-            default="true"
-            extensions="atest"
-            id="org.eclipse.amp.amf.testing.ATest"
-            name="ATest Editor">
+              class="org.eclipse.amp.amf.testing.ATestExecutableExtensionFactory:org.eclipse.xtext.ui.core.editor.XtextEditor"
+              contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
+              default="true"
+              extensions="atest"
+              icon="icons/etool16/test_file.gif"
+              id="org.eclipse.amp.amf.testing.ATest"
+              name="ATest Editor">
         </editor>
     </extension>
     <extension
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/AbstractATestProposalProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/AbstractATestProposalProvider.java
index 43bbf17..b84e40f 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/AbstractATestProposalProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/AbstractATestProposalProvider.java
@@ -97,8 +97,7 @@
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ context.getPrefix() + "'");
 		}
-		completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getGroups().get(0)), context, acceptor);
-		completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getGroups().get(1)), context, acceptor);
+		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
 	public void completeConstraint_MaxValue(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		if (logger.isDebugEnabled()) {
@@ -106,8 +105,7 @@
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ context.getPrefix() + "'");
 		}
-		completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getGroups().get(0)), context, acceptor);
-		completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getGroups().get(1)), context, acceptor);
+		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
 	public void completeIntValue_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		if (logger.isDebugEnabled()) {
@@ -154,6 +152,13 @@
 		}
 		// subclasses may override
 	}
+	public void complete_Value(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		if (logger.isDebugEnabled()) {
+			logger.debug("complete_Value '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
+					+ "' for model '" + context.getCurrentModel() + "' and prefix '" + context.getPrefix() + "'");
+		}
+		// subclasses may override
+	}
 	public void complete_IntValue(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		if (logger.isDebugEnabled()) {
 			logger.debug("complete_IntValue '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/ATestParser.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/ATestParser.java
index 931bbf8..98a2b26 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/ATestParser.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/ATestParser.java
@@ -42,27 +42,13 @@
 		if (nameMappings == null) {
 			nameMappings = new HashMap<AbstractElement, String>() {
 				{
-					put(grammarAccess.getConstraintAccess().getMinValueAlternatives_7_2_0(), "rule__Constraint__MinValueAlternatives_7_2_0");
-					put(grammarAccess.getConstraintAccess().getMaxValueAlternatives_7_4_0(), "rule__Constraint__MaxValueAlternatives_7_4_0");
+					put(grammarAccess.getValueAccess().getAlternatives(), "rule__Value__Alternatives");
 					put(grammarAccess.getMeasureAccess().getAlternatives(), "rule__Measure__Alternatives");
-					put(grammarAccess.getModelAccess().getGroup(), "rule__Model__Group__0");
-					put(grammarAccess.getTestsAccess().getGroup(), "rule__Tests__Group__0");
-					put(grammarAccess.getConstraintAccess().getGroup(), "rule__Constraint__Group__0");
-					put(grammarAccess.getConstraintAccess().getGroup_5(), "rule__Constraint__Group_5__0");
-					put(grammarAccess.getConstraintAccess().getGroup_7(), "rule__Constraint__Group_7__0");
-					put(grammarAccess.getModelAccess().getNameAssignment_0(), "rule__Model__NameAssignment_0");
-					put(grammarAccess.getModelAccess().getDescriptionAssignment_1(), "rule__Model__DescriptionAssignment_1");
-					put(grammarAccess.getModelAccess().getTestsAssignment_2(), "rule__Model__TestsAssignment_2");
-					put(grammarAccess.getModelAccess().getContraintsAssignment_3(), "rule__Model__ContraintsAssignment_3");
-					put(grammarAccess.getTestsAccess().getImportURIAssignment_1(), "rule__Tests__ImportURIAssignment_1");
-					put(grammarAccess.getConstraintAccess().getMeasureAssignment_0(), "rule__Constraint__MeasureAssignment_0");
-					put(grammarAccess.getConstraintAccess().getAgentAssignment_2(), "rule__Constraint__AgentAssignment_2");
-					put(grammarAccess.getConstraintAccess().getAttributeAssignment_4(), "rule__Constraint__AttributeAssignment_4");
-					put(grammarAccess.getConstraintAccess().getQualifierAssignment_5_1(), "rule__Constraint__QualifierAssignment_5_1");
-					put(grammarAccess.getConstraintAccess().getMinValueAssignment_7_2(), "rule__Constraint__MinValueAssignment_7_2");
-					put(grammarAccess.getConstraintAccess().getMaxValueAssignment_7_4(), "rule__Constraint__MaxValueAssignment_7_4");
-					put(grammarAccess.getIntValueAccess().getValueAssignment(), "rule__IntValue__ValueAssignment");
-					put(grammarAccess.getRealValueAccess().getValueAssignment(), "rule__RealValue__ValueAssignment");
+					put(grammarAccess.getModelAccess().getGroup(), "rule__Model__Group");
+					put(grammarAccess.getTestsAccess().getGroup(), "rule__Tests__Group");
+					put(grammarAccess.getConstraintAccess().getGroup(), "rule__Constraint__Group");
+					put(grammarAccess.getConstraintAccess().getGroup_5(), "rule__Constraint__Group_5");
+					put(grammarAccess.getConstraintAccess().getGroup_7(), "rule__Constraint__Group_7");
 				}
 			};
 		}
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g
index 2cd6c90..e1cc981 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g
@@ -67,8 +67,7 @@
  :
 (
 { before(grammarAccess.getModelAccess().getGroup()); }
-(rule__Model__Group__0)
-{ after(grammarAccess.getModelAccess().getGroup()); }
+(rule__Model__Group){ after(grammarAccess.getModelAccess().getGroup()); }
 )
 
 ;
@@ -94,8 +93,7 @@
  :
 (
 { before(grammarAccess.getTestsAccess().getGroup()); }
-(rule__Tests__Group__0)
-{ after(grammarAccess.getTestsAccess().getGroup()); }
+(rule__Tests__Group){ after(grammarAccess.getTestsAccess().getGroup()); }
 )
 
 ;
@@ -121,8 +119,33 @@
  :
 (
 { before(grammarAccess.getConstraintAccess().getGroup()); }
-(rule__Constraint__Group__0)
-{ after(grammarAccess.getConstraintAccess().getGroup()); }
+(rule__Constraint__Group){ after(grammarAccess.getConstraintAccess().getGroup()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+
+// Entry rule entryRuleValue
+entryRuleValue :
+{ before(grammarAccess.getValueRule()); }
+	 ruleValue
+{ after(grammarAccess.getValueRule()); } 
+	 EOF 
+;
+
+// Rule Value
+ruleValue 
+    @init {
+		int stackSize = keepStackSize();
+    }
+ :
+(
+{ before(grammarAccess.getValueAccess().getAlternatives()); }
+(rule__Value__Alternatives){ after(grammarAccess.getValueAccess().getAlternatives()); }
 )
 
 ;
@@ -148,8 +171,13 @@
  :
 (
 { before(grammarAccess.getIntValueAccess().getValueAssignment()); }
-(rule__IntValue__ValueAssignment)
-{ after(grammarAccess.getIntValueAccess().getValueAssignment()); }
+(	
+(
+{ before(grammarAccess.getIntValueAccess().getValueINTTerminalRuleCall_0()); }
+	RULE_INT{ after(grammarAccess.getIntValueAccess().getValueINTTerminalRuleCall_0()); }
+)
+ 
+){ after(grammarAccess.getIntValueAccess().getValueAssignment()); }
 )
 
 ;
@@ -175,8 +203,13 @@
  :
 (
 { before(grammarAccess.getRealValueAccess().getValueAssignment()); }
-(rule__RealValue__ValueAssignment)
-{ after(grammarAccess.getRealValueAccess().getValueAssignment()); }
+(	
+(
+{ before(grammarAccess.getRealValueAccess().getValueREALTerminalRuleCall_0()); }
+	RULE_REAL{ after(grammarAccess.getRealValueAccess().getValueREALTerminalRuleCall_0()); }
+)
+ 
+){ after(grammarAccess.getRealValueAccess().getValueAssignment()); }
 )
 
 ;
@@ -195,8 +228,7 @@
 :
 (
 { before(grammarAccess.getMeasureAccess().getAlternatives()); }
-(rule__Measure__Alternatives)
-{ after(grammarAccess.getMeasureAccess().getAlternatives()); }
+(rule__Measure__Alternatives){ after(grammarAccess.getMeasureAccess().getAlternatives()); }
 )
 
 ;
@@ -206,43 +238,19 @@
 
 
 
-rule__Constraint__MinValueAlternatives_7_2_0
+rule__Value__Alternatives
     @init {
 		int stackSize = keepStackSize();
     }
 :
 (
-{ before(grammarAccess.getConstraintAccess().getMinValueIntValueParserRuleCall_7_2_0_0()); }
-	ruleIntValue
-{ after(grammarAccess.getConstraintAccess().getMinValueIntValueParserRuleCall_7_2_0_0()); }
+{ before(grammarAccess.getValueAccess().getIntValueParserRuleCall_0()); }
+	ruleIntValue{ after(grammarAccess.getValueAccess().getIntValueParserRuleCall_0()); }
 )
 
     |(
-{ before(grammarAccess.getConstraintAccess().getMinValueRealValueParserRuleCall_7_2_0_1()); }
-	ruleRealValue
-{ after(grammarAccess.getConstraintAccess().getMinValueRealValueParserRuleCall_7_2_0_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Constraint__MaxValueAlternatives_7_4_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getConstraintAccess().getMaxValueIntValueParserRuleCall_7_4_0_0()); }
-	ruleIntValue
-{ after(grammarAccess.getConstraintAccess().getMaxValueIntValueParserRuleCall_7_4_0_0()); }
-)
-
-    |(
-{ before(grammarAccess.getConstraintAccess().getMaxValueRealValueParserRuleCall_7_4_0_1()); }
-	ruleRealValue
-{ after(grammarAccess.getConstraintAccess().getMaxValueRealValueParserRuleCall_7_4_0_1()); }
+{ before(grammarAccess.getValueAccess().getRealValueParserRuleCall_1()); }
+	ruleRealValue{ after(grammarAccess.getValueAccess().getRealValueParserRuleCall_1()); }
 )
 
 ;
@@ -258,36 +266,31 @@
 (
 { before(grammarAccess.getMeasureAccess().getCOUNTEnumLiteralDeclaration_0()); }
 (	'Count' 
-)
-{ after(grammarAccess.getMeasureAccess().getCOUNTEnumLiteralDeclaration_0()); }
+){ after(grammarAccess.getMeasureAccess().getCOUNTEnumLiteralDeclaration_0()); }
 )
 
     |(
 { before(grammarAccess.getMeasureAccess().getAVERAGEEnumLiteralDeclaration_1()); }
 (	'Average' 
-)
-{ after(grammarAccess.getMeasureAccess().getAVERAGEEnumLiteralDeclaration_1()); }
+){ after(grammarAccess.getMeasureAccess().getAVERAGEEnumLiteralDeclaration_1()); }
 )
 
     |(
 { before(grammarAccess.getMeasureAccess().getSUMEnumLiteralDeclaration_2()); }
 (	'Sum' 
-)
-{ after(grammarAccess.getMeasureAccess().getSUMEnumLiteralDeclaration_2()); }
+){ after(grammarAccess.getMeasureAccess().getSUMEnumLiteralDeclaration_2()); }
 )
 
     |(
 { before(grammarAccess.getMeasureAccess().getMINIMUMEnumLiteralDeclaration_3()); }
 (	'Minimum' 
-)
-{ after(grammarAccess.getMeasureAccess().getMINIMUMEnumLiteralDeclaration_3()); }
+){ after(grammarAccess.getMeasureAccess().getMINIMUMEnumLiteralDeclaration_3()); }
 )
 
     |(
 { before(grammarAccess.getMeasureAccess().getMAXIMUMEnumLiteralDeclaration_4()); }
 (	'Maximum' 
-)
-{ after(grammarAccess.getMeasureAccess().getMAXIMUMEnumLiteralDeclaration_4()); }
+){ after(grammarAccess.getMeasureAccess().getMAXIMUMEnumLiteralDeclaration_4()); }
 )
 
 ;
@@ -296,70 +299,50 @@
 }
 
 
-
-rule__Model__Group__0
+rule__Model__Group
     @init {
 		int stackSize = keepStackSize();
     }
 :
 (
 { before(grammarAccess.getModelAccess().getNameAssignment_0()); }
-(rule__Model__NameAssignment_0)?
-{ after(grammarAccess.getModelAccess().getNameAssignment_0()); }
+(	
+(
+{ before(grammarAccess.getModelAccess().getNameSTRINGTerminalRuleCall_0_0()); }
+	RULE_STRING{ after(grammarAccess.getModelAccess().getNameSTRINGTerminalRuleCall_0_0()); }
 )
-
-	rule__Model__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Model__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
+ 
+)?{ after(grammarAccess.getModelAccess().getNameAssignment_0()); }
+)
 (
 { before(grammarAccess.getModelAccess().getDescriptionAssignment_1()); }
-(rule__Model__DescriptionAssignment_1)?
-{ after(grammarAccess.getModelAccess().getDescriptionAssignment_1()); }
+(	
+(
+{ before(grammarAccess.getModelAccess().getDescriptionPLAIN_STRINGTerminalRuleCall_1_0()); }
+	RULE_PLAIN_STRING{ after(grammarAccess.getModelAccess().getDescriptionPLAIN_STRINGTerminalRuleCall_1_0()); }
 )
-
-	rule__Model__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Model__Group__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
+ 
+)?{ after(grammarAccess.getModelAccess().getDescriptionAssignment_1()); }
+)
 (
 { before(grammarAccess.getModelAccess().getTestsAssignment_2()); }
-(rule__Model__TestsAssignment_2)?
-{ after(grammarAccess.getModelAccess().getTestsAssignment_2()); }
+(	
+(
+{ before(grammarAccess.getModelAccess().getTestsTestsParserRuleCall_2_0()); }
+	ruleTests{ after(grammarAccess.getModelAccess().getTestsTestsParserRuleCall_2_0()); }
 )
-
-	rule__Model__Group__3
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Model__Group__3
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
+ 
+)?{ after(grammarAccess.getModelAccess().getTestsAssignment_2()); }
+)
 (
 { before(grammarAccess.getModelAccess().getContraintsAssignment_3()); }
-(rule__Model__ContraintsAssignment_3)*
-{ after(grammarAccess.getModelAccess().getContraintsAssignment_3()); }
+(	
+(
+{ before(grammarAccess.getModelAccess().getContraintsConstraintParserRuleCall_3_0()); }
+	ruleConstraint{ after(grammarAccess.getModelAccess().getContraintsConstraintParserRuleCall_3_0()); }
+)
+ 
+)*{ after(grammarAccess.getModelAccess().getContraintsAssignment_3()); }
 )
 
 ;
@@ -367,16 +350,7 @@
 	restoreStackSize(stackSize);
 }
 
-
-
-
-
-
-
-
-
-
-rule__Tests__Group__0
+rule__Tests__Group
     @init {
 		int stackSize = keepStackSize();
     }
@@ -385,26 +359,17 @@
 { before(grammarAccess.getTestsAccess().getTESTSKeyword_0()); }
 
 	'TESTS' 
-
 { after(grammarAccess.getTestsAccess().getTESTSKeyword_0()); }
 )
-
-	rule__Tests__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Tests__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
 (
 { before(grammarAccess.getTestsAccess().getImportURIAssignment_1()); }
-(rule__Tests__ImportURIAssignment_1)
-{ after(grammarAccess.getTestsAccess().getImportURIAssignment_1()); }
+(	
+(
+{ before(grammarAccess.getTestsAccess().getImportURISTRINGTerminalRuleCall_1_0()); }
+	RULE_STRING{ after(grammarAccess.getTestsAccess().getImportURISTRINGTerminalRuleCall_1_0()); }
+)
+ 
+){ after(grammarAccess.getTestsAccess().getImportURIAssignment_1()); }
 )
 
 ;
@@ -412,152 +377,74 @@
 	restoreStackSize(stackSize);
 }
 
-
-
-
-
-
-rule__Constraint__Group__0
+rule__Constraint__Group
     @init {
 		int stackSize = keepStackSize();
     }
 :
 (
 { before(grammarAccess.getConstraintAccess().getMeasureAssignment_0()); }
-(rule__Constraint__MeasureAssignment_0)
-{ after(grammarAccess.getConstraintAccess().getMeasureAssignment_0()); }
+(	
+(
+{ before(grammarAccess.getConstraintAccess().getMeasureMeasureEnumRuleCall_0_0()); }
+	ruleMeasure{ after(grammarAccess.getConstraintAccess().getMeasureMeasureEnumRuleCall_0_0()); }
 )
-
-	rule__Constraint__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Constraint__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
+ 
+){ after(grammarAccess.getConstraintAccess().getMeasureAssignment_0()); }
+)
 (
 { before(grammarAccess.getConstraintAccess().getLeftParenthesisKeyword_1()); }
 
 	'(' 
-
 { after(grammarAccess.getConstraintAccess().getLeftParenthesisKeyword_1()); }
 )
-
-	rule__Constraint__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Constraint__Group__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
 (
 { before(grammarAccess.getConstraintAccess().getAgentAssignment_2()); }
-(rule__Constraint__AgentAssignment_2)
-{ after(grammarAccess.getConstraintAccess().getAgentAssignment_2()); }
+(	
+(
+{ before(grammarAccess.getConstraintAccess().getAgentSAgentCrossReference_2_0()); }
+(
+{ before(grammarAccess.getConstraintAccess().getAgentSAgentSTRINGTerminalRuleCall_2_0_1()); }
+	RULE_STRING{ after(grammarAccess.getConstraintAccess().getAgentSAgentSTRINGTerminalRuleCall_2_0_1()); }
 )
-
-	rule__Constraint__Group__3
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Constraint__Group__3
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
+{ after(grammarAccess.getConstraintAccess().getAgentSAgentCrossReference_2_0()); }
+)
+ 
+){ after(grammarAccess.getConstraintAccess().getAgentAssignment_2()); }
+)
 (
 { before(grammarAccess.getConstraintAccess().getColonKeyword_3()); }
 
 	':' 
-
 { after(grammarAccess.getConstraintAccess().getColonKeyword_3()); }
 )
-
-	rule__Constraint__Group__4
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Constraint__Group__4
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
 (
 { before(grammarAccess.getConstraintAccess().getAttributeAssignment_4()); }
-(rule__Constraint__AttributeAssignment_4)
-{ after(grammarAccess.getConstraintAccess().getAttributeAssignment_4()); }
+(	
+(
+{ before(grammarAccess.getConstraintAccess().getAttributeSAttributeCrossReference_4_0()); }
+(
+{ before(grammarAccess.getConstraintAccess().getAttributeSAttributeSTRINGTerminalRuleCall_4_0_1()); }
+	RULE_STRING{ after(grammarAccess.getConstraintAccess().getAttributeSAttributeSTRINGTerminalRuleCall_4_0_1()); }
 )
-
-	rule__Constraint__Group__5
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Constraint__Group__5
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
+{ after(grammarAccess.getConstraintAccess().getAttributeSAttributeCrossReference_4_0()); }
+)
+ 
+){ after(grammarAccess.getConstraintAccess().getAttributeAssignment_4()); }
+)
 (
 { before(grammarAccess.getConstraintAccess().getGroup_5()); }
-(rule__Constraint__Group_5__0)?
-{ after(grammarAccess.getConstraintAccess().getGroup_5()); }
+(rule__Constraint__Group_5)?{ after(grammarAccess.getConstraintAccess().getGroup_5()); }
 )
-
-	rule__Constraint__Group__6
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Constraint__Group__6
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
 (
 { before(grammarAccess.getConstraintAccess().getRightParenthesisKeyword_6()); }
 
 	')' 
-
 { after(grammarAccess.getConstraintAccess().getRightParenthesisKeyword_6()); }
 )
-
-	rule__Constraint__Group__7
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Constraint__Group__7
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
 (
 { before(grammarAccess.getConstraintAccess().getGroup_7()); }
-(rule__Constraint__Group_7__0)
-{ after(grammarAccess.getConstraintAccess().getGroup_7()); }
+(rule__Constraint__Group_7){ after(grammarAccess.getConstraintAccess().getGroup_7()); }
 )
 
 ;
@@ -565,24 +452,7 @@
 	restoreStackSize(stackSize);
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-rule__Constraint__Group_5__0
+rule__Constraint__Group_5
     @init {
 		int stackSize = keepStackSize();
     }
@@ -591,26 +461,21 @@
 { before(grammarAccess.getConstraintAccess().getColonKeyword_5_0()); }
 
 	':' 
-
 { after(grammarAccess.getConstraintAccess().getColonKeyword_5_0()); }
 )
-
-	rule__Constraint__Group_5__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Constraint__Group_5__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
 (
 { before(grammarAccess.getConstraintAccess().getQualifierAssignment_5_1()); }
-(rule__Constraint__QualifierAssignment_5_1)
-{ after(grammarAccess.getConstraintAccess().getQualifierAssignment_5_1()); }
+(	
+(
+{ before(grammarAccess.getConstraintAccess().getQualifierSStateValueCrossReference_5_1_0()); }
+(
+{ before(grammarAccess.getConstraintAccess().getQualifierSStateValueSTRINGTerminalRuleCall_5_1_0_1()); }
+	RULE_STRING{ after(grammarAccess.getConstraintAccess().getQualifierSStateValueSTRINGTerminalRuleCall_5_1_0_1()); }
+)
+{ after(grammarAccess.getConstraintAccess().getQualifierSStateValueCrossReference_5_1_0()); }
+)
+ 
+){ after(grammarAccess.getConstraintAccess().getQualifierAssignment_5_1()); }
 )
 
 ;
@@ -618,12 +483,7 @@
 	restoreStackSize(stackSize);
 }
 
-
-
-
-
-
-rule__Constraint__Group_7__0
+rule__Constraint__Group_7
     @init {
 		int stackSize = keepStackSize();
     }
@@ -632,103 +492,44 @@
 { before(grammarAccess.getConstraintAccess().getEqualsSignKeyword_7_0()); }
 
 	'=' 
-
 { after(grammarAccess.getConstraintAccess().getEqualsSignKeyword_7_0()); }
 )
-
-	rule__Constraint__Group_7__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Constraint__Group_7__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
 (
 { before(grammarAccess.getConstraintAccess().getLeftSquareBracketKeyword_7_1()); }
 
 	'[' 
-
 { after(grammarAccess.getConstraintAccess().getLeftSquareBracketKeyword_7_1()); }
 )
-
-	rule__Constraint__Group_7__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Constraint__Group_7__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
 (
 { before(grammarAccess.getConstraintAccess().getMinValueAssignment_7_2()); }
-(rule__Constraint__MinValueAssignment_7_2)
-{ after(grammarAccess.getConstraintAccess().getMinValueAssignment_7_2()); }
+(	
+(
+{ before(grammarAccess.getConstraintAccess().getMinValueValueParserRuleCall_7_2_0()); }
+	ruleValue{ after(grammarAccess.getConstraintAccess().getMinValueValueParserRuleCall_7_2_0()); }
 )
-
-	rule__Constraint__Group_7__3
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Constraint__Group_7__3
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
+ 
+){ after(grammarAccess.getConstraintAccess().getMinValueAssignment_7_2()); }
+)
 (
 { before(grammarAccess.getConstraintAccess().getCommaKeyword_7_3()); }
 
 	',' 
-
 { after(grammarAccess.getConstraintAccess().getCommaKeyword_7_3()); }
 )
-
-	rule__Constraint__Group_7__4
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Constraint__Group_7__4
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
 (
 { before(grammarAccess.getConstraintAccess().getMaxValueAssignment_7_4()); }
-(rule__Constraint__MaxValueAssignment_7_4)
-{ after(grammarAccess.getConstraintAccess().getMaxValueAssignment_7_4()); }
+(	
+(
+{ before(grammarAccess.getConstraintAccess().getMaxValueValueParserRuleCall_7_4_0()); }
+	ruleValue{ after(grammarAccess.getConstraintAccess().getMaxValueValueParserRuleCall_7_4_0()); }
 )
-
-	rule__Constraint__Group_7__5
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Constraint__Group_7__5
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
+ 
+){ after(grammarAccess.getConstraintAccess().getMaxValueAssignment_7_4()); }
+)
 (
 { before(grammarAccess.getConstraintAccess().getRightSquareBracketKeyword_7_5()); }
 
 	']' 
-
 { after(grammarAccess.getConstraintAccess().getRightSquareBracketKeyword_7_5()); }
 )
 
@@ -738,229 +539,7 @@
 }
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-rule__Model__NameAssignment_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getModelAccess().getNameSTRINGTerminalRuleCall_0_0()); }
-	RULE_STRING{ after(grammarAccess.getModelAccess().getNameSTRINGTerminalRuleCall_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Model__DescriptionAssignment_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getModelAccess().getDescriptionPLAIN_STRINGTerminalRuleCall_1_0()); }
-	RULE_PLAIN_STRING{ after(grammarAccess.getModelAccess().getDescriptionPLAIN_STRINGTerminalRuleCall_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Model__TestsAssignment_2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getModelAccess().getTestsTestsParserRuleCall_2_0()); }
-	ruleTests{ after(grammarAccess.getModelAccess().getTestsTestsParserRuleCall_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Model__ContraintsAssignment_3
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getModelAccess().getContraintsConstraintParserRuleCall_3_0()); }
-	ruleConstraint{ after(grammarAccess.getModelAccess().getContraintsConstraintParserRuleCall_3_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Tests__ImportURIAssignment_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getTestsAccess().getImportURISTRINGTerminalRuleCall_1_0()); }
-	RULE_STRING{ after(grammarAccess.getTestsAccess().getImportURISTRINGTerminalRuleCall_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Constraint__MeasureAssignment_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getConstraintAccess().getMeasureMeasureEnumRuleCall_0_0()); }
-	ruleMeasure{ after(grammarAccess.getConstraintAccess().getMeasureMeasureEnumRuleCall_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Constraint__AgentAssignment_2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getConstraintAccess().getAgentSAgentCrossReference_2_0()); }
-(
-{ before(grammarAccess.getConstraintAccess().getAgentSAgentSTRINGTerminalRuleCall_2_0_1()); }
-	RULE_STRING{ after(grammarAccess.getConstraintAccess().getAgentSAgentSTRINGTerminalRuleCall_2_0_1()); }
-)
-{ after(grammarAccess.getConstraintAccess().getAgentSAgentCrossReference_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Constraint__AttributeAssignment_4
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getConstraintAccess().getAttributeSAttributeCrossReference_4_0()); }
-(
-{ before(grammarAccess.getConstraintAccess().getAttributeSAttributeSTRINGTerminalRuleCall_4_0_1()); }
-	RULE_STRING{ after(grammarAccess.getConstraintAccess().getAttributeSAttributeSTRINGTerminalRuleCall_4_0_1()); }
-)
-{ after(grammarAccess.getConstraintAccess().getAttributeSAttributeCrossReference_4_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Constraint__QualifierAssignment_5_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getConstraintAccess().getQualifierSStateValueCrossReference_5_1_0()); }
-(
-{ before(grammarAccess.getConstraintAccess().getQualifierSStateValueSTRINGTerminalRuleCall_5_1_0_1()); }
-	RULE_STRING{ after(grammarAccess.getConstraintAccess().getQualifierSStateValueSTRINGTerminalRuleCall_5_1_0_1()); }
-)
-{ after(grammarAccess.getConstraintAccess().getQualifierSStateValueCrossReference_5_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Constraint__MinValueAssignment_7_2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getConstraintAccess().getMinValueAlternatives_7_2_0()); }
-(rule__Constraint__MinValueAlternatives_7_2_0)
-{ after(grammarAccess.getConstraintAccess().getMinValueAlternatives_7_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Constraint__MaxValueAssignment_7_4
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getConstraintAccess().getMaxValueAlternatives_7_4_0()); }
-(rule__Constraint__MaxValueAlternatives_7_4_0)
-{ after(grammarAccess.getConstraintAccess().getMaxValueAlternatives_7_4_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__IntValue__ValueAssignment
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getIntValueAccess().getValueINTTerminalRuleCall_0()); }
-	RULE_INT{ after(grammarAccess.getIntValueAccess().getValueINTTerminalRuleCall_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__RealValue__ValueAssignment
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getRealValueAccess().getValueREALTerminalRuleCall_0()); }
-	RULE_REAL{ after(grammarAccess.getRealValueAccess().getValueREALTerminalRuleCall_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-RULE_REAL : '-'? RULE_INT ('.' RULE_INT)?;
+RULE_REAL : '-'? RULE_INT '.' RULE_INT;
 
 RULE_PLAIN_STRING : '\u00AB' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'\u00AB'|'\u00BB')))* '\u00BB';
 
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.tokens b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.tokens
index 86b2959..c3530f6 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.tokens
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.tokens
@@ -1,9 +1,9 @@
-RULE_PLAIN_STRING=5
+RULE_PLAIN_STRING=7
 RULE_ID=8
-RULE_STRING=4
+RULE_STRING=6
 RULE_ANY_OTHER=12
-RULE_INT=6
-RULE_REAL=7
+RULE_INT=4
+RULE_REAL=5
 RULE_WS=11
 RULE_SL_COMMENT=10
 RULE_ML_COMMENT=9
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATestLexer.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATestLexer.java
index 817d299..4fabe7d 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATestLexer.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATestLexer.java
@@ -23,10 +23,10 @@
     public static final int T21=21;
     public static final int T20=20;
     public static final int RULE_ML_COMMENT=9;
-    public static final int RULE_PLAIN_STRING=5;
-    public static final int RULE_STRING=4;
-    public static final int RULE_INT=6;
-    public static final int RULE_REAL=7;
+    public static final int RULE_PLAIN_STRING=7;
+    public static final int RULE_STRING=6;
+    public static final int RULE_INT=4;
+    public static final int RULE_REAL=5;
     public static final int T13=13;
     public static final int T14=14;
     public static final int RULE_WS=11;
@@ -285,10 +285,10 @@
     public final void mRULE_REAL() throws RecognitionException {
         try {
             int _type = RULE_REAL;
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:963:11: ( ( '-' )? RULE_INT ( '.' RULE_INT )? )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:963:13: ( '-' )? RULE_INT ( '.' RULE_INT )?
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:542:11: ( ( '-' )? RULE_INT '.' RULE_INT )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:542:13: ( '-' )? RULE_INT '.' RULE_INT
             {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:963:13: ( '-' )?
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:542:13: ( '-' )?
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -297,7 +297,7 @@
             }
             switch (alt1) {
                 case 1 :
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:963:13: '-'
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:542:13: '-'
                     {
                     match('-'); 
 
@@ -307,25 +307,8 @@
             }
 
             mRULE_INT(); 
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:963:27: ( '.' RULE_INT )?
-            int alt2=2;
-            int LA2_0 = input.LA(1);
-
-            if ( (LA2_0=='.') ) {
-                alt2=1;
-            }
-            switch (alt2) {
-                case 1 :
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:963:28: '.' RULE_INT
-                    {
-                    match('.'); 
-                    mRULE_INT(); 
-
-                    }
-                    break;
-
-            }
-
+            match('.'); 
+            mRULE_INT(); 
 
             }
 
@@ -340,27 +323,27 @@
     public final void mRULE_PLAIN_STRING() throws RecognitionException {
         try {
             int _type = RULE_PLAIN_STRING;
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:965:19: ( '\\u00AB' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\u00AB' | '\\u00BB' ) ) )* '\\u00BB' )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:965:21: '\\u00AB' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\u00AB' | '\\u00BB' ) ) )* '\\u00BB'
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:544:19: ( '\\u00AB' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\u00AB' | '\\u00BB' ) ) )* '\\u00BB' )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:544:21: '\\u00AB' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\u00AB' | '\\u00BB' ) ) )* '\\u00BB'
             {
             match('\u00AB'); 
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:965:30: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\u00AB' | '\\u00BB' ) ) )*
-            loop3:
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:544:30: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\u00AB' | '\\u00BB' ) ) )*
+            loop2:
             do {
-                int alt3=3;
-                int LA3_0 = input.LA(1);
+                int alt2=3;
+                int LA2_0 = input.LA(1);
 
-                if ( (LA3_0=='\\') ) {
-                    alt3=1;
+                if ( (LA2_0=='\\') ) {
+                    alt2=1;
                 }
-                else if ( ((LA3_0>='\u0000' && LA3_0<='[')||(LA3_0>=']' && LA3_0<='\u00AA')||(LA3_0>='\u00AC' && LA3_0<='\u00BA')||(LA3_0>='\u00BC' && LA3_0<='\uFFFE')) ) {
-                    alt3=2;
+                else if ( ((LA2_0>='\u0000' && LA2_0<='[')||(LA2_0>=']' && LA2_0<='\u00AA')||(LA2_0>='\u00AC' && LA2_0<='\u00BA')||(LA2_0>='\u00BC' && LA2_0<='\uFFFE')) ) {
+                    alt2=2;
                 }
 
 
-                switch (alt3) {
+                switch (alt2) {
             	case 1 :
-            	    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:965:31: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
+            	    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:544:31: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
             	    {
             	    match('\\'); 
             	    if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t' ) {
@@ -377,7 +360,7 @@
             	    }
             	    break;
             	case 2 :
-            	    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:965:72: ~ ( ( '\\\\' | '\\u00AB' | '\\u00BB' ) )
+            	    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:544:72: ~ ( ( '\\\\' | '\\u00AB' | '\\u00BB' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\u00AA')||(input.LA(1)>='\u00AC' && input.LA(1)<='\u00BA')||(input.LA(1)>='\u00BC' && input.LA(1)<='\uFFFE') ) {
             	        input.consume();
@@ -394,7 +377,7 @@
             	    break;
 
             	default :
-            	    break loop3;
+            	    break loop2;
                 }
             } while (true);
 
@@ -413,19 +396,19 @@
     public final void mRULE_ID() throws RecognitionException {
         try {
             int _type = RULE_ID;
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:967:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:967:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:546:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:546:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:967:11: ( '^' )?
-            int alt4=2;
-            int LA4_0 = input.LA(1);
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:546:11: ( '^' )?
+            int alt3=2;
+            int LA3_0 = input.LA(1);
 
-            if ( (LA4_0=='^') ) {
-                alt4=1;
+            if ( (LA3_0=='^') ) {
+                alt3=1;
             }
-            switch (alt4) {
+            switch (alt3) {
                 case 1 :
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:967:11: '^'
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:546:11: '^'
                     {
                     match('^'); 
 
@@ -444,18 +427,18 @@
                 recover(mse);    throw mse;
             }
 
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:967:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
-            loop5:
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:546:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            loop4:
             do {
-                int alt5=2;
-                int LA5_0 = input.LA(1);
+                int alt4=2;
+                int LA4_0 = input.LA(1);
 
-                if ( ((LA5_0>='0' && LA5_0<='9')||(LA5_0>='A' && LA5_0<='Z')||LA5_0=='_'||(LA5_0>='a' && LA5_0<='z')) ) {
-                    alt5=1;
+                if ( ((LA4_0>='0' && LA4_0<='9')||(LA4_0>='A' && LA4_0<='Z')||LA4_0=='_'||(LA4_0>='a' && LA4_0<='z')) ) {
+                    alt4=1;
                 }
 
 
-                switch (alt5) {
+                switch (alt4) {
             	case 1 :
             	    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:
             	    {
@@ -474,7 +457,7 @@
             	    break;
 
             	default :
-            	    break loop5;
+            	    break loop4;
                 }
             } while (true);
 
@@ -492,24 +475,24 @@
     public final void mRULE_INT() throws RecognitionException {
         try {
             int _type = RULE_INT;
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:969:10: ( ( '0' .. '9' )+ )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:969:12: ( '0' .. '9' )+
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:548:10: ( ( '0' .. '9' )+ )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:548:12: ( '0' .. '9' )+
             {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:969:12: ( '0' .. '9' )+
-            int cnt6=0;
-            loop6:
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:548:12: ( '0' .. '9' )+
+            int cnt5=0;
+            loop5:
             do {
-                int alt6=2;
-                int LA6_0 = input.LA(1);
+                int alt5=2;
+                int LA5_0 = input.LA(1);
 
-                if ( ((LA6_0>='0' && LA6_0<='9')) ) {
-                    alt6=1;
+                if ( ((LA5_0>='0' && LA5_0<='9')) ) {
+                    alt5=1;
                 }
 
 
-                switch (alt6) {
+                switch (alt5) {
             	case 1 :
-            	    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:969:13: '0' .. '9'
+            	    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:548:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -517,12 +500,12 @@
             	    break;
 
             	default :
-            	    if ( cnt6 >= 1 ) break loop6;
+            	    if ( cnt5 >= 1 ) break loop5;
                         EarlyExitException eee =
-                            new EarlyExitException(6, input);
+                            new EarlyExitException(5, input);
                         throw eee;
                 }
-                cnt6++;
+                cnt5++;
             } while (true);
 
 
@@ -539,47 +522,47 @@
     public final void mRULE_STRING() throws RecognitionException {
         try {
             int _type = RULE_STRING;
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:971:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:971:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:550:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:550:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:971:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
-            int alt9=2;
-            int LA9_0 = input.LA(1);
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:550:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            int alt8=2;
+            int LA8_0 = input.LA(1);
 
-            if ( (LA9_0=='\"') ) {
-                alt9=1;
+            if ( (LA8_0=='\"') ) {
+                alt8=1;
             }
-            else if ( (LA9_0=='\'') ) {
-                alt9=2;
+            else if ( (LA8_0=='\'') ) {
+                alt8=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("971:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 9, 0, input);
+                    new NoViableAltException("550:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 8, 0, input);
 
                 throw nvae;
             }
-            switch (alt9) {
+            switch (alt8) {
                 case 1 :
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:971:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:550:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:971:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
-                    loop7:
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:550:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
+                    loop6:
                     do {
-                        int alt7=3;
-                        int LA7_0 = input.LA(1);
+                        int alt6=3;
+                        int LA6_0 = input.LA(1);
 
-                        if ( (LA7_0=='\\') ) {
-                            alt7=1;
+                        if ( (LA6_0=='\\') ) {
+                            alt6=1;
                         }
-                        else if ( ((LA7_0>='\u0000' && LA7_0<='!')||(LA7_0>='#' && LA7_0<='[')||(LA7_0>=']' && LA7_0<='\uFFFE')) ) {
-                            alt7=2;
+                        else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>=']' && LA6_0<='\uFFFE')) ) {
+                            alt6=2;
                         }
 
 
-                        switch (alt7) {
+                        switch (alt6) {
                     	case 1 :
-                    	    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:971:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
+                    	    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:550:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
                     	    {
                     	    match('\\'); 
                     	    if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t' ) {
@@ -596,7 +579,7 @@
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:971:62: ~ ( ( '\\\\' | '\"' ) )
+                    	    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:550:62: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
                     	        input.consume();
@@ -613,7 +596,7 @@
                     	    break;
 
                     	default :
-                    	    break loop7;
+                    	    break loop6;
                         }
                     } while (true);
 
@@ -622,26 +605,26 @@
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:971:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:550:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:971:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
-                    loop8:
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:550:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    loop7:
                     do {
-                        int alt8=3;
-                        int LA8_0 = input.LA(1);
+                        int alt7=3;
+                        int LA7_0 = input.LA(1);
 
-                        if ( (LA8_0=='\\') ) {
-                            alt8=1;
+                        if ( (LA7_0=='\\') ) {
+                            alt7=1;
                         }
-                        else if ( ((LA8_0>='\u0000' && LA8_0<='&')||(LA8_0>='(' && LA8_0<='[')||(LA8_0>=']' && LA8_0<='\uFFFE')) ) {
-                            alt8=2;
+                        else if ( ((LA7_0>='\u0000' && LA7_0<='&')||(LA7_0>='(' && LA7_0<='[')||(LA7_0>=']' && LA7_0<='\uFFFE')) ) {
+                            alt7=2;
                         }
 
 
-                        switch (alt8) {
+                        switch (alt7) {
                     	case 1 :
-                    	    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:971:88: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
+                    	    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:550:88: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
                     	    {
                     	    match('\\'); 
                     	    if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t' ) {
@@ -658,7 +641,7 @@
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:971:129: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:550:129: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
                     	        input.consume();
@@ -675,7 +658,7 @@
                     	    break;
 
                     	default :
-                    	    break loop8;
+                    	    break loop7;
                         }
                     } while (true);
 
@@ -700,37 +683,37 @@
     public final void mRULE_ML_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_ML_COMMENT;
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:973:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:973:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:552:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:552:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:973:24: ( options {greedy=false; } : . )*
-            loop10:
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:552:24: ( options {greedy=false; } : . )*
+            loop9:
             do {
-                int alt10=2;
-                int LA10_0 = input.LA(1);
+                int alt9=2;
+                int LA9_0 = input.LA(1);
 
-                if ( (LA10_0=='*') ) {
-                    int LA10_1 = input.LA(2);
+                if ( (LA9_0=='*') ) {
+                    int LA9_1 = input.LA(2);
 
-                    if ( (LA10_1=='/') ) {
-                        alt10=2;
+                    if ( (LA9_1=='/') ) {
+                        alt9=2;
                     }
-                    else if ( ((LA10_1>='\u0000' && LA10_1<='.')||(LA10_1>='0' && LA10_1<='\uFFFE')) ) {
-                        alt10=1;
+                    else if ( ((LA9_1>='\u0000' && LA9_1<='.')||(LA9_1>='0' && LA9_1<='\uFFFE')) ) {
+                        alt9=1;
                     }
 
 
                 }
-                else if ( ((LA10_0>='\u0000' && LA10_0<=')')||(LA10_0>='+' && LA10_0<='\uFFFE')) ) {
-                    alt10=1;
+                else if ( ((LA9_0>='\u0000' && LA9_0<=')')||(LA9_0>='+' && LA9_0<='\uFFFE')) ) {
+                    alt9=1;
                 }
 
 
-                switch (alt10) {
+                switch (alt9) {
             	case 1 :
-            	    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:973:52: .
+            	    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:552:52: .
             	    {
             	    matchAny(); 
 
@@ -738,7 +721,7 @@
             	    break;
 
             	default :
-            	    break loop10;
+            	    break loop9;
                 }
             } while (true);
 
@@ -758,25 +741,25 @@
     public final void mRULE_SL_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_SL_COMMENT;
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:975:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:975:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:554:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:554:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:975:24: (~ ( ( '\\n' | '\\r' ) ) )*
-            loop11:
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:554:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            loop10:
             do {
-                int alt11=2;
-                int LA11_0 = input.LA(1);
+                int alt10=2;
+                int LA10_0 = input.LA(1);
 
-                if ( ((LA11_0>='\u0000' && LA11_0<='\t')||(LA11_0>='\u000B' && LA11_0<='\f')||(LA11_0>='\u000E' && LA11_0<='\uFFFE')) ) {
-                    alt11=1;
+                if ( ((LA10_0>='\u0000' && LA10_0<='\t')||(LA10_0>='\u000B' && LA10_0<='\f')||(LA10_0>='\u000E' && LA10_0<='\uFFFE')) ) {
+                    alt10=1;
                 }
 
 
-                switch (alt11) {
+                switch (alt10) {
             	case 1 :
-            	    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:975:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:554:24: ~ ( ( '\\n' | '\\r' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFE') ) {
             	        input.consume();
@@ -793,31 +776,31 @@
             	    break;
 
             	default :
-            	    break loop11;
+            	    break loop10;
                 }
             } while (true);
 
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:975:40: ( ( '\\r' )? '\\n' )?
-            int alt13=2;
-            int LA13_0 = input.LA(1);
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:554:40: ( ( '\\r' )? '\\n' )?
+            int alt12=2;
+            int LA12_0 = input.LA(1);
 
-            if ( (LA13_0=='\n'||LA13_0=='\r') ) {
-                alt13=1;
+            if ( (LA12_0=='\n'||LA12_0=='\r') ) {
+                alt12=1;
             }
-            switch (alt13) {
+            switch (alt12) {
                 case 1 :
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:975:41: ( '\\r' )? '\\n'
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:554:41: ( '\\r' )? '\\n'
                     {
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:975:41: ( '\\r' )?
-                    int alt12=2;
-                    int LA12_0 = input.LA(1);
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:554:41: ( '\\r' )?
+                    int alt11=2;
+                    int LA11_0 = input.LA(1);
 
-                    if ( (LA12_0=='\r') ) {
-                        alt12=1;
+                    if ( (LA11_0=='\r') ) {
+                        alt11=1;
                     }
-                    switch (alt12) {
+                    switch (alt11) {
                         case 1 :
-                            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:975:41: '\\r'
+                            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:554:41: '\\r'
                             {
                             match('\r'); 
 
@@ -847,22 +830,22 @@
     public final void mRULE_WS() throws RecognitionException {
         try {
             int _type = RULE_WS;
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:977:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:977:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:556:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:556:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:977:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
-            int cnt14=0;
-            loop14:
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:556:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            int cnt13=0;
+            loop13:
             do {
-                int alt14=2;
-                int LA14_0 = input.LA(1);
+                int alt13=2;
+                int LA13_0 = input.LA(1);
 
-                if ( ((LA14_0>='\t' && LA14_0<='\n')||LA14_0=='\r'||LA14_0==' ') ) {
-                    alt14=1;
+                if ( ((LA13_0>='\t' && LA13_0<='\n')||LA13_0=='\r'||LA13_0==' ') ) {
+                    alt13=1;
                 }
 
 
-                switch (alt14) {
+                switch (alt13) {
             	case 1 :
             	    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:
             	    {
@@ -881,12 +864,12 @@
             	    break;
 
             	default :
-            	    if ( cnt14 >= 1 ) break loop14;
+            	    if ( cnt13 >= 1 ) break loop13;
                         EarlyExitException eee =
-                            new EarlyExitException(14, input);
+                            new EarlyExitException(13, input);
                         throw eee;
                 }
-                cnt14++;
+                cnt13++;
             } while (true);
 
 
@@ -903,8 +886,8 @@
     public final void mRULE_ANY_OTHER() throws RecognitionException {
         try {
             int _type = RULE_ANY_OTHER;
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:979:16: ( . )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:979:18: .
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:558:16: ( . )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:558:18: .
             {
             matchAny(); 
 
@@ -919,9 +902,9 @@
 
     public void mTokens() throws RecognitionException {
         // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:1:8: ( T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | RULE_REAL | RULE_PLAIN_STRING | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
-        int alt15=22;
-        alt15 = dfa15.predict(input);
-        switch (alt15) {
+        int alt14=22;
+        alt14 = dfa14.predict(input);
+        switch (alt14) {
             case 1 :
                 // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:1:10: T13
                 {
@@ -1082,33 +1065,33 @@
     }
 
 
-    protected DFA15 dfa15 = new DFA15(this);
-    static final String DFA15_eotS =
-        "\1\uffff\5\30\7\uffff\1\26\1\45\2\26\1\uffff\3\26\2\uffff\1\30\1"+
-        "\uffff\5\30\10\uffff\1\45\5\uffff\2\30\1\64\5\30\1\uffff\3\30\1"+
-        "\75\3\30\1\101\1\uffff\3\30\1\uffff\1\105\1\106\1\107\3\uffff";
-    static final String DFA15_eofS =
-        "\110\uffff";
-    static final String DFA15_minS =
-        "\1\0\1\157\1\166\1\165\1\141\1\105\7\uffff\2\60\1\0\1\101\1\uffff"+
-        "\2\0\1\52\2\uffff\1\165\1\uffff\1\145\1\155\1\156\1\170\1\123\10"+
-        "\uffff\1\60\5\uffff\1\156\1\162\1\60\2\151\1\124\1\164\1\141\1\uffff"+
-        "\2\155\1\123\1\60\1\147\2\165\1\60\1\uffff\1\145\2\155\1\uffff\3"+
-        "\60\3\uffff";
-    static final String DFA15_maxS =
+    protected DFA14 dfa14 = new DFA14(this);
+    static final String DFA14_eotS =
+        "\1\uffff\5\30\7\uffff\1\26\1\46\2\26\1\uffff\3\26\2\uffff\1\30\1"+
+        "\uffff\5\30\11\uffff\1\46\5\uffff\2\30\1\65\5\30\1\uffff\3\30\1"+
+        "\76\3\30\1\102\1\uffff\3\30\1\uffff\1\106\1\107\1\110\3\uffff";
+    static final String DFA14_eofS =
+        "\111\uffff";
+    static final String DFA14_minS =
+        "\1\0\1\157\1\166\1\165\1\141\1\105\7\uffff\1\60\1\56\1\0\1\101\1"+
+        "\uffff\2\0\1\52\2\uffff\1\165\1\uffff\1\145\1\155\1\170\1\156\1"+
+        "\123\11\uffff\1\56\5\uffff\1\156\1\162\1\60\2\151\1\124\1\164\1"+
+        "\141\1\uffff\2\155\1\123\1\60\1\147\2\165\1\60\1\uffff\1\145\2\155"+
+        "\1\uffff\3\60\3\uffff";
+    static final String DFA14_maxS =
         "\1\ufffe\1\157\1\166\1\165\1\151\1\105\7\uffff\2\71\1\ufffe\1\172"+
-        "\1\uffff\2\ufffe\1\57\2\uffff\1\165\1\uffff\1\145\1\155\1\156\1"+
-        "\170\1\123\10\uffff\1\71\5\uffff\1\156\1\162\1\172\2\151\1\124\1"+
+        "\1\uffff\2\ufffe\1\57\2\uffff\1\165\1\uffff\1\145\1\155\1\170\1"+
+        "\156\1\123\11\uffff\1\71\5\uffff\1\156\1\162\1\172\2\151\1\124\1"+
         "\164\1\141\1\uffff\2\155\1\123\1\172\1\147\2\165\1\172\1\uffff\1"+
         "\145\2\155\1\uffff\3\172\3\uffff";
-    static final String DFA15_acceptS =
+    static final String DFA14_acceptS =
         "\6\uffff\1\7\1\10\1\11\1\12\1\13\1\14\1\15\4\uffff\1\20\3\uffff"+
         "\1\25\1\26\1\uffff\1\20\5\uffff\1\7\1\10\1\11\1\12\1\13\1\14\1\15"+
-        "\1\16\1\uffff\1\17\1\22\1\23\1\24\1\25\10\uffff\1\3\10\uffff\1\1"+
-        "\3\uffff\1\6\3\uffff\1\2\1\4\1\5";
-    static final String DFA15_specialS =
-        "\110\uffff}>";
-    static final String[] DFA15_transitionS = {
+        "\1\16\1\21\1\uffff\1\17\1\22\1\23\1\24\1\25\10\uffff\1\3\10\uffff"+
+        "\1\1\3\uffff\1\6\3\uffff\1\2\1\5\1\4";
+    static final String DFA14_specialS =
+        "\111\uffff}>";
+    static final String[] DFA14_transitionS = {
             "\11\26\2\25\2\26\1\25\22\26\1\25\1\26\1\22\4\26\1\23\1\6\1\10"+
             "\2\26\1\13\1\15\1\26\1\24\12\16\1\7\2\26\1\11\3\26\1\2\1\21"+
             "\1\1\11\21\1\4\5\21\1\3\1\5\6\21\1\12\1\26\1\14\1\20\1\21\1"+
@@ -1116,7 +1099,7 @@
             "\1\27",
             "\1\31",
             "\1\32",
-            "\1\34\7\uffff\1\33",
+            "\1\33\7\uffff\1\34",
             "\1\35",
             "",
             "",
@@ -1126,57 +1109,58 @@
             "",
             "",
             "\12\45",
-            "\12\46",
-            "\u00ab\47\1\uffff\uff53\47",
+            "\1\45\1\uffff\12\47",
+            "\u00ab\50\1\uffff\uff53\50",
             "\32\30\4\uffff\1\30\1\uffff\32\30",
             "",
-            "\uffff\50",
-            "\uffff\50",
-            "\1\51\4\uffff\1\52",
+            "\uffff\51",
+            "\uffff\51",
+            "\1\52\4\uffff\1\53",
             "",
             "",
-            "\1\54",
-            "",
             "\1\55",
+            "",
             "\1\56",
             "\1\57",
             "\1\60",
             "\1\61",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "\12\46",
-            "",
-            "",
-            "",
-            "",
-            "",
             "\1\62",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "\1\45\1\uffff\12\47",
+            "",
+            "",
+            "",
+            "",
+            "",
             "\1\63",
+            "\1\64",
             "\12\30\7\uffff\32\30\4\uffff\1\30\1\uffff\32\30",
-            "\1\65",
             "\1\66",
             "\1\67",
             "\1\70",
             "\1\71",
-            "",
             "\1\72",
+            "",
             "\1\73",
             "\1\74",
+            "\1\75",
             "\12\30\7\uffff\32\30\4\uffff\1\30\1\uffff\32\30",
-            "\1\76",
             "\1\77",
             "\1\100",
+            "\1\101",
             "\12\30\7\uffff\32\30\4\uffff\1\30\1\uffff\32\30",
             "",
-            "\1\102",
             "\1\103",
             "\1\104",
+            "\1\105",
             "",
             "\12\30\7\uffff\32\30\4\uffff\1\30\1\uffff\32\30",
             "\12\30\7\uffff\32\30\4\uffff\1\30\1\uffff\32\30",
@@ -1186,34 +1170,34 @@
             ""
     };
 
-    static final short[] DFA15_eot = DFA.unpackEncodedString(DFA15_eotS);
-    static final short[] DFA15_eof = DFA.unpackEncodedString(DFA15_eofS);
-    static final char[] DFA15_min = DFA.unpackEncodedStringToUnsignedChars(DFA15_minS);
-    static final char[] DFA15_max = DFA.unpackEncodedStringToUnsignedChars(DFA15_maxS);
-    static final short[] DFA15_accept = DFA.unpackEncodedString(DFA15_acceptS);
-    static final short[] DFA15_special = DFA.unpackEncodedString(DFA15_specialS);
-    static final short[][] DFA15_transition;
+    static final short[] DFA14_eot = DFA.unpackEncodedString(DFA14_eotS);
+    static final short[] DFA14_eof = DFA.unpackEncodedString(DFA14_eofS);
+    static final char[] DFA14_min = DFA.unpackEncodedStringToUnsignedChars(DFA14_minS);
+    static final char[] DFA14_max = DFA.unpackEncodedStringToUnsignedChars(DFA14_maxS);
+    static final short[] DFA14_accept = DFA.unpackEncodedString(DFA14_acceptS);
+    static final short[] DFA14_special = DFA.unpackEncodedString(DFA14_specialS);
+    static final short[][] DFA14_transition;
 
     static {
-        int numStates = DFA15_transitionS.length;
-        DFA15_transition = new short[numStates][];
+        int numStates = DFA14_transitionS.length;
+        DFA14_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA15_transition[i] = DFA.unpackEncodedString(DFA15_transitionS[i]);
+            DFA14_transition[i] = DFA.unpackEncodedString(DFA14_transitionS[i]);
         }
     }
 
-    class DFA15 extends DFA {
+    class DFA14 extends DFA {
 
-        public DFA15(BaseRecognizer recognizer) {
+        public DFA14(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 15;
-            this.eot = DFA15_eot;
-            this.eof = DFA15_eof;
-            this.min = DFA15_min;
-            this.max = DFA15_max;
-            this.accept = DFA15_accept;
-            this.special = DFA15_special;
-            this.transition = DFA15_transition;
+            this.decisionNumber = 14;
+            this.eot = DFA14_eot;
+            this.eof = DFA14_eof;
+            this.min = DFA14_min;
+            this.max = DFA14_max;
+            this.accept = DFA14_accept;
+            this.special = DFA14_special;
+            this.transition = DFA14_transition;
         }
         public String getDescription() {
             return "1:1: Tokens : ( T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | RULE_REAL | RULE_PLAIN_STRING | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATestParser.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATestParser.java
index 7b37528..f276651 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATestParser.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATestParser.java
@@ -21,14 +21,14 @@
 
 public class InternalATestParser extends AbstractInternalContentAssistParser {
     public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_STRING", "RULE_PLAIN_STRING", "RULE_INT", "RULE_REAL", "RULE_ID", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'Count'", "'Average'", "'Sum'", "'Minimum'", "'Maximum'", "'TESTS'", "'('", "':'", "')'", "'='", "'['", "','", "']'"
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_INT", "RULE_REAL", "RULE_STRING", "RULE_PLAIN_STRING", "RULE_ID", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'Count'", "'Average'", "'Sum'", "'Minimum'", "'Maximum'", "'TESTS'", "'('", "':'", "')'", "'='", "'['", "','", "']'"
     };
-    public static final int RULE_PLAIN_STRING=5;
+    public static final int RULE_PLAIN_STRING=7;
     public static final int RULE_ID=8;
-    public static final int RULE_STRING=4;
+    public static final int RULE_STRING=6;
     public static final int RULE_ANY_OTHER=12;
-    public static final int RULE_INT=6;
-    public static final int RULE_REAL=7;
+    public static final int RULE_INT=4;
+    public static final int RULE_REAL=5;
     public static final int RULE_WS=11;
     public static final int RULE_SL_COMMENT=10;
     public static final int EOF=-1;
@@ -88,24 +88,24 @@
 
 
     // $ANTLR start ruleModel
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:63:1: ruleModel : ( ( rule__Model__Group__0 ) ) ;
+    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:63:1: ruleModel : ( ( rule__Model__Group ) ) ;
     public final void ruleModel() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:67:2: ( ( ( rule__Model__Group__0 ) ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:68:1: ( ( rule__Model__Group__0 ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:67:2: ( ( ( rule__Model__Group ) ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:68:1: ( ( rule__Model__Group ) )
             {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:68:1: ( ( rule__Model__Group__0 ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:69:1: ( rule__Model__Group__0 )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:68:1: ( ( rule__Model__Group ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:69:1: ( rule__Model__Group )
             {
              before(grammarAccess.getModelAccess().getGroup()); 
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:70:1: ( rule__Model__Group__0 )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:70:2: rule__Model__Group__0
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:70:1: ( rule__Model__Group )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:70:2: rule__Model__Group
             {
-            pushFollow(FOLLOW_rule__Model__Group__0_in_ruleModel94);
-            rule__Model__Group__0();
+            pushFollow(FOLLOW_rule__Model__Group_in_ruleModel94);
+            rule__Model__Group();
             _fsp--;
 
 
@@ -134,19 +134,19 @@
 
 
     // $ANTLR start entryRuleTests
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:82:1: entryRuleTests : ruleTests EOF ;
+    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:81:1: entryRuleTests : ruleTests EOF ;
     public final void entryRuleTests() throws RecognitionException {
         try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:82:16: ( ruleTests EOF )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:83:1: ruleTests EOF
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:81:16: ( ruleTests EOF )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:82:1: ruleTests EOF
             {
              before(grammarAccess.getTestsRule()); 
-            pushFollow(FOLLOW_ruleTests_in_entryRuleTests120);
+            pushFollow(FOLLOW_ruleTests_in_entryRuleTests119);
             ruleTests();
             _fsp--;
 
              after(grammarAccess.getTestsRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTests127); 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleTests126); 
 
             }
 
@@ -163,24 +163,24 @@
 
 
     // $ANTLR start ruleTests
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:90:1: ruleTests : ( ( rule__Tests__Group__0 ) ) ;
+    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:89:1: ruleTests : ( ( rule__Tests__Group ) ) ;
     public final void ruleTests() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:94:2: ( ( ( rule__Tests__Group__0 ) ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:95:1: ( ( rule__Tests__Group__0 ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:93:2: ( ( ( rule__Tests__Group ) ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:94:1: ( ( rule__Tests__Group ) )
             {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:95:1: ( ( rule__Tests__Group__0 ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:96:1: ( rule__Tests__Group__0 )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:94:1: ( ( rule__Tests__Group ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:95:1: ( rule__Tests__Group )
             {
              before(grammarAccess.getTestsAccess().getGroup()); 
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:97:1: ( rule__Tests__Group__0 )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:97:2: rule__Tests__Group__0
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:96:1: ( rule__Tests__Group )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:96:2: rule__Tests__Group
             {
-            pushFollow(FOLLOW_rule__Tests__Group__0_in_ruleTests154);
-            rule__Tests__Group__0();
+            pushFollow(FOLLOW_rule__Tests__Group_in_ruleTests153);
+            rule__Tests__Group();
             _fsp--;
 
 
@@ -209,19 +209,19 @@
 
 
     // $ANTLR start entryRuleConstraint
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:109:1: entryRuleConstraint : ruleConstraint EOF ;
+    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:107:1: entryRuleConstraint : ruleConstraint EOF ;
     public final void entryRuleConstraint() throws RecognitionException {
         try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:109:21: ( ruleConstraint EOF )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:110:1: ruleConstraint EOF
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:107:21: ( ruleConstraint EOF )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:108:1: ruleConstraint EOF
             {
              before(grammarAccess.getConstraintRule()); 
-            pushFollow(FOLLOW_ruleConstraint_in_entryRuleConstraint180);
+            pushFollow(FOLLOW_ruleConstraint_in_entryRuleConstraint178);
             ruleConstraint();
             _fsp--;
 
              after(grammarAccess.getConstraintRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleConstraint187); 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleConstraint185); 
 
             }
 
@@ -238,24 +238,24 @@
 
 
     // $ANTLR start ruleConstraint
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:117:1: ruleConstraint : ( ( rule__Constraint__Group__0 ) ) ;
+    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:115:1: ruleConstraint : ( ( rule__Constraint__Group ) ) ;
     public final void ruleConstraint() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:121:2: ( ( ( rule__Constraint__Group__0 ) ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:122:1: ( ( rule__Constraint__Group__0 ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:119:2: ( ( ( rule__Constraint__Group ) ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:120:1: ( ( rule__Constraint__Group ) )
             {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:122:1: ( ( rule__Constraint__Group__0 ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:123:1: ( rule__Constraint__Group__0 )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:120:1: ( ( rule__Constraint__Group ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:121:1: ( rule__Constraint__Group )
             {
              before(grammarAccess.getConstraintAccess().getGroup()); 
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:124:1: ( rule__Constraint__Group__0 )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:124:2: rule__Constraint__Group__0
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:122:1: ( rule__Constraint__Group )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:122:2: rule__Constraint__Group
             {
-            pushFollow(FOLLOW_rule__Constraint__Group__0_in_ruleConstraint214);
-            rule__Constraint__Group__0();
+            pushFollow(FOLLOW_rule__Constraint__Group_in_ruleConstraint212);
+            rule__Constraint__Group();
             _fsp--;
 
 
@@ -283,20 +283,95 @@
     // $ANTLR end ruleConstraint
 
 
+    // $ANTLR start entryRuleValue
+    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:133:1: entryRuleValue : ruleValue EOF ;
+    public final void entryRuleValue() throws RecognitionException {
+        try {
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:133:16: ( ruleValue EOF )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:134:1: ruleValue EOF
+            {
+             before(grammarAccess.getValueRule()); 
+            pushFollow(FOLLOW_ruleValue_in_entryRuleValue237);
+            ruleValue();
+            _fsp--;
+
+             after(grammarAccess.getValueRule()); 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleValue244); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end entryRuleValue
+
+
+    // $ANTLR start ruleValue
+    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:141:1: ruleValue : ( ( rule__Value__Alternatives ) ) ;
+    public final void ruleValue() throws RecognitionException {
+
+        		int stackSize = keepStackSize();
+            
+        try {
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:145:2: ( ( ( rule__Value__Alternatives ) ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:146:1: ( ( rule__Value__Alternatives ) )
+            {
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:146:1: ( ( rule__Value__Alternatives ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:147:1: ( rule__Value__Alternatives )
+            {
+             before(grammarAccess.getValueAccess().getAlternatives()); 
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:148:1: ( rule__Value__Alternatives )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:148:2: rule__Value__Alternatives
+            {
+            pushFollow(FOLLOW_rule__Value__Alternatives_in_ruleValue271);
+            rule__Value__Alternatives();
+            _fsp--;
+
+
+            }
+
+             after(grammarAccess.getValueAccess().getAlternatives()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end ruleValue
+
+
     // $ANTLR start entryRuleIntValue
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:136:1: entryRuleIntValue : ruleIntValue EOF ;
+    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:159:1: entryRuleIntValue : ruleIntValue EOF ;
     public final void entryRuleIntValue() throws RecognitionException {
         try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:136:19: ( ruleIntValue EOF )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:137:1: ruleIntValue EOF
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:159:19: ( ruleIntValue EOF )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:160:1: ruleIntValue EOF
             {
              before(grammarAccess.getIntValueRule()); 
-            pushFollow(FOLLOW_ruleIntValue_in_entryRuleIntValue240);
+            pushFollow(FOLLOW_ruleIntValue_in_entryRuleIntValue296);
             ruleIntValue();
             _fsp--;
 
              after(grammarAccess.getIntValueRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIntValue247); 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleIntValue303); 
 
             }
 
@@ -313,25 +388,30 @@
 
 
     // $ANTLR start ruleIntValue
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:144:1: ruleIntValue : ( ( rule__IntValue__ValueAssignment ) ) ;
+    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:167:1: ruleIntValue : ( ( ( RULE_INT ) ) ) ;
     public final void ruleIntValue() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:148:2: ( ( ( rule__IntValue__ValueAssignment ) ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:149:1: ( ( rule__IntValue__ValueAssignment ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:171:2: ( ( ( ( RULE_INT ) ) ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:172:1: ( ( ( RULE_INT ) ) )
             {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:149:1: ( ( rule__IntValue__ValueAssignment ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:150:1: ( rule__IntValue__ValueAssignment )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:172:1: ( ( ( RULE_INT ) ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:173:1: ( ( RULE_INT ) )
             {
              before(grammarAccess.getIntValueAccess().getValueAssignment()); 
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:151:1: ( rule__IntValue__ValueAssignment )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:151:2: rule__IntValue__ValueAssignment
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:174:1: ( ( RULE_INT ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:175:1: ( RULE_INT )
             {
-            pushFollow(FOLLOW_rule__IntValue__ValueAssignment_in_ruleIntValue274);
-            rule__IntValue__ValueAssignment();
-            _fsp--;
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:175:1: ( RULE_INT )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:176:1: RULE_INT
+            {
+             before(grammarAccess.getIntValueAccess().getValueINTTerminalRuleCall_0()); 
+            match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleIntValue337); 
+             after(grammarAccess.getIntValueAccess().getValueINTTerminalRuleCall_0()); 
+
+            }
 
 
             }
@@ -359,19 +439,19 @@
 
 
     // $ANTLR start entryRuleRealValue
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:163:1: entryRuleRealValue : ruleRealValue EOF ;
+    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:191:1: entryRuleRealValue : ruleRealValue EOF ;
     public final void entryRuleRealValue() throws RecognitionException {
         try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:163:20: ( ruleRealValue EOF )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:164:1: ruleRealValue EOF
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:191:20: ( ruleRealValue EOF )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:192:1: ruleRealValue EOF
             {
              before(grammarAccess.getRealValueRule()); 
-            pushFollow(FOLLOW_ruleRealValue_in_entryRuleRealValue300);
+            pushFollow(FOLLOW_ruleRealValue_in_entryRuleRealValue368);
             ruleRealValue();
             _fsp--;
 
              after(grammarAccess.getRealValueRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRealValue307); 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleRealValue375); 
 
             }
 
@@ -388,25 +468,30 @@
 
 
     // $ANTLR start ruleRealValue
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:171:1: ruleRealValue : ( ( rule__RealValue__ValueAssignment ) ) ;
+    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:199:1: ruleRealValue : ( ( ( RULE_REAL ) ) ) ;
     public final void ruleRealValue() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:175:2: ( ( ( rule__RealValue__ValueAssignment ) ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:176:1: ( ( rule__RealValue__ValueAssignment ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:203:2: ( ( ( ( RULE_REAL ) ) ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:204:1: ( ( ( RULE_REAL ) ) )
             {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:176:1: ( ( rule__RealValue__ValueAssignment ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:177:1: ( rule__RealValue__ValueAssignment )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:204:1: ( ( ( RULE_REAL ) ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:205:1: ( ( RULE_REAL ) )
             {
              before(grammarAccess.getRealValueAccess().getValueAssignment()); 
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:178:1: ( rule__RealValue__ValueAssignment )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:178:2: rule__RealValue__ValueAssignment
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:206:1: ( ( RULE_REAL ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:207:1: ( RULE_REAL )
             {
-            pushFollow(FOLLOW_rule__RealValue__ValueAssignment_in_ruleRealValue334);
-            rule__RealValue__ValueAssignment();
-            _fsp--;
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:207:1: ( RULE_REAL )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:208:1: RULE_REAL
+            {
+             before(grammarAccess.getRealValueAccess().getValueREALTerminalRuleCall_0()); 
+            match(input,RULE_REAL,FOLLOW_RULE_REAL_in_ruleRealValue409); 
+             after(grammarAccess.getRealValueAccess().getValueREALTerminalRuleCall_0()); 
+
+            }
 
 
             }
@@ -434,23 +519,23 @@
 
 
     // $ANTLR start ruleMeasure
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:191:1: ruleMeasure : ( ( rule__Measure__Alternatives ) ) ;
+    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:224:1: ruleMeasure : ( ( rule__Measure__Alternatives ) ) ;
     public final void ruleMeasure() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:195:1: ( ( ( rule__Measure__Alternatives ) ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:196:1: ( ( rule__Measure__Alternatives ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:228:1: ( ( ( rule__Measure__Alternatives ) ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:229:1: ( ( rule__Measure__Alternatives ) )
             {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:196:1: ( ( rule__Measure__Alternatives ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:197:1: ( rule__Measure__Alternatives )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:229:1: ( ( rule__Measure__Alternatives ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:230:1: ( rule__Measure__Alternatives )
             {
              before(grammarAccess.getMeasureAccess().getAlternatives()); 
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:198:1: ( rule__Measure__Alternatives )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:198:2: rule__Measure__Alternatives
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:231:1: ( rule__Measure__Alternatives )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:231:2: rule__Measure__Alternatives
             {
-            pushFollow(FOLLOW_rule__Measure__Alternatives_in_ruleMeasure371);
+            pushFollow(FOLLOW_rule__Measure__Alternatives_in_ruleMeasure451);
             rule__Measure__Alternatives();
             _fsp--;
 
@@ -479,14 +564,14 @@
     // $ANTLR end ruleMeasure
 
 
-    // $ANTLR start rule__Constraint__MinValueAlternatives_7_2_0
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:209:1: rule__Constraint__MinValueAlternatives_7_2_0 : ( ( ruleIntValue ) | ( ruleRealValue ) );
-    public final void rule__Constraint__MinValueAlternatives_7_2_0() throws RecognitionException {
+    // $ANTLR start rule__Value__Alternatives
+    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:241:1: rule__Value__Alternatives : ( ( ruleIntValue ) | ( ruleRealValue ) );
+    public final void rule__Value__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:213:1: ( ( ruleIntValue ) | ( ruleRealValue ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:245:1: ( ( ruleIntValue ) | ( ruleRealValue ) )
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -498,23 +583,23 @@
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("209:1: rule__Constraint__MinValueAlternatives_7_2_0 : ( ( ruleIntValue ) | ( ruleRealValue ) );", 1, 0, input);
+                    new NoViableAltException("241:1: rule__Value__Alternatives : ( ( ruleIntValue ) | ( ruleRealValue ) );", 1, 0, input);
 
                 throw nvae;
             }
             switch (alt1) {
                 case 1 :
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:214:1: ( ruleIntValue )
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:246:1: ( ruleIntValue )
                     {
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:214:1: ( ruleIntValue )
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:215:1: ruleIntValue
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:246:1: ( ruleIntValue )
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:247:1: ruleIntValue
                     {
-                     before(grammarAccess.getConstraintAccess().getMinValueIntValueParserRuleCall_7_2_0_0()); 
-                    pushFollow(FOLLOW_ruleIntValue_in_rule__Constraint__MinValueAlternatives_7_2_0406);
+                     before(grammarAccess.getValueAccess().getIntValueParserRuleCall_0()); 
+                    pushFollow(FOLLOW_ruleIntValue_in_rule__Value__Alternatives485);
                     ruleIntValue();
                     _fsp--;
 
-                     after(grammarAccess.getConstraintAccess().getMinValueIntValueParserRuleCall_7_2_0_0()); 
+                     after(grammarAccess.getValueAccess().getIntValueParserRuleCall_0()); 
 
                     }
 
@@ -522,17 +607,17 @@
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:220:6: ( ruleRealValue )
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:251:6: ( ruleRealValue )
                     {
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:220:6: ( ruleRealValue )
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:221:1: ruleRealValue
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:251:6: ( ruleRealValue )
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:252:1: ruleRealValue
                     {
-                     before(grammarAccess.getConstraintAccess().getMinValueRealValueParserRuleCall_7_2_0_1()); 
-                    pushFollow(FOLLOW_ruleRealValue_in_rule__Constraint__MinValueAlternatives_7_2_0423);
+                     before(grammarAccess.getValueAccess().getRealValueParserRuleCall_1()); 
+                    pushFollow(FOLLOW_ruleRealValue_in_rule__Value__Alternatives501);
                     ruleRealValue();
                     _fsp--;
 
-                     after(grammarAccess.getConstraintAccess().getMinValueRealValueParserRuleCall_7_2_0_1()); 
+                     after(grammarAccess.getValueAccess().getRealValueParserRuleCall_1()); 
 
                     }
 
@@ -553,140 +638,63 @@
         }
         return ;
     }
-    // $ANTLR end rule__Constraint__MinValueAlternatives_7_2_0
-
-
-    // $ANTLR start rule__Constraint__MaxValueAlternatives_7_4_0
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:231:1: rule__Constraint__MaxValueAlternatives_7_4_0 : ( ( ruleIntValue ) | ( ruleRealValue ) );
-    public final void rule__Constraint__MaxValueAlternatives_7_4_0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:235:1: ( ( ruleIntValue ) | ( ruleRealValue ) )
-            int alt2=2;
-            int LA2_0 = input.LA(1);
-
-            if ( (LA2_0==RULE_INT) ) {
-                alt2=1;
-            }
-            else if ( (LA2_0==RULE_REAL) ) {
-                alt2=2;
-            }
-            else {
-                NoViableAltException nvae =
-                    new NoViableAltException("231:1: rule__Constraint__MaxValueAlternatives_7_4_0 : ( ( ruleIntValue ) | ( ruleRealValue ) );", 2, 0, input);
-
-                throw nvae;
-            }
-            switch (alt2) {
-                case 1 :
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:236:1: ( ruleIntValue )
-                    {
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:236:1: ( ruleIntValue )
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:237:1: ruleIntValue
-                    {
-                     before(grammarAccess.getConstraintAccess().getMaxValueIntValueParserRuleCall_7_4_0_0()); 
-                    pushFollow(FOLLOW_ruleIntValue_in_rule__Constraint__MaxValueAlternatives_7_4_0455);
-                    ruleIntValue();
-                    _fsp--;
-
-                     after(grammarAccess.getConstraintAccess().getMaxValueIntValueParserRuleCall_7_4_0_0()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:242:6: ( ruleRealValue )
-                    {
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:242:6: ( ruleRealValue )
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:243:1: ruleRealValue
-                    {
-                     before(grammarAccess.getConstraintAccess().getMaxValueRealValueParserRuleCall_7_4_0_1()); 
-                    pushFollow(FOLLOW_ruleRealValue_in_rule__Constraint__MaxValueAlternatives_7_4_0472);
-                    ruleRealValue();
-                    _fsp--;
-
-                     after(grammarAccess.getConstraintAccess().getMaxValueRealValueParserRuleCall_7_4_0_1()); 
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__Constraint__MaxValueAlternatives_7_4_0
+    // $ANTLR end rule__Value__Alternatives
 
 
     // $ANTLR start rule__Measure__Alternatives
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:253:1: rule__Measure__Alternatives : ( ( ( 'Count' ) ) | ( ( 'Average' ) ) | ( ( 'Sum' ) ) | ( ( 'Minimum' ) ) | ( ( 'Maximum' ) ) );
+    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:261:1: rule__Measure__Alternatives : ( ( ( 'Count' ) ) | ( ( 'Average' ) ) | ( ( 'Sum' ) ) | ( ( 'Minimum' ) ) | ( ( 'Maximum' ) ) );
     public final void rule__Measure__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:257:1: ( ( ( 'Count' ) ) | ( ( 'Average' ) ) | ( ( 'Sum' ) ) | ( ( 'Minimum' ) ) | ( ( 'Maximum' ) ) )
-            int alt3=5;
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:265:1: ( ( ( 'Count' ) ) | ( ( 'Average' ) ) | ( ( 'Sum' ) ) | ( ( 'Minimum' ) ) | ( ( 'Maximum' ) ) )
+            int alt2=5;
             switch ( input.LA(1) ) {
             case 13:
                 {
-                alt3=1;
+                alt2=1;
                 }
                 break;
             case 14:
                 {
-                alt3=2;
+                alt2=2;
                 }
                 break;
             case 15:
                 {
-                alt3=3;
+                alt2=3;
                 }
                 break;
             case 16:
                 {
-                alt3=4;
+                alt2=4;
                 }
                 break;
             case 17:
                 {
-                alt3=5;
+                alt2=5;
                 }
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("253:1: rule__Measure__Alternatives : ( ( ( 'Count' ) ) | ( ( 'Average' ) ) | ( ( 'Sum' ) ) | ( ( 'Minimum' ) ) | ( ( 'Maximum' ) ) );", 3, 0, input);
+                    new NoViableAltException("261:1: rule__Measure__Alternatives : ( ( ( 'Count' ) ) | ( ( 'Average' ) ) | ( ( 'Sum' ) ) | ( ( 'Minimum' ) ) | ( ( 'Maximum' ) ) );", 2, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt3) {
+            switch (alt2) {
                 case 1 :
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:258:1: ( ( 'Count' ) )
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:266:1: ( ( 'Count' ) )
                     {
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:258:1: ( ( 'Count' ) )
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:259:1: ( 'Count' )
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:266:1: ( ( 'Count' ) )
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:267:1: ( 'Count' )
                     {
                      before(grammarAccess.getMeasureAccess().getCOUNTEnumLiteralDeclaration_0()); 
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:260:1: ( 'Count' )
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:260:3: 'Count'
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:268:1: ( 'Count' )
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:268:3: 'Count'
                     {
-                    match(input,13,FOLLOW_13_in_rule__Measure__Alternatives505); 
+                    match(input,13,FOLLOW_13_in_rule__Measure__Alternatives533); 
 
                     }
 
@@ -698,16 +706,16 @@
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:265:6: ( ( 'Average' ) )
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:272:6: ( ( 'Average' ) )
                     {
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:265:6: ( ( 'Average' ) )
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:266:1: ( 'Average' )
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:272:6: ( ( 'Average' ) )
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:273:1: ( 'Average' )
                     {
                      before(grammarAccess.getMeasureAccess().getAVERAGEEnumLiteralDeclaration_1()); 
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:267:1: ( 'Average' )
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:267:3: 'Average'
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:274:1: ( 'Average' )
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:274:3: 'Average'
                     {
-                    match(input,14,FOLLOW_14_in_rule__Measure__Alternatives526); 
+                    match(input,14,FOLLOW_14_in_rule__Measure__Alternatives553); 
 
                     }
 
@@ -719,16 +727,16 @@
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:272:6: ( ( 'Sum' ) )
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:278:6: ( ( 'Sum' ) )
                     {
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:272:6: ( ( 'Sum' ) )
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:273:1: ( 'Sum' )
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:278:6: ( ( 'Sum' ) )
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:279:1: ( 'Sum' )
                     {
                      before(grammarAccess.getMeasureAccess().getSUMEnumLiteralDeclaration_2()); 
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:274:1: ( 'Sum' )
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:274:3: 'Sum'
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:280:1: ( 'Sum' )
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:280:3: 'Sum'
                     {
-                    match(input,15,FOLLOW_15_in_rule__Measure__Alternatives547); 
+                    match(input,15,FOLLOW_15_in_rule__Measure__Alternatives573); 
 
                     }
 
@@ -740,16 +748,16 @@
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:279:6: ( ( 'Minimum' ) )
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:284:6: ( ( 'Minimum' ) )
                     {
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:279:6: ( ( 'Minimum' ) )
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:280:1: ( 'Minimum' )
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:284:6: ( ( 'Minimum' ) )
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:285:1: ( 'Minimum' )
                     {
                      before(grammarAccess.getMeasureAccess().getMINIMUMEnumLiteralDeclaration_3()); 
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:281:1: ( 'Minimum' )
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:281:3: 'Minimum'
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:286:1: ( 'Minimum' )
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:286:3: 'Minimum'
                     {
-                    match(input,16,FOLLOW_16_in_rule__Measure__Alternatives568); 
+                    match(input,16,FOLLOW_16_in_rule__Measure__Alternatives593); 
 
                     }
 
@@ -761,16 +769,16 @@
                     }
                     break;
                 case 5 :
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:286:6: ( ( 'Maximum' ) )
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:290:6: ( ( 'Maximum' ) )
                     {
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:286:6: ( ( 'Maximum' ) )
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:287:1: ( 'Maximum' )
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:290:6: ( ( 'Maximum' ) )
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:291:1: ( 'Maximum' )
                     {
                      before(grammarAccess.getMeasureAccess().getMAXIMUMEnumLiteralDeclaration_4()); 
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:288:1: ( 'Maximum' )
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:288:3: 'Maximum'
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:292:1: ( 'Maximum' )
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:292:3: 'Maximum'
                     {
-                    match(input,17,FOLLOW_17_in_rule__Measure__Alternatives589); 
+                    match(input,17,FOLLOW_17_in_rule__Measure__Alternatives613); 
 
                     }
 
@@ -798,34 +806,39 @@
     // $ANTLR end rule__Measure__Alternatives
 
 
-    // $ANTLR start rule__Model__Group__0
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:300:1: rule__Model__Group__0 : ( ( rule__Model__NameAssignment_0 )? ) rule__Model__Group__1 ;
-    public final void rule__Model__Group__0() throws RecognitionException {
+    // $ANTLR start rule__Model__Group
+    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:302:1: rule__Model__Group : ( ( ( RULE_STRING ) )? ) ( ( ( RULE_PLAIN_STRING ) )? ) ( ( ( ruleTests ) )? ) ( ( ( ruleConstraint ) )* ) ;
+    public final void rule__Model__Group() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:304:1: ( ( ( rule__Model__NameAssignment_0 )? ) rule__Model__Group__1 )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:305:1: ( ( rule__Model__NameAssignment_0 )? ) rule__Model__Group__1
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:306:1: ( ( ( ( RULE_STRING ) )? ) ( ( ( RULE_PLAIN_STRING ) )? ) ( ( ( ruleTests ) )? ) ( ( ( ruleConstraint ) )* ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:307:1: ( ( ( RULE_STRING ) )? ) ( ( ( RULE_PLAIN_STRING ) )? ) ( ( ( ruleTests ) )? ) ( ( ( ruleConstraint ) )* )
             {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:305:1: ( ( rule__Model__NameAssignment_0 )? )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:306:1: ( rule__Model__NameAssignment_0 )?
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:307:1: ( ( ( RULE_STRING ) )? )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:308:1: ( ( RULE_STRING ) )?
             {
              before(grammarAccess.getModelAccess().getNameAssignment_0()); 
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:307:1: ( rule__Model__NameAssignment_0 )?
-            int alt4=2;
-            int LA4_0 = input.LA(1);
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:309:1: ( ( RULE_STRING ) )?
+            int alt3=2;
+            int LA3_0 = input.LA(1);
 
-            if ( (LA4_0==RULE_STRING) ) {
-                alt4=1;
+            if ( (LA3_0==RULE_STRING) ) {
+                alt3=1;
             }
-            switch (alt4) {
+            switch (alt3) {
                 case 1 :
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:307:2: rule__Model__NameAssignment_0
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:310:1: ( RULE_STRING )
                     {
-                    pushFollow(FOLLOW_rule__Model__NameAssignment_0_in_rule__Model__Group__0626);
-                    rule__Model__NameAssignment_0();
-                    _fsp--;
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:310:1: ( RULE_STRING )
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:311:1: RULE_STRING
+                    {
+                     before(grammarAccess.getModelAccess().getNameSTRINGTerminalRuleCall_0_0()); 
+                    match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Model__Group655); 
+                     after(grammarAccess.getModelAccess().getNameSTRINGTerminalRuleCall_0_0()); 
+
+                    }
 
 
                     }
@@ -837,56 +850,29 @@
 
             }
 
-            pushFollow(FOLLOW_rule__Model__Group__1_in_rule__Model__Group__0636);
-            rule__Model__Group__1();
-            _fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__Model__Group__0
-
-
-    // $ANTLR start rule__Model__Group__1
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:318:1: rule__Model__Group__1 : ( ( rule__Model__DescriptionAssignment_1 )? ) rule__Model__Group__2 ;
-    public final void rule__Model__Group__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:322:1: ( ( ( rule__Model__DescriptionAssignment_1 )? ) rule__Model__Group__2 )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:323:1: ( ( rule__Model__DescriptionAssignment_1 )? ) rule__Model__Group__2
-            {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:323:1: ( ( rule__Model__DescriptionAssignment_1 )? )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:324:1: ( rule__Model__DescriptionAssignment_1 )?
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:317:1: ( ( ( RULE_PLAIN_STRING ) )? )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:318:1: ( ( RULE_PLAIN_STRING ) )?
             {
              before(grammarAccess.getModelAccess().getDescriptionAssignment_1()); 
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:325:1: ( rule__Model__DescriptionAssignment_1 )?
-            int alt5=2;
-            int LA5_0 = input.LA(1);
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:319:1: ( ( RULE_PLAIN_STRING ) )?
+            int alt4=2;
+            int LA4_0 = input.LA(1);
 
-            if ( (LA5_0==RULE_PLAIN_STRING) ) {
-                alt5=1;
+            if ( (LA4_0==RULE_PLAIN_STRING) ) {
+                alt4=1;
             }
-            switch (alt5) {
+            switch (alt4) {
                 case 1 :
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:325:2: rule__Model__DescriptionAssignment_1
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:320:1: ( RULE_PLAIN_STRING )
                     {
-                    pushFollow(FOLLOW_rule__Model__DescriptionAssignment_1_in_rule__Model__Group__1664);
-                    rule__Model__DescriptionAssignment_1();
-                    _fsp--;
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:320:1: ( RULE_PLAIN_STRING )
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:321:1: RULE_PLAIN_STRING
+                    {
+                     before(grammarAccess.getModelAccess().getDescriptionPLAIN_STRINGTerminalRuleCall_1_0()); 
+                    match(input,RULE_PLAIN_STRING,FOLLOW_RULE_PLAIN_STRING_in_rule__Model__Group680); 
+                     after(grammarAccess.getModelAccess().getDescriptionPLAIN_STRINGTerminalRuleCall_1_0()); 
+
+                    }
 
 
                     }
@@ -898,57 +884,33 @@
 
             }
 
-            pushFollow(FOLLOW_rule__Model__Group__2_in_rule__Model__Group__1674);
-            rule__Model__Group__2();
-            _fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__Model__Group__1
-
-
-    // $ANTLR start rule__Model__Group__2
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:336:1: rule__Model__Group__2 : ( ( rule__Model__TestsAssignment_2 )? ) rule__Model__Group__3 ;
-    public final void rule__Model__Group__2() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:340:1: ( ( ( rule__Model__TestsAssignment_2 )? ) rule__Model__Group__3 )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:341:1: ( ( rule__Model__TestsAssignment_2 )? ) rule__Model__Group__3
-            {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:341:1: ( ( rule__Model__TestsAssignment_2 )? )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:342:1: ( rule__Model__TestsAssignment_2 )?
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:327:1: ( ( ( ruleTests ) )? )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:328:1: ( ( ruleTests ) )?
             {
              before(grammarAccess.getModelAccess().getTestsAssignment_2()); 
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:343:1: ( rule__Model__TestsAssignment_2 )?
-            int alt6=2;
-            int LA6_0 = input.LA(1);
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:329:1: ( ( ruleTests ) )?
+            int alt5=2;
+            int LA5_0 = input.LA(1);
 
-            if ( (LA6_0==18) ) {
-                alt6=1;
+            if ( (LA5_0==18) ) {
+                alt5=1;
             }
-            switch (alt6) {
+            switch (alt5) {
                 case 1 :
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:343:2: rule__Model__TestsAssignment_2
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:330:1: ( ruleTests )
                     {
-                    pushFollow(FOLLOW_rule__Model__TestsAssignment_2_in_rule__Model__Group__2702);
-                    rule__Model__TestsAssignment_2();
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:330:1: ( ruleTests )
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:331:1: ruleTests
+                    {
+                     before(grammarAccess.getModelAccess().getTestsTestsParserRuleCall_2_0()); 
+                    pushFollow(FOLLOW_ruleTests_in_rule__Model__Group705);
+                    ruleTests();
                     _fsp--;
 
+                     after(grammarAccess.getModelAccess().getTestsTestsParserRuleCall_2_0()); 
+
+                    }
+
 
                     }
                     break;
@@ -959,67 +921,43 @@
 
             }
 
-            pushFollow(FOLLOW_rule__Model__Group__3_in_rule__Model__Group__2712);
-            rule__Model__Group__3();
-            _fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__Model__Group__2
-
-
-    // $ANTLR start rule__Model__Group__3
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:354:1: rule__Model__Group__3 : ( ( rule__Model__ContraintsAssignment_3 )* ) ;
-    public final void rule__Model__Group__3() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:358:1: ( ( ( rule__Model__ContraintsAssignment_3 )* ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:359:1: ( ( rule__Model__ContraintsAssignment_3 )* )
-            {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:359:1: ( ( rule__Model__ContraintsAssignment_3 )* )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:360:1: ( rule__Model__ContraintsAssignment_3 )*
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:337:1: ( ( ( ruleConstraint ) )* )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:338:1: ( ( ruleConstraint ) )*
             {
              before(grammarAccess.getModelAccess().getContraintsAssignment_3()); 
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:361:1: ( rule__Model__ContraintsAssignment_3 )*
-            loop7:
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:339:1: ( ( ruleConstraint ) )*
+            loop6:
             do {
-                int alt7=2;
-                int LA7_0 = input.LA(1);
+                int alt6=2;
+                int LA6_0 = input.LA(1);
 
-                if ( ((LA7_0>=13 && LA7_0<=17)) ) {
-                    alt7=1;
+                if ( ((LA6_0>=13 && LA6_0<=17)) ) {
+                    alt6=1;
                 }
 
 
-                switch (alt7) {
+                switch (alt6) {
             	case 1 :
-            	    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:361:2: rule__Model__ContraintsAssignment_3
+            	    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:340:1: ( ruleConstraint )
             	    {
-            	    pushFollow(FOLLOW_rule__Model__ContraintsAssignment_3_in_rule__Model__Group__3740);
-            	    rule__Model__ContraintsAssignment_3();
+            	    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:340:1: ( ruleConstraint )
+            	    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:341:1: ruleConstraint
+            	    {
+            	     before(grammarAccess.getModelAccess().getContraintsConstraintParserRuleCall_3_0()); 
+            	    pushFollow(FOLLOW_ruleConstraint_in_rule__Model__Group730);
+            	    ruleConstraint();
             	    _fsp--;
 
+            	     after(grammarAccess.getModelAccess().getContraintsConstraintParserRuleCall_3_0()); 
+
+            	    }
+
 
             	    }
             	    break;
 
             	default :
-            	    break loop7;
+            	    break loop6;
                 }
             } while (true);
 
@@ -1042,70 +980,43 @@
         }
         return ;
     }
-    // $ANTLR end rule__Model__Group__3
+    // $ANTLR end rule__Model__Group
 
 
-    // $ANTLR start rule__Tests__Group__0
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:379:1: rule__Tests__Group__0 : ( 'TESTS' ) rule__Tests__Group__1 ;
-    public final void rule__Tests__Group__0() throws RecognitionException {
+    // $ANTLR start rule__Tests__Group
+    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:353:1: rule__Tests__Group : ( 'TESTS' ) ( ( ( RULE_STRING ) ) ) ;
+    public final void rule__Tests__Group() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:383:1: ( ( 'TESTS' ) rule__Tests__Group__1 )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:384:1: ( 'TESTS' ) rule__Tests__Group__1
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:357:1: ( ( 'TESTS' ) ( ( ( RULE_STRING ) ) ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:358:1: ( 'TESTS' ) ( ( ( RULE_STRING ) ) )
             {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:384:1: ( 'TESTS' )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:385:1: 'TESTS'
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:358:1: ( 'TESTS' )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:359:1: 'TESTS'
             {
              before(grammarAccess.getTestsAccess().getTESTSKeyword_0()); 
-            match(input,18,FOLLOW_18_in_rule__Tests__Group__0784); 
+            match(input,18,FOLLOW_18_in_rule__Tests__Group770); 
              after(grammarAccess.getTestsAccess().getTESTSKeyword_0()); 
 
             }
 
-            pushFollow(FOLLOW_rule__Tests__Group__1_in_rule__Tests__Group__0794);
-            rule__Tests__Group__1();
-            _fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__Tests__Group__0
-
-
-    // $ANTLR start rule__Tests__Group__1
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:399:1: rule__Tests__Group__1 : ( ( rule__Tests__ImportURIAssignment_1 ) ) ;
-    public final void rule__Tests__Group__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:403:1: ( ( ( rule__Tests__ImportURIAssignment_1 ) ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:404:1: ( ( rule__Tests__ImportURIAssignment_1 ) )
-            {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:404:1: ( ( rule__Tests__ImportURIAssignment_1 ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:405:1: ( rule__Tests__ImportURIAssignment_1 )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:364:1: ( ( ( RULE_STRING ) ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:365:1: ( ( RULE_STRING ) )
             {
              before(grammarAccess.getTestsAccess().getImportURIAssignment_1()); 
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:406:1: ( rule__Tests__ImportURIAssignment_1 )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:406:2: rule__Tests__ImportURIAssignment_1
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:366:1: ( ( RULE_STRING ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:367:1: ( RULE_STRING )
             {
-            pushFollow(FOLLOW_rule__Tests__ImportURIAssignment_1_in_rule__Tests__Group__1822);
-            rule__Tests__ImportURIAssignment_1();
-            _fsp--;
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:367:1: ( RULE_STRING )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:368:1: RULE_STRING
+            {
+             before(grammarAccess.getTestsAccess().getImportURISTRINGTerminalRuleCall_1_0()); 
+            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Tests__Group789); 
+             after(grammarAccess.getTestsAccess().getImportURISTRINGTerminalRuleCall_1_0()); 
+
+            }
 
 
             }
@@ -1129,30 +1040,38 @@
         }
         return ;
     }
-    // $ANTLR end rule__Tests__Group__1
+    // $ANTLR end rule__Tests__Group
 
 
-    // $ANTLR start rule__Constraint__Group__0
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:420:1: rule__Constraint__Group__0 : ( ( rule__Constraint__MeasureAssignment_0 ) ) rule__Constraint__Group__1 ;
-    public final void rule__Constraint__Group__0() throws RecognitionException {
+    // $ANTLR start rule__Constraint__Group
+    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:380:1: rule__Constraint__Group : ( ( ( ruleMeasure ) ) ) ( '(' ) ( ( ( ( RULE_STRING ) ) ) ) ( ':' ) ( ( ( ( RULE_STRING ) ) ) ) ( ( rule__Constraint__Group_5 )? ) ( ')' ) ( ( rule__Constraint__Group_7 ) ) ;
+    public final void rule__Constraint__Group() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:424:1: ( ( ( rule__Constraint__MeasureAssignment_0 ) ) rule__Constraint__Group__1 )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:425:1: ( ( rule__Constraint__MeasureAssignment_0 ) ) rule__Constraint__Group__1
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:384:1: ( ( ( ( ruleMeasure ) ) ) ( '(' ) ( ( ( ( RULE_STRING ) ) ) ) ( ':' ) ( ( ( ( RULE_STRING ) ) ) ) ( ( rule__Constraint__Group_5 )? ) ( ')' ) ( ( rule__Constraint__Group_7 ) ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:385:1: ( ( ( ruleMeasure ) ) ) ( '(' ) ( ( ( ( RULE_STRING ) ) ) ) ( ':' ) ( ( ( ( RULE_STRING ) ) ) ) ( ( rule__Constraint__Group_5 )? ) ( ')' ) ( ( rule__Constraint__Group_7 ) )
             {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:425:1: ( ( rule__Constraint__MeasureAssignment_0 ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:426:1: ( rule__Constraint__MeasureAssignment_0 )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:385:1: ( ( ( ruleMeasure ) ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:386:1: ( ( ruleMeasure ) )
             {
              before(grammarAccess.getConstraintAccess().getMeasureAssignment_0()); 
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:427:1: ( rule__Constraint__MeasureAssignment_0 )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:427:2: rule__Constraint__MeasureAssignment_0
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:387:1: ( ( ruleMeasure ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:388:1: ( ruleMeasure )
             {
-            pushFollow(FOLLOW_rule__Constraint__MeasureAssignment_0_in_rule__Constraint__Group__0860);
-            rule__Constraint__MeasureAssignment_0();
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:388:1: ( ruleMeasure )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:389:1: ruleMeasure
+            {
+             before(grammarAccess.getConstraintAccess().getMeasureMeasureEnumRuleCall_0_0()); 
+            pushFollow(FOLLOW_ruleMeasure_in_rule__Constraint__Group834);
+            ruleMeasure();
             _fsp--;
 
+             after(grammarAccess.getConstraintAccess().getMeasureMeasureEnumRuleCall_0_0()); 
+
+            }
+
 
             }
 
@@ -1160,89 +1079,38 @@
 
             }
 
-            pushFollow(FOLLOW_rule__Constraint__Group__1_in_rule__Constraint__Group__0869);
-            rule__Constraint__Group__1();
-            _fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__Constraint__Group__0
-
-
-    // $ANTLR start rule__Constraint__Group__1
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:438:1: rule__Constraint__Group__1 : ( '(' ) rule__Constraint__Group__2 ;
-    public final void rule__Constraint__Group__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:442:1: ( ( '(' ) rule__Constraint__Group__2 )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:443:1: ( '(' ) rule__Constraint__Group__2
-            {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:443:1: ( '(' )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:444:1: '('
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:395:1: ( '(' )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:396:1: '('
             {
              before(grammarAccess.getConstraintAccess().getLeftParenthesisKeyword_1()); 
-            match(input,19,FOLLOW_19_in_rule__Constraint__Group__1898); 
+            match(input,19,FOLLOW_19_in_rule__Constraint__Group852); 
              after(grammarAccess.getConstraintAccess().getLeftParenthesisKeyword_1()); 
 
             }
 
-            pushFollow(FOLLOW_rule__Constraint__Group__2_in_rule__Constraint__Group__1908);
-            rule__Constraint__Group__2();
-            _fsp--;
-
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:401:1: ( ( ( ( RULE_STRING ) ) ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:402:1: ( ( ( RULE_STRING ) ) )
+            {
+             before(grammarAccess.getConstraintAccess().getAgentAssignment_2()); 
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:403:1: ( ( ( RULE_STRING ) ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:404:1: ( ( RULE_STRING ) )
+            {
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:404:1: ( ( RULE_STRING ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:405:1: ( RULE_STRING )
+            {
+             before(grammarAccess.getConstraintAccess().getAgentSAgentCrossReference_2_0()); 
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:406:1: ( RULE_STRING )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:407:1: RULE_STRING
+            {
+             before(grammarAccess.getConstraintAccess().getAgentSAgentSTRINGTerminalRuleCall_2_0_1()); 
+            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Constraint__Group875); 
+             after(grammarAccess.getConstraintAccess().getAgentSAgentSTRINGTerminalRuleCall_2_0_1()); 
 
             }
 
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
+             after(grammarAccess.getConstraintAccess().getAgentSAgentCrossReference_2_0()); 
 
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__Constraint__Group__1
-
-
-    // $ANTLR start rule__Constraint__Group__2
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:458:1: rule__Constraint__Group__2 : ( ( rule__Constraint__AgentAssignment_2 ) ) rule__Constraint__Group__3 ;
-    public final void rule__Constraint__Group__2() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:462:1: ( ( ( rule__Constraint__AgentAssignment_2 ) ) rule__Constraint__Group__3 )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:463:1: ( ( rule__Constraint__AgentAssignment_2 ) ) rule__Constraint__Group__3
-            {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:463:1: ( ( rule__Constraint__AgentAssignment_2 ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:464:1: ( rule__Constraint__AgentAssignment_2 )
-            {
-             before(grammarAccess.getConstraintAccess().getAgentAssignment_2()); 
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:465:1: ( rule__Constraint__AgentAssignment_2 )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:465:2: rule__Constraint__AgentAssignment_2
-            {
-            pushFollow(FOLLOW_rule__Constraint__AgentAssignment_2_in_rule__Constraint__Group__2936);
-            rule__Constraint__AgentAssignment_2();
-            _fsp--;
+            }
 
 
             }
@@ -1251,89 +1119,38 @@
 
             }
 
-            pushFollow(FOLLOW_rule__Constraint__Group__3_in_rule__Constraint__Group__2945);
-            rule__Constraint__Group__3();
-            _fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__Constraint__Group__2
-
-
-    // $ANTLR start rule__Constraint__Group__3
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:476:1: rule__Constraint__Group__3 : ( ':' ) rule__Constraint__Group__4 ;
-    public final void rule__Constraint__Group__3() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:480:1: ( ( ':' ) rule__Constraint__Group__4 )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:481:1: ( ':' ) rule__Constraint__Group__4
-            {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:481:1: ( ':' )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:482:1: ':'
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:415:1: ( ':' )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:416:1: ':'
             {
              before(grammarAccess.getConstraintAccess().getColonKeyword_3()); 
-            match(input,20,FOLLOW_20_in_rule__Constraint__Group__3974); 
+            match(input,20,FOLLOW_20_in_rule__Constraint__Group897); 
              after(grammarAccess.getConstraintAccess().getColonKeyword_3()); 
 
             }
 
-            pushFollow(FOLLOW_rule__Constraint__Group__4_in_rule__Constraint__Group__3984);
-            rule__Constraint__Group__4();
-            _fsp--;
-
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:421:1: ( ( ( ( RULE_STRING ) ) ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:422:1: ( ( ( RULE_STRING ) ) )
+            {
+             before(grammarAccess.getConstraintAccess().getAttributeAssignment_4()); 
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:423:1: ( ( ( RULE_STRING ) ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:424:1: ( ( RULE_STRING ) )
+            {
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:424:1: ( ( RULE_STRING ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:425:1: ( RULE_STRING )
+            {
+             before(grammarAccess.getConstraintAccess().getAttributeSAttributeCrossReference_4_0()); 
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:426:1: ( RULE_STRING )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:427:1: RULE_STRING
+            {
+             before(grammarAccess.getConstraintAccess().getAttributeSAttributeSTRINGTerminalRuleCall_4_0_1()); 
+            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Constraint__Group920); 
+             after(grammarAccess.getConstraintAccess().getAttributeSAttributeSTRINGTerminalRuleCall_4_0_1()); 
 
             }
 
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
+             after(grammarAccess.getConstraintAccess().getAttributeSAttributeCrossReference_4_0()); 
 
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__Constraint__Group__3
-
-
-    // $ANTLR start rule__Constraint__Group__4
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:496:1: rule__Constraint__Group__4 : ( ( rule__Constraint__AttributeAssignment_4 ) ) rule__Constraint__Group__5 ;
-    public final void rule__Constraint__Group__4() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:500:1: ( ( ( rule__Constraint__AttributeAssignment_4 ) ) rule__Constraint__Group__5 )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:501:1: ( ( rule__Constraint__AttributeAssignment_4 ) ) rule__Constraint__Group__5
-            {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:501:1: ( ( rule__Constraint__AttributeAssignment_4 ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:502:1: ( rule__Constraint__AttributeAssignment_4 )
-            {
-             before(grammarAccess.getConstraintAccess().getAttributeAssignment_4()); 
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:503:1: ( rule__Constraint__AttributeAssignment_4 )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:503:2: rule__Constraint__AttributeAssignment_4
-            {
-            pushFollow(FOLLOW_rule__Constraint__AttributeAssignment_4_in_rule__Constraint__Group__41012);
-            rule__Constraint__AttributeAssignment_4();
-            _fsp--;
+            }
 
 
             }
@@ -1342,55 +1159,23 @@
 
             }
 
-            pushFollow(FOLLOW_rule__Constraint__Group__5_in_rule__Constraint__Group__41021);
-            rule__Constraint__Group__5();
-            _fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__Constraint__Group__4
-
-
-    // $ANTLR start rule__Constraint__Group__5
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:514:1: rule__Constraint__Group__5 : ( ( rule__Constraint__Group_5__0 )? ) rule__Constraint__Group__6 ;
-    public final void rule__Constraint__Group__5() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:518:1: ( ( ( rule__Constraint__Group_5__0 )? ) rule__Constraint__Group__6 )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:519:1: ( ( rule__Constraint__Group_5__0 )? ) rule__Constraint__Group__6
-            {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:519:1: ( ( rule__Constraint__Group_5__0 )? )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:520:1: ( rule__Constraint__Group_5__0 )?
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:435:1: ( ( rule__Constraint__Group_5 )? )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:436:1: ( rule__Constraint__Group_5 )?
             {
              before(grammarAccess.getConstraintAccess().getGroup_5()); 
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:521:1: ( rule__Constraint__Group_5__0 )?
-            int alt8=2;
-            int LA8_0 = input.LA(1);
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:437:1: ( rule__Constraint__Group_5 )?
+            int alt7=2;
+            int LA7_0 = input.LA(1);
 
-            if ( (LA8_0==20) ) {
-                alt8=1;
+            if ( (LA7_0==20) ) {
+                alt7=1;
             }
-            switch (alt8) {
+            switch (alt7) {
                 case 1 :
-                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:521:2: rule__Constraint__Group_5__0
+                    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:437:2: rule__Constraint__Group_5
                     {
-                    pushFollow(FOLLOW_rule__Constraint__Group_5__0_in_rule__Constraint__Group__51049);
-                    rule__Constraint__Group_5__0();
+                    pushFollow(FOLLOW_rule__Constraint__Group_5_in_rule__Constraint__Group941);
+                    rule__Constraint__Group_5();
                     _fsp--;
 
 
@@ -1403,88 +1188,24 @@
 
             }
 
-            pushFollow(FOLLOW_rule__Constraint__Group__6_in_rule__Constraint__Group__51059);
-            rule__Constraint__Group__6();
-            _fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__Constraint__Group__5
-
-
-    // $ANTLR start rule__Constraint__Group__6
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:532:1: rule__Constraint__Group__6 : ( ')' ) rule__Constraint__Group__7 ;
-    public final void rule__Constraint__Group__6() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:536:1: ( ( ')' ) rule__Constraint__Group__7 )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:537:1: ( ')' ) rule__Constraint__Group__7
-            {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:537:1: ( ')' )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:538:1: ')'
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:439:1: ( ')' )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:440:1: ')'
             {
              before(grammarAccess.getConstraintAccess().getRightParenthesisKeyword_6()); 
-            match(input,21,FOLLOW_21_in_rule__Constraint__Group__61088); 
+            match(input,21,FOLLOW_21_in_rule__Constraint__Group954); 
              after(grammarAccess.getConstraintAccess().getRightParenthesisKeyword_6()); 
 
             }
 
-            pushFollow(FOLLOW_rule__Constraint__Group__7_in_rule__Constraint__Group__61098);
-            rule__Constraint__Group__7();
-            _fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__Constraint__Group__6
-
-
-    // $ANTLR start rule__Constraint__Group__7
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:552:1: rule__Constraint__Group__7 : ( ( rule__Constraint__Group_7__0 ) ) ;
-    public final void rule__Constraint__Group__7() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:556:1: ( ( ( rule__Constraint__Group_7__0 ) ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:557:1: ( ( rule__Constraint__Group_7__0 ) )
-            {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:557:1: ( ( rule__Constraint__Group_7__0 ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:558:1: ( rule__Constraint__Group_7__0 )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:445:1: ( ( rule__Constraint__Group_7 ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:446:1: ( rule__Constraint__Group_7 )
             {
              before(grammarAccess.getConstraintAccess().getGroup_7()); 
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:559:1: ( rule__Constraint__Group_7__0 )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:559:2: rule__Constraint__Group_7__0
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:447:1: ( rule__Constraint__Group_7 )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:447:2: rule__Constraint__Group_7
             {
-            pushFollow(FOLLOW_rule__Constraint__Group_7__0_in_rule__Constraint__Group__71126);
-            rule__Constraint__Group_7__0();
+            pushFollow(FOLLOW_rule__Constraint__Group_7_in_rule__Constraint__Group966);
+            rule__Constraint__Group_7();
             _fsp--;
 
 
@@ -1509,70 +1230,51 @@
         }
         return ;
     }
-    // $ANTLR end rule__Constraint__Group__7
+    // $ANTLR end rule__Constraint__Group
 
 
-    // $ANTLR start rule__Constraint__Group_5__0
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:585:1: rule__Constraint__Group_5__0 : ( ':' ) rule__Constraint__Group_5__1 ;
-    public final void rule__Constraint__Group_5__0() throws RecognitionException {
+    // $ANTLR start rule__Constraint__Group_5
+    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:455:1: rule__Constraint__Group_5 : ( ':' ) ( ( ( ( RULE_STRING ) ) ) ) ;
+    public final void rule__Constraint__Group_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:589:1: ( ( ':' ) rule__Constraint__Group_5__1 )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:590:1: ( ':' ) rule__Constraint__Group_5__1
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:459:1: ( ( ':' ) ( ( ( ( RULE_STRING ) ) ) ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:460:1: ( ':' ) ( ( ( ( RULE_STRING ) ) ) )
             {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:590:1: ( ':' )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:591:1: ':'
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:460:1: ( ':' )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:461:1: ':'
             {
              before(grammarAccess.getConstraintAccess().getColonKeyword_5_0()); 
-            match(input,20,FOLLOW_20_in_rule__Constraint__Group_5__01177); 
+            match(input,20,FOLLOW_20_in_rule__Constraint__Group_5999); 
              after(grammarAccess.getConstraintAccess().getColonKeyword_5_0()); 
 
             }
 
-            pushFollow(FOLLOW_rule__Constraint__Group_5__1_in_rule__Constraint__Group_5__01187);
-            rule__Constraint__Group_5__1();
-            _fsp--;
-
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:466:1: ( ( ( ( RULE_STRING ) ) ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:467:1: ( ( ( RULE_STRING ) ) )
+            {
+             before(grammarAccess.getConstraintAccess().getQualifierAssignment_5_1()); 
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:468:1: ( ( ( RULE_STRING ) ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:469:1: ( ( RULE_STRING ) )
+            {
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:469:1: ( ( RULE_STRING ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:470:1: ( RULE_STRING )
+            {
+             before(grammarAccess.getConstraintAccess().getQualifierSStateValueCrossReference_5_1_0()); 
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:471:1: ( RULE_STRING )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:472:1: RULE_STRING
+            {
+             before(grammarAccess.getConstraintAccess().getQualifierSStateValueSTRINGTerminalRuleCall_5_1_0_1()); 
+            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Constraint__Group_51022); 
+             after(grammarAccess.getConstraintAccess().getQualifierSStateValueSTRINGTerminalRuleCall_5_1_0_1()); 
 
             }
 
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
+             after(grammarAccess.getConstraintAccess().getQualifierSStateValueCrossReference_5_1_0()); 
 
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__Constraint__Group_5__0
-
-
-    // $ANTLR start rule__Constraint__Group_5__1
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:605:1: rule__Constraint__Group_5__1 : ( ( rule__Constraint__QualifierAssignment_5_1 ) ) ;
-    public final void rule__Constraint__Group_5__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:609:1: ( ( ( rule__Constraint__QualifierAssignment_5_1 ) ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:610:1: ( ( rule__Constraint__QualifierAssignment_5_1 ) )
-            {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:610:1: ( ( rule__Constraint__QualifierAssignment_5_1 ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:611:1: ( rule__Constraint__QualifierAssignment_5_1 )
-            {
-             before(grammarAccess.getConstraintAccess().getQualifierAssignment_5_1()); 
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:612:1: ( rule__Constraint__QualifierAssignment_5_1 )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:612:2: rule__Constraint__QualifierAssignment_5_1
-            {
-            pushFollow(FOLLOW_rule__Constraint__QualifierAssignment_5_1_in_rule__Constraint__Group_5__11215);
-            rule__Constraint__QualifierAssignment_5_1();
-            _fsp--;
+            }
 
 
             }
@@ -1596,112 +1298,56 @@
         }
         return ;
     }
-    // $ANTLR end rule__Constraint__Group_5__1
+    // $ANTLR end rule__Constraint__Group_5
 
 
-    // $ANTLR start rule__Constraint__Group_7__0
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:626:1: rule__Constraint__Group_7__0 : ( '=' ) rule__Constraint__Group_7__1 ;
-    public final void rule__Constraint__Group_7__0() throws RecognitionException {
+    // $ANTLR start rule__Constraint__Group_7
+    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:486:1: rule__Constraint__Group_7 : ( '=' ) ( '[' ) ( ( ( ruleValue ) ) ) ( ',' ) ( ( ( ruleValue ) ) ) ( ']' ) ;
+    public final void rule__Constraint__Group_7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:630:1: ( ( '=' ) rule__Constraint__Group_7__1 )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:631:1: ( '=' ) rule__Constraint__Group_7__1
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:490:1: ( ( '=' ) ( '[' ) ( ( ( ruleValue ) ) ) ( ',' ) ( ( ( ruleValue ) ) ) ( ']' ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:491:1: ( '=' ) ( '[' ) ( ( ( ruleValue ) ) ) ( ',' ) ( ( ( ruleValue ) ) ) ( ']' )
             {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:631:1: ( '=' )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:632:1: '='
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:491:1: ( '=' )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:492:1: '='
             {
              before(grammarAccess.getConstraintAccess().getEqualsSignKeyword_7_0()); 
-            match(input,22,FOLLOW_22_in_rule__Constraint__Group_7__01254); 
+            match(input,22,FOLLOW_22_in_rule__Constraint__Group_71065); 
              after(grammarAccess.getConstraintAccess().getEqualsSignKeyword_7_0()); 
 
             }
 
-            pushFollow(FOLLOW_rule__Constraint__Group_7__1_in_rule__Constraint__Group_7__01264);
-            rule__Constraint__Group_7__1();
-            _fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__Constraint__Group_7__0
-
-
-    // $ANTLR start rule__Constraint__Group_7__1
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:646:1: rule__Constraint__Group_7__1 : ( '[' ) rule__Constraint__Group_7__2 ;
-    public final void rule__Constraint__Group_7__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:650:1: ( ( '[' ) rule__Constraint__Group_7__2 )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:651:1: ( '[' ) rule__Constraint__Group_7__2
-            {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:651:1: ( '[' )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:652:1: '['
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:497:1: ( '[' )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:498:1: '['
             {
              before(grammarAccess.getConstraintAccess().getLeftSquareBracketKeyword_7_1()); 
-            match(input,23,FOLLOW_23_in_rule__Constraint__Group_7__11293); 
+            match(input,23,FOLLOW_23_in_rule__Constraint__Group_71078); 
              after(grammarAccess.getConstraintAccess().getLeftSquareBracketKeyword_7_1()); 
 
             }
 
-            pushFollow(FOLLOW_rule__Constraint__Group_7__2_in_rule__Constraint__Group_7__11303);
-            rule__Constraint__Group_7__2();
-            _fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__Constraint__Group_7__1
-
-
-    // $ANTLR start rule__Constraint__Group_7__2
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:666:1: rule__Constraint__Group_7__2 : ( ( rule__Constraint__MinValueAssignment_7_2 ) ) rule__Constraint__Group_7__3 ;
-    public final void rule__Constraint__Group_7__2() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:670:1: ( ( ( rule__Constraint__MinValueAssignment_7_2 ) ) rule__Constraint__Group_7__3 )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:671:1: ( ( rule__Constraint__MinValueAssignment_7_2 ) ) rule__Constraint__Group_7__3
-            {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:671:1: ( ( rule__Constraint__MinValueAssignment_7_2 ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:672:1: ( rule__Constraint__MinValueAssignment_7_2 )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:503:1: ( ( ( ruleValue ) ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:504:1: ( ( ruleValue ) )
             {
              before(grammarAccess.getConstraintAccess().getMinValueAssignment_7_2()); 
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:673:1: ( rule__Constraint__MinValueAssignment_7_2 )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:673:2: rule__Constraint__MinValueAssignment_7_2
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:505:1: ( ( ruleValue ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:506:1: ( ruleValue )
             {
-            pushFollow(FOLLOW_rule__Constraint__MinValueAssignment_7_2_in_rule__Constraint__Group_7__21331);
-            rule__Constraint__MinValueAssignment_7_2();
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:506:1: ( ruleValue )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:507:1: ruleValue
+            {
+             before(grammarAccess.getConstraintAccess().getMinValueValueParserRuleCall_7_2_0()); 
+            pushFollow(FOLLOW_ruleValue_in_rule__Constraint__Group_71097);
+            ruleValue();
             _fsp--;
 
+             after(grammarAccess.getConstraintAccess().getMinValueValueParserRuleCall_7_2_0()); 
+
+            }
+
 
             }
 
@@ -1709,90 +1355,34 @@
 
             }
 
-            pushFollow(FOLLOW_rule__Constraint__Group_7__3_in_rule__Constraint__Group_7__21340);
-            rule__Constraint__Group_7__3();
-            _fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__Constraint__Group_7__2
-
-
-    // $ANTLR start rule__Constraint__Group_7__3
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:684:1: rule__Constraint__Group_7__3 : ( ',' ) rule__Constraint__Group_7__4 ;
-    public final void rule__Constraint__Group_7__3() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:688:1: ( ( ',' ) rule__Constraint__Group_7__4 )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:689:1: ( ',' ) rule__Constraint__Group_7__4
-            {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:689:1: ( ',' )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:690:1: ','
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:513:1: ( ',' )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:514:1: ','
             {
              before(grammarAccess.getConstraintAccess().getCommaKeyword_7_3()); 
-            match(input,24,FOLLOW_24_in_rule__Constraint__Group_7__31369); 
+            match(input,24,FOLLOW_24_in_rule__Constraint__Group_71115); 
              after(grammarAccess.getConstraintAccess().getCommaKeyword_7_3()); 
 
             }
 
-            pushFollow(FOLLOW_rule__Constraint__Group_7__4_in_rule__Constraint__Group_7__31379);
-            rule__Constraint__Group_7__4();
-            _fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__Constraint__Group_7__3
-
-
-    // $ANTLR start rule__Constraint__Group_7__4
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:704:1: rule__Constraint__Group_7__4 : ( ( rule__Constraint__MaxValueAssignment_7_4 ) ) rule__Constraint__Group_7__5 ;
-    public final void rule__Constraint__Group_7__4() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:708:1: ( ( ( rule__Constraint__MaxValueAssignment_7_4 ) ) rule__Constraint__Group_7__5 )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:709:1: ( ( rule__Constraint__MaxValueAssignment_7_4 ) ) rule__Constraint__Group_7__5
-            {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:709:1: ( ( rule__Constraint__MaxValueAssignment_7_4 ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:710:1: ( rule__Constraint__MaxValueAssignment_7_4 )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:519:1: ( ( ( ruleValue ) ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:520:1: ( ( ruleValue ) )
             {
              before(grammarAccess.getConstraintAccess().getMaxValueAssignment_7_4()); 
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:711:1: ( rule__Constraint__MaxValueAssignment_7_4 )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:711:2: rule__Constraint__MaxValueAssignment_7_4
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:521:1: ( ( ruleValue ) )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:522:1: ( ruleValue )
             {
-            pushFollow(FOLLOW_rule__Constraint__MaxValueAssignment_7_4_in_rule__Constraint__Group_7__41407);
-            rule__Constraint__MaxValueAssignment_7_4();
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:522:1: ( ruleValue )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:523:1: ruleValue
+            {
+             before(grammarAccess.getConstraintAccess().getMaxValueValueParserRuleCall_7_4_0()); 
+            pushFollow(FOLLOW_ruleValue_in_rule__Constraint__Group_71134);
+            ruleValue();
             _fsp--;
 
+             after(grammarAccess.getConstraintAccess().getMaxValueValueParserRuleCall_7_4_0()); 
+
+            }
+
 
             }
 
@@ -1800,43 +1390,11 @@
 
             }
 
-            pushFollow(FOLLOW_rule__Constraint__Group_7__5_in_rule__Constraint__Group_7__41416);
-            rule__Constraint__Group_7__5();
-            _fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__Constraint__Group_7__4
-
-
-    // $ANTLR start rule__Constraint__Group_7__5
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:722:1: rule__Constraint__Group_7__5 : ( ']' ) ;
-    public final void rule__Constraint__Group_7__5() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:726:1: ( ( ']' ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:727:1: ( ']' )
-            {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:727:1: ( ']' )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:728:1: ']'
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:529:1: ( ']' )
+            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:530:1: ']'
             {
              before(grammarAccess.getConstraintAccess().getRightSquareBracketKeyword_7_5()); 
-            match(input,25,FOLLOW_25_in_rule__Constraint__Group_7__51445); 
+            match(input,25,FOLLOW_25_in_rule__Constraint__Group_71152); 
              after(grammarAccess.getConstraintAccess().getRightSquareBracketKeyword_7_5()); 
 
             }
@@ -1856,619 +1414,58 @@
         }
         return ;
     }
-    // $ANTLR end rule__Constraint__Group_7__5
-
-
-    // $ANTLR start rule__Model__NameAssignment_0
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:753:1: rule__Model__NameAssignment_0 : ( RULE_STRING ) ;
-    public final void rule__Model__NameAssignment_0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:757:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:758:1: ( RULE_STRING )
-            {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:758:1: ( RULE_STRING )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:759:1: RULE_STRING
-            {
-             before(grammarAccess.getModelAccess().getNameSTRINGTerminalRuleCall_0_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Model__NameAssignment_01492); 
-             after(grammarAccess.getModelAccess().getNameSTRINGTerminalRuleCall_0_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__Model__NameAssignment_0
-
-
-    // $ANTLR start rule__Model__DescriptionAssignment_1
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:768:1: rule__Model__DescriptionAssignment_1 : ( RULE_PLAIN_STRING ) ;
-    public final void rule__Model__DescriptionAssignment_1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:772:1: ( ( RULE_PLAIN_STRING ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:773:1: ( RULE_PLAIN_STRING )
-            {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:773:1: ( RULE_PLAIN_STRING )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:774:1: RULE_PLAIN_STRING
-            {
-             before(grammarAccess.getModelAccess().getDescriptionPLAIN_STRINGTerminalRuleCall_1_0()); 
-            match(input,RULE_PLAIN_STRING,FOLLOW_RULE_PLAIN_STRING_in_rule__Model__DescriptionAssignment_11523); 
-             after(grammarAccess.getModelAccess().getDescriptionPLAIN_STRINGTerminalRuleCall_1_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__Model__DescriptionAssignment_1
-
-
-    // $ANTLR start rule__Model__TestsAssignment_2
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:783:1: rule__Model__TestsAssignment_2 : ( ruleTests ) ;
-    public final void rule__Model__TestsAssignment_2() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:787:1: ( ( ruleTests ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:788:1: ( ruleTests )
-            {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:788:1: ( ruleTests )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:789:1: ruleTests
-            {
-             before(grammarAccess.getModelAccess().getTestsTestsParserRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleTests_in_rule__Model__TestsAssignment_21554);
-            ruleTests();
-            _fsp--;
-
-             after(grammarAccess.getModelAccess().getTestsTestsParserRuleCall_2_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__Model__TestsAssignment_2
-
-
-    // $ANTLR start rule__Model__ContraintsAssignment_3
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:798:1: rule__Model__ContraintsAssignment_3 : ( ruleConstraint ) ;
-    public final void rule__Model__ContraintsAssignment_3() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:802:1: ( ( ruleConstraint ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:803:1: ( ruleConstraint )
-            {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:803:1: ( ruleConstraint )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:804:1: ruleConstraint
-            {
-             before(grammarAccess.getModelAccess().getContraintsConstraintParserRuleCall_3_0()); 
-            pushFollow(FOLLOW_ruleConstraint_in_rule__Model__ContraintsAssignment_31585);
-            ruleConstraint();
-            _fsp--;
-
-             after(grammarAccess.getModelAccess().getContraintsConstraintParserRuleCall_3_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__Model__ContraintsAssignment_3
-
-
-    // $ANTLR start rule__Tests__ImportURIAssignment_1
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:813:1: rule__Tests__ImportURIAssignment_1 : ( RULE_STRING ) ;
-    public final void rule__Tests__ImportURIAssignment_1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:817:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:818:1: ( RULE_STRING )
-            {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:818:1: ( RULE_STRING )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:819:1: RULE_STRING
-            {
-             before(grammarAccess.getTestsAccess().getImportURISTRINGTerminalRuleCall_1_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Tests__ImportURIAssignment_11616); 
-             after(grammarAccess.getTestsAccess().getImportURISTRINGTerminalRuleCall_1_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__Tests__ImportURIAssignment_1
-
-
-    // $ANTLR start rule__Constraint__MeasureAssignment_0
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:828:1: rule__Constraint__MeasureAssignment_0 : ( ruleMeasure ) ;
-    public final void rule__Constraint__MeasureAssignment_0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:832:1: ( ( ruleMeasure ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:833:1: ( ruleMeasure )
-            {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:833:1: ( ruleMeasure )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:834:1: ruleMeasure
-            {
-             before(grammarAccess.getConstraintAccess().getMeasureMeasureEnumRuleCall_0_0()); 
-            pushFollow(FOLLOW_ruleMeasure_in_rule__Constraint__MeasureAssignment_01647);
-            ruleMeasure();
-            _fsp--;
-
-             after(grammarAccess.getConstraintAccess().getMeasureMeasureEnumRuleCall_0_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__Constraint__MeasureAssignment_0
-
-
-    // $ANTLR start rule__Constraint__AgentAssignment_2
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:843:1: rule__Constraint__AgentAssignment_2 : ( ( RULE_STRING ) ) ;
-    public final void rule__Constraint__AgentAssignment_2() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:847:1: ( ( ( RULE_STRING ) ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:848:1: ( ( RULE_STRING ) )
-            {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:848:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:849:1: ( RULE_STRING )
-            {
-             before(grammarAccess.getConstraintAccess().getAgentSAgentCrossReference_2_0()); 
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:850:1: ( RULE_STRING )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:851:1: RULE_STRING
-            {
-             before(grammarAccess.getConstraintAccess().getAgentSAgentSTRINGTerminalRuleCall_2_0_1()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Constraint__AgentAssignment_21682); 
-             after(grammarAccess.getConstraintAccess().getAgentSAgentSTRINGTerminalRuleCall_2_0_1()); 
-
-            }
-
-             after(grammarAccess.getConstraintAccess().getAgentSAgentCrossReference_2_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__Constraint__AgentAssignment_2
-
-
-    // $ANTLR start rule__Constraint__AttributeAssignment_4
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:862:1: rule__Constraint__AttributeAssignment_4 : ( ( RULE_STRING ) ) ;
-    public final void rule__Constraint__AttributeAssignment_4() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:866:1: ( ( ( RULE_STRING ) ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:867:1: ( ( RULE_STRING ) )
-            {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:867:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:868:1: ( RULE_STRING )
-            {
-             before(grammarAccess.getConstraintAccess().getAttributeSAttributeCrossReference_4_0()); 
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:869:1: ( RULE_STRING )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:870:1: RULE_STRING
-            {
-             before(grammarAccess.getConstraintAccess().getAttributeSAttributeSTRINGTerminalRuleCall_4_0_1()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Constraint__AttributeAssignment_41721); 
-             after(grammarAccess.getConstraintAccess().getAttributeSAttributeSTRINGTerminalRuleCall_4_0_1()); 
-
-            }
-
-             after(grammarAccess.getConstraintAccess().getAttributeSAttributeCrossReference_4_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__Constraint__AttributeAssignment_4
-
-
-    // $ANTLR start rule__Constraint__QualifierAssignment_5_1
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:881:1: rule__Constraint__QualifierAssignment_5_1 : ( ( RULE_STRING ) ) ;
-    public final void rule__Constraint__QualifierAssignment_5_1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:885:1: ( ( ( RULE_STRING ) ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:886:1: ( ( RULE_STRING ) )
-            {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:886:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:887:1: ( RULE_STRING )
-            {
-             before(grammarAccess.getConstraintAccess().getQualifierSStateValueCrossReference_5_1_0()); 
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:888:1: ( RULE_STRING )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:889:1: RULE_STRING
-            {
-             before(grammarAccess.getConstraintAccess().getQualifierSStateValueSTRINGTerminalRuleCall_5_1_0_1()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Constraint__QualifierAssignment_5_11760); 
-             after(grammarAccess.getConstraintAccess().getQualifierSStateValueSTRINGTerminalRuleCall_5_1_0_1()); 
-
-            }
-
-             after(grammarAccess.getConstraintAccess().getQualifierSStateValueCrossReference_5_1_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__Constraint__QualifierAssignment_5_1
-
-
-    // $ANTLR start rule__Constraint__MinValueAssignment_7_2
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:900:1: rule__Constraint__MinValueAssignment_7_2 : ( ( rule__Constraint__MinValueAlternatives_7_2_0 ) ) ;
-    public final void rule__Constraint__MinValueAssignment_7_2() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:904:1: ( ( ( rule__Constraint__MinValueAlternatives_7_2_0 ) ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:905:1: ( ( rule__Constraint__MinValueAlternatives_7_2_0 ) )
-            {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:905:1: ( ( rule__Constraint__MinValueAlternatives_7_2_0 ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:906:1: ( rule__Constraint__MinValueAlternatives_7_2_0 )
-            {
-             before(grammarAccess.getConstraintAccess().getMinValueAlternatives_7_2_0()); 
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:907:1: ( rule__Constraint__MinValueAlternatives_7_2_0 )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:907:2: rule__Constraint__MinValueAlternatives_7_2_0
-            {
-            pushFollow(FOLLOW_rule__Constraint__MinValueAlternatives_7_2_0_in_rule__Constraint__MinValueAssignment_7_21795);
-            rule__Constraint__MinValueAlternatives_7_2_0();
-            _fsp--;
-
-
-            }
-
-             after(grammarAccess.getConstraintAccess().getMinValueAlternatives_7_2_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__Constraint__MinValueAssignment_7_2
-
-
-    // $ANTLR start rule__Constraint__MaxValueAssignment_7_4
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:916:1: rule__Constraint__MaxValueAssignment_7_4 : ( ( rule__Constraint__MaxValueAlternatives_7_4_0 ) ) ;
-    public final void rule__Constraint__MaxValueAssignment_7_4() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:920:1: ( ( ( rule__Constraint__MaxValueAlternatives_7_4_0 ) ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:921:1: ( ( rule__Constraint__MaxValueAlternatives_7_4_0 ) )
-            {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:921:1: ( ( rule__Constraint__MaxValueAlternatives_7_4_0 ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:922:1: ( rule__Constraint__MaxValueAlternatives_7_4_0 )
-            {
-             before(grammarAccess.getConstraintAccess().getMaxValueAlternatives_7_4_0()); 
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:923:1: ( rule__Constraint__MaxValueAlternatives_7_4_0 )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:923:2: rule__Constraint__MaxValueAlternatives_7_4_0
-            {
-            pushFollow(FOLLOW_rule__Constraint__MaxValueAlternatives_7_4_0_in_rule__Constraint__MaxValueAssignment_7_41828);
-            rule__Constraint__MaxValueAlternatives_7_4_0();
-            _fsp--;
-
-
-            }
-
-             after(grammarAccess.getConstraintAccess().getMaxValueAlternatives_7_4_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__Constraint__MaxValueAssignment_7_4
-
-
-    // $ANTLR start rule__IntValue__ValueAssignment
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:932:1: rule__IntValue__ValueAssignment : ( RULE_INT ) ;
-    public final void rule__IntValue__ValueAssignment() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:936:1: ( ( RULE_INT ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:937:1: ( RULE_INT )
-            {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:937:1: ( RULE_INT )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:938:1: RULE_INT
-            {
-             before(grammarAccess.getIntValueAccess().getValueINTTerminalRuleCall_0()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__IntValue__ValueAssignment1861); 
-             after(grammarAccess.getIntValueAccess().getValueINTTerminalRuleCall_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__IntValue__ValueAssignment
-
-
-    // $ANTLR start rule__RealValue__ValueAssignment
-    // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:947:1: rule__RealValue__ValueAssignment : ( RULE_REAL ) ;
-    public final void rule__RealValue__ValueAssignment() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:951:1: ( ( RULE_REAL ) )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:952:1: ( RULE_REAL )
-            {
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:952:1: ( RULE_REAL )
-            // ../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g:953:1: RULE_REAL
-            {
-             before(grammarAccess.getRealValueAccess().getValueREALTerminalRuleCall_0()); 
-            match(input,RULE_REAL,FOLLOW_RULE_REAL_in_rule__RealValue__ValueAssignment1892); 
-             after(grammarAccess.getRealValueAccess().getValueREALTerminalRuleCall_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end rule__RealValue__ValueAssignment
+    // $ANTLR end rule__Constraint__Group_7
 
 
  
 
     public static final BitSet FOLLOW_ruleModel_in_entryRuleModel60 = new BitSet(new long[]{0x0000000000000000L});
     public static final BitSet FOLLOW_EOF_in_entryRuleModel67 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Model__Group__0_in_ruleModel94 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTests_in_entryRuleTests120 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTests127 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Tests__Group__0_in_ruleTests154 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConstraint_in_entryRuleConstraint180 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleConstraint187 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Constraint__Group__0_in_ruleConstraint214 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntValue_in_entryRuleIntValue240 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIntValue247 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntValue__ValueAssignment_in_ruleIntValue274 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealValue_in_entryRuleRealValue300 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRealValue307 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RealValue__ValueAssignment_in_ruleRealValue334 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Measure__Alternatives_in_ruleMeasure371 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntValue_in_rule__Constraint__MinValueAlternatives_7_2_0406 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealValue_in_rule__Constraint__MinValueAlternatives_7_2_0423 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntValue_in_rule__Constraint__MaxValueAlternatives_7_4_0455 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealValue_in_rule__Constraint__MaxValueAlternatives_7_4_0472 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_rule__Measure__Alternatives505 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_rule__Measure__Alternatives526 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_rule__Measure__Alternatives547 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_rule__Measure__Alternatives568 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_rule__Measure__Alternatives589 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Model__NameAssignment_0_in_rule__Model__Group__0626 = new BitSet(new long[]{0x000000000007E022L});
-    public static final BitSet FOLLOW_rule__Model__Group__1_in_rule__Model__Group__0636 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Model__DescriptionAssignment_1_in_rule__Model__Group__1664 = new BitSet(new long[]{0x000000000007E002L});
-    public static final BitSet FOLLOW_rule__Model__Group__2_in_rule__Model__Group__1674 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Model__TestsAssignment_2_in_rule__Model__Group__2702 = new BitSet(new long[]{0x000000000003E002L});
-    public static final BitSet FOLLOW_rule__Model__Group__3_in_rule__Model__Group__2712 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Model__ContraintsAssignment_3_in_rule__Model__Group__3740 = new BitSet(new long[]{0x000000000003E002L});
-    public static final BitSet FOLLOW_18_in_rule__Tests__Group__0784 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Tests__Group__1_in_rule__Tests__Group__0794 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Tests__ImportURIAssignment_1_in_rule__Tests__Group__1822 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Constraint__MeasureAssignment_0_in_rule__Constraint__Group__0860 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_rule__Constraint__Group__1_in_rule__Constraint__Group__0869 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__Constraint__Group__1898 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Constraint__Group__2_in_rule__Constraint__Group__1908 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Constraint__AgentAssignment_2_in_rule__Constraint__Group__2936 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_rule__Constraint__Group__3_in_rule__Constraint__Group__2945 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__Constraint__Group__3974 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Constraint__Group__4_in_rule__Constraint__Group__3984 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Constraint__AttributeAssignment_4_in_rule__Constraint__Group__41012 = new BitSet(new long[]{0x0000000000300000L});
-    public static final BitSet FOLLOW_rule__Constraint__Group__5_in_rule__Constraint__Group__41021 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Constraint__Group_5__0_in_rule__Constraint__Group__51049 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_rule__Constraint__Group__6_in_rule__Constraint__Group__51059 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_rule__Constraint__Group__61088 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_rule__Constraint__Group__7_in_rule__Constraint__Group__61098 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Constraint__Group_7__0_in_rule__Constraint__Group__71126 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__Constraint__Group_5__01177 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Constraint__Group_5__1_in_rule__Constraint__Group_5__01187 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Constraint__QualifierAssignment_5_1_in_rule__Constraint__Group_5__11215 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_rule__Constraint__Group_7__01254 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_rule__Constraint__Group_7__1_in_rule__Constraint__Group_7__01264 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_rule__Constraint__Group_7__11293 = new BitSet(new long[]{0x00000000000000C0L});
-    public static final BitSet FOLLOW_rule__Constraint__Group_7__2_in_rule__Constraint__Group_7__11303 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Constraint__MinValueAssignment_7_2_in_rule__Constraint__Group_7__21331 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_rule__Constraint__Group_7__3_in_rule__Constraint__Group_7__21340 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_rule__Constraint__Group_7__31369 = new BitSet(new long[]{0x00000000000000C0L});
-    public static final BitSet FOLLOW_rule__Constraint__Group_7__4_in_rule__Constraint__Group_7__31379 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Constraint__MaxValueAssignment_7_4_in_rule__Constraint__Group_7__41407 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_rule__Constraint__Group_7__5_in_rule__Constraint__Group_7__41416 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_rule__Constraint__Group_7__51445 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__Model__NameAssignment_01492 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_PLAIN_STRING_in_rule__Model__DescriptionAssignment_11523 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTests_in_rule__Model__TestsAssignment_21554 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConstraint_in_rule__Model__ContraintsAssignment_31585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__Tests__ImportURIAssignment_11616 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMeasure_in_rule__Constraint__MeasureAssignment_01647 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__Constraint__AgentAssignment_21682 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__Constraint__AttributeAssignment_41721 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__Constraint__QualifierAssignment_5_11760 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Constraint__MinValueAlternatives_7_2_0_in_rule__Constraint__MinValueAssignment_7_21795 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Constraint__MaxValueAlternatives_7_4_0_in_rule__Constraint__MaxValueAssignment_7_41828 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__IntValue__ValueAssignment1861 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_REAL_in_rule__RealValue__ValueAssignment1892 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Model__Group_in_ruleModel94 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleTests_in_entryRuleTests119 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleTests126 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Tests__Group_in_ruleTests153 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleConstraint_in_entryRuleConstraint178 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleConstraint185 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Constraint__Group_in_ruleConstraint212 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleValue_in_entryRuleValue237 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleValue244 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Value__Alternatives_in_ruleValue271 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleIntValue_in_entryRuleIntValue296 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleIntValue303 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_INT_in_ruleIntValue337 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleRealValue_in_entryRuleRealValue368 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleRealValue375 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_REAL_in_ruleRealValue409 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Measure__Alternatives_in_ruleMeasure451 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleIntValue_in_rule__Value__Alternatives485 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleRealValue_in_rule__Value__Alternatives501 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_13_in_rule__Measure__Alternatives533 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_14_in_rule__Measure__Alternatives553 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_15_in_rule__Measure__Alternatives573 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_16_in_rule__Measure__Alternatives593 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_17_in_rule__Measure__Alternatives613 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_STRING_in_rule__Model__Group655 = new BitSet(new long[]{0x000000000007E082L});
+    public static final BitSet FOLLOW_RULE_PLAIN_STRING_in_rule__Model__Group680 = new BitSet(new long[]{0x000000000007E002L});
+    public static final BitSet FOLLOW_ruleTests_in_rule__Model__Group705 = new BitSet(new long[]{0x000000000003E002L});
+    public static final BitSet FOLLOW_ruleConstraint_in_rule__Model__Group730 = new BitSet(new long[]{0x000000000003E002L});
+    public static final BitSet FOLLOW_18_in_rule__Tests__Group770 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_RULE_STRING_in_rule__Tests__Group789 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleMeasure_in_rule__Constraint__Group834 = new BitSet(new long[]{0x0000000000080000L});
+    public static final BitSet FOLLOW_19_in_rule__Constraint__Group852 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_RULE_STRING_in_rule__Constraint__Group875 = new BitSet(new long[]{0x0000000000100000L});
+    public static final BitSet FOLLOW_20_in_rule__Constraint__Group897 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_RULE_STRING_in_rule__Constraint__Group920 = new BitSet(new long[]{0x0000000000300000L});
+    public static final BitSet FOLLOW_rule__Constraint__Group_5_in_rule__Constraint__Group941 = new BitSet(new long[]{0x0000000000200000L});
+    public static final BitSet FOLLOW_21_in_rule__Constraint__Group954 = new BitSet(new long[]{0x0000000000400000L});
+    public static final BitSet FOLLOW_rule__Constraint__Group_7_in_rule__Constraint__Group966 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_20_in_rule__Constraint__Group_5999 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_RULE_STRING_in_rule__Constraint__Group_51022 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_22_in_rule__Constraint__Group_71065 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_23_in_rule__Constraint__Group_71078 = new BitSet(new long[]{0x0000000000000030L});
+    public static final BitSet FOLLOW_ruleValue_in_rule__Constraint__Group_71097 = new BitSet(new long[]{0x0000000001000000L});
+    public static final BitSet FOLLOW_24_in_rule__Constraint__Group_71115 = new BitSet(new long[]{0x0000000000000030L});
+    public static final BitSet FOLLOW_ruleValue_in_rule__Constraint__Group_71134 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_25_in_rule__Constraint__Group_71152 = new BitSet(new long[]{0x0000000000000002L});
 
 }
\ No newline at end of file
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest__.g b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest__.g
index 51d4e3b..4c3e4a4 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest__.g
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest__.g
@@ -21,31 +21,31 @@
 T24 : ',' ;
 T25 : ']' ;
 
-// $ANTLR src "../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g" 963
-RULE_REAL : '-'? RULE_INT ('.' RULE_INT)?;
+// $ANTLR src "../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g" 542
+RULE_REAL : '-'? RULE_INT '.' RULE_INT;
 
-// $ANTLR src "../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g" 965
+// $ANTLR src "../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g" 544
 RULE_PLAIN_STRING : '\u00AB' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'\u00AB'|'\u00BB')))* '\u00BB';
 
-// $ANTLR src "../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g" 967
+// $ANTLR src "../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g" 546
 RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
 
-// $ANTLR src "../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g" 969
+// $ANTLR src "../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g" 548
 RULE_INT : ('0'..'9')+;
 
-// $ANTLR src "../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g" 971
+// $ANTLR src "../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g" 550
 RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
 
-// $ANTLR src "../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g" 973
+// $ANTLR src "../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g" 552
 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
 
-// $ANTLR src "../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g" 975
+// $ANTLR src "../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g" 554
 RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?;
 
-// $ANTLR src "../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g" 977
+// $ANTLR src "../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g" 556
 RULE_WS : (' '|'\t'|'\r'|'\n')+;
 
-// $ANTLR src "../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g" 979
+// $ANTLR src "../org.eclipse.amp.amf.testing.ui/src-gen/org/eclipse/amp/amf/testing/contentassist/antlr/internal/InternalATest.g" 558
 RULE_ANY_OTHER : .;