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>