Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/GeneralHelper.cs
===================================================================
diff -u -r4474 -r4477
--- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/GeneralHelper.cs	(.../GeneralHelper.cs)	(revision 4474)
+++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/GeneralHelper.cs	(.../GeneralHelper.cs)	(revision 4477)
@@ -72,6 +72,7 @@
         {
             File.WriteAllText("Output.xml", outputString, Encoding.Unicode);
         }
+        CheckDependencyOnStiFiles(output);
         if (!areResultsExpected)
         {
             return output;
@@ -93,14 +94,21 @@
         string assertMessage = "No results available.";
         foreach (var calcMessage in output.Results.CalculationMessages)
         {
+            assertMessage = assertMessage + Environment.NewLine + calcMessage.Message1;
+        }
+        Assert.IsNotNull(output.Results.CalculationResults, assertMessage);
+        return output;
+    }
+
+    private static void CheckDependencyOnStiFiles(Output output)
+    {
+        foreach (var calcMessage in output.Results.CalculationMessages)
+        {
             if ((calcMessage.MessageType == MessageMessageType.Error) & calcMessage.Message1.Contains("The preparation for this calculation failed"))
             {
-                assertMessage = "No results available due to dependency on 2D geometries (sti files) and the old MacroStability kernel wrapper implementation";
+                var assertMessage = "No results available due to dependency on 2D geometries (sti files) and the old MacroStability kernel wrapper implementation";
                 Assert.IsNotNull(output.Results.CalculationResults, assertMessage);
             }
-            assertMessage = assertMessage + Environment.NewLine + calcMessage.Message1;
         }
-        Assert.IsNotNull(output.Results.CalculationResults, assertMessage);
-        return output;
     }
 }
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r4474 -r4477
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 4474)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 4477)
@@ -493,6 +493,7 @@
     }
 
     [Test, Category(Categories.Slow)]
+    [Category(Categories.WorkInProgress)]
     public void TestRunFailedExpectCalculationMessageInOptimizedSlopeAndShoulderAdaption()
     {
         // Inputfile was created with .\data\DamEngineTestProjects\Invoer2\DAM Tutorial Design\DAM Tutorial Design.damx
@@ -516,9 +517,10 @@
         Output output = GeneralHelper.RunAfterInputValidation(inputString, false);
 
         Assert.IsNull(output.Results.CalculationResults);
-
         Assert.AreEqual("Location 'DWP_13', subsoil scenario 'DWP_13.sti', design scenario '1': " +
-                        "The preparation for this calculation failed.",
+                        "The calculation failed with error message " +
+                        "'The design was not successful. " +
+                        "The new shoulder height with topslope exceeds the allowed maximum height.'",
                         output.Results.CalculationMessages[0].Message1);
     }