Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs
===================================================================
diff -u -r503de68118b2702bb62004782f1c39271cb2eb29 -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs	(.../PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs)	(revision 503de68118b2702bb62004782f1c39271cb2eb29)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs	(.../PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
@@ -132,11 +132,11 @@
 
             pipingCalculationScenario1.IsRelevant = true;
             pipingCalculationScenario1.Contribution = (RoundedDouble) 0.2111;
-            pipingCalculationScenario1.Output = PipingOutputTestFactory.Create(1.1, 2.2, 3.3);
+            pipingCalculationScenario1.Output = SemiProbabilisticPipingOutputTestFactory.Create(1.1, 2.2, 3.3);
 
             pipingCalculationScenario2.IsRelevant = true;
             pipingCalculationScenario2.Contribution = (RoundedDouble) 0.7889;
-            pipingCalculationScenario2.Output = PipingOutputTestFactory.Create(4.4, 5.5, 6.6);
+            pipingCalculationScenario2.Output = SemiProbabilisticPipingOutputTestFactory.Create(4.4, 5.5, 6.6);
 
             pipingCalculationScenario3.IsRelevant = false;
 
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/Probabilistic/ProbabilisticPipingCalculationTest.cs
===================================================================
diff -u -r29eb40bfe04b200a49455f143e605f83dc0cd4d9 -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/Probabilistic/ProbabilisticPipingCalculationTest.cs	(.../ProbabilisticPipingCalculationTest.cs)	(revision 29eb40bfe04b200a49455f143e605f83dc0cd4d9)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/Probabilistic/ProbabilisticPipingCalculationTest.cs	(.../ProbabilisticPipingCalculationTest.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
@@ -96,7 +96,7 @@
             // Setup
             ProbabilisticPipingCalculation original = CreateRandomCalculationWithoutOutput();
 
-            original.Output = PipingOutputTestFactory.Create();
+            original.Output = SemiProbabilisticPipingOutputTestFactory.Create();
             
             // Call
             object clone = original.Clone();
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationTest.cs
===================================================================
diff -u -r7d4cd8bd62fff02ccaa91f18ed6d53b46bc3b2ec -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationTest.cs	(.../SemiProbabilisticPipingCalculationTest.cs)	(revision 7d4cd8bd62fff02ccaa91f18ed6d53b46bc3b2ec)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationTest.cs	(.../SemiProbabilisticPipingCalculationTest.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
@@ -64,7 +64,7 @@
             // Setup
             var calculation = new SemiProbabilisticPipingCalculation(new GeneralPipingInput())
             {
-                Output = PipingOutputTestFactory.Create()
+                Output = SemiProbabilisticPipingOutputTestFactory.Create()
             };
 
             // Call
@@ -80,7 +80,7 @@
             // Setup
             var calculation = new SemiProbabilisticPipingCalculation(new GeneralPipingInput())
             {
-                Output = PipingOutputTestFactory.Create()
+                Output = SemiProbabilisticPipingOutputTestFactory.Create()
             };
 
             // Call
@@ -96,7 +96,7 @@
             // Setup
             SemiProbabilisticPipingCalculation original = CreateRandomCalculationWithoutOutput();
 
-            original.Output = PipingOutputTestFactory.Create();
+            original.Output = SemiProbabilisticPipingOutputTestFactory.Create();
             
             // Call
             object clone = original.Clone();
Fisheye: Tag a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86 refers to a dead (removed) revision in file `Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil.Test/PipingOutputTestFactoryTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil.Test/SemiProbabilisticPipingOutputTestFactoryTest.cs
===================================================================
diff -u
--- Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil.Test/SemiProbabilisticPipingOutputTestFactoryTest.cs	(revision 0)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil.Test/SemiProbabilisticPipingOutputTestFactoryTest.cs	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
@@ -0,0 +1,71 @@
+// 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 NUnit.Framework;
+using Riskeer.Piping.Data.SemiProbabilistic;
+
+namespace Riskeer.Piping.Data.TestUtil.Test
+{
+    [TestFixture]
+    public class SemiProbabilisticPipingOutputTestFactoryTest
+    {
+        [Test]
+        public void Create_WithoutParameters_ReturnOutput()
+        {
+            // Call
+            SemiProbabilisticPipingOutput output = SemiProbabilisticPipingOutputTestFactory.Create();
+
+            // Assert
+            Assert.IsTrue(IsValidDouble(output.HeaveFactorOfSafety));
+            Assert.IsTrue(IsValidDouble(output.UpliftEffectiveStress));
+            Assert.IsTrue(IsValidDouble(output.UpliftFactorOfSafety));
+            Assert.IsTrue(IsValidDouble(output.SellmeijerFactorOfSafety));
+            Assert.IsTrue(IsValidDouble(output.HeaveGradient));
+            Assert.IsTrue(IsValidDouble(output.SellmeijerCreepCoefficient));
+            Assert.IsTrue(IsValidDouble(output.SellmeijerCriticalFall));
+            Assert.IsTrue(IsValidDouble(output.SellmeijerReducedFall));
+        }
+
+        [Test]
+        public void Create_WithParameters_ReturnOutput()
+        {
+            // Setup
+            var random = new Random(39);
+            double heaveFactorOfSafety = random.NextDouble();
+            double upliftFactorOfSafety = random.NextDouble();
+            double sellmeijerFactorOfSafety = random.NextDouble();
+
+            // Call
+            SemiProbabilisticPipingOutput output = SemiProbabilisticPipingOutputTestFactory.Create(heaveFactorOfSafety, upliftFactorOfSafety, sellmeijerFactorOfSafety);
+
+            // Assert
+            Assert.AreEqual(heaveFactorOfSafety, output.HeaveFactorOfSafety);
+            Assert.AreEqual(upliftFactorOfSafety, output.UpliftFactorOfSafety);
+            Assert.AreEqual(sellmeijerFactorOfSafety, output.SellmeijerFactorOfSafety);
+        }
+
+        private static bool IsValidDouble(double value)
+        {
+            return !double.IsNaN(value) && !double.IsInfinity(value);
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86 refers to a dead (removed) revision in file `Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingOutputTestFactory.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingTestDataGenerator.cs
===================================================================
diff -u -rc9a6042f8c227006d244933f201cf8109b330164 -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86
--- Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingTestDataGenerator.cs	(.../PipingTestDataGenerator.cs)	(revision c9a6042f8c227006d244933f201cf8109b330164)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingTestDataGenerator.cs	(.../PipingTestDataGenerator.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
@@ -305,7 +305,7 @@
                     SurfaceLine = surfaceLine1,
                     StochasticSoilModel = stochasticSoilModel1
                 },
-                Output = PipingOutputTestFactory.Create()
+                Output = SemiProbabilisticPipingOutputTestFactory.Create()
             };
             var calculationWithSurfaceLineAndSoilModel = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput())
             {
@@ -325,7 +325,7 @@
                     SurfaceLine = surfaceLine2,
                     StochasticSoilModel = stochasticSoilModel2
                 },
-                Output = PipingOutputTestFactory.Create()
+                Output = SemiProbabilisticPipingOutputTestFactory.Create()
             };
             var calculationWithHydraulicBoundaryLocation = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput())
             {
@@ -354,7 +354,7 @@
                     StochasticSoilModel = stochasticSoilModel2,
                     StochasticSoilProfile = stochasticSoilModel2.StochasticSoilProfiles.First()
                 },
