Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityTest.cs
===================================================================
diff -u -r39872caaa09e1fc308417c1c4f8eb28a3527f26c -r23c2f333179e32dddb874d9e260c5d8f24799a02
--- Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityTest.cs	(.../PipingCalculationActivityTest.cs)	(revision 39872caaa09e1fc308417c1c4f8eb28a3527f26c)
+++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityTest.cs	(.../PipingCalculationActivityTest.cs)	(revision 23c2f333179e32dddb874d9e260c5d8f24799a02)
@@ -60,7 +60,7 @@
         public void Run_InvalidPipingCalculation_LogValidationStartAndEndWithErrors()
         {
             // Setup
-            PipingCalculationScenario invalidPipingCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput();
+            SemiProbabilisticPipingCalculation invalidPipingCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput();
 
             var activity = new PipingCalculationActivity(invalidPipingCalculation,
                                                          AssessmentSectionTestHelper.GetTestAssessmentLevel());
@@ -91,7 +91,7 @@
         public void Run_ValidPipingCalculation_PerformPipingValidationAndCalculationAndLogStartAndEnd()
         {
             // Setup
-            PipingCalculationScenario validPipingCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+            SemiProbabilisticPipingCalculation validPipingCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
 
             var activity = new PipingCalculationActivity(validPipingCalculation,
                                                          AssessmentSectionTestHelper.GetTestAssessmentLevel());
@@ -123,7 +123,7 @@
             observer.Expect(o => o.UpdateObserver());
             mocks.ReplayAll();
 
-            PipingCalculationScenario validPipingCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+            SemiProbabilisticPipingCalculation validPipingCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
             validPipingCalculation.Output = null;
             validPipingCalculation.Attach(observer);
 
Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationServiceTest.cs
===================================================================
diff -u -r3a17278b768b9fad2ea946607126a15b8854f02a -r23c2f333179e32dddb874d9e260c5d8f24799a02
--- Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationServiceTest.cs	(.../PipingCalculationServiceTest.cs)	(revision 3a17278b768b9fad2ea946607126a15b8854f02a)
+++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationServiceTest.cs	(.../PipingCalculationServiceTest.cs)	(revision 23c2f333179e32dddb874d9e260c5d8f24799a02)
@@ -85,7 +85,7 @@
         {
             // Setup
             PipingOutput output = PipingOutputTestFactory.Create();
-            PipingCalculation<PipingInput, PipingOutput> invalidPipingCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput();
+            SemiProbabilisticPipingCalculation invalidPipingCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput();
             invalidPipingCalculation.Output = output;
 
             // Call
@@ -101,7 +101,7 @@
         public void Validate_InvalidCalculationInput_LogsErrorAndReturnsFalse()
         {
             // Setup
-            var calculation = new TestPipingCalculation();
+            var calculation = new SemiProbabilisticPipingCalculation(new GeneralPipingInput());
 
             // Call
             var isValid = false;