Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/NormPropertiesIntegrationTest.cs
===================================================================
diff -u -r418a1ea0ec32c35a910714f804b3b75abd74fd92 -r4738ba7126e4a8a1f25c74c0e725dd14392aa603
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/NormPropertiesIntegrationTest.cs	(.../NormPropertiesIntegrationTest.cs)	(revision 418a1ea0ec32c35a910714f804b3b75abd74fd92)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/NormPropertiesIntegrationTest.cs	(.../NormPropertiesIntegrationTest.cs)	(revision 4738ba7126e4a8a1f25c74c0e725dd14392aa603)
@@ -86,8 +86,8 @@
             });
             SetOutputToHydraulicBoundaryLocationCalculations(assessmentSection.GrassCoverErosionOutwards, hydraulicBoundaryLocation1, random);
 
-            var emptyPipingCalculation = new TestPipingCalculation();
-            var pipingCalculation = new TestPipingCalculation(true);
+            var emptyPipingCalculation = new TestPipingCalculationScenario();
+            var pipingCalculation = new TestPipingCalculationScenario(true);
             var emptyGrassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation();
             var grassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation
             {
@@ -177,7 +177,7 @@
             });
             SetOutputToHydraulicBoundaryLocationCalculations(assessmentSection.GrassCoverErosionOutwards, hydraulicBoundaryLocation, random);
 
-            var pipingCalculation = new TestPipingCalculation(true);
+            var pipingCalculation = new TestPipingCalculationScenario(true);
             var grassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation
             {
                 Output = new TestGrassCoverErosionInwardsOutput()
@@ -259,7 +259,7 @@
                 hydraulicBoundaryLocation
             });
 
-            var emptyPipingCalculation = new TestPipingCalculation();
+            var emptyPipingCalculation = new TestPipingCalculationScenario();
             var emptyGrassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation();
             var emptyHeightStructuresCalculation = new StructuresCalculation<HeightStructuresInput>();
 
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs
===================================================================
diff -u -raf3a45afddc78175220ee97da11e78a9d0350dc2 -r4738ba7126e4a8a1f25c74c0e725dd14392aa603
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs	(.../AssessmentSectionMergeHandlerTest.cs)	(revision af3a45afddc78175220ee97da11e78a9d0350dc2)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs	(.../AssessmentSectionMergeHandlerTest.cs)	(revision 4738ba7126e4a8a1f25c74c0e725dd14392aa603)
@@ -383,7 +383,7 @@
 
             AssessmentSection targetAssessmentSection = CreateAssessmentSection(targetLocations);
             AssessmentSection sourceAssessmentSection = CreateAssessmentSection(sourceLocations);
-            sourceAssessmentSection.Piping.CalculationsGroup.Children.Add(new TestPipingCalculation
+            sourceAssessmentSection.Piping.CalculationsGroup.Children.Add(new TestPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -472,7 +472,7 @@
                                      }));
 
             // Then
-            var pipingCalculation = (TestPipingCalculation) targetAssessmentSection.Piping.Calculations.Single();
+            var pipingCalculation = (TestPipingCalculationScenario) targetAssessmentSection.Piping.Calculations.Single();
             Assert.AreSame(targetLocations[0], pipingCalculation.InputParameters.HydraulicBoundaryLocation);
 
             var grassInwardsCalculation = (GrassCoverErosionInwardsCalculationScenario) targetAssessmentSection.GrassCoverErosionInwards.Calculations.Single();
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismTest.cs
===================================================================
diff -u -ra2cd2b7978f12e687b1bb21d17a12bc5cead8fed -r4738ba7126e4a8a1f25c74c0e725dd14392aa603
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismTest.cs	(.../PipingFailureMechanismTest.cs)	(revision a2cd2b7978f12e687b1bb21d17a12bc5cead8fed)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismTest.cs	(.../PipingFailureMechanismTest.cs)	(revision 4738ba7126e4a8a1f25c74c0e725dd14392aa603)
@@ -60,7 +60,7 @@
         public void Calculations_AddPipingCalculation_ItemIsAddedToCollection()
         {
             // Setup
-            var calculation = new TestPipingCalculation();
+            var calculation = new TestPipingCalculationScenario();
             var failureMechanism = new PipingFailureMechanism();
 
             // Call
@@ -74,7 +74,7 @@
         public void Calculations_RemovePipingCalculation_ItemIsRemovedFromCollection()
         {
             // Setup
-            var calculation = new TestPipingCalculation();
+            var calculation = new TestPipingCalculationScenario();
             var failureMechanism = new PipingFailureMechanism();
 
             failureMechanism.CalculationsGroup.Children.Add(calculation);
Index: Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingTestDataGenerator.cs
===================================================================
diff -u -r3882e557378ddb85e62cbcb91a7db28c86a6412b -r4738ba7126e4a8a1f25c74c0e725dd14392aa603
--- Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingTestDataGenerator.cs	(.../PipingTestDataGenerator.cs)	(revision 3882e557378ddb85e62cbcb91a7db28c86a6412b)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingTestDataGenerator.cs	(.../PipingTestDataGenerator.cs)	(revision 4738ba7126e4a8a1f25c74c0e725dd14392aa603)
@@ -296,8 +296,8 @@
                 stochasticSoilModel2
             }, "some/path/to/stochasticsoilmodels");
 
