Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationFactory.cs
===================================================================
diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r4ce321e0acec2ea04fe99f4e855d319b0ac17298
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationFactory.cs	(.../PipingCalculationFactory.cs)	(revision 24da3aa72ccc0776599628c9f971081694048d9a)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationFactory.cs	(.../PipingCalculationFactory.cs)	(revision 4ce321e0acec2ea04fe99f4e855d319b0ac17298)
@@ -21,100 +21,12 @@
 
 using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
-using Ringtoets.HydraRing.Data;
 using Ringtoets.Piping.Primitives;
 
 namespace Ringtoets.Piping.Data.TestUtil
 {
     public static class PipingCalculationFactory
     {
-        public static PipingCalculationScenario CreateCalculationWithInvalidData()
-        {
-            return new PipingCalculationScenario(new GeneralPipingInput());
-        }
-
-        public static PipingCalculationScenario CreateCalculationWithValidInput()
-        {
-            var bottom = 1.12;
-            var top = 10.56;
-            var stochasticSoilProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0)
-            {
-                SoilProfile = new PipingSoilProfile(string.Empty, 0.0, new[]
-                {
-                    new PipingSoilLayer(top)
-                    {
-                        IsAquifer = false,
-                        BelowPhreaticLevelDeviation = 0,
-                        BelowPhreaticLevelShift = 10,
-                        BelowPhreaticLevelMean = 17.5
-                    },
-                    new PipingSoilLayer(top/2)
-                    {
-                        IsAquifer = true,
-                        DiameterD70Deviation = 0,
-                        DiameterD70Mean = 1.0,
-                        PermeabilityDeviation = 0,
-                        PermeabilityMean = 1.0
-                    }
-                }, SoilProfileType.SoilProfile1D, 0)
-            };
-            var surfaceLine = new RingtoetsPipingSurfaceLine();
-            var firstCharacteristicPointLocation = new Point3D(0.2, 0.0, bottom + 3*top/4);
-            var secondCharacteristicPointLocation = new Point3D(0.3, 0.0, bottom + 2*top/4);
-            var thirdCharacteristicPointLocation = new Point3D(0.4, 0.0, bottom + top/4);
-            var fourthCharacteristicPointLocation = new Point3D(0.5, 0.0, bottom + 2*top/4);
-            var fifthCharacteristicPointLocation = new Point3D(0.6, 0.0, bottom + 3*top/4);
-            surfaceLine.SetGeometry(new[]
-            {
-                new Point3D(0.0, 0.0, 0.0),
-                firstCharacteristicPointLocation,
-                secondCharacteristicPointLocation,
-                thirdCharacteristicPointLocation,
-                fourthCharacteristicPointLocation,
-                fifthCharacteristicPointLocation,
-                new Point3D(1.0, 0.0, top)
-            });
-            surfaceLine.SetDikeToeAtPolderAt(firstCharacteristicPointLocation);
-            surfaceLine.SetDitchDikeSideAt(secondCharacteristicPointLocation);
-            surfaceLine.SetBottomDitchDikeSideAt(thirdCharacteristicPointLocation);
-            surfaceLine.SetBottomDitchPolderSideAt(fourthCharacteristicPointLocation);
-            surfaceLine.SetDitchPolderSideAt(fifthCharacteristicPointLocation);
-
-            HydraulicBoundaryLocation hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, string.Empty, 0.0, 0.0)
-            {
-                DesignWaterLevel = (RoundedDouble) 1.0
-            };
-            return new PipingCalculationScenario(new GeneralPipingInput())
-            {
-                InputParameters =
-                {
-                    DampingFactorExit =
-                    {
-                        Mean = (RoundedDouble) 1.0
-                    },
-                    PhreaticLevelExit =
-                    {
-                        Mean = (RoundedDouble) 2.0
-                    },
-                    SeepageLength =
-                    {
-                        Mean = (RoundedDouble) 1.0
-                    },
-                    ThicknessAquiferLayer =
-                    {
-                        Mean = (RoundedDouble) 1.0
-                    },
-                    ThicknessCoverageLayer =
-                    {
-                        Mean = (RoundedDouble) 1.0
-                    },
-                    SurfaceLine = surfaceLine,
-                    StochasticSoilProfile = stochasticSoilProfile,
-                    HydraulicBoundaryLocation = hydraulicBoundaryLocation
-                }
-            };
-        }
-
         public static PipingInput CreateInputWithAquiferAndCoverageLayer(double thicknessAquiferLayer = 1.0, double thicknessCoverageLayer = 2.0)
         {
             var surfaceLine = new RingtoetsPipingSurfaceLine();
@@ -153,7 +65,7 @@
             surfaceLine.SetGeometry(new[]
             {
                 new Point3D(0, 0, surfaceLineTopLevel),
-                new Point3D(1.0, 0, surfaceLineTopLevel),
+                new Point3D(1.0, 0, surfaceLineTopLevel)
             });
             var stochasticSoilProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0)
             {
@@ -188,7 +100,7 @@
             surfaceLine.SetGeometry(new[]
             {
                 new Point3D(0, 0, 3.3),
-                new Point3D(1.0, 0, 3.3),
+                new Point3D(1.0, 0, 3.3)
             });
             var stochasticSoilProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0)
             {
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationScenarioFactory.cs
===================================================================
diff -u -rb190a14336e0d8fe9aec34e81a68194081c76155 -r4ce321e0acec2ea04fe99f4e855d319b0ac17298
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationScenarioFactory.cs	(.../PipingCalculationScenarioFactory.cs)	(revision b190a14336e0d8fe9aec34e81a68194081c76155)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationScenarioFactory.cs	(.../PipingCalculationScenarioFactory.cs)	(revision 4ce321e0acec2ea04fe99f4e855d319b0ac17298)
@@ -24,6 +24,7 @@
 using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.HydraRing.Data;
 using Ringtoets.Piping.Primitives;
 
 namespace Ringtoets.Piping.Data.TestUtil
@@ -126,5 +127,100 @@
             };
             return scenario;
         }
