Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs
===================================================================
diff -u -r1144 -r1149
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs	(.../DamMacroStabilityInwardsKernelWrapperTests.cs)	(revision 1144)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs	(.../DamMacroStabilityInwardsKernelWrapperTests.cs)	(revision 1149)
@@ -92,9 +92,7 @@
             }
             Directory.CreateDirectory(workingDir);
 
-            var line = FactoryForSurfaceLines.CreateSurfaceLineTutorial1();
-            var location = new Location();
-            var scenario = DamMacroStabilityTestHelper.CreateScenarioForLocation(location, line);
+            var location = DamMacroStabilityTestHelper.CreateLocation(FactoryForSurfaceLines.CreateSurfaceLineTutorial1());
             location.StabilityOptions = new StabilityOptions();
             location.StabilityOptions.TrafficLoad = 10.0;
             location.StabilityOptions.SoilGeometries2DPath = geometryPath;
@@ -151,7 +149,7 @@
             }
 
             // Fill the design results
-            var designScenario = DamMacroStabilityTestHelper.CreateScenarioForLocation(damKernelInput.Location, damKernelInput.Location.SurfaceLine);
+            var designScenario = DamMacroStabilityTestHelper.CreateScenario(damKernelInput.Location);
             List<DesignResult> results;
             kernelWrapper.PostProcess(damKernelInput, damMacroStabilityOutput, designScenario, "", out results);
             Assert.AreEqual(expectedOutputValues.Count, results.Count);
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityTestHelper.cs
===================================================================
diff -u -r1001 -r1149
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityTestHelper.cs	(.../DamMacroStabilityTestHelper.cs)	(revision 1001)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityTestHelper.cs	(.../DamMacroStabilityTestHelper.cs)	(revision 1149)
@@ -32,21 +32,43 @@
 {
     public static class DamMacroStabilityTestHelper
     {
-        public static DesignScenario CreateScenarioForLocation(Location location, SurfaceLine2 surfaceLine)
+        /// <summary>
+        /// Creates the scenario for testigg.
+        /// </summary>
+        /// <param name="location">The location.</param>
+        /// <returns></returns>
+        public static DesignScenario CreateScenario(Location location)
         {
-            DesignScenario scenario = new DesignScenario();
-            scenario.Location = location;
-            scenario.Location.DamType = DamType.Regional;
-            scenario.Location.Name = "LocationName";
-            scenario.Location.DikeEmbankmentMaterial = "OB1";
-            scenario.Location.ShoulderEmbankmentMaterial = "OB2";
-            scenario.Location.SoilList = CreateSoilList();
-            scenario.LocationScenarioID = "ScenarioID";
-            scenario.Location.SurfaceLine = surfaceLine;
+            DesignScenario scenario = new DesignScenario
+            {
+                Location = location,
+                LocationScenarioID = "ScenarioID"
+            };
             return scenario;
         }
-        private static SoilList CreateSoilList()
+        /// <summary>
+        /// Creates the location for testing.
+        /// </summary>
+        /// <param name="surfaceLine">The surface line.</param>
+        /// <returns></returns>
+        public static Location CreateLocation(SurfaceLine2 surfaceLine)
         {
+            Location location = new Location();
+            location.DamType = DamType.Regional;
+            location.Name = "LocationName";
+            location.DikeEmbankmentMaterial = "OB1";
+            location.ShoulderEmbankmentMaterial = "OB2";
+            location.SoilList = CreateSoilList();
+            location.SurfaceLine = surfaceLine;
+            return location;
+        }
+
+        /// <summary>
+        /// Creates the soil list for the tests.
+        /// </summary>
+        /// <returns></returns>
+        public static SoilList CreateSoilList()
+        {
             var soilList = new SoilList();
             var s1 = new Soil("DKN5")
             {
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityHorizontalBalance/DamMacroStabilityHorizontalBalanceKernelWrapperTests.cs
===================================================================
diff -u -r1146 -r1149
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityHorizontalBalance/DamMacroStabilityHorizontalBalanceKernelWrapperTests.cs	(.../DamMacroStabilityHorizontalBalanceKernelWrapperTests.cs)	(revision 1146)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityHorizontalBalance/DamMacroStabilityHorizontalBalanceKernelWrapperTests.cs	(.../DamMacroStabilityHorizontalBalanceKernelWrapperTests.cs)	(revision 1149)
@@ -92,8 +92,8 @@
             }
 
             var line = FactoryForSurfaceLines.CreateSurfaceLineTutorial1();
-            var location = new Location();
-            var scenario = DamMacroStabilityTestHelper.CreateScenarioForLocation(location, line);
+            var location = DamMacroStabilityTestHelper.CreateLocation(line);
+            var scenario = DamMacroStabilityTestHelper.CreateScenario(location);
             scenario.RiverLevel = 4.0;
             scenario.Location.PolderLevel = -1.0;
             scenario.Location.StabilityOptions = new StabilityOptions
@@ -261,7 +261,7 @@
             var soilDbName = Path.Combine(testFolder, "soilmaterials.mdb");
             var soilGeometry2DName = "1D1.sti";
             var line = FactoryForSurfaceLines.CreateSurfaceLineTutorial1();
-            var location = new Location();
+            var location = DamMacroStabilityTestHelper.CreateLocation(line);
             if (realOut)
             {
                 soilDbName = Path.Combine(absoluteFolder, "soilmaterialsOutwards.mdb");
@@ -273,7 +273,7 @@
                 location.PolderLevel = -11;
             }
 
-            var scenario = DamMacroStabilityTestHelper.CreateScenarioForLocation(location, line);
+            var scenario = DamMacroStabilityTestHelper.CreateScenario(location);
             scenario.Location.StabilityOptions = new StabilityOptions
             {
                 TrafficLoad = 10.0,
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/MStabXmlDocTests.cs
===================================================================
diff -u -r1137 -r1149
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/MStabXmlDocTests.cs	(.../MStabXmlDocTests.cs)	(revision 1137)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/MStabXmlDocTests.cs	(.../MStabXmlDocTests.cs)	(revision 1149)
@@ -61,8 +61,8 @@
             }
 
             var line = FactoryForSurfaceLines.CreateSurfaceLineTutorial1();
-            var location = new Location();
-            var scenario = DamMacroStabilityTestHelper.CreateScenarioForLocation(location, line);
+            var location = DamMacroStabilityTestHelper.CreateLocation(line);
+            var scenario = DamMacroStabilityTestHelper.CreateScenario(location);
             scenario.Location.StabilityOptions = new StabilityOptions();
             scenario.Location.StabilityOptions.TrafficLoad = 10.0;
             scenario.Location.StabilityOptions.MinimalCircleDepth = 1.0;
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs
===================================================================
diff -u -r1145 -r1149
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs	(.../DamMacroStabilityOutwardsKernelWrapperTests.cs)	(revision 1145)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs	(.../DamMacroStabilityOutwardsKernelWrapperTests.cs)	(revision 1149)
@@ -142,8 +142,9 @@
             Assert.IsNull(damMacroStabilityOutput.StabilityOutputItems[0].Zone2Results);
 
             // Fill the design results
+            var designScenario = DamMacroStabilityTestHelper.CreateScenario(damKernelInput.Location);
             List<DesignResult> results;
-            kernelWrapper.PostProcess(damKernelInput, damMacroStabilityOutput, null, "", out results);
+            kernelWrapper.PostProcess(damKernelInput, damMacroStabilityOutput, designScenario, "", out results);
             Assert.AreEqual(2.935, results[0].StabilityDesignResults.SafetyFactor, diff);
             Assert.AreEqual("", results[0].StabilityDesignResults.ResultMessage);
             Assert.AreEqual(CalculationResult.Succeeded, results[0].CalculationResult);
@@ -205,24 +206,17 @@
 
         private static DesignScenario CreateDesignScenario(Location location)
         {
-            var scenario = DamMacroStabilityTestHelper.CreateScenarioForLocation(location, location.SurfaceLine);
+            var scenario = DamMacroStabilityTestHelper.CreateScenario(location);
             scenario.Location.StabilityOptions = new StabilityOptions
             {
                 TrafficLoad = 10.0,
                 SoilGeometries2DPath = GetAbsoluteFolder(),
-                SoilDatabaseName = GetSoilDbName()
-            };
-            scenario.ModelFactors.RequiredSafetyFactorStabilityOuterSlope = 1.1;
-            scenario.ModelFactors.UpliftCriterionStability = 1.2;
+                SoilDatabaseName = Path.Combine(testFolder, "soilmaterials.mdb")
+
+        };
             return scenario;
         }
 
-        private static string GetSoilDbName()
-        {
-            var soilDbName = Path.Combine(testFolder, "soilmaterials.mdb");
-            return soilDbName;
-        }
-
         private static string GetAbsoluteFolder()
         {
             var absoluteFolder = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), testFolder));