-            var calculation = new TestPipingCalculation();
-            var calculationWithOutput = new TestPipingCalculation(true)
+            var calculation = new TestPipingCalculationScenario();
+            var calculationWithOutput = new TestPipingCalculationScenario(true)
             {
                 InputParameters =
                 {
@@ -306,7 +306,7 @@
                     StochasticSoilModel = stochasticSoilModel1
                 }
             };
-            var calculationWithSurfaceLineAndSoilModel = new TestPipingCalculation
+            var calculationWithSurfaceLineAndSoilModel = new TestPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -316,7 +316,7 @@
                     StochasticSoilProfile = stochasticSoilModel1.StochasticSoilProfiles.First()
                 }
             };
-            var calculationWithOutputAndHydraulicBoundaryLocation = new TestPipingCalculation(true)
+            var calculationWithOutputAndHydraulicBoundaryLocation = new TestPipingCalculationScenario(true)
             {
                 InputParameters =
                 {
@@ -325,14 +325,14 @@
                     StochasticSoilModel = stochasticSoilModel2
                 }
             };
-            var calculationWithHydraulicBoundaryLocation = new TestPipingCalculation
+            var calculationWithHydraulicBoundaryLocation = new TestPipingCalculationScenario
             {
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation
                 }
             };
-            var calculationWithSurfaceLineAndStochasticSoilModel = new TestPipingCalculation
+            var calculationWithSurfaceLineAndStochasticSoilModel = new TestPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -342,8 +342,8 @@
                 }
             };
 
-            var subCalculation = new TestPipingCalculation();
-            var subCalculationWithOutput = new TestPipingCalculation(true)
+            var subCalculation = new TestPipingCalculationScenario();
+            var subCalculationWithOutput = new TestPipingCalculationScenario(true)
             {
                 InputParameters =
                 {
@@ -353,7 +353,7 @@
                     StochasticSoilProfile = stochasticSoilModel2.StochasticSoilProfiles.First()
                 }
             };
-            var subCalculationWithOutputAndHydraulicBoundaryLocation = new TestPipingCalculation(true)
+            var subCalculationWithOutputAndHydraulicBoundaryLocation = new TestPipingCalculationScenario(true)
             {
                 InputParameters =
                 {
@@ -363,14 +363,14 @@
                     StochasticSoilProfile = stochasticSoilModel1.StochasticSoilProfiles.First()
                 }
             };
-            var subCalculationWithHydraulicBoundaryLocation = new TestPipingCalculation
+            var subCalculationWithHydraulicBoundaryLocation = new TestPipingCalculationScenario
             {
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation
                 }
             };
