Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Factories/PipingMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -rde3208f1b2edd577702e24093a06fa475d4aae5e -r9148fdc7a9c219bde45d85c8a812a46ad2559e93
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Factories/PipingMapDataFeaturesFactoryTest.cs	(.../PipingMapDataFeaturesFactoryTest.cs)	(revision de3208f1b2edd577702e24093a06fa475d4aae5e)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Factories/PipingMapDataFeaturesFactoryTest.cs	(.../PipingMapDataFeaturesFactoryTest.cs)	(revision 9148fdc7a9c219bde45d85c8a812a46ad2559e93)
@@ -174,8 +174,10 @@
         public void CreateCalculationFeatures_GivenCalculations_ReturnsCalculationFeaturesCollection()
         {
             // Setup
-            SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(new HydraulicBoundaryLocation(1, string.Empty, 5.0, 4.0));
-            SemiProbabilisticPipingCalculationScenario calculationB = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(new HydraulicBoundaryLocation(1, string.Empty, 2.2, 3.8));
+            SemiProbabilisticPipingCalculationScenario calculationA =
+                SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<SemiProbabilisticPipingCalculationScenario>(new HydraulicBoundaryLocation(1, string.Empty, 5.0, 4.0));
+            SemiProbabilisticPipingCalculationScenario calculationB =
+                SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<SemiProbabilisticPipingCalculationScenario>(new HydraulicBoundaryLocation(1, string.Empty, 2.2, 3.8));
 
             calculationA.InputParameters.SurfaceLine.ReferenceLineIntersectionWorldPoint = new Point2D(1.0, 3.0);
             calculationB.InputParameters.SurfaceLine.ReferenceLineIntersectionWorldPoint = new Point2D(1.0, 4.0);
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingCalculationRowTest.cs
===================================================================
diff -u -rde3208f1b2edd577702e24093a06fa475d4aae5e -r9148fdc7a9c219bde45d85c8a812a46ad2559e93
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingCalculationRowTest.cs	(.../PipingCalculationRowTest.cs)	(revision de3208f1b2edd577702e24093a06fa475d4aae5e)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingCalculationRowTest.cs	(.../PipingCalculationRowTest.cs)	(revision 9148fdc7a9c219bde45d85c8a812a46ad2559e93)
@@ -292,7 +292,8 @@
         public void EntryPointL_EntryPointNotBeforeExitPoint_ThrowsArgumentOutOfRangeExceptionDoesNotNotifyObservers(double newValue)
         {
             // Setup
-            SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(new TestHydraulicBoundaryLocation());
+            SemiProbabilisticPipingCalculationScenario calculation =
+                SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<SemiProbabilisticPipingCalculationScenario>(new TestHydraulicBoundaryLocation());
             var entryPointL = (RoundedDouble) newValue;
 
             // Call & Assert
@@ -306,7 +307,8 @@
         public void EntryPointL_NotOnSurfaceLine_ThrowsArgumentOutOfRangeExceptionAndDoesNotNotifyObservers()
         {
             // Setup
-            SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(new TestHydraulicBoundaryLocation());
+            SemiProbabilisticPipingCalculationScenario calculation =
+                SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<SemiProbabilisticPipingCalculationScenario>(new TestHydraulicBoundaryLocation());
             var entryPointL = (RoundedDouble) (-3.0);
 
             // Call & Assert
@@ -319,7 +321,8 @@
         public void ExitPointL_OnValidChange_NotifyObserverAndCalculationPropertyChanged()
         {
             // Setup
-            SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(new TestHydraulicBoundaryLocation());
+            SemiProbabilisticPipingCalculationScenario calculation =
+                SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<SemiProbabilisticPipingCalculationScenario>(new TestHydraulicBoundaryLocation());
             var exitPointL = (RoundedDouble) 0.3;
 
             // Call & Assert
@@ -353,7 +356,8 @@
         public void ExitPointL_ExitPointNotBeyondEntryPoint_ThrowsArgumentOutOfRangeExceptionDoesNotNotifyObservers(double newValue)
         {
             // Setup
-            SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(new TestHydraulicBoundaryLocation());
+            SemiProbabilisticPipingCalculationScenario calculation =
+                SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<SemiProbabilisticPipingCalculationScenario>(new TestHydraulicBoundaryLocation());
             var exitPointL = (RoundedDouble) newValue;
 
             // Call & Assert
@@ -367,7 +371,8 @@
         public void ExitPointL_NotOnSurfaceLine_ThrowsArgumentOutOfRangeExceptionAndDoesNotNotifyObservers()
         {
             // Setup
-            SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(new TestHydraulicBoundaryLocation());
+            SemiProbabilisticPipingCalculationScenario calculation =
+                SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<SemiProbabilisticPipingCalculationScenario>(new TestHydraulicBoundaryLocation());
             var exitPointL = (RoundedDouble) 3.0;
 
             // Call & Assert
@@ -418,7 +423,8 @@
 
             SemiProbabilisticPipingOutput assignedOutput = null;
 
-            SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(new TestHydraulicBoundaryLocation());
+            SemiProbabilisticPipingCalculationScenario calculation =
+                SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<SemiProbabilisticPipingCalculationScenario>(new TestHydraulicBoundaryLocation());
             if (hasOutput)
             {
                 assignedOutput = PipingTestDataGenerator.GetRandomSemiProbabilisticPipingOutput();