Index: Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingTestDataGenerator.cs
===================================================================
diff -u -rb5f6de56734adc256e71ee5e487ac22d7217a6d4 -r3328b8fb5882643e06cfff7a0720937d3f5c7aaf
--- Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingTestDataGenerator.cs	(.../PipingTestDataGenerator.cs)	(revision b5f6de56734adc256e71ee5e487ac22d7217a6d4)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingTestDataGenerator.cs	(.../PipingTestDataGenerator.cs)	(revision 3328b8fb5882643e06cfff7a0720937d3f5c7aaf)
@@ -278,7 +278,6 @@
                 new Point2D(-5, 5),
                 new Point2D(5, 5)
             }, new[]
-
             {
                 new PipingStochasticSoilProfile(1.0, PipingSoilProfileTestFactory.CreatePipingSoilProfile())
             });
@@ -297,18 +296,17 @@
                 stochasticSoilModel2
             }, "some/path/to/stochasticsoilmodels");
 
-            var calculation = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput());
-            var calculationWithOutput = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput())
+            var calculation = new TestPipingCalculation();
+            var calculationWithOutput = new TestPipingCalculation(true)
             {
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation,
                     SurfaceLine = surfaceLine1,
                     StochasticSoilModel = stochasticSoilModel1
-                },
-                Output = GetRandomSemiProbabilisticPipingOutput()
+                }
             };
-            var calculationWithSurfaceLineAndSoilModel = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput())
+            var calculationWithSurfaceLineAndSoilModel = new TestPipingCalculation
             {
                 InputParameters =
                 {
@@ -318,24 +316,23 @@
                     StochasticSoilProfile = stochasticSoilModel1.StochasticSoilProfiles.First()
                 }
             };
-            var calculationWithOutputAndHydraulicBoundaryLocation = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput())
+            var calculationWithOutputAndHydraulicBoundaryLocation = new TestPipingCalculation(true)
             {
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation,
                     SurfaceLine = surfaceLine2,
                     StochasticSoilModel = stochasticSoilModel2
-                },
-                Output = GetRandomSemiProbabilisticPipingOutput()
+                }
             };
-            var calculationWithHydraulicBoundaryLocation = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput())
+            var calculationWithHydraulicBoundaryLocation = new TestPipingCalculation
             {
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation
                 }
             };
-            var calculationWithSurfaceLineAndStochasticSoilModel = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput())
+            var calculationWithSurfaceLineAndStochasticSoilModel = new TestPipingCalculation
             {
                 InputParameters =
                 {
@@ -345,37 +342,35 @@
                 }
             };
 
-            var subCalculation = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput());
-            var subCalculationWithOutput = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput())
+            var subCalculation = new TestPipingCalculation();
+            var subCalculationWithOutput = new TestPipingCalculation(true)
             {
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation,
                     SurfaceLine = surfaceLine2,
                     StochasticSoilModel = stochasticSoilModel2,
                     StochasticSoilProfile = stochasticSoilModel2.StochasticSoilProfiles.First()
-                },
-                Output = GetRandomSemiProbabilisticPipingOutput()
+                }
             };
-            var subCalculationWithOutputAndHydraulicBoundaryLocation = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput())
+            var subCalculationWithOutputAndHydraulicBoundaryLocation = new TestPipingCalculation(true)
             {
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation,
                     SurfaceLine = surfaceLine1,
                     StochasticSoilModel = stochasticSoilModel1,
                     StochasticSoilProfile = stochasticSoilModel1.StochasticSoilProfiles.First()
-                },
-                Output = GetRandomSemiProbabilisticPipingOutput()
+                }
             };
-            var subCalculationWithHydraulicBoundaryLocation = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput())
+            var subCalculationWithHydraulicBoundaryLocation = new TestPipingCalculation
             {
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation
                 }
             };
-            var subCalculationWithSurfaceLineAndStochasticSoilModel = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput())
+            var subCalculationWithSurfaceLineAndStochasticSoilModel = new TestPipingCalculation
             {
                 InputParameters =
                 {