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);