There probably aren't any real changes here.
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/ATestFactory.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/ATestFactory.java
index 925fb37..eb9fdd5 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/ATestFactory.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/ATestFactory.java
@@ -18,74 +18,74 @@
 public interface ATestFactory extends EFactory
 {
   /**
-     * The singleton instance of the factory.
-     * <!-- begin-user-doc -->
+   * The singleton instance of the factory.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   ATestFactory eINSTANCE = org.eclipse.amp.amf.testing.aTest.impl.ATestFactoryImpl.init();
 
   /**
-     * Returns a new object of class '<em>Model</em>'.
-     * <!-- begin-user-doc -->
+   * Returns a new object of class '<em>Model</em>'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @return a new object of class '<em>Model</em>'.
-     * @generated
-     */
+   * @return a new object of class '<em>Model</em>'.
+   * @generated
+   */
   Model createModel();
 
   /**
-     * Returns a new object of class '<em>Tests</em>'.
-     * <!-- begin-user-doc -->
+   * Returns a new object of class '<em>Tests</em>'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @return a new object of class '<em>Tests</em>'.
-     * @generated
-     */
+   * @return a new object of class '<em>Tests</em>'.
+   * @generated
+   */
   Tests createTests();
 
   /**
-     * Returns a new object of class '<em>Constraint</em>'.
-     * <!-- begin-user-doc -->
+   * Returns a new object of class '<em>Constraint</em>'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @return a new object of class '<em>Constraint</em>'.
-     * @generated
-     */
+   * @return a new object of class '<em>Constraint</em>'.
+   * @generated
+   */
   Constraint createConstraint();
 
   /**
-     * Returns a new object of class '<em>Value</em>'.
-     * <!-- begin-user-doc -->
+   * Returns a new object of class '<em>Value</em>'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @return a new object of class '<em>Value</em>'.
-     * @generated
-     */
+   * @return a new object of class '<em>Value</em>'.
+   * @generated
+   */
   Value createValue();
 
   /**
-     * Returns a new object of class '<em>Int Value</em>'.
-     * <!-- begin-user-doc -->
+   * Returns a new object of class '<em>Int Value</em>'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @return a new object of class '<em>Int Value</em>'.
-     * @generated
-     */
+   * @return a new object of class '<em>Int Value</em>'.
+   * @generated
+   */
   IntValue createIntValue();
 
   /**
-     * Returns a new object of class '<em>Real Value</em>'.
-     * <!-- begin-user-doc -->
+   * Returns a new object of class '<em>Real Value</em>'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @return a new object of class '<em>Real Value</em>'.
-     * @generated
-     */
+   * @return a new object of class '<em>Real Value</em>'.
+   * @generated
+   */
   RealValue createRealValue();
 
   /**
-     * Returns the package supported by this factory.
-     * <!-- begin-user-doc -->
+   * Returns the package supported by this factory.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @return the package supported by this factory.
-     * @generated
-     */
+   * @return the package supported by this factory.
+   * @generated
+   */
   ATestPackage getATestPackage();
 
 } //ATestFactory
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/ATestPackage.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/ATestPackage.java
index 8b58e0e..fa505c2 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/ATestPackage.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/ATestPackage.java
@@ -29,501 +29,501 @@
 public interface ATestPackage extends EPackage
 {
   /**
-     * The package name.
-     * <!-- begin-user-doc -->
+   * The package name.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   String eNAME = "aTest";
 
   /**
-     * The package namespace URI.
-     * <!-- begin-user-doc -->
+   * The package namespace URI.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   String eNS_URI = "http://www.eclipse.org/amp/amf/testing/ATest";
 
   /**
-     * The package namespace name.
-     * <!-- begin-user-doc -->
+   * The package namespace name.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   String eNS_PREFIX = "aTest";
 
   /**
-     * The singleton instance of the package.
-     * <!-- begin-user-doc -->
+   * The singleton instance of the package.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   ATestPackage eINSTANCE = org.eclipse.amp.amf.testing.aTest.impl.ATestPackageImpl.init();
 
   /**
-     * The meta object id for the '{@link org.eclipse.amp.amf.testing.aTest.impl.ModelImpl <em>Model</em>}' class.
-     * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.amp.amf.testing.aTest.impl.ModelImpl <em>Model</em>}' class.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see org.eclipse.amp.amf.testing.aTest.impl.ModelImpl
-     * @see org.eclipse.amp.amf.testing.aTest.impl.ATestPackageImpl#getModel()
-     * @generated
-     */
+   * @see org.eclipse.amp.amf.testing.aTest.impl.ModelImpl
+   * @see org.eclipse.amp.amf.testing.aTest.impl.ATestPackageImpl#getModel()
+   * @generated
+   */
   int MODEL = 0;
 
   /**
-     * The feature id for the '<em><b>Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
+   * @generated
+   * @ordered
+   */
   int MODEL__NAME = 0;
 
   /**
-     * The feature id for the '<em><b>Description</b></em>' attribute.
-     * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Description</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
+   * @generated
+   * @ordered
+   */
   int MODEL__DESCRIPTION = 1;
 
   /**
-     * The feature id for the '<em><b>Tests</b></em>' containment reference.
-     * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Tests</b></em>' containment reference.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
+   * @generated
+   * @ordered
+   */
   int MODEL__TESTS = 2;
 
   /**
-     * The feature id for the '<em><b>Contraints</b></em>' containment reference list.
-     * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Contraints</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
+   * @generated
+   * @ordered
+   */
   int MODEL__CONTRAINTS = 3;
 
   /**
-     * The number of structural features of the '<em>Model</em>' class.
-     * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>Model</em>' class.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
+   * @generated
+   * @ordered
+   */
   int MODEL_FEATURE_COUNT = 4;
 
   /**
-     * The meta object id for the '{@link org.eclipse.amp.amf.testing.aTest.impl.TestsImpl <em>Tests</em>}' class.
-     * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.amp.amf.testing.aTest.impl.TestsImpl <em>Tests</em>}' class.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see org.eclipse.amp.amf.testing.aTest.impl.TestsImpl
-     * @see org.eclipse.amp.amf.testing.aTest.impl.ATestPackageImpl#getTests()
-     * @generated
-     */
+   * @see org.eclipse.amp.amf.testing.aTest.impl.TestsImpl
+   * @see org.eclipse.amp.amf.testing.aTest.impl.ATestPackageImpl#getTests()
+   * @generated
+   */
   int TESTS = 1;
 
   /**
-     * The feature id for the '<em><b>Import URI</b></em>' attribute.
-     * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Import URI</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
+   * @generated
+   * @ordered
+   */
   int TESTS__IMPORT_URI = 0;
 
   /**
-     * The number of structural features of the '<em>Tests</em>' class.
-     * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>Tests</em>' class.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
+   * @generated
+   * @ordered
+   */
   int TESTS_FEATURE_COUNT = 1;
 
   /**
-     * The meta object id for the '{@link org.eclipse.amp.amf.testing.aTest.impl.ConstraintImpl <em>Constraint</em>}' class.
-     * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.amp.amf.testing.aTest.impl.ConstraintImpl <em>Constraint</em>}' class.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see org.eclipse.amp.amf.testing.aTest.impl.ConstraintImpl
-     * @see org.eclipse.amp.amf.testing.aTest.impl.ATestPackageImpl#getConstraint()
-     * @generated
-     */
+   * @see org.eclipse.amp.amf.testing.aTest.impl.ConstraintImpl
+   * @see org.eclipse.amp.amf.testing.aTest.impl.ATestPackageImpl#getConstraint()
+   * @generated
+   */
   int CONSTRAINT = 2;
 
   /**
-     * The feature id for the '<em><b>Measure</b></em>' attribute.
-     * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Measure</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
+   * @generated
+   * @ordered
+   */
   int CONSTRAINT__MEASURE = 0;
 
   /**
-     * The feature id for the '<em><b>Agent</b></em>' reference.
-     * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Agent</b></em>' reference.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
+   * @generated
+   * @ordered
+   */
   int CONSTRAINT__AGENT = 1;
 
   /**
-     * The feature id for the '<em><b>Attribute</b></em>' reference.
-     * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Attribute</b></em>' reference.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
+   * @generated
+   * @ordered
+   */
   int CONSTRAINT__ATTRIBUTE = 2;
 
   /**
-     * The feature id for the '<em><b>Qualifier</b></em>' reference.
-     * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Qualifier</b></em>' reference.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
+   * @generated
+   * @ordered
+   */
   int CONSTRAINT__QUALIFIER = 3;
 
   /**
-     * The feature id for the '<em><b>Min Value</b></em>' containment reference.
-     * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Min Value</b></em>' containment reference.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
+   * @generated
+   * @ordered
+   */
   int CONSTRAINT__MIN_VALUE = 4;
 
   /**
-     * The feature id for the '<em><b>Max Value</b></em>' containment reference.
-     * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Max Value</b></em>' containment reference.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
+   * @generated
+   * @ordered
+   */
   int CONSTRAINT__MAX_VALUE = 5;
 
   /**
-     * The number of structural features of the '<em>Constraint</em>' class.
-     * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>Constraint</em>' class.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
+   * @generated
+   * @ordered
+   */
   int CONSTRAINT_FEATURE_COUNT = 6;
 
   /**
-     * The meta object id for the '{@link org.eclipse.amp.amf.testing.aTest.impl.ValueImpl <em>Value</em>}' class.
-     * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.amp.amf.testing.aTest.impl.ValueImpl <em>Value</em>}' class.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see org.eclipse.amp.amf.testing.aTest.impl.ValueImpl
-     * @see org.eclipse.amp.amf.testing.aTest.impl.ATestPackageImpl#getValue()
-     * @generated
-     */
+   * @see org.eclipse.amp.amf.testing.aTest.impl.ValueImpl
+   * @see org.eclipse.amp.amf.testing.aTest.impl.ATestPackageImpl#getValue()
+   * @generated
+   */
   int VALUE = 3;
 
   /**
-     * The feature id for the '<em><b>Value</b></em>' attribute.
-     * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Value</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
+   * @generated
+   * @ordered
+   */
   int VALUE__VALUE = 0;
 
   /**
-     * The number of structural features of the '<em>Value</em>' class.
-     * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>Value</em>' class.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
+   * @generated
+   * @ordered
+   */
   int VALUE_FEATURE_COUNT = 1;
 
   /**
-     * The meta object id for the '{@link org.eclipse.amp.amf.testing.aTest.impl.IntValueImpl <em>Int Value</em>}' class.
-     * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.amp.amf.testing.aTest.impl.IntValueImpl <em>Int Value</em>}' class.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see org.eclipse.amp.amf.testing.aTest.impl.IntValueImpl
-     * @see org.eclipse.amp.amf.testing.aTest.impl.ATestPackageImpl#getIntValue()
-     * @generated
-     */
+   * @see org.eclipse.amp.amf.testing.aTest.impl.IntValueImpl
+   * @see org.eclipse.amp.amf.testing.aTest.impl.ATestPackageImpl#getIntValue()
+   * @generated
+   */
   int INT_VALUE = 4;
 
   /**
-     * The feature id for the '<em><b>Value</b></em>' attribute.
-     * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Value</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
+   * @generated
+   * @ordered
+   */
   int INT_VALUE__VALUE = VALUE__VALUE;
 
   /**
-     * The number of structural features of the '<em>Int Value</em>' class.
-     * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>Int Value</em>' class.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
+   * @generated
+   * @ordered
+   */
   int INT_VALUE_FEATURE_COUNT = VALUE_FEATURE_COUNT + 0;
 
   /**
-     * The meta object id for the '{@link org.eclipse.amp.amf.testing.aTest.impl.RealValueImpl <em>Real Value</em>}' class.
-     * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.amp.amf.testing.aTest.impl.RealValueImpl <em>Real Value</em>}' class.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see org.eclipse.amp.amf.testing.aTest.impl.RealValueImpl
-     * @see org.eclipse.amp.amf.testing.aTest.impl.ATestPackageImpl#getRealValue()
-     * @generated
-     */
+   * @see org.eclipse.amp.amf.testing.aTest.impl.RealValueImpl
+   * @see org.eclipse.amp.amf.testing.aTest.impl.ATestPackageImpl#getRealValue()
+   * @generated
+   */
   int REAL_VALUE = 5;
 
   /**
-     * The feature id for the '<em><b>Value</b></em>' attribute.
-     * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Value</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
+   * @generated
+   * @ordered
+   */
   int REAL_VALUE__VALUE = VALUE__VALUE;
 
   /**
-     * The number of structural features of the '<em>Real Value</em>' class.
-     * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>Real Value</em>' class.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
+   * @generated
+   * @ordered
+   */
   int REAL_VALUE_FEATURE_COUNT = VALUE_FEATURE_COUNT + 0;
 
   /**
-     * The meta object id for the '{@link org.eclipse.amp.amf.testing.aTest.Measure <em>Measure</em>}' enum.
-     * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.amp.amf.testing.aTest.Measure <em>Measure</em>}' enum.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see org.eclipse.amp.amf.testing.aTest.Measure
-     * @see org.eclipse.amp.amf.testing.aTest.impl.ATestPackageImpl#getMeasure()
-     * @generated
-     */
+   * @see org.eclipse.amp.amf.testing.aTest.Measure
+   * @see org.eclipse.amp.amf.testing.aTest.impl.ATestPackageImpl#getMeasure()
+   * @generated
+   */
   int MEASURE = 6;
 
 
   /**
-     * Returns the meta object for class '{@link org.eclipse.amp.amf.testing.aTest.Model <em>Model</em>}'.
-     * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.amp.amf.testing.aTest.Model <em>Model</em>}'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Model</em>'.
-     * @see org.eclipse.amp.amf.testing.aTest.Model
-     * @generated
-     */
+   * @return the meta object for class '<em>Model</em>'.
+   * @see org.eclipse.amp.amf.testing.aTest.Model
+   * @generated
+   */
   EClass getModel();
 
   /**
-     * Returns the meta object for the attribute '{@link org.eclipse.amp.amf.testing.aTest.Model#getName <em>Name</em>}'.
-     * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amp.amf.testing.aTest.Model#getName <em>Name</em>}'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Name</em>'.
-     * @see org.eclipse.amp.amf.testing.aTest.Model#getName()
-     * @see #getModel()
-     * @generated
-     */
+   * @return the meta object for the attribute '<em>Name</em>'.
+   * @see org.eclipse.amp.amf.testing.aTest.Model#getName()
+   * @see #getModel()
+   * @generated
+   */
   EAttribute getModel_Name();
 
   /**
-     * Returns the meta object for the attribute '{@link org.eclipse.amp.amf.testing.aTest.Model#getDescription <em>Description</em>}'.
-     * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amp.amf.testing.aTest.Model#getDescription <em>Description</em>}'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Description</em>'.
-     * @see org.eclipse.amp.amf.testing.aTest.Model#getDescription()
-     * @see #getModel()
-     * @generated
-     */
+   * @return the meta object for the attribute '<em>Description</em>'.
+   * @see org.eclipse.amp.amf.testing.aTest.Model#getDescription()
+   * @see #getModel()
+   * @generated
+   */
   EAttribute getModel_Description();
 
   /**
-     * Returns the meta object for the containment reference '{@link org.eclipse.amp.amf.testing.aTest.Model#getTests <em>Tests</em>}'.
-     * <!-- begin-user-doc -->
+   * Returns the meta object for the containment reference '{@link org.eclipse.amp.amf.testing.aTest.Model#getTests <em>Tests</em>}'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @return the meta object for the containment reference '<em>Tests</em>'.
-     * @see org.eclipse.amp.amf.testing.aTest.Model#getTests()
-     * @see #getModel()
-     * @generated
-     */
+   * @return the meta object for the containment reference '<em>Tests</em>'.
+   * @see org.eclipse.amp.amf.testing.aTest.Model#getTests()
+   * @see #getModel()
+   * @generated
+   */
   EReference getModel_Tests();
 
   /**
-     * Returns the meta object for the containment reference list '{@link org.eclipse.amp.amf.testing.aTest.Model#getContraints <em>Contraints</em>}'.
-     * <!-- begin-user-doc -->
+   * Returns the meta object for the containment reference list '{@link org.eclipse.amp.amf.testing.aTest.Model#getContraints <em>Contraints</em>}'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @return the meta object for the containment reference list '<em>Contraints</em>'.
-     * @see org.eclipse.amp.amf.testing.aTest.Model#getContraints()
-     * @see #getModel()
-     * @generated
-     */
+   * @return the meta object for the containment reference list '<em>Contraints</em>'.
+   * @see org.eclipse.amp.amf.testing.aTest.Model#getContraints()
+   * @see #getModel()
+   * @generated
+   */
   EReference getModel_Contraints();
 
   /**
-     * Returns the meta object for class '{@link org.eclipse.amp.amf.testing.aTest.Tests <em>Tests</em>}'.
-     * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.amp.amf.testing.aTest.Tests <em>Tests</em>}'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Tests</em>'.
-     * @see org.eclipse.amp.amf.testing.aTest.Tests
-     * @generated
-     */
+   * @return the meta object for class '<em>Tests</em>'.
+   * @see org.eclipse.amp.amf.testing.aTest.Tests
+   * @generated
+   */
   EClass getTests();
 
   /**
-     * Returns the meta object for the attribute '{@link org.eclipse.amp.amf.testing.aTest.Tests#getImportURI <em>Import URI</em>}'.
-     * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amp.amf.testing.aTest.Tests#getImportURI <em>Import URI</em>}'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Import URI</em>'.
-     * @see org.eclipse.amp.amf.testing.aTest.Tests#getImportURI()
-     * @see #getTests()
-     * @generated
-     */
+   * @return the meta object for the attribute '<em>Import URI</em>'.
+   * @see org.eclipse.amp.amf.testing.aTest.Tests#getImportURI()
+   * @see #getTests()
+   * @generated
+   */
   EAttribute getTests_ImportURI();
 
   /**
-     * Returns the meta object for class '{@link org.eclipse.amp.amf.testing.aTest.Constraint <em>Constraint</em>}'.
-     * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.amp.amf.testing.aTest.Constraint <em>Constraint</em>}'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Constraint</em>'.
-     * @see org.eclipse.amp.amf.testing.aTest.Constraint
-     * @generated
-     */
+   * @return the meta object for class '<em>Constraint</em>'.
+   * @see org.eclipse.amp.amf.testing.aTest.Constraint
+   * @generated
+   */
   EClass getConstraint();
 
   /**
-     * Returns the meta object for the attribute '{@link org.eclipse.amp.amf.testing.aTest.Constraint#getMeasure <em>Measure</em>}'.
-     * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amp.amf.testing.aTest.Constraint#getMeasure <em>Measure</em>}'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Measure</em>'.
-     * @see org.eclipse.amp.amf.testing.aTest.Constraint#getMeasure()
-     * @see #getConstraint()
-     * @generated
-     */
+   * @return the meta object for the attribute '<em>Measure</em>'.
+   * @see org.eclipse.amp.amf.testing.aTest.Constraint#getMeasure()
+   * @see #getConstraint()
+   * @generated
+   */
   EAttribute getConstraint_Measure();
 
   /**
-     * Returns the meta object for the reference '{@link org.eclipse.amp.amf.testing.aTest.Constraint#getAgent <em>Agent</em>}'.
-     * <!-- begin-user-doc -->
+   * Returns the meta object for the reference '{@link org.eclipse.amp.amf.testing.aTest.Constraint#getAgent <em>Agent</em>}'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @return the meta object for the reference '<em>Agent</em>'.
-     * @see org.eclipse.amp.amf.testing.aTest.Constraint#getAgent()
-     * @see #getConstraint()
-     * @generated
-     */
+   * @return the meta object for the reference '<em>Agent</em>'.
+   * @see org.eclipse.amp.amf.testing.aTest.Constraint#getAgent()
+   * @see #getConstraint()
+   * @generated
+   */
   EReference getConstraint_Agent();
 
   /**
-     * Returns the meta object for the reference '{@link org.eclipse.amp.amf.testing.aTest.Constraint#getAttribute <em>Attribute</em>}'.
-     * <!-- begin-user-doc -->
+   * Returns the meta object for the reference '{@link org.eclipse.amp.amf.testing.aTest.Constraint#getAttribute <em>Attribute</em>}'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @return the meta object for the reference '<em>Attribute</em>'.
-     * @see org.eclipse.amp.amf.testing.aTest.Constraint#getAttribute()
-     * @see #getConstraint()
-     * @generated
-     */
+   * @return the meta object for the reference '<em>Attribute</em>'.
+   * @see org.eclipse.amp.amf.testing.aTest.Constraint#getAttribute()
+   * @see #getConstraint()
+   * @generated
+   */
   EReference getConstraint_Attribute();
 
   /**
-     * Returns the meta object for the reference '{@link org.eclipse.amp.amf.testing.aTest.Constraint#getQualifier <em>Qualifier</em>}'.
-     * <!-- begin-user-doc -->
+   * Returns the meta object for the reference '{@link org.eclipse.amp.amf.testing.aTest.Constraint#getQualifier <em>Qualifier</em>}'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @return the meta object for the reference '<em>Qualifier</em>'.
-     * @see org.eclipse.amp.amf.testing.aTest.Constraint#getQualifier()
-     * @see #getConstraint()
-     * @generated
-     */
+   * @return the meta object for the reference '<em>Qualifier</em>'.
+   * @see org.eclipse.amp.amf.testing.aTest.Constraint#getQualifier()
+   * @see #getConstraint()
+   * @generated
+   */
   EReference getConstraint_Qualifier();
 
   /**
-     * Returns the meta object for the containment reference '{@link org.eclipse.amp.amf.testing.aTest.Constraint#getMinValue <em>Min Value</em>}'.
-     * <!-- begin-user-doc -->
+   * Returns the meta object for the containment reference '{@link org.eclipse.amp.amf.testing.aTest.Constraint#getMinValue <em>Min Value</em>}'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @return the meta object for the containment reference '<em>Min Value</em>'.
-     * @see org.eclipse.amp.amf.testing.aTest.Constraint#getMinValue()
-     * @see #getConstraint()
-     * @generated
-     */
+   * @return the meta object for the containment reference '<em>Min Value</em>'.
+   * @see org.eclipse.amp.amf.testing.aTest.Constraint#getMinValue()
+   * @see #getConstraint()
+   * @generated
+   */
   EReference getConstraint_MinValue();
 
   /**
-     * Returns the meta object for the containment reference '{@link org.eclipse.amp.amf.testing.aTest.Constraint#getMaxValue <em>Max Value</em>}'.
-     * <!-- begin-user-doc -->
+   * Returns the meta object for the containment reference '{@link org.eclipse.amp.amf.testing.aTest.Constraint#getMaxValue <em>Max Value</em>}'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @return the meta object for the containment reference '<em>Max Value</em>'.
-     * @see org.eclipse.amp.amf.testing.aTest.Constraint#getMaxValue()
-     * @see #getConstraint()
-     * @generated
-     */
+   * @return the meta object for the containment reference '<em>Max Value</em>'.
+   * @see org.eclipse.amp.amf.testing.aTest.Constraint#getMaxValue()
+   * @see #getConstraint()
+   * @generated
+   */
   EReference getConstraint_MaxValue();
 
   /**
-     * Returns the meta object for class '{@link org.eclipse.amp.amf.testing.aTest.Value <em>Value</em>}'.
-     * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.amp.amf.testing.aTest.Value <em>Value</em>}'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Value</em>'.
-     * @see org.eclipse.amp.amf.testing.aTest.Value
-     * @generated
-     */
+   * @return the meta object for class '<em>Value</em>'.
+   * @see org.eclipse.amp.amf.testing.aTest.Value
+   * @generated
+   */
   EClass getValue();
 
   /**
-     * Returns the meta object for the attribute '{@link org.eclipse.amp.amf.testing.aTest.Value#getValue <em>Value</em>}'.
-     * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amp.amf.testing.aTest.Value#getValue <em>Value</em>}'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Value</em>'.
-     * @see org.eclipse.amp.amf.testing.aTest.Value#getValue()
-     * @see #getValue()
-     * @generated
-     */
+   * @return the meta object for the attribute '<em>Value</em>'.
+   * @see org.eclipse.amp.amf.testing.aTest.Value#getValue()
+   * @see #getValue()
+   * @generated
+   */
   EAttribute getValue_Value();
 
   /**
-     * Returns the meta object for class '{@link org.eclipse.amp.amf.testing.aTest.IntValue <em>Int Value</em>}'.
-     * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.amp.amf.testing.aTest.IntValue <em>Int Value</em>}'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Int Value</em>'.
-     * @see org.eclipse.amp.amf.testing.aTest.IntValue
-     * @generated
-     */
+   * @return the meta object for class '<em>Int Value</em>'.
+   * @see org.eclipse.amp.amf.testing.aTest.IntValue
+   * @generated
+   */
   EClass getIntValue();
 
   /**
-     * Returns the meta object for class '{@link org.eclipse.amp.amf.testing.aTest.RealValue <em>Real Value</em>}'.
-     * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.amp.amf.testing.aTest.RealValue <em>Real Value</em>}'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Real Value</em>'.
-     * @see org.eclipse.amp.amf.testing.aTest.RealValue
-     * @generated
-     */
+   * @return the meta object for class '<em>Real Value</em>'.
+   * @see org.eclipse.amp.amf.testing.aTest.RealValue
+   * @generated
+   */
   EClass getRealValue();
 
   /**
-     * Returns the meta object for enum '{@link org.eclipse.amp.amf.testing.aTest.Measure <em>Measure</em>}'.
-     * <!-- begin-user-doc -->
+   * Returns the meta object for enum '{@link org.eclipse.amp.amf.testing.aTest.Measure <em>Measure</em>}'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @return the meta object for enum '<em>Measure</em>'.
-     * @see org.eclipse.amp.amf.testing.aTest.Measure
-     * @generated
-     */
+   * @return the meta object for enum '<em>Measure</em>'.
+   * @see org.eclipse.amp.amf.testing.aTest.Measure
+   * @generated
+   */
   EEnum getMeasure();
 
   /**
-     * Returns the factory that creates the instances of the model.
-     * <!-- begin-user-doc -->
+   * Returns the factory that creates the instances of the model.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @return the factory that creates the instances of the model.
-     * @generated
-     */
+   * @return the factory that creates the instances of the model.
+   * @generated
+   */
   ATestFactory getATestFactory();
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * Defines literals for the meta objects that represent
    * <ul>
    *   <li>each class,</li>
@@ -532,174 +532,174 @@
    *   <li>and each data type</li>
    * </ul>
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   interface Literals
   {
     /**
-         * The meta object literal for the '{@link org.eclipse.amp.amf.testing.aTest.impl.ModelImpl <em>Model</em>}' class.
-         * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.amp.amf.testing.aTest.impl.ModelImpl <em>Model</em>}' class.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-         * @see org.eclipse.amp.amf.testing.aTest.impl.ModelImpl
-         * @see org.eclipse.amp.amf.testing.aTest.impl.ATestPackageImpl#getModel()
-         * @generated
-         */
+     * @see org.eclipse.amp.amf.testing.aTest.impl.ModelImpl
+     * @see org.eclipse.amp.amf.testing.aTest.impl.ATestPackageImpl#getModel()
+     * @generated
+     */
     EClass MODEL = eINSTANCE.getModel();
 
     /**
-         * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-         * @generated
-         */
+     * @generated
+     */
     EAttribute MODEL__NAME = eINSTANCE.getModel_Name();
 
     /**
-         * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-         * @generated
-         */
+     * @generated
+     */
     EAttribute MODEL__DESCRIPTION = eINSTANCE.getModel_Description();
 
     /**
-         * The meta object literal for the '<em><b>Tests</b></em>' containment reference feature.
-         * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Tests</b></em>' containment reference feature.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-         * @generated
-         */
+     * @generated
+     */
     EReference MODEL__TESTS = eINSTANCE.getModel_Tests();
 
     /**
-         * The meta object literal for the '<em><b>Contraints</b></em>' containment reference list feature.
-         * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Contraints</b></em>' containment reference list feature.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-         * @generated
-         */
+     * @generated
+     */
     EReference MODEL__CONTRAINTS = eINSTANCE.getModel_Contraints();
 
     /**
-         * The meta object literal for the '{@link org.eclipse.amp.amf.testing.aTest.impl.TestsImpl <em>Tests</em>}' class.
-         * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.amp.amf.testing.aTest.impl.TestsImpl <em>Tests</em>}' class.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-         * @see org.eclipse.amp.amf.testing.aTest.impl.TestsImpl
-         * @see org.eclipse.amp.amf.testing.aTest.impl.ATestPackageImpl#getTests()
-         * @generated
-         */
+     * @see org.eclipse.amp.amf.testing.aTest.impl.TestsImpl
+     * @see org.eclipse.amp.amf.testing.aTest.impl.ATestPackageImpl#getTests()
+     * @generated
+     */
     EClass TESTS = eINSTANCE.getTests();
 
     /**
-         * The meta object literal for the '<em><b>Import URI</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Import URI</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-         * @generated
-         */
+     * @generated
+     */
     EAttribute TESTS__IMPORT_URI = eINSTANCE.getTests_ImportURI();
 
     /**
-         * The meta object literal for the '{@link org.eclipse.amp.amf.testing.aTest.impl.ConstraintImpl <em>Constraint</em>}' class.
-         * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.amp.amf.testing.aTest.impl.ConstraintImpl <em>Constraint</em>}' class.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-         * @see org.eclipse.amp.amf.testing.aTest.impl.ConstraintImpl
-         * @see org.eclipse.amp.amf.testing.aTest.impl.ATestPackageImpl#getConstraint()
-         * @generated
-         */
+     * @see org.eclipse.amp.amf.testing.aTest.impl.ConstraintImpl
+     * @see org.eclipse.amp.amf.testing.aTest.impl.ATestPackageImpl#getConstraint()
+     * @generated
+     */
     EClass CONSTRAINT = eINSTANCE.getConstraint();
 
     /**
-         * The meta object literal for the '<em><b>Measure</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Measure</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-         * @generated
-         */
+     * @generated
+     */
     EAttribute CONSTRAINT__MEASURE = eINSTANCE.getConstraint_Measure();
 
     /**
-         * The meta object literal for the '<em><b>Agent</b></em>' reference feature.
-         * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Agent</b></em>' reference feature.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-         * @generated
-         */
+     * @generated
+     */
     EReference CONSTRAINT__AGENT = eINSTANCE.getConstraint_Agent();
 
     /**
-         * The meta object literal for the '<em><b>Attribute</b></em>' reference feature.
-         * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Attribute</b></em>' reference feature.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-         * @generated
-         */
+     * @generated
+     */
     EReference CONSTRAINT__ATTRIBUTE = eINSTANCE.getConstraint_Attribute();
 
     /**
-         * The meta object literal for the '<em><b>Qualifier</b></em>' reference feature.
-         * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Qualifier</b></em>' reference feature.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-         * @generated
-         */
+     * @generated
+     */
     EReference CONSTRAINT__QUALIFIER = eINSTANCE.getConstraint_Qualifier();
 
     /**
-         * The meta object literal for the '<em><b>Min Value</b></em>' containment reference feature.
-         * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Min Value</b></em>' containment reference feature.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-         * @generated
-         */
+     * @generated
+     */
     EReference CONSTRAINT__MIN_VALUE = eINSTANCE.getConstraint_MinValue();
 
     /**
-         * The meta object literal for the '<em><b>Max Value</b></em>' containment reference feature.
-         * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Max Value</b></em>' containment reference feature.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-         * @generated
-         */
+     * @generated
+     */
     EReference CONSTRAINT__MAX_VALUE = eINSTANCE.getConstraint_MaxValue();
 
     /**
-         * The meta object literal for the '{@link org.eclipse.amp.amf.testing.aTest.impl.ValueImpl <em>Value</em>}' class.
-         * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.amp.amf.testing.aTest.impl.ValueImpl <em>Value</em>}' class.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-         * @see org.eclipse.amp.amf.testing.aTest.impl.ValueImpl
-         * @see org.eclipse.amp.amf.testing.aTest.impl.ATestPackageImpl#getValue()
-         * @generated
-         */
+     * @see org.eclipse.amp.amf.testing.aTest.impl.ValueImpl
+     * @see org.eclipse.amp.amf.testing.aTest.impl.ATestPackageImpl#getValue()
+     * @generated
+     */
     EClass VALUE = eINSTANCE.getValue();
 
     /**
-         * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-         * @generated
-         */
+     * @generated
+     */
     EAttribute VALUE__VALUE = eINSTANCE.getValue_Value();
 
     /**
-         * The meta object literal for the '{@link org.eclipse.amp.amf.testing.aTest.impl.IntValueImpl <em>Int Value</em>}' class.
-         * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.amp.amf.testing.aTest.impl.IntValueImpl <em>Int Value</em>}' class.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-         * @see org.eclipse.amp.amf.testing.aTest.impl.IntValueImpl
-         * @see org.eclipse.amp.amf.testing.aTest.impl.ATestPackageImpl#getIntValue()
-         * @generated
-         */
+     * @see org.eclipse.amp.amf.testing.aTest.impl.IntValueImpl
+     * @see org.eclipse.amp.amf.testing.aTest.impl.ATestPackageImpl#getIntValue()
+     * @generated
+     */
     EClass INT_VALUE = eINSTANCE.getIntValue();
 
     /**
-         * The meta object literal for the '{@link org.eclipse.amp.amf.testing.aTest.impl.RealValueImpl <em>Real Value</em>}' class.
-         * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.amp.amf.testing.aTest.impl.RealValueImpl <em>Real Value</em>}' class.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-         * @see org.eclipse.amp.amf.testing.aTest.impl.RealValueImpl
-         * @see org.eclipse.amp.amf.testing.aTest.impl.ATestPackageImpl#getRealValue()
-         * @generated
-         */
+     * @see org.eclipse.amp.amf.testing.aTest.impl.RealValueImpl
+     * @see org.eclipse.amp.amf.testing.aTest.impl.ATestPackageImpl#getRealValue()
+     * @generated
+     */
     EClass REAL_VALUE = eINSTANCE.getRealValue();
 
     /**
-         * The meta object literal for the '{@link org.eclipse.amp.amf.testing.aTest.Measure <em>Measure</em>}' enum.
-         * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.amp.amf.testing.aTest.Measure <em>Measure</em>}' enum.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-         * @see org.eclipse.amp.amf.testing.aTest.Measure
-         * @see org.eclipse.amp.amf.testing.aTest.impl.ATestPackageImpl#getMeasure()
-         * @generated
-         */
+     * @see org.eclipse.amp.amf.testing.aTest.Measure
+     * @see org.eclipse.amp.amf.testing.aTest.impl.ATestPackageImpl#getMeasure()
+     * @generated
+     */
     EEnum MEASURE = eINSTANCE.getMeasure();
 
   }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/Constraint.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/Constraint.java
index 65224ee..ca6e718 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/Constraint.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/Constraint.java
@@ -35,162 +35,162 @@
 public interface Constraint extends EObject
 {
   /**
-     * Returns the value of the '<em><b>Measure</b></em>' attribute.
-     * The literals are from the enumeration {@link org.eclipse.amp.amf.testing.aTest.Measure}.
-     * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Measure</b></em>' attribute.
+   * The literals are from the enumeration {@link org.eclipse.amp.amf.testing.aTest.Measure}.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Measure</em>' attribute isn't clear,
    * there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-     * @return the value of the '<em>Measure</em>' attribute.
-     * @see org.eclipse.amp.amf.testing.aTest.Measure
-     * @see #setMeasure(Measure)
-     * @see org.eclipse.amp.amf.testing.aTest.ATestPackage#getConstraint_Measure()
-     * @model
-     * @generated
-     */
+   * @return the value of the '<em>Measure</em>' attribute.
+   * @see org.eclipse.amp.amf.testing.aTest.Measure
+   * @see #setMeasure(Measure)
+   * @see org.eclipse.amp.amf.testing.aTest.ATestPackage#getConstraint_Measure()
+   * @model
+   * @generated
+   */
   Measure getMeasure();
 
   /**
-     * Sets the value of the '{@link org.eclipse.amp.amf.testing.aTest.Constraint#getMeasure <em>Measure</em>}' attribute.
-     * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amp.amf.testing.aTest.Constraint#getMeasure <em>Measure</em>}' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Measure</em>' attribute.
-     * @see org.eclipse.amp.amf.testing.aTest.Measure
-     * @see #getMeasure()
-     * @generated
-     */
+   * @param value the new value of the '<em>Measure</em>' attribute.
+   * @see org.eclipse.amp.amf.testing.aTest.Measure
+   * @see #getMeasure()
+   * @generated
+   */
   void setMeasure(Measure value);
 
   /**
-     * Returns the value of the '<em><b>Agent</b></em>' reference.
-     * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Agent</b></em>' reference.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Agent</em>' reference isn't clear,
    * there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-     * @return the value of the '<em>Agent</em>' reference.
-     * @see #setAgent(SAgent)
-     * @see org.eclipse.amp.amf.testing.aTest.ATestPackage#getConstraint_Agent()
-     * @model
-     * @generated
-     */
+   * @return the value of the '<em>Agent</em>' reference.
+   * @see #setAgent(SAgent)
+   * @see org.eclipse.amp.amf.testing.aTest.ATestPackage#getConstraint_Agent()
+   * @model
+   * @generated
+   */
   SAgent getAgent();
 
   /**
-     * Sets the value of the '{@link org.eclipse.amp.amf.testing.aTest.Constraint#getAgent <em>Agent</em>}' reference.
-     * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amp.amf.testing.aTest.Constraint#getAgent <em>Agent</em>}' reference.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Agent</em>' reference.
-     * @see #getAgent()
-     * @generated
-     */
+   * @param value the new value of the '<em>Agent</em>' reference.
+   * @see #getAgent()
+   * @generated
+   */
   void setAgent(SAgent value);
 
   /**
-     * Returns the value of the '<em><b>Attribute</b></em>' reference.
-     * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Attribute</b></em>' reference.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Attribute</em>' reference isn't clear,
    * there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-     * @return the value of the '<em>Attribute</em>' reference.
-     * @see #setAttribute(SAttribute)
-     * @see org.eclipse.amp.amf.testing.aTest.ATestPackage#getConstraint_Attribute()
-     * @model
-     * @generated
-     */
+   * @return the value of the '<em>Attribute</em>' reference.
+   * @see #setAttribute(SAttribute)
+   * @see org.eclipse.amp.amf.testing.aTest.ATestPackage#getConstraint_Attribute()
+   * @model
+   * @generated
+   */
   SAttribute getAttribute();
 
   /**
-     * Sets the value of the '{@link org.eclipse.amp.amf.testing.aTest.Constraint#getAttribute <em>Attribute</em>}' reference.
-     * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amp.amf.testing.aTest.Constraint#getAttribute <em>Attribute</em>}' reference.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Attribute</em>' reference.
-     * @see #getAttribute()
-     * @generated
-     */
+   * @param value the new value of the '<em>Attribute</em>' reference.
+   * @see #getAttribute()
+   * @generated
+   */
   void setAttribute(SAttribute value);
 
   /**
-     * Returns the value of the '<em><b>Qualifier</b></em>' reference.
-     * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Qualifier</b></em>' reference.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Qualifier</em>' reference isn't clear,
    * there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-     * @return the value of the '<em>Qualifier</em>' reference.
-     * @see #setQualifier(SStateValue)
-     * @see org.eclipse.amp.amf.testing.aTest.ATestPackage#getConstraint_Qualifier()
-     * @model
-     * @generated
-     */
+   * @return the value of the '<em>Qualifier</em>' reference.
+   * @see #setQualifier(SStateValue)
+   * @see org.eclipse.amp.amf.testing.aTest.ATestPackage#getConstraint_Qualifier()
+   * @model
+   * @generated
+   */
   SStateValue getQualifier();
 
   /**
-     * Sets the value of the '{@link org.eclipse.amp.amf.testing.aTest.Constraint#getQualifier <em>Qualifier</em>}' reference.
-     * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amp.amf.testing.aTest.Constraint#getQualifier <em>Qualifier</em>}' reference.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Qualifier</em>' reference.
-     * @see #getQualifier()
-     * @generated
-     */
+   * @param value the new value of the '<em>Qualifier</em>' reference.
+   * @see #getQualifier()
+   * @generated
+   */
   void setQualifier(SStateValue value);
 
   /**
-     * Returns the value of the '<em><b>Min Value</b></em>' containment reference.
-     * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Min Value</b></em>' containment reference.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Min Value</em>' containment reference isn't clear,
    * there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-     * @return the value of the '<em>Min Value</em>' containment reference.
-     * @see #setMinValue(Value)
-     * @see org.eclipse.amp.amf.testing.aTest.ATestPackage#getConstraint_MinValue()
-     * @model containment="true"
-     * @generated
-     */
+   * @return the value of the '<em>Min Value</em>' containment reference.
+   * @see #setMinValue(Value)
+   * @see org.eclipse.amp.amf.testing.aTest.ATestPackage#getConstraint_MinValue()
+   * @model containment="true"
+   * @generated
+   */
   Value getMinValue();
 
   /**
-     * Sets the value of the '{@link org.eclipse.amp.amf.testing.aTest.Constraint#getMinValue <em>Min Value</em>}' containment reference.
-     * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amp.amf.testing.aTest.Constraint#getMinValue <em>Min Value</em>}' containment reference.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Min Value</em>' containment reference.
-     * @see #getMinValue()
-     * @generated
-     */
+   * @param value the new value of the '<em>Min Value</em>' containment reference.
+   * @see #getMinValue()
+   * @generated
+   */
   void setMinValue(Value value);
 
   /**
-     * Returns the value of the '<em><b>Max Value</b></em>' containment reference.
-     * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Max Value</b></em>' containment reference.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Max Value</em>' containment reference isn't clear,
    * there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-     * @return the value of the '<em>Max Value</em>' containment reference.
-     * @see #setMaxValue(Value)
-     * @see org.eclipse.amp.amf.testing.aTest.ATestPackage#getConstraint_MaxValue()
-     * @model containment="true"
-     * @generated
-     */
+   * @return the value of the '<em>Max Value</em>' containment reference.
+   * @see #setMaxValue(Value)
+   * @see org.eclipse.amp.amf.testing.aTest.ATestPackage#getConstraint_MaxValue()
+   * @model containment="true"
+   * @generated
+   */
   Value getMaxValue();
 
   /**
-     * Sets the value of the '{@link org.eclipse.amp.amf.testing.aTest.Constraint#getMaxValue <em>Max Value</em>}' containment reference.
-     * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amp.amf.testing.aTest.Constraint#getMaxValue <em>Max Value</em>}' containment reference.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Max Value</em>' containment reference.
-     * @see #getMaxValue()
-     * @generated
-     */
+   * @param value the new value of the '<em>Max Value</em>' containment reference.
+   * @see #getMaxValue()
+   * @generated
+   */
   void setMaxValue(Value value);
 
 } // Constraint
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/Measure.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/Measure.java
index 67f6272..417babd 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/Measure.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/Measure.java
@@ -23,279 +23,285 @@
 public enum Measure implements Enumerator
 {
   /**
-     * The '<em><b>COUNT</b></em>' literal object.
-     * <!-- begin-user-doc -->
+   * The '<em><b>COUNT</b></em>' literal object.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see #COUNT_VALUE
-     * @generated
-     * @ordered
-     */
+   * @see #COUNT_VALUE
+   * @generated
+   * @ordered
+   */
   COUNT(0, "COUNT", "Count"),
 
   /**
-     * The '<em><b>AVERAGE</b></em>' literal object.
-     * <!-- begin-user-doc -->
+   * The '<em><b>AVERAGE</b></em>' literal object.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see #AVERAGE_VALUE
-     * @generated
-     * @ordered
-     */
+   * @see #AVERAGE_VALUE
+   * @generated
+   * @ordered
+   */
   AVERAGE(1, "AVERAGE", "Average"),
 
   /**
-     * The '<em><b>SUM</b></em>' literal object.
-     * <!-- begin-user-doc -->
+   * The '<em><b>SUM</b></em>' literal object.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see #SUM_VALUE
-     * @generated
-     * @ordered
-     */
+   * @see #SUM_VALUE
+   * @generated
+   * @ordered
+   */
   SUM(2, "SUM", "Sum"),
 
   /**
-     * The '<em><b>MINIMUM</b></em>' literal object.
-     * <!-- begin-user-doc -->
+   * The '<em><b>MINIMUM</b></em>' literal object.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see #MINIMUM_VALUE
-     * @generated
-     * @ordered
-     */
+   * @see #MINIMUM_VALUE
+   * @generated
+   * @ordered
+   */
   MINIMUM(3, "MINIMUM", "Minimum"),
 
   /**
-     * The '<em><b>MAXIMUM</b></em>' literal object.
-     * <!-- begin-user-doc -->
+   * The '<em><b>MAXIMUM</b></em>' literal object.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see #MAXIMUM_VALUE
-     * @generated
-     * @ordered
-     */
+   * @see #MAXIMUM_VALUE
+   * @generated
+   * @ordered
+   */
   MAXIMUM(4, "MAXIMUM", "Maximum");
 
   /**
-     * The '<em><b>COUNT</b></em>' literal value.
-     * <!-- begin-user-doc -->
+   * The '<em><b>COUNT</b></em>' literal value.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of '<em><b>COUNT</b></em>' literal object isn't clear,
    * there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-     * @see #COUNT
-     * @model literal="Count"
-     * @generated
-     * @ordered
-     */
+   * @see #COUNT
+   * @model literal="Count"
+   * @generated
+   * @ordered
+   */
   public static final int COUNT_VALUE = 0;
 
   /**
-     * The '<em><b>AVERAGE</b></em>' literal value.
-     * <!-- begin-user-doc -->
+   * The '<em><b>AVERAGE</b></em>' literal value.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of '<em><b>AVERAGE</b></em>' literal object isn't clear,
    * there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-     * @see #AVERAGE
-     * @model literal="Average"
-     * @generated
-     * @ordered
-     */
+   * @see #AVERAGE
+   * @model literal="Average"
+   * @generated
+   * @ordered
+   */
   public static final int AVERAGE_VALUE = 1;
 
   /**
-     * The '<em><b>SUM</b></em>' literal value.
-     * <!-- begin-user-doc -->
+   * The '<em><b>SUM</b></em>' literal value.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of '<em><b>SUM</b></em>' literal object isn't clear,
    * there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-     * @see #SUM
-     * @model literal="Sum"
-     * @generated
-     * @ordered
-     */
+   * @see #SUM
+   * @model literal="Sum"
+   * @generated
+   * @ordered
+   */
   public static final int SUM_VALUE = 2;
 
   /**
-     * The '<em><b>MINIMUM</b></em>' literal value.
-     * <!-- begin-user-doc -->
+   * The '<em><b>MINIMUM</b></em>' literal value.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of '<em><b>MINIMUM</b></em>' literal object isn't clear,
    * there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-     * @see #MINIMUM
-     * @model literal="Minimum"
-     * @generated
-     * @ordered
-     */
+   * @see #MINIMUM
+   * @model literal="Minimum"
+   * @generated
+   * @ordered
+   */
   public static final int MINIMUM_VALUE = 3;
 
   /**
-     * The '<em><b>MAXIMUM</b></em>' literal value.
-     * <!-- begin-user-doc -->
+   * The '<em><b>MAXIMUM</b></em>' literal value.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of '<em><b>MAXIMUM</b></em>' literal object isn't clear,
    * there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-     * @see #MAXIMUM
-     * @model literal="Maximum"
-     * @generated
-     * @ordered
-     */
+   * @see #MAXIMUM
+   * @model literal="Maximum"
+   * @generated
+   * @ordered
+   */
   public static final int MAXIMUM_VALUE = 4;
 
   /**
-     * An array of all the '<em><b>Measure</b></em>' enumerators.
-     * <!-- begin-user-doc -->
+   * An array of all the '<em><b>Measure</b></em>' enumerators.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   private static final Measure[] VALUES_ARRAY =
-    new Measure[] {
-            COUNT,
-            AVERAGE,
-            SUM,
-            MINIMUM,
-            MAXIMUM,
-        };
+    new Measure[]
+    {
+      COUNT,
+      AVERAGE,
+      SUM,
+      MINIMUM,
+      MAXIMUM,
+    };
 
   /**
-     * A public read-only list of all the '<em><b>Measure</b></em>' enumerators.
-     * <!-- begin-user-doc -->
+   * A public read-only list of all the '<em><b>Measure</b></em>' enumerators.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public static final List<Measure> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
   /**
-     * Returns the '<em><b>Measure</b></em>' literal with the specified literal value.
-     * <!-- begin-user-doc -->
+   * Returns the '<em><b>Measure</b></em>' literal with the specified literal value.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public static Measure get(String literal)
   {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-            Measure result = VALUES_ARRAY[i];
-            if (result.toString().equals(literal)) {
-                return result;
-            }
-        }
-        return null;
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      Measure result = VALUES_ARRAY[i];
+      if (result.toString().equals(literal))
+      {
+        return result;
+      }
     }
+    return null;
+  }
 
   /**
-     * Returns the '<em><b>Measure</b></em>' literal with the specified name.
-     * <!-- begin-user-doc -->
+   * Returns the '<em><b>Measure</b></em>' literal with the specified name.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public static Measure getByName(String name)
   {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-            Measure result = VALUES_ARRAY[i];
-            if (result.getName().equals(name)) {
-                return result;
-            }
-        }
-        return null;
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      Measure result = VALUES_ARRAY[i];
+      if (result.getName().equals(name))
+      {
+        return result;
+      }
     }
+    return null;
+  }
 
   /**
-     * Returns the '<em><b>Measure</b></em>' literal with the specified integer value.
-     * <!-- begin-user-doc -->
+   * Returns the '<em><b>Measure</b></em>' literal with the specified integer value.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public static Measure get(int value)
   {
-        switch (value) {
-            case COUNT_VALUE: return COUNT;
-            case AVERAGE_VALUE: return AVERAGE;
-            case SUM_VALUE: return SUM;
-            case MINIMUM_VALUE: return MINIMUM;
-            case MAXIMUM_VALUE: return MAXIMUM;
-        }
-        return null;
+    switch (value)
+    {
+      case COUNT_VALUE: return COUNT;
+      case AVERAGE_VALUE: return AVERAGE;
+      case SUM_VALUE: return SUM;
+      case MINIMUM_VALUE: return MINIMUM;
+      case MAXIMUM_VALUE: return MAXIMUM;
     }
+    return null;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   private final int value;
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   private final String name;
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   private final String literal;
 
   /**
-     * Only this class can construct instances.
-     * <!-- begin-user-doc -->
+   * Only this class can construct instances.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   private Measure(int value, String name, String literal)
   {
-        this.value = value;
-        this.name = name;
-        this.literal = literal;
-    }
+    this.value = value;
+    this.name = name;
+    this.literal = literal;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public int getValue()
   {
-      return value;
-    }
+    return value;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public String getName()
   {
-      return name;
-    }
+    return name;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public String getLiteral()
   {
-      return literal;
-    }
+    return literal;
+  }
 
   /**
-     * Returns the literal value of the enumerator, which is its string representation.
-     * <!-- begin-user-doc -->
+   * Returns the literal value of the enumerator, which is its string representation.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   public String toString()
   {
-        return literal;
-    }
+    return literal;
+  }
   
 } //Measure
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/Model.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/Model.java
index e0992ac..ecceda9 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/Model.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/Model.java
@@ -31,97 +31,97 @@
 public interface Model extends EObject
 {
   /**
-     * Returns the value of the '<em><b>Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Name</em>' attribute isn't clear,
    * there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-     * @return the value of the '<em>Name</em>' attribute.
-     * @see #setName(String)
-     * @see org.eclipse.amp.amf.testing.aTest.ATestPackage#getModel_Name()
-     * @model
-     * @generated
-     */
+   * @return the value of the '<em>Name</em>' attribute.
+   * @see #setName(String)
+   * @see org.eclipse.amp.amf.testing.aTest.ATestPackage#getModel_Name()
+   * @model
+   * @generated
+   */
   String getName();
 
   /**
-     * Sets the value of the '{@link org.eclipse.amp.amf.testing.aTest.Model#getName <em>Name</em>}' attribute.
-     * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amp.amf.testing.aTest.Model#getName <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Name</em>' attribute.
-     * @see #getName()
-     * @generated
-     */
+   * @param value the new value of the '<em>Name</em>' attribute.
+   * @see #getName()
+   * @generated
+   */
   void setName(String value);
 
   /**
-     * Returns the value of the '<em><b>Description</b></em>' attribute.
-     * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Description</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Description</em>' attribute isn't clear,
    * there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-     * @return the value of the '<em>Description</em>' attribute.
-     * @see #setDescription(String)
-     * @see org.eclipse.amp.amf.testing.aTest.ATestPackage#getModel_Description()
-     * @model
-     * @generated
-     */
+   * @return the value of the '<em>Description</em>' attribute.
+   * @see #setDescription(String)
+   * @see org.eclipse.amp.amf.testing.aTest.ATestPackage#getModel_Description()
+   * @model
+   * @generated
+   */
   String getDescription();
 
   /**
-     * Sets the value of the '{@link org.eclipse.amp.amf.testing.aTest.Model#getDescription <em>Description</em>}' attribute.
-     * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amp.amf.testing.aTest.Model#getDescription <em>Description</em>}' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Description</em>' attribute.
-     * @see #getDescription()
-     * @generated
-     */
+   * @param value the new value of the '<em>Description</em>' attribute.
+   * @see #getDescription()
+   * @generated
+   */
   void setDescription(String value);
 
   /**
-     * Returns the value of the '<em><b>Tests</b></em>' containment reference.
-     * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Tests</b></em>' containment reference.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Tests</em>' containment reference isn't clear,
    * there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-     * @return the value of the '<em>Tests</em>' containment reference.
-     * @see #setTests(Tests)
-     * @see org.eclipse.amp.amf.testing.aTest.ATestPackage#getModel_Tests()
-     * @model containment="true"
-     * @generated
-     */
+   * @return the value of the '<em>Tests</em>' containment reference.
+   * @see #setTests(Tests)
+   * @see org.eclipse.amp.amf.testing.aTest.ATestPackage#getModel_Tests()
+   * @model containment="true"
+   * @generated
+   */
   Tests getTests();
 
   /**
-     * Sets the value of the '{@link org.eclipse.amp.amf.testing.aTest.Model#getTests <em>Tests</em>}' containment reference.
-     * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amp.amf.testing.aTest.Model#getTests <em>Tests</em>}' containment reference.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Tests</em>' containment reference.
-     * @see #getTests()
-     * @generated
-     */
+   * @param value the new value of the '<em>Tests</em>' containment reference.
+   * @see #getTests()
+   * @generated
+   */
   void setTests(Tests value);
 
   /**
-     * Returns the value of the '<em><b>Contraints</b></em>' containment reference list.
-     * The list contents are of type {@link org.eclipse.amp.amf.testing.aTest.Constraint}.
-     * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Contraints</b></em>' containment reference list.
+   * The list contents are of type {@link org.eclipse.amp.amf.testing.aTest.Constraint}.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Contraints</em>' containment reference list isn't clear,
    * there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-     * @return the value of the '<em>Contraints</em>' containment reference list.
-     * @see org.eclipse.amp.amf.testing.aTest.ATestPackage#getModel_Contraints()
-     * @model containment="true"
-     * @generated
-     */
+   * @return the value of the '<em>Contraints</em>' containment reference list.
+   * @see org.eclipse.amp.amf.testing.aTest.ATestPackage#getModel_Contraints()
+   * @model containment="true"
+   * @generated
+   */
   EList<Constraint> getContraints();
 
 } // Model
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/Tests.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/Tests.java
index a63c747..76cf4e8 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/Tests.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/Tests.java
@@ -26,29 +26,29 @@
 public interface Tests extends EObject
 {
   /**
-     * Returns the value of the '<em><b>Import URI</b></em>' attribute.
-     * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Import URI</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Import URI</em>' attribute isn't clear,
    * there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-     * @return the value of the '<em>Import URI</em>' attribute.
-     * @see #setImportURI(String)
-     * @see org.eclipse.amp.amf.testing.aTest.ATestPackage#getTests_ImportURI()
-     * @model
-     * @generated
-     */
+   * @return the value of the '<em>Import URI</em>' attribute.
+   * @see #setImportURI(String)
+   * @see org.eclipse.amp.amf.testing.aTest.ATestPackage#getTests_ImportURI()
+   * @model
+   * @generated
+   */
   String getImportURI();
 
   /**
-     * Sets the value of the '{@link org.eclipse.amp.amf.testing.aTest.Tests#getImportURI <em>Import URI</em>}' attribute.
-     * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amp.amf.testing.aTest.Tests#getImportURI <em>Import URI</em>}' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Import URI</em>' attribute.
-     * @see #getImportURI()
-     * @generated
-     */
+   * @param value the new value of the '<em>Import URI</em>' attribute.
+   * @see #getImportURI()
+   * @generated
+   */
   void setImportURI(String value);
 
 } // Tests
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/Value.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/Value.java
index 58b3bb8..56b0ed1 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/Value.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/Value.java
@@ -26,29 +26,29 @@
 public interface Value extends EObject
 {
   /**
-     * Returns the value of the '<em><b>Value</b></em>' attribute.
-     * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Value</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Value</em>' attribute isn't clear,
    * there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-     * @return the value of the '<em>Value</em>' attribute.
-     * @see #setValue(String)
-     * @see org.eclipse.amp.amf.testing.aTest.ATestPackage#getValue_Value()
-     * @model
-     * @generated
-     */
+   * @return the value of the '<em>Value</em>' attribute.
+   * @see #setValue(String)
+   * @see org.eclipse.amp.amf.testing.aTest.ATestPackage#getValue_Value()
+   * @model
+   * @generated
+   */
   String getValue();
 
   /**
-     * Sets the value of the '{@link org.eclipse.amp.amf.testing.aTest.Value#getValue <em>Value</em>}' attribute.
-     * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amp.amf.testing.aTest.Value#getValue <em>Value</em>}' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Value</em>' attribute.
-     * @see #getValue()
-     * @generated
-     */
+   * @param value the new value of the '<em>Value</em>' attribute.
+   * @see #getValue()
+   * @generated
+   */
   void setValue(String value);
 
 } // Value
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/ATestFactoryImpl.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/ATestFactoryImpl.java
index eb0470b..d98ebe1 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/ATestFactoryImpl.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/ATestFactoryImpl.java
@@ -25,196 +25,202 @@
 public class ATestFactoryImpl extends EFactoryImpl implements ATestFactory
 {
   /**
-     * Creates the default factory implementation.
-     * <!-- begin-user-doc -->
+   * Creates the default factory implementation.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public static ATestFactory init()
   {
-        try {
-            ATestFactory theATestFactory = (ATestFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/amp/amf/testing/ATest"); 
-            if (theATestFactory != null) {
-                return theATestFactory;
-            }
-        }
-        catch (Exception exception) {
-            EcorePlugin.INSTANCE.log(exception);
-        }
-        return new ATestFactoryImpl();
+    try
+    {
+      ATestFactory theATestFactory = (ATestFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/amp/amf/testing/ATest"); 
+      if (theATestFactory != null)
+      {
+        return theATestFactory;
+      }
     }
+    catch (Exception exception)
+    {
+      EcorePlugin.INSTANCE.log(exception);
+    }
+    return new ATestFactoryImpl();
+  }
 
   /**
-     * Creates an instance of the factory.
-     * <!-- begin-user-doc -->
+   * Creates an instance of the factory.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public ATestFactoryImpl()
   {
-        super();
-    }
+    super();
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   public EObject create(EClass eClass)
   {
-        switch (eClass.getClassifierID()) {
-            case ATestPackage.MODEL: return createModel();
-            case ATestPackage.TESTS: return createTests();
-            case ATestPackage.CONSTRAINT: return createConstraint();
-            case ATestPackage.VALUE: return createValue();
-            case ATestPackage.INT_VALUE: return createIntValue();
-            case ATestPackage.REAL_VALUE: return createRealValue();
-            default:
-                throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-        }
+    switch (eClass.getClassifierID())
+    {
+      case ATestPackage.MODEL: return createModel();
+      case ATestPackage.TESTS: return createTests();
+      case ATestPackage.CONSTRAINT: return createConstraint();
+      case ATestPackage.VALUE: return createValue();
+      case ATestPackage.INT_VALUE: return createIntValue();
+      case ATestPackage.REAL_VALUE: return createRealValue();
+      default:
+        throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
     }
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   public Object createFromString(EDataType eDataType, String initialValue)
   {
-        switch (eDataType.getClassifierID()) {
-            case ATestPackage.MEASURE:
-                return createMeasureFromString(eDataType, initialValue);
-            default:
-                throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-        }
+    switch (eDataType.getClassifierID())
+    {
+      case ATestPackage.MEASURE:
+        return createMeasureFromString(eDataType, initialValue);
+      default:
+        throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
     }
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   public String convertToString(EDataType eDataType, Object instanceValue)
   {
-        switch (eDataType.getClassifierID()) {
-            case ATestPackage.MEASURE:
-                return convertMeasureToString(eDataType, instanceValue);
-            default:
-                throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-        }
+    switch (eDataType.getClassifierID())
+    {
+      case ATestPackage.MEASURE:
+        return convertMeasureToString(eDataType, instanceValue);
+      default:
+        throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
     }
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public Model createModel()
   {
-        ModelImpl model = new ModelImpl();
-        return model;
-    }
+    ModelImpl model = new ModelImpl();
+    return model;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public Tests createTests()
   {
-        TestsImpl tests = new TestsImpl();
-        return tests;
-    }
+    TestsImpl tests = new TestsImpl();
+    return tests;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public Constraint createConstraint()
   {
-        ConstraintImpl constraint = new ConstraintImpl();
-        return constraint;
-    }
+    ConstraintImpl constraint = new ConstraintImpl();
+    return constraint;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public Value createValue()
   {
-        ValueImpl value = new ValueImpl();
-        return value;
-    }
+    ValueImpl value = new ValueImpl();
+    return value;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public IntValue createIntValue()
   {
-        IntValueImpl intValue = new IntValueImpl();
-        return intValue;
-    }
+    IntValueImpl intValue = new IntValueImpl();
+    return intValue;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public RealValue createRealValue()
   {
-        RealValueImpl realValue = new RealValueImpl();
-        return realValue;
-    }
+    RealValueImpl realValue = new RealValueImpl();
+    return realValue;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public Measure createMeasureFromString(EDataType eDataType, String initialValue)
   {
-        Measure result = Measure.get(initialValue);
-        if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-        return result;
-    }
+    Measure result = Measure.get(initialValue);
+    if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+    return result;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public String convertMeasureToString(EDataType eDataType, Object instanceValue)
   {
-        return instanceValue == null ? null : instanceValue.toString();
-    }
+    return instanceValue == null ? null : instanceValue.toString();
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public ATestPackage getATestPackage()
   {
-        return (ATestPackage)getEPackage();
-    }
+    return (ATestPackage)getEPackage();
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @deprecated
-     * @generated
-     */
+   * @deprecated
+   * @generated
+   */
   @Deprecated
   public static ATestPackage getPackage()
   {
-        return ATestPackage.eINSTANCE;
-    }
+    return ATestPackage.eINSTANCE;
+  }
 
 } //ATestFactoryImpl
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/ATestPackageImpl.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/ATestPackageImpl.java
index 35aaa68..be59faa 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/ATestPackageImpl.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/ATestPackageImpl.java
@@ -34,438 +34,438 @@
 public class ATestPackageImpl extends EPackageImpl implements ATestPackage
 {
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   private EClass modelEClass = null;
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   private EClass testsEClass = null;
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   private EClass constraintEClass = null;
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   private EClass valueEClass = null;
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   private EClass intValueEClass = null;
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   private EClass realValueEClass = null;
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   private EEnum measureEEnum = null;
 
   /**
-     * Creates an instance of the model <b>Package</b>, registered with
-     * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-     * package URI value.
-     * <p>Note: the correct way to create the package is via the static
-     * factory method {@link #init init()}, which also performs
-     * initialization of the package, or returns the registered package,
-     * if one already exists.
-     * <!-- begin-user-doc -->
+   * Creates an instance of the model <b>Package</b>, registered with
+   * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+   * package URI value.
+   * <p>Note: the correct way to create the package is via the static
+   * factory method {@link #init init()}, which also performs
+   * initialization of the package, or returns the registered package,
+   * if one already exists.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see org.eclipse.emf.ecore.EPackage.Registry
-     * @see org.eclipse.amp.amf.testing.aTest.ATestPackage#eNS_URI
-     * @see #init()
-     * @generated
-     */
+   * @see org.eclipse.emf.ecore.EPackage.Registry
+   * @see org.eclipse.amp.amf.testing.aTest.ATestPackage#eNS_URI
+   * @see #init()
+   * @generated
+   */
   private ATestPackageImpl()
   {
-        super(eNS_URI, ATestFactory.eINSTANCE);
-    }
+    super(eNS_URI, ATestFactory.eINSTANCE);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   private static boolean isInited = false;
 
   /**
-     * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-     * 
-     * <p>This method is used to initialize {@link ATestPackage#eINSTANCE} when that field is accessed.
-     * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-     * <!-- begin-user-doc -->
+   * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+   * 
+   * <p>This method is used to initialize {@link ATestPackage#eINSTANCE} when that field is accessed.
+   * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see #eNS_URI
-     * @see #createPackageContents()
-     * @see #initializePackageContents()
-     * @generated
-     */
+   * @see #eNS_URI
+   * @see #createPackageContents()
+   * @see #initializePackageContents()
+   * @generated
+   */
   public static ATestPackage init()
   {
-        if (isInited) return (ATestPackage)EPackage.Registry.INSTANCE.getEPackage(ATestPackage.eNS_URI);
+    if (isInited) return (ATestPackage)EPackage.Registry.INSTANCE.getEPackage(ATestPackage.eNS_URI);
 
-        // Obtain or create and register package
-        ATestPackageImpl theATestPackage = (ATestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ATestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ATestPackageImpl());
+    // Obtain or create and register package
+    ATestPackageImpl theATestPackage = (ATestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ATestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ATestPackageImpl());
 
-        isInited = true;
+    isInited = true;
 
-        // Initialize simple dependencies
-        MetaABMPackage.eINSTANCE.eClass();
+    // Initialize simple dependencies
+    MetaABMPackage.eINSTANCE.eClass();
 
-        // Create package meta-data objects
-        theATestPackage.createPackageContents();
+    // Create package meta-data objects
+    theATestPackage.createPackageContents();
 
-        // Initialize created meta-data
-        theATestPackage.initializePackageContents();
+    // Initialize created meta-data
+    theATestPackage.initializePackageContents();
 
-        // Mark meta-data to indicate it can't be changed
-        theATestPackage.freeze();
+    // Mark meta-data to indicate it can't be changed
+    theATestPackage.freeze();
 
   
-        // Update the registry and return the package
-        EPackage.Registry.INSTANCE.put(ATestPackage.eNS_URI, theATestPackage);
-        return theATestPackage;
-    }
+    // Update the registry and return the package
+    EPackage.Registry.INSTANCE.put(ATestPackage.eNS_URI, theATestPackage);
+    return theATestPackage;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public EClass getModel()
   {
-        return modelEClass;
-    }
+    return modelEClass;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public EAttribute getModel_Name()
   {
-        return (EAttribute)modelEClass.getEStructuralFeatures().get(0);
-    }
+    return (EAttribute)modelEClass.getEStructuralFeatures().get(0);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public EAttribute getModel_Description()
   {
-        return (EAttribute)modelEClass.getEStructuralFeatures().get(1);
-    }
+    return (EAttribute)modelEClass.getEStructuralFeatures().get(1);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public EReference getModel_Tests()
   {
-        return (EReference)modelEClass.getEStructuralFeatures().get(2);
-    }
+    return (EReference)modelEClass.getEStructuralFeatures().get(2);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public EReference getModel_Contraints()
   {
-        return (EReference)modelEClass.getEStructuralFeatures().get(3);
-    }
+    return (EReference)modelEClass.getEStructuralFeatures().get(3);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public EClass getTests()
   {
-        return testsEClass;
-    }
+    return testsEClass;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public EAttribute getTests_ImportURI()
   {
-        return (EAttribute)testsEClass.getEStructuralFeatures().get(0);
-    }
+    return (EAttribute)testsEClass.getEStructuralFeatures().get(0);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public EClass getConstraint()
   {
-        return constraintEClass;
-    }
+    return constraintEClass;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public EAttribute getConstraint_Measure()
   {
-        return (EAttribute)constraintEClass.getEStructuralFeatures().get(0);
-    }
+    return (EAttribute)constraintEClass.getEStructuralFeatures().get(0);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public EReference getConstraint_Agent()
   {
-        return (EReference)constraintEClass.getEStructuralFeatures().get(1);
-    }
+    return (EReference)constraintEClass.getEStructuralFeatures().get(1);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public EReference getConstraint_Attribute()
   {
-        return (EReference)constraintEClass.getEStructuralFeatures().get(2);
-    }
+    return (EReference)constraintEClass.getEStructuralFeatures().get(2);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public EReference getConstraint_Qualifier()
   {
-        return (EReference)constraintEClass.getEStructuralFeatures().get(3);
-    }
+    return (EReference)constraintEClass.getEStructuralFeatures().get(3);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public EReference getConstraint_MinValue()
   {
-        return (EReference)constraintEClass.getEStructuralFeatures().get(4);
-    }
+    return (EReference)constraintEClass.getEStructuralFeatures().get(4);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public EReference getConstraint_MaxValue()
   {
-        return (EReference)constraintEClass.getEStructuralFeatures().get(5);
-    }
+    return (EReference)constraintEClass.getEStructuralFeatures().get(5);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public EClass getValue()
   {
-        return valueEClass;
-    }
+    return valueEClass;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public EAttribute getValue_Value()
   {
-        return (EAttribute)valueEClass.getEStructuralFeatures().get(0);
-    }
+    return (EAttribute)valueEClass.getEStructuralFeatures().get(0);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public EClass getIntValue()
   {
-        return intValueEClass;
-    }
+    return intValueEClass;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public EClass getRealValue()
   {
-        return realValueEClass;
-    }
+    return realValueEClass;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public EEnum getMeasure()
   {
-        return measureEEnum;
-    }
+    return measureEEnum;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public ATestFactory getATestFactory()
   {
-        return (ATestFactory)getEFactoryInstance();
-    }
+    return (ATestFactory)getEFactoryInstance();
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   private boolean isCreated = false;
 
   /**
-     * Creates the meta-model objects for the package.  This method is
-     * guarded to have no affect on any invocation but its first.
-     * <!-- begin-user-doc -->
+   * Creates the meta-model objects for the package.  This method is
+   * guarded to have no affect on any invocation but its first.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public void createPackageContents()
   {
-        if (isCreated) return;
-        isCreated = true;
+    if (isCreated) return;
+    isCreated = true;
 
-        // Create classes and their features
-        modelEClass = createEClass(MODEL);
-        createEAttribute(modelEClass, MODEL__NAME);
-        createEAttribute(modelEClass, MODEL__DESCRIPTION);
-        createEReference(modelEClass, MODEL__TESTS);
-        createEReference(modelEClass, MODEL__CONTRAINTS);
+    // Create classes and their features
+    modelEClass = createEClass(MODEL);
+    createEAttribute(modelEClass, MODEL__NAME);
+    createEAttribute(modelEClass, MODEL__DESCRIPTION);
+    createEReference(modelEClass, MODEL__TESTS);
+    createEReference(modelEClass, MODEL__CONTRAINTS);
 
-        testsEClass = createEClass(TESTS);
-        createEAttribute(testsEClass, TESTS__IMPORT_URI);
+    testsEClass = createEClass(TESTS);
+    createEAttribute(testsEClass, TESTS__IMPORT_URI);
 
-        constraintEClass = createEClass(CONSTRAINT);
-        createEAttribute(constraintEClass, CONSTRAINT__MEASURE);
-        createEReference(constraintEClass, CONSTRAINT__AGENT);
-        createEReference(constraintEClass, CONSTRAINT__ATTRIBUTE);
-        createEReference(constraintEClass, CONSTRAINT__QUALIFIER);
-        createEReference(constraintEClass, CONSTRAINT__MIN_VALUE);
-        createEReference(constraintEClass, CONSTRAINT__MAX_VALUE);
+    constraintEClass = createEClass(CONSTRAINT);
+    createEAttribute(constraintEClass, CONSTRAINT__MEASURE);
+    createEReference(constraintEClass, CONSTRAINT__AGENT);
+    createEReference(constraintEClass, CONSTRAINT__ATTRIBUTE);
+    createEReference(constraintEClass, CONSTRAINT__QUALIFIER);
+    createEReference(constraintEClass, CONSTRAINT__MIN_VALUE);
+    createEReference(constraintEClass, CONSTRAINT__MAX_VALUE);
 
-        valueEClass = createEClass(VALUE);
-        createEAttribute(valueEClass, VALUE__VALUE);
+    valueEClass = createEClass(VALUE);
+    createEAttribute(valueEClass, VALUE__VALUE);
 
-        intValueEClass = createEClass(INT_VALUE);
+    intValueEClass = createEClass(INT_VALUE);
 
-        realValueEClass = createEClass(REAL_VALUE);
+    realValueEClass = createEClass(REAL_VALUE);
 
-        // Create enums
-        measureEEnum = createEEnum(MEASURE);
-    }
+    // Create enums
+    measureEEnum = createEEnum(MEASURE);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   private boolean isInitialized = false;
 
   /**
-     * Complete the initialization of the package and its meta-model.  This
-     * method is guarded to have no affect on any invocation but its first.
-     * <!-- begin-user-doc -->
+   * Complete the initialization of the package and its meta-model.  This
+   * method is guarded to have no affect on any invocation but its first.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public void initializePackageContents()
   {
-        if (isInitialized) return;
-        isInitialized = true;
+    if (isInitialized) return;
+    isInitialized = true;
 
-        // Initialize package
-        setName(eNAME);
-        setNsPrefix(eNS_PREFIX);
-        setNsURI(eNS_URI);
+    // Initialize package
+    setName(eNAME);
+    setNsPrefix(eNS_PREFIX);
+    setNsURI(eNS_URI);
 
-        // Obtain other dependent packages
-        MetaABMPackage theMetaABMPackage = (MetaABMPackage)EPackage.Registry.INSTANCE.getEPackage(MetaABMPackage.eNS_URI);
+    // Obtain other dependent packages
+    MetaABMPackage theMetaABMPackage = (MetaABMPackage)EPackage.Registry.INSTANCE.getEPackage(MetaABMPackage.eNS_URI);
 
-        // Create type parameters
+    // Create type parameters
 
-        // Set bounds for type parameters
+    // Set bounds for type parameters
 
-        // Add supertypes to classes
-        intValueEClass.getESuperTypes().add(this.getValue());
-        realValueEClass.getESuperTypes().add(this.getValue());
+    // Add supertypes to classes
+    intValueEClass.getESuperTypes().add(this.getValue());
+    realValueEClass.getESuperTypes().add(this.getValue());
 
-        // Initialize classes and features; add operations and parameters
-        initEClass(modelEClass, Model.class, "Model", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getModel_Name(), ecorePackage.getEString(), "name", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getModel_Description(), ecorePackage.getEString(), "description", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getModel_Tests(), this.getTests(), null, "tests", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getModel_Contraints(), this.getConstraint(), null, "contraints", null, 0, -1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    // Initialize classes and features; add operations and parameters
+    initEClass(modelEClass, Model.class, "Model", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getModel_Name(), ecorePackage.getEString(), "name", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getModel_Description(), ecorePackage.getEString(), "description", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getModel_Tests(), this.getTests(), null, "tests", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getModel_Contraints(), this.getConstraint(), null, "contraints", null, 0, -1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-        initEClass(testsEClass, Tests.class, "Tests", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getTests_ImportURI(), ecorePackage.getEString(), "importURI", null, 0, 1, Tests.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(testsEClass, Tests.class, "Tests", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getTests_ImportURI(), ecorePackage.getEString(), "importURI", null, 0, 1, Tests.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-        initEClass(constraintEClass, Constraint.class, "Constraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getConstraint_Measure(), this.getMeasure(), "measure", null, 0, 1, Constraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getConstraint_Agent(), theMetaABMPackage.getSAgent(), null, "agent", null, 0, 1, Constraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getConstraint_Attribute(), theMetaABMPackage.getSAttribute(), null, "attribute", null, 0, 1, Constraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getConstraint_Qualifier(), theMetaABMPackage.getSStateValue(), null, "qualifier", null, 0, 1, Constraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getConstraint_MinValue(), this.getValue(), null, "minValue", null, 0, 1, Constraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getConstraint_MaxValue(), this.getValue(), null, "maxValue", null, 0, 1, Constraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(constraintEClass, Constraint.class, "Constraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getConstraint_Measure(), this.getMeasure(), "measure", null, 0, 1, Constraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getConstraint_Agent(), theMetaABMPackage.getSAgent(), null, "agent", null, 0, 1, Constraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getConstraint_Attribute(), theMetaABMPackage.getSAttribute(), null, "attribute", null, 0, 1, Constraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getConstraint_Qualifier(), theMetaABMPackage.getSStateValue(), null, "qualifier", null, 0, 1, Constraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getConstraint_MinValue(), this.getValue(), null, "minValue", null, 0, 1, Constraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getConstraint_MaxValue(), this.getValue(), null, "maxValue", null, 0, 1, Constraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-        initEClass(valueEClass, Value.class, "Value", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getValue_Value(), ecorePackage.getEString(), "value", null, 0, 1, Value.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(valueEClass, Value.class, "Value", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getValue_Value(), ecorePackage.getEString(), "value", null, 0, 1, Value.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-        initEClass(intValueEClass, IntValue.class, "IntValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(intValueEClass, IntValue.class, "IntValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-        initEClass(realValueEClass, RealValue.class, "RealValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(realValueEClass, RealValue.class, "RealValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-        // Initialize enums and add enum literals
-        initEEnum(measureEEnum, Measure.class, "Measure");
-        addEEnumLiteral(measureEEnum, Measure.COUNT);
-        addEEnumLiteral(measureEEnum, Measure.AVERAGE);
-        addEEnumLiteral(measureEEnum, Measure.SUM);
-        addEEnumLiteral(measureEEnum, Measure.MINIMUM);
-        addEEnumLiteral(measureEEnum, Measure.MAXIMUM);
+    // Initialize enums and add enum literals
+    initEEnum(measureEEnum, Measure.class, "Measure");
+    addEEnumLiteral(measureEEnum, Measure.COUNT);
+    addEEnumLiteral(measureEEnum, Measure.AVERAGE);
+    addEEnumLiteral(measureEEnum, Measure.SUM);
+    addEEnumLiteral(measureEEnum, Measure.MINIMUM);
+    addEEnumLiteral(measureEEnum, Measure.MAXIMUM);
 
-        // Create resource
-        createResource(eNS_URI);
-    }
+    // Create resource
+    createResource(eNS_URI);
+  }
 
 } //ATestPackageImpl
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/ConstraintImpl.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/ConstraintImpl.java
index a2350da..6c8910f 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/ConstraintImpl.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/ConstraintImpl.java
@@ -44,481 +44,496 @@
 public class ConstraintImpl extends MinimalEObjectImpl.Container implements Constraint
 {
   /**
-     * The default value of the '{@link #getMeasure() <em>Measure</em>}' attribute.
-     * <!-- begin-user-doc -->
+   * The default value of the '{@link #getMeasure() <em>Measure</em>}' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see #getMeasure()
-     * @generated
-     * @ordered
-     */
+   * @see #getMeasure()
+   * @generated
+   * @ordered
+   */
   protected static final Measure MEASURE_EDEFAULT = Measure.COUNT;
 
   /**
-     * The cached value of the '{@link #getMeasure() <em>Measure</em>}' attribute.
-     * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getMeasure() <em>Measure</em>}' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see #getMeasure()
-     * @generated
-     * @ordered
-     */
+   * @see #getMeasure()
+   * @generated
+   * @ordered
+   */
   protected Measure measure = MEASURE_EDEFAULT;
 
   /**
-     * The cached value of the '{@link #getAgent() <em>Agent</em>}' reference.
-     * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getAgent() <em>Agent</em>}' reference.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see #getAgent()
-     * @generated
-     * @ordered
-     */
+   * @see #getAgent()
+   * @generated
+   * @ordered
+   */
   protected SAgent agent;
 
   /**
-     * The cached value of the '{@link #getAttribute() <em>Attribute</em>}' reference.
-     * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getAttribute() <em>Attribute</em>}' reference.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see #getAttribute()
-     * @generated
-     * @ordered
-     */
+   * @see #getAttribute()
+   * @generated
+   * @ordered
+   */
   protected SAttribute attribute;
 
   /**
-     * The cached value of the '{@link #getQualifier() <em>Qualifier</em>}' reference.
-     * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getQualifier() <em>Qualifier</em>}' reference.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see #getQualifier()
-     * @generated
-     * @ordered
-     */
+   * @see #getQualifier()
+   * @generated
+   * @ordered
+   */
   protected SStateValue qualifier;
 
   /**
-     * The cached value of the '{@link #getMinValue() <em>Min Value</em>}' containment reference.
-     * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getMinValue() <em>Min Value</em>}' containment reference.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see #getMinValue()
-     * @generated
-     * @ordered
-     */
+   * @see #getMinValue()
+   * @generated
+   * @ordered
+   */
   protected Value minValue;
 
   /**
-     * The cached value of the '{@link #getMaxValue() <em>Max Value</em>}' containment reference.
-     * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getMaxValue() <em>Max Value</em>}' containment reference.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see #getMaxValue()
-     * @generated
-     * @ordered
-     */
+   * @see #getMaxValue()
+   * @generated
+   * @ordered
+   */
   protected Value maxValue;
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   protected ConstraintImpl()
   {
-        super();
-    }
+    super();
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   protected EClass eStaticClass()
   {
-        return ATestPackage.Literals.CONSTRAINT;
-    }
+    return ATestPackage.Literals.CONSTRAINT;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public Measure getMeasure()
   {
-        return measure;
-    }
+    return measure;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public void setMeasure(Measure newMeasure)
   {
-        Measure oldMeasure = measure;
-        measure = newMeasure == null ? MEASURE_EDEFAULT : newMeasure;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, ATestPackage.CONSTRAINT__MEASURE, oldMeasure, measure));
-    }
+    Measure oldMeasure = measure;
+    measure = newMeasure == null ? MEASURE_EDEFAULT : newMeasure;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, ATestPackage.CONSTRAINT__MEASURE, oldMeasure, measure));
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public SAgent getAgent()
   {
-        if (agent != null && agent.eIsProxy()) {
-            InternalEObject oldAgent = (InternalEObject)agent;
-            agent = (SAgent)eResolveProxy(oldAgent);
-            if (agent != oldAgent) {
-                if (eNotificationRequired())
-                    eNotify(new ENotificationImpl(this, Notification.RESOLVE, ATestPackage.CONSTRAINT__AGENT, oldAgent, agent));
-            }
-        }
-        return agent;
+    if (agent != null && agent.eIsProxy())
+    {
+      InternalEObject oldAgent = (InternalEObject)agent;
+      agent = (SAgent)eResolveProxy(oldAgent);
+      if (agent != oldAgent)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, ATestPackage.CONSTRAINT__AGENT, oldAgent, agent));
+      }
     }
