Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/IssuesTests.cs
===================================================================
diff -u -r5887 -r6015
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/IssuesTests.cs	(.../IssuesTests.cs)	(revision 5887)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/IssuesTests.cs	(.../IssuesTests.cs)	(revision 6015)
@@ -38,35 +38,37 @@
     private const string tutorialStability2D = @"TestFiles\InputTutorialStability2D.xml";
     
     [Test, Category(Categories.WorkInProgress)]
-    [TestCase("DWP_2", 1,15, 97, 83, 46,1.393)]
-    [TestCase("DWP_8", 7,26, 129, 104, 53, 1.051)]
-    [TestCase("DWP_16", 15,26, 117, 92, 47, 0.749)]
-    [TestCase("DWP_20", 19,23, 113, 91, 50, 1.523)]
+    [TestCase("DWP_1", 0,20, 82, 63, 34,1.248)]
+    [TestCase("DWP_2", 1,13, 73, 61, 37,1.398)]
+    [TestCase("DWP_6", 5, 19,83, 65, 42, 1.051)]
+    [TestCase("DWP_7", 6,10, 66, 57, 37, 1.051)]
+    [TestCase("DWP_8", 7,28, 119, 92, 47, 0.989)]
+    [TestCase("DWP_16", 15,27, 100, 74, 38, 0.849)]
+    [TestCase("DWP_20", 19,25, 104, 80, 47, 1.523)]
     public void TestGeometryAndResultForIssueWithDwpsFromTutorial(string location, int segmentIndex, int surfaceCount, int curveCount, int pointCount, int surfaceLinePointCount, double safetyFactor)
     {
         string inputString = File.ReadAllText(tutorialStability2D);
         string[] locations = [location];
         inputString = XmlAdapter.SelectLocations(inputString, locations);
         var outputName = "OutputFor" + location + ".xml";
         var engineInterface = new EngineInterface(inputString);
-        engineInterface.DamProjectData.Dike.Locations[0].XSoilGeometry2DOrigin = 0.0;
-        //GeometryData geometry = engineInterface.DamProjectData.Segments[segmentIndex].SoilProfileProbabilities[0].SoilProfile2D.Geometry;
+        GeometryData geometry = engineInterface.DamProjectData.Segments[segmentIndex].SoilProfileProbabilities[0].SoilProfile2D.Geometry;
         SurfaceLine2 surfaceLine = engineInterface.DamProjectData.Dike.Locations[0].SurfaceLine;
         
-        // GeometryExporter.ExportToFile(geometry, GeometryExporter.VisualizationFolder + "Geometry.txt");
-        // GeometryExporter.ExportWithSurfaceLineToJsonFile(GeometryExporter.VisualizationFolder + 
-        //                                                  GeometryExporter.ExportJasonFile, geometry, surfaceLine.Geometry);
+        GeometryExporter.ExportToFile(geometry, GeometryExporter.VisualizationFolder + location +"GeometryStart.txt");
+        GeometryExporter.ExportWithSurfaceLineToJsonFile(GeometryExporter.VisualizationFolder + 
+                                                          GeometryExporter.ExportJasonFile, geometry, surfaceLine.Geometry);
 
         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 = SoilProfile2DSurfaceLineHelper.CombineSurfaceLineWithSoilProfile2D(surfaceLine.Geometry,
                                                                                                          engineInterface.DamProjectData.Segments[segmentIndex].SoilProfileProbabilities[0].SoilProfile2D, soil);
         // For debugging purposes
-        // geometry = soilProfile2D.Geometry;  
-        // GeometryExporter.ExportToFile(geometry, GeometryExporter.VisualizationFolder + "Geometry.txt");
-        // GeometryExporter.ExportWithSurfaceLineToJsonFile(GeometryExporter.VisualizationFolder + 
-        //                                                  GeometryExporter.ExportJasonFile, geometry, surfaceLine.Geometry);
+        geometry = soilProfile2D.Geometry;  
+        GeometryExporter.ExportToFile(geometry, GeometryExporter.VisualizationFolder + location + "GeometryEnd.txt");
+        GeometryExporter.ExportWithSurfaceLineToJsonFile(GeometryExporter.VisualizationFolder + 
+                                                          GeometryExporter.ExportJasonFile, geometry, surfaceLine.Geometry);
         Assert.Multiple(() =>
         {
             Assert.That(soilProfile2D.Geometry.Surfaces, Has.Count.EqualTo(surfaceCount));
@@ -84,42 +86,4 @@
         });
     }
     
-    [Test, Category(Categories.WorkInProgress)]
-    [TestCase("DWP_1", 0, 1.248)]
-    [TestCase("DWP_6", 5, 1.000)]
-    [TestCase("DWP_7", 6, 1.000)]
-    [TestCase("DWP_20", 19, 1.000)]
-    public void GivenLocationFromDesignTutorialStability_WhenCalculating_ThenResultAvailable(string location, int segmentIndex, double safetyFactor)
-    {
-        string inputString = File.ReadAllText(tutorialStability2D);
-        string[] locations = [location];
-        inputString = XmlAdapter.SelectLocations(inputString, locations);
-        var engineInterface = new EngineInterface(inputString);
-        double shift = engineInterface.DamProjectData.Dike.Locations[0].XSoilGeometry2DOrigin;
-        SurfaceLine2 surfaceLine = engineInterface.DamProjectData.Dike.Locations[0].SurfaceLine;
-        string soilName = engineInterface.DamProjectData.Dike.Locations[0].DikeEmbankmentMaterial;  
-        Soil fillingMaterial = engineInterface.DamProjectData.Dike.SoilList.GetSoilByName(soilName);
-
-        SoilProfile2D soilProfile2D = SoilProfile2DSurfaceLineHelper.CombineSurfaceLineWithSoilProfile2D(surfaceLine.Geometry,
-                                                                                                         engineInterface.DamProjectData.Segments[segmentIndex].SoilProfileProbabilities[0].SoilProfile2D, fillingMaterial);
-        if (location == "DWP_1")
-        {
-            Assert.Multiple(() =>
-            {
-                Assert.That(soilProfile2D.Geometry.Surfaces, Has.Count.EqualTo(20));
-                Assert.That(soilProfile2D.Surfaces, Has.Count.EqualTo(20));
-                Assert.That(soilProfile2D.Surfaces.Where(s => s.SoilName == fillingMaterial.Name).ToList(), Has.Count.EqualTo(3));
-            });
-        }
-
-        var outputName = "OutputFor" + location + ".xml";
-        GeneralHelper.RunAfterInputValidation(engineInterface, true, outputName);
-        int errorCount = GeneralHelper.DetermineNumberOfCalculationErrors(engineInterface.DamProjectData.CalculationMessages);
-        Assert.Multiple(() =>
-        {
-            Assert.That(errorCount, Is.EqualTo(0), "There should be no errors during the calculation.");
-            Assert.That(engineInterface.DamProjectData.DesignCalculations, Has.Count.EqualTo(1), "There should be one design calculation.");
-            Assert.That(engineInterface.DamProjectData.DesignCalculations[0].SafetyFactor, Is.EqualTo(safetyFactor).Within(0.001), "The safety factor is incorrect.");
-        });
-    }
 }
\ No newline at end of file