Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r2193 -r2404
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 2193)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 2404)
@@ -146,9 +146,9 @@
 
             Assert.IsNotNull(outputString);
             var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
-            Assert.AreEqual(1.062, output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, tolerance);
-            // Zone1SafetyFactor=1.062
-            Assert.AreEqual(1.062, output.Results.CalculationResults[0].StabilityDesignResults.Zone1SafetyFactor, tolerance);
+            Assert.AreEqual(1.115, output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, tolerance);
+            // Zone1SafetyFactor=1.115
+            Assert.AreEqual(1.115, output.Results.CalculationResults[0].StabilityDesignResults.Zone1SafetyFactor, tolerance);
 
             // Zone1EntryPointX Local =39.3 Global=47.72
             Assert.AreEqual(39.3, output.Results.CalculationResults[0].StabilityDesignResults.Zone1EntryPointX, tolerance);
@@ -223,13 +223,13 @@
             Assert.AreEqual("Loc(DWP_1)_Sce(1)_Pro(DWP_1)", result.BaseFileName);
             // Uplift Van
             result = output.Results.CalculationResults[1];
-            Assert.AreEqual(1.062, result.StabilityDesignResults.SafetyFactor, tolerance);
+            Assert.AreEqual(1.115, result.StabilityDesignResults.SafetyFactor, tolerance);
             Assert.IsNotNull(result.StabilityDesignResults.UpliftSituation);
             Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, result.StabilityDesignResults.StabilityModelType);
             Assert.AreEqual("Loc(DWP_1)_Sce(1)_Pro(DWP_1)", result.BaseFileName);
             // Worst of Bishop and Uplift Van 
             result = output.Results.CalculationResults[2];
-            Assert.AreEqual(1.062, result.StabilityDesignResults.SafetyFactor, tolerance);
+            Assert.AreEqual(1.115, result.StabilityDesignResults.SafetyFactor, tolerance);
             Assert.IsNotNull(result.StabilityDesignResults.UpliftSituation);
             Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, result.StabilityDesignResults.StabilityModelType);
             Assert.AreEqual("Loc(DWP_1)_Sce(1)_Pro(DWP_1)", result.BaseFileName);
@@ -274,7 +274,7 @@
             Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.Bishop, result.StabilityModelType);
             // Uplift Van
             result = output.Results.CalculationResults[1].StabilityDesignResults;
-            Assert.AreEqual(0.547, result.SafetyFactor, tolerance);
+            Assert.AreEqual(0.574, result.SafetyFactor, tolerance);
             Assert.IsNotNull(result.UpliftSituation);
             Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, result.StabilityModelType);
             // Worst of Bishop and Uplift Van 
@@ -518,18 +518,18 @@
             Assert.AreEqual("6-4-1-A-1-F_3_s", output.Results.CalculationResults[2].ProfileName);
 
             var result = output.Results.CalculationResults[0];
-            // SafetyFactor=0.983 (lowest of zone 1 and 2)
-            Assert.AreEqual(0.983, result.StabilityDesignResults.SafetyFactor, tolerance);
+            // SafetyFactor=1.032 (lowest of zone 1 and 2)
+            Assert.AreEqual(1.032, result.StabilityDesignResults.SafetyFactor, tolerance);
 
-            // Zone1SafetyFactor=0.983
-            Assert.AreEqual(0.983, result.StabilityDesignResults.Zone1SafetyFactor, tolerance);
+            // Zone1SafetyFactor=1.032
+            Assert.AreEqual(1.032, result.StabilityDesignResults.Zone1SafetyFactor, tolerance);
             // Zone1EntryPointX=29.779
             Assert.AreEqual(29.779, result.StabilityDesignResults.Zone1EntryPointX, tolerance);
             // Zone1ExitPointX72.599=
             Assert.AreEqual(72.599, result.StabilityDesignResults.Zone1ExitPointX, tolerance);
 
-            // Zone2SafetyFactor=2.221
-            Assert.AreEqual(2.221, result.StabilityDesignResults.Zone2SafetyFactor, tolerance);
+            // Zone2SafetyFactor=2.332
+            Assert.AreEqual(2.332, result.StabilityDesignResults.Zone2SafetyFactor, tolerance);
             // Zone2EntryPointX=27.1
             Assert.AreEqual(27.1, result.StabilityDesignResults.Zone2EntryPointX, tolerance);
             // Zone2ExitPointX=72.524
@@ -542,11 +542,11 @@
 
             // test safety factor for other profiles
             result = output.Results.CalculationResults[1];
-            // SafetyFactor=1.811
-            Assert.AreEqual(1.811, result.StabilityDesignResults.SafetyFactor, tolerance);
+            // SafetyFactor=1.901
+            Assert.AreEqual(1.901, result.StabilityDesignResults.SafetyFactor, tolerance);
             result = output.Results.CalculationResults[2];
-            // SafetyFactor=1.591
-            Assert.AreEqual(1.591, result.StabilityDesignResults.SafetyFactor, tolerance);
+            // SafetyFactor=1.670
+            Assert.AreEqual(1.670, result.StabilityDesignResults.SafetyFactor, tolerance);
         }
 
         [Test, Category("Slow")]
@@ -637,8 +637,8 @@
             Assert.AreEqual("6-4-3-A-1-C_1_s", result.ProfileName);
             // Calculation Result
             Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult));
-            // SafetyFactor=2.413
-            Assert.AreEqual(2.413, result.StabilityDesignResults.SafetyFactor, tolerance);
+            // SafetyFactor=2.533
+            Assert.AreEqual(2.533, result.StabilityDesignResults.SafetyFactor, tolerance);
 
             result = output.Results.CalculationResults[1];
             Assert.AreEqual("6-4-3-A-1-C", result.LocationName);
@@ -653,16 +653,16 @@
             Assert.AreEqual("6-4-3-B-1-D_1_s", result.ProfileName);
             // Calculation Result
             Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult));
-            // SafetyFactor=2.471
-            Assert.AreEqual(2.471, result.StabilityDesignResults.SafetyFactor, tolerance);
+            // SafetyFactor=2.594
+            Assert.AreEqual(2.594, result.StabilityDesignResults.SafetyFactor, tolerance);
 
             result = output.Results.CalculationResults[3];
             Assert.AreEqual("6-4-3-B-1-D", result.LocationName);
             Assert.AreEqual("6-4-3-B-1-D_2_s", result.ProfileName);
             // Calculation Result
             Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult));
-            // SafetyFactor=3.157
-            Assert.AreEqual(3.157, result.StabilityDesignResults.SafetyFactor, tolerance);
+            // SafetyFactor=3.315
+            Assert.AreEqual(3.315, result.StabilityDesignResults.SafetyFactor, tolerance);
         }
 
         [Test, Category("Slow")]
@@ -819,8 +819,8 @@
         // Parameters: CalcDir - StabilityModel - DesignStrategy - CalculationResult - FoS - EntryPointX - ExitPointX - DikeLength - ShoulderHeight - Iterations - ResultMessage
         [TestCase("TestStabInwardsBishopDesignSequential", "Bishop", "SlopeAdaptionBeforeShoulderAdaption", CalculationResult.Succeeded, 1.444, 39.081, 67.577, 45.387, 2.799, 5, "")]
         [TestCase("TestStabInwardsBishopDesignOptimized", "Bishop", "OptimizedSlopeAndShoulderAdaption", CalculationResult.Succeeded, 1.412, 50.236, 67.077, 43.760, 3.889, 4, "")]
-        [TestCase("TestStabInwardsUpliftVanDesignSequential", "UpliftVan", "SlopeAdaptionBeforeShoulderAdaption", CalculationResult.Succeeded, 1.414, 39.243, 73.587, 50.285, 3.465, 7, "")]
-        [TestCase("TestStabInwardsUpliftVanDesignOptimized", "UpliftVan", "OptimizedSlopeAndShoulderAdaption", CalculationResult.RunFailed, 1.156, 39.514, 66.926, 36.150, 0.0, 4, "The new shoulder height with topslope exceeds the allowed maximum height.")]
+        [TestCase("TestStabInwardsUpliftVanDesignSequential", "UpliftVan", "SlopeAdaptionBeforeShoulderAdaption", CalculationResult.Succeeded, 1.4847, 39.243, 73.587, 50.285, 3.465, 7, "")]
+        [TestCase("TestStabInwardsUpliftVanDesignOptimized", "UpliftVan", "OptimizedSlopeAndShoulderAdaption", CalculationResult.RunFailed, 1.214, 39.514, 66.926, 36.150, 0.0, 4, "The new shoulder height with topslope exceeds the allowed maximum height.")]
         public void CanPerformStabilityInwardsDesignTutorialDesignOptimizedSlopeAndShoulderAdaption_OneLocation(
             string calcDir, string stabilityModel, string designStrategy, 
             CalculationResult calculationResult, double expectedSafetyFactor,