Index: dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs
===================================================================
diff -u -r752 -r764
--- dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs	(.../DamPipingSellmeijer4ForcesKernelWrapperTests.cs)	(revision 752)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs	(.../DamPipingSellmeijer4ForcesKernelWrapperTests.cs)	(revision 764)
@@ -31,6 +31,7 @@
 using Deltares.DamEngine.Data.Geotechnics;
 using Deltares.DamEngine.Data.Standard.Calculation;
 using Deltares.DamEngine.Data.Standard.Logging;
+using Deltares.DamEngine.TestHelpers;
 using NUnit.Framework;
 
 namespace Deltares.DamEngine.Calculators.Tests.KernelWrappers.DamPipingSellmeijer4Forces
@@ -52,7 +53,7 @@
 
             var location = new Location("Location 1")
             {
-                SurfaceLine = CreateSurfaceLineTutorial1()
+                SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1()
             };
 
             var designScenario = new DesignScenario
@@ -126,7 +127,7 @@
             designScenario.ModelFactors.UpliftCriterionPiping = 1.0;
 
             var location = new Location();
-            location.SurfaceLine = CreateSurfaceLineTutorial1();
+            location.SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1();
 
             var subSoilScenario = new SoilGeometryProbability();
             subSoilScenario.SoilProfile1D = CreatePipingSellmeijerProfileWithOneSandlayer();
@@ -298,31 +299,5 @@
             return soilProfile1D;
         }
 
-        private static SurfaceLine2 CreateSurfaceLineTutorial1(bool includingTraffic = false)
-        {
-            SurfaceLine2 surfaceLine2 = new SurfaceLine2();
-            surfaceLine2.Name = "Tutorial1";
-            surfaceLine2.Geometry = new GeometryPointString();
-            surfaceLine2.CharacteristicPoints.GeometryMustContainPoint = true;
-            SurfaceLine2 line = surfaceLine2;
-            line.EnsurePointOfType(0.0, 0.0, CharacteristicPointType.SurfaceLevelOutside);
-            line.EnsurePointOfType(10.0, 0.0, CharacteristicPointType.DikeToeAtRiver);
-            line.EnsurePointOfType(34.5, 5.0, CharacteristicPointType.DikeTopAtRiver);
-            if (includingTraffic)
-            {
-                line.EnsurePointOfType(35.0, 5.0, CharacteristicPointType.TrafficLoadOutside);
-                line.EnsurePointOfType(38.5, 5.0, CharacteristicPointType.TrafficLoadInside);
-            }
-            line.EnsurePointOfType(40.5, 5.0, CharacteristicPointType.DikeTopAtPolder);
-            line.EnsurePointOfType(50.5, 0.0, CharacteristicPointType.DikeToeAtPolder);
-            line.EnsurePointOfType(58.5, 0.0, CharacteristicPointType.DitchDikeSide);
-            line.EnsurePointOfType(59.5, -2.0, CharacteristicPointType.BottomDitchDikeSide);
-            line.EnsurePointOfType(61.5, -2.0, CharacteristicPointType.BottomDitchPolderSide);
-            line.EnsurePointOfType(61.5, 0.0, CharacteristicPointType.DitchPolderSide);
-            line.EnsurePointOfType(75.0, 0.0, CharacteristicPointType.SurfaceLevelInside);
-            line.Geometry.SyncCalcPoints();
-            return line;
-        }
-
     }
 }
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs
===================================================================
diff -u -r686 -r764
--- dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs	(.../PlLinesHelperTests.cs)	(revision 686)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs	(.../PlLinesHelperTests.cs)	(revision 764)
@@ -8,6 +8,7 @@
 using Deltares.DamEngine.Data.General.PlLines;
 using Deltares.DamEngine.Data.Geometry;
 using Deltares.DamEngine.Data.Geotechnics;
+using Deltares.DamEngine.TestHelpers;
 using NUnit.Framework;
 
 namespace Deltares.DamEngine.Calculators.Tests.KernelWrappers.Common
@@ -21,7 +22,7 @@
             // expected values retrieved from debugging Dam Classic (rev.663) 
             // test CanCalculateThePipingFactorUsingSellmeijer4Forces
             var location = new Location();
