Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandlerTest.cs
===================================================================
diff -u -ra183792019e7eda080468ee52166f1d5a00d45c5 -rd108d281eac4c96d0ff49458436edc6698d4b8e4
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandlerTest.cs	(.../ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandlerTest.cs)	(revision a183792019e7eda080468ee52166f1d5a00d45c5)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandlerTest.cs	(.../ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandlerTest.cs)	(revision d108d281eac4c96d0ff49458436edc6698d4b8e4)
@@ -22,6 +22,7 @@
 using Core.Common.Gui.Helpers;
 using NUnit.Framework;
 using Rhino.Mocks;
+using Riskeer.Common.Data.TestUtil.IllustrationPoints;
 using Riskeer.Common.Forms.ChangeHandlers;
 using Riskeer.Piping.Data.Probabilistic;
 using Riskeer.Piping.Data.TestUtil;
@@ -113,8 +114,8 @@
             // Assert
             Assert.IsTrue(result);
 
-            Assert.IsNull(((TestPartialProbabilisticPipingOutput) calculation.Output.ProfileSpecificOutput).GeneralResult);
-            Assert.IsNull(((TestPartialProbabilisticPipingOutput) calculation.Output.SectionSpecificOutput).GeneralResult);
+            Assert.IsNull(((PartialProbabilisticPipingOutput<TestTopLevelIllustrationPoint>) calculation.Output.ProfileSpecificOutput).GeneralResult);
+            Assert.IsNull(((PartialProbabilisticPipingOutput<TestTopLevelIllustrationPoint>) calculation.Output.SectionSpecificOutput).GeneralResult);
             mocks.VerifyAll();
         }
     }
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/Probabilistic/ProbabilisticPipingProfileSpecificOutputPropertyInfoTest.cs
===================================================================
diff -u -ra2b891616b3ffbe15c24b43de6c0ace4397ffa69 -rd108d281eac4c96d0ff49458436edc6698d4b8e4
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/Probabilistic/ProbabilisticPipingProfileSpecificOutputPropertyInfoTest.cs	(.../ProbabilisticPipingProfileSpecificOutputPropertyInfoTest.cs)	(revision a2b891616b3ffbe15c24b43de6c0ace4397ffa69)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/Probabilistic/ProbabilisticPipingProfileSpecificOutputPropertyInfoTest.cs	(.../ProbabilisticPipingProfileSpecificOutputPropertyInfoTest.cs)	(revision d108d281eac4c96d0ff49458436edc6698d4b8e4)
@@ -69,7 +69,8 @@
                 {
                     SurfaceLine = failureMechanism.SurfaceLines.First()
                 },
-                Output = PipingTestDataGenerator.GetRandomProbabilisticPipingOutputWithIllustrationPoints()
+                Output = new ProbabilisticPipingOutput(PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput(),
+                                                       PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput())
             };
 
             var context = new ProbabilisticPipingProfileSpecificOutputContext(calculation,
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/Probabilistic/ProbabilisticPipingSectionSpecificOutputPropertyInfoTest.cs
===================================================================
diff -u -ra2b891616b3ffbe15c24b43de6c0ace4397ffa69 -rd108d281eac4c96d0ff49458436edc6698d4b8e4
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/Probabilistic/ProbabilisticPipingSectionSpecificOutputPropertyInfoTest.cs	(.../ProbabilisticPipingSectionSpecificOutputPropertyInfoTest.cs)	(revision a2b891616b3ffbe15c24b43de6c0ace4397ffa69)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/Probabilistic/ProbabilisticPipingSectionSpecificOutputPropertyInfoTest.cs	(.../ProbabilisticPipingSectionSpecificOutputPropertyInfoTest.cs)	(revision d108d281eac4c96d0ff49458436edc6698d4b8e4)
@@ -62,7 +62,8 @@
             // Setup
             var calculation = new ProbabilisticPipingCalculationScenario
             {
-                Output = PipingTestDataGenerator.GetRandomProbabilisticPipingOutputWithIllustrationPoints()
+                Output = new ProbabilisticPipingOutput(PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput(),
+                                                       PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput())
             };
             var context = new ProbabilisticPipingSectionSpecificOutputContext(calculation);