Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/PipingCalculationScenarioTest.cs
===================================================================
diff -u -r4a27dfb1033419dd325dee88fd4abe3cb56e452d -r4c16454e3b11df918816195e24fa56dc4e352eee
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/PipingCalculationScenarioTest.cs	(.../PipingCalculationScenarioTest.cs)	(revision 4a27dfb1033419dd325dee88fd4abe3cb56e452d)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/PipingCalculationScenarioTest.cs	(.../PipingCalculationScenarioTest.cs)	(revision 4c16454e3b11df918816195e24fa56dc4e352eee)
@@ -35,7 +35,7 @@
         public void Constructor_ExpectedValues()
         {
             // Setup
-            var generalInputParameters = new GeneralPipingInput();
+            var generalInputParameters = new GeneralMacroStabilityInwardsInput();
 
             // Call
             var scenario = new PipingCalculationScenario(generalInputParameters);
@@ -54,7 +54,7 @@
         public void IsRelevant_Always_ReturnsSetValue(bool isRelevant)
         {
             // Setup
-            var scenario = new PipingCalculationScenario(new GeneralPipingInput());
+            var scenario = new PipingCalculationScenario(new GeneralMacroStabilityInwardsInput());
 
             // Call
             scenario.IsRelevant = isRelevant;
@@ -69,7 +69,7 @@
         public void Contribution_Always_ReturnsSetValue(double newValue)
         {
             // Setup
-            var scenario = new PipingCalculationScenario(new GeneralPipingInput());
+            var scenario = new PipingCalculationScenario(new GeneralMacroStabilityInwardsInput());
             var roundedDouble = (RoundedDouble) newValue;
 
             // Call
@@ -85,7 +85,7 @@
             // Setup
             const double expectedProbability = 1.0 / 49862180;
 
-            var scenario = new PipingCalculationScenario(new GeneralPipingInput())
+            var scenario = new PipingCalculationScenario(new GeneralMacroStabilityInwardsInput())
             {
                 Output = new TestPipingOutput(),
                 SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput(expectedProbability)
@@ -102,7 +102,7 @@
         public void Probability_ScenarioStatusNotDone_ThrowsInvalidOperationException()
         {
             // Setup
-            var scenario = new PipingCalculationScenario(new GeneralPipingInput());
+            var scenario = new PipingCalculationScenario(new GeneralMacroStabilityInwardsInput());
 
             // Call
             TestDelegate call = () =>
@@ -118,7 +118,7 @@
         public void CalculationScenarioStatus_OutputNull_ReturnsStatusNotCalculated()
         {
             // Setup
-            var scenario = new PipingCalculationScenario(new GeneralPipingInput());
+            var scenario = new PipingCalculationScenario(new GeneralMacroStabilityInwardsInput());
 
             // Call
             CalculationScenarioStatus status = scenario.Status;
@@ -131,7 +131,7 @@
         public void CalculationScenarioStatus_SemiProbabilisticOutputNull_ReturnsStatusFailed()
         {
             // Setup
-            var scenario = new PipingCalculationScenario(new GeneralPipingInput())
+            var scenario = new PipingCalculationScenario(new GeneralMacroStabilityInwardsInput())
             {
                 Output = new TestPipingOutput(),
                 SemiProbabilisticOutput = null
@@ -148,7 +148,7 @@
         public void CalculationScenarioStatus_ScenarioInvalid_ReturnsStatusFailed()
         {
             // Setup
-            var scenario = new PipingCalculationScenario(new GeneralPipingInput())
+            var scenario = new PipingCalculationScenario(new GeneralMacroStabilityInwardsInput())
             {
                 Output = new TestPipingOutput(),
                 SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput(double.NaN)
@@ -167,7 +167,7 @@
             // Setup
             const double expectedProbability = 1.0 / 49862180;
 
-            var scenario = new PipingCalculationScenario(new GeneralPipingInput())
+            var scenario = new PipingCalculationScenario(new GeneralMacroStabilityInwardsInput())
             {
                 Output = new TestPipingOutput(),
                 SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput(expectedProbability)