Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingInputContextTest.cs
===================================================================
diff -u -rc5f90c4f9b42d985f16f99ad8732576b9217267a -rec5eeafbbd987b02a9d9c07b7e920c03d567f3f7
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingInputContextTest.cs	(.../PipingInputContextTest.cs)	(revision c5f90c4f9b42d985f16f99ad8732576b9217267a)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingInputContextTest.cs	(.../PipingInputContextTest.cs)	(revision ec5eeafbbd987b02a9d9c07b7e920c03d567f3f7)
@@ -40,7 +40,7 @@
         public void ParameteredConstructor_ExpectedValues()
         {
             // Setup
-            var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput());
+            var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput());
             var surfaceLines = new[]
             {
                 new RingtoetsPipingSurfaceLine()
@@ -75,7 +75,7 @@
         public void ParameteredConstructor_AssessmentSectionIsNull_ThrowArgumentNullException()
         {
             // Setup
-            var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput());
+            var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput());
             var surfaceLines = new[]
             {
                 new RingtoetsPipingSurfaceLine()
@@ -125,7 +125,7 @@
         public void ParameteredConstructor_FailureMechanismNull_ThrowsArgumentNullException()
         {
             // Setup
-            var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput());
+            var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput());
             var surfaceLines = new[]
             {
                 new RingtoetsPipingSurfaceLine()
@@ -158,7 +158,7 @@
             observer.Expect(o => o.UpdateObserver());
             mocks.ReplayAll();
 
-            var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput());
+            var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput());
             var failureMechanism = new PipingFailureMechanism();
             var context = new PipingInputContext(calculation.InputParameters,
                                                  calculation,
@@ -184,7 +184,7 @@
             var observer = mocks.StrictMock<IObserver>();
             mocks.ReplayAll();
 
-            var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput());
+            var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput());
             var failureMechanism = new PipingFailureMechanism();
             var context = new PipingInputContext(calculation.InputParameters,
                                                  calculation,
@@ -213,7 +213,7 @@
             observer.Expect(o => o.UpdateObserver());
             mocks.ReplayAll();
 
-            var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput());
+            var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput());
             var failureMechanism = new PipingFailureMechanism();
             var context = new PipingInputContext(calculationItem.InputParameters,
                                                  calculationItem,