Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSurfaceLines.cs
===================================================================
diff -u -r5427 -r5555
--- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSurfaceLines.cs	(.../FactoryForSurfaceLines.cs)	(revision 5427)
+++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSurfaceLines.cs	(.../FactoryForSurfaceLines.cs)	(revision 5555)
@@ -24,7 +24,7 @@
 
 namespace Deltares.DamEngine.TestHelpers.Factories;
 
-public class FactoryForSurfaceLines
+public static class FactoryForSurfaceLines
 {
     /// <summary>
     /// Creates a surface line, that is almost the same as Tutorial 1 
@@ -221,95 +221,6 @@
     }
 
     /// <summary>
-    /// Creates a surface line for BM4 01.
-    /// </summary>
-    /// <returns>surface line</returns>
-    public static SurfaceLine2 CreateSurfaceLineBm4_01()
-    {
-        var surfaceLine = new SurfaceLine2
-        {
-            CharacteristicPoints =
-            {
-                GeometryMustContainPoint = true
-            },
-            Geometry = new GeometryPointString()
-        };
-        surfaceLine.EnsurePointOfType(0.0, 0.1, CharacteristicPointType.SurfaceLevelOutside);
-        surfaceLine.EnsurePointOfType(4.0, 0.0, CharacteristicPointType.DikeToeAtRiver);
-        surfaceLine.EnsurePointOfType(6.4, 1.3, CharacteristicPointType.ShoulderTopOutside);
-        surfaceLine.EnsurePointOfType(7.9, 1.5, CharacteristicPointType.ShoulderBaseOutside);
-        surfaceLine.EnsurePointOfType(10.0, 3.0, CharacteristicPointType.DikeTopAtRiver);
-        surfaceLine.EnsurePointOfType(13, 3.2, CharacteristicPointType.DikeTopAtPolder);
-        surfaceLine.EnsurePointOfType(15.6, 1.2, CharacteristicPointType.ShoulderBaseInside);
-        surfaceLine.EnsurePointOfType(17, 1.0, CharacteristicPointType.ShoulderTopInside);
-        surfaceLine.EnsurePointOfType(18.6, 0.2, CharacteristicPointType.DikeToeAtPolder);
-        surfaceLine.EnsurePointOfType(23, 0.1, CharacteristicPointType.DitchDikeSide);
-        surfaceLine.EnsurePointOfType(26, -0.45, CharacteristicPointType.BottomDitchDikeSide);
-        surfaceLine.EnsurePointOfType(28.5, -0.48, CharacteristicPointType.BottomDitchPolderSide);
-        surfaceLine.EnsurePointOfType(31, 0.0, CharacteristicPointType.DitchPolderSide);
-        surfaceLine.EnsurePointOfType(45, 0.1, CharacteristicPointType.SurfaceLevelInside);
-        surfaceLine.Geometry.SyncCalcPoints();
-        return surfaceLine;
-    }
-
-    /// <summary>
-    /// Creates a surface line for BM4 02.
-    /// </summary>
-    /// <returns>surface line</returns>
-    public static SurfaceLine2 CreateSurfaceLineBm4_02()
-    {
-        var surfaceLine = new SurfaceLine2
-        {
-            CharacteristicPoints =
-            {
-                GeometryMustContainPoint = true
-            },
-            Geometry = new GeometryPointString()
-        };
-        surfaceLine.EnsurePointOfType(0.0, 1.0, CharacteristicPointType.SurfaceLevelOutside);
-        surfaceLine.EnsurePointOfType(30.0, 0.0, CharacteristicPointType.DikeToeAtRiver);
-        surfaceLine.EnsurePointOfType(45.0, 6.0, CharacteristicPointType.ShoulderTopOutside);
-        surfaceLine.EnsurePointOfType(55.0, 7.0, CharacteristicPointType.ShoulderBaseOutside);
-        surfaceLine.EnsurePointOfType(80.0, 16.0, CharacteristicPointType.DikeTopAtRiver);
-        surfaceLine.EnsurePointOfType(85.0, 16.3, CharacteristicPointType.TrafficLoadOutside);
-        surfaceLine.EnsurePointOfType(90.0, 16.6, CharacteristicPointType.TrafficLoadInside);
-        surfaceLine.EnsurePointOfType(95.0, 16.9, CharacteristicPointType.DikeTopAtPolder);
-        surfaceLine.EnsurePointOfType(120.0, 5.5, CharacteristicPointType.ShoulderBaseInside);
-        surfaceLine.EnsurePointOfType(127.0, 4.8, CharacteristicPointType.ShoulderTopInside);
-        surfaceLine.EnsurePointOfType(140.0, 0.5, CharacteristicPointType.DikeToeAtPolder);
-        surfaceLine.EnsurePointOfType(165.0, 0.0, CharacteristicPointType.DitchDikeSide);
-        surfaceLine.EnsurePointOfType(175.0, -3.4, CharacteristicPointType.BottomDitchDikeSide);
-        surfaceLine.EnsurePointOfType(188.0, -3.0, CharacteristicPointType.BottomDitchPolderSide);
-        surfaceLine.EnsurePointOfType(200.0, 0.0, CharacteristicPointType.DitchPolderSide);
-        surfaceLine.EnsurePointOfType(220.0, -0.5, CharacteristicPointType.SurfaceLevelInside);
-        surfaceLine.Geometry.SyncCalcPoints();
-        return surfaceLine;
-    }
-
-    /// <summary>
-    /// Creates a simple surface line for exit point test.
-    /// </summary>
-    /// <returns>surface line</returns>
-    public static SurfaceLine2 CreateSimpleSurfaceLineForExitPointTest()
-    {
-        var surfaceLine = new SurfaceLine2
-        {
-            Name = "SimpleExitPoint"
-        };
-
-        surfaceLine.EnsurePointOfType(0.0, 0, CharacteristicPointType.SurfaceLevelOutside);
-        surfaceLine.EnsurePointOfType(10.0, 0, CharacteristicPointType.DikeToeAtRiver);
-        surfaceLine.EnsurePointOfType(34.5, 5, CharacteristicPointType.DikeTopAtRiver);
-        surfaceLine.EnsurePointOfType(40.5, 5, CharacteristicPointType.DikeTopAtPolder);
-        surfaceLine.EnsurePointOfType(50.5, 0, CharacteristicPointType.DikeToeAtPolder);
-        surfaceLine.EnsurePoint(60.5, -1);
-        surfaceLine.EnsurePointOfType(75.0, 0, CharacteristicPointType.SurfaceLevelInside);
-
-        surfaceLine.Geometry.SyncCalcPoints();
-        return surfaceLine;
-    }
-
-    /// <summary>
     /// Creates a horizontal surface line.
     /// </summary>
     /// <returns>surface line</returns>