+
+        /// <summary>
+        /// Creates a scenario with invalid input.
+        /// </summary>
+        /// <returns>A new <see cref="PipingCalculationScenario"/>.</returns>
+        public static PipingCalculationScenario CreatePipingCalculationScenarioWithInvalidInput()
+        {
+            return new PipingCalculationScenario(new GeneralPipingInput());
+        }
+
+        /// <summary>
+        /// Creates a scenario with valid input.
+        /// </summary>
+        /// <returns>A new <see cref="PipingCalculationScenario"/>.</returns>
+        public static PipingCalculationScenario CreatePipingCalculationScenarioWithValidInput()
+        {
+            var bottom = 1.12;
+            var top = 10.56;
+            var stochasticSoilProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0)
+            {
+                SoilProfile = new PipingSoilProfile(string.Empty, 0.0, new[]
+                {
+                    new PipingSoilLayer(top)
+                    {
+                        IsAquifer = false,
+                        BelowPhreaticLevelDeviation = 0,
+                        BelowPhreaticLevelShift = 10,
+                        BelowPhreaticLevelMean = 17.5
+                    },
+                    new PipingSoilLayer(top/2)
+                    {
+                        IsAquifer = true,
+                        DiameterD70Deviation = 0,
+                        DiameterD70Mean = 1.0,
+                        PermeabilityDeviation = 0,
+                        PermeabilityMean = 1.0
+                    }
+                }, SoilProfileType.SoilProfile1D, 0)
+            };
+            var surfaceLine = new RingtoetsPipingSurfaceLine();
+            var firstCharacteristicPointLocation = new Point3D(0.2, 0.0, bottom + 3 * top / 4);
+            var secondCharacteristicPointLocation = new Point3D(0.3, 0.0, bottom + 2 * top / 4);
+            var thirdCharacteristicPointLocation = new Point3D(0.4, 0.0, bottom + top / 4);
+            var fourthCharacteristicPointLocation = new Point3D(0.5, 0.0, bottom + 2 * top / 4);
+            var fifthCharacteristicPointLocation = new Point3D(0.6, 0.0, bottom + 3 * top / 4);
+            surfaceLine.SetGeometry(new[]
+            {
+                new Point3D(0.0, 0.0, 0.0),
+                firstCharacteristicPointLocation,
+                secondCharacteristicPointLocation,
+                thirdCharacteristicPointLocation,
+                fourthCharacteristicPointLocation,
+                fifthCharacteristicPointLocation,
+                new Point3D(1.0, 0.0, top)
+            });
+            surfaceLine.SetDikeToeAtPolderAt(firstCharacteristicPointLocation);
+            surfaceLine.SetDitchDikeSideAt(secondCharacteristicPointLocation);
+            surfaceLine.SetBottomDitchDikeSideAt(thirdCharacteristicPointLocation);
+            surfaceLine.SetBottomDitchPolderSideAt(fourthCharacteristicPointLocation);
+            surfaceLine.SetDitchPolderSideAt(fifthCharacteristicPointLocation);
+
+            HydraulicBoundaryLocation hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, string.Empty, 0.0, 0.0)
+            {
+                DesignWaterLevel = (RoundedDouble)1.0
+            };
+            return new PipingCalculationScenario(new GeneralPipingInput())
+            {
+                InputParameters =
+                {
+                    DampingFactorExit =
+                    {
+                        Mean = (RoundedDouble)1.0
+                    },
+                    PhreaticLevelExit =
+                    {
+                        Mean = (RoundedDouble)2.0
+                    },
+                    SeepageLength =
+                    {
+                        Mean = (RoundedDouble)1.0
+                    },
+                    ThicknessAquiferLayer =
+                    {
+                        Mean = (RoundedDouble)1.0
+                    },
+                    ThicknessCoverageLayer =
+                    {
+                        Mean = (RoundedDouble)1.0
+                    },
+                    SurfaceLine = surfaceLine,
+                    StochasticSoilProfile = stochasticSoilProfile,
+                    HydraulicBoundaryLocation = hydraulicBoundaryLocation
+                }
+            };
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r968cbe97d1a910b9bbb0fb52b22ece65126ed675 -r4ce321e0acec2ea04fe99f4e855d319b0ac17298
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 968cbe97d1a910b9bbb0fb52b22ece65126ed675)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 4ce321e0acec2ea04fe99f4e855d319b0ac17298)
@@ -676,9 +676,9 @@
             // Setup
             using (var treeViewControl = new TreeViewControl())
             {
-                var validCalculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+                var validCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
                 validCalculation.Name = "A";
-                var invalidCalculation = PipingCalculationFactory.CreateCalculationWithInvalidData();
+                var invalidCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithInvalidInput();
                 invalidCalculation.Name = "B";
 
                 var childGroup = new CalculationGroup();
@@ -744,9 +744,9 @@
             {
                 var mainWindow = mocks.Stub<IMainWindow>();
 
-                var validCalculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+                var validCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
                 validCalculation.Name = "A";
-                var invalidCalculation = PipingCalculationFactory.CreateCalculationWithInvalidData();
+                var invalidCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithInvalidInput();
                 invalidCalculation.Name = "B";
 
                 var childGroup = new CalculationGroup();
@@ -822,11 +822,11 @@
                     calculation2Observer.Expect(o => o.UpdateObserver());
                 }
 
-                var calculation1 = PipingCalculationFactory.CreateCalculationWithValidInput();
+                var calculation1 = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
                 calculation1.Name = "A";
                 calculation1.Output = new TestPipingOutput();
                 calculation1.Attach(calculation1Observer);
-                var calculation2 = PipingCalculationFactory.CreateCalculationWithValidInput();
+                var calculation2 = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
                 calculation2.Name = "B";
                 calculation2.Output = new TestPipingOutput();
                 calculation1.Attach(calculation2Observer);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs
===================================================================
diff -u -r74817f4dbb43aa0346f8b839e59370f786c5d452 -r4ce321e0acec2ea04fe99f4e855d319b0ac17298
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs	(.../PipingCalculationScenarioContextTreeNodeInfoTest.cs)	(revision 74817f4dbb43aa0346f8b839e59370f786c5d452)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs	(.../PipingCalculationScenarioContextTreeNodeInfoTest.cs)	(revision 4ce321e0acec2ea04fe99f4e855d319b0ac17298)
@@ -507,7 +507,7 @@
             // Given
             using (var treeViewControl = new TreeViewControl())
             {
-                var calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+                var calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
                 var pipingFailureMechanism = new PipingFailureMechanism();
                 pipingFailureMechanism.AddSection(new FailureMechanismSection("A", new[]
                 {
@@ -671,7 +671,7 @@
                         Geometry =
                         {
                             new Point2D(0.0, 0.0), new Point2D(5.0, 0.0)
-                        },
+                        }
                     }
                 }
             };
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r968cbe97d1a910b9bbb0fb52b22ece65126ed675 -r4ce321e0acec2ea04fe99f4e855d319b0ac17298
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision 968cbe97d1a910b9bbb0fb52b22ece65126ed675)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision 4ce321e0acec2ea04fe99f4e855d319b0ac17298)
@@ -551,9 +551,9 @@
                 var failureMechanism = new PipingFailureMechanism();
                 failureMechanism.CalculationsGroup.Children.Clear();
 