-            location.SurfaceLine = CreateSurfaceLineTutorial1();
+            location.SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1();
             var soilProfile1D = CreatePipingSellmeijerProfileWithOneSandlayer();
             var riverLevel = 1.0;
             UpliftSituation upliftSituation;
@@ -71,33 +72,5 @@
             return soilProfile1D;
         }
 
-        private static SurfaceLine2 CreateSurfaceLineTutorial1(bool includingTraffic = false)
-        {
-            SurfaceLine2 surfaceLine2 = new SurfaceLine2();
-            surfaceLine2.Name = "Tutorial1";
-            surfaceLine2.Geometry = new GeometryPointString();
-            surfaceLine2.CharacteristicPoints.GeometryMustContainPoint = true;
-            SurfaceLine2 line = surfaceLine2;
-            line.EnsurePointOfType(0.0, 0.0, CharacteristicPointType.SurfaceLevelOutside);
-            line.EnsurePointOfType(10.0, 0.0, CharacteristicPointType.DikeToeAtRiver);
-            line.EnsurePointOfType(34.5, 5.0, CharacteristicPointType.DikeTopAtRiver);
-            if (includingTraffic)
-            {
-                line.EnsurePointOfType(35.0, 5.0, CharacteristicPointType.TrafficLoadOutside);
-                line.EnsurePointOfType(38.5, 5.0, CharacteristicPointType.TrafficLoadInside);
-            }
-            line.EnsurePointOfType(40.5, 5.0, CharacteristicPointType.DikeTopAtPolder);
-            line.EnsurePointOfType(50.5, 0.0, CharacteristicPointType.DikeToeAtPolder);
-            line.EnsurePointOfType(58.5, 0.0, CharacteristicPointType.DitchDikeSide);
-            line.EnsurePointOfType(59.5, -2.0, CharacteristicPointType.BottomDitchDikeSide);
-            line.EnsurePointOfType(61.5, -2.0, CharacteristicPointType.BottomDitchPolderSide);
-            line.EnsurePointOfType(61.5, 0.0, CharacteristicPointType.DitchPolderSide);
-            line.EnsurePointOfType(75.0, 0.0, CharacteristicPointType.SurfaceLevelInside);
-            line.Geometry.SyncCalcPoints();
-            return line;
-        }
-
-
-
     }
 }
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs
===================================================================
diff -u -r761 -r764
--- dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs	(.../DamPipingSellmeijerVnkKernelWrapperTests.cs)	(revision 761)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs	(.../DamPipingSellmeijerVnkKernelWrapperTests.cs)	(revision 764)
@@ -74,7 +74,7 @@
 
             var location = new Location("Location 1")
             {
-                SurfaceLine = CreateSurfaceLineTutorial1()
+                SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1()
             };
 
             var designScenario = new DesignScenario
@@ -148,7 +148,7 @@
             designScenario.ModelFactors.UpliftCriterionPiping = 1.0;
 
             var location = new Location();
-            location.SurfaceLine = CreateSurfaceLineTutorial1();
+            location.SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1();
 
             var subSoilScenario = new SoilGeometryProbability();
             subSoilScenario.SoilProfile1D = CreatePipingSellmeijerProfileWithTwoSandlayers();
@@ -361,31 +361,5 @@
             return soilProfile1D;
         }
 
