Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Extensions/PipingInputExtensionsTest.cs
===================================================================
diff -u -r0c2ba533bc2cf8f4693c468e07f73737e2cc6644 -r1c01ea681887e96b5b80fb7d23680a4eeac9bd50
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Extensions/PipingInputExtensionsTest.cs	(.../PipingInputExtensionsTest.cs)	(revision 0c2ba533bc2cf8f4693c468e07f73737e2cc6644)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Extensions/PipingInputExtensionsTest.cs	(.../PipingInputExtensionsTest.cs)	(revision 1c01ea681887e96b5b80fb7d23680a4eeac9bd50)
@@ -15,7 +15,7 @@
         public void SetSurfaceLine_WithDikeToeDikeSideAndDikeToeRiverSide_SetsExitPointLAndSeePageLength()
         {
             // Setup
-            var inputParameters = new PipingInput();
+            var inputParameters = new PipingInput(new GeneralPipingInput());
             RingtoetsPipingSurfaceLine surfaceLine = new RingtoetsPipingSurfaceLine();
             var firstPointX = 1.0;
             var secondPointX = 4.0;
@@ -41,7 +41,7 @@
         public void SetSurfaceLine_Null_SetsExitPointLAndSeePageLengthMeanToNaN()
         {
             // Setup
-            var inputParameters = new PipingInput();
+            var inputParameters = new PipingInput(new GeneralPipingInput());
             RingtoetsPipingSurfaceLine surfaceLine = new RingtoetsPipingSurfaceLine();
             var firstPointX = 1.0;
             var secondPointX = 4.0;
@@ -69,7 +69,7 @@
         public void SetSurfaceLine_WithoutDikeToeDikeSideAndDikeToeRiverSide_ExitPointAtEndAndSeePageLengthIsLengthInX()
         {
             // Setup
-            var inputParameters = new PipingInput();
+            var inputParameters = new PipingInput(new GeneralPipingInput());
             RingtoetsPipingSurfaceLine surfaceLine = new RingtoetsPipingSurfaceLine();
             var firstPointX = 1.0;
             var secondPointX = 4.0;
@@ -93,7 +93,7 @@
         public void SetSurfaceLine_WithoutDikeToeDikeSide_ExitPointSetSeePageLengthStartToExitPointInX()
         {
             // Setup
-            var inputParameters = new PipingInput();
+            var inputParameters = new PipingInput(new GeneralPipingInput());
             RingtoetsPipingSurfaceLine surfaceLine = new RingtoetsPipingSurfaceLine();
             var firstPointX = 1.0;
             var secondPointX = 3.0;
@@ -122,7 +122,7 @@
         public void SetSurfaceLine_WithoutDikeToeRiverSide_ExitPointAtEndSeePageLengthLessThanLengthInX()
         {
             // Setup
-            var inputParameters = new PipingInput();
+            var inputParameters = new PipingInput(new GeneralPipingInput());
             RingtoetsPipingSurfaceLine surfaceLine = new RingtoetsPipingSurfaceLine();
             var firstPointX = 1.0;
             var secondPointX = 3.0;
@@ -167,7 +167,7 @@
                     IsAquifer = true
                 }
             });
-            var input = new PipingInput
+            var input = new PipingInput(new GeneralPipingInput())
             {
                 SurfaceLine = surfaceLine,
                 SoilProfile = soilProfile,
@@ -191,7 +191,7 @@
         {
             // Setup
             var surfaceLine = ValidSurfaceLine(0.0, 4.0);
-            var input = new PipingInput();
+            var input = new PipingInput(new GeneralPipingInput());
             input.SetSurfaceLine(surfaceLine);
 
             input.SeepageLength.Mean = seepageLength; // L-coordinate of entry point at 4.0 - seepageLength
@@ -211,7 +211,7 @@
             var surfaceLine = ValidSurfaceLine(0.0, 4.0);
 
             var l = 2.0;
-            var input = new PipingInput
+            var input = new PipingInput(new GeneralPipingInput())
             {
                 SurfaceLine = surfaceLine,
                 ExitPointL = l
@@ -232,7 +232,7 @@
             var exitPointOld = 4.0;
             var seepageLength = 3.0;
             var surfaceLine = ValidSurfaceLine(0.0, exitPointOld);
-            var input = new PipingInput();
+            var input = new PipingInput(new GeneralPipingInput());
             input.SetSurfaceLine(surfaceLine);
             input.SeepageLength.Mean = seepageLength;
             var entryPointL = exitPointOld - seepageLength;
@@ -271,7 +271,7 @@
                     IsAquifer = false
                 }
             });
-            var input = new PipingInput();
+            var input = new PipingInput(new GeneralPipingInput());
 
             // Call
             Action call = null;
@@ -306,8 +306,10 @@
                     IsAquifer = false
                 }
             });
-            var input = new PipingInput();
-            input.SoilProfile = soilProfile;
+            var input = new PipingInput(new GeneralPipingInput())
+            {
+                SoilProfile = soilProfile
+            };
 
             // Call
             Action call = () => input.SetSurfaceLine(surfaceLine);
@@ -340,7 +342,7 @@
                     IsAquifer = false
                 }
             });
-            var input = new PipingInput();
+            var input = new PipingInput(new GeneralPipingInput());
             input.SetSurfaceLine(surfaceLine);
             input.SetSoilProfile(soilProfile);
 
@@ -378,7 +380,7 @@
                 }
             });
 
-            var input = new PipingInput();
+            var input = new PipingInput(new GeneralPipingInput());
 
             input.SetSurfaceLine(surfaceLine);
             input.SetExitPointL(0.5);
@@ -415,7 +417,7 @@
                     IsAquifer = false
                 }
             });
-            var input = new PipingInput
+            var input = new PipingInput(new GeneralPipingInput())
             {
                 SoilProfile = soilProfile,
                 ExitPointL = 0.5
@@ -455,7 +457,7 @@
                     IsAquifer = false
                 }
             });
-            var input = new PipingInput
+            var input = new PipingInput(new GeneralPipingInput())
             {
                 SurfaceLine = surfaceLine,
                 ExitPointL = 0.5
@@ -495,7 +497,7 @@
                     IsAquifer = false
                 }
             });
-            var input = new PipingInput
+            var input = new PipingInput(new GeneralPipingInput())
             {
                 SurfaceLine = surfaceLine,
                 SoilProfile = soilProfile