-            var subCalculationWithSurfaceLineAndStochasticSoilModel = new TestPipingCalculation
+            var subCalculationWithSurfaceLineAndStochasticSoilModel = new TestPipingCalculationScenario
             {
                 InputParameters =
                 {
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ExportInfos/PipingCalculationGroupContextExportInfoTest.cs
===================================================================
diff -u -ra2cd2b7978f12e687b1bb21d17a12bc5cead8fed -r4738ba7126e4a8a1f25c74c0e725dd14392aa603
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ExportInfos/PipingCalculationGroupContextExportInfoTest.cs	(.../PipingCalculationGroupContextExportInfoTest.cs)	(revision a2cd2b7978f12e687b1bb21d17a12bc5cead8fed)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ExportInfos/PipingCalculationGroupContextExportInfoTest.cs	(.../PipingCalculationGroupContextExportInfoTest.cs)	(revision 4738ba7126e4a8a1f25c74c0e725dd14392aa603)
@@ -144,7 +144,7 @@
 
             if (hasCalculation)
             {
-                calculationGroup.Children.Add(new TestPipingCalculation());
+                calculationGroup.Children.Add(new TestPipingCalculationScenario());
             }
 
             var context = new PipingCalculationGroupContext(calculationGroup,
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/FileImporter/PipingSurfaceLineUpdateDataStrategyTest.cs
===================================================================
diff -u -rc1a1e86ae637d4d6ff91fc78b2fb4ab97972d4a5 -r4738ba7126e4a8a1f25c74c0e725dd14392aa603
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/FileImporter/PipingSurfaceLineUpdateDataStrategyTest.cs	(.../PipingSurfaceLineUpdateDataStrategyTest.cs)	(revision c1a1e86ae637d4d6ff91fc78b2fb4ab97972d4a5)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/FileImporter/PipingSurfaceLineUpdateDataStrategyTest.cs	(.../PipingSurfaceLineUpdateDataStrategyTest.cs)	(revision 4738ba7126e4a8a1f25c74c0e725dd14392aa603)
@@ -445,7 +445,7 @@
         {
             // Setup
             PipingSurfaceLine surfaceLine = CreateValidSurfaceLineForCalculations();
-            var calculation = new TestPipingCalculation(true)
+            var calculation = new TestPipingCalculationScenario(true)
             {
                 InputParameters =
                 {
@@ -491,7 +491,7 @@
                 new Point3D(1, 2, 3),
                 new Point3D(4, 5, 6)
             });
-            var affectedCalculation = new TestPipingCalculation(true)
+            var affectedCalculation = new TestPipingCalculationScenario(true)
             {
                 InputParameters =
                 {
@@ -506,7 +506,7 @@
             };
             var unaffectedSurfaceLine = new PipingSurfaceLine(unaffectedSurfaceLineName);
             unaffectedSurfaceLine.SetGeometry(unaffectedGeometry);
-            var unAffectedCalculation = new TestPipingCalculation(true)
+            var unAffectedCalculation = new TestPipingCalculationScenario(true)
             {
                 InputParameters =
                 {
@@ -571,7 +571,7 @@
                 new Point3D(1, 2, 3),
                 new Point3D(4, 5, 6)
             });
-            var affectedCalculation = new TestPipingCalculation(true)
+            var affectedCalculation = new TestPipingCalculationScenario(true)
             {
                 InputParameters =
                 {
@@ -586,7 +586,7 @@
             };
             var unaffectedSurfaceLine = new PipingSurfaceLine(unaffectedSurfaceLineName);
             unaffectedSurfaceLine.SetGeometry(unaffectedGeometry);
-            var unAffectedCalculation = new TestPipingCalculation(true)
+            var unAffectedCalculation = new TestPipingCalculationScenario(true)
             {
                 InputParameters =
                 {
@@ -638,7 +638,7 @@
         {
             // Setup
             PipingSurfaceLine surfaceLine = CreateValidSurfaceLineForCalculations();
-            var calculation = new TestPipingCalculation
+            var calculation = new TestPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -735,7 +735,7 @@
             };
 
             PipingSurfaceLine surfaceLine = CreateValidSurfaceLineForCalculations();
-            var calculation = new TestPipingCalculation
+            var calculation = new TestPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -794,7 +794,7 @@
             });
 
             PipingSurfaceLine surfaceLine = CreateValidSurfaceLineForCalculations();
-            var calculation = new TestPipingCalculation
+            var calculation = new TestPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -844,7 +844,7 @@
             });
 
             PipingSurfaceLine surfaceLine = CreateValidSurfaceLineForCalculations();
-            var calculation = new TestPipingCalculation
+            var calculation = new TestPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -894,7 +894,7 @@
                 new Point3D(1, 2, 3),
                 new Point3D(4, 5, 6)
             });
-            var affectedCalculation = new TestPipingCalculation
+            var affectedCalculation = new TestPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -909,7 +909,7 @@
             };
             var unaffectedSurfaceLine = new PipingSurfaceLine(string.Empty);
             unaffectedSurfaceLine.SetGeometry(unaffectedGeometry);
-            var unAffectedCalculation = new TestPipingCalculation
+            var unAffectedCalculation = new TestPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -992,7 +992,7 @@
                 new Point3D(1, 2, 3),
                 new Point3D(4, 5, 6)
             });
-            var affectedCalculation = new TestPipingCalculation(true)
+            var affectedCalculation = new TestPipingCalculationScenario(true)
             {
                 InputParameters =
                 {
@@ -1044,7 +1044,7 @@
                 new Point3D(4, 0, 2),
                 new Point3D(5, 0, 3)
             });
-            var affectedCalculation = new TestPipingCalculation(true)
+            var affectedCalculation = new TestPipingCalculationScenario(true)
             {
                 InputParameters =
                 {
@@ -1108,7 +1108,7 @@
                 new Point3D(4, 0, 2),
                 new Point3D(5, 0, 3)
             });
-            var affectedCalculation = new TestPipingCalculation(true)
+            var affectedCalculation = new TestPipingCalculationScenario(true)
             {
                 InputParameters =
                 {
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r0da412bffaa065cadf2df8f8f55cffee69dba970 -r4738ba7126e4a8a1f25c74c0e725dd14392aa603
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 0da412bffaa065cadf2df8f8f55cffee69dba970)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 4738ba7126e4a8a1f25c74c0e725dd14392aa603)
@@ -696,7 +696,7 @@
                 {
                     Children =
                     {
-                        new TestPipingCalculation()
+                        new TestPipingCalculationScenario()
                     }
                 };