Index: dam clients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs
===================================================================
diff -u -r774 -r794
--- dam clients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs	(.../FillDamUiFromXmlOutputTests.cs)	(revision 774)
+++ dam clients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs	(.../FillDamUiFromXmlOutputTests.cs)	(revision 794)
@@ -70,7 +70,7 @@
         public void SimpleTestPiping()
         {
             var inputProjectData = CreateInputProjectDataForPiping();
-            var output = CreateTestOutput(true);
+            var output = CreateTestOutputForPiping();
             
             const string inputFilename = "OutputFilePiping.xml";
             var combinedDamProjectData = FillDamUiFromXmlOutput.AddOutputToDamProjectData(inputProjectData, output);
@@ -126,7 +126,7 @@
         public void SimpleTestStabilityInside()
         {
             var inputProjectData = CreateInputProjectDataForStability();
-            var output = CreateTestOutput(false);
+            var output = CreateTestOutputForStability();
 
             const string inputFilename = "OutputFileStability.xml";
             var combinedDamProjectData = FillDamUiFromXmlOutput.AddOutputToDamProjectData(inputProjectData, output);
@@ -248,8 +248,33 @@
             return project;
         }
 
-        private Output CreateTestOutput(bool forPiping)
+        private Output CreateTestOutputForPiping()
         {
+            var output = CreateTestOutput();
+            for (int i = 0; i < 4; i++)
+            {
+                var surfaceline = CreateSurfaceLine();
+                var upliftSituation = CreateUpliftSituation(i);
+                var pipingdesignResults = CreateDesignResultPiping(i, surfaceline, upliftSituation);
+                output.Results.CalculationResults.DesignResults[i].PipingDesignResults = pipingdesignResults;
+            }
+            return output;
+        }
+
+        private Output CreateTestOutputForStability()
+        {
+            var output = CreateTestOutput();
+            for (int i = 0; i < 4; i++)
+            {
+                var surfaceline = CreateSurfaceLine();
+                var upliftSituation = CreateUpliftSituation(i);
+                var stabilityResults = CreateDesignResultStability(i, surfaceline, upliftSituation);
+                output.Results.CalculationResults.DesignResults[i].StabilityDesignResults = stabilityResults;
+            }
+            return output;
+        }
+        private Output CreateTestOutput()
+        {
             var output = new Output();
             output.Results = new OutputResults();
             output.Results.CalculationResults = new CalculationResults();
@@ -263,64 +288,68 @@
                     ProfileName = "Profile " + (i + 1).ToString(),
                     CalculationResult = 1 * i
                 };
-                var surfaceline = CreateSurfaceLine();
-
-                var upliftSituation = new UpliftSituation
-                {
-                    IsUplift = true,
-                    Pl3HeadAdjusted = 0.2 * i,
-                    Pl3LocationXMinUplift = 2.2 * i,
-                    Pl3MinUplift = 0.7 * i,
-                    Pl4HeadAdjusted = 0.4 * i,
-                    Pl4LocationXMinUplift = 4.4 * i,
-                    Pl4MinUplift = 4.7 * i
-                };
-                
-                if (forPiping)
-                {
-                    var pipingdesignResults = new DesignResultPipingDesignResults
-                    {
-                        ResultMessage = "no run made",
-                        UpliftFactorSpecified = true,
-                        UpliftFactor = 1.3 * i,
-                        HeaveFactorSpecified = true,
-                        HeaveFactor = 1.1 * i,
-                        BlighFactorSpecified = true,
-                        BlighFactor = 1.03 * i,
-                        BlighHcriticalSpecified = true,
-                        BlighHcritical = 0.4,
-                        ExitPointXSpecified = true,
-                        ExitPointX = 34.21,
-                        RedesignedSurfaceLine = surfaceline,
-                        UpliftSituation = upliftSituation
-                    };
-                    desResult.PipingDesignResults = pipingdesignResults;
-                }
-                else
-                {
-                    var stabilityResults = new DesignResultStabilityDesignResults
-                    {
-                        ResultMessage = "aok",
-                        SafetyFactor = 1.2 * i,
-                        SafetyFactorSpecified = true,
-                        NumberOfIterationsSpecified = true,
-                        NumberOfIterations = 1 * i,
-                        Zone1SafetyFactorSpecified = true,
-                        Zone1SafetyFactor = 1.1 * i,
-                        Zone1EntryPointXSpecified = true,
-                        Zone1EntryPointX = 2.2 * i,
-                        Zone2ExitPointXSpecified = true,
-                        Zone2ExitPointX = 3.3 * i,
-                        RedesignedSurfaceLine = surfaceline,
-                        UpliftSituation = upliftSituation
-                    };
-                    desResult.StabilityDesignResults = stabilityResults;
-                }
                 output.Results.CalculationResults.DesignResults[i] = desResult;
             }
             return output;
         }
 
+        private static UpliftSituation CreateUpliftSituation(int i)
+        {
+            var upliftSituation = new UpliftSituation
+            {
+                IsUplift = true,
+                Pl3HeadAdjusted = 0.2 * i,
+                Pl3LocationXMinUplift = 2.2 * i,
+                Pl3MinUplift = 0.7 * i,
+                Pl4HeadAdjusted = 0.4 * i,
+                Pl4LocationXMinUplift = 4.4 * i,
+                Pl4MinUplift = 4.7 * i
+            };
+            return upliftSituation;
+        }
+
+        private static DesignResultPipingDesignResults CreateDesignResultPiping(int i, SurfaceLine surfaceline, UpliftSituation upliftSituation)
+        {
+            var pipingdesignResults = new DesignResultPipingDesignResults
+            {
+                ResultMessage = "no run made",
+                UpliftFactorSpecified = true,
+                UpliftFactor = 1.3 * i,
+                HeaveFactorSpecified = true,
+                HeaveFactor = 1.1 * i,
+                BlighFactorSpecified = true,
+                BlighFactor = 1.03 * i,
+                BlighHcriticalSpecified = true,
+                BlighHcritical = 0.4,
+                ExitPointXSpecified = true,
+                ExitPointX = 34.21,
+                RedesignedSurfaceLine = surfaceline,
+                UpliftSituation = upliftSituation
+            };
+            return pipingdesignResults;
+        }
+
+        private static DesignResultStabilityDesignResults CreateDesignResultStability(int i, SurfaceLine surfaceline, UpliftSituation upliftSituation)
+        {
+            var stabilityResults = new DesignResultStabilityDesignResults
+            {
+                ResultMessage = "aok",
+                SafetyFactor = 1.2 * i,
+                SafetyFactorSpecified = true,
+                NumberOfIterationsSpecified = true,
+                NumberOfIterations = 1 * i,
+                Zone1SafetyFactorSpecified = true,
+                Zone1SafetyFactor = 1.1 * i,
+                Zone1EntryPointXSpecified = true,
+                Zone1EntryPointX = 2.2 * i,
+                Zone2ExitPointXSpecified = true,
+                Zone2ExitPointX = 3.3 * i,
+                RedesignedSurfaceLine = surfaceline,
+                UpliftSituation = upliftSituation
+            };
+            return stabilityResults;
+        }
+
         private static SurfaceLine CreateSurfaceLine()
         {
             var surfaceline = new SurfaceLine