Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Observers/AssessmentSectionResultObserverTest.cs
===================================================================
diff -u -ra9d9138b73c38022ecb110a4a5ca573c8dd6dc71 -r96024447a838d0efc914e4fc4db1c245ae13c9c1
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Observers/AssessmentSectionResultObserverTest.cs	(.../AssessmentSectionResultObserverTest.cs)	(revision a9d9138b73c38022ecb110a4a5ca573c8dd6dc71)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Observers/AssessmentSectionResultObserverTest.cs	(.../AssessmentSectionResultObserverTest.cs)	(revision 96024447a838d0efc914e4fc4db1c245ae13c9c1)
@@ -42,6 +42,7 @@
 using Riskeer.Piping.Data;
 using Riskeer.Piping.Data.SemiProbabilistic;
 using Riskeer.Piping.Data.TestUtil;
+using Riskeer.Piping.Data.TestUtil.SemiProbabilistic;
 using Riskeer.StabilityPointStructures.Data;
 using Riskeer.StabilityPointStructures.Data.TestUtil;
 using Riskeer.StabilityStoneCover.Data;
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs
===================================================================
diff -u -r6035fafb6e89b1e7fad8c40cdfb944565764f593 -r96024447a838d0efc914e4fc4db1c245ae13c9c1
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs	(.../AssessmentSectionTreeNodeInfoTest.cs)	(revision 6035fafb6e89b1e7fad8c40cdfb944565764f593)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs	(.../AssessmentSectionTreeNodeInfoTest.cs)	(revision 96024447a838d0efc914e4fc4db1c245ae13c9c1)
@@ -67,6 +67,7 @@
 using Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Kernels;
 using Riskeer.Piping.Data.SemiProbabilistic;
 using Riskeer.Piping.Data.TestUtil;
+using Riskeer.Piping.Data.TestUtil.SemiProbabilistic;
 using Riskeer.Piping.Forms.PresentationObjects;
 using Riskeer.Piping.KernelWrapper.SubCalculator;
 using Riskeer.Piping.KernelWrapper.TestUtil.SubCalculator;
Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs
===================================================================
diff -u -r6035fafb6e89b1e7fad8c40cdfb944565764f593 -r96024447a838d0efc914e4fc4db1c245ae13c9c1
--- Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs	(.../AssessmentSectionCalculationActivityFactoryTest.cs)	(revision 6035fafb6e89b1e7fad8c40cdfb944565764f593)
+++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs	(.../AssessmentSectionCalculationActivityFactoryTest.cs)	(revision 96024447a838d0efc914e4fc4db1c245ae13c9c1)
@@ -50,6 +50,7 @@
 using Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Kernels;
 using Riskeer.Piping.Data.SemiProbabilistic;
 using Riskeer.Piping.Data.TestUtil;
+using Riskeer.Piping.Data.TestUtil.SemiProbabilistic;
 using Riskeer.Piping.KernelWrapper.SubCalculator;
 using Riskeer.Piping.KernelWrapper.TestUtil.SubCalculator;
 using Riskeer.StabilityPointStructures.Data.TestUtil;
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r6035fafb6e89b1e7fad8c40cdfb944565764f593 -r96024447a838d0efc914e4fc4db1c245ae13c9c1
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs	(.../PipingFailureMechanismAssemblyFactoryTest.cs)	(revision 6035fafb6e89b1e7fad8c40cdfb944565764f593)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs	(.../PipingFailureMechanismAssemblyFactoryTest.cs)	(revision 96024447a838d0efc914e4fc4db1c245ae13c9c1)
@@ -39,6 +39,7 @@
 using Riskeer.Common.Primitives;
 using Riskeer.Piping.Data.SemiProbabilistic;
 using Riskeer.Piping.Data.TestUtil;
