Index: dam clients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs
===================================================================
diff -u -r754 -r774
--- dam clients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs	(.../FillDamUiFromXmlOutputTests.cs)	(revision 754)
+++ dam clients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs	(.../FillDamUiFromXmlOutputTests.cs)	(revision 774)
@@ -69,7 +69,7 @@
         [Test]
         public void SimpleTestPiping()
         {
-            var inputProjectData = CreateInputProjectData(true);
+            var inputProjectData = CreateInputProjectDataForPiping();
             var output = CreateTestOutput(true);
             
             const string inputFilename = "OutputFilePiping.xml";
@@ -125,7 +125,7 @@
         [Test]
         public void SimpleTestStabilityInside()
         {
-            var inputProjectData = CreateInputProjectData(false);
+            var inputProjectData = CreateInputProjectDataForStability();
             var output = CreateTestOutput(false);
 
             const string inputFilename = "OutputFileStability.xml";
@@ -181,27 +181,35 @@
             Assert.AreEqual(combinedDamProjectData.DesignCalculations[0].LocationName, actualDamProjectData.DesignCalculations[0].LocationName);
         }
 
-        private DamProjectData CreateInputProjectData(bool forPiping)
+        private DamProjectData CreateInputProjectDataForPiping()
         {
-            var project = new DamProjectData();
-            DamFailureMechanismeCalculationSpecification spec = null;
-            if (forPiping)
+            var spec = new DamFailureMechanismeCalculationSpecification
             {
-                spec = new DamFailureMechanismeCalculationSpecification
-                {
-                    FailureMechanismSystemType = FailureMechanismSystemType.Piping,
-                    PipingModelType = PipingModelType.Bligh
-                };
-            }
-            else
+                FailureMechanismSystemType = FailureMechanismSystemType.Piping,
+                PipingModelType = PipingModelType.Bligh
+            };
+            return CreateInputProjectData(spec);
+        }
+
+        private DamProjectData CreateInputProjectDataForStability()
+        {
+            var spec = new DamFailureMechanismeCalculationSpecification
             {
-                spec = new DamFailureMechanismeCalculationSpecification
+                FailureMechanismSystemType = FailureMechanismSystemType.StabilityInside,
+                CalculationModel = MStabModelType.Bishop
+            };
+            return CreateInputProjectData(spec);
+        }
+
+        private static DamProjectData CreateInputProjectData(DamFailureMechanismeCalculationSpecification spec)
+        {
+            var project = new DamProjectData
+            {
+                DamProjectCalculationSpecification =
                 {
-                    FailureMechanismSystemType = FailureMechanismSystemType.StabilityInside,
-                    CalculationModel = MStabModelType.Bishop
-                };
-            }
-            project.DamProjectCalculationSpecification.CurrentSpecification = spec;
+                    CurrentSpecification = spec
+                }
+            };
 
             project.WaterBoard.Dikes.Add(new Dike());
             var surfaceline = CreateSurfaceLine2();