@@ -331,112 +242,6 @@
     }
 
     /// <summary>
-    /// Creates a descending surface line for benchmark 2.
-    /// </summary>
-    /// <returns>surface line</returns>
-    public static SurfaceLine2 CreateDescendingSurfaceLineForBenchmark2()
-    {
-        var surfaceLine = new SurfaceLine2
-        {
-            Name = "NonHorizontalLine"
-        };
-
-        surfaceLine.EnsurePointOfType(30, -0.2, CharacteristicPointType.DikeToeAtPolder);
-        surfaceLine.EnsurePointOfType(70, -1.8, CharacteristicPointType.SurfaceLevelInside);
-
-        surfaceLine.Geometry.SyncCalcPoints();
-        return surfaceLine;
-    }
-
-    /// <summary>
-    /// Creates a horizontal surface line with symmetrical ditch for benchmark 5.
-    /// </summary>
-    /// <returns>surface line</returns>
-    public static SurfaceLine2 CreateHorizontalSurfaceLineWithSymmetricalDitchForBenchmark5()
-    {
-        var surfaceLine = new SurfaceLine2
-        {
-            Name = "HorizontalLineWithSymmetricalDitch"
-        };
-
-        surfaceLine.EnsurePointOfType(30, 0, CharacteristicPointType.DikeToeAtPolder);
-        surfaceLine.EnsurePointOfType(35, 0, CharacteristicPointType.DitchDikeSide);
-        surfaceLine.EnsurePointOfType(36, -1.2, CharacteristicPointType.BottomDitchDikeSide);
-        surfaceLine.EnsurePointOfType(37, -1.2, CharacteristicPointType.BottomDitchPolderSide);
-        surfaceLine.EnsurePointOfType(38, 0, CharacteristicPointType.DitchPolderSide);
-        surfaceLine.EnsurePointOfType(70, 0, CharacteristicPointType.SurfaceLevelInside);
-
-        surfaceLine.Geometry.SyncCalcPoints();
-        return surfaceLine;
-    }
-
-    /// <summary>
-    /// Creates a non horizontal line with asymmetrical ditch for benchmark 6.
-    /// </summary>
-    /// <returns>surface line</returns>
-    public static SurfaceLine2 CreateNonHorizontalLineWithAsymmetricalDitchForBenchmark6()
-    {
-        var surfaceLine = new SurfaceLine2
-        {
-            Name = "NonHorizontalLineWithAsymmetricalDitch"
-        };
-
-        surfaceLine.EnsurePointOfType(30, 0, CharacteristicPointType.DikeToeAtPolder);
-        surfaceLine.EnsurePointOfType(35.2, -0.208, CharacteristicPointType.DitchDikeSide);
-        surfaceLine.EnsurePointOfType(36, -1.2, CharacteristicPointType.BottomDitchDikeSide);
-        surfaceLine.EnsurePointOfType(37, -1.3, CharacteristicPointType.BottomDitchPolderSide);
-        surfaceLine.EnsurePointOfType(38, -0.5, CharacteristicPointType.DitchPolderSide);
-        surfaceLine.EnsurePointOfType(70, -0.8, CharacteristicPointType.SurfaceLevelInside);
-
-        surfaceLine.Geometry.SyncCalcPoints();
-        return surfaceLine;
-    }
-
-    /// <summary>
-    /// Creates a surface line with asymmetrical ditch high polder side.
-    /// </summary>
-    /// <returns>surface line</returns>
-    public static SurfaceLine2 CreateSurfaceLineWithAsymmetricalDitchHighPolderSide()
-    {
-        var surfaceLine = new SurfaceLine2
-        {
-            Name = "AsymmetricalDitchHighPolderSide"
-        };
-
-        surfaceLine.EnsurePointOfType(30, 0, CharacteristicPointType.DikeToeAtPolder);
-        surfaceLine.EnsurePointOfType(35, 0, CharacteristicPointType.DitchDikeSide);
-        surfaceLine.EnsurePointOfType(36, -1, CharacteristicPointType.BottomDitchDikeSide);
-        surfaceLine.EnsurePointOfType(37, -1, CharacteristicPointType.BottomDitchPolderSide);
-        surfaceLine.EnsurePointOfType(38, 1, CharacteristicPointType.DitchPolderSide);
-        surfaceLine.EnsurePointOfType(70, 0, CharacteristicPointType.SurfaceLevelInside);
-
-        surfaceLine.Geometry.SyncCalcPoints();
-        return surfaceLine;
-    }
-
-    /// <summary>
-    /// Creates a surface line with asymmetrical ditch high dike side.
-    /// </summary>
-    /// <returns>surface line</returns>
-    public static SurfaceLine2 CreateSurfaceLineWithAsymmetricalDitchHighDikeSide()
-    {
-        var surfaceLine = new SurfaceLine2
-        {
-            Name = "AsymmetricalDitchHighPolderSide"
-        };
-
-        surfaceLine.EnsurePointOfType(30, 0, CharacteristicPointType.DikeToeAtPolder);
-        surfaceLine.EnsurePointOfType(35, 3, CharacteristicPointType.DitchDikeSide);
-        surfaceLine.EnsurePointOfType(36, -1, CharacteristicPointType.BottomDitchDikeSide);
-        surfaceLine.EnsurePointOfType(37, -1, CharacteristicPointType.BottomDitchPolderSide);
-        surfaceLine.EnsurePointOfType(38, 0, CharacteristicPointType.DitchPolderSide);
-        surfaceLine.EnsurePointOfType(70, 0, CharacteristicPointType.SurfaceLevelInside);
-
-        surfaceLine.Geometry.SyncCalcPoints();
-        return surfaceLine;
-    }
-
-    /// <summary>
     /// Create a simple surface line without shoulder
     /// </summary>
     /// <returns>surface line</returns>
