Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil/IllustrationPoints/TestGeneralResultTopLevelIllustrationPoint.cs
===================================================================
diff -u -r59b68e4aee31897ec18cd836814a7215152ba817 -r0b3ef93fbcbc29a3b70604e157c7275c018a4c35
--- Riskeer/Common/test/Riskeer.Common.Data.TestUtil/IllustrationPoints/TestGeneralResultTopLevelIllustrationPoint.cs	(.../TestGeneralResultTopLevelIllustrationPoint.cs)	(revision 59b68e4aee31897ec18cd836814a7215152ba817)
+++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil/IllustrationPoints/TestGeneralResultTopLevelIllustrationPoint.cs	(.../TestGeneralResultTopLevelIllustrationPoint.cs)	(revision 0b3ef93fbcbc29a3b70604e157c7275c018a4c35)
@@ -33,7 +33,7 @@
         /// <summary>
         /// Creates a new instance of <see cref="TestGeneralResultTopLevelIllustrationPoint"/>.
         /// </summary>
-        public TestGeneralResultTopLevelIllustrationPoint() 
+        public TestGeneralResultTopLevelIllustrationPoint()
             : base(WindDirectionTestFactory.CreateTestWindDirection(),
                    new[]
                    {
@@ -44,4 +44,19 @@
                        new TestTopLevelIllustrationPoint()
                    }) {}
     }
+
+    public class TestGeneralResult<T> : GeneralResult<T>
+        where T : TopLevelIllustrationPointBase, new()
+    {
+        public TestGeneralResult() :
+            base(WindDirectionTestFactory.CreateTestWindDirection(),
+                 new[]
+                 {
+                     new Stochast("A", 10.0, 5.0)
+                 },
+                 new List<T>
+                 {
+                     new T()
+                 }) {}
+    }
 }