+    return agent;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public SAgent basicGetAgent()
   {
-        return agent;
-    }
+    return agent;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public void setAgent(SAgent newAgent)
   {
-        SAgent oldAgent = agent;
-        agent = newAgent;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, ATestPackage.CONSTRAINT__AGENT, oldAgent, agent));
-    }
+    SAgent oldAgent = agent;
+    agent = newAgent;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, ATestPackage.CONSTRAINT__AGENT, oldAgent, agent));
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public SAttribute getAttribute()
   {
-        if (attribute != null && attribute.eIsProxy()) {
-            InternalEObject oldAttribute = (InternalEObject)attribute;
-            attribute = (SAttribute)eResolveProxy(oldAttribute);
-            if (attribute != oldAttribute) {
-                if (eNotificationRequired())
-                    eNotify(new ENotificationImpl(this, Notification.RESOLVE, ATestPackage.CONSTRAINT__ATTRIBUTE, oldAttribute, attribute));
-            }
-        }
-        return attribute;
+    if (attribute != null && attribute.eIsProxy())
+    {
+      InternalEObject oldAttribute = (InternalEObject)attribute;
+      attribute = (SAttribute)eResolveProxy(oldAttribute);
+      if (attribute != oldAttribute)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, ATestPackage.CONSTRAINT__ATTRIBUTE, oldAttribute, attribute));
+      }
     }
