Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs
===================================================================
diff -u -r1232 -r1234
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs	(.../DamMacroStabilityInwardsKernelWrapperTests.cs)	(revision 1232)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs	(.../DamMacroStabilityInwardsKernelWrapperTests.cs)	(revision 1234)
@@ -54,7 +54,7 @@
             FullCalculation(MStabModelType.Bishop, expectedValues, expectedValues);
         }
 
-        [Test]
+        [Test, Category("Slow")]
         public void TestFullCalculationUpliftVan()
         {
             // expected results are based on test CanCalculateStabilitySafetyFactorGeometry2D
@@ -66,7 +66,7 @@
             FullCalculation(MStabModelType.UpliftVan, expectedValues, expectedValues);
         }
 
-        [Test]
+        [Test, Category("Slow")]
         public void TestFullCalculationBishopUpliftVan()
         {
             // expected result is worst of Bishop (1.5570) and UpliftVan (1.0105)
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r1233 -r1234
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 1233)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 1234)
@@ -37,7 +37,7 @@
     {
         private const double tolerance = 0.0005;
 
-        [Test]
+        [Test, Category("Slow")]
         public void TestRunMacroStabilityTutorialDesignBishop()
         {
             // Based on ".data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx"
@@ -111,7 +111,7 @@
             Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults.DesignResults[0].CalculationResult));
         }
 
-        [Test]
+        [Test, Category("Slow")]
         public void TestRunMacroStabilityTutorialDesignUpliftVan()
         {
             // Based on ".data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx"
@@ -179,7 +179,7 @@
             Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults.DesignResults[0].CalculationResult));
         }
 
-        [Test]
+        [Test, Category("Slow")]
         public void TestRunMacroStabilityTutorialDesignBishopUpliftVan_UpliftVanLowest()
         {
             // Based on ".data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx"
@@ -228,7 +228,7 @@
             Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults.DesignResults[2].CalculationResult));
         }
 
-        [Test]
+        [Test, Category("Slow")]
         public void TestRunMacroStabilityTutorialDesignBishopUpliftVan_BishopLowest()
         {
             // Based on ".data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx"
@@ -277,7 +277,7 @@
             Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults.DesignResults[2].CalculationResult));
         }
 
-        [Test]
+        [Test, Category("Slow")]
         public void TestRunMacroStabilityTutorialDesignBishopUpliftVan_NoUplift()
         {
             // Based on ".data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx"
@@ -328,7 +328,7 @@
             Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults.DesignResults[2].CalculationResult));
         }
 
-        [Test]
+        [Test, Category("Slow")]
         public void TestRunMacroStabilityDeltaDijkZoneAreasBishopWith1D()
         {
             // Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\DeltaDijk_zonering_BI\DeltaDijk normal.damx
@@ -401,7 +401,7 @@
             Assert.AreEqual(1.621, result.StabilityDesignResults.SafetyFactor, tolerance);
         }
 
-        [Test]
+        [Test, Category("Slow")]
         public void TestRunMacroStabilityDeltaDijkZoneAreasBishopWith1DZone2()
         {
             // Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\DeltaDijk_zonering_BI\DeltaDijk normal.damx
@@ -463,7 +463,7 @@
             Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult));
         }
 
-        [Test]
+        [Test, Category("Slow")]
         public void TestRunMacroStabilityDeltaDijkZoneAreasUpliftVanWith1D()
         {
             // Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\DeltaDijk_zonering_BI
@@ -537,7 +537,7 @@
             Assert.AreEqual(1.591, result.StabilityDesignResults.SafetyFactor, tolerance);
         }
 
-        [Test]
+        [Test, Category("Slow")]
         public void TestRunMacroStabilityInvoer10ForbiddenZoneBishop()
         {
             // Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\Invoer10\ZoneType.damx
@@ -586,7 +586,7 @@
             Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult));
         }
 
-        [Test]
+        [Test, Category("Slow")]
         public void TestRunMacroStabilityWithErrorUpliftVan()
         {
             // Expected results are determined by running .\data\DamEngineTestProjects\DeltaDijk_zonering_BI\DeltaDijk normal.damx
@@ -654,7 +654,7 @@
         }
 
 
-        [Test]
+        [Test, Category("Slow")]
         public void TestRunMacroStabilityWithErrorBishopUpliftVan()
         {
             // Expected results are determined by running .\data\DamEngineTestProjects\DeltaDijk_zonering_BI\DeltaDijk normal.damx
@@ -717,7 +717,7 @@
             Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, result.StabilityDesignResults.StabilityModelType);
         }
 
-        [Test]
+        [Test, Category("Slow")]
         // Expected results are determined by running .\DamUI\trunk\data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx
         // with Dam Classic rev.1059
         // Select 1st location (DWP_1)
@@ -766,12 +766,13 @@
             Assert.AreEqual("", output.Results.CalculationResults.DesignResults[0].StabilityDesignResults.ResultMessage);
         }
 
-        [Test, Category("Work_In_Progress")]
+        [Test, Category("Slow")]
         // Expected results are determined by running .\DamUI\trunk\data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx
         // with Dam Classic rev.1059
         // Select 1st location (DWP_1)
         // Model Bishop, Set safetyfactor Inwards to 1.4
         // Design strategy: OptimizedSlopeAndShoulderAdaption
+        // Set NewMinDistanceDikeToeStartDitch = 3.0, UseNewMinDistanceDikeToeStartDitch = true (to force value to be written to XML)
         // Result: 
         //   SF = 1.412
         //   Shoulderheight = 3.889
@@ -809,13 +810,11 @@
             Assert.AreEqual(50.236, output.Results.CalculationResults.DesignResults[0].StabilityDesignResults.Zone1EntryPointX, tolerance);
             Assert.AreEqual(67.077, output.Results.CalculationResults.DesignResults[0].StabilityDesignResults.Zone1ExitPointX, tolerance);
             Assert.AreEqual(43.760, redesignedSurfaceLine.GetDikeLength(), tolerance);
-//            Assert.AreEqual(3.889, redesignedSurfaceLine.DetermineShoulderHeight(), tolerance);
-//            Assert.AreEqual(4.9, redesignedSurfaceLine.GetDikeHeight(), tolerance);
             Assert.AreEqual(4, output.Results.CalculationResults.DesignResults[0].StabilityDesignResults.NumberOfIterations);
             Assert.AreEqual("", output.Results.CalculationResults.DesignResults[0].StabilityDesignResults.ResultMessage);
         }
 
-        [Test]
+        [Test, Category("Slow")]
         // Expected results are determined by running .\DamUI\trunk\data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx
         // with Dam Classic rev.1059
         // Select .. location (DWP_1, DWP_10, DWP_16, DWP_19, DWP_23,DWP_9)
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/RegionalAssessment/RegionalScenariosCalculationTests.cs
===================================================================
diff -u -r1230 -r1234
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/RegionalAssessment/RegionalScenariosCalculationTests.cs	(.../RegionalScenariosCalculationTests.cs)	(revision 1230)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/RegionalAssessment/RegionalScenariosCalculationTests.cs	(.../RegionalScenariosCalculationTests.cs)	(revision 1234)
@@ -32,7 +32,7 @@
     {
         private const double tolerance = 0.0005;
 
-        [Test]
+        [Test, Category("Slow")]
         public void TestScenario3And7And8And10SingleCore()
         {
             TestScenario3And7And8And10(1);