-                var validCalculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+                var validCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
                 validCalculation.Name = "A";
-                var invalidCalculation = PipingCalculationFactory.CreateCalculationWithInvalidData();
+                var invalidCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithInvalidInput();
                 invalidCalculation.Name = "B";
 
                 failureMechanism.CalculationsGroup.Children.Add(validCalculation);
@@ -605,9 +605,9 @@
                 }));
                 failureMechanism.CalculationsGroup.Children.Clear();
 
-                var validCalculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+                var validCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
                 validCalculation.Name = "A";
-                var invalidCalculation = PipingCalculationFactory.CreateCalculationWithInvalidData();
+                var invalidCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithInvalidInput();
                 invalidCalculation.Name = "B";
 
                 failureMechanism.CalculationsGroup.Children.Add(validCalculation);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationRowTest.cs
===================================================================
diff -u -re42bdf3dd379c46bab9212eb7b30f4754c9bc91c -r4ce321e0acec2ea04fe99f4e855d319b0ac17298
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationRowTest.cs	(.../PipingCalculationRowTest.cs)	(revision e42bdf3dd379c46bab9212eb7b30f4754c9bc91c)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationRowTest.cs	(.../PipingCalculationRowTest.cs)	(revision 4ce321e0acec2ea04fe99f4e855d319b0ac17298)
@@ -53,7 +53,7 @@
         public void Constructor_WithPipingCalculation_PropertiesFromPipingCalculation()
         {
             // Setup
-            var calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            var calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
 
             // Call
             var row = new PipingCalculationRow(calculation);
@@ -77,7 +77,7 @@
             // Setup
             var newValue = "Test new name";
 
-            var calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            var calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             var row = new PipingCalculationRow(calculation);
 
             int counter = 0;
@@ -101,7 +101,7 @@
             // Setup
             var newValue = new DataGridViewComboBoxItemWrapper<StochasticSoilModel>(new StochasticSoilModel(0, "test", "test"));
 
-            var calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            var calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             var row = new PipingCalculationRow(calculation);
 
             int counter = 0;
@@ -125,7 +125,7 @@
             // Setup
             var newValue = new DataGridViewComboBoxItemWrapper<StochasticSoilProfile>(new StochasticSoilProfile(0, 0, 0));
 
-            var calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            var calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             var row = new PipingCalculationRow(calculation);
 
             int counter = 0;
@@ -149,7 +149,7 @@
             // Setup
             var newValue = new DataGridViewComboBoxItemWrapper<HydraulicBoundaryLocation>(new HydraulicBoundaryLocation(0, "test", 0.0, 0.0));
 
-            var calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            var calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             var row = new PipingCalculationRow(calculation);
 
             int counter = 0;
@@ -173,7 +173,7 @@
             // Setup
             var newValue = new Random().Next();
 
-            var calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            var calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             var row = new PipingCalculationRow(calculation);
 
             int counter = 0;
@@ -197,7 +197,7 @@
             // Setup
             var newValue = new Random().Next();
 
-            var calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            var calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             var row = new PipingCalculationRow(calculation);
 
             int counter = 0;
@@ -226,7 +226,7 @@
 
             var newValue = 0.1;
 
-            var calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            var calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             var row = new PipingCalculationRow(calculation);
 
             calculation.InputParameters.Attach(observer);
@@ -249,7 +249,7 @@
             var observer = mocks.StrictMock<IObserver>();
             mocks.ReplayAll();
 
-            var calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            var calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             var row = new PipingCalculationRow(calculation);
 
             calculation.InputParameters.Attach(observer);
@@ -271,7 +271,7 @@
             var observer = mocks.StrictMock<IObserver>();
             mocks.ReplayAll();
 
-            var calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            var calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             var row = new PipingCalculationRow(calculation);
 
             calculation.InputParameters.Attach(observer);
@@ -298,7 +298,7 @@
 
             var newValue = 0.3;
 
-            var calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            var calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             var row = new PipingCalculationRow(calculation);
 
             calculation.InputParameters.Attach(observer);
@@ -321,7 +321,7 @@
             var observer = mocks.StrictMock<IObserver>();
             mocks.ReplayAll();
 
-            var calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            var calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             var row = new PipingCalculationRow(calculation);
 
             calculation.InputParameters.Attach(observer);
@@ -343,7 +343,7 @@
             var observer = mocks.StrictMock<IObserver>();
             mocks.ReplayAll();
 
-            var calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            var calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             var row = new PipingCalculationRow(calculation);
 
             calculation.InputParameters.Attach(observer);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenarioRowTest.cs
===================================================================
diff -u -rb190a14336e0d8fe9aec34e81a68194081c76155 -r4ce321e0acec2ea04fe99f4e855d319b0ac17298
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenarioRowTest.cs	(.../PipingScenarioRowTest.cs)	(revision b190a14336e0d8fe9aec34e81a68194081c76155)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenarioRowTest.cs	(.../PipingScenarioRowTest.cs)	(revision 4ce321e0acec2ea04fe99f4e855d319b0ac17298)
@@ -51,7 +51,7 @@
         {
             // Setup
             var random = new Random(21);
-            var calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            var calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             calculation.SemiProbabilisticOutput = new PipingSemiProbabilisticOutput(
                 random.NextDouble(),
                 random.NextDouble(),
@@ -86,7 +86,7 @@
         public void Constructor_WithPipingCalculationWithoutSemiProbabilisticOutput_PropertiesFromPipingCalculation()
         {
             // Setup
-            var calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            var calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
 
             // Call
             var row = new PipingScenarioRow(calculation);
@@ -113,7 +113,7 @@
             observer.Expect(o => o.UpdateObserver());
             mocks.ReplayAll();
 
-            var calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            var calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             calculation.Attach(observer);
 
             var row = new PipingScenarioRow(calculation);
@@ -133,7 +133,7 @@
             // Setup
             var newValue = new Random().Next(0, 100);
 
-            var calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            var calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             var row = new PipingScenarioRow(calculation);
 
             int counter = 0;
Index: Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs
===================================================================
diff -u -r7259f846cac0ed1569ee22d9788ca7c2f3ca6445 -r4ce321e0acec2ea04fe99f4e855d319b0ac17298
--- Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs	(.../InputParameterCalculationServiceTest.cs)	(revision 7259f846cac0ed1569ee22d9788ca7c2f3ca6445)
+++ Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs	(.../InputParameterCalculationServiceTest.cs)	(revision 4ce321e0acec2ea04fe99f4e855d319b0ac17298)
@@ -41,7 +41,7 @@
         public static void CalculateThicknessCoverageLayer_InvalidPipingCalculationWithOutput_ReturnsNaN()
         {
             // Setup
-            PipingCalculation invalidPipingCalculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            PipingCalculation invalidPipingCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
 
             // Make invalid by having surfaceline partially above soil profile:
             double highestLevelSurfaceLine = invalidPipingCalculation.InputParameters.SurfaceLine.Points.Max(p => p.Z);
@@ -141,7 +141,7 @@
         public static void CalculateThicknessCoverageLayer_CompleteInput_InputSetOnSubCalculator()
         {
             // Setup
-            PipingCalculation validPipingCalculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            PipingCalculation validPipingCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             PipingInput input = validPipingCalculation.InputParameters;
 
             using (new PipingSubCalculatorFactoryConfig())
@@ -173,7 +173,7 @@
         public static void CalculatePiezometricHeadAtExit_CompleteInput_InputSetOnSubCalculator()
         {
             // Setup
-            PipingCalculation validPipingCalculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            PipingCalculation validPipingCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             PipingInput input = validPipingCalculation.InputParameters;
 
             using (new PipingSubCalculatorFactoryConfig())
Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs
===================================================================
diff -u -r99f3b343f5ac4aed453d9f6d291217de76ef5314 -r4ce321e0acec2ea04fe99f4e855d319b0ac17298
--- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs	(.../PipingCalculationActivityTest.cs)	(revision 99f3b343f5ac4aed453d9f6d291217de76ef5314)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs	(.../PipingCalculationActivityTest.cs)	(revision 4ce321e0acec2ea04fe99f4e855d319b0ac17298)
@@ -82,7 +82,7 @@
             // Setup
             var originalOutput = new TestPipingOutput();
 
-            PipingCalculationScenario invalidPipingCalculation = PipingCalculationFactory.CreateCalculationWithInvalidData();
+            PipingCalculationScenario invalidPipingCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithInvalidInput();
             invalidPipingCalculation.Output = originalOutput;
 
             var activity = new PipingCalculationActivity(invalidPipingCalculation, new PipingProbabilityAssessmentInput(), int.MinValue, double.NaN);
@@ -111,7 +111,7 @@
         public void Run_ValidPipingCalculation_PerformPipingValidationAndCalculationAndLogStartAndEnd()
         {
             // Setup
-            PipingCalculationScenario validPipingCalculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            PipingCalculationScenario validPipingCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             validPipingCalculation.Output = null;
 
             int norm = new Random(21).Next(100, 300000);
@@ -144,7 +144,7 @@
             observerMock.Expect(o => o.UpdateObserver());
             mocks.ReplayAll();
 
-            PipingCalculationScenario validPipingCalculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            PipingCalculationScenario validPipingCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             validPipingCalculation.Output = null;
             validPipingCalculation.Attach(observerMock);
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs
===================================================================
diff -u -re12f4d3c8a659d72f0550416b85df98bb0e6f7dd -r4ce321e0acec2ea04fe99f4e855d319b0ac17298
--- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs	(.../PipingCalculationServiceTest.cs)	(revision e12f4d3c8a659d72f0550416b85df98bb0e6f7dd)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs	(.../PipingCalculationServiceTest.cs)	(revision 4ce321e0acec2ea04fe99f4e855d319b0ac17298)
@@ -43,7 +43,7 @@
             // Setup
             const string name = "<very nice name>";
 
-            PipingCalculation pipingCalculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            PipingCalculation pipingCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             pipingCalculation.Name = name;
 
             // Call
@@ -63,7 +63,7 @@
         {
             // Setup
             var output = new TestPipingOutput();
-            PipingCalculation invalidPipingCalculation = PipingCalculationFactory.CreateCalculationWithInvalidData();
+            PipingCalculation invalidPipingCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithInvalidInput();
             invalidPipingCalculation.Output = output;
 
             // Call
@@ -111,7 +111,7 @@
             // Setup
             const string name = "<very nice name>";
 
-            PipingCalculation calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            PipingCalculation calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             calculation.InputParameters.HydraulicBoundaryLocation = null;
             calculation.Name = name;
 
@@ -137,7 +137,7 @@
             // Setup
             const string name = "<very nice name>";
 
-            PipingCalculation calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            PipingCalculation calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             calculation.InputParameters.HydraulicBoundaryLocation.DesignWaterLevel = RoundedDouble.NaN;
             calculation.Name = name;
 
@@ -164,7 +164,7 @@
             // Setup
             const string name = "<very nice name>";
 
-            PipingCalculation calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            PipingCalculation calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             calculation.InputParameters.EntryPointL = RoundedDouble.NaN;
             calculation.Name = name;
 
@@ -190,7 +190,7 @@
             // Setup
             const string name = "<very nice name>";
 
-            PipingCalculation calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            PipingCalculation calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             calculation.InputParameters.ExitPointL = RoundedDouble.NaN;
             calculation.Name = name;
 
@@ -216,7 +216,7 @@
             // Setup
             const string name = "<very nice name>";
 
-            PipingCalculation calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            PipingCalculation calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             calculation.InputParameters.SurfaceLine = null;
             calculation.InputParameters.ExitPointL = (RoundedDouble) 0.9;
             calculation.InputParameters.EntryPointL = (RoundedDouble) 0.1;
@@ -244,7 +244,7 @@
             // Setup
             const string name = "<very nice name>";
 
-            PipingCalculation calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            PipingCalculation calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             calculation.InputParameters.StochasticSoilProfile = null;
             calculation.Name = name;
 
@@ -281,7 +281,7 @@
                                                 },
                                                 SoilProfileType.SoilProfile1D, -1);
 
-            PipingCalculation calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            PipingCalculation calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             calculation.InputParameters.StochasticSoilProfile.SoilProfile = profile;
             calculation.Name = name;
 
@@ -326,7 +326,7 @@
                                                 },
                                                 SoilProfileType.SoilProfile1D, -1);
 
-            PipingCalculation calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            PipingCalculation calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             calculation.InputParameters.StochasticSoilProfile.SoilProfile = profile;
             calculation.Name = name;
 
@@ -373,7 +373,7 @@
                                                 },
                                                 SoilProfileType.SoilProfile1D, -1);
 
-            PipingCalculation calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            PipingCalculation calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             calculation.InputParameters.StochasticSoilProfile.SoilProfile = profile;
             calculation.Name = name;
 
@@ -434,7 +434,7 @@
                                                 },
                                                 SoilProfileType.SoilProfile1D, -1);
 
-            PipingCalculation calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            PipingCalculation calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             calculation.InputParameters.StochasticSoilProfile.SoilProfile = profile;
             calculation.Name = name;
 
@@ -494,7 +494,7 @@
                                                 },
                                                 SoilProfileType.SoilProfile1D, -1);
 