+    return attribute;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public SAttribute basicGetAttribute()
   {
-        return attribute;
-    }
+    return attribute;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public void setAttribute(SAttribute newAttribute)
   {
-        SAttribute oldAttribute = attribute;
-        attribute = newAttribute;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, ATestPackage.CONSTRAINT__ATTRIBUTE, oldAttribute, attribute));
-    }
+    SAttribute oldAttribute = attribute;
+    attribute = newAttribute;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, ATestPackage.CONSTRAINT__ATTRIBUTE, oldAttribute, attribute));
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public SStateValue getQualifier()
   {
-        if (qualifier != null && qualifier.eIsProxy()) {
-            InternalEObject oldQualifier = (InternalEObject)qualifier;
-            qualifier = (SStateValue)eResolveProxy(oldQualifier);
-            if (qualifier != oldQualifier) {
-                if (eNotificationRequired())
-                    eNotify(new ENotificationImpl(this, Notification.RESOLVE, ATestPackage.CONSTRAINT__QUALIFIER, oldQualifier, qualifier));
-            }
-        }
-        return qualifier;
+    if (qualifier != null && qualifier.eIsProxy())
+    {
+      InternalEObject oldQualifier = (InternalEObject)qualifier;
+      qualifier = (SStateValue)eResolveProxy(oldQualifier);
+      if (qualifier != oldQualifier)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, ATestPackage.CONSTRAINT__QUALIFIER, oldQualifier, qualifier));
+      }
     }
