diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/AcamarCluster.xmi b/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/AcamarCluster.xmi
index 0c4774c2f511bf030023b916d1a2106a89b55304..6eeb1ec75c1af3994f1a50aca3262cb0a277d570 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/AcamarCluster.xmi
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/AcamarCluster.xmi
@@ -12,14 +12,108 @@
     <contains
         xsi:type="resourcelandscape:CompositeHardwareInfrastructure"
         id="3"
-        name="AcamarCluster"/>
-    <contains
-        xsi:type="resourcelandscape:ComputingInfrastructure"
-        id="4"
-        name="ClusterNode20"/>
-    <contains
-        xsi:type="resourcelandscape:ComputingInfrastructure"
-        id="5"
-        name="ClusterNode19"/>
+        name="AcamarCluster">
+      <contains
+          xsi:type="resourcelandscape:ComputingInfrastructure"
+          id="4"
+          name="ClusterNode20">
+        <contains
+            id="10"
+            name="XenServer">
+          <contains
+              id="12"
+              name="AppServerVM1"
+              ofClass="OS VM">
+            <template
+                href="ContainerTemplateRepo.xmi#2"/>
+          </contains>
+          <contains
+              id="13"
+              name="AppServerVM2"
+              ofClass="OS VM">
+            <template
+                href="ContainerTemplateRepo.xmi#2"/>
+          </contains>
+          <template
+              href="ContainerTemplateRepo.xmi#11"/>
+        </contains>
+        <template
+            href="ContainerTemplateRepo.xmi#5"/>
+      </contains>
+      <contains
+          xsi:type="resourcelandscape:ComputingInfrastructure"
+          id="5"
+          name="ClusterNode19">
+        <contains
+            id="15"
+            name="XenServer">
+          <contains
+              id="16"
+              name="AppServerVM3"
+              ofClass="OS VM">
+            <template
+                href="ContainerTemplateRepo.xmi#2"/>
+          </contains>
+          <contains
+              id="17"
+              name="AppServerVM4"
+              ofClass="OS VM">
+            <template
+                href="ContainerTemplateRepo.xmi#2"/>
+          </contains>
+          <template
+              href="ContainerTemplateRepo.xmi#11"/>
+        </contains>
+        <template
+            href="ContainerTemplateRepo.xmi#5"/>
+      </contains>
+      <contains
+          xsi:type="resourcelandscape:ComputingInfrastructure"
+          id="6"
+          name="ClusterNode18">
+        <contains
+            id="25"
+            name="XenServer">
+          <contains
+              id="26"
+              name="AppServerVM5"
+              ofClass="OS VM">
+            <template
+                href="ContainerTemplateRepo.xmi#2"/>
+          </contains>
+          <contains
+              id="27"
+              name="AppServerVM6"
+              ofClass="OS VM">
+            <template
+                href="ContainerTemplateRepo.xmi#2"/>
+          </contains>
+          <template
+              href="ContainerTemplateRepo.xmi#11"/>
+        </contains>
+        <template
+            href="ContainerTemplateRepo.xmi#5"/>
+      </contains>
+      <contains
+          xsi:type="resourcelandscape:ComputingInfrastructure"
+          id="7"
+          name="ClusterNode17">
+        <contains
+            id="14"
+            name="XenServer">
+          <contains
+              id="33"
+              name="DatabaseVM"
+              ofClass="OS VM">
+            <template
+                href="ContainerTemplateRepo.xmi#555"/>
+          </contains>
+          <template
+              href="ContainerTemplateRepo.xmi#11"/>
+        </contains>
+        <template
+            href="ContainerTemplateRepo.xmi#5"/>
+      </contains>
+    </contains>
   </consistsOf>
 </resourcelandscape:DistributedDataCenter>
diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/ContainerTemplateRepo.xmi b/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/ContainerTemplateRepo.xmi
index fa4920f61e860bc89ac7f007508e567bfe8a8f1b..04994ffc70ad09fd1bfce9ce2f5796183babe261 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/ContainerTemplateRepo.xmi
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/ContainerTemplateRepo.xmi
@@ -1,45 +1,27 @@
 <?xml version="1.0" encoding="ASCII"?>
-<containerrepository:ContainerRepository
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/0.1"
-    xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/0.1"
-    xsi:schemaLocation="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"
-    id="1" name="AcamarClusterContainerTemplates">
-  <templates
-      id="2"
-      name="AppServerVmTemplate">
-    <templateConfig
-        xsi:type="resourceconfiguration:ActiveResourceSpecification"
-        id="3"
-        name="CPU">
-      <processingResourceSpecifications
-          id="235234"
-          name="CPU-Spec"
-          schedulingPolicy="PROCESSOR_SHARING"
-          processingRate="1000.0"
-          parentResourceSpecification="3">
-        <nrOfParProcUnits
-            id="1341341"
-            name="NumberOfVirtualCpus"
-            number="2"/>
+<containerrepository:ContainerRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/0.1" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/0.1" xsi:schemaLocation="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" id="1" name="AcamarClusterContainerTemplates">
+  <templates id="2" name="AppServerVmTemplate">
+    <templateConfig xsi:type="resourceconfiguration:ActiveResourceSpecification" id="3" name="CpusAppServer">
+      <processingResourceSpecifications id="235234" name="CPU-Spec" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0" parentResourceSpecification="3">
+        <nrOfParProcUnits id="1341341" name="NumberOfVirtualCpus" number="2"/>
       </processingResourceSpecifications>
     </templateConfig>
   </templates>
-  <templates
-      id="555"
-      name="DatabaseVmTemplate">
-    <templateConfig
-        xsi:type="resourceconfiguration:ActiveResourceSpecification"
-        id="1231231231"
-        name="CPU">
-      <processingResourceSpecifications
-          id="51241132"
-          name="CPU-Spec"
-          schedulingPolicy="PROCESSOR_SHARING"
-          processingRate="1000.0"
-          parentResourceSpecification="1231231231"/>
+  <templates id="555" name="DatabaseVmTemplate">
+    <templateConfig xsi:type="resourceconfiguration:ActiveResourceSpecification" id="1231231231" name="CpusDatabase">
+      <processingResourceSpecifications id="51241132" name="CPU-Spec" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0" parentResourceSpecification="1231231231">
+        <nrOfParProcUnits id="33" name="DatabaseVirtualCpus" number="8"/>
+      </processingResourceSpecifications>
     </templateConfig>
   </templates>
+  <templates id="5" name="ClusterNodeTemplate">
+    <templateConfig xsi:type="resourceconfiguration:ActiveResourceSpecification" id="123123" name="CpusClusterNode">
+      <processingResourceSpecifications id="123sf" name="AmdOpteronCpuSpec" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0" parentResourceSpecification="123123">
+        <nrOfParProcUnits id="23423sad" name="AmdOpteron" number="8"/>
+      </processingResourceSpecifications>
+    </templateConfig>
+  </templates>
+  <templates id="11" name="XenServerTemplate">
+    <templateConfig xsi:type="resourceconfiguration:CustomConfigurationSpecification" id="12" name="XenServerConfiguration"/>
+  </templates>
 </containerrepository:ContainerRepository>