Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSurfaceLines.cs
===================================================================
diff -u -r5555 -r5556
--- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSurfaceLines.cs	(.../FactoryForSurfaceLines.cs)	(revision 5555)
+++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSurfaceLines.cs	(.../FactoryForSurfaceLines.cs)	(revision 5556)
@@ -242,6 +242,29 @@
     }
 
     /// <summary>
+    /// Creates a surface line based on tutorial DWP_1
+    /// </summary>
+    /// <returns>surface line</returns>
+    public static SurfaceLine2 CreateSurfaceLineForTestingGrid(double left, double right)
+    {
+        var surfaceLine = new SurfaceLine2
+        {
+            Geometry = new GeometryPointString(),
+            CharacteristicPoints =
+            {
+                GeometryMustContainPoint = true
+            }
+        };
+        surfaceLine.EnsurePointOfType(left, 0.0, CharacteristicPointType.SurfaceLevelOutside);
+        surfaceLine.EnsurePointOfType(29.86, 3.74, CharacteristicPointType.DikeTopAtRiver);
+        surfaceLine.EnsurePointOfType(33.18, 3.81, CharacteristicPointType.DikeTopAtPolder);
+        surfaceLine.EnsurePointOfType(59.96, -0.29, CharacteristicPointType.DikeToeAtPolder);
+        surfaceLine.EnsurePointOfType(right, 0.0, CharacteristicPointType.SurfaceLevelInside);
+        surfaceLine.Geometry.SyncCalcPoints();
+        return surfaceLine;
+    }
+
+    /// <summary>
     /// Create a simple surface line without shoulder
     /// </summary>
     /// <returns>surface line</returns>
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/UpliftVanGridCreatorTests.cs
===================================================================
diff -u -r5540 -r5556
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/UpliftVanGridCreatorTests.cs	(.../UpliftVanGridCreatorTests.cs)	(revision 5540)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/UpliftVanGridCreatorTests.cs	(.../UpliftVanGridCreatorTests.cs)	(revision 5556)
@@ -24,6 +24,7 @@
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.Geometry;
 using Deltares.DamEngine.Data.Geotechnics;
+using Deltares.DamEngine.TestHelpers.Factories;
 using NUnit.Framework;
 
 namespace Deltares.DamEngine.Calculators.Tests.KernelWrappers.MacroStabilityInwards;
@@ -36,10 +37,7 @@
    {
        // Given
        SlipCircleDefinition slipCircleDefinition = CreateSlipCircleDefinitionSpecified();
-       SurfaceLine2 surfaceLine = CreateSurfaceLine();
-       surfaceLine.AddCharacteristicPoint(new GeometryPoint(10.0, 0.0));
-       surfaceLine.AddCharacteristicPoint(new GeometryPoint(80.0, 0.0));
-       surfaceLine.Geometry.SyncCalcPoints();
+       SurfaceLine2 surfaceLine = FactoryForSurfaceLines.CreateSurfaceLineForTestingGrid(10.0, 80.0);
        // When
        UpliftVanCalculationGrid upliftVanCalculationGrid = UpliftVanGridCreator.DetermineGridsFromSettings(slipCircleDefinition, surfaceLine);
        // Then
@@ -60,10 +58,7 @@
    {
        // Given
        SlipCircleDefinition slipCircleDefinition = CreateSlipCircleDefinitionSpecified();
-       SurfaceLine2 surfaceLine = CreateSurfaceLine();
-       surfaceLine.AddCharacteristicPoint(new GeometryPoint(10.0, 0.0));
-       surfaceLine.AddCharacteristicPoint(new GeometryPoint(65.0, 0.0));
-       surfaceLine.Geometry.SyncCalcPoints();
+       SurfaceLine2 surfaceLine = FactoryForSurfaceLines.CreateSurfaceLineForTestingGrid(10.0, 65.0);
        // When
        UpliftVanCalculationGrid upliftVanCalculationGrid = UpliftVanGridCreator.DetermineGridsFromSettings(slipCircleDefinition, surfaceLine);
        // Then
@@ -82,10 +77,7 @@
        // Given
        SlipCircleDefinition slipCircleDefinition = CreateSlipCircleDefinitionSpecified();
        slipCircleDefinition.XCoordinateLastUpliftPoint = 75.0;
-       SurfaceLine2 surfaceLine = CreateSurfaceLine();
-       surfaceLine.AddCharacteristicPoint(new GeometryPoint(10.0, 0.0));
-       surfaceLine.AddCharacteristicPoint(new GeometryPoint(80.0, 0.0));
-       surfaceLine.Geometry.SyncCalcPoints();
+       SurfaceLine2 surfaceLine = FactoryForSurfaceLines.CreateSurfaceLineForTestingGrid(10.0, 80.0);
        // When
        UpliftVanCalculationGrid upliftVanCalculationGrid = UpliftVanGridCreator.DetermineGridsFromSettings(slipCircleDefinition, surfaceLine);
        // Then
@@ -109,7 +101,7 @@
        {
            GridSizeDetermination = GridSizeDetermination.Automatic
        };
-       SurfaceLine2 surfaceLine = CreateSurfaceLine();
+       SurfaceLine2 surfaceLine = FactoryForSurfaceLines.CreateSurfaceLineForTestingGrid(10.0, 80.0);
        // When
        UpliftVanCalculationGrid upliftVanCalculationGrid = UpliftVanGridCreator.DetermineGridsFromSettings(slipCircleDefinition, surfaceLine);
        // Then
@@ -144,22 +136,6 @@
         });
     }
    
-   private static SurfaceLine2 CreateSurfaceLine()
-   {
-       var surfaceLine = new SurfaceLine2
-       {
-           Geometry = new GeometryPointString(),
-           CharacteristicPoints =
-           {
-               GeometryMustContainPoint = true
-           }
-       };
-       surfaceLine.EnsurePointOfType(29.86, 3.74, CharacteristicPointType.DikeTopAtRiver);
-       surfaceLine.EnsurePointOfType(33.18, 3.81, CharacteristicPointType.DikeTopAtPolder);
-       surfaceLine.EnsurePointOfType(59.96, -0.29, CharacteristicPointType.DikeToeAtPolder);
-       return surfaceLine;
-   }
-
    private static SlipCircleDefinition CreateSlipCircleDefinitionSpecified()
    {
        var slipCircleDefinition = new SlipCircleDefinition