Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingStochasticSoilModelCreateExtensionsTest.cs
===================================================================
diff -u -r342550ddfacbc6b0253b9b452da4aa68c3fac73f -r57bc6a475f6cdd57b1a0ebf70cdf533014afd1ff
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingStochasticSoilModelCreateExtensionsTest.cs	(.../PipingStochasticSoilModelCreateExtensionsTest.cs)	(revision 342550ddfacbc6b0253b9b452da4aa68c3fac73f)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingStochasticSoilModelCreateExtensionsTest.cs	(.../PipingStochasticSoilModelCreateExtensionsTest.cs)	(revision 57bc6a475f6cdd57b1a0ebf70cdf533014afd1ff)
@@ -69,9 +69,13 @@
         public void Create_WithCollector_ReturnsPipingStochasticSoilModelEntityWithPropertiesSet()
         {
             // Setup
-            int order = new Random(1).Next();
+            var random = new Random(1);
+            int order = random.Next();
             const string testName = "testName";
-            var stochasticSoilModel = new PipingStochasticSoilModel(testName);
+            var stochasticSoilModel = new PipingStochasticSoilModel(testName, new[]
+            {
+                new Point2D(random.NextDouble(), random.NextDouble())
+            });
             var registry = new PersistenceRegistry();
 
             // Call
@@ -107,13 +111,10 @@
         public void Create_WithStochasticSoilProfiles_ReturnsStochasticSoilModelEntityWithPropertiesAndPipingStochasticSoilProfileEntitiesSet()
         {
             // Setup
-            var stochasticSoilModel = new PipingStochasticSoilModel("testName")
+            PipingStochasticSoilModel stochasticSoilModel = PipingStochasticSoilModelTestFactory.CreatePipingStochasticSoilModel("testName", new[]
             {
-                StochasticSoilProfiles =
-                {
-                    new PipingStochasticSoilProfile(1, PipingSoilProfileTestFactory.CreatePipingSoilProfile())
-                }
-            };
+                new PipingStochasticSoilProfile(1, PipingSoilProfileTestFactory.CreatePipingSoilProfile())
+            });
             var registry = new PersistenceRegistry();
 
             // Call
@@ -135,12 +136,12 @@
         {
             // Setup
             var random = new Random(31);
-            PipingStochasticSoilModel stochasticSoilModel = PipingStochasticSoilModelTestFactory.CreatePipingStochasticSoilModel("testName");
-            stochasticSoilModel.Geometry.AddRange(new[]
+            PipingStochasticSoilModel stochasticSoilModel = PipingStochasticSoilModelTestFactory.CreatePipingStochasticSoilModel("testName", new[]
             {
                 new Point2D(random.NextDouble(), random.NextDouble()),
                 new Point2D(random.NextDouble(), random.NextDouble())
             });
+
             var registry = new PersistenceRegistry();
 
             // Call