-            PipingCalculation calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            PipingCalculation calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             calculation.InputParameters.StochasticSoilProfile.SoilProfile = profile;
             calculation.Name = name;
 
@@ -528,7 +528,7 @@
             var random = new Random(21);
             var incompletePipingSoilLayer = new PipingSoilLayer(10.5)
             {
-                IsAquifer = false,
+                IsAquifer = false
             };
             if (deviationSet)
             {
@@ -558,7 +558,7 @@
                                                 },
                                                 SoilProfileType.SoilProfile1D, -1);
 
-            PipingCalculation calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            PipingCalculation calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             calculation.InputParameters.StochasticSoilProfile.SoilProfile = profile;
             calculation.Name = name;
 
@@ -616,7 +616,7 @@
                                                 },
                                                 SoilProfileType.SoilProfile1D, -1);
 
-            PipingCalculation calculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            PipingCalculation calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             calculation.InputParameters.StochasticSoilProfile.SoilProfile = profile;
             calculation.Name = name;
 
@@ -643,7 +643,7 @@
             // Setup
             const string name = "<very nice name>";
 
-            PipingCalculation validPipingCalculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            PipingCalculation validPipingCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             validPipingCalculation.Name = name;
 
             Action call = () =>
@@ -671,7 +671,7 @@
         public void Calculate_ValidPipingCalculationNoOutput_ShouldSetOutput()
         {
             // Setup
-            PipingCalculation validPipingCalculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            PipingCalculation validPipingCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
 
             // Precondition
             Assert.IsNull(validPipingCalculation.Output);
@@ -690,7 +690,7 @@
             // Setup
             var output = new TestPipingOutput();
 
-            PipingCalculation validPipingCalculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            PipingCalculation validPipingCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             validPipingCalculation.Output = output;
 
             // Precondition
@@ -707,7 +707,7 @@
         public void Validate_CompleteInput_InputSetOnSubCalculators()
         {
             // Setup
-            PipingCalculation validPipingCalculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            PipingCalculation validPipingCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             PipingInput input = validPipingCalculation.InputParameters;
 
             using (new PipingSubCalculatorFactoryConfig())
@@ -724,7 +724,7 @@
         public void Calculate_CompleteInput_InputSetOnSubCalculators()
         {
             // Setup
-            PipingCalculation validPipingCalculation = PipingCalculationFactory.CreateCalculationWithValidInput();
+            PipingCalculation validPipingCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
             PipingInput input = validPipingCalculation.InputParameters;
 
             using (new PipingSubCalculatorFactoryConfig())
@@ -737,7 +737,7 @@
             }
         }
 
-        private void AssertSubCalculatorInputs(PipingInput input)
+        private static void AssertSubCalculatorInputs(PipingInput input)
         {
             var testFactory = (TestPipingSubCalculatorFactory) PipingSubCalculatorFactory.Instance;
             var heaveCalculator = testFactory.LastCreatedHeaveCalculator;