Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/CheckLargeResultsSets.cs
===================================================================
diff -u -r5729 -r6274
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/CheckLargeResultsSets.cs	(.../CheckLargeResultsSets.cs)	(revision 5729)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/CheckLargeResultsSets.cs	(.../CheckLargeResultsSets.cs)	(revision 6274)
@@ -110,7 +110,7 @@
             {
                 Assert.Multiple(() =>
                 {
-                    Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.312).Within(tolerance));
+                    Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.311).Within(tolerance));
                     Assert.That(designResult.ScenarioName, Is.EqualTo("3"));
                     Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.00).Within(tol2Digits));
                 });
@@ -121,7 +121,7 @@
             {
                 Assert.Multiple(() =>
                 {
-                    Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.290).Within(tolerance));
+                    Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.204).Within(tolerance));
                     Assert.That(designResult.ScenarioName, Is.EqualTo("4"));
                     Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.52).Within(tol2Digits));
                 });
@@ -132,7 +132,7 @@
             {
                 Assert.Multiple(() =>
                 {
-                    Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.229).Within(tolerance));
+                    Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.203).Within(tolerance));
                     Assert.That(designResult.ScenarioName, Is.EqualTo("3"));
                     Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.00).Within(tol2Digits));
                 });
@@ -143,7 +143,7 @@
             {
                 Assert.Multiple(() =>
                 {
-                    Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.229).Within(tolerance));
+                    Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.203).Within(tolerance));
                     Assert.That(designResult.ScenarioName, Is.EqualTo("4"));
                     Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits));
                 });
@@ -154,7 +154,7 @@
             {
                 Assert.Multiple(() =>
                 {
-                    Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.390).Within(tolerance));
+                    Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.369).Within(tolerance));
                     Assert.That(designResult.ScenarioName, Is.EqualTo("3"));
                     Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.00).Within(tol2Digits));
                 });
@@ -165,7 +165,7 @@
             {
                 Assert.Multiple(() =>
                 {
-                    Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.388).Within(tolerance));
+                    Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.366).Within(tolerance));
                     Assert.That(designResult.ScenarioName, Is.EqualTo("4"));
                     Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits));
                 });
@@ -176,7 +176,7 @@
             {
                 Assert.Multiple(() =>
                 {
-                    Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(9.367).Within(tolerance));
+                    Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(8.437).Within(tolerance));
                     Assert.That(designResult.ScenarioName, Is.EqualTo("3"));
                     Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.03).Within(tol2Digits));
                 });
@@ -187,7 +187,7 @@
             {
                 Assert.Multiple(() =>
                 {
-                    Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(9.340).Within(tolerance));
+                    Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(8.437).Within(tolerance));
                     Assert.That(designResult.ScenarioName, Is.EqualTo("4"));
                     Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.57).Within(tol2Digits));
                 });
@@ -198,7 +198,7 @@
             {
                 Assert.Multiple(() =>
                 {
-                    Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.336).Within(tolerance));
+                    Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.308).Within(tolerance));
                     Assert.That(designResult.ScenarioName, Is.EqualTo("3"));
                     Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.03).Within(tol2Digits));
                 });
@@ -220,7 +220,7 @@
             {
                 Assert.Multiple(() =>
                 {
-                    Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.524).Within(tolerance));
+                    Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.511).Within(tolerance));
                     Assert.That(designResult.ScenarioName, Is.EqualTo("3"));
                     Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.03).Within(tol2Digits));
                 });
@@ -231,7 +231,7 @@
             {
                 Assert.Multiple(() =>
                 {
-                    Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.518).Within(tolerance));
+                    Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.484).Within(tolerance));
                     Assert.That(designResult.ScenarioName, Is.EqualTo("4"));
                     Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits));
                 });
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r6264 -r6274
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 6264)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 6274)
@@ -332,10 +332,9 @@
         });
     }
 
-    [Test, Category(Categories.Slow), Ignore("Work in progress")]
+    [Test, Category(Categories.Slow)]
     public void DesignBishopOptimizedSlopeAndShoulderAdaptionWithScenariosForHeadPL3CalculatesCorrect()
     {
-        // ToDo: When fixed, check if tutorialStability2D can be used instead of next xml file
         const string inputFilename = "InputFileMultiCoreTestForScenarioAdaption.xml";
         string fullInputFilename = Path.Combine(mapTestFiles, inputFilename);
         Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
@@ -358,14 +357,13 @@
         Assert.Multiple(() =>
         {
             Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(18));
-            Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(1336));
             int resultsFound = CheckLargeResultsSets.CheckResultsDesignBishopAdaptionWithScenariosForHeadPl3CalculatesCorrect(
                 output.Results.CalculationResults);
             Assert.That(resultsFound, Is.EqualTo(11));
         });
     }
 
-    [Test, Category(Categories.Slow), Ignore("Work in progress")]
+    [Test, Category(Categories.Slow)]
     public void TestRunSlopeAdaptionBeforeShoulderAdaptionSucceeds()
     {
         // Input file was created with .\data\Dam\Benchmarks\Validatie SlopeAdaption\SlopeAdaption.damx
@@ -378,15 +376,14 @@
 
         Directory.CreateDirectory(calcDir);
 
-        // ToDo: When fixed, check if tutorialStability2D can be used instead of next xml file
         const string fileName = @"TestFiles\ValidatieSlopeAdaption.xml";
         string inputString = File.ReadAllText(fileName);
         inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used
         inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
 
         Output output = GeneralHelper.RunAfterInputValidation(inputString);
 
-        Assert.That(output.Results.CalculationResults.First().StabilityDesignResults.SafetyFactor, Is.EqualTo(1.366).Within(tolerance));
+        Assert.That(output.Results.CalculationResults.First().StabilityDesignResults.SafetyFactor, Is.EqualTo(2.062).Within(tolerance));
     }
 
     [Test]