Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r6029 -r6086
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 6029)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 6086)
@@ -70,7 +70,7 @@
 
         Assert.Multiple(() =>
         {
-            Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.161).Within(tolerance));
+            Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.165).Within(tolerance));
 
             // NumberOfIterations=0
             Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.NumberOfIterations, Is.EqualTo(0));
@@ -129,7 +129,7 @@
         DesignResult result = output.Results.CalculationResults[0];
         Assert.Multiple(() =>
         {
-            Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.245).Within(tolerance));
+            Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.248).Within(tolerance));
             Assert.That(result.StabilityDesignResults.UpliftSituation, Is.Not.Null);
         });
         Assert.Multiple(() =>
@@ -142,7 +142,7 @@
         result = output.Results.CalculationResults[1];
         Assert.Multiple(() =>
         {
-            Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.161).Within(tolerance));
+            Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.165).Within(tolerance));
             Assert.That(result.StabilityDesignResults.UpliftSituation, Is.Not.Null);
             Assert.That(result.StabilityDesignResults.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan));
             Assert.That(result.BaseFileName, Is.EqualTo("Loc(DWP_1)_Sce(1)_Pro(DWP_1_stix)"));
@@ -151,7 +151,7 @@
         result = output.Results.CalculationResults[2];
         Assert.Multiple(() =>
         {
-            Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.161).Within(tolerance));
+            Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.165).Within(tolerance));
             Assert.That(result.StabilityDesignResults.UpliftSituation, Is.Not.Null);
             Assert.That(result.StabilityDesignResults.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan));
             Assert.That(result.BaseFileName, Is.EqualTo("Loc(DWP_1)_Sce(1)_Pro(DWP_1_stix)"));
@@ -202,7 +202,7 @@
         result = output.Results.CalculationResults[1].StabilityDesignResults;
         Assert.Multiple(() =>
         {
-            Assert.That(result.SafetyFactor, Is.EqualTo(1.387).Within(tolerance));
+            Assert.That(result.SafetyFactor, Is.EqualTo(1.421).Within(tolerance));
             Assert.That(result.UpliftSituation, Is.Not.Null);
             Assert.That(result.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan));
         });
@@ -315,7 +315,7 @@
         Assert.Multiple(() =>
         {
             // No Zone
-            Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.338).Within(tolerance));
+            Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.318).Within(tolerance));
             Assert.That(result.LocationName, Is.EqualTo("DWP_10_1"));
             Assert.That(result.ProfileName, Is.EqualTo("DWP_10.stix"));
             Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded));
@@ -325,7 +325,7 @@
         Assert.Multiple(() =>
         {
             // Forbidden Zone, factor = 0.2
-            Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.866).Within(tolerance));
+            Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.835).Within(tolerance));
             Assert.That(result.LocationName, Is.EqualTo("DWP_10_4"));
             Assert.That(result.ProfileName, Is.EqualTo("DWP_10.stix"));
             Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded));
@@ -438,7 +438,7 @@
         if (redesignedSurfaceLine != null)
         {
             double? actualDikeLength = redesignedSurfaceLine.GetDikeLength();
-            GeometryPoint pointShoulderBaseInside = redesignedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside);
+            Point2D pointShoulderBaseInside = redesignedSurfaceLine.CharacteristicPoints.GetPoint2D(CharacteristicPointType.ShoulderTopInside);
             Assert.Multiple(() =>
             {
                 Assert.That(actualDikeLength, Is.EqualTo(expectedDikeLength).Within(tolerance));
@@ -477,15 +477,15 @@
         Assert.That(output.Results.CalculationMessages[0].Message1, Is.EqualTo("Geen ondergrond profielen beschikbaar voor locatie '12-2_027'"));
     }
 
-    [Test, Category(Categories.WorkInProgress)]
+    [Test]
     public void TestAdaptWithRiverLevelAboveDikeTopButBelowDikeTableHeightCanCalculate()
     {
         const string analysisType = "AdaptGeometry";
         // Test just to see if calculation works in this case as it should do.
         Output output = GetOutputStringForProject(analysisType, true);
 
         Assert.That(output.Results.CalculationResults, Is.Not.Null, "No results available");
-        Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.356).Within(0.0005));
+        Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.259).Within(0.0005));
     }
 
     [Test]
@@ -839,11 +839,11 @@
     /// </summary>
     /// <param name="trafficLoadDegreeOfConsolidation"></param>
     /// <param name="expectedSafetyFactor"></param>
-    [Test, Category(Categories.WorkInProgress)]
-    [TestCase(double.NaN, 1.245)] // DoC is unchanged
-    [TestCase(0, 1.245)]
-    [TestCase(50, 1.273)]
-    [TestCase(100, 1.301)]
+    [Test]
+    [TestCase(double.NaN, 1.248)] // DoC is unchanged
+    [TestCase(0, 1.248)]
+    [TestCase(50, 1.276)]
+    [TestCase(100, 1.305)]
     public void GivenStabilityDesignTutorial_WhenCalculatingWithDifferentDegreeOfConsolidation_ThenReturnsADifferentSafetyFactor(double trafficLoadDegreeOfConsolidation, double expectedSafetyFactor)
     {
         const string calcDir = "TestEffectOfTrafficLoadDegreeOfConsolidation";
@@ -875,7 +875,7 @@
 
     /// <summary>Test for different segmentFailureMechanismType</summary>
     /// <param name="segmentFailureMechanismType">The soil probabilities are set tot the specified segmentFailureMechanismType</param>
-    [Test, Category(Categories.WorkInProgress)]
+    [Test]
     [TestCase(ConversionHelper.InputSegmentFailureMechanismStability)]
     [TestCase(ConversionHelper.InputSegmentFailureMechanismAll)]
     public void TestRunMacroStabilityTutorialDesignBishop(int segmentFailureMechanismType)
@@ -907,7 +907,7 @@
 
         Assert.Multiple(() =>
         {
-            Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.245).Within(tolerance));
+            Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.248).Within(tolerance));
 
             // NumberOfIterations=0
             Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.NumberOfIterations, Is.EqualTo(0));