Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r6276 -r6290
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 6276)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 6290)
@@ -42,7 +42,6 @@
 public class MacroStabilityInwardsTests
 {
     private const double tolerance = 0.00051;
-    private const string mapTestFiles = @"TestFiles\";
     private const string tutorialStability2D = @"TestFiles\InputTutorialStability2D.xml";
 
     [Test, Category(Categories.Slow)]
@@ -332,60 +331,6 @@
         });
     }
 
-    [Test, Category(Categories.Slow)]
-    public void DesignBishopOptimizedSlopeAndShoulderAdaptionWithScenariosForHeadPL3CalculatesCorrect()
-    {
-        const string inputFilename = "InputFileMultiCoreTestForScenarioAdaption.xml";
-        string fullInputFilename = Path.Combine(mapTestFiles, inputFilename);
-        Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
-        string inputString = File.ReadAllText(fullInputFilename);
-
-        var engineInterface = new EngineInterface(inputString);
-        engineInterface.DamProjectData.MaxCalculationCores = 1;
-        string calcDir = engineInterface.DamProjectData.CalculationMap + "_SingleCore";
-
-        engineInterface.DamProjectData.CalculationMap = calcDir;
-        Assert.That(engineInterface.DamProjectData, Is.Not.Null);
-        calcDir = Directory.GetCurrentDirectory() + "\\" + calcDir;
-        if (Directory.Exists(calcDir))
-        {
-            Directory.Delete(calcDir, true); // delete previous results
-        }
-
-        Output output = GeneralHelper.RunAfterInputValidation(engineInterface, true, "Results_Single_Core" + ".xml");
-
-        Assert.Multiple(() =>
-        {
-            Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(18));
-            int resultsFound = CheckLargeResultsSets.CheckResultsDesignBishopAdaptionWithScenariosForHeadPl3CalculatesCorrect(
-                output.Results.CalculationResults);
-            Assert.That(resultsFound, Is.EqualTo(11));
-        });
-    }
-
-    [Test, Category(Categories.Slow)]
-    public void TestRunSlopeAdaptionBeforeShoulderAdaptionSucceeds()
-    {
-        // Input file was created with .\data\Dam\Benchmarks\Validatie SlopeAdaption\SlopeAdaption.damx
-        // Expected: a valid calculation.
-        const string calcDir = "TestRunFailedExpectCalculationMessageInSlopeAdaptionBeforeShoulderAdaption";
-        if (Directory.Exists(calcDir))
-        {
-            Directory.Delete(calcDir, true); // delete previous results
-        }
-
-        Directory.CreateDirectory(calcDir);
-
-        const string fileName = @"TestFiles\ValidatieSlopeAdaption.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);
-
-        Assert.That(output.Results.CalculationResults.First().StabilityDesignResults.SafetyFactor, Is.EqualTo(2.061).Within(tolerance));
-    }
-
     [Test]
     [Category(Categories.Slow)]
     // Xml is created with DAM Tutorial Design.damx
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityInwardsTests.cs
===================================================================
diff -u -r6232 -r6290
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityInwardsTests.cs	(.../MultiCoreMacroStabilityInwardsTests.cs)	(revision 6232)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityInwardsTests.cs	(.../MultiCoreMacroStabilityInwardsTests.cs)	(revision 6290)
@@ -20,10 +20,13 @@
 // All rights reserved.
 
 using System;
+using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.Standard.Calculation;
+using Deltares.DamEngine.Interface;
 using Deltares.DamEngine.Io;
 using Deltares.DamEngine.Io.XmlInput;
 using Deltares.DamEngine.Io.XmlOutput;
@@ -84,4 +87,43 @@
             Assert.That(actualFailed, Is.EqualTo(expectedFailed),"Failed calculations");
         });
     }
+    [Test, Category(Categories.MultiCore)]
+    [Category(Categories.WorkInProgress)] // As long as multicore is not fixed, it might give errors
+    public void DesignBishopOptimizedSlopeAndShoulderAdaptionWithScenariosForHeadPL3CalculatesCorrect()
+    {
+        const string mapTestFiles = @"TestFiles\";
+        const string inputFilename = "InputFileMultiCoreTestForScenarioAdaption.xml";
+        string fullInputFilename = Path.Combine(mapTestFiles, inputFilename);
+        Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
+        string inputString = File.ReadAllText(fullInputFilename);
+
+        var engineInterface = new EngineInterface(inputString)
+        {
+            DamProjectData =
+            {
+                MaxCalculationCores = 4
+            }
+        };
+        string calcDir = engineInterface.DamProjectData.CalculationMap + "_4_Cores";
+
+        engineInterface.DamProjectData.CalculationMap = calcDir;
+        Assert.That(engineInterface.DamProjectData, Is.Not.Null);
+        calcDir = Directory.GetCurrentDirectory() + "\\" + calcDir;
+        if (Directory.Exists(calcDir))
+        {
+            Directory.Delete(calcDir, true); // delete previous results
+        }
+
+        Output output = GeneralHelper.RunAfterInputValidation(engineInterface, true, "Results_4_Cores" + ".xml");
+
+        Assert.Multiple(() =>
+        {
+            Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(18));
+            int resultsFound = CheckLargeResultsSets.CheckResultsDesignBishopAdaptionWithScenariosForHeadPl3CalculatesCorrect(
+                output.Results.CalculationResults);
+            Assert.That(resultsFound, Is.EqualTo(11));
+        });
+    }
+
+    
 }
\ No newline at end of file