Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs
===================================================================
diff -u -r2002 -r2004
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs	(.../FillDamFromXmlInputTests.cs)	(revision 2002)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs	(.../FillDamFromXmlInputTests.cs)	(revision 2004)
@@ -31,6 +31,7 @@
 using Deltares.DamEngine.Io;
 using Deltares.DamEngine.Io.XmlInput;
 using Deltares.DamEngine.TestHelpers;
+using Deltares.DamEngine.TestHelpers.Factories;
 using KellermanSoftware.CompareNetObjects;
 using NUnit.Framework;
 using Segment = Deltares.DamEngine.Data.General.Segment;
@@ -50,14 +51,14 @@
         public void CanWriteAndReadDamProjectDataToXml()
         {
             const string inputFilename = "InputFile.xml";
-            DamProjectData expectedDamProjectData = TestDataCreator.CreateExampleDamProjectData();
+            DamProjectData expectedDamProjectData = FactoryForDamProjectData.CreateExampleDamProjectData();
 
             // Write input file
             Input input = FillXmlInputFromDam.CreateInput(expectedDamProjectData);
             DamXmlSerialization.SaveInputAsXmlFile(inputFilename, input);
 
             // Init static that is to be loaded with not expected value
-            DamProjectCalculationSpecification.SelectedAnalysisType = TestDataCreator.NotExpectedAnalysisType;
+            DamProjectCalculationSpecification.SelectedAnalysisType = FactoryForDamProjectData.NotExpectedAnalysisType;
 
             // Load input file
             input = DamXmlSerialization.LoadInputFromXmlFile(inputFilename);
@@ -68,15 +69,15 @@
         [Test]
         public void CanWriteAndReadDamProjectDataToXmlString()
         {
-            DamProjectData expectedDamProjectData = TestDataCreator.CreateExampleDamProjectData();
+            DamProjectData expectedDamProjectData = FactoryForDamProjectData.CreateExampleDamProjectData();
 
             // Write input string
             string xmlString;
             Input input = FillXmlInputFromDam.CreateInput(expectedDamProjectData);
             xmlString = DamXmlSerialization.SaveInputAsXmlString(input);
 
             // Init static that is to be loaded with not expected value
-            DamProjectCalculationSpecification.SelectedAnalysisType = TestDataCreator.NotExpectedAnalysisType;
+            DamProjectCalculationSpecification.SelectedAnalysisType = FactoryForDamProjectData.NotExpectedAnalysisType;
 
             // Load input string
             input = DamXmlSerialization.LoadInputFromXmlString(xmlString);
@@ -97,7 +98,7 @@
 
         private void CompareDamProjectData(DamProjectData actual, DamProjectData expected)
         {
-            Assert.AreEqual(TestDataCreator.ExpectedAnalysisType, DamProjectCalculationSpecification.SelectedAnalysisType);
+            Assert.AreEqual(FactoryForDamProjectData.ExpectedAnalysisType, DamProjectCalculationSpecification.SelectedAnalysisType);
 
             var compare = new CompareLogic { Config = { MaxDifferences = 100 } };
             compare.Config.MembersToIgnore = new List<string>
Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Deltares.DamEngine.TestHelpers.csproj
===================================================================
diff -u -r1990 -r2004
--- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Deltares.DamEngine.TestHelpers.csproj	(.../Deltares.DamEngine.TestHelpers.csproj)	(revision 1990)
+++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Deltares.DamEngine.TestHelpers.csproj	(.../Deltares.DamEngine.TestHelpers.csproj)	(revision 2004)
@@ -43,7 +43,7 @@
     <Compile Include="Factories\FactoryForSoilProfiles.cs" />
     <Compile Include="Factories\FactoryForSurfaceLines.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TestDataCreator.cs" />
+    <Compile Include="Factories\FactoryForDamProjectData.cs" />
     <Compile Include="XmlAdapter.cs" />
   </ItemGroup>
   <ItemGroup>
Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/TestDataCreator.cs
===================================================================
diff -u -r2002 -r2004
--- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/TestDataCreator.cs	(.../TestDataCreator.cs)	(revision 2002)
+++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/TestDataCreator.cs	(.../Factories/FactoryForDamProjectData.cs)	(revision 2004)
@@ -30,9 +30,9 @@
 using Deltares.DamEngine.Data.Geotechnics;
 using Deltares.DamEngine.Interface;
 
-namespace Deltares.DamEngine.TestHelpers
+namespace Deltares.DamEngine.TestHelpers.Factories
 {
-    public class TestDataCreator
+    public class FactoryForDamProjectData
     {
         public const AnalysisType ExpectedAnalysisType = AnalysisType.AdaptGeometry;
         public const AnalysisType NotExpectedAnalysisType = AnalysisType.NoAdaption;
Fisheye: Tag 2004 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/TestDataCreator.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
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();
         }
 
     }