@@ -490,30 +295,6 @@
     /// Create a simple surface line without shoulder and with ditch at polder side
     /// </summary>
     /// <returns>surface line</returns>
-    public static SurfaceLine2 CreateSurfacelineSimpleDikeWithDitchAtPolderSide()
-    {
-        var surfaceLine = new SurfaceLine2
-        {
-            Geometry = new GeometryPointString(),
-            CharacteristicPoints =
-            {
-                GeometryMustContainPoint = true
-            }
-        };
-        surfaceLine.EnsurePointOfType(0.0, 0.0, CharacteristicPointType.SurfaceLevelOutside);
-        surfaceLine.EnsurePointOfType(10.0, 0.0, CharacteristicPointType.DikeToeAtRiver);
-        surfaceLine.EnsurePointOfType(20.0, 5.0, CharacteristicPointType.DikeTopAtRiver);
-        surfaceLine.EnsurePointOfType(25.0, 5.0, CharacteristicPointType.DikeTopAtPolder);
-        surfaceLine.EnsurePointOfType(30.0, 0.0, CharacteristicPointType.DikeToeAtPolder);
-        surfaceLine.EnsurePointOfType(35.0, 0.0, CharacteristicPointType.DitchDikeSide);
-        surfaceLine.EnsurePointOfType(36.0, -1.0, CharacteristicPointType.BottomDitchDikeSide);
-        surfaceLine.EnsurePointOfType(38.0, -1.0, CharacteristicPointType.BottomDitchPolderSide);
-        surfaceLine.EnsurePointOfType(39.0, 0.0, CharacteristicPointType.DitchPolderSide);
-        surfaceLine.EnsurePointOfType(100.0, 0.0, CharacteristicPointType.SurfaceLevelInside);
-        surfaceLine.Geometry.SyncCalcPoints();
-        return surfaceLine;
-    }
-
     public static SurfaceLine2 CreateSurfaceLineForWtiPiping(bool includingTraffic = false)
     {
         //Surface line tutorial 1