Index: Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilisticPipingCalculationScenarioTestFactory.cs
===================================================================
diff -u -r6035fafb6e89b1e7fad8c40cdfb944565764f593 -r8ffc19a143703b1a4d4601b50003d46a5a357359
--- Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilisticPipingCalculationScenarioTestFactory.cs	(.../SemiProbabilisticPipingCalculationScenarioTestFactory.cs)	(revision 6035fafb6e89b1e7fad8c40cdfb944565764f593)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilisticPipingCalculationScenarioTestFactory.cs	(.../SemiProbabilisticPipingCalculationScenarioTestFactory.cs)	(revision 8ffc19a143703b1a4d4601b50003d46a5a357359)
@@ -114,38 +114,6 @@
         }
 
         /// <summary>
-        /// Creates a calculation 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>
-        /// <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> CreatePipingCalculationWithValidInput(HydraulicBoundaryLocation hydraulicBoundaryLocation, bool hasOutput = false)
-        {
-            if (hydraulicBoundaryLocation == null)
-            {
-                throw new ArgumentNullException(nameof(hydraulicBoundaryLocation));
-            }
-
-            return new TestPipingCalculation(new TestPipingInput
-            {
-                DampingFactorExit =
-                {
-                    Mean = (RoundedDouble) 1.0
-                },
-                PhreaticLevelExit =
-                {
-                    Mean = (RoundedDouble) 2.0
-                },
-                SurfaceLine = GetSurfaceLine(),
-                StochasticSoilProfile = GetStochasticSoilProfile(),
-                HydraulicBoundaryLocation = hydraulicBoundaryLocation
-            }, hasOutput);
-        }
-
-        /// <summary>
         /// Creates a scenario with valid input.
         /// </summary>
         /// <param name="hydraulicBoundaryLocation">The hydraulic boundary location to set to the input.</param>
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r6035fafb6e89b1e7fad8c40cdfb944565764f593 -r8ffc19a143703b1a4d4601b50003d46a5a357359
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 6035fafb6e89b1e7fad8c40cdfb944565764f593)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 8ffc19a143703b1a4d4601b50003d46a5a357359)
@@ -746,7 +746,7 @@
                 {
                     Children =
                     {
-                        SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationWithValidInput(hydraulicBoundaryLocation)
+                        PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation)
                     }
                 };
 
