Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/IssuesTests.cs
===================================================================
diff -u -r6291 -r6378
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/IssuesTests.cs	(.../IssuesTests.cs)	(revision 6291)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/IssuesTests.cs	(.../IssuesTests.cs)	(revision 6378)
@@ -20,7 +20,9 @@
 // All rights reserved.
 
 using System.IO;
+using System.Linq;
 using Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityCommon;
+using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.Geotechnics;
 using Deltares.DamEngine.Interface;
 using Deltares.DamEngine.TestHelpers;
@@ -34,19 +36,20 @@
     private const string tutorialStability2D = @"TestFiles\InputTutorialStability2D.xml";
     
     [Test]
-    [TestCase("DWP_1", 0,19, 81, 63, 35,1.248)]
-    [TestCase("DWP_2", 1,12, 72, 61, 38,1.398)]
-    [TestCase("DWP_6", 5, 15,79, 65, 45, 1.503)]
-    [TestCase("DWP_7", 6,9, 65, 57, 37, 1.264)]
-    [TestCase("DWP_8", 7,27, 117, 91, 46, 0.989)]
-    [TestCase("DWP_16", 15,26, 99, 74, 39, 0.849)]
-    [TestCase("DWP_17", 16,19, 82, 64, 32, 1.256)]
-    [TestCase("DWP_20", 19,24, 102, 79, 46, 1.523)]
-    public void TestGeometryAndResultForIssueWithDwpsFromTutorial(string location, int segmentIndex, int surfaceCount, int curveCount, int pointCount, int surfaceLinePointCount, double safetyFactor)
+    [TestCase("DWP_1", 19, 81, 63, 35,1.248)]
+    [TestCase("DWP_2", 12, 72, 61, 38,1.398)]
+    [TestCase("DWP_6", 15,79, 65, 45, 1.503)]
+    [TestCase("DWP_7", 9, 65, 57, 37, 1.264)]
+    [TestCase("DWP_8", 27, 117, 91, 46, 0.989)]
+    [TestCase("DWP_16", 26, 99, 74, 39, 0.713)]
+    [TestCase("DWP_17", 19, 82, 64, 32, 1.256)]
+    [TestCase("DWP_20", 24, 102, 79, 46, 1.523)]
+    public void TestGeometryAndResultForIssueWithDwpsFromTutorial(string location, int surfaceCount, int curveCount, int pointCount, int surfaceLinePointCount, double safetyFactor)
     {
         string inputString = File.ReadAllText(tutorialStability2D);
         string[] locations = [location];
         inputString = XmlAdapter.SelectLocations(inputString, locations);
+        inputString = XmlAdapter.ChangeValueInXml(inputString, "SearchMethod", "CalculationGrid");
         var outputName = "OutputFor" + location + ".xml";
         var engineInterface = new EngineInterface(inputString);
         //GeometryData geometry = engineInterface.DamProjectData.Segments[segmentIndex].SoilProfileProbabilities[0].SoilProfile2D.Geometry;
@@ -59,7 +62,8 @@
         string soilName = engineInterface.DamProjectData.Dike.Locations[0].DikeEmbankmentMaterial;  
         Soil soil = engineInterface.DamProjectData.Dike.SoilList.GetSoilByName(soilName);
         // To be able to check the geometry, create it here.
-        SoilProfile2D soilProfile2D = MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(engineInterface.DamProjectData.Segments[segmentIndex].SoilProfileProbabilities[0], surfaceLine, soil);
+        SoilGeometryProbability soilProfile2DOriginal = engineInterface.DamProjectData.Segments.First(s => s.Name == location).SoilProfileProbabilities[0];
+        SoilProfile2D soilProfile2D = MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilProfile2DOriginal, surfaceLine, soil);
         // For debugging purposes
         //geometry = soilProfile2D.Geometry;  
         //GeometryExporter.ExportToFile(geometry, GeometryExporter.VisualizationFolder + location + "GeometryEnd.txt");
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r6290 -r6378
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 6290)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 6378)
@@ -62,6 +62,7 @@
         inputString = XmlAdapter.SelectLocations(inputString, locations);
 
         inputString = XmlAdapter.ChangeStabilityInputModel(inputString, InputStabilityModelType.UpliftVan);
+        inputString = XmlAdapter.ChangeValueInXml(inputString, "SearchMethod", "CalculationGrid");
         inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used
         inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
 
@@ -119,6 +120,7 @@
         inputString = XmlAdapter.SelectLocations(inputString, locations);
 
         inputString = XmlAdapter.ChangeStabilityInputModel(inputString, InputStabilityModelType.BishopUpliftVan);
+        inputString = XmlAdapter.ChangeValueInXml(inputString, "SearchMethod", "CalculationGrid");
         inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used
         inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
 
@@ -902,6 +904,7 @@
         string inputString = File.ReadAllText(tutorialStability2D);
         string[] locations = [locationId];
         inputString = XmlAdapter.SelectLocations(inputString, locations);
+        inputString = XmlAdapter.ChangeValueInXml(inputString, "SearchMethod", "CalculationGrid");
         inputString = XmlAdapter.ChangeStabilityInputModel(inputString, stabilityModelType);
         inputString = XmlAdapter.ChangeValueInXml(inputString, "FailureMechanismSystemType", ConversionHelper.ConvertToInputFailureMechanismSystemType(
                                                       FailureMechanismSystemType.StabilityInside).ToString());
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityInwardsTests.cs
===================================================================
diff -u -r6290 -r6378
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityInwardsTests.cs	(.../MultiCoreMacroStabilityInwardsTests.cs)	(revision 6290)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityInwardsTests.cs	(.../MultiCoreMacroStabilityInwardsTests.cs)	(revision 6378)
@@ -68,6 +68,7 @@
         inputString = XmlAdapter.ChangeStabilityInputModel(inputString, stabilityModelType);
         inputString = XmlAdapter.ChangeValueInXml(inputString, "FailureMechanismSystemType", ConversionHelper.ConvertToInputFailureMechanismSystemType(
                                                       FailureMechanismSystemType.StabilityInside).ToString());
+        inputString = XmlAdapter.ChangeValueInXml(inputString, "SearchMethod", "CalculationGrid");
         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",