@@ -231,19 +225,35 @@
 
         private static DamKernelInput CreateDamKernelInput(bool realOut = false)
         {
+            var absoluteFolder = GetAbsoluteFolder();
+            var soilDbName = Path.Combine(testFolder, "soilmaterials.mdb");
             var soilGeometry2DName = "1D1.sti";
             var surfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1();
-            var location = new Location();
+            var location = DamMacroStabilityTestHelper.CreateLocation(surfaceLine);
+            location.DamType = DamType.Regional;
+            location.Name = "LocationName";
+            location.DikeEmbankmentMaterial = "OB1";
+            location.ShoulderEmbankmentMaterial = "OB2";
+            location.SoilList = DamMacroStabilityTestHelper.CreateSoilList();
             location.SurfaceLine = surfaceLine;
+            location.ModelFactors.RequiredSafetyFactorStabilityOuterSlope = 1.1;
+            location.ModelFactors.UpliftCriterionStability = 1.2;
             if (realOut)
             {
+                soilDbName = Path.Combine(absoluteFolder, "soilmaterialsOutwards.mdb");
                 soilGeometry2DName = "OutwardsZones.sti";
                 foreach (var characteristicPoint in surfaceLine.CharacteristicPoints)
                 {
                     characteristicPoint.Z = characteristicPoint.Z - 3;
                 }
                 location.PolderLevel = -11;
             }
+            location.StabilityOptions = new StabilityOptions
+            {
+                TrafficLoad = 10.0,
+                SoilGeometries2DPath = GetAbsoluteFolder(),
+                SoilDatabaseName = soilDbName
+            };
 
             var subSoilScenario = new SoilGeometryProbability
             {
@@ -451,17 +461,16 @@
                 Directory.Delete(workingDir, true);
             }
 
-            var line = FactoryForSurfaceLines.CreateSurfaceLineTutorial1();
-            var location = new Location();
-            var scenario = DamMacroStabilityTestHelper.CreateScenarioForLocation(location, line);
-            scenario.Location.StabilityOptions = new StabilityOptions
+            var surfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1();
+            var location = DamMacroStabilityTestHelper.CreateLocation(surfaceLine);
+            location.StabilityOptions = new StabilityOptions
             {
                 TrafficLoad = 10.0,
                 SoilGeometries2DPath = "",
                 SoilDatabaseName = soilDbName
             };
-            scenario.ModelFactors.RequiredSafetyFactorStabilityInnerSlope = 1.1;
-            scenario.ModelFactors.UpliftCriterionStability = 1.2;
+            location.ModelFactors.RequiredSafetyFactorStabilityInnerSlope = 1.1;
+            location.ModelFactors.UpliftCriterionStability = 1.2;
 
             var subSoilScenario = new SoilGeometryProbability
             {