Index: Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingCalculationScenarioTestFactorycs.cs
===================================================================
diff -u -r24ba1cb10f3b58b12d6a46d132186f210d614773 -rb4727e7f5ebbdec9f8f9937e0e9d7cb33f6404e7
--- Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingCalculationScenarioTestFactorycs.cs	(.../PipingCalculationScenarioTestFactorycs.cs)	(revision 24ba1cb10f3b58b12d6a46d132186f210d614773)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingCalculationScenarioTestFactorycs.cs	(.../PipingCalculationScenarioTestFactorycs.cs)	(revision b4727e7f5ebbdec9f8f9937e0e9d7cb33f6404e7)
@@ -38,22 +38,22 @@
         private const double top = 10.56;
 
         /// <summary>
-        /// Creates a calculation with valid input.
+        /// Creates a calculation scenario with valid input.
         /// </summary>
         /// <param name="hydraulicBoundaryLocation">The hydraulic boundary location to set to the input.</param>
         /// <param name="hasOutput">Indicator whether the calculation has output.</param>
-        /// <returns>A new <see cref="IPipingCalculation{PipingInput}"/>.</returns>
+        /// <returns>A new <see cref="IPipingCalculationScenario{PipingInput}"/>.</returns>
         /// <remarks>The caller is responsible for actually providing a valid hydraulic boundary location
         /// (for instance when it comes to the presence of a normative assessment level).</remarks>
         /// <exception cref="ArgumentNullException">Throw when <paramref name="hydraulicBoundaryLocation"/> is <c>null</c>.</exception>
-        public static PipingCalculation<PipingInput> CreatePipingCalculationScenarioWithValidInput(HydraulicBoundaryLocation hydraulicBoundaryLocation, bool hasOutput = false)
+        public static IPipingCalculationScenario<PipingInput> CreatePipingCalculationScenarioWithValidInput(HydraulicBoundaryLocation hydraulicBoundaryLocation, bool hasOutput = false)
         {
             if (hydraulicBoundaryLocation == null)
             {
                 throw new ArgumentNullException(nameof(hydraulicBoundaryLocation));
             }
 
-            return new TestPipingCalculation(new TestPipingInput
+            return new TestPipingCalculationScenario(new TestPipingInput
             {
                 DampingFactorExit =
                 {
Index: Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilisticPipingCalculationScenarioTestFactory.cs
===================================================================
diff -u -r8ffc19a143703b1a4d4601b50003d46a5a357359 -rb4727e7f5ebbdec9f8f9937e0e9d7cb33f6404e7
--- Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilisticPipingCalculationScenarioTestFactory.cs	(.../SemiProbabilisticPipingCalculationScenarioTestFactory.cs)	(revision 8ffc19a143703b1a4d4601b50003d46a5a357359)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilisticPipingCalculationScenarioTestFactory.cs	(.../SemiProbabilisticPipingCalculationScenarioTestFactory.cs)	(revision b4727e7f5ebbdec9f8f9937e0e9d7cb33f6404e7)
@@ -25,23 +25,17 @@
 using Core.Common.Base.Geometry;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.Hydraulics;
-using Riskeer.Common.Data.Probabilistics;
 using Riskeer.Piping.Data.Probabilistic;
 using Riskeer.Piping.Data.SemiProbabilistic;
-using Riskeer.Piping.Data.SoilProfile;
 using Riskeer.Piping.Primitives;
 
 namespace Riskeer.Piping.Data.TestUtil
 {
     /// <summary>
-    /// Helper class for creating different instances of <see cref="SemiProbabilisticPipingCalculationScenario"/>
-    /// for easier testing.
+    /// Helper class for creating instances of <see cref="SemiProbabilisticPipingCalculationScenario"/>.
     /// </summary>
     public static class SemiProbabilisticPipingCalculationScenarioTestFactory
     {
-        private const double bottom = 1.12;
-        private const double top = 10.56;
-
         /// <summary>
         /// Creates a calculated scenario for which the surface line on the input intersects with <paramref name="section"/>.
         /// </summary>
@@ -140,8 +134,8 @@
                     {
                         Mean = (RoundedDouble) 2.0
                     },
-                    SurfaceLine = GetSurfaceLine(),
-                    StochasticSoilProfile = GetStochasticSoilProfile(),
+                    SurfaceLine = PipingCalculationScenarioTestFactory.GetSurfaceLine(),
+                    StochasticSoilProfile = PipingCalculationScenarioTestFactory.GetStochasticSoilProfile(),
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation
                 }
             };
@@ -174,71 +168,11 @@
                     {
                         Mean = (RoundedDouble) 2.0
                     },
-                    SurfaceLine = GetSurfaceLine(),
-                    StochasticSoilProfile = GetStochasticSoilProfile(),
+                    SurfaceLine = PipingCalculationScenarioTestFactory.GetSurfaceLine(),
+                    StochasticSoilProfile = PipingCalculationScenarioTestFactory.GetStochasticSoilProfile(),
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation
                 }
             };
         }
-
-        private static PipingSurfaceLine GetSurfaceLine()
-        {
-            var surfaceLine = new PipingSurfaceLine(string.Empty);
-            var firstCharacteristicPointLocation = new Point3D(0.2, 0.0, bottom + 3 * top / 4);
-            var secondCharacteristicPointLocation = new Point3D(0.3, 0.0, bottom + 2 * top / 4);
-            var thirdCharacteristicPointLocation = new Point3D(0.4, 0.0, bottom + top / 4);
-            var fourthCharacteristicPointLocation = new Point3D(0.5, 0.0, bottom + 2 * top / 4);
-            var fifthCharacteristicPointLocation = new Point3D(0.6, 0.0, bottom + 3 * top / 4);
-            surfaceLine.SetGeometry(new[]
-            {
-                new Point3D(0.0, 0.0, 0.0),
-                firstCharacteristicPointLocation,
-                secondCharacteristicPointLocation,
-                thirdCharacteristicPointLocation,
-                fourthCharacteristicPointLocation,
-                fifthCharacteristicPointLocation,
-                new Point3D(1.0, 0.0, top)
-            });
-            surfaceLine.SetDikeToeAtPolderAt(firstCharacteristicPointLocation);
-            surfaceLine.SetDitchDikeSideAt(secondCharacteristicPointLocation);
-            surfaceLine.SetBottomDitchDikeSideAt(thirdCharacteristicPointLocation);
-            surfaceLine.SetBottomDitchPolderSideAt(fourthCharacteristicPointLocation);
-            surfaceLine.SetDitchPolderSideAt(fifthCharacteristicPointLocation);
-            surfaceLine.ReferenceLineIntersectionWorldPoint = new Point2D(0.0, 0.0);
-
-            return surfaceLine;
-        }
-
-        private static PipingStochasticSoilProfile GetStochasticSoilProfile()
-        {
-            return new PipingStochasticSoilProfile(
-                0.0, new PipingSoilProfile(string.Empty, 0.0, new[]
-                {
-                    new PipingSoilLayer(top)
-                    {
-                        IsAquifer = false,
-                        BelowPhreaticLevel = new LogNormalDistribution
-                        {
-                            Mean = (RoundedDouble) 17.5,
-                            StandardDeviation = (RoundedDouble) 0,
-                            Shift = (RoundedDouble) 10
-                        }
-                    },
-                    new PipingSoilLayer(top / 2)
-                    {
-                        IsAquifer = true,
-                        DiameterD70 = new VariationCoefficientLogNormalDistribution
-                        {
-                            Mean = (RoundedDouble) 4.0e-4,
-                            CoefficientOfVariation = (RoundedDouble) 0
-                        },
-                        Permeability = new VariationCoefficientLogNormalDistribution
-                        {
-                            Mean = (RoundedDouble) 1.0,
-                            CoefficientOfVariation = (RoundedDouble) 0.5
-                        }
-                    }
-                }, SoilProfileType.SoilProfile1D));
-        }
     }
 }
