Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs
===================================================================
diff -u -r8323c6cbe3f292646a254938161e17c42d13d10c -r314545f25db70366badcc527aeca68d241bfdcdc
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs	(.../PipingCalculationConfigurationHelperTest.cs)	(revision 8323c6cbe3f292646a254938161e17c42d13d10c)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs	(.../PipingCalculationConfigurationHelperTest.cs)	(revision 314545f25db70366badcc527aeca68d241bfdcdc)
@@ -26,6 +26,7 @@
 using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
 using NUnit.Framework;
+using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Primitives;
@@ -433,7 +434,7 @@
                     Name = testName4
                 }
             };
-            IEnumerable<IPipingCalculationItem> result = null;
+            IEnumerable<ICalculation> result = null;
 
             // Call
             Action call = () =>
@@ -511,7 +512,7 @@
             };
 
             // Call
-            IEnumerable<IPipingCalculationItem> result = PipingCalculationConfigurationHelper.GenerateCalculationsStructure(
+            IEnumerable<ICalculation> result = PipingCalculationConfigurationHelper.GenerateCalculationsStructure(
                 surfaceLines,
                 availableSoilModels,
                 new GeneralPipingInput(),
@@ -573,7 +574,7 @@
                 surfaceLine
             };
 
-            IEnumerable<IPipingCalculationItem> result = null;
+            IEnumerable<ICalculation> result = null;
             // Call
             Action call = () =>
             {
@@ -649,7 +650,7 @@
                 surfaceLine
             };
 
-            IEnumerable<IPipingCalculationItem> result = null; 
+            IEnumerable<ICalculation> result = null; 
 
             // Call
             Action call = () =>
@@ -736,7 +737,7 @@
             };
 
             // Call
-            IEnumerable<IPipingCalculationItem> result = PipingCalculationConfigurationHelper.GenerateCalculationsStructure(
+            IEnumerable<ICalculation> result = PipingCalculationConfigurationHelper.GenerateCalculationsStructure(
                 surfaceLines, 
                 availableSoilModels, 
                 new GeneralPipingInput(), 
@@ -845,7 +846,7 @@
             };
 
             // Call
-            IEnumerable<IPipingCalculationItem> result = PipingCalculationConfigurationHelper.GenerateCalculationsStructure(
+            IEnumerable<ICalculation> result = PipingCalculationConfigurationHelper.GenerateCalculationsStructure(
                 surfaceLines, 
                 availableSoilModels, 
                 new GeneralPipingInput(), 
@@ -966,7 +967,7 @@
                 surfaceLine2
             };
 
-            IEnumerable<IPipingCalculationItem> result = null;
+            IEnumerable<ICalculation> result = null;
 
             // Call
             Action call = () =>
@@ -1065,7 +1066,7 @@
             SemiProbabilisticPipingInput semiProbabilisticInput = new SemiProbabilisticPipingInput();
 
             // Call
-            IEnumerable<IPipingCalculationItem> result = PipingCalculationConfigurationHelper.GenerateCalculationsStructure(
+            IEnumerable<ICalculation> result = PipingCalculationConfigurationHelper.GenerateCalculationsStructure(
                 surfaceLines,
                 availableSoilModels,
                 generalInput,
@@ -1154,7 +1155,7 @@
             };
 
             // Call
-            IEnumerable<IPipingCalculationItem> result = PipingCalculationConfigurationHelper.GenerateCalculationsStructure(
+            IEnumerable<ICalculation> result = PipingCalculationConfigurationHelper.GenerateCalculationsStructure(
                 surfaceLines,
                 availableSoilModels,
                 new GeneralPipingInput(),