-                Output = PipingOutputTestFactory.Create()
+                Output = SemiProbabilisticPipingOutputTestFactory.Create()
             };
             var subCalculationWithOutputAndHydraulicBoundaryLocation = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput())
             {
@@ -365,7 +365,7 @@
                     StochasticSoilModel = stochasticSoilModel1,
                     StochasticSoilProfile = stochasticSoilModel1.StochasticSoilProfiles.First()
                 },
-                Output = PipingOutputTestFactory.Create()
+                Output = SemiProbabilisticPipingOutputTestFactory.Create()
             };
             var subCalculationWithHydraulicBoundaryLocation = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput())
             {
Index: Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilisticPipingCalculationScenarioTestFactory.cs
===================================================================
diff -u -ra9d9138b73c38022ecb110a4a5ca573c8dd6dc71 -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86
--- Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilisticPipingCalculationScenarioTestFactory.cs	(.../SemiProbabilisticPipingCalculationScenarioTestFactory.cs)	(revision a9d9138b73c38022ecb110a4a5ca573c8dd6dc71)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilisticPipingCalculationScenarioTestFactory.cs	(.../SemiProbabilisticPipingCalculationScenarioTestFactory.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
@@ -47,7 +47,7 @@
         public static SemiProbabilisticPipingCalculationScenario CreatePipingCalculationScenario(FailureMechanismSection section)
         {
             SemiProbabilisticPipingCalculationScenario scenario = CreateNotCalculatedPipingCalculationScenario(section);
-            scenario.Output = PipingOutputTestFactory.Create();
+            scenario.Output = SemiProbabilisticPipingOutputTestFactory.Create();
 
             return scenario;
         }
Index: Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilisticPipingOutputTestFactory.cs
===================================================================
diff -u
--- Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilisticPipingOutputTestFactory.cs	(revision 0)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilisticPipingOutputTestFactory.cs	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
@@ -0,0 +1,71 @@
+// 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 Riskeer.Piping.Data.SemiProbabilistic;
+
+namespace Riskeer.Piping.Data.TestUtil
+{
+    /// <summary>
+    /// Factory for creating <see cref="SemiProbabilisticPipingOutput"/> that can be used
+    /// for test purposes.
+    /// </summary>
+    public static class SemiProbabilisticPipingOutputTestFactory
+    {
+        /// <summary>
+        /// Creates <see cref="SemiProbabilisticPipingOutput"/> with random values.
+        /// </summary>
+        /// <returns>The created <see cref="SemiProbabilisticPipingOutput"/>.</returns>
+        public static SemiProbabilisticPipingOutput Create()
+        {
+            var random = new Random(39);
+
+            return new SemiProbabilisticPipingOutput(new SemiProbabilisticPipingOutput.ConstructionProperties
+            {
+                HeaveFactorOfSafety = random.NextDouble(),
+                UpliftEffectiveStress = random.NextDouble(),
+                UpliftFactorOfSafety = random.NextDouble(),
+                SellmeijerFactorOfSafety = random.NextDouble(),
+                HeaveGradient = random.NextDouble(),
+                SellmeijerCreepCoefficient = random.NextDouble(),
+                SellmeijerCriticalFall = random.NextDouble(),
+                SellmeijerReducedFall = random.NextDouble()
+            });
+        }
+
+        /// <summary>
+        /// Creates output with the given values.
+        /// </summary>
+        /// <param name="heaveFactorOfSafety">The heave factor of safety.</param>
+        /// <param name="upliftFactorOfSafety">The uplift factor of safety.</param>
+        /// <param name="sellmeijerFactorOfSafety">The sellmeijer factor of safety.</param>
+        /// <returns>The created <see cref="SemiProbabilisticPipingOutput"/>.</returns>
+        public static SemiProbabilisticPipingOutput Create(double heaveFactorOfSafety, double upliftFactorOfSafety, double sellmeijerFactorOfSafety)
+        {
+            return new SemiProbabilisticPipingOutput(new SemiProbabilisticPipingOutput.ConstructionProperties
+            {
+                HeaveFactorOfSafety = heaveFactorOfSafety,
+                UpliftFactorOfSafety = upliftFactorOfSafety,
+                SellmeijerFactorOfSafety = sellmeijerFactorOfSafety
+            });
+        }
+    }
+}
\ No newline at end of file
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/SemiProbabilistic/SemiProbabilisticPipingOutputContextTest.cs
===================================================================
diff -u -r4de992e770b6741a2480d50042c76d0ce07ceee8 -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/SemiProbabilistic/SemiProbabilisticPipingOutputContextTest.cs	(.../SemiProbabilisticPipingOutputContextTest.cs)	(revision 4de992e770b6741a2480d50042c76d0ce07ceee8)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/SemiProbabilistic/SemiProbabilisticPipingOutputContextTest.cs	(.../SemiProbabilisticPipingOutputContextTest.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
@@ -60,7 +60,7 @@
             mocks.ReplayAll();
 
             // Call
-            TestDelegate test = () => new SemiProbabilisticPipingOutputContext(PipingOutputTestFactory.Create(), null, assessmentSection);
+            TestDelegate test = () => new SemiProbabilisticPipingOutputContext(SemiProbabilisticPipingOutputTestFactory.Create(), null, assessmentSection);
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
@@ -72,7 +72,7 @@
         public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => new SemiProbabilisticPipingOutputContext(PipingOutputTestFactory.Create(), new PipingFailureMechanism(), null);
+            TestDelegate call = () => new SemiProbabilisticPipingOutputContext(SemiProbabilisticPipingOutputTestFactory.Create(), new PipingFailureMechanism(), null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -87,7 +87,7 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            SemiProbabilisticPipingOutput output = PipingOutputTestFactory.Create();
+            SemiProbabilisticPipingOutput output = SemiProbabilisticPipingOutputTestFactory.Create();
             var failureMechanism = new PipingFailureMechanism();
 
             // Call
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingOutputPropertiesTest.cs
===================================================================
diff -u -rd2f2b1cd5848ccee5da58b3181be23bcc7f54c4c -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingOutputPropertiesTest.cs	(.../SemiProbabilisticPipingOutputPropertiesTest.cs)	(revision d2f2b1cd5848ccee5da58b3181be23bcc7f54c4c)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingOutputPropertiesTest.cs	(.../SemiProbabilisticPipingOutputPropertiesTest.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
@@ -64,7 +64,7 @@
             mocks.ReplayAll();
 
             // Call
-            TestDelegate test = () => new SemiProbabilisticPipingOutputProperties(PipingOutputTestFactory.Create(), null, assessmentSection);
+            TestDelegate test = () => new SemiProbabilisticPipingOutputProperties(SemiProbabilisticPipingOutputTestFactory.Create(), null, assessmentSection);
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
@@ -76,7 +76,7 @@
         public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => new SemiProbabilisticPipingOutputProperties(PipingOutputTestFactory.Create(), new PipingFailureMechanism(), null);
+            TestDelegate call = () => new SemiProbabilisticPipingOutputProperties(SemiProbabilisticPipingOutputTestFactory.Create(), new PipingFailureMechanism(), null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -93,7 +93,7 @@
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks);
             mocks.ReplayAll();
 
-            SemiProbabilisticPipingOutput output = PipingOutputTestFactory.Create();
+            SemiProbabilisticPipingOutput output = SemiProbabilisticPipingOutputTestFactory.Create();
 
             // Call
             var properties = new SemiProbabilisticPipingOutputProperties(output, failureMechanism, assessmentSection);
@@ -175,7 +175,7 @@
             mocks.ReplayAll();
 
             // Call
-            var properties = new SemiProbabilisticPipingOutputProperties(PipingOutputTestFactory.Create(), failureMechanism, assessmentSection);
+            var properties = new SemiProbabilisticPipingOutputProperties(SemiProbabilisticPipingOutputTestFactory.Create(), failureMechanism, assessmentSection);
 
             // Assert
             PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingCalculationRowTest.cs
===================================================================
diff -u -r503de68118b2702bb62004782f1c39271cb2eb29 -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingCalculationRowTest.cs	(.../PipingCalculationRowTest.cs)	(revision 503de68118b2702bb62004782f1c39271cb2eb29)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingCalculationRowTest.cs	(.../PipingCalculationRowTest.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
@@ -421,7 +421,7 @@
             SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
             if (hasOutput)
             {
-                assignedOutput = PipingOutputTestFactory.Create();
+                assignedOutput = SemiProbabilisticPipingOutputTestFactory.Create();
             }
 
             calculation.Output = assignedOutput;
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs
===================================================================
diff -u -r9d81fce2b4838979d13c48cf0adc054fb240625a -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs	(.../PipingCalculationsViewTest.cs)	(revision 9d81fce2b4838979d13c48cf0adc054fb240625a)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs	(.../PipingCalculationsViewTest.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
@@ -654,7 +654,7 @@
 
             if (useCalculationWithOutput)
             {
-                calculation.Output = PipingOutputTestFactory.Create();
+                calculation.Output = SemiProbabilisticPipingOutputTestFactory.Create();
             }
 
             calculation.Attach(calculationObserver);
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs
===================================================================
diff -u -r9d81fce2b4838979d13c48cf0adc054fb240625a -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs	(.../PipingFailureMechanismSectionResultRowTest.cs)	(revision 9d81fce2b4838979d13c48cf0adc054fb240625a)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs	(.../PipingFailureMechanismSectionResultRowTest.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
@@ -820,7 +820,7 @@
 
             SemiProbabilisticPipingCalculationScenario calculationScenario = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(
                 section);
-            calculationScenario.Output = PipingOutputTestFactory.Create(double.NaN, double.NaN, double.NaN);
+            calculationScenario.Output = SemiProbabilisticPipingOutputTestFactory.Create(double.NaN, double.NaN, double.NaN);
 
             using (new AssemblyToolCalculatorFactoryConfig())
             {
@@ -1069,7 +1069,7 @@
             var sectionResult = new PipingFailureMechanismSectionResult(section);
 
             SemiProbabilisticPipingCalculationScenario scenario = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(section);
-            scenario.Output = PipingOutputTestFactory.Create();
+            scenario.Output = SemiProbabilisticPipingOutputTestFactory.Create();
             scenario.Contribution = (RoundedDouble) 0.3;
 
             using (new AssemblyToolCalculatorFactoryConfig())
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenarioRowTest.cs
===================================================================
diff -u -r5b3e99659e7701e346dacc32d3ce59a63dcc481f -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenarioRowTest.cs	(.../PipingScenarioRowTest.cs)	(revision 5b3e99659e7701e346dacc32d3ce59a63dcc481f)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenarioRowTest.cs	(.../PipingScenarioRowTest.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
@@ -109,7 +109,7 @@
 
             var calculation = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput())
             {
-                Output = PipingOutputTestFactory.Create()
+                Output = SemiProbabilisticPipingOutputTestFactory.Create()
             };
 
             // Call
@@ -167,7 +167,7 @@
             Assert.IsNaN(row.FailureProbabilitySellmeijer);
 
             // When
-            calculation.Output = PipingOutputTestFactory.Create();
+            calculation.Output = SemiProbabilisticPipingOutputTestFactory.Create();
             row.Update();
 
             // Then
@@ -191,7 +191,7 @@
 
             var calculation = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput())
             {
-                Output = PipingOutputTestFactory.Create()
+                Output = SemiProbabilisticPipingOutputTestFactory.Create()
             };
 
             var row = new PipingScenarioRow(calculation, failureMechanism, assessmentSection);
@@ -227,7 +227,7 @@
 
             var calculation = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput())
             {
-                Output = PipingOutputTestFactory.Create()
+                Output = SemiProbabilisticPipingOutputTestFactory.Create()
             };
 
             var row = new PipingScenarioRow(calculation, failureMechanism, assessmentSection);
@@ -242,7 +242,7 @@
             var random = new Random(11);
 
             // When
-            calculation.Output = PipingOutputTestFactory.Create(random.NextDouble(), random.NextDouble(), random.NextDouble());
+            calculation.Output = SemiProbabilisticPipingOutputTestFactory.Create(random.NextDouble(), random.NextDouble(), random.NextDouble());
             row.Update();
 
             // Then
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenariosViewTest.cs
===================================================================
diff -u -r9d81fce2b4838979d13c48cf0adc054fb240625a -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenariosViewTest.cs	(.../PipingScenariosViewTest.cs)	(revision 9d81fce2b4838979d13c48cf0adc054fb240625a)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenariosViewTest.cs	(.../PipingScenariosViewTest.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
@@ -227,7 +227,7 @@
                         EntryPointL = (RoundedDouble) 7.7777,
                         ExitPointL = (RoundedDouble) 8.8888
                     },
-                    Output = PipingOutputTestFactory.Create(0.26065, 0.81398, 0.38024)
+                    Output = SemiProbabilisticPipingOutputTestFactory.Create(0.26065, 0.81398, 0.38024)
                 }
             });
 
Index: Riskeer/Piping/test/Riskeer.Piping.Integration.Test/PipingFailureMechanismResultViewIntegrationTest.cs
===================================================================
diff -u -r8da4704f43ae462b1eeae911f401e9b41cb3ce50 -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86
--- Riskeer/Piping/test/Riskeer.Piping.Integration.Test/PipingFailureMechanismResultViewIntegrationTest.cs	(.../PipingFailureMechanismResultViewIntegrationTest.cs)	(revision 8da4704f43ae462b1eeae911f401e9b41cb3ce50)
+++ Riskeer/Piping/test/Riskeer.Piping.Integration.Test/PipingFailureMechanismResultViewIntegrationTest.cs	(.../PipingFailureMechanismResultViewIntegrationTest.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
@@ -122,7 +122,7 @@
                                 dataGridView.Rows[22].Cells[detailedAssessmentIndex].ErrorText);
 
                 // Execute the first calculation and ensure the data grid view is updated
-                pipingCalculation1.Output = PipingOutputTestFactory.Create(0.26065, 0.81398, 0.38024);
+                pipingCalculation1.Output = SemiProbabilisticPipingOutputTestFactory.Create(0.26065, 0.81398, 0.38024);
                 pipingCalculation1.NotifyObservers();
                 Assert.AreEqual(ProbabilityFormattingHelper.Format(2.425418e-4),
                                 dataGridView.Rows[22].Cells[detailedAssessmentIndex].FormattedValue);
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ImportInfos/PipingStochasticSoilModelCollectionContextImportInfoTest.cs
===================================================================
diff -u -r8da4704f43ae462b1eeae911f401e9b41cb3ce50 -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ImportInfos/PipingStochasticSoilModelCollectionContextImportInfoTest.cs	(.../PipingStochasticSoilModelCollectionContextImportInfoTest.cs)	(revision 8da4704f43ae462b1eeae911f401e9b41cb3ce50)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ImportInfos/PipingStochasticSoilModelCollectionContextImportInfoTest.cs	(.../PipingStochasticSoilModelCollectionContextImportInfoTest.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
@@ -178,7 +178,7 @@
             var failureMechanism = new PipingFailureMechanism();
             var calculationWithOutput = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput())
             {
-                Output = PipingOutputTestFactory.Create()
+                Output = SemiProbabilisticPipingOutputTestFactory.Create()
             };
             failureMechanism.CalculationsGroup.Children.Add(calculationWithOutput);
 
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ImportInfos/PipingSurfaceLinesContextImportInfoTest.cs
===================================================================
diff -u -r8da4704f43ae462b1eeae911f401e9b41cb3ce50 -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ImportInfos/PipingSurfaceLinesContextImportInfoTest.cs	(.../PipingSurfaceLinesContextImportInfoTest.cs)	(revision 8da4704f43ae462b1eeae911f401e9b41cb3ce50)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ImportInfos/PipingSurfaceLinesContextImportInfoTest.cs	(.../PipingSurfaceLinesContextImportInfoTest.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
@@ -180,7 +180,7 @@
             var failureMechanism = new PipingFailureMechanism();
             var calculationWithOutput = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput())
             {
-                Output = PipingOutputTestFactory.Create()
+                Output = SemiProbabilisticPipingOutputTestFactory.Create()
             };
             failureMechanism.CalculationsGroup.Children.Add(calculationWithOutput);
 
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/PipingOutputPropertyInfoTest.cs
===================================================================
diff -u -rc5b663de1a71c17ce8e2b9fff060800c6d6b0979 -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/PipingOutputPropertyInfoTest.cs	(.../PipingOutputPropertyInfoTest.cs)	(revision c5b663de1a71c17ce8e2b9fff060800c6d6b0979)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/PipingOutputPropertyInfoTest.cs	(.../PipingOutputPropertyInfoTest.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
@@ -70,7 +70,7 @@
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks);
             mocks.ReplayAll();
 
-            SemiProbabilisticPipingOutput output = PipingOutputTestFactory.Create();
+            SemiProbabilisticPipingOutput output = SemiProbabilisticPipingOutputTestFactory.Create();
             var context = new SemiProbabilisticPipingOutputContext(output, failureMechanism, assessmentSection);
 
             // Call
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rbb9019821be7597d93163a6c6cc250fe32cc5bc9 -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision bb9019821be7597d93163a6c6cc250fe32cc5bc9)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
@@ -207,7 +207,7 @@
 
             group.Children.Add(new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput())
             {
-                Output = PipingOutputTestFactory.Create()
+                Output = SemiProbabilisticPipingOutputTestFactory.Create()
             });
 
             var pipingFailureMechanism = new TestPipingFailureMechanism();
@@ -344,7 +344,7 @@
 
             group.Children.Add(new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput())
             {
-                Output = PipingOutputTestFactory.Create()
+                Output = SemiProbabilisticPipingOutputTestFactory.Create()
             });
 
             var pipingFailureMechanism = new TestPipingFailureMechanism();
@@ -1189,11 +1189,11 @@
 
                 SemiProbabilisticPipingCalculationScenario calculation1 = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
                 calculation1.Name = "A";
-                calculation1.Output = PipingOutputTestFactory.Create();
+                calculation1.Output = SemiProbabilisticPipingOutputTestFactory.Create();
                 calculation1.Attach(calculation1Observer);
                 SemiProbabilisticPipingCalculationScenario calculation2 = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
                 calculation2.Name = "B";
-                calculation2.Output = PipingOutputTestFactory.Create();
+                calculation2.Output = SemiProbabilisticPipingOutputTestFactory.Create();
                 calculation2.Attach(calculation2Observer);
 
                 var childGroup = new CalculationGroup();
@@ -1758,7 +1758,7 @@
                         EntryPointL = (RoundedDouble) 0,
                         ExitPointL = (RoundedDouble) 1
                     },
