Index: Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingTestDataGeneratorHelper.cs
===================================================================
diff -u -rb4f6e4fe36ac0c03415db646e5a3714c2f771e61 -ra96fafcaa6c9957cf63bf55d2afb30d189e770ee
--- Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingTestDataGeneratorHelper.cs	(.../PipingTestDataGeneratorHelper.cs)	(revision b4f6e4fe36ac0c03415db646e5a3714c2f771e61)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingTestDataGeneratorHelper.cs	(.../PipingTestDataGeneratorHelper.cs)	(revision a96fafcaa6c9957cf63bf55d2afb30d189e770ee)
@@ -44,10 +44,10 @@
         public static void AssertHasAllPossibleCalculationConfigurationsWithOutputs(PipingFailureMechanism failureMechanism)
         {
             IEnumerable<ICalculationBase> calculationRoot = failureMechanism.CalculationsGroup.Children;
-            AssertPipingCalculationGroupWithOutput(calculationRoot.OfType<PipingCalculation<PipingInput, PipingOutput>>());
+            AssertPipingCalculationGroupWithOutput(calculationRoot.OfType<IPipingCalculation<PipingInput, PipingOutput>>());
 
             CalculationGroup nestedCalculations = calculationRoot.OfType<CalculationGroup>().First();
-            AssertPipingCalculationGroupWithOutput(nestedCalculations.Children.OfType<PipingCalculation<PipingInput, PipingOutput>>());
+            AssertPipingCalculationGroupWithOutput(nestedCalculations.Children.OfType<IPipingCalculation<PipingInput, PipingOutput>>());
         }
 
         /// <summary>
@@ -60,10 +60,10 @@
         public static void AssertHasAllPossibleCalculationConfigurationsWithoutOutputs(PipingFailureMechanism failureMechanism)
         {
             IEnumerable<ICalculationBase> calculationRoot = failureMechanism.CalculationsGroup.Children;
-            AssertPipingCalculationGroupWithoutOutput(calculationRoot.OfType<PipingCalculation<PipingInput, PipingOutput>>());
+            AssertPipingCalculationGroupWithoutOutput(calculationRoot.OfType<IPipingCalculation<PipingInput, PipingOutput>>());
 
             CalculationGroup nestedCalculations = calculationRoot.OfType<CalculationGroup>().First();
-            AssertPipingCalculationGroupWithoutOutput(nestedCalculations.Children.OfType<PipingCalculation<PipingInput, PipingOutput>>());
+            AssertPipingCalculationGroupWithoutOutput(nestedCalculations.Children.OfType<IPipingCalculation<PipingInput, PipingOutput>>());
         }
 
         /// <summary>
@@ -104,18 +104,18 @@
             Assert.AreEqual("path/to/sections", failureMechanism.FailureMechanismSectionSourcePath);
         }
 
-        private static void AssertPipingCalculationGroupWithOutput(IEnumerable<PipingCalculation<PipingInput, PipingOutput>> children)
+        private static void AssertPipingCalculationGroupWithOutput(IEnumerable<IPipingCalculation<PipingInput, PipingOutput>> children)
         {
             AssertCalculationConfig(children, true, true);
         }
 
-        private static void AssertPipingCalculationGroupWithoutOutput(IEnumerable<PipingCalculation<PipingInput, PipingOutput>> children)
+        private static void AssertPipingCalculationGroupWithoutOutput(IEnumerable<IPipingCalculation<PipingInput, PipingOutput>> children)
         {
             AssertCalculationConfig(children, false, false);
             AssertCalculationConfig(children, true, false);
         }
 
-        private static void AssertCalculationConfig(IEnumerable<PipingCalculation<PipingInput, PipingOutput>> children,
+        private static void AssertCalculationConfig(IEnumerable<IPipingCalculation<PipingInput, PipingOutput>> children,
                                                     bool hasHydraulicBoundaryLocation, bool hasOutput)
         {
             Assert.NotNull(children.FirstOrDefault(calc => calc.InputParameters.HydraulicBoundaryLocation != null == hasHydraulicBoundaryLocation