+    return qualifier;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public SStateValue basicGetQualifier()
   {
-        return qualifier;
-    }
+    return qualifier;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public void setQualifier(SStateValue newQualifier)
   {
-        SStateValue oldQualifier = qualifier;
-        qualifier = newQualifier;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, ATestPackage.CONSTRAINT__QUALIFIER, oldQualifier, qualifier));
-    }
+    SStateValue oldQualifier = qualifier;
+    qualifier = newQualifier;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, ATestPackage.CONSTRAINT__QUALIFIER, oldQualifier, qualifier));
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public Value getMinValue()
   {
-        return minValue;
-    }
+    return minValue;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public NotificationChain basicSetMinValue(Value newMinValue, NotificationChain msgs)
   {
-        Value oldMinValue = minValue;
-        minValue = newMinValue;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ATestPackage.CONSTRAINT__MIN_VALUE, oldMinValue, newMinValue);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
-        }
-        return msgs;
+    Value oldMinValue = minValue;
+    minValue = newMinValue;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ATestPackage.CONSTRAINT__MIN_VALUE, oldMinValue, newMinValue);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
     }
+    return msgs;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public void setMinValue(Value newMinValue)
   {
-        if (newMinValue != minValue) {
-            NotificationChain msgs = null;
-            if (minValue != null)
-                msgs = ((InternalEObject)minValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ATestPackage.CONSTRAINT__MIN_VALUE, null, msgs);
-            if (newMinValue != null)
-                msgs = ((InternalEObject)newMinValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ATestPackage.CONSTRAINT__MIN_VALUE, null, msgs);
-            msgs = basicSetMinValue(newMinValue, msgs);
-            if (msgs != null) msgs.dispatch();
-        }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, ATestPackage.CONSTRAINT__MIN_VALUE, newMinValue, newMinValue));
+    if (newMinValue != minValue)
+    {
+      NotificationChain msgs = null;
+      if (minValue != null)
+        msgs = ((InternalEObject)minValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ATestPackage.CONSTRAINT__MIN_VALUE, null, msgs);
+      if (newMinValue != null)
+        msgs = ((InternalEObject)newMinValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ATestPackage.CONSTRAINT__MIN_VALUE, null, msgs);
+      msgs = basicSetMinValue(newMinValue, msgs);
+      if (msgs != null) msgs.dispatch();
     }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, ATestPackage.CONSTRAINT__MIN_VALUE, newMinValue, newMinValue));
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public Value getMaxValue()
   {
-        return maxValue;
-    }
+    return maxValue;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public NotificationChain basicSetMaxValue(Value newMaxValue, NotificationChain msgs)
   {
-        Value oldMaxValue = maxValue;
-        maxValue = newMaxValue;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ATestPackage.CONSTRAINT__MAX_VALUE, oldMaxValue, newMaxValue);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
-        }
-        return msgs;
+    Value oldMaxValue = maxValue;
+    maxValue = newMaxValue;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ATestPackage.CONSTRAINT__MAX_VALUE, oldMaxValue, newMaxValue);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
     }
