Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs
===================================================================
diff -u -r1999 -r2002
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs	(.../MacroStabilityIoTests.cs)	(revision 1999)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs	(.../MacroStabilityIoTests.cs)	(revision 2002)
@@ -25,6 +25,7 @@
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.TestHelpers;
 using Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityCommon.MacroStabilityIo;
+using Deltares.DamEngine.Data.Geotechnics;
 using KellermanSoftware.CompareNetObjects;
 
 namespace Deltares.DamEngine.Calculators.Tests.KernelWrappers.MacroStabilityCommon
@@ -59,18 +60,40 @@
         {
             // Given DamEngine data (DamProjectData)
             DamProjectData expectedDamProjectData = CreateExampleDamProjectData();
-            KernelModel expectedKernelModel = FillWtiFromDamEngine.CreateKernelModelFromDamProjectData(expectedDamProjectData);
 
+            Location expectedLocation = expectedDamProjectData.Dike.Locations[0];
+            SoilProfile2D expectedSoilProfile2D = expectedLocation.Segment.SoilProfileProbabilities[0].SoilProfile2D;
+            SurfaceLine2 expectedSurfaceLine2D = expectedLocation.SurfaceLine;
+            FailureMechanismParametersMStab expectedParametersMStab = expectedDamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismParametersMStab;
+            FillWtiKernelData fillWtiKernelData = new FillWtiKernelData()
+            {
+                FailureMechanismParametersMStab = expectedParametersMStab,
+                Location = expectedLocation,
+                SoilProfile2D = expectedSoilProfile2D,
+                SurfaceLine2 = expectedSurfaceLine2D
+            };
+            KernelModel expectedKernelModel = fillWtiKernelData.CreateKernelModel();
+
             // When Serializing and Deserializing
             string xmlWti = WtiSerializer.Serialize(expectedKernelModel);
             const string fileName = "TestInput.wti";
             string fullFileName = Path.Combine(WtiFilesMap, fileName);
             File.WriteAllText(fullFileName, xmlWti);
             KernelModel actualKernelModel = WtiDeserializer.Deserialize(xmlWti);
-            DamProjectData actualDamProjectData = FillDamEngineFromWti.CreateDamProjectDataFromKernelModel(actualKernelModel);
+            var fillDamEngineFromWti = new FillDamEngineFromWti();
+            fillDamEngineFromWti.FillDamProjectDataFromKernelModel(actualKernelModel);
 
             // Then the data models are equal
-            CompareDamProjectData(actualDamProjectData, expectedDamProjectData);
+            var compare = new CompareLogic { Config = { MaxDifferences = 100 } };
+            var result = compare.Compare(expectedLocation, fillDamEngineFromWti.Location);
+            Assert.AreEqual(0, result.Differences.Count, "Differences found read/write kernel Location");
+            result = compare.Compare(expectedSoilProfile2D, fillDamEngineFromWti.SoilProfile2D);
+            Assert.AreEqual(0, result.Differences.Count, "Differences found read/write kernel SoilProfile2D");
+            result = compare.Compare(expectedSurfaceLine2D, fillDamEngineFromWti.SurfaceLine2);
+            Assert.AreEqual(0, result.Differences.Count, "Differences found read/write kernel SurfaceLine2");
+            result = compare.Compare(expectedParametersMStab, fillDamEngineFromWti.FailureMechanismParametersMStab);
+            Assert.AreEqual(0, result.Differences.Count, "Differences found read/write kernel FailureMechanismParametersMStab");
+
         }
 
         private DamProjectData CreateExampleDamProjectData()
@@ -114,14 +137,5 @@
             // Then the strings are equal
             Assert.AreEqual(xmlInput, xmlOutput);
         }
-
-        private static void CompareDamProjectData(DamProjectData actual, DamProjectData expected)
-        {
-
-            var compare = new CompareLogic { Config = { MaxDifferences = 100 } };
-            var result = compare.Compare(expected, actual);
-            Assert.AreEqual(0, result.Differences.Count, "Differences found read/write Input object");
-
-        }
     }
 }