-                    Output = PipingOutputTestFactory.Create()
+                    Output = SemiProbabilisticPipingOutputTestFactory.Create()
                 };
                 calculation1.Attach(calculation1Observer);
                 calculation1.InputParameters.Attach(calculation1InputObserver);
@@ -1771,7 +1771,7 @@
                         EntryPointL = (RoundedDouble) 0,
                         ExitPointL = (RoundedDouble) 1
                     },
-                    Output = PipingOutputTestFactory.Create()
+                    Output = SemiProbabilisticPipingOutputTestFactory.Create()
                 };
                 calculation2.Attach(calculation2Observer);
                 calculation2.InputParameters.Attach(calculation2InputObserver);
@@ -1873,7 +1873,7 @@
                         EntryPointL = (RoundedDouble) 0,
                         ExitPointL = (RoundedDouble) 1
                     },
-                    Output = PipingOutputTestFactory.Create()
+                    Output = SemiProbabilisticPipingOutputTestFactory.Create()
                 };
                 calculation1.Attach(calculation1Observer);
                 calculation1.InputParameters.Attach(calculation1InputObserver);
@@ -1886,7 +1886,7 @@
                         EntryPointL = (RoundedDouble) 0,
                         ExitPointL = (RoundedDouble) 1
                     },
-                    Output = PipingOutputTestFactory.Create()
+                    Output = SemiProbabilisticPipingOutputTestFactory.Create()
                 };
                 calculation2.Attach(calculation2Observer);
                 calculation2.InputParameters.Attach(calculation2InputObserver);
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs
===================================================================
diff -u -rd9aa4d20777db5bdadc8330ea5d26f47c4f32c1c -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs	(.../PipingCalculationScenarioContextTreeNodeInfoTest.cs)	(revision d9aa4d20777db5bdadc8330ea5d26f47c4f32c1c)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs	(.../PipingCalculationScenarioContextTreeNodeInfoTest.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
@@ -112,7 +112,7 @@
             // Setup
             var calculation = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput())
             {
-                Output = PipingOutputTestFactory.Create()
+                Output = SemiProbabilisticPipingOutputTestFactory.Create()
             };
 
             var pipingFailureMechanism = new PipingFailureMechanism();