+    return msgs;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public void setMaxValue(Value newMaxValue)
   {
-        if (newMaxValue != maxValue) {
-            NotificationChain msgs = null;
-            if (maxValue != null)
-                msgs = ((InternalEObject)maxValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ATestPackage.CONSTRAINT__MAX_VALUE, null, msgs);
-            if (newMaxValue != null)
-                msgs = ((InternalEObject)newMaxValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ATestPackage.CONSTRAINT__MAX_VALUE, null, msgs);
-            msgs = basicSetMaxValue(newMaxValue, msgs);
-            if (msgs != null) msgs.dispatch();
-        }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, ATestPackage.CONSTRAINT__MAX_VALUE, newMaxValue, newMaxValue));
+    if (newMaxValue != maxValue)
+    {
+      NotificationChain msgs = null;
+      if (maxValue != null)
+        msgs = ((InternalEObject)maxValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ATestPackage.CONSTRAINT__MAX_VALUE, null, msgs);
+      if (newMaxValue != null)
+        msgs = ((InternalEObject)newMaxValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ATestPackage.CONSTRAINT__MAX_VALUE, null, msgs);
+      msgs = basicSetMaxValue(newMaxValue, msgs);
+      if (msgs != null) msgs.dispatch();
     }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, ATestPackage.CONSTRAINT__MAX_VALUE, newMaxValue, newMaxValue));
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
   {
-        switch (featureID) {
-            case ATestPackage.CONSTRAINT__MIN_VALUE:
-                return basicSetMinValue(null, msgs);
-            case ATestPackage.CONSTRAINT__MAX_VALUE:
-                return basicSetMaxValue(null, msgs);
-        }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+    switch (featureID)
+    {
+      case ATestPackage.CONSTRAINT__MIN_VALUE:
+        return basicSetMinValue(null, msgs);
+      case ATestPackage.CONSTRAINT__MAX_VALUE:
+        return basicSetMaxValue(null, msgs);
     }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   public Object eGet(int featureID, boolean resolve, boolean coreType)
   {
-        switch (featureID) {
-            case ATestPackage.CONSTRAINT__MEASURE:
-                return getMeasure();
-            case ATestPackage.CONSTRAINT__AGENT:
-                if (resolve) return getAgent();
-                return basicGetAgent();
-            case ATestPackage.CONSTRAINT__ATTRIBUTE:
-                if (resolve) return getAttribute();
-                return basicGetAttribute();
-            case ATestPackage.CONSTRAINT__QUALIFIER:
-                if (resolve) return getQualifier();
-                return basicGetQualifier();
-            case ATestPackage.CONSTRAINT__MIN_VALUE:
-                return getMinValue();
-            case ATestPackage.CONSTRAINT__MAX_VALUE:
-                return getMaxValue();
-        }
-        return super.eGet(featureID, resolve, coreType);
+    switch (featureID)
+    {
+      case ATestPackage.CONSTRAINT__MEASURE:
+        return getMeasure();
+      case ATestPackage.CONSTRAINT__AGENT:
+        if (resolve) return getAgent();
+        return basicGetAgent();
+      case ATestPackage.CONSTRAINT__ATTRIBUTE:
+        if (resolve) return getAttribute();
+        return basicGetAttribute();
+      case ATestPackage.CONSTRAINT__QUALIFIER:
+        if (resolve) return getQualifier();
+        return basicGetQualifier();
+      case ATestPackage.CONSTRAINT__MIN_VALUE:
+        return getMinValue();
+      case ATestPackage.CONSTRAINT__MAX_VALUE:
+        return getMaxValue();
     }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   public void eSet(int featureID, Object newValue)
   {
-        switch (featureID) {
-            case ATestPackage.CONSTRAINT__MEASURE:
-                setMeasure((Measure)newValue);
-                return;
-            case ATestPackage.CONSTRAINT__AGENT:
-                setAgent((SAgent)newValue);
-                return;
-            case ATestPackage.CONSTRAINT__ATTRIBUTE:
-                setAttribute((SAttribute)newValue);
-                return;
-            case ATestPackage.CONSTRAINT__QUALIFIER:
-                setQualifier((SStateValue)newValue);
-                return;
-            case ATestPackage.CONSTRAINT__MIN_VALUE:
-                setMinValue((Value)newValue);
-                return;
-            case ATestPackage.CONSTRAINT__MAX_VALUE:
-                setMaxValue((Value)newValue);
-                return;
-        }
-        super.eSet(featureID, newValue);
+    switch (featureID)
+    {
+      case ATestPackage.CONSTRAINT__MEASURE:
+        setMeasure((Measure)newValue);
+        return;
+      case ATestPackage.CONSTRAINT__AGENT:
+        setAgent((SAgent)newValue);
+        return;
+      case ATestPackage.CONSTRAINT__ATTRIBUTE:
+        setAttribute((SAttribute)newValue);
+        return;
+      case ATestPackage.CONSTRAINT__QUALIFIER:
+        setQualifier((SStateValue)newValue);
+        return;
+      case ATestPackage.CONSTRAINT__MIN_VALUE:
+        setMinValue((Value)newValue);
+        return;
+      case ATestPackage.CONSTRAINT__MAX_VALUE:
+        setMaxValue((Value)newValue);
+        return;
     }
+    super.eSet(featureID, newValue);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   public void eUnset(int featureID)
   {
-        switch (featureID) {
-            case ATestPackage.CONSTRAINT__MEASURE:
-                setMeasure(MEASURE_EDEFAULT);
-                return;
-            case ATestPackage.CONSTRAINT__AGENT:
-                setAgent((SAgent)null);
-                return;
-            case ATestPackage.CONSTRAINT__ATTRIBUTE:
-                setAttribute((SAttribute)null);
-                return;
-            case ATestPackage.CONSTRAINT__QUALIFIER:
-                setQualifier((SStateValue)null);
-                return;
-            case ATestPackage.CONSTRAINT__MIN_VALUE:
-                setMinValue((Value)null);
-                return;
-            case ATestPackage.CONSTRAINT__MAX_VALUE:
-                setMaxValue((Value)null);
-                return;
-        }
-        super.eUnset(featureID);
+    switch (featureID)
+    {
+      case ATestPackage.CONSTRAINT__MEASURE:
+        setMeasure(MEASURE_EDEFAULT);
+        return;
+      case ATestPackage.CONSTRAINT__AGENT:
+        setAgent((SAgent)null);
+        return;
+      case ATestPackage.CONSTRAINT__ATTRIBUTE:
+        setAttribute((SAttribute)null);
+        return;
+      case ATestPackage.CONSTRAINT__QUALIFIER:
+        setQualifier((SStateValue)null);
+        return;
+      case ATestPackage.CONSTRAINT__MIN_VALUE:
+        setMinValue((Value)null);
+        return;
+      case ATestPackage.CONSTRAINT__MAX_VALUE:
+        setMaxValue((Value)null);
+        return;
     }
+    super.eUnset(featureID);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   public boolean eIsSet(int featureID)
   {
-        switch (featureID) {
-            case ATestPackage.CONSTRAINT__MEASURE:
-                return measure != MEASURE_EDEFAULT;
-            case ATestPackage.CONSTRAINT__AGENT:
-                return agent != null;
-            case ATestPackage.CONSTRAINT__ATTRIBUTE:
-                return attribute != null;
-            case ATestPackage.CONSTRAINT__QUALIFIER:
-                return qualifier != null;
-            case ATestPackage.CONSTRAINT__MIN_VALUE:
-                return minValue != null;
-            case ATestPackage.CONSTRAINT__MAX_VALUE:
-                return maxValue != null;
-        }
-        return super.eIsSet(featureID);
+    switch (featureID)
+    {
+      case ATestPackage.CONSTRAINT__MEASURE:
+        return measure != MEASURE_EDEFAULT;
+      case ATestPackage.CONSTRAINT__AGENT:
+        return agent != null;
+      case ATestPackage.CONSTRAINT__ATTRIBUTE:
+        return attribute != null;
+      case ATestPackage.CONSTRAINT__QUALIFIER:
+        return qualifier != null;
+      case ATestPackage.CONSTRAINT__MIN_VALUE:
+        return minValue != null;
+      case ATestPackage.CONSTRAINT__MAX_VALUE:
+        return maxValue != null;
     }
+    return super.eIsSet(featureID);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   public String toString()
   {
-        if (eIsProxy()) return super.toString();
+    if (eIsProxy()) return super.toString();
 
-        StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (measure: ");
-        result.append(measure);
-        result.append(')');
-        return result.toString();
-    }
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (measure: ");
+    result.append(measure);
+    result.append(')');
+    return result.toString();
+  }
 
 } //ConstraintImpl
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/IntValueImpl.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/IntValueImpl.java
index 8ba17a2..e7b7a64 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/IntValueImpl.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/IntValueImpl.java
@@ -22,24 +22,24 @@
 public class IntValueImpl extends ValueImpl implements IntValue
 {
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   protected IntValueImpl()
   {
-        super();
-    }
+    super();
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   protected EClass eStaticClass()
   {
-        return ATestPackage.Literals.INT_VALUE;
-    }
+    return ATestPackage.Literals.INT_VALUE;
+  }
 
 } //IntValueImpl
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/ModelImpl.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/ModelImpl.java
index 886d61f..c2d6e25 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/ModelImpl.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/ModelImpl.java
@@ -45,319 +45,327 @@
 public class ModelImpl extends MinimalEObjectImpl.Container implements Model
 {
   /**
-     * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-     * <!-- begin-user-doc -->
+   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see #getName()
-     * @generated
-     * @ordered
-     */
+   * @see #getName()
+   * @generated
+   * @ordered
+   */
   protected static final String NAME_EDEFAULT = null;
 
   /**
-     * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-     * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see #getName()
-     * @generated
-     * @ordered
-     */
+   * @see #getName()
+   * @generated
+   * @ordered
+   */
   protected String name = NAME_EDEFAULT;
 
   /**
-     * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-     * <!-- begin-user-doc -->
+   * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see #getDescription()
-     * @generated
-     * @ordered
-     */
+   * @see #getDescription()
+   * @generated
+   * @ordered
+   */
   protected static final String DESCRIPTION_EDEFAULT = null;
 
   /**
-     * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-     * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see #getDescription()
-     * @generated
-     * @ordered
-     */
+   * @see #getDescription()
+   * @generated
+   * @ordered
+   */
   protected String description = DESCRIPTION_EDEFAULT;
 
   /**
-     * The cached value of the '{@link #getTests() <em>Tests</em>}' containment reference.
-     * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getTests() <em>Tests</em>}' containment reference.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see #getTests()
-     * @generated
-     * @ordered
-     */
+   * @see #getTests()
+   * @generated
+   * @ordered
+   */
   protected Tests tests;
 
   /**
-     * The cached value of the '{@link #getContraints() <em>Contraints</em>}' containment reference list.
-     * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getContraints() <em>Contraints</em>}' containment reference list.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see #getContraints()
-     * @generated
-     * @ordered
-     */
+   * @see #getContraints()
+   * @generated
+   * @ordered
+   */
   protected EList<Constraint> contraints;
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   protected ModelImpl()
   {
-        super();
-    }
+    super();
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   protected EClass eStaticClass()
   {
-        return ATestPackage.Literals.MODEL;
-    }
+    return ATestPackage.Literals.MODEL;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public String getName()
   {
-        return name;
-    }
+    return name;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public void setName(String newName)
   {
-        String oldName = name;
-        name = newName;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, ATestPackage.MODEL__NAME, oldName, name));
-    }
+    String oldName = name;
+    name = newName;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, ATestPackage.MODEL__NAME, oldName, name));
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public String getDescription()
   {
-        return description;
-    }
+    return description;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public void setDescription(String newDescription)
   {
-        String oldDescription = description;
-        description = newDescription;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, ATestPackage.MODEL__DESCRIPTION, oldDescription, description));
-    }
+    String oldDescription = description;
+    description = newDescription;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, ATestPackage.MODEL__DESCRIPTION, oldDescription, description));
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public Tests getTests()
   {
-        return tests;
-    }
+    return tests;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public NotificationChain basicSetTests(Tests newTests, NotificationChain msgs)
   {
-        Tests oldTests = tests;
-        tests = newTests;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ATestPackage.MODEL__TESTS, oldTests, newTests);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
-        }
-        return msgs;
+    Tests oldTests = tests;
+    tests = newTests;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ATestPackage.MODEL__TESTS, oldTests, newTests);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
     }