+using Riskeer.Piping.Data.TestUtil.SemiProbabilistic;
 
 namespace Riskeer.Piping.Data.Test
 {
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs
===================================================================
diff -u -r3cf96c8027cad788d9753ed323866fbfd04f5ef4 -r96024447a838d0efc914e4fc4db1c245ae13c9c1
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs	(.../PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs)	(revision 3cf96c8027cad788d9753ed323866fbfd04f5ef4)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs	(.../PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs)	(revision 96024447a838d0efc914e4fc4db1c245ae13c9c1)
@@ -31,6 +31,7 @@
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Piping.Data.SemiProbabilistic;
 using Riskeer.Piping.Data.TestUtil;
+using Riskeer.Piping.Data.TestUtil.SemiProbabilistic;
 
 namespace Riskeer.Piping.Data.Test
 {
Index: Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/Probabilistic/ProbabilisticPipingCalculationScenarioTestFactory.cs
===================================================================
diff -u
--- Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/Probabilistic/ProbabilisticPipingCalculationScenarioTestFactory.cs	(revision 0)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/Probabilistic/ProbabilisticPipingCalculationScenarioTestFactory.cs	(revision 96024447a838d0efc914e4fc4db1c245ae13c9c1)
@@ -0,0 +1,68 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Core.Common.Base.Data;
+using Riskeer.Common.Data.Hydraulics;
+using Riskeer.Piping.Data.Probabilistic;
+
+namespace Riskeer.Piping.Data.TestUtil.Probabilistic
+{
+    /// <summary>
+    /// Helper class for creating instances of <see cref="ProbabilisticPipingCalculationScenario"/>.
+    /// </summary>
+    public static class ProbabilisticPipingCalculationScenarioTestFactory
+    {
+        /// <summary>
+        /// Creates a probabilistic calculation scenario with valid input.
+        /// </summary>
+        /// <param name="hydraulicBoundaryLocation">The hydraulic boundary location to set to the input.</param>
+        /// <returns>A new <see cref="ProbabilisticPipingCalculationScenario"/>.</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 ProbabilisticPipingCalculationScenario CreateProbabilisticPipingCalculationScenarioWithValidInput(HydraulicBoundaryLocation hydraulicBoundaryLocation)
+        {
+            if (hydraulicBoundaryLocation == null)
+            {
+                throw new ArgumentNullException(nameof(hydraulicBoundaryLocation));
+            }
+
+            return new ProbabilisticPipingCalculationScenario
+            {
+                InputParameters =
+                {
+                    DampingFactorExit =
+                    {
+                        Mean = (RoundedDouble) 1.0
+                    },
+                    PhreaticLevelExit =
+                    {
+                        Mean = (RoundedDouble) 2.0
+                    },
+                    SurfaceLine = PipingCalculationScenarioTestFactory.GetSurfaceLine(),
+                    StochasticSoilProfile = PipingCalculationScenarioTestFactory.GetStochasticSoilProfile(),
+                    HydraulicBoundaryLocation = hydraulicBoundaryLocation
+                }
+            };
+        }
+    }
+}
\ No newline at end of file
Index: Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioTestFactory.cs
===================================================================
diff -u
--- Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioTestFactory.cs	(revision 0)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioTestFactory.cs	(revision 96024447a838d0efc914e4fc4db1c245ae13c9c1)
@@ -0,0 +1,143 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Linq;
+using Core.Common.Base.Data;
+using Core.Common.Base.Geometry;
+using Riskeer.Common.Data.FailureMechanism;
+using Riskeer.Common.Data.Hydraulics;
+using Riskeer.Piping.Data.SemiProbabilistic;
+using Riskeer.Piping.Primitives;
+
+namespace Riskeer.Piping.Data.TestUtil.SemiProbabilistic
+{
+    /// <summary>
+    /// Helper class for creating instances of <see cref="SemiProbabilisticPipingCalculationScenario"/>.
+    /// </summary>
+    public static class SemiProbabilisticPipingCalculationScenarioTestFactory
+    {
+        /// <summary>
+        /// Creates a calculated scenario for which the surface line on the input intersects with <paramref name="section"/>.
+        /// </summary>
+        /// <param name="section">The section for which an intersection will be created.</param>
+        /// <returns>A new <see cref="SemiProbabilisticPipingCalculationScenario"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="section"/> is <c>null</c>.</exception>
+        public static SemiProbabilisticPipingCalculationScenario CreatePipingCalculationScenario(FailureMechanismSection section)
+        {
+            SemiProbabilisticPipingCalculationScenario scenario = CreateNotCalculatedPipingCalculationScenario(section);
+            scenario.Output = PipingTestDataGenerator.GetRandomSemiProbabilisticPipingOutput();
+
+            return scenario;
+        }
+
+        /// <summary>
+        /// Creates a scenario for which the surface line on the input intersects with <paramref name="section"/> and
+        /// is marked as not relevant for the assessment.
+        /// </summary>
+        /// <param name="section">The section for which an intersection will be created.</param>
+        /// <returns>A new <see cref="SemiProbabilisticPipingCalculationScenario"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="section"/> is <c>null</c>.</exception>
+        public static SemiProbabilisticPipingCalculationScenario CreateIrrelevantPipingCalculationScenario(FailureMechanismSection section)
+        {
+            SemiProbabilisticPipingCalculationScenario scenario = CreateNotCalculatedPipingCalculationScenario(section);
+            scenario.IsRelevant = false;
+            return scenario;
+        }
+
+        /// <summary>
+        /// Creates a scenario for which the surface line on the input intersects with <paramref name="section"/> and
+        /// the calculation has not been performed.
+        /// </summary>
+        /// <param name="section">The section for which an intersection will be created.</param>
+        /// <returns>A new <see cref="SemiProbabilisticPipingCalculationScenario"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="section"/> is <c>null</c>.</exception>
+        public static SemiProbabilisticPipingCalculationScenario CreateNotCalculatedPipingCalculationScenario(FailureMechanismSection section)
+        {
+            if (section == null)
+            {
+                throw new ArgumentNullException(nameof(section));
+            }
+
+            var pipingSurfaceLine = new PipingSurfaceLine(string.Empty);
+            Point2D p = section.Points.First();
+            pipingSurfaceLine.SetGeometry(new[]
+            {
+                new Point3D(p.X, p.Y, 0),
+                new Point3D(p.X + 2, p.Y + 2, 0)
+            });
+            pipingSurfaceLine.ReferenceLineIntersectionWorldPoint = section.Points.First();
+
+            var scenario = new SemiProbabilisticPipingCalculationScenario
+            {
+                IsRelevant = true,
+                InputParameters =
+                {
+                    SurfaceLine = pipingSurfaceLine
+                }
+            };
+            return scenario;
+        }
+
+        /// <summary>
+        /// Creates a scenario with invalid input.
+        /// </summary>
+        /// <returns>A new <see cref="SemiProbabilisticPipingCalculationScenario"/>.</returns>
+        public static SemiProbabilisticPipingCalculationScenario CreatePipingCalculationScenarioWithInvalidInput()
+        {
+            return new SemiProbabilisticPipingCalculationScenario();
+        }
+
+        /// <summary>
+        /// Creates a scenario with valid input.
+        /// </summary>
+        /// <param name="hydraulicBoundaryLocation">The hydraulic boundary location to set to the input.</param>
+        /// <returns>A new <see cref="SemiProbabilisticPipingCalculationScenario"/>.</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 SemiProbabilisticPipingCalculationScenario CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(HydraulicBoundaryLocation hydraulicBoundaryLocation)
+        {
+            if (hydraulicBoundaryLocation == null)
+            {
+                throw new ArgumentNullException(nameof(hydraulicBoundaryLocation));
+            }
+
+            return new SemiProbabilisticPipingCalculationScenario
+            {
+                InputParameters =
+                {
+                    DampingFactorExit =
+                    {
+                        Mean = (RoundedDouble) 1.0
+                    },
+                    PhreaticLevelExit =
+                    {
+                        Mean = (RoundedDouble) 2.0
+                    },
+                    SurfaceLine = PipingCalculationScenarioTestFactory.GetSurfaceLine(),
+                    StochasticSoilProfile = PipingCalculationScenarioTestFactory.GetStochasticSoilProfile(),
+                    HydraulicBoundaryLocation = hydraulicBoundaryLocation
+                }
+            };
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 96024447a838d0efc914e4fc4db1c245ae13c9c1 refers to a dead (removed) revision in file `Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilisticPipingCalculationScenarioTestFactory.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Factories/PipingMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -r6035fafb6e89b1e7fad8c40cdfb944565764f593 -r96024447a838d0efc914e4fc4db1c245ae13c9c1
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Factories/PipingMapDataFeaturesFactoryTest.cs	(.../PipingMapDataFeaturesFactoryTest.cs)	(revision 6035fafb6e89b1e7fad8c40cdfb944565764f593)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Factories/PipingMapDataFeaturesFactoryTest.cs	(.../PipingMapDataFeaturesFactoryTest.cs)	(revision 96024447a838d0efc914e4fc4db1c245ae13c9c1)
@@ -29,6 +29,7 @@
 using Riskeer.Piping.Data.SemiProbabilistic;
 using Riskeer.Piping.Data.SoilProfile;
 using Riskeer.Piping.Data.TestUtil;
+using Riskeer.Piping.Data.TestUtil.SemiProbabilistic;
 using Riskeer.Piping.Forms.Factories;
 using Riskeer.Piping.Primitives;
 
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingCalculationRowTest.cs
===================================================================
diff -u -r6035fafb6e89b1e7fad8c40cdfb944565764f593 -r96024447a838d0efc914e4fc4db1c245ae13c9c1
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingCalculationRowTest.cs	(.../PipingCalculationRowTest.cs)	(revision 6035fafb6e89b1e7fad8c40cdfb944565764f593)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingCalculationRowTest.cs	(.../PipingCalculationRowTest.cs)	(revision 96024447a838d0efc914e4fc4db1c245ae13c9c1)
@@ -36,6 +36,7 @@
 using Riskeer.Piping.Data.SemiProbabilistic;
 using Riskeer.Piping.Data.SoilProfile;
 using Riskeer.Piping.Data.TestUtil;
+using Riskeer.Piping.Data.TestUtil.SemiProbabilistic;
 using Riskeer.Piping.Forms.Views;
 using Riskeer.Piping.Primitives;
 using Riskeer.Piping.Primitives.TestUtil;
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs
===================================================================
diff -u -ra9d9138b73c38022ecb110a4a5ca573c8dd6dc71 -r96024447a838d0efc914e4fc4db1c245ae13c9c1
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs	(.../PipingFailureMechanismResultViewTest.cs)	(revision a9d9138b73c38022ecb110a4a5ca573c8dd6dc71)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs	(.../PipingFailureMechanismResultViewTest.cs)	(revision 96024447a838d0efc914e4fc4db1c245ae13c9c1)
@@ -39,6 +39,7 @@
 using Riskeer.Piping.Data;
 using Riskeer.Piping.Data.SemiProbabilistic;
 using Riskeer.Piping.Data.TestUtil;
+using Riskeer.Piping.Data.TestUtil.SemiProbabilistic;
 using Riskeer.Piping.Forms.Views;
 
 namespace Riskeer.Piping.Forms.Test.Views
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs
===================================================================
diff -u -r5007379065eb83c6d21cfa16264b9e16fee696d7 -r96024447a838d0efc914e4fc4db1c245ae13c9c1
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs	(.../PipingFailureMechanismSectionResultRowTest.cs)	(revision 5007379065eb83c6d21cfa16264b9e16fee696d7)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs	(.../PipingFailureMechanismSectionResultRowTest.cs)	(revision 96024447a838d0efc914e4fc4db1c245ae13c9c1)
@@ -44,6 +44,7 @@
 using Riskeer.Piping.Data;
 using Riskeer.Piping.Data.SemiProbabilistic;
 using Riskeer.Piping.Data.TestUtil;
+using Riskeer.Piping.Data.TestUtil.SemiProbabilistic;
 using Riskeer.Piping.Forms.Views;
 
 namespace Riskeer.Piping.Forms.Test.Views
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs
===================================================================
diff -u -r6035fafb6e89b1e7fad8c40cdfb944565764f593 -r96024447a838d0efc914e4fc4db1c245ae13c9c1
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs	(.../PipingFailureMechanismViewTest.cs)	(revision 6035fafb6e89b1e7fad8c40cdfb944565764f593)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs	(.../PipingFailureMechanismViewTest.cs)	(revision 96024447a838d0efc914e4fc4db1c245ae13c9c1)
@@ -47,6 +47,7 @@
 using Riskeer.Piping.Data.SemiProbabilistic;
 using Riskeer.Piping.Data.SoilProfile;
 using Riskeer.Piping.Data.TestUtil;
+using Riskeer.Piping.Data.TestUtil.SemiProbabilistic;
 using Riskeer.Piping.Forms.Views;
 using Riskeer.Piping.Primitives;
 
Index: Riskeer/Piping/test/Riskeer.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs
===================================================================
diff -u -r6035fafb6e89b1e7fad8c40cdfb944565764f593 -r96024447a838d0efc914e4fc4db1c245ae13c9c1
--- Riskeer/Piping/test/Riskeer.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs	(.../InputParameterCalculationServiceTest.cs)	(revision 6035fafb6e89b1e7fad8c40cdfb944565764f593)
+++ Riskeer/Piping/test/Riskeer.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs	(.../InputParameterCalculationServiceTest.cs)	(revision 96024447a838d0efc914e4fc4db1c245ae13c9c1)
@@ -30,6 +30,7 @@
 using Riskeer.Piping.Data.SemiProbabilistic;
 using Riskeer.Piping.Data.SoilProfile;
 using Riskeer.Piping.Data.TestUtil;
+using Riskeer.Piping.Data.TestUtil.SemiProbabilistic;
 using Riskeer.Piping.KernelWrapper.SubCalculator;
 using Riskeer.Piping.KernelWrapper.TestUtil.SubCalculator;
 using Riskeer.Piping.Primitives;
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4738ba7126e4a8a1f25c74c0e725dd14392aa603 -r96024447a838d0efc914e4fc4db1c245ae13c9c1
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 4738ba7126e4a8a1f25c74c0e725dd14392aa603)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 96024447a838d0efc914e4fc4db1c245ae13c9c1)
@@ -46,6 +46,7 @@
 using Riskeer.Piping.Data.SemiProbabilistic;
 using Riskeer.Piping.Data.SoilProfile;
 using Riskeer.Piping.Data.TestUtil;
+using Riskeer.Piping.Data.TestUtil.SemiProbabilistic;
 using Riskeer.Piping.Forms;
 using Riskeer.Piping.Forms.PresentationObjects;
 using Riskeer.Piping.Forms.PresentationObjects.Probabilistic;
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r6035fafb6e89b1e7fad8c40cdfb944565764f593 -r96024447a838d0efc914e4fc4db1c245ae13c9c1
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision 6035fafb6e89b1e7fad8c40cdfb944565764f593)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision 96024447a838d0efc914e4fc4db1c245ae13c9c1)
@@ -47,6 +47,7 @@
 using Riskeer.Piping.Data;
 using Riskeer.Piping.Data.SemiProbabilistic;
 using Riskeer.Piping.Data.TestUtil;
+using Riskeer.Piping.Data.TestUtil.SemiProbabilistic;
 using Riskeer.Piping.Forms.PresentationObjects;
 using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources;
 using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs
===================================================================
diff -u -r6035fafb6e89b1e7fad8c40cdfb944565764f593 -r96024447a838d0efc914e4fc4db1c245ae13c9c1
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs	(.../SemiProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs)	(revision 6035fafb6e89b1e7fad8c40cdfb944565764f593)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs	(.../SemiProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs)	(revision 96024447a838d0efc914e4fc4db1c245ae13c9c1)
@@ -46,6 +46,7 @@
 using Riskeer.Piping.Data.SemiProbabilistic;
 using Riskeer.Piping.Data.SoilProfile;
 using Riskeer.Piping.Data.TestUtil;
+using Riskeer.Piping.Data.TestUtil.SemiProbabilistic;
 using Riskeer.Piping.Forms.PresentationObjects;
 using Riskeer.Piping.Forms.PresentationObjects.SemiProbabilistic;
 using Riskeer.Piping.Primitives;
Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs
===================================================================
diff -u -r0abe26d381a9120149abe6438b8c1af9829db4b5 -r96024447a838d0efc914e4fc4db1c245ae13c9c1
--- Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs	(.../PipingCalculationActivityFactoryTest.cs)	(revision 0abe26d381a9120149abe6438b8c1af9829db4b5)
+++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs	(.../PipingCalculationActivityFactoryTest.cs)	(revision 96024447a838d0efc914e4fc4db1c245ae13c9c1)
@@ -35,6 +35,7 @@
 using Riskeer.Piping.Data;
 using Riskeer.Piping.Data.SemiProbabilistic;
 using Riskeer.Piping.Data.TestUtil;
+using Riskeer.Piping.Data.TestUtil.SemiProbabilistic;
 using Riskeer.Piping.KernelWrapper.SubCalculator;
 using Riskeer.Piping.KernelWrapper.TestUtil.SubCalculator;
 using Riskeer.Piping.Service.SemiProbabilistic;
Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/Probabilistic/ProbabilisticPipingCalculationServiceTest.cs
===================================================================
diff -u -rb59bdeedc35d66fb4053a7d7164ac9eb68dcea9d -r96024447a838d0efc914e4fc4db1c245ae13c9c1
--- Riskeer/Piping/test/Riskeer.Piping.Service.Test/Probabilistic/ProbabilisticPipingCalculationServiceTest.cs	(.../ProbabilisticPipingCalculationServiceTest.cs)	(revision b59bdeedc35d66fb4053a7d7164ac9eb68dcea9d)
+++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/Probabilistic/ProbabilisticPipingCalculationServiceTest.cs	(.../ProbabilisticPipingCalculationServiceTest.cs)	(revision 96024447a838d0efc914e4fc4db1c245ae13c9c1)
@@ -35,6 +35,7 @@
 using Riskeer.Piping.Data.Probabilistic;
 using Riskeer.Piping.Data.SoilProfile;
 using Riskeer.Piping.Data.TestUtil;
+using Riskeer.Piping.Data.TestUtil.Probabilistic;
 using Riskeer.Piping.Primitives;
 using Riskeer.Piping.Service.Probabilistic;
 
@@ -44,7 +45,7 @@
     public class ProbabilisticPipingCalculationServiceTest
     {
         private const string averagingSoilLayerPropertiesMessage = "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.";
-        
+
         private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Integration.Service, "HydraRingCalculation");
         private static readonly string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
 
@@ -54,7 +55,7 @@
         [SetUp]
         public void Setup()
         {
-            calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+            calculation = ProbabilisticPipingCalculationScenarioTestFactory.CreateProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
             testSurfaceLineTopLevel = calculation.InputParameters.SurfaceLine.Points.Max(p => p.Z);
         }
 
@@ -65,7 +66,7 @@
             var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
-            
+
             // Call
             void Call() => ProbabilisticPipingCalculationService.Validate(null, new GeneralPipingInput(), assessmentSection);
 
@@ -82,7 +83,7 @@
             var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
-            
+
             // Call
             void Call() => ProbabilisticPipingCalculationService.Validate(new TestProbabilisticPipingCalculation(), null, assessmentSection);
 
@@ -102,13 +103,13 @@
             var exception = Assert.Throws<ArgumentNullException>(Call);
             Assert.AreEqual("assessmentSection", exception.ParamName);
         }
-        
+
         [Test]
         public void Validate_Always_LogStartAndEndOfValidatingInputs()
         {
             // Setup
             var failureMechanism = new PipingFailureMechanism();
-            
+
             var mocks = new MockRepository();
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(
                 failureMechanism, mocks, validFilePath);
@@ -283,13 +284,13 @@
             Assert.IsFalse(isValid);
             mocks.VerifyAll();
         }
-        
+
         [Test]
         public void Validate_InvalidCalculationInput_LogsErrorAndReturnsFalse()
         {
             // Setup
             var failureMechanism = new PipingFailureMechanism();
-            
+
             var mocks = new MockRepository();
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(
                 failureMechanism, mocks, validFilePath);
@@ -327,7 +328,7 @@
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(
                 failureMechanism, mocks, validFilePath);
             mocks.ReplayAll();
-            
+
             var aquitardLayer = new PipingSoilLayer(2.0)
             {
                 IsAquifer = false
@@ -372,7 +373,7 @@
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(
                 failureMechanism, mocks, validFilePath);
             mocks.ReplayAll();
-            
+
             var aquiferLayer = new PipingSoilLayer(10.56)
             {
                 IsAquifer = true,
@@ -425,7 +426,7 @@
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(
                 failureMechanism, mocks, validFilePath);
             mocks.ReplayAll();
-            
+
             var coverageLayerAboveSurfaceLine = new PipingSoilLayer(13.0)
             {
                 IsAquifer = false
@@ -483,7 +484,7 @@
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(
                 failureMechanism, mocks, validFilePath);
             mocks.ReplayAll();
-            
+
             var random = new Random(21);
             const double belowPhreaticLevelDeviation = 0.5;
             const int belowPhreaticLevelShift = 1;
@@ -566,7 +567,7 @@
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(
                 failureMechanism, mocks, validFilePath);
             mocks.ReplayAll();
-            
+
             var random = new Random(21);
             var incompletePipingSoilLayer = new PipingSoilLayer(5.0)
             {
@@ -638,7 +639,7 @@
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(
                 failureMechanism, mocks, validFilePath);
             mocks.ReplayAll();
-            
+
             var random = new Random(21);
             var coverageLayerInvalidD70 = new PipingSoilLayer(5.0)
             {
@@ -705,7 +706,7 @@
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(
                 failureMechanism, mocks, validFilePath);
             mocks.ReplayAll();
-            
+
             var random = new Random(21);
             var incompletePipingSoilLayer = new PipingSoilLayer(5.0)
             {
@@ -779,7 +780,7 @@
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(
                 failureMechanism, mocks, validFilePath);
             mocks.ReplayAll();
-            
+
             var random = new Random(21);
             var incompletePipingSoilLayer = new PipingSoilLayer(testSurfaceLineTopLevel)
             {
@@ -851,7 +852,7 @@
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(
                 failureMechanism, mocks, validFilePath);
             mocks.ReplayAll();
-            
+
             var coverageLayerInvalidSaturatedVolumicWeight = new PipingSoilLayer(testSurfaceLineTopLevel)
             {
                 IsAquifer = false,
@@ -917,7 +918,7 @@
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(
                 failureMechanism, mocks, validFilePath);
             mocks.ReplayAll();
-            
+
             var topCoverageLayer = new PipingSoilLayer(testSurfaceLineTopLevel)
             {
                 IsAquifer = false,
Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationActivityTest.cs
===================================================================
diff -u -r6035fafb6e89b1e7fad8c40cdfb944565764f593 -r96024447a838d0efc914e4fc4db1c245ae13c9c1
--- Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationActivityTest.cs	(.../SemiProbabilisticPipingCalculationActivityTest.cs)	(revision 6035fafb6e89b1e7fad8c40cdfb944565764f593)
+++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationActivityTest.cs	(.../SemiProbabilisticPipingCalculationActivityTest.cs)	(revision 96024447a838d0efc914e4fc4db1c245ae13c9c1)
@@ -34,6 +34,7 @@
 using Riskeer.Piping.Data;
 using Riskeer.Piping.Data.SemiProbabilistic;
 using Riskeer.Piping.Data.TestUtil;
+using Riskeer.Piping.Data.TestUtil.SemiProbabilistic;
 using Riskeer.Piping.Service.SemiProbabilistic;
 
 namespace Riskeer.Piping.Service.Test.SemiProbabilistic
Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationServiceTest.cs
===================================================================
diff -u -r6035fafb6e89b1e7fad8c40cdfb944565764f593 -r96024447a838d0efc914e4fc4db1c245ae13c9c1
--- Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationServiceTest.cs	(.../SemiProbabilisticPipingCalculationServiceTest.cs)	(revision 6035fafb6e89b1e7fad8c40cdfb944565764f593)
+++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationServiceTest.cs	(.../SemiProbabilisticPipingCalculationServiceTest.cs)	(revision 96024447a838d0efc914e4fc4db1c245ae13c9c1)
@@ -34,6 +34,7 @@
 using Riskeer.Piping.Data.SemiProbabilistic;
 using Riskeer.Piping.Data.SoilProfile;
 using Riskeer.Piping.Data.TestUtil;
+using Riskeer.Piping.Data.TestUtil.SemiProbabilistic;
 using Riskeer.Piping.KernelWrapper;
 using Riskeer.Piping.KernelWrapper.SubCalculator;
 using Riskeer.Piping.KernelWrapper.TestUtil.SubCalculator;