@@ -226,7 +226,7 @@
             {
                 var calculation = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput())
                 {
-                    Output = PipingOutputTestFactory.Create()
+                    Output = SemiProbabilisticPipingOutputTestFactory.Create()
                 };
                 var pipingFailureMechanism = new TestPipingFailureMechanism();
                 var assessmentSection = mocks.Stub<IAssessmentSection>();
@@ -602,7 +602,7 @@
                 PipingSurfaceLine surfaceLine;
                 SemiProbabilisticPipingCalculationScenario calculation;
                 CreateCalculationWithSurfaceLine(out calculation, out surfaceLine);
-                calculation.Output = PipingOutputTestFactory.Create();
+                calculation.Output = SemiProbabilisticPipingOutputTestFactory.Create();
 
                 var pipingFailureMechanism = new TestPipingFailureMechanism();
                 var assessmentSection = mocks.Stub<IAssessmentSection>();
@@ -664,7 +664,7 @@
                 PipingSurfaceLine surfaceLine;
                 SemiProbabilisticPipingCalculationScenario calculation;
                 CreateCalculationWithSurfaceLine(out calculation, out surfaceLine);
-                calculation.Output = PipingOutputTestFactory.Create();
+                calculation.Output = SemiProbabilisticPipingOutputTestFactory.Create();
 
                 var pipingFailureMechanism = new TestPipingFailureMechanism();
                 var assessmentSection = mocks.Stub<IAssessmentSection>();
