diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/AdaptationPoints.xmi b/edu.kit.ipd.descartes.adaptation.test/test_models/AdaptationPoints.xmi
index 26e1de8a829bded0b0d58bb53386423fc6491ef1..92dbec62028a0bf333efd6e40e02d0e62f7a83e4 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/AdaptationPoints.xmi
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/AdaptationPoints.xmi
@@ -1,28 +1,71 @@
 <?xml version="1.0" encoding="ASCII"?>
-<adaptationpoints:AdaptationPointDescriptions xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/0.1" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/0.1" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/0.1" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" xsi:schemaLocation="http://www.descartes-research.net/metamodel/adaptationpoints/0.1 ../../edu.kit.ipd.descartes.mm.adaptationpoints/model/adaptationpoints.ecore http://www.descartes-research.net/metamodel/containerrepository/0.1 ../../edu.kit.ipd.descartes.mm.resourcelandscape/model/containerrepository.ecore http://www.descartes-research.net/metamodel/resourceconfiguration/0.1 ../../edu.kit.ipd.descartes.mm.resourcelandscape/model/resourceconfiguration.ecore http://www.descartes-research.net/metamodel/resourcelandscape/0.1 ../../edu.kit.ipd.descartes.mm.resourcelandscape/model/resourcelandscape.ecore" id="1" name="MyAdaptationPointDescriptions">
-  <adaptationPoints xsi:type="adaptationpoints:ModelVariableConfigurationRange" id="238746123" name="AmountOfCores" minValue="1.0" maxValue="4.0">
-    <adaptableEntity xsi:type="resourceconfiguration:NumberOfParallelProcessingUnits" href="ContainerTemplateRepository.xmi#1341341"/>
+<adaptationpoints:AdaptationPointDescriptions
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/0.1"
+    xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/0.1"
+    xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/0.1"
+    xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1"
+    xsi:schemaLocation="http://www.descartes-research.net/metamodel/adaptationpoints/0.1 ../../edu.kit.ipd.descartes.mm.adaptationpoints/model/adaptationpoints.ecore http://www.descartes-research.net/metamodel/containerrepository/0.1 ../../edu.kit.ipd.descartes.mm.resourcelandscape/model/containerrepository.ecore http://www.descartes-research.net/metamodel/resourceconfiguration/0.1 ../../edu.kit.ipd.descartes.mm.resourcelandscape/model/resourceconfiguration.ecore http://www.descartes-research.net/metamodel/resourcelandscape/0.1 ../../edu.kit.ipd.descartes.mm.resourcelandscape/model/resourcelandscape.ecore"
+    id="1" name="MyAdaptationPointDescriptions">
+  <adaptationPoints
+      xsi:type="adaptationpoints:ModelVariableConfigurationRange"
+      id="238746123"
+      name="AmountOfCores"
+      minValue="1.0"
+      maxValue="4.0">
+    <adaptableEntity
+        xsi:type="resourceconfiguration:NumberOfParallelProcessingUnits"
+        href="ContainerTemplateRepository.xmi#1341341"/>
   </adaptationPoints>
-  <adaptationPoints xsi:type="adaptationpoints:ModelEntityConfigurationRange" id="12312412412" name="NumberOfVmInstances">
-    <variationPossibility xsi:type="adaptationpoints:PropertyRange">
-      <minValueConstraint oclString="self.containedIn.contains -> select( r&#xA; | r.template = self.template)->size() >= 1"/>
-      <maxValueConstraint oclString="self.containedIn.contains -> select( r&#xA; | r.template = self.template)->size() &lt;= 4"/>
+  <adaptationPoints
+      xsi:type="adaptationpoints:ModelEntityConfigurationRange"
+      id="12312412412"
+      name="NumberOfVmInstances">
+    <variationPossibility
+        xsi:type="adaptationpoints:PropertyRange">
+      <minValueConstraint
+          oclString="self.containedIn.contains -> select( r&#xA; | r.template = self.template)->size() >= 1"/>
+      <maxValueConstraint
+          oclString="self.containedIn.contains -> select( r&#xA; | r.template = self.template)->size() &lt;= 4"/>
     </variationPossibility>
-    <adaptableEntity xsi:type="resourcelandscape:RuntimeEnvironment" href="DistributedDataCenter.xmi#12345-1"/>
+    <adaptableEntity
+        xsi:type="resourcelandscape:RuntimeEnvironment"
+        href="DistributedDataCenter.xmi#12345-1"/>
   </adaptationPoints>
-  <adaptationPoints xsi:type="adaptationpoints:ModelEntityConfigurationRange" id="xyz" name="NumberOfTemplateInstances">
-    <variationPossibility xsi:type="adaptationpoints:PropertyRange">
-      <minValueConstraint oclString="self.referringContainers->size() >= 1"/>
-      <maxValueConstraint oclString="self.referringContainers->size() &lt;= 10"/>
+  <adaptationPoints
+      xsi:type="adaptationpoints:ModelEntityConfigurationRange"
+      id="xyz"
+      name="NumberOfTemplateInstances">
+    <variationPossibility
+        xsi:type="adaptationpoints:PropertyRange">
+      <minValueConstraint
+          oclString="self.referringContainers->size() >= 1"/>
+      <maxValueConstraint
+          oclString="self.referringContainers->size() &lt;= 10"/>
     </variationPossibility>
-    <adaptableEntity xsi:type="containerrepository:ContainerTemplate" href="ContainerTemplateRepository.xmi#555"/>
+    <adaptableEntity
+        xsi:type="containerrepository:ContainerTemplate"
+        href="ContainerTemplateRepository.xmi#555"/>
   </adaptationPoints>
-  <adaptationPoints xsi:type="adaptationpoints:ModelEntityConfigurationRange" id="123321" name="VM USA Migration">
-    <variationPossibility xsi:type="adaptationpoints:SetOfConfigurations">
-      <valueConstraint oclString="&quot;Specify a fancy OCL constraint here&quot;"/>
-      <variants href="DistributedDataCenter.xmi#12312312"/>
-      <variants href="DistributedDataCenter.xmi#y"/>
+  <adaptationPoints
+      xsi:type="adaptationpoints:ModelEntityConfigurationRange"
+      id="123321"
+      name="VM USA Migration">
+    <variationPossibility
+        xsi:type="adaptationpoints:SetOfConfigurations">
+      <valueConstraint
+          oclString="&quot;Specify a fancy OCL constraint here&quot;"/>
+      <variants
+          xsi:type="resourcelandscape:ComputingInfrastructure"
+          href="DistributedDataCenter.xmi#y"/>
+      <variants
+          xsi:type="resourcelandscape:ComputingInfrastructure"
+          href="DistributedDataCenter.xmi#12312312"/>
     </variationPossibility>
-    <adaptableEntity xsi:type="resourcelandscape:RuntimeEnvironment" href="DistributedDataCenter.xmi#2313"/>
+    <adaptableEntity
+        xsi:type="resourcelandscape:RuntimeEnvironment"
+        href="DistributedDataCenter.xmi#2313"/>
   </adaptationPoints>
 </adaptationpoints:AdaptationPointDescriptions>