Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs
===================================================================
diff -u -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86 -r3cf96c8027cad788d9753ed323866fbfd04f5ef4
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs	(.../PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs	(.../PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs)	(revision 3cf96c8027cad788d9753ed323866fbfd04f5ef4)
@@ -132,11 +132,11 @@
 
             pipingCalculationScenario1.IsRelevant = true;
             pipingCalculationScenario1.Contribution = (RoundedDouble) 0.2111;
-            pipingCalculationScenario1.Output = SemiProbabilisticPipingOutputTestFactory.Create(1.1, 2.2, 3.3);
+            pipingCalculationScenario1.Output = PipingTestDataGenerator.GetSemiProbabilisticPipingOutput(1.1, 2.2, 3.3);
 
             pipingCalculationScenario2.IsRelevant = true;
             pipingCalculationScenario2.Contribution = (RoundedDouble) 0.7889;
-            pipingCalculationScenario2.Output = SemiProbabilisticPipingOutputTestFactory.Create(4.4, 5.5, 6.6);
+            pipingCalculationScenario2.Output = PipingTestDataGenerator.GetSemiProbabilisticPipingOutput(4.4, 5.5, 6.6);
 
             pipingCalculationScenario3.IsRelevant = false;
 
Index: Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil.Test/SemiProbabilisticPipingOutputTestFactoryTest.cs
===================================================================
diff -u -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86 -r3cf96c8027cad788d9753ed323866fbfd04f5ef4
--- Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil.Test/SemiProbabilisticPipingOutputTestFactoryTest.cs	(.../SemiProbabilisticPipingOutputTestFactoryTest.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil.Test/SemiProbabilisticPipingOutputTestFactoryTest.cs	(.../SemiProbabilisticPipingOutputTestFactoryTest.cs)	(revision 3cf96c8027cad788d9753ed323866fbfd04f5ef4)
@@ -55,7 +55,7 @@
             double sellmeijerFactorOfSafety = random.NextDouble();
 
             // Call
-            SemiProbabilisticPipingOutput output = SemiProbabilisticPipingOutputTestFactory.Create(heaveFactorOfSafety, upliftFactorOfSafety, sellmeijerFactorOfSafety);
+            SemiProbabilisticPipingOutput output = PipingTestDataGenerator.GetSemiProbabilisticPipingOutput(heaveFactorOfSafety, upliftFactorOfSafety, sellmeijerFactorOfSafety);
 
             // Assert
             Assert.AreEqual(heaveFactorOfSafety, output.HeaveFactorOfSafety);
Index: Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilisticPipingOutputTestFactory.cs
===================================================================
diff -u -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86 -r3cf96c8027cad788d9753ed323866fbfd04f5ef4
--- Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilisticPipingOutputTestFactory.cs	(.../SemiProbabilisticPipingOutputTestFactory.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilisticPipingOutputTestFactory.cs	(.../SemiProbabilisticPipingOutputTestFactory.cs)	(revision 3cf96c8027cad788d9753ed323866fbfd04f5ef4)
@@ -50,22 +50,5 @@
                 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/Views/PipingFailureMechanismSectionResultRowTest.cs
===================================================================
diff -u -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86 -r3cf96c8027cad788d9753ed323866fbfd04f5ef4
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs	(.../PipingFailureMechanismSectionResultRowTest.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs	(.../PipingFailureMechanismSectionResultRowTest.cs)	(revision 3cf96c8027cad788d9753ed323866fbfd04f5ef4)
@@ -820,7 +820,7 @@
 
             SemiProbabilisticPipingCalculationScenario calculationScenario = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(
                 section);
-            calculationScenario.Output = SemiProbabilisticPipingOutputTestFactory.Create(double.NaN, double.NaN, double.NaN);
+            calculationScenario.Output = PipingTestDataGenerator.GetSemiProbabilisticPipingOutput(double.NaN, double.NaN, double.NaN);
 
             using (new AssemblyToolCalculatorFactoryConfig())
             {
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenarioRowTest.cs
===================================================================
diff -u -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86 -r3cf96c8027cad788d9753ed323866fbfd04f5ef4
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenarioRowTest.cs	(.../PipingScenarioRowTest.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenarioRowTest.cs	(.../PipingScenarioRowTest.cs)	(revision 3cf96c8027cad788d9753ed323866fbfd04f5ef4)
@@ -242,7 +242,7 @@
             var random = new Random(11);
 
             // When
-            calculation.Output = SemiProbabilisticPipingOutputTestFactory.Create(random.NextDouble(), random.NextDouble(), random.NextDouble());
+            calculation.Output = PipingTestDataGenerator.GetSemiProbabilisticPipingOutput(random.NextDouble(), random.NextDouble(), random.NextDouble());
             row.Update();
 
             // Then
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenariosViewTest.cs
===================================================================
diff -u -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86 -r3cf96c8027cad788d9753ed323866fbfd04f5ef4
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenariosViewTest.cs	(.../PipingScenariosViewTest.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenariosViewTest.cs	(.../PipingScenariosViewTest.cs)	(revision 3cf96c8027cad788d9753ed323866fbfd04f5ef4)
@@ -227,7 +227,7 @@
                         EntryPointL = (RoundedDouble) 7.7777,
                         ExitPointL = (RoundedDouble) 8.8888
                     },
-                    Output = SemiProbabilisticPipingOutputTestFactory.Create(0.26065, 0.81398, 0.38024)
+                    Output = PipingTestDataGenerator.GetSemiProbabilisticPipingOutput(0.26065, 0.81398, 0.38024)
                 }
             });
 
Index: Riskeer/Piping/test/Riskeer.Piping.Integration.Test/PipingFailureMechanismResultViewIntegrationTest.cs
===================================================================
diff -u -ra59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86 -r3cf96c8027cad788d9753ed323866fbfd04f5ef4
--- Riskeer/Piping/test/Riskeer.Piping.Integration.Test/PipingFailureMechanismResultViewIntegrationTest.cs	(.../PipingFailureMechanismResultViewIntegrationTest.cs)	(revision a59ee2aa0ac32e113bbf6937fd5ef53e6b48dd86)
+++ Riskeer/Piping/test/Riskeer.Piping.Integration.Test/PipingFailureMechanismResultViewIntegrationTest.cs	(.../PipingFailureMechanismResultViewIntegrationTest.cs)	(revision 3cf96c8027cad788d9753ed323866fbfd04f5ef4)
@@ -122,7 +122,7 @@
                                 dataGridView.Rows[22].Cells[detailedAssessmentIndex].ErrorText);
 
                 // Execute the first calculation and ensure the data grid view is updated
-                pipingCalculation1.Output = SemiProbabilisticPipingOutputTestFactory.Create(0.26065, 0.81398, 0.38024);
+                pipingCalculation1.Output = PipingTestDataGenerator.GetSemiProbabilisticPipingOutput(0.26065, 0.81398, 0.38024);
                 pipingCalculation1.NotifyObservers();
                 Assert.AreEqual(ProbabilityFormattingHelper.Format(2.425418e-4),
                                 dataGridView.Rows[22].Cells[detailedAssessmentIndex].FormattedValue);