Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/PipingBlighTests.cs
===================================================================
diff -u -r1363 -r1404
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/PipingBlighTests.cs	(.../PipingBlighTests.cs)	(revision 1363)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/PipingBlighTests.cs	(.../PipingBlighTests.cs)	(revision 1404)
@@ -179,7 +179,7 @@
             string outputString = engineInterface.Run();
             var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
             Assert.AreEqual(2, output.Results.CalculationMessages.Length);
-            Assert.AreEqual("Location 101, subsoil scenario 'segment1_1D1', design scenario '1': " +
+            Assert.AreEqual("Location '101', subsoil scenario 'segment1_1D1', design scenario '1': " +
                             "The calculation failed with error message " +
                             "'The design was not successful. " +
                             "The new shoulder length is too large to fit in the current surface line.'",
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r1403 -r1404
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 1403)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 1404)
@@ -777,7 +777,7 @@
         [TestCase("TestStabInwardsBishopDesignSequential", "Bishop", "SlopeAdaptionBeforeShoulderAdaption", CalculationResult.Succeeded, 1.444, 39.081, 67.577, 45.387, 2.799, 5, "")]
         [TestCase("TestStabInwardsBishopDesignOptimized", "Bishop", "OptimizedSlopeAndShoulderAdaption", CalculationResult.Succeeded, 1.412, 50.236, 67.077, 43.760, 3.889, 4, "")]
         [TestCase("TestStabInwardsUpliftVanDesignSequential", "UpliftVan", "SlopeAdaptionBeforeShoulderAdaption", CalculationResult.Succeeded, 1.414, 39.243, 73.587, 50.285, 3.465, 7, "")]
-        [TestCase("TestStabInwardsUpliftVanDesignOptimized", "UpliftVan", "OptimizedSlopeAndShoulderAdaption", CalculationResult.RunFailed, 1.156, 39.514, 66.926, 36.150, 0.0, 4, "FAIL: The new shoulder height with topslope exceeds the allowed maximum height.")]
+        [TestCase("TestStabInwardsUpliftVanDesignOptimized", "UpliftVan", "OptimizedSlopeAndShoulderAdaption", CalculationResult.RunFailed, 1.156, 39.514, 66.926, 36.150, 0.0, 4, "The new shoulder height with topslope exceeds the allowed maximum height.")]
         public void CanPerformStabilityInwardsDesignTutorialDesignOptimizedSlopeAndShoulderAdaption_OneLocation(
             string calcDir, string stabilityModel, string designStrategy, 
             CalculationResult calculationResult, double expectedSafetyFactor,