Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r6557 -r6659
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 6557)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 6659)
@@ -45,7 +45,7 @@
     private const double tolerance = 0.00051;
     private const string tutorialStability2D = @"TestFiles\InputTutorialStability2D.xml";
 
-    [Test, Category(Categories.Slow)]
+    [Test]
     public void TestRunMacroStabilityTutorialDesignUpliftVan()
     {
         // Based on ".data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx"
@@ -68,6 +68,7 @@
         inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
 
         Output output = GeneralHelper.RunAfterInputValidation(inputString);
+        Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(1));
 
         Assert.Multiple(() =>
         {
@@ -103,6 +104,43 @@
         });
     }
 
+    [Test]
+    public void TestRunMacroStabilityTutorialDesignUpliftVan_NoUplift()
+    {
+        // Based on DAM UI tutorial for stability, for location DWP_18
+        const string calcDir = "TestStabInwardsUpliftVan_NoUplift";
+        if (Directory.Exists(calcDir))
+        {
+            Directory.Delete(calcDir, true); // delete previous results
+        }
+
+        string inputString = File.ReadAllText(tutorialStability2D);
+        string[] locations = ["DWP_18"];
+        inputString = XmlAdapter.SelectLocations(inputString, locations);
+
+        inputString = XmlAdapter.ChangeStabilityInputModel(inputString, InputStabilityModelType.UpliftVan);
+        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);
+        Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(1));
+
+        // Uplift Van
+        DesignResultStabilityDesignResults result = output.Results.CalculationResults[0].StabilityDesignResults;
+        Assert.Multiple(() =>
+        {
+            Assert.That(result.SafetyFactorSpecified, Is.False);
+            Assert.That(result.UpliftSituation, Is.Not.Null);
+            Assert.That(result.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan));
+        });
+        Assert.Multiple(() =>
+        {
+            // Calculation Result
+            Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult), 
+                        Is.EqualTo(CalculationResult.NoRun));
+        });
+    }
+
     [Test, Category(Categories.Slow)]
     public void TestRunMacroStabilityTutorialDesignBishopUpliftVan_UpliftVanLowest()
     {
@@ -126,6 +164,7 @@
         inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
 
         Output output = GeneralHelper.RunAfterInputValidation(inputString);
+        Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(3));
 
         // Bishop
         DesignResult result = output.Results.CalculationResults[0];
@@ -187,6 +226,7 @@
         inputString = XmlAdapter.ChangeValueInXml(inputString, "SearchMethod", "BeeSwarm");
 
         Output output = GeneralHelper.RunAfterInputValidation(inputString);
+        Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(3));
 
         // Bishop
         DesignResultStabilityDesignResults result = output.Results.CalculationResults[0].StabilityDesignResults;
@@ -225,13 +265,10 @@
         });
     }
 
-    [Test, Category(Categories.Slow)]
+    [Test]
     public void TestRunMacroStabilityTutorialDesignBishopUpliftVan_NoUplift()
     {
-        // Based on ".data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx"
-        // with Dam Classic rev.1059
-        // Select 10th location (DWP_18)
-        // with Dam Classic rev.833
+        // Based on DAM UI tutorial for stability, for location DWP_18
         const string calcDir = "TestStabInwardsBishopUpliftVan_NoUplift";
         if (Directory.Exists(calcDir))
         {
@@ -247,6 +284,7 @@
         inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
 
         Output output = GeneralHelper.RunAfterInputValidation(inputString);
+        Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(3));
 
         // Bishop
         DesignResultStabilityDesignResults result = output.Results.CalculationResults[0].StabilityDesignResults;
@@ -548,14 +586,22 @@
         Output output = GeneralHelper.RunAfterInputValidation(engineInterface);
 
         // one location is calculated with 3 1D profiles
-        // However, profile 6-4-1-A-1-F_3_s has no UpliftVan occuring and thus has no result 
-        Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(2));
+        // However, profile 6-4-1-A-1-F_3_s has no UpliftVan occuring and thus has result NoRun 
+        Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(3));
         Assert.Multiple(() =>
         {
-            Assert.That(output.Results.CalculationResults[0].LocationName, Is.EqualTo("6-4-1-A-1-F"));
-            Assert.That(output.Results.CalculationResults[0].ProfileName, Is.EqualTo("6-4-1-A-1-F_1_s"));
-            Assert.That(output.Results.CalculationResults[1].LocationName, Is.EqualTo("6-4-1-A-1-F"));
-            Assert.That(output.Results.CalculationResults[1].ProfileName, Is.EqualTo("6-4-1-A-1-F_2_s"));
+            DesignResult result = output.Results.CalculationResults[0];
+            Assert.That(result.LocationName, Is.EqualTo("6-4-1-A-1-F"));
+            Assert.That(result.ProfileName, Is.EqualTo("6-4-1-A-1-F_1_s"));
+            Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded));
+            result = output.Results.CalculationResults[1];
+            Assert.That(result.LocationName, Is.EqualTo("6-4-1-A-1-F"));
+            Assert.That(result.ProfileName, Is.EqualTo("6-4-1-A-1-F_2_s"));
+            Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded));
+            result = output.Results.CalculationResults[2];
+            Assert.That(result.LocationName, Is.EqualTo("6-4-1-A-1-F"));
+            Assert.That(result.ProfileName, Is.EqualTo("6-4-1-A-1-F_3_s"));
+            Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.NoRun));
         });
 
         DesignResult result = output.Results.CalculationResults[0];