@@ -1028,7 +1028,7 @@
 
                 plugin.Gui = gui;
 
-                calculation.Output = PipingOutputTestFactory.Create();
+                calculation.Output = SemiProbabilisticPipingOutputTestFactory.Create();
                 calculation.Attach(observer);
 
                 string messageBoxText = null, messageBoxTitle = null;
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2e5b444e91e9bd39e83725489f1c01505df84f76 -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision 2e5b444e91e9bd39e83725489f1c01505df84f76)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
@@ -238,11 +238,11 @@
                 var generalInputParameters = new GeneralPipingInput();
                 var pipingCalculation1 = new SemiProbabilisticPipingCalculationScenario(generalInputParameters)
                 {
-                    Output = PipingOutputTestFactory.Create()
+                    Output = SemiProbabilisticPipingOutputTestFactory.Create()
                 };
                 var pipingCalculation2 = new SemiProbabilisticPipingCalculationScenario(generalInputParameters)
                 {
-                    Output = PipingOutputTestFactory.Create()
+                    Output = SemiProbabilisticPipingOutputTestFactory.Create()
                 };
 
                 var observer = mocks.StrictMock<IObserver>();
@@ -313,7 +313,7 @@
             var failureMechanism = new TestPipingFailureMechanism();
             var pipingCalculation = new SemiProbabilisticPipingCalculationScenario(failureMechanism.GeneralInput)
             {
-                Output = PipingOutputTestFactory.Create()
+                Output = SemiProbabilisticPipingOutputTestFactory.Create()
             };
             failureMechanism.CalculationsGroup.Children.Add(pipingCalculation);
 
