Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r5397 -r5411
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 5397)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 5411)
@@ -67,8 +67,10 @@
 
         Directory.CreateDirectory(calcDir);
 
-        const string fileName = @"TestFiles\MacroStabilityTutorialDesignInputFile.xml";
-        string inputString = File.ReadAllText(fileName);
+        string inputString = File.ReadAllText(tutorialStability2D);
+        string[] locations = ["DWP_1"];
+        inputString = XmlAdapter.SelectLocations(inputString, locations);
+
         inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used
         inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
         inputString = XmlAdapter.ChangeValueInXml(inputString, "SegmentFailureMechanismType", segmentFailureMechanismType.ToString());
@@ -122,8 +124,10 @@
             Directory.Delete(calcDir, true); // delete previous results
         }
 
-        const string fileName = @"TestFiles\MacroStabilityTutorialDesignInputFile.xml";
-        string inputString = File.ReadAllText(fileName);
+        string inputString = File.ReadAllText(tutorialStability2D);
+        string[] locations = ["DWP_1"];
+        inputString = XmlAdapter.SelectLocations(inputString, locations);
+
         inputString = ChangeInputModel(inputString, InputStabilityModelType.UpliftVan);
         inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used
         inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
@@ -177,8 +181,10 @@
             Directory.Delete(calcDir, true); // delete previous results
         }
 
-        const string fileName = @"TestFiles\MacroStabilityTutorialDesignInputFile.xml";
-        string inputString = File.ReadAllText(fileName);
+        string inputString = File.ReadAllText(tutorialStability2D);
+        string[] locations = ["DWP_1"];
+        inputString = XmlAdapter.SelectLocations(inputString, locations);
+
         inputString = ChangeInputModel(inputString, InputStabilityModelType.BishopUpliftVan);
         inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used
         inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
@@ -236,11 +242,14 @@
             Directory.Delete(calcDir, true); // delete previous results
         }
 
-        const string fileName = @"TestFiles\MacroStabilityTutorialDesignInputFile22.xml";
-        string inputString = File.ReadAllText(fileName);
+        string inputString = File.ReadAllText(tutorialStability2D);
+        string[] locations = ["DWP_22"];
+        inputString = XmlAdapter.SelectLocations(inputString, locations);
+        
         inputString = ChangeInputModel(inputString, InputStabilityModelType.BishopUpliftVan);
         inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used
         inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
+        inputString = XmlAdapter.ChangeValueInXml(inputString, "SearchMethod", "2");
 
         Output output = GeneralHelper.RunAfterInputValidation(inputString);
 
@@ -294,8 +303,10 @@
             Directory.Delete(calcDir, true); // delete previous results
         }
 
-        const string fileName = @"TestFiles\MacroStabilityTutorialDesignInputFile18.xml";
-        string inputString = File.ReadAllText(fileName);
+        string inputString = File.ReadAllText(tutorialStability2D);
+        string[] locations = ["DWP_18"];
+        inputString = XmlAdapter.SelectLocations(inputString, locations);
+
         inputString = ChangeInputModel(inputString, InputStabilityModelType.BishopUpliftVan);
         inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used
         inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
@@ -404,6 +415,7 @@
 
         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
@@ -421,6 +433,7 @@
     [Test, Category(Categories.Slow), Ignore("Work in progress")]
     public void DesignBishopOptimizedSlopeAndShoulderAdaptionWithScenariosForHeadPL3CalculatesCorrect()
     {
+        // ToDo: When fixed, check if tutorialStability2D can be used instead of next xml file
         const string inputFilename = "InputFileMultiCoreTestForScenarioAdaption.xml";
         string fullInputFilename = Path.Combine(mapTestFiles, inputFilename);
         Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
@@ -463,6 +476,7 @@
 
         Directory.CreateDirectory(calcDir);
 
+        // ToDo: When fixed, check if tutorialStability2D can be used instead of next xml file
         const string fileName = @"TestFiles\ValidatieSlopeAdaption.xml";
         string inputString = File.ReadAllText(fileName);
         inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used
Fisheye: Tag 5411 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/MacroStabilityTutorialDesignInputFileMultipleLocations.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 5411 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/MacroStabilityTutorialDesignInputFile.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 5411 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/MacroStabilityTutorialDesignInputFile22.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 5411 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/MacroStabilityTutorialDesignInputFile13.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 5411 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/MacroStabilityTutorialDesignInputFile18.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
===================================================================
diff -u -r5403 -r5411
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj	(.../Deltares.DamEngine.IntegrationTests.csproj)	(revision 5403)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj	(.../Deltares.DamEngine.IntegrationTests.csproj)	(revision 5411)
@@ -59,24 +59,9 @@
         <None Update="TestFiles\MacroStabilityRunFailedExpectCalculationMessage.xml">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestFiles\MacroStabilityTutorialDesignInputFile.xml">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
         <None Update="TestFiles\MacroStabilityTutorialDesignInputFile1LocationWithAdaption.xml">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestFiles\MacroStabilityTutorialDesignInputFile13.xml">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestFiles\MacroStabilityTutorialDesignInputFile18.xml">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestFiles\MacroStabilityTutorialDesignInputFile22.xml">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="TestFiles\MacroStabilityTutorialDesignInputFileMultipleLocations.xml">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
         <None Update="TestFiles\OperationalBishopGrid18Cores.xml">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>