Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/Probabilistic/ProbabilisticPipingCalculationScenarioCreateExtensionsTest.cs
===================================================================
diff -u -rea609f4592fa0a0df54670689af45c1c6462816d -r3e0ebf71d8d9015968bf707685f45015f387891b
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/Probabilistic/ProbabilisticPipingCalculationScenarioCreateExtensionsTest.cs	(.../ProbabilisticPipingCalculationScenarioCreateExtensionsTest.cs)	(revision ea609f4592fa0a0df54670689af45c1c6462816d)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/Probabilistic/ProbabilisticPipingCalculationScenarioCreateExtensionsTest.cs	(.../ProbabilisticPipingCalculationScenarioCreateExtensionsTest.cs)	(revision 3e0ebf71d8d9015968bf707685f45015f387891b)
@@ -249,7 +249,9 @@
             // Setup
             var registry = new PersistenceRegistry();
 
-            ProbabilisticPipingOutput output = PipingTestDataGenerator.GetRandomProbabilisticPipingOutputWithIllustrationPoints();
+            var output = new ProbabilisticPipingOutput(PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput(),
+                                                       PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput());
+            
             var calculation = new ProbabilisticPipingCalculationScenario
             {
                 Output = output
@@ -264,9 +266,9 @@
             Assert.IsNotNull(outputEntity);
             Assert.AreEqual(output.ProfileSpecificOutput.Reliability, outputEntity.ProfileSpecificReliability);
             Assert.AreEqual(output.SectionSpecificOutput.Reliability, outputEntity.SectionSpecificReliability);
-            GeneralResultEntityTestHelper.AssertGeneralResultPropertyValues(((PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>)output.ProfileSpecificOutput).GeneralResult,
+            GeneralResultEntityTestHelper.AssertGeneralResultPropertyValues(((PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>) output.ProfileSpecificOutput).GeneralResult,
                                                                             outputEntity.GeneralResultFaultTreeIllustrationPointEntity);
-            GeneralResultEntityTestHelper.AssertGeneralResultPropertyValues(((PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>)output.SectionSpecificOutput).GeneralResult,
+            GeneralResultEntityTestHelper.AssertGeneralResultPropertyValues(((PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>) output.SectionSpecificOutput).GeneralResult,
                                                                             outputEntity.GeneralResultFaultTreeIllustrationPointEntity1);
         }
     }
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/Probabilistic/ProbabilisticPipingOutputCreateExtensionsTest.cs
===================================================================
diff -u -rea609f4592fa0a0df54670689af45c1c6462816d -r3e0ebf71d8d9015968bf707685f45015f387891b
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/Probabilistic/ProbabilisticPipingOutputCreateExtensionsTest.cs	(.../ProbabilisticPipingOutputCreateExtensionsTest.cs)	(revision ea609f4592fa0a0df54670689af45c1c6462816d)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/Probabilistic/ProbabilisticPipingOutputCreateExtensionsTest.cs	(.../ProbabilisticPipingOutputCreateExtensionsTest.cs)	(revision 3e0ebf71d8d9015968bf707685f45015f387891b)
@@ -48,9 +48,8 @@
         public void Create_CalculationWithOutput_ReturnEntityWithOutput()
         {
             // Setup
-            var output = new ProbabilisticPipingOutput(
-                PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput(null),
-                PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput(null));
+            var output = new ProbabilisticPipingOutput(PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput(null),
+                                                       PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput(null));
 
             // Call
             ProbabilisticPipingCalculationOutputEntity entity = output.Create();
@@ -84,9 +83,8 @@
         public void Create_CalculationWithOutputAndGeneralResult_ReturnEntityWithOutputAndGeneralResult()
         {
             // Setup
-            var output = new ProbabilisticPipingOutput(
-                PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput(),
-                PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput());
+            var output = new ProbabilisticPipingOutput(PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput(),
+                                                       PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput());
 
             // Call
             ProbabilisticPipingCalculationOutputEntity entity = output.Create();
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/Probabilistic/ProbabilisticPipingCalculationOutputEntityReadExtensionsTest.cs
===================================================================
diff -u -rea609f4592fa0a0df54670689af45c1c6462816d -r3e0ebf71d8d9015968bf707685f45015f387891b
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/Probabilistic/ProbabilisticPipingCalculationOutputEntityReadExtensionsTest.cs	(.../ProbabilisticPipingCalculationOutputEntityReadExtensionsTest.cs)	(revision ea609f4592fa0a0df54670689af45c1c6462816d)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/Probabilistic/ProbabilisticPipingCalculationOutputEntityReadExtensionsTest.cs	(.../ProbabilisticPipingCalculationOutputEntityReadExtensionsTest.cs)	(revision 3e0ebf71d8d9015968bf707685f45015f387891b)
@@ -77,7 +77,7 @@
             GeneralResultEntityTestHelper.AssertGeneralResultPropertyValues(
                 ((PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>) output.ProfileSpecificOutput).GeneralResult, profileSpecificGeneralResultEntity);
             GeneralResultEntityTestHelper.AssertGeneralResultPropertyValues(
-                ((PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>) output.ProfileSpecificOutput).GeneralResult, sectionSpecificGeneralResultEntity);
+                ((PartialProbabilisticPipingOutput<TopLevelFaultTreeIllustrationPoint>) output.SectionSpecificOutput).GeneralResult, sectionSpecificGeneralResultEntity);
         }
 
         [Test]
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs
===================================================================
diff -u -ra2b891616b3ffbe15c24b43de6c0ace4397ffa69 -r3e0ebf71d8d9015968bf707685f45015f387891b
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision a2b891616b3ffbe15c24b43de6c0ace4397ffa69)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision 3e0ebf71d8d9015968bf707685f45015f387891b)
@@ -1092,7 +1092,8 @@
                             ShouldProfileSpecificIllustrationPointsBeCalculated = true,
                             ShouldSectionSpecificIllustrationPointsBeCalculated = true
                         },
-                        Output = PipingTestDataGenerator.GetRandomProbabilisticPipingOutputWithIllustrationPoints()
+                        Output = new ProbabilisticPipingOutput(PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput(),
+                                                               PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput())
                     }
                 }
             });