Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs
===================================================================
diff -u -r2003 -r2004
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs	(.../MacroStabilityIoTests.cs)	(revision 2003)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs	(.../MacroStabilityIoTests.cs)	(revision 2004)
@@ -26,6 +26,7 @@
 using Deltares.DamEngine.TestHelpers;
 using Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityCommon.MacroStabilityIo;
 using Deltares.DamEngine.Data.Geotechnics;
+using Deltares.DamEngine.TestHelpers.Factories;
 using KellermanSoftware.CompareNetObjects;
 
 namespace Deltares.DamEngine.Calculators.Tests.KernelWrappers.MacroStabilityCommon
@@ -99,16 +100,16 @@
         [TestCase("Benchmark 1-01b.wti")]
         [TestCase("Benchmark 2-04a.wti")]
         [Category(Categories.WorkInProgress)]
-        public void GivenWtiFileWhenFillingToDamEngineDataAndWritingBackToKernelDataThenTheResultingFileIsEqualToOriginalFile(string fileNameIn)
+        public void GivenWtiFileWhenFillingToDamEngineDataAndWritingBackToKernelDataThenTheKernelModelsAreEqual(string fileNameIn)
         {
             // Given Wti file
             string fullFileNameIn = Path.Combine(WtiFilesMap, fileNameIn);
 
             // When filling to DamEngine data 
             string xmlInput = File.ReadAllText(fullFileNameIn);
-            KernelModel kernelModel = WtiDeserializer.Deserialize(xmlInput);
+            KernelModel expectedKernelModel = WtiDeserializer.Deserialize(xmlInput);
             FillDamEngineFromWti fillDamEngineFromWti = new FillDamEngineFromWti();
-            fillDamEngineFromWti.FillDamProjectDataFromKernelModel(kernelModel);
+            fillDamEngineFromWti.FillDamProjectDataFromKernelModel(expectedKernelModel);
 
 
             // And writing back to kernel data
@@ -125,7 +126,7 @@
             string fullFileNameOut = Path.Combine(WtiFilesMap, fileNameOut);
             File.WriteAllText(fullFileNameOut, xmlOutput);
 
-            // Then the resulting file is equal to the original file
+            // Then the kernel models are equal
             // Assert.AreEqual(xmlInput, xmlOutput);
 
         }
@@ -168,7 +169,7 @@
         }
         private DamProjectData CreateExampleDamProjectData()
         {
-            return TestDataCreator.CreateExampleDamProjectData();
+            return FactoryForDamProjectData.CreateExampleDamProjectData();
         }
 
     }