@@ -785,7 +785,7 @@
             {
                 var pipingFailureMechanism = new TestPipingFailureMechanism();
                 var assessmentSection = mocks.Stub<IAssessmentSection>();
-                IPipingCalculation<PipingInput> calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationWithValidInput(new TestHydraulicBoundaryLocation());
+                IPipingCalculation<PipingInput> calculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
                 var group = new CalculationGroup
                 {
                     Children =
Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationValidationHelperTest.cs
===================================================================
diff -u -r56198a842a4c892afc1ea3166d310c3daa4d271d -r8ffc19a143703b1a4d4601b50003d46a5a357359
--- Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationValidationHelperTest.cs	(.../PipingCalculationValidationHelperTest.cs)	(revision 56198a842a4c892afc1ea3166d310c3daa4d271d)
+++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationValidationHelperTest.cs	(.../PipingCalculationValidationHelperTest.cs)	(revision 8ffc19a143703b1a4d4601b50003d46a5a357359)
@@ -43,7 +43,7 @@
         [SetUp]
         public void SetUp()
         {
-            calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationWithValidInput(
+            calculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(
                 new TestHydraulicBoundaryLocation());
             testSurfaceLineTopLevel = calculation.InputParameters.SurfaceLine.Points.Max(p => p.Z);
         }
@@ -64,10 +64,10 @@
         {
             // Setup
             calculation.InputParameters.SurfaceLine = null;
-            
+
             // Call
             IEnumerable<string> messages = PipingCalculationValidationHelper.GetValidationWarnings(calculation.InputParameters);
-            
+
             // Assert
             CollectionAssert.IsEmpty(messages);
         }
@@ -77,10 +77,10 @@
         {
             // Setup
             calculation.InputParameters.StochasticSoilProfile = null;
-            
+
             // Call
             IEnumerable<string> messages = PipingCalculationValidationHelper.GetValidationWarnings(calculation.InputParameters);
-            
+
             // Assert
             CollectionAssert.IsEmpty(messages);
         }
@@ -90,14 +90,14 @@
         {
             // Setup
             calculation.InputParameters.ExitPointL = RoundedDouble.NaN;
-            
+
             // Call
             IEnumerable<string> messages = PipingCalculationValidationHelper.GetValidationWarnings(calculation.InputParameters);
-            
+
             // Assert
             CollectionAssert.IsEmpty(messages);
         }
-        
+
         [Test]
         public void GetValidationWarnings_WithoutAquitardLayer_LogsWarningsAndReturnsTrue()
         {
@@ -130,8 +130,8 @@
 
             // Assert
             Assert.AreEqual(2, messages.Count());
-                Assert.AreEqual("Geen deklaag gevonden voor de ondergrondschematisatie onder de profielschematisatie bij het uittredepunt.", messages.ElementAt(0));
-                Assert.AreEqual("Kan de totale deklaagdikte bij het uittredepunt niet afleiden op basis van de invoer.", messages.ElementAt(1));
+            Assert.AreEqual("Geen deklaag gevonden voor de ondergrondschematisatie onder de profielschematisatie bij het uittredepunt.", messages.ElementAt(0));
+            Assert.AreEqual("Kan de totale deklaagdikte bij het uittredepunt niet afleiden op basis van de invoer.", messages.ElementAt(1));
         }
 
         [Test]
@@ -238,7 +238,7 @@
             const string expectedMessage = "Meerdere aaneengesloten deklagen gevonden. De grondeigenschappen worden bepaald door het nemen van een gewogen gemiddelde, mits de standaardafwijkingen en verschuivingen voor alle lagen gelijk zijn.";
             Assert.AreEqual(expectedMessage, messages.ElementAt(0));
         }
-        
+
         [Test]
         [TestCase(6.2e-5)]
         [TestCase(5.1e-3)]
@@ -345,7 +345,7 @@
 
             // Call
             IEnumerable<string> messages = PipingCalculationValidationHelper.GetValidationErrors(calculation.InputParameters,
-                                                                                           new GeneralPipingInput());
+                                                                                                 new GeneralPipingInput());
 
             // Assert
             Assert.AreEqual(2, messages.Count());
@@ -403,7 +403,7 @@
 
             // Call
             IEnumerable<string> messages = PipingCalculationValidationHelper.GetValidationErrors(calculation.InputParameters,
-                                                                                           new GeneralPipingInput());
+                                                                                                 new GeneralPipingInput());
 
             // Assert
             Assert.AreEqual(1, messages.Count());
@@ -460,7 +460,7 @@
 
             // Call
             IEnumerable<string> messages = PipingCalculationValidationHelper.GetValidationErrors(calculation.InputParameters,
-                                                                                           new GeneralPipingInput());
+                                                                                                 new GeneralPipingInput());
 
             // Assert
             Assert.AreEqual(1, messages.Count());
@@ -521,7 +521,7 @@
 
             // Call
             IEnumerable<string> messages = PipingCalculationValidationHelper.GetValidationErrors(calculation.InputParameters,
-                                                                                           new GeneralPipingInput());
+                                                                                                 new GeneralPipingInput());
 
             // Assert
             Assert.AreEqual(1, messages.Count());
@@ -568,7 +568,7 @@
 
             // Call
             IEnumerable<string> messages = PipingCalculationValidationHelper.GetValidationErrors(calculation.InputParameters,
-                                                                                           new GeneralPipingInput());
+                                                                                                 new GeneralPipingInput());
 
             // Assert
             Assert.AreEqual(1, messages.Count());