@@ -447,7 +447,7 @@
             {
                 var pipingCalculation = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput())
                 {
-                    Output = PipingOutputTestFactory.Create()
+                    Output = SemiProbabilisticPipingOutputTestFactory.Create()
                 };
 
                 var failureMechanism = new PipingFailureMechanism();
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/UpdateInfos/PipingStochasticSoilModelCollectionContextUpdateInfoTest.cs
===================================================================
diff -u -r8da4704f43ae462b1eeae911f401e9b41cb3ce50 -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/UpdateInfos/PipingStochasticSoilModelCollectionContextUpdateInfoTest.cs	(.../PipingStochasticSoilModelCollectionContextUpdateInfoTest.cs)	(revision 8da4704f43ae462b1eeae911f401e9b41cb3ce50)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/UpdateInfos/PipingStochasticSoilModelCollectionContextUpdateInfoTest.cs	(.../PipingStochasticSoilModelCollectionContextUpdateInfoTest.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
@@ -178,7 +178,7 @@
             var failureMechanism = new PipingFailureMechanism();
             var calculationWithOutput = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput())
             {
-                Output = PipingOutputTestFactory.Create()
+                Output = SemiProbabilisticPipingOutputTestFactory.Create()
             };
             failureMechanism.CalculationsGroup.Children.Add(calculationWithOutput);
 
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/UpdateInfos/PipingSurfaceLinesContextUpdateInfoTest.cs
===================================================================
diff -u -r8da4704f43ae462b1eeae911f401e9b41cb3ce50 -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/UpdateInfos/PipingSurfaceLinesContextUpdateInfoTest.cs	(.../PipingSurfaceLinesContextUpdateInfoTest.cs)	(revision 8da4704f43ae462b1eeae911f401e9b41cb3ce50)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/UpdateInfos/PipingSurfaceLinesContextUpdateInfoTest.cs	(.../PipingSurfaceLinesContextUpdateInfoTest.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
@@ -177,7 +177,7 @@
             var failureMechanism = new PipingFailureMechanism();
             var calculationWithOutput = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput())
             {
-                Output = PipingOutputTestFactory.Create()
+                Output = SemiProbabilisticPipingOutputTestFactory.Create()
             };
             failureMechanism.CalculationsGroup.Children.Add(calculationWithOutput);
 
Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationServiceTest.cs
===================================================================
diff -u -r503de68118b2702bb62004782f1c39271cb2eb29 -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86
--- Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationServiceTest.cs	(.../SemiProbabilisticPipingCalculationServiceTest.cs)	(revision 503de68118b2702bb62004782f1c39271cb2eb29)
+++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationServiceTest.cs	(.../SemiProbabilisticPipingCalculationServiceTest.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
@@ -86,7 +86,7 @@
         public void Validate_InvalidPipingCalculationWithOutput_ReturnsFalseNoOutputChange()
         {
             // Setup
-            SemiProbabilisticPipingOutput output = PipingOutputTestFactory.Create();
+            SemiProbabilisticPipingOutput output = SemiProbabilisticPipingOutputTestFactory.Create();
             SemiProbabilisticPipingCalculation invalidPipingCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput();
             invalidPipingCalculation.Output = output;
 
@@ -1042,7 +1042,7 @@
         public void Calculate_ValidPipingCalculationWithOutput_ShouldChangeOutput()
         {
             // Setup
-            SemiProbabilisticPipingOutput output = PipingOutputTestFactory.Create();
+            SemiProbabilisticPipingOutput output = SemiProbabilisticPipingOutputTestFactory.Create();
             RoundedDouble normativeAssessmentLevel = AssessmentSectionTestHelper.GetTestAssessmentLevel();
 
             testCalculation.Output = output;
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/PipingCalculationScenarioCreateExtensionsTest.cs
===================================================================
diff -u -r503de68118b2702bb62004782f1c39271cb2eb29 -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/PipingCalculationScenarioCreateExtensionsTest.cs	(.../PipingCalculationScenarioCreateExtensionsTest.cs)	(revision 503de68118b2702bb62004782f1c39271cb2eb29)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/PipingCalculationScenarioCreateExtensionsTest.cs	(.../PipingCalculationScenarioCreateExtensionsTest.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
@@ -246,7 +246,7 @@
             // Setup
             var registry = new PersistenceRegistry();
 
-            SemiProbabilisticPipingOutput newOutput = PipingOutputTestFactory.Create();
+            SemiProbabilisticPipingOutput newOutput = SemiProbabilisticPipingOutputTestFactory.Create();
             var calculation = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput())
             {
                 Output = newOutput
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs
===================================================================
diff -u -r8da4704f43ae462b1eeae911f401e9b41cb3ce50 -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision 8da4704f43ae462b1eeae911f401e9b41cb3ce50)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
@@ -1026,7 +1026,7 @@
                                 StandardDeviation = (RoundedDouble) 4.4
                             }
                         },
-                        Output = PipingOutputTestFactory.Create()
+                        Output = SemiProbabilisticPipingOutputTestFactory.Create()
                     },
                     new SemiProbabilisticPipingCalculationScenario(pipingFailureMechanism.GeneralInput)
                     {
@@ -1058,7 +1058,7 @@
                             UseAssessmentLevelManualInput = true,
                             AssessmentLevel = (RoundedDouble) 6.0
                         },
-                        Output = PipingOutputTestFactory.Create()
+                        Output = SemiProbabilisticPipingOutputTestFactory.Create()
                     }
                 }
             });