Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r5548 -r5558
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 5548)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 5558)
@@ -332,37 +332,7 @@
         });
     }
 
-    [Test, Ignore("This test does not give expected result. Fix in MWDAM-2473")]
-    [Category(Categories.Slow)]
-    [Category(Categories.WorkInProgress)]
-    public void TestRunFailedExpectCalculationMessageInOptimizedSlopeAndShoulderAdaption()
-    {
-        // Inputfile was created with DAM Tutorial Design.damx
-        // Select dwp 13 and Adapt geometry
-        // Expected: RunFailed
-        const string calcDir = "TestRunFailedExpectCalculationMessageInOptimizedSlopeAndShoulderAdaption";
-        if (Directory.Exists(calcDir))
-        {
-            Directory.Delete(calcDir, true); // delete previous results
-        }
 
-        Directory.CreateDirectory(calcDir);
-
-        // ToDo: When fixed, check if tutorialStability2D can be used instead of next xml file
-        const string fileName = @"TestFiles\MacroStabilityRunFailedExpectCalculationMessage.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, false);
-
-        Assert.That(output.Results.CalculationMessages[0].Message1,
-                    Is.EqualTo("Location 'DWP_13', subsoil scenario 'DWP_13.stix', design scenario '1': " +
-                               "The calculation failed with error message " +
-                               "'The design was not successful. " +
-                               "The new shoulder height with topslope exceeds the allowed maximum height.'"));
-    }
-
     [Test, Category(Categories.Slow), Ignore("Work in progress")]
     public void DesignBishopOptimizedSlopeAndShoulderAdaptionWithScenariosForHeadPL3CalculatesCorrect()
     {
@@ -968,8 +938,9 @@
     [TestCase("DWP_1", "OptimizedSlopeAndShoulderAdaption",CalculationResult.Succeeded, 1.4, 1.589, 4)]
     [TestCase("DWP_2", "SlopeAdaptionBeforeShoulderAdaption", CalculationResult.RunFailed, 1.5, 1.364, 14)]
     [TestCase("DWP_2", "OptimizedSlopeAndShoulderAdaption", CalculationResult.RunFailed, 1.5, 1.114, 17)]
+    [TestCase("DWP_13", "OptimizedSlopeAndShoulderAdaption", CalculationResult.RunFailed, 1.5, 0.976, 23, "The characteristic points of the surfaceline are not ascending in X-direction.")]
     public void GivenTutorialDesign_WhenSpecifiedLocationRunWithGeometryAdaption_ThenGivesExpectedResults(string locationId, string designMethod,
-         CalculationResult calculationResult, double requiredSafetyFactor, double actualSafetyFactor, int iterationCount)
+         CalculationResult calculationResult, double requiredSafetyFactor, double actualSafetyFactor, int iterationCount, string errorMessage= "")
     {
         // Create xml with Tutorial project
         // Select location DWP_1
@@ -1003,6 +974,9 @@
             if (calculationResult == CalculationResult.Succeeded)
             {
                 Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.GreaterThanOrEqualTo(requiredSafetyFactor));
+            } else if (!errorMessage.Equals(""))
+            {
+                Assert.That(output.Results.CalculationMessages.Last().Message1.Contains(errorMessage), Is.True);
             }
             Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(actualSafetyFactor).Within(tolerance));
             Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.NumberOfIterations, Is.EqualTo(iterationCount));
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj
===================================================================
diff -u -r5222 -r5558
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj	(.../Deltares.DamEngine.Data.csproj)	(revision 5222)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj	(.../Deltares.DamEngine.Data.csproj)	(revision 5558)
@@ -14,4 +14,9 @@
             <_Parameter1>Deltares.DamEngine.Data.Tests</_Parameter1>
         </AssemblyAttribute>
     </ItemGroup>
+    <ItemGroup>
+      <EmbeddedResource Include="Translations.xml">
+        <SubType>Designer</SubType>
+      </EmbeddedResource>
+    </ItemGroup>
 </Project>
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Translations.xml
===================================================================
diff -u -r4898 -r5558
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Translations.xml	(.../Deltares.DamEngine.Calculators/Translations.xml)	(revision 4898)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Translations.xml	(.../Deltares.DamEngine.Data/Translations.xml)	(revision 5558)
@@ -22,7 +22,7 @@
 All rights reserved.
 -->
 <Translations>
-    <Translation ID="UnexpectedErrorStixFileCreation"
-                 en-US="An unexpected error occured during the creation of the stix file: "
-                 nl-NL="Er is een onverwachte fout opgetreden tijdens het aanmaken van het stix-bestand: "/>
+    <Translation ID="ChartPointsNotAscending"
+                 en-US="The characteristic points of the surfaceline are not ascending in X-direction."
+                 nl-NL="De karakteristieke punten van de hoogtegeometrie zijn niet oplopend in X-richting."/>
 </Translations>
\ No newline at end of file