Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs
===================================================================
diff -u -r5132 -r5150
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs	(.../MultiCoreMacroStabilityTests.cs)	(revision 5132)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs	(.../MultiCoreMacroStabilityTests.cs)	(revision 5150)
@@ -79,7 +79,7 @@
         Assert.That(numberOfRealResults, Is.EqualTo(16));
     }
 
-    [Test, Category(Categories.MultiCore), Ignore("WorkInProgress")]
+    [Test, Category(Categories.MultiCore)]
     [TestCase("DesignBishopGrid1Core.xml")]
     [TestCase("DesignBishopGrid2Cores.xml")]
     [TestCase("DesignBishopGrid4Cores.xml")]
@@ -178,7 +178,7 @@
         CheckLargeResultsSets.CheckResultsDesignBishopWithScenariosForHeadPl3CalculatesCorrect(output.Results.CalculationResults);
     }
 
-    [Test, Category(Categories.MultiCore), Ignore("WorkInProgress")]
+    [Test, Category(Categories.MultiCore)]
     [TestCase(1, true)]
     [TestCase(4, true)]
     [TestCase(16, true)]
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs
===================================================================
diff -u -r5134 -r5150
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs	(.../MacroStabilityCommonHelper.cs)	(revision 5134)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs	(.../MacroStabilityCommonHelper.cs)	(revision 5150)
@@ -61,15 +61,16 @@
     /// <param name="dikeEmbankmentSoil">The dike embankment soil.</param>
     /// <exception cref="ArgumentNullException">Thrown when subSoilScenario.SoilProfileType is ProfileTypeStiFile</exception>
     /// <exception cref="NotImplementedException"></exception>
-    public static void CombineSoilProfileWithSurfaceLine(SoilGeometryProbability subSoilScenario, SurfaceLine2 surfaceLine2, Soil dikeEmbankmentSoil)
+    public static SoilProfile2D CombineSoilProfileWithSurfaceLine(SoilGeometryProbability subSoilScenario, SurfaceLine2 surfaceLine2, Soil dikeEmbankmentSoil)
     {
         switch (subSoilScenario.SoilProfileType)
         {
             case SoilProfileType.ProfileType1D:
                 CombineSoilProfile1DWithSurfaceLine(subSoilScenario, surfaceLine2, dikeEmbankmentSoil);
+                return subSoilScenario.SoilProfile2D;
                 break;
             case SoilProfileType.ProfileType2D:
-                CombineSoilProfile2DWithSurfaceLine(subSoilScenario, surfaceLine2, dikeEmbankmentSoil);
+                return CombineSoilProfile2DWithSurfaceLine(subSoilScenario, surfaceLine2, dikeEmbankmentSoil);
                 break;
             default:
                 throw new NotImplementedException();
@@ -412,12 +413,12 @@
     /// <param name="surfaceLine2">The surfaceline.</param>
     /// <param name="dikeEmbankmentSoil">The dike embankment soil.</param>
     /// <exception cref="ArgumentNullException">Thrown when no SoilProfile2D is defined</exception>
-    private static void CombineSoilProfile2DWithSurfaceLine(SoilGeometryProbability subSoilScenario, SurfaceLine2 surfaceLine2, 
+    private static SoilProfile2D CombineSoilProfile2DWithSurfaceLine(SoilGeometryProbability subSoilScenario, SurfaceLine2 surfaceLine2, 
                                                             Soil dikeEmbankmentSoil)
     {
         ValidateForCombineSoilProfile2DWithSurfaceLine(subSoilScenario, surfaceLine2, dikeEmbankmentSoil);
-
-        subSoilScenario.SoilProfile2D = SoilProfile2DSurfaceLineHelper.CombineSurfaceLineWithSoilProfile2D(surfaceLine2.Geometry, subSoilScenario.SoilProfile2D, 
+        
+        return SoilProfile2DSurfaceLineHelper.CombineSurfaceLineWithSoilProfile2D(surfaceLine2.Geometry, subSoilScenario.SoilProfile2D, 
                                                                                                         dikeEmbankmentSoil, 0);
     }
 
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelperTests.cs
===================================================================
diff -u -r5130 -r5150
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelperTests.cs	(.../MacroStabilityCommonHelperTests.cs)	(revision 5130)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelperTests.cs	(.../MacroStabilityCommonHelperTests.cs)	(revision 5150)
@@ -44,8 +44,8 @@
     {
         SoilGeometryProbability soilGeometryProbability = FactoryForSoilGeometryProbabilities.CreateSoilGeometryProbabilityWithSoilProfile1D();
         SurfaceLine2 surfaceLine = FactoryForSurfaceLines.CreateSurfaceLineWithDikeAndDitch();
-        MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil());
-        GeometryData geometry = soilGeometryProbability.SoilProfile2D.Geometry;
+        var combinedProfile = MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil());
+        GeometryData geometry = combinedProfile.Geometry;
         // For debugging purposes
         // GeometryExporter.ExportToFile(geometry, visualizationFolder + "Geometry.txt");
         // GeometryExporter.ExportToJsonFile(geometry, visualizationFolder + "Geometry.json");
@@ -100,8 +100,8 @@
             surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelOutside).X + 5.0;
         // Now combine the soilGeometryProbability with the same SurfaceLine2 which should result the SoilProfile2D
         // being cut on the left with 5.0 meters
-        MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil());
-        GeometryData geometry = soilGeometryProbability.SoilProfile2D.Geometry;
+        var combinedProfile = MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil());
+        GeometryData geometry = combinedProfile.Geometry;
         // For debugging purposes
         // GeometryExporter.ExportToFile(geometry, visualizationFolder + "Geometry.txt");
         // GeometryExporter.ExportToJsonFile(geometry, visualizationFolder + "Geometry.json");