\ No newline at end of file
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r8ffc19a143703b1a4d4601b50003d46a5a357359 -rb4727e7f5ebbdec9f8f9937e0e9d7cb33f6404e7
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 8ffc19a143703b1a4d4601b50003d46a5a357359)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision b4727e7f5ebbdec9f8f9937e0e9d7cb33f6404e7)
@@ -785,7 +785,7 @@
             {
                 var pipingFailureMechanism = new TestPipingFailureMechanism();
                 var assessmentSection = mocks.Stub<IAssessmentSection>();
-                IPipingCalculation<PipingInput> calculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+                IPipingCalculationScenario<PipingInput> calculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
                 var group = new CalculationGroup
                 {
                     Children =
Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationValidationHelperTest.cs
===================================================================
diff -u -r8ffc19a143703b1a4d4601b50003d46a5a357359 -rb4727e7f5ebbdec9f8f9937e0e9d7cb33f6404e7
--- Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationValidationHelperTest.cs	(.../PipingCalculationValidationHelperTest.cs)	(revision 8ffc19a143703b1a4d4601b50003d46a5a357359)
+++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationValidationHelperTest.cs	(.../PipingCalculationValidationHelperTest.cs)	(revision b4727e7f5ebbdec9f8f9937e0e9d7cb33f6404e7)
@@ -37,7 +37,7 @@
     [TestFixture]
     public class PipingCalculationValidationHelperTest
     {
-        private PipingCalculation<PipingInput> calculation;
+        private IPipingCalculation<PipingInput> calculation;
         private double testSurfaceLineTopLevel;
 
         [SetUp]