Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs
===================================================================
diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -r57bc6a475f6cdd57b1a0ebf70cdf533014afd1ff
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs	(.../PipingCalculationConfigurationHelperTest.cs)	(revision 99f686f22091051a65ff1ee20abd68ffad713647)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs	(.../PipingCalculationConfigurationHelperTest.cs)	(revision 57bc6a475f6cdd57b1a0ebf70cdf533014afd1ff)
@@ -72,13 +72,12 @@
                     new PipingSoilLayer(4.0)
                 }, SoilProfileType.SoilProfile1D));
 
-            var soilModel = new PipingStochasticSoilModel("A")
+            var soilModel = new PipingStochasticSoilModel("A", new[]
             {
-                Geometry =
-                {
-                    new Point2D(1.0, 0.0),
-                    new Point2D(5.0, 0.0)
-                },
+                new Point2D(1.0, 0.0),
+                new Point2D(5.0, 0.0)
+            })
+            {
                 StochasticSoilProfiles =
                 {
                     soilProfile1,
@@ -129,13 +128,12 @@
                 new PipingSoilLayer(4.0)
             }, SoilProfileType.SoilProfile1D);
 
-            var soilModel = new PipingStochasticSoilModel("A")
+            var soilModel = new PipingStochasticSoilModel("A", new[]
             {
-                Geometry =
-                {
-                    new Point2D(1.0, 0.0),
-                    new Point2D(5.0, 0.0)
-                },
+                new Point2D(1.0, 0.0),
+                new Point2D(5.0, 0.0)
+            })
+            {
                 StochasticSoilProfiles =
                 {
                     new PipingStochasticSoilProfile(0.3, soilProfile1),
@@ -182,14 +180,11 @@
         public void GetStochasticSoilModelsForSurfaceLine_NoSoilProfiles_ReturnEmpty()
         {
             // Setup
-            var soilModel = new PipingStochasticSoilModel("A")
+            var soilModel = new PipingStochasticSoilModel("A", new[]
             {
-                Geometry =
-                {
-                    new Point2D(1.0, 0.0),
-                    new Point2D(5.0, 0.0)
-                }
-            };
+                new Point2D(1.0, 0.0),
+                new Point2D(5.0, 0.0)
+            });
 
             var availableSoilModels = new[]
             {
@@ -230,13 +225,12 @@
                 new PipingSoilLayer(4.0)
             }, SoilProfileType.SoilProfile1D);
 
-            var soilModel = new PipingStochasticSoilModel("A")
+            var soilModel = new PipingStochasticSoilModel("A", new[]
             {
-                Geometry =
-                {
-                    new Point2D(1.0, 0.0),
-                    new Point2D(5.0, 0.0)
-                },
+                new Point2D(1.0, 0.0),
+                new Point2D(5.0, 0.0)
+            })
+            {
                 StochasticSoilProfiles =
                 {
                     new PipingStochasticSoilProfile(0.3, soilProfile1),
@@ -287,26 +281,24 @@
             );
 
             const double y = 1.1;
-            var soilModel1 = new PipingStochasticSoilModel("A")
+            var soilModel1 = new PipingStochasticSoilModel("A", new[]
             {
-                Geometry =
-                {
-                    new Point2D(1.0, y),
-                    new Point2D(2.0, y)
-                },
+                new Point2D(1.0, y),
+                new Point2D(2.0, y)
+            })
+            {
                 StochasticSoilProfiles =
                 {
                     soilProfile1
                 }
             };
 
-            var soilModel2 = new PipingStochasticSoilModel("A")
+            var soilModel2 = new PipingStochasticSoilModel("A", new[]
             {
-                Geometry =
-                {
-                    new Point2D(3.0, y),
-                    new Point2D(4.0, y)
-                },
+                new Point2D(3.0, y),
+                new Point2D(4.0, y)
+            })
+            {
                 StochasticSoilProfiles =
                 {
                     soilProfile2
@@ -447,13 +439,12 @@
                 }, SoilProfileType.SoilProfile1D)
             );
 
-            var soilModel = new PipingStochasticSoilModel("A")
+            var soilModel = new PipingStochasticSoilModel("A", new[]
             {
-                Geometry =
-                {
-                    new Point2D(1.0, 0.0),
-                    new Point2D(5.0, 0.0)
-                },
+                new Point2D(1.0, 0.0),
+                new Point2D(5.0, 0.0)
+            })
+            {
                 StochasticSoilProfiles =
                 {
                     soilProfile1,
@@ -512,14 +503,11 @@
         public void GenerateCalculationItemsStructure_NoSoilProfiles_LogWarning()
         {
             // Setup
-            var soilModel = new PipingStochasticSoilModel("A")
+            var soilModel = new PipingStochasticSoilModel("A", new[]
             {
-                Geometry =
-                {
-                    new Point2D(1.0, 0.0),
-                    new Point2D(5.0, 0.0)
-                }
-            };
+                new Point2D(1.0, 0.0),
+                new Point2D(5.0, 0.0)
+            });
 
             var availableSoilModels = new[]
             {
@@ -576,13 +564,12 @@
                 new PipingSoilLayer(4.0)
             }, SoilProfileType.SoilProfile1D);
 
-            var soilModel = new PipingStochasticSoilModel("A")
+            var soilModel = new PipingStochasticSoilModel("A", new[]
             {
-                Geometry =
-                {
-                    new Point2D(1.0, 0.0),
-                    new Point2D(5.0, 0.0)
-                },
+                new Point2D(1.0, 0.0),
+                new Point2D(5.0, 0.0)
+            })
+            {
                 StochasticSoilProfiles =
                 {
                     new PipingStochasticSoilProfile(0.3, soilProfile1),
@@ -651,26 +638,24 @@
             );
 
             const double y = 1.1;
-            var soilModel1 = new PipingStochasticSoilModel("A")
+            var soilModel1 = new PipingStochasticSoilModel("A", new[]
             {
-                Geometry =
-                {
-                    new Point2D(1.0, y),
-                    new Point2D(2.0, y)
-                },
+                new Point2D(1.0, y),
+                new Point2D(2.0, y)
+            })
+            {
                 StochasticSoilProfiles =
                 {
                     soilProfile1
                 }
             };
 
-            var soilModel2 = new PipingStochasticSoilModel("A")
+            var soilModel2 = new PipingStochasticSoilModel("A", new[]
             {
-                Geometry =
-                {
-                    new Point2D(3.0, y),
-                    new Point2D(4.0, y)
-                },
+                new Point2D(3.0, y),
+                new Point2D(4.0, y)
+            })
+            {
                 StochasticSoilProfiles =
                 {
                     soilProfile2
@@ -747,27 +732,25 @@
             );
 
             const double y = 1.1;
-            var soilModel1 = new PipingStochasticSoilModel("A")
+            var soilModel1 = new PipingStochasticSoilModel("A", new[]
             {
-                Geometry =
-                {
-                    new Point2D(1.0, y),
-                    new Point2D(2.0, y)
-                },
+                new Point2D(1.0, y),
+                new Point2D(2.0, y)
+            })
+            {
                 StochasticSoilProfiles =
                 {
                     soilProfile1,
                     soilProfile2
                 }
             };
 
-            var soilModel2 = new PipingStochasticSoilModel("A")
+            var soilModel2 = new PipingStochasticSoilModel("A", new[]
             {
-                Geometry =
-                {
-                    new Point2D(3.0, y),
-                    new Point2D(4.0, y)
-                },
+                new Point2D(3.0, y),
+                new Point2D(4.0, y)
+            })
+            {
                 StochasticSoilProfiles =
                 {
                     soilProfile2
@@ -864,28 +847,25 @@
             );
 
             const double y = 1.1;
-            var soilModel1 = new PipingStochasticSoilModel("A")
+            var soilModel1 = new PipingStochasticSoilModel("A", new[]
             {
-                Geometry =
-                {
-                    new Point2D(1.0, y),
-                    new Point2D(2.0, y)
-                },
-
+                new Point2D(1.0, y),
+                new Point2D(2.0, y)
+            })
+            {
                 StochasticSoilProfiles =
                 {
                     soilProfile1,
                     soilProfile2
                 }
             };
 
-            var soilModel2 = new PipingStochasticSoilModel("A")
+            var soilModel2 = new PipingStochasticSoilModel("A", new[]
             {
-                Geometry =
-                {
-                    new Point2D(3.0, y),
-                    new Point2D(4.0, y)
-                },
+                new Point2D(3.0, y),
+                new Point2D(4.0, y)
+            })
+            {
                 StochasticSoilProfiles =
                 {
                     soilProfile2
@@ -973,13 +953,12 @@
                 new PipingSoilLayer(4.0)
             }, SoilProfileType.SoilProfile1D);
 
-            var soilModel = new PipingStochasticSoilModel("A")
+            var soilModel = new PipingStochasticSoilModel("A", new[]
             {
-                Geometry =
-                {
-                    new Point2D(1.0, 0.0),
-                    new Point2D(5.0, 0.0)
-                },
+                new Point2D(1.0, 0.0),
+                new Point2D(5.0, 0.0)
+            })
+            {
                 StochasticSoilProfiles =
                 {
                     new PipingStochasticSoilProfile(0.3, soilProfile1),
@@ -1048,13 +1027,12 @@
                 new PipingSoilLayer(4.0)
             }, SoilProfileType.SoilProfile1D);
 
-            var soilModel = new PipingStochasticSoilModel("A")
+            var soilModel = new PipingStochasticSoilModel("A", new[]
             {
-                Geometry =
-                {
-                    new Point2D(1.0, 0.0),
-                    new Point2D(5.0, 0.0)
-                },
+                new Point2D(1.0, 0.0),
+                new Point2D(5.0, 0.0)
+            })
+            {
                 StochasticSoilProfiles =
                 {
                     new PipingStochasticSoilProfile(0.3, soilProfile1),