\ No newline at end of file
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/Probabilistic/PartialProbabilisticPipingOutputTest.cs
===================================================================
diff -u -r84bbd7997930ce609be01fa84204442a286bff19 -r0b3ef93fbcbc29a3b70604e157c7275c018a4c35
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/Probabilistic/PartialProbabilisticPipingOutputTest.cs	(.../PartialProbabilisticPipingOutputTest.cs)	(revision 84bbd7997930ce609be01fa84204442a286bff19)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/Probabilistic/PartialProbabilisticPipingOutputTest.cs	(.../PartialProbabilisticPipingOutputTest.cs)	(revision 0b3ef93fbcbc29a3b70604e157c7275c018a4c35)
@@ -59,7 +59,7 @@
         public void Clone_NotAllPropertiesSet_ReturnNewInstanceWithCopiedValues()
         {
             // Setup
-            TestPartialProbabilisticPipingOutput original = PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput(null);
+            PartialProbabilisticPipingOutput<TestTopLevelIllustrationPoint> original = PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput(null);
 
             // Call
             object clone = original.Clone();
@@ -72,7 +72,7 @@
         public void Clone_AllPropertiesSet_ReturnNewInstanceWithCopiedValues()
         {
             // Setup
-            TestPartialProbabilisticPipingOutput original = PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput();
+            PartialProbabilisticPipingOutput<TestTopLevelIllustrationPoint> original = PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput();
 
             // Call
             object clone = original.Clone();
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/Probabilistic/ProbabilisticPipingCalculationTest.cs
===================================================================
diff -u -ra183792019e7eda080468ee52166f1d5a00d45c5 -r0b3ef93fbcbc29a3b70604e157c7275c018a4c35
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/Probabilistic/ProbabilisticPipingCalculationTest.cs	(.../ProbabilisticPipingCalculationTest.cs)	(revision a183792019e7eda080468ee52166f1d5a00d45c5)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/Probabilistic/ProbabilisticPipingCalculationTest.cs	(.../ProbabilisticPipingCalculationTest.cs)	(revision 0b3ef93fbcbc29a3b70604e157c7275c018a4c35)
@@ -22,6 +22,7 @@
 using System.Collections.Generic;
 using Core.Common.Data.TestUtil;
 using NUnit.Framework;
+using Riskeer.Common.Data.TestUtil.IllustrationPoints;
 using Riskeer.Piping.Data.Probabilistic;
 using Riskeer.Piping.Data.TestUtil;
 
@@ -90,8 +91,8 @@
         public void ClearIllustrationPoints_CalculationWithOutput_ClearsIllustrationPointResult()
         {
             // Setup
-            TestPartialProbabilisticPipingOutput sectionSpecificOutput = PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput();
-            TestPartialProbabilisticPipingOutput profileSpecificOutput = PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput();
+            PartialProbabilisticPipingOutput<TestTopLevelIllustrationPoint> sectionSpecificOutput = PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput();
+            PartialProbabilisticPipingOutput<TestTopLevelIllustrationPoint> profileSpecificOutput = PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput();
             var output = new ProbabilisticPipingOutput(sectionSpecificOutput, profileSpecificOutput);
             var calculation = new TestProbabilisticPipingCalculation
             {
@@ -103,8 +104,8 @@
 
             // Assert
             Assert.AreSame(output, calculation.Output);
-            Assert.IsNull(((TestPartialProbabilisticPipingOutput) output.SectionSpecificOutput).GeneralResult);
-            Assert.IsNull(((TestPartialProbabilisticPipingOutput) output.ProfileSpecificOutput).GeneralResult);
+            Assert.IsNull(((PartialProbabilisticPipingOutput<TestTopLevelIllustrationPoint>) output.SectionSpecificOutput).GeneralResult);
+            Assert.IsNull(((PartialProbabilisticPipingOutput<TestTopLevelIllustrationPoint>) output.ProfileSpecificOutput).GeneralResult);
         }
 
         [Test]
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/Probabilistic/ProbabilisticPipingOutputTest.cs
===================================================================
diff -u -ra183792019e7eda080468ee52166f1d5a00d45c5 -r0b3ef93fbcbc29a3b70604e157c7275c018a4c35
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/Probabilistic/ProbabilisticPipingOutputTest.cs	(.../ProbabilisticPipingOutputTest.cs)	(revision a183792019e7eda080468ee52166f1d5a00d45c5)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/Probabilistic/ProbabilisticPipingOutputTest.cs	(.../ProbabilisticPipingOutputTest.cs)	(revision 0b3ef93fbcbc29a3b70604e157c7275c018a4c35)
@@ -61,8 +61,8 @@
         public void Constructor_ExpectedValues()
         {
             // Setup
-            TestPartialProbabilisticPipingOutput sectionSpecificOutput = PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput();
-            TestPartialProbabilisticPipingOutput profileSpecificOutput = PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput();
+            PartialProbabilisticPipingOutput<TestTopLevelIllustrationPoint> sectionSpecificOutput = PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput();
+            PartialProbabilisticPipingOutput<TestTopLevelIllustrationPoint> profileSpecificOutput = PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput();
 
             // Call
             var output = new ProbabilisticPipingOutput(sectionSpecificOutput, profileSpecificOutput);
Index: Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingTestDataGenerator.cs
===================================================================
diff -u -r84bbd7997930ce609be01fa84204442a286bff19 -r0b3ef93fbcbc29a3b70604e157c7275c018a4c35
--- Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingTestDataGenerator.cs	(.../PipingTestDataGenerator.cs)	(revision 84bbd7997930ce609be01fa84204442a286bff19)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingTestDataGenerator.cs	(.../PipingTestDataGenerator.cs)	(revision 0b3ef93fbcbc29a3b70604e157c7275c018a4c35)
@@ -27,6 +27,7 @@
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.Hydraulics;
+using Riskeer.Common.Data.IllustrationPoints;
 using Riskeer.Common.Data.Probabilistics;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Common.Data.TestUtil.IllustrationPoints;
@@ -587,22 +588,19 @@
         /// Creates a random instance of <see cref="TestPartialProbabilisticPipingOutput"/>.
         /// </summary>
         /// <returns>A random instance of <see cref="TestPartialProbabilisticPipingOutput"/>.</returns>
-        public static TestPartialProbabilisticPipingOutput GetRandomPartialProbabilisticPipingOutput()
+        public static PartialProbabilisticPipingOutput<TestTopLevelIllustrationPoint> GetRandomPartialProbabilisticPipingOutput()
         {
-            return GetRandomPartialProbabilisticPipingOutput(new TestGeneralResultTopLevelIllustrationPoint());
+            return GetRandomPartialProbabilisticPipingOutput<TestTopLevelIllustrationPoint>();
         }
 
         /// <summary>
         /// Creates a random instance of <see cref="TestPartialProbabilisticPipingOutput"/>.
         /// </summary>
         /// <param name="generalResult">The general result to set to the output.</param>
         /// <returns>A random instance of <see cref="TestPartialProbabilisticPipingOutput"/>.</returns>
-        public static TestPartialProbabilisticPipingOutput GetRandomPartialProbabilisticPipingOutput(TestGeneralResultTopLevelIllustrationPoint generalResult)
+        public static PartialProbabilisticPipingOutput<TestTopLevelIllustrationPoint> GetRandomPartialProbabilisticPipingOutput(GeneralResult<TestTopLevelIllustrationPoint> generalResult)
         {
-            var random = new Random(21);
-
-            return new TestPartialProbabilisticPipingOutput(random.NextDouble(),
-                                                            generalResult);
+            return GetRandomPartialProbabilisticPipingOutput<TestTopLevelIllustrationPoint>(generalResult);
         }
 
         /// <summary>
@@ -624,5 +622,31 @@
             return new ProbabilisticPipingOutput(GetRandomPartialProbabilisticPipingOutput(null),
                                                  GetRandomPartialProbabilisticPipingOutput(null));
         }
+
+        /// <summary>
+        /// Creates a random instance of <see cref="TestPartialProbabilisticPipingOutput"/>.
+        /// </summary>
+        /// <returns>A random instance of <see cref="TestPartialProbabilisticPipingOutput"/>.</returns>
+        /// <typeparam name="T">The type of the top level illustration point.</typeparam>
+        private static PartialProbabilisticPipingOutput<T> GetRandomPartialProbabilisticPipingOutput<T>()
+            where T : TopLevelIllustrationPointBase, new()
+        {
+            return GetRandomPartialProbabilisticPipingOutput(new TestGeneralResult<T>());
+        }
+
+        /// <summary>
+        /// Creates a random instance of <see cref="TestPartialProbabilisticPipingOutput"/>.
+        /// </summary>
+        /// <param name="generalResult">The general result to set to the output.</param>
+        /// <returns>A random instance of <see cref="TestPartialProbabilisticPipingOutput"/>.</returns>
+        /// <typeparam name="T">The type of the top level illustration point.</typeparam>
+        private static PartialProbabilisticPipingOutput<T> GetRandomPartialProbabilisticPipingOutput<T>(GeneralResult<T> generalResult)
+            where T : TopLevelIllustrationPointBase
+        {
+            var random = new Random(21);
+
+            return new PartialProbabilisticPipingOutput<T>(random.NextDouble(),
+                                                           generalResult);
+        }
     }
 }
\ No newline at end of file