Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r4483 -r4495
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 4483)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 4495)
@@ -88,10 +88,8 @@
         var engineInterface = new EngineInterface(inputString);
         Assert.IsNotNull(engineInterface.DamProjectData);
 
-        string outputString = engineInterface.Run();
-
-        Assert.IsNotNull(outputString);
-        Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
+       Output output = GeneralHelper.RunAfterInputValidation(inputString);
+       
         Assert.IsNotNull(output.Results.CalculationResults, "No results available");
         Assert.AreEqual(1.282, output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, tolerance);
     }
@@ -696,9 +694,12 @@
         // Test just to see if calculation works in this case as it should do.
         Output output = GetOutputStringForProject(analysisType);
         
-        // Note Bka: it already failed, but now for a different reason.Probably because DTH is not yet taken into account with testing/adjusting the data.
+        // Note Bka: it already failed, with message "The preparation for this calculation failed".
+        // Now for a different reason. Probably 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."));
+        Assert.IsTrue(output.Results.CalculationMessages[0].Message1.Contains("Location 'DWP_1', subsoil scenario 'DWP_1.sti', design scenario '1': " + 
+                                                                              "The preparation for this calculation failed."));
     }
 
     [Test]
Index: DamEngine/trunk/doc/Work/DAMEngine_OverviewIntegrationTests.xlsx
===================================================================
diff -u -r4471 -r4495
Binary files differ