@@ -130,8 +130,8 @@
             surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelOutside).X - 5.0;
         // Now combine the soilGeometryProbability with the same SurfaceLine2 which should result the SoilProfile2D
         // being extended to the left with 5.0 meters
-        MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil());
-        GeometryData geometry = soilGeometryProbability.SoilProfile2D.Geometry;
+        var combinedProfile = MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil());
+        GeometryData geometry = combinedProfile.Geometry;
         // For debugging purposes
         // GeometryExporter.ExportToFile(geometry, visualizationFolder + "Geometry.txt");
         // GeometryExporter.ExportToJsonFile(geometry, visualizationFolder + "Geometry.json");
@@ -156,8 +156,8 @@
             surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside).X - 5.0;
         // Now combine the soilGeometryProbability with the same SurfaceLine2 which should result the SoilProfile2D
         // being cut on the right with 5.0 meters
-        MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil());
-        GeometryData geometry = soilGeometryProbability.SoilProfile2D.Geometry;
+        var combinedProfile = MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil());
+        GeometryData geometry = combinedProfile.Geometry;
         // For debugging purposes
         // GeometryExporter.ExportToFile(geometry, visualizationFolder + "Geometry.txt");
         // GeometryExporter.ExportToJsonFile(geometry, visualizationFolder + "Geometry.json");
@@ -186,8 +186,8 @@
             surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside).X + 5.0;
         // Now combine the soilGeometryProbability with the same SurfaceLine2 which should result the SoilProfile2D
         // being extended to the right with 5.0 meters
-        MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil());
-        GeometryData geometry = soilGeometryProbability.SoilProfile2D.Geometry;
+        var combinedProfile = MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil());
+        GeometryData geometry = combinedProfile.Geometry;
         // For debugging purposes
         // GeometryExporter.ExportToFile(geometry, visualizationFolder + "Geometry.txt");
         // GeometryExporter.ExportToJsonFile(geometry, visualizationFolder + "Geometry.json");
@@ -208,8 +208,8 @@
         SurfaceLine2 surfaceLine = FactoryForSurfaceLines.CreateSurfaceLineAboveSurfaceLineDikeAndDitch();
         // Now combine the soilGeometryProbability with the surfaceLine which should result that a layer is added on
         // top of the SoilProfile2D
-        MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil());
-        GeometryData geometry = soilGeometryProbability.SoilProfile2D.Geometry;
+        var combinedProfile = MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil());
+        GeometryData geometry = combinedProfile.Geometry;
         // For debugging purposes
         // GeometryExporter.ExportToFile(geometry, visualizationFolder + "Geometry.txt");
         // GeometryExporter.ExportToJsonFile(geometry, visualizationFolder + "Geometry.json");
@@ -231,8 +231,8 @@
         SurfaceLine2 surfaceLine = FactoryForSurfaceLines.CreateSurfaceLineBelowSurfaceLineDikeAndDitch();
         // Now combine the soilGeometryProbability with the surfaceLine which should result that the top part of the 
         // SoilProfile2D is removed (between top boundary of the SoilProfile2D and the surfaceLine)
-        MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil());
-        GeometryData geometry = soilGeometryProbability.SoilProfile2D.Geometry;
+        var combinedProfile = MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil());
+        GeometryData geometry = combinedProfile.Geometry;
         // For debugging purposes
         // GeometryExporter.ExportToFile(geometry, visualizationFolder + "Geometry.txt");
         // GeometryExporter.ExportToJsonFile(geometry, visualizationFolder + "Geometry.json");
@@ -254,8 +254,8 @@
         SurfaceLine2 surfaceLine = FactoryForSurfaceLines.CreateSurfaceLineCuttingSurfaceLineDikeAndDitch();
         // Now combine the soilGeometryProbability with the surfaceLine which should result that the top part of the 
         // SoilProfile2D is removed (between top boundary of the SoilProfile2D and the surfaceLine)
-        MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil());
-        GeometryData geometry = soilGeometryProbability.SoilProfile2D.Geometry;
+        var combinedProfile = MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil());
+        GeometryData geometry = combinedProfile.Geometry;
         // For debugging purposes
         // GeometryExporter.ExportToFile(geometry, visualizationFolder + "Geometry.txt");
         // GeometryExporter.ExportToJsonFile(geometry, visualizationFolder + "Geometry.json");