-        private static SurfaceLine2 CreateSurfaceLineTutorial1(bool includingTraffic = false)
-        {
-            SurfaceLine2 surfaceLine2 = new SurfaceLine2();
-            surfaceLine2.Name = "Tutorial1";
-            surfaceLine2.Geometry = new GeometryPointString();
-            surfaceLine2.CharacteristicPoints.GeometryMustContainPoint = true;
-            SurfaceLine2 line = surfaceLine2;
-            line.EnsurePointOfType(0.0, 0.0, CharacteristicPointType.SurfaceLevelOutside);
-            line.EnsurePointOfType(10.0, 0.0, CharacteristicPointType.DikeToeAtRiver);
-            line.EnsurePointOfType(34.5, 5.0, CharacteristicPointType.DikeTopAtRiver);
-            if (includingTraffic)
-            {
-                line.EnsurePointOfType(35.0, 5.0, CharacteristicPointType.TrafficLoadOutside);
-                line.EnsurePointOfType(38.5, 5.0, CharacteristicPointType.TrafficLoadInside);
-            }
-            line.EnsurePointOfType(40.5, 5.0, CharacteristicPointType.DikeTopAtPolder);
-            line.EnsurePointOfType(50.5, 0.0, CharacteristicPointType.DikeToeAtPolder);
-            line.EnsurePointOfType(58.5, 0.0, CharacteristicPointType.DitchDikeSide);
-            line.EnsurePointOfType(59.5, -2.0, CharacteristicPointType.BottomDitchDikeSide);
-            line.EnsurePointOfType(61.5, -2.0, CharacteristicPointType.BottomDitchPolderSide);
-            line.EnsurePointOfType(61.5, 0.0, CharacteristicPointType.DitchPolderSide);
-            line.EnsurePointOfType(75.0, 0.0, CharacteristicPointType.SurfaceLevelInside);
-            line.Geometry.SyncCalcPoints();
-            return line;
-        }
-
     }
 }
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs
===================================================================
diff -u -r761 -r764
--- dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs	(.../DamPipingBlighKernelWrapperTests.cs)	(revision 761)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs	(.../DamPipingBlighKernelWrapperTests.cs)	(revision 764)
@@ -52,7 +52,7 @@
 
             var location = new Location("Location 1")
             {
-                SurfaceLine = CreateSurfaceLineTutorial1()
+                SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1()
             };
 
             var designScenario = new DesignScenario
@@ -126,7 +126,7 @@
             designScenario.ModelFactors.UpliftCriterionPiping = 1.0;
 
             var location = new Location();
-            location.SurfaceLine = CreateSurfaceLineTutorial1();
+            location.SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1();
 
             var subSoilScenario = new SoilGeometryProbability();
             subSoilScenario.SoilProfile1D = CreateClaySandProfileForPipingBligh();
@@ -294,30 +294,5 @@
             return soilProfile1D;
         }
 
-        private static SurfaceLine2 CreateSurfaceLineTutorial1(bool includingTraffic = false)
-        {
-            SurfaceLine2 surfaceLine2 = new SurfaceLine2();
-            surfaceLine2.Name = "Tutorial1";
-            surfaceLine2.Geometry = new GeometryPointString();
-            surfaceLine2.CharacteristicPoints.GeometryMustContainPoint = true;
-            SurfaceLine2 line = surfaceLine2;
-            line.EnsurePointOfType(0.0, 0.0, CharacteristicPointType.SurfaceLevelOutside);
-            line.EnsurePointOfType(10.0, 0.0, CharacteristicPointType.DikeToeAtRiver);
-            line.EnsurePointOfType(34.5, 5.0, CharacteristicPointType.DikeTopAtRiver);
-            if (includingTraffic)
-            {
-                line.EnsurePointOfType(35.0, 5.0, CharacteristicPointType.TrafficLoadOutside);
-                line.EnsurePointOfType(38.5, 5.0, CharacteristicPointType.TrafficLoadInside);
-            }
-            line.EnsurePointOfType(40.5, 5.0, CharacteristicPointType.DikeTopAtPolder);
-            line.EnsurePointOfType(50.5, 0.0, CharacteristicPointType.DikeToeAtPolder);
-            line.EnsurePointOfType(58.5, 0.0, CharacteristicPointType.DitchDikeSide);
-            line.EnsurePointOfType(59.5, -2.0, CharacteristicPointType.BottomDitchDikeSide);
-            line.EnsurePointOfType(61.5, -2.0, CharacteristicPointType.BottomDitchPolderSide);
-            line.EnsurePointOfType(61.5, 0.0, CharacteristicPointType.DitchPolderSide);
-            line.EnsurePointOfType(75.0, 0.0, CharacteristicPointType.SurfaceLevelInside);
-            line.Geometry.SyncCalcPoints();
-            return line;
-        }
     }
 }