+    return msgs;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public void setTests(Tests newTests)
   {
-        if (newTests != tests) {
-            NotificationChain msgs = null;
-            if (tests != null)
-                msgs = ((InternalEObject)tests).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ATestPackage.MODEL__TESTS, null, msgs);
-            if (newTests != null)
-                msgs = ((InternalEObject)newTests).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ATestPackage.MODEL__TESTS, null, msgs);
-            msgs = basicSetTests(newTests, msgs);
-            if (msgs != null) msgs.dispatch();
-        }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, ATestPackage.MODEL__TESTS, newTests, newTests));
+    if (newTests != tests)
+    {
+      NotificationChain msgs = null;
+      if (tests != null)
+        msgs = ((InternalEObject)tests).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ATestPackage.MODEL__TESTS, null, msgs);
+      if (newTests != null)
+        msgs = ((InternalEObject)newTests).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ATestPackage.MODEL__TESTS, null, msgs);
+      msgs = basicSetTests(newTests, msgs);
+      if (msgs != null) msgs.dispatch();
     }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, ATestPackage.MODEL__TESTS, newTests, newTests));
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public EList<Constraint> getContraints()
   {
-        if (contraints == null) {
-            contraints = new EObjectContainmentEList<Constraint>(Constraint.class, this, ATestPackage.MODEL__CONTRAINTS);
-        }
-        return contraints;
+    if (contraints == null)
+    {
+      contraints = new EObjectContainmentEList<Constraint>(Constraint.class, this, ATestPackage.MODEL__CONTRAINTS);
     }
+    return contraints;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
   {
-        switch (featureID) {
-            case ATestPackage.MODEL__TESTS:
-                return basicSetTests(null, msgs);
-            case ATestPackage.MODEL__CONTRAINTS:
-                return ((InternalEList<?>)getContraints()).basicRemove(otherEnd, msgs);
-        }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+    switch (featureID)
+    {
+      case ATestPackage.MODEL__TESTS:
+        return basicSetTests(null, msgs);
+      case ATestPackage.MODEL__CONTRAINTS:
+        return ((InternalEList<?>)getContraints()).basicRemove(otherEnd, msgs);
     }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   public Object eGet(int featureID, boolean resolve, boolean coreType)
   {
-        switch (featureID) {
-            case ATestPackage.MODEL__NAME:
-                return getName();
-            case ATestPackage.MODEL__DESCRIPTION:
-                return getDescription();
-            case ATestPackage.MODEL__TESTS:
-                return getTests();
-            case ATestPackage.MODEL__CONTRAINTS:
-                return getContraints();
-        }
-        return super.eGet(featureID, resolve, coreType);
+    switch (featureID)
+    {
+      case ATestPackage.MODEL__NAME:
+        return getName();
+      case ATestPackage.MODEL__DESCRIPTION:
+        return getDescription();
+      case ATestPackage.MODEL__TESTS:
+        return getTests();
+      case ATestPackage.MODEL__CONTRAINTS:
+        return getContraints();
     }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @SuppressWarnings("unchecked")
   @Override
   public void eSet(int featureID, Object newValue)
   {
-        switch (featureID) {
-            case ATestPackage.MODEL__NAME:
-                setName((String)newValue);
-                return;
-            case ATestPackage.MODEL__DESCRIPTION:
-                setDescription((String)newValue);
-                return;
-            case ATestPackage.MODEL__TESTS:
-                setTests((Tests)newValue);
-                return;
-            case ATestPackage.MODEL__CONTRAINTS:
-                getContraints().clear();
-                getContraints().addAll((Collection<? extends Constraint>)newValue);
-                return;
-        }
-        super.eSet(featureID, newValue);
+    switch (featureID)
+    {
+      case ATestPackage.MODEL__NAME:
+        setName((String)newValue);
+        return;
+      case ATestPackage.MODEL__DESCRIPTION:
+        setDescription((String)newValue);
+        return;
+      case ATestPackage.MODEL__TESTS:
+        setTests((Tests)newValue);
+        return;
+      case ATestPackage.MODEL__CONTRAINTS:
+        getContraints().clear();
+        getContraints().addAll((Collection<? extends Constraint>)newValue);
+        return;
     }
+    super.eSet(featureID, newValue);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   public void eUnset(int featureID)
   {
-        switch (featureID) {
-            case ATestPackage.MODEL__NAME:
-                setName(NAME_EDEFAULT);
-                return;
-            case ATestPackage.MODEL__DESCRIPTION:
-                setDescription(DESCRIPTION_EDEFAULT);
-                return;
-            case ATestPackage.MODEL__TESTS:
-                setTests((Tests)null);
-                return;
-            case ATestPackage.MODEL__CONTRAINTS:
-                getContraints().clear();
-                return;
-        }
-        super.eUnset(featureID);
+    switch (featureID)
+    {
+      case ATestPackage.MODEL__NAME:
+        setName(NAME_EDEFAULT);
+        return;
+      case ATestPackage.MODEL__DESCRIPTION:
+        setDescription(DESCRIPTION_EDEFAULT);
+        return;
+      case ATestPackage.MODEL__TESTS:
+        setTests((Tests)null);
+        return;
+      case ATestPackage.MODEL__CONTRAINTS:
+        getContraints().clear();
+        return;
     }
+    super.eUnset(featureID);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   public boolean eIsSet(int featureID)
   {
-        switch (featureID) {
-            case ATestPackage.MODEL__NAME:
-                return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-            case ATestPackage.MODEL__DESCRIPTION:
-                return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-            case ATestPackage.MODEL__TESTS:
-                return tests != null;
-            case ATestPackage.MODEL__CONTRAINTS:
-                return contraints != null && !contraints.isEmpty();
-        }
-        return super.eIsSet(featureID);
+    switch (featureID)
+    {
+      case ATestPackage.MODEL__NAME:
+        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+      case ATestPackage.MODEL__DESCRIPTION:
+        return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
+      case ATestPackage.MODEL__TESTS:
+        return tests != null;
+      case ATestPackage.MODEL__CONTRAINTS:
+        return contraints != null && !contraints.isEmpty();
     }
+    return super.eIsSet(featureID);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   public String toString()
   {
-        if (eIsProxy()) return super.toString();
+    if (eIsProxy()) return super.toString();
 
-        StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
-        result.append(name);
-        result.append(", description: ");
-        result.append(description);
-        result.append(')');
-        return result.toString();
-    }
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (name: ");
+    result.append(name);
+    result.append(", description: ");
+    result.append(description);
+    result.append(')');
+    return result.toString();
+  }
 
 } //ModelImpl
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/RealValueImpl.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/RealValueImpl.java
index 17e2c75..6041562 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/RealValueImpl.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/RealValueImpl.java
@@ -22,24 +22,24 @@
 public class RealValueImpl extends ValueImpl implements RealValue
 {
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   protected RealValueImpl()
   {
-        super();
-    }
+    super();
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   protected EClass eStaticClass()
   {
-        return ATestPackage.Literals.REAL_VALUE;
-    }
+    return ATestPackage.Literals.REAL_VALUE;
+  }
 
 } //RealValueImpl
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/TestsImpl.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/TestsImpl.java
index 5c08930..2e1c493 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/TestsImpl.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/TestsImpl.java
@@ -31,146 +31,150 @@
 public class TestsImpl extends MinimalEObjectImpl.Container implements Tests
 {
   /**
-     * The default value of the '{@link #getImportURI() <em>Import URI</em>}' attribute.
-     * <!-- begin-user-doc -->
+   * The default value of the '{@link #getImportURI() <em>Import URI</em>}' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see #getImportURI()
-     * @generated
-     * @ordered
-     */
+   * @see #getImportURI()
+   * @generated
+   * @ordered
+   */
   protected static final String IMPORT_URI_EDEFAULT = null;
 
   /**
-     * The cached value of the '{@link #getImportURI() <em>Import URI</em>}' attribute.
-     * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getImportURI() <em>Import URI</em>}' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see #getImportURI()
-     * @generated
-     * @ordered
-     */
+   * @see #getImportURI()
+   * @generated
+   * @ordered
+   */
   protected String importURI = IMPORT_URI_EDEFAULT;
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   protected TestsImpl()
   {
-        super();
-    }
+    super();
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   protected EClass eStaticClass()
   {
-        return ATestPackage.Literals.TESTS;
-    }
+    return ATestPackage.Literals.TESTS;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public String getImportURI()
   {
-        return importURI;
-    }
+    return importURI;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public void setImportURI(String newImportURI)
   {
-        String oldImportURI = importURI;
-        importURI = newImportURI;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, ATestPackage.TESTS__IMPORT_URI, oldImportURI, importURI));
-    }
+    String oldImportURI = importURI;
+    importURI = newImportURI;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, ATestPackage.TESTS__IMPORT_URI, oldImportURI, importURI));
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   public Object eGet(int featureID, boolean resolve, boolean coreType)
   {
-        switch (featureID) {
-            case ATestPackage.TESTS__IMPORT_URI:
-                return getImportURI();
-        }
-        return super.eGet(featureID, resolve, coreType);
+    switch (featureID)
+    {
+      case ATestPackage.TESTS__IMPORT_URI:
+        return getImportURI();
     }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   public void eSet(int featureID, Object newValue)
   {
-        switch (featureID) {
-            case ATestPackage.TESTS__IMPORT_URI:
-                setImportURI((String)newValue);
-                return;
-        }
-        super.eSet(featureID, newValue);
+    switch (featureID)
+    {
+      case ATestPackage.TESTS__IMPORT_URI:
+        setImportURI((String)newValue);
+        return;
     }
+    super.eSet(featureID, newValue);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   public void eUnset(int featureID)
   {
-        switch (featureID) {
-            case ATestPackage.TESTS__IMPORT_URI:
-                setImportURI(IMPORT_URI_EDEFAULT);
-                return;
-        }
-        super.eUnset(featureID);
+    switch (featureID)
+    {
+      case ATestPackage.TESTS__IMPORT_URI:
+        setImportURI(IMPORT_URI_EDEFAULT);
+        return;
     }
+    super.eUnset(featureID);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   public boolean eIsSet(int featureID)
   {
-        switch (featureID) {
-            case ATestPackage.TESTS__IMPORT_URI:
-                return IMPORT_URI_EDEFAULT == null ? importURI != null : !IMPORT_URI_EDEFAULT.equals(importURI);
-        }
-        return super.eIsSet(featureID);
+    switch (featureID)
+    {
+      case ATestPackage.TESTS__IMPORT_URI:
+        return IMPORT_URI_EDEFAULT == null ? importURI != null : !IMPORT_URI_EDEFAULT.equals(importURI);
     }
+    return super.eIsSet(featureID);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   public String toString()
   {
-        if (eIsProxy()) return super.toString();
+    if (eIsProxy()) return super.toString();
 
-        StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (importURI: ");
-        result.append(importURI);
-        result.append(')');
-        return result.toString();
-    }
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (importURI: ");
+    result.append(importURI);
+    result.append(')');
+    return result.toString();
+  }
 
 } //TestsImpl
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/ValueImpl.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/ValueImpl.java
index 6ff3973..34ebbfd 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/ValueImpl.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/impl/ValueImpl.java
@@ -31,146 +31,150 @@
 public class ValueImpl extends MinimalEObjectImpl.Container implements Value
 {
   /**
-     * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-     * <!-- begin-user-doc -->
+   * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see #getValue()
-     * @generated
-     * @ordered
-     */
+   * @see #getValue()
+   * @generated
+   * @ordered
+   */
   protected static final String VALUE_EDEFAULT = null;
 
   /**
-     * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-     * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @see #getValue()
-     * @generated
-     * @ordered
-     */
+   * @see #getValue()
+   * @generated
+   * @ordered
+   */
   protected String value = VALUE_EDEFAULT;
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   protected ValueImpl()
   {
-        super();
-    }
+    super();
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   protected EClass eStaticClass()
   {
-        return ATestPackage.Literals.VALUE;
-    }
+    return ATestPackage.Literals.VALUE;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public String getValue()
   {
-        return value;
-    }
+    return value;
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public void setValue(String newValue)
   {
-        String oldValue = value;
-        value = newValue;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, ATestPackage.VALUE__VALUE, oldValue, value));
-    }
+    String oldValue = value;
+    value = newValue;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, ATestPackage.VALUE__VALUE, oldValue, value));
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   public Object eGet(int featureID, boolean resolve, boolean coreType)
   {
-        switch (featureID) {
-            case ATestPackage.VALUE__VALUE:
-                return getValue();
-        }
-        return super.eGet(featureID, resolve, coreType);
+    switch (featureID)
+    {
+      case ATestPackage.VALUE__VALUE:
+        return getValue();
     }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   public void eSet(int featureID, Object newValue)
   {
-        switch (featureID) {
-            case ATestPackage.VALUE__VALUE:
-                setValue((String)newValue);
-                return;
-        }
-        super.eSet(featureID, newValue);
+    switch (featureID)
+    {
+      case ATestPackage.VALUE__VALUE:
+        setValue((String)newValue);
+        return;
     }
+    super.eSet(featureID, newValue);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   public void eUnset(int featureID)
   {
-        switch (featureID) {
-            case ATestPackage.VALUE__VALUE:
-                setValue(VALUE_EDEFAULT);
-                return;
-        }
-        super.eUnset(featureID);
+    switch (featureID)
+    {
+      case ATestPackage.VALUE__VALUE:
+        setValue(VALUE_EDEFAULT);
+        return;
     }
+    super.eUnset(featureID);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   public boolean eIsSet(int featureID)
   {
-        switch (featureID) {
-            case ATestPackage.VALUE__VALUE:
-                return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-        }
-        return super.eIsSet(featureID);
+    switch (featureID)
+    {
+      case ATestPackage.VALUE__VALUE:
+        return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
     }
+    return super.eIsSet(featureID);
+  }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   @Override
   public String toString()
   {
-        if (eIsProxy()) return super.toString();
+    if (eIsProxy()) return super.toString();
 
-        StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (value: ");
-        result.append(value);
-        result.append(')');
-        return result.toString();
-    }
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (value: ");
+    result.append(value);
+    result.append(')');
+    return result.toString();
+  }
 
 } //ValueImpl
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/util/ATestAdapterFactory.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/util/ATestAdapterFactory.java
index 58b00e4..4753b3f 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/util/ATestAdapterFactory.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/util/ATestAdapterFactory.java
@@ -25,200 +25,211 @@
 public class ATestAdapterFactory extends AdapterFactoryImpl
 {
   /**
-     * The cached model package.
-     * <!-- begin-user-doc -->
+   * The cached model package.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   protected static ATestPackage modelPackage;
 
   /**
-     * Creates an instance of the adapter factory.
-     * <!-- begin-user-doc -->
+   * Creates an instance of the adapter factory.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public ATestAdapterFactory()
   {
-        if (modelPackage == null) {
-            modelPackage = ATestPackage.eINSTANCE;
-        }
+    if (modelPackage == null)
+    {
+      modelPackage = ATestPackage.eINSTANCE;
     }
+  }
 
   /**
-     * Returns whether this factory is applicable for the type of the object.
-     * <!-- begin-user-doc -->
+   * Returns whether this factory is applicable for the type of the object.
+   * <!-- begin-user-doc -->
    * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
    * <!-- end-user-doc -->
-     * @return whether this factory is applicable for the type of the object.
-     * @generated
-     */
+   * @return whether this factory is applicable for the type of the object.
+   * @generated
+   */
   @Override
   public boolean isFactoryForType(Object object)
   {
-        if (object == modelPackage) {
-            return true;
-        }
-        if (object instanceof EObject) {
-            return ((EObject)object).eClass().getEPackage() == modelPackage;
-        }
-        return false;
+    if (object == modelPackage)
+    {
+      return true;
     }
+    if (object instanceof EObject)
+    {
+      return ((EObject)object).eClass().getEPackage() == modelPackage;
+    }
+    return false;
+  }
 
   /**
-     * The switch that delegates to the <code>createXXX</code> methods.
-     * <!-- begin-user-doc -->
+   * The switch that delegates to the <code>createXXX</code> methods.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   protected ATestSwitch<Adapter> modelSwitch =
-    new ATestSwitch<Adapter>() {
-            @Override
-            public Adapter caseModel(Model object) {
-                return createModelAdapter();
-            }
-            @Override
-            public Adapter caseTests(Tests object) {
-                return createTestsAdapter();
-            }
-            @Override
-            public Adapter caseConstraint(Constraint object) {
-                return createConstraintAdapter();
-            }
-            @Override
-            public Adapter caseValue(Value object) {
-                return createValueAdapter();
-            }
-            @Override
-            public Adapter caseIntValue(IntValue object) {
-                return createIntValueAdapter();
-            }
-            @Override
-            public Adapter caseRealValue(RealValue object) {
-                return createRealValueAdapter();
-            }
-            @Override
-            public Adapter defaultCase(EObject object) {
-                return createEObjectAdapter();
-            }
-        };
+    new ATestSwitch<Adapter>()
+    {
+      @Override
+      public Adapter caseModel(Model object)
+      {
+        return createModelAdapter();
+      }
+      @Override
+      public Adapter caseTests(Tests object)
+      {
+        return createTestsAdapter();
+      }
+      @Override
+      public Adapter caseConstraint(Constraint object)
+      {
+        return createConstraintAdapter();
+      }
+      @Override
+      public Adapter caseValue(Value object)
+      {
+        return createValueAdapter();
+      }
+      @Override
+      public Adapter caseIntValue(IntValue object)
+      {
+        return createIntValueAdapter();
+      }
+      @Override
+      public Adapter caseRealValue(RealValue object)
+      {
+        return createRealValueAdapter();
+      }
+      @Override
+      public Adapter defaultCase(EObject object)
+      {
+        return createEObjectAdapter();
+      }
+    };
 
   /**
-     * Creates an adapter for the <code>target</code>.
-     * <!-- begin-user-doc -->
+   * Creates an adapter for the <code>target</code>.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @param target the object to adapt.
-     * @return the adapter for the <code>target</code>.
-     * @generated
-     */
+   * @param target the object to adapt.
+   * @return the adapter for the <code>target</code>.
+   * @generated
+   */
   @Override
   public Adapter createAdapter(Notifier target)
   {
-        return modelSwitch.doSwitch((EObject)target);
-    }
+    return modelSwitch.doSwitch((EObject)target);
+  }
 
 
   /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.amp.amf.testing.aTest.Model <em>Model</em>}'.
-     * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.amp.amf.testing.aTest.Model <em>Model</em>}'.
+   * <!-- begin-user-doc -->
    * This default implementation returns null so that we can easily ignore cases;
    * it's useful to ignore a case when inheritance will catch all the cases anyway.
    * <!-- end-user-doc -->
-     * @return the new adapter.
-     * @see org.eclipse.amp.amf.testing.aTest.Model
-     * @generated
-     */
+   * @return the new adapter.
+   * @see org.eclipse.amp.amf.testing.aTest.Model
+   * @generated
+   */
   public Adapter createModelAdapter()
   {
-        return null;
-    }
+    return null;
+  }
 
   /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.amp.amf.testing.aTest.Tests <em>Tests</em>}'.
-     * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.amp.amf.testing.aTest.Tests <em>Tests</em>}'.
+   * <!-- begin-user-doc -->
    * This default implementation returns null so that we can easily ignore cases;
    * it's useful to ignore a case when inheritance will catch all the cases anyway.
    * <!-- end-user-doc -->
-     * @return the new adapter.
-     * @see org.eclipse.amp.amf.testing.aTest.Tests
-     * @generated
-     */
+   * @return the new adapter.
+   * @see org.eclipse.amp.amf.testing.aTest.Tests
+   * @generated
+   */
   public Adapter createTestsAdapter()
   {
-        return null;
-    }
+    return null;
+  }
 
   /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.amp.amf.testing.aTest.Constraint <em>Constraint</em>}'.
-     * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.amp.amf.testing.aTest.Constraint <em>Constraint</em>}'.
+   * <!-- begin-user-doc -->
    * This default implementation returns null so that we can easily ignore cases;
    * it's useful to ignore a case when inheritance will catch all the cases anyway.
    * <!-- end-user-doc -->
-     * @return the new adapter.
-     * @see org.eclipse.amp.amf.testing.aTest.Constraint
-     * @generated
-     */
+   * @return the new adapter.
+   * @see org.eclipse.amp.amf.testing.aTest.Constraint
+   * @generated
+   */
   public Adapter createConstraintAdapter()
   {
-        return null;
-    }
+    return null;
+  }
 
   /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.amp.amf.testing.aTest.Value <em>Value</em>}'.
-     * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.amp.amf.testing.aTest.Value <em>Value</em>}'.
+   * <!-- begin-user-doc -->
    * This default implementation returns null so that we can easily ignore cases;
    * it's useful to ignore a case when inheritance will catch all the cases anyway.
    * <!-- end-user-doc -->
-     * @return the new adapter.
-     * @see org.eclipse.amp.amf.testing.aTest.Value
-     * @generated
-     */
+   * @return the new adapter.
+   * @see org.eclipse.amp.amf.testing.aTest.Value
+   * @generated
+   */
   public Adapter createValueAdapter()
   {
-        return null;
-    }
+    return null;
+  }
 
   /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.amp.amf.testing.aTest.IntValue <em>Int Value</em>}'.
-     * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.amp.amf.testing.aTest.IntValue <em>Int Value</em>}'.
+   * <!-- begin-user-doc -->
    * This default implementation returns null so that we can easily ignore cases;
    * it's useful to ignore a case when inheritance will catch all the cases anyway.
    * <!-- end-user-doc -->
-     * @return the new adapter.
-     * @see org.eclipse.amp.amf.testing.aTest.IntValue
-     * @generated
-     */
+   * @return the new adapter.
+   * @see org.eclipse.amp.amf.testing.aTest.IntValue
+   * @generated
+   */
   public Adapter createIntValueAdapter()
   {
-        return null;
-    }
+    return null;
+  }
 
   /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.amp.amf.testing.aTest.RealValue <em>Real Value</em>}'.
-     * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.amp.amf.testing.aTest.RealValue <em>Real Value</em>}'.
+   * <!-- begin-user-doc -->
    * This default implementation returns null so that we can easily ignore cases;
    * it's useful to ignore a case when inheritance will catch all the cases anyway.
    * <!-- end-user-doc -->
-     * @return the new adapter.
-     * @see org.eclipse.amp.amf.testing.aTest.RealValue
-     * @generated
-     */
+   * @return the new adapter.
+   * @see org.eclipse.amp.amf.testing.aTest.RealValue
+   * @generated
+   */
   public Adapter createRealValueAdapter()
   {
-        return null;
-    }
+    return null;
+  }
 
   /**
-     * Creates a new adapter for the default case.
-     * <!-- begin-user-doc -->
+   * Creates a new adapter for the default case.
+   * <!-- begin-user-doc -->
    * This default implementation returns null.
    * <!-- end-user-doc -->
-     * @return the new adapter.
-     * @generated
-     */
+   * @return the new adapter.
+   * @generated
+   */
   public Adapter createEObjectAdapter()
   {
-        return null;
-    }
+    return null;
+  }
 
 } //ATestAdapterFactory
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/util/ATestSwitch.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/util/ATestSwitch.java
index 473936f..bb79f63 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/util/ATestSwitch.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/src-gen/org/eclipse/amp/amf/testing/aTest/util/ATestSwitch.java
@@ -28,221 +28,231 @@
 public class ATestSwitch<T>
 {
   /**
-     * The cached model package
-     * <!-- begin-user-doc -->
+   * The cached model package
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   protected static ATestPackage modelPackage;
 
   /**
-     * Creates an instance of the switch.
-     * <!-- begin-user-doc -->
+   * Creates an instance of the switch.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public ATestSwitch()
   {
-        if (modelPackage == null) {
-            modelPackage = ATestPackage.eINSTANCE;
-        }
+    if (modelPackage == null)
+    {
+      modelPackage = ATestPackage.eINSTANCE;
     }
+  }
 
   /**
-     * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-     * <!-- begin-user-doc -->
+   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @return the first non-null result returned by a <code>caseXXX</code> call.
-     * @generated
-     */
+   * @return the first non-null result returned by a <code>caseXXX</code> call.
+   * @generated
+   */
   public T doSwitch(EObject theEObject)
   {
-        return doSwitch(theEObject.eClass(), theEObject);
-    }
+    return doSwitch(theEObject.eClass(), theEObject);
+  }
 
   /**
-     * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-     * <!-- begin-user-doc -->
+   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @return the first non-null result returned by a <code>caseXXX</code> call.
-     * @generated
-     */
+   * @return the first non-null result returned by a <code>caseXXX</code> call.
+   * @generated
+   */
   protected T doSwitch(EClass theEClass, EObject theEObject)
   {
-        if (theEClass.eContainer() == modelPackage) {
-            return doSwitch(theEClass.getClassifierID(), theEObject);
-        }
-        else {
-            List<EClass> eSuperTypes = theEClass.getESuperTypes();
-            return
-                eSuperTypes.isEmpty() ?
-                    defaultCase(theEObject) :
-                    doSwitch(eSuperTypes.get(0), theEObject);
-        }
+    if (theEClass.eContainer() == modelPackage)
+    {
+      return doSwitch(theEClass.getClassifierID(), theEObject);
     }
+    else
+    {
+      List<EClass> eSuperTypes = theEClass.getESuperTypes();
+      return
+        eSuperTypes.isEmpty() ?
+          defaultCase(theEObject) :
+          doSwitch(eSuperTypes.get(0), theEObject);
+    }
+  }
 
   /**
-     * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-     * <!-- begin-user-doc -->
+   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-     * @return the first non-null result returned by a <code>caseXXX</code> call.
-     * @generated
-     */
+   * @return the first non-null result returned by a <code>caseXXX</code> call.
+   * @generated
+   */
   protected T doSwitch(int classifierID, EObject theEObject)
   {
-        switch (classifierID) {
-            case ATestPackage.MODEL: {
-                Model model = (Model)theEObject;
-                T result = caseModel(model);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case ATestPackage.TESTS: {
-                Tests tests = (Tests)theEObject;
-                T result = caseTests(tests);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case ATestPackage.CONSTRAINT: {
-                Constraint constraint = (Constraint)theEObject;
-                T result = caseConstraint(constraint);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case ATestPackage.VALUE: {
-                Value value = (Value)theEObject;
-                T result = caseValue(value);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case ATestPackage.INT_VALUE: {
-                IntValue intValue = (IntValue)theEObject;
-                T result = caseIntValue(intValue);
-                if (result == null) result = caseValue(intValue);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case ATestPackage.REAL_VALUE: {
-                RealValue realValue = (RealValue)theEObject;
-                T result = caseRealValue(realValue);
-                if (result == null) result = caseValue(realValue);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            default: return defaultCase(theEObject);
-        }
+    switch (classifierID)
+    {
+      case ATestPackage.MODEL:
+      {
+        Model model = (Model)theEObject;
+        T result = caseModel(model);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
+      case ATestPackage.TESTS:
+      {
+        Tests tests = (Tests)theEObject;
+        T result = caseTests(tests);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
+      case ATestPackage.CONSTRAINT:
+      {
+        Constraint constraint = (Constraint)theEObject;
+        T result = caseConstraint(constraint);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
+      case ATestPackage.VALUE:
+      {
+        Value value = (Value)theEObject;
+        T result = caseValue(value);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
+      case ATestPackage.INT_VALUE:
+      {
+        IntValue intValue = (IntValue)theEObject;
+        T result = caseIntValue(intValue);
+        if (result == null) result = caseValue(intValue);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
+      case ATestPackage.REAL_VALUE:
+      {
+        RealValue realValue = (RealValue)theEObject;
+        T result = caseRealValue(realValue);
+        if (result == null) result = caseValue(realValue);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
+      default: return defaultCase(theEObject);
     }
+  }
 
   /**
-     * Returns the result of interpreting the object as an instance of '<em>Model</em>'.
-     * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>Model</em>'.
+   * <!-- begin-user-doc -->
    * This implementation returns null;
    * returning a non-null result will terminate the switch.
    * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>Model</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Model</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
   public T caseModel(Model object)
   {
-        return null;
-    }
+    return null;
+  }
 
   /**
-     * Returns the result of interpreting the object as an instance of '<em>Tests</em>'.
-     * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>Tests</em>'.
+   * <!-- begin-user-doc -->
    * This implementation returns null;
    * returning a non-null result will terminate the switch.
    * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>Tests</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Tests</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
   public T caseTests(Tests object)
   {
-        return null;
-    }
+    return null;
+  }
 
   /**
-     * Returns the result of interpreting the object as an instance of '<em>Constraint</em>'.
-     * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>Constraint</em>'.
+   * <!-- begin-user-doc -->
    * This implementation returns null;
    * returning a non-null result will terminate the switch.
    * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>Constraint</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Constraint</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
   public T caseConstraint(Constraint object)
   {
-        return null;
-    }
+    return null;
+  }
 
   /**
-     * Returns the result of interpreting the object as an instance of '<em>Value</em>'.
-     * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>Value</em>'.
+   * <!-- begin-user-doc -->
    * This implementation returns null;
    * returning a non-null result will terminate the switch.
    * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>Value</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Value</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
   public T caseValue(Value object)
   {
-        return null;
-    }
+    return null;
+  }
 
   /**
-     * Returns the result of interpreting the object as an instance of '<em>Int Value</em>'.
-     * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>Int Value</em>'.
+   * <!-- begin-user-doc -->
    * This implementation returns null;
    * returning a non-null result will terminate the switch.
    * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>Int Value</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Int Value</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
   public T caseIntValue(IntValue object)
   {
-        return null;
-    }
+    return null;
+  }
 
   /**
-     * Returns the result of interpreting the object as an instance of '<em>Real Value</em>'.
-     * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>Real Value</em>'.
+   * <!-- begin-user-doc -->
    * This implementation returns null;
    * returning a non-null result will terminate the switch.
    * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>Real Value</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Real Value</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
   public T caseRealValue(RealValue object)
   {
-        return null;
-    }
+    return null;
+  }
 
   /**
-     * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-     * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+   * <!-- begin-user-doc -->
    * This implementation returns null;
    * returning a non-null result will terminate the switch, but this is the last case anyway.
    * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-     * @generated
-     */
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+   * @generated
+   */
   public T defaultCase(EObject object)
   {
-        return null;
-    }
+    return null;
+  }
 
 } //ATestSwitch