Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DesignCalculatorTests.cs
===================================================================
diff -u -r3670 -r3792
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DesignCalculatorTests.cs	(.../DesignCalculatorTests.cs)	(revision 3670)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DesignCalculatorTests.cs	(.../DesignCalculatorTests.cs)	(revision 3792)
@@ -83,8 +83,8 @@
             string outputString = engineInterface.Run();
             var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
             // As DGeoStability is no longer available, the scenario cannot be prepared for the calculation (2 errors).
-            Assert.AreEqual(2, output.Results.CalculationMessages.Length);
-            Assert.IsTrue(output.Results.CalculationMessages[0].Message1.Contains("Het klaarzetten van deze berekening is mislukt."), output.Results.CalculationMessages[0].Message1);
+            Assert.AreEqual(1, output.Results.CalculationMessages.Length);
+            Assert.IsTrue(output.Results.CalculationMessages[0].Message1.Contains("Waarde kan niet null zijn."), output.Results.CalculationMessages[0].Message1);
         }
 
         [Test]
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DebuggingTest.cs
===================================================================
diff -u -r3667 -r3792
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DebuggingTest.cs	(.../DebuggingTest.cs)	(revision 3667)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DebuggingTest.cs	(.../DebuggingTest.cs)	(revision 3792)
@@ -42,7 +42,7 @@
         [Test, Ignore("This test is only used for debugging XML files generated by Dam UI")]
         public void DebugWithXmlInputFile()
         {
-            const string inputFilename = "DebuggingInputFile.xml";//"InputForDebugging.xml";
+            const string inputFilename = "AdaptionInputFile.xml";//"InputForDebugging.xml";
             string fullInputFilename = Path.Combine(mapTestFiles, inputFilename);
             Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.InvariantCulture;
             string inputString = File.ReadAllText(fullInputFilename);
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r3787 -r3792
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 3787)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 3792)
@@ -566,10 +566,10 @@
         }
 
         [Test, Category("Slow")]
-        public void TestRunFailedExpectCalculationMessageInSlopeAdaptionBeforeShoulderAdaption()
+        public void TestRunSlopeAdaptionBeforeShoulderAdaptionSucceeds()
         {
             // Inputfile was created with .\data\Dam\Benchmarks\Validatie SlopeAdaption\SlopeAdaption.damx
-            // Expected: RunFailed
+            // Expected: a valid calculation.
             const string calcDir = "TestRunFailedExpectCalculationMessageInSlopeAdaptionBeforeShoulderAdaption";
             if (Directory.Exists(calcDir))
             {
@@ -590,12 +590,9 @@
             Assert.IsNotNull(outputString);
 
             var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
-            Assert.IsNull(output.Results.CalculationResults);
+            Assert.IsNotNull(output.Results.CalculationResults);
             
-            Assert.AreEqual("Location 'Test1', subsoil scenario 'segment1_Test1', design scenario '1': " +
-                            "The calculation failed with error message " +
-                            "'Prepare of calculator for Macro Stability did not succeed'",
-                output.Results.CalculationMessages[0].Message1);
+            Assert.AreEqual(1.724, output.Results.CalculationResults.First().StabilityDesignResults.SafetyFactor, Tolerance);
         }
 
         [Test, Category("Slow")]
@@ -689,18 +686,18 @@
         }
 
         [Test]
-        public void TestDesignWithRiverLevelAboveDikeTopButBelowDthCanCalculate()
+        public void TestDesignWithRiverLevelAboveDikeTopButBelowDthCanNotCalculate()
         {
             var analysisType = "AdaptGeometry";
-            // Test just to see if calculation works in this case as it should do, result itself is irrelevant so just taken as is.
+            // Test just to see if calculation works in this case as it should do.
             var outputString = GetOutputStringForProject(analysisType);
 
             Assert.IsNotNull(outputString);
             var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
             Assert.IsNull(output.Results.CalculationResults, "No results available");
-            Assert.AreEqual("Location 'DWP_1', subsoil scenario 'DWP_1.sti', design scenario '1': " + 
-                            "The preparation for this calculation failed.",
-            output.Results.CalculationMessages[0].Message1);
+            // Note Bka: it already failed, but now for a different reason.porbably because DTH is not yet taken into account with testing/adjusting the data.
+            Assert.IsTrue(output.Results.CalculationMessages[0].Message1.Contains("Location 'DWP_1', subsoil scenario 'DWP_1.sti', design scenario '1': " +
+                            "The calculation failed with error message 'Value cannot be null."));
         }
 
         [Test]