Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/Probabilistic/ProbabilisticPipingSectionSpecificOutputProperties.cs
===================================================================
diff -u -r6f9faf2191aaab7e438551794102cbdadf386b1e -r7f5ab0442e7a0248ce85199d107b872d7866967c
--- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/Probabilistic/ProbabilisticPipingSectionSpecificOutputProperties.cs	(.../ProbabilisticPipingSectionSpecificOutputProperties.cs)	(revision 6f9faf2191aaab7e438551794102cbdadf386b1e)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/Probabilistic/ProbabilisticPipingSectionSpecificOutputProperties.cs	(.../ProbabilisticPipingSectionSpecificOutputProperties.cs)	(revision 7f5ab0442e7a0248ce85199d107b872d7866967c)
@@ -92,9 +92,8 @@
         {
             get
             {
-                double reliability = ((PartialProbabilisticPipingOutput) Data).Reliability;
-                double probability = StatisticsConverter.ReliabilityToProbability(reliability);
-                return ProbabilityFormattingHelper.Format(probability);
+                double reliability = data.Reliability;
+                return ProbabilityFormattingHelper.Format(StatisticsConverter.ReliabilityToProbability(reliability));
             }
         }
 
@@ -105,7 +104,7 @@
         {
             get
             {
-                double reliability = ((PartialProbabilisticPipingOutput) Data).Reliability;
+                double reliability = data.Reliability;
                 return new RoundedDouble(5, reliability);
             }
         }
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticPipingProfileSpecificOutputPropertiesTest.cs
===================================================================
diff -u -rc5187a62b780efae6602291415f5c8d27f1bccaa -r7f5ab0442e7a0248ce85199d107b872d7866967c
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticPipingProfileSpecificOutputPropertiesTest.cs	(.../ProbabilisticPipingProfileSpecificOutputPropertiesTest.cs)	(revision c5187a62b780efae6602291415f5c8d27f1bccaa)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticPipingProfileSpecificOutputPropertiesTest.cs	(.../ProbabilisticPipingProfileSpecificOutputPropertiesTest.cs)	(revision 7f5ab0442e7a0248ce85199d107b872d7866967c)
@@ -329,11 +329,11 @@
                                                                                     failureMechanism,
                                                                                     assessmentSection);
             // Assert
-            ProbabilityAssessmentOutput expectedProbabilityAssessmentOutput = ProbabilityAssessmentOutputFactory.Create(assessmentSection.FailureMechanismContribution.Norm,
-                                                                                                                        failureMechanism.Contribution,
-                                                                                                                        5.0,
-                                                                                                                        output.Reliability);
-            
+            ProbabilityAssessmentOutput expectedProbabilityAssessmentOutput = PipingProbabilityAssessmentOutputFactory.Create(output,
+                                                                                                                              calculation,
+                                                                                                                              failureMechanism,
+                                                                                                                              assessmentSection);
+
             Assert.AreEqual(ProbabilityFormattingHelper.Format(expectedProbabilityAssessmentOutput.RequiredProbability), properties.RequiredProbability);
             Assert.AreEqual(expectedProbabilityAssessmentOutput.RequiredReliability, properties.RequiredReliability, properties.RequiredReliability.GetAccuracy());
             Assert.AreEqual(ProbabilityFormattingHelper.Format(expectedProbabilityAssessmentOutput.Probability), properties.Probability);
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticPipingSectionSpecificOutputPropertiesTest.cs
===================================================================
diff -u -rc5187a62b780efae6602291415f5c8d27f1bccaa -r7f5ab0442e7a0248ce85199d107b872d7866967c
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticPipingSectionSpecificOutputPropertiesTest.cs	(.../ProbabilisticPipingSectionSpecificOutputPropertiesTest.cs)	(revision c5187a62b780efae6602291415f5c8d27f1bccaa)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticPipingSectionSpecificOutputPropertiesTest.cs	(.../ProbabilisticPipingSectionSpecificOutputPropertiesTest.cs)	(revision 7f5ab0442e7a0248ce85199d107b872d7866967c)
@@ -26,11 +26,10 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Riskeer.Common.Data.AssessmentSection;
-using Riskeer.Common.Data.IllustrationPoints;
 using Riskeer.Common.Data.Probability;
 using Riskeer.Common.Data.TestUtil;
-using Riskeer.Common.Data.TestUtil.IllustrationPoints;
 using Riskeer.Common.Forms.Helpers;
+using Riskeer.Piping.Data;
 using Riskeer.Piping.Data.Probabilistic;
 using Riskeer.Piping.Data.TestUtil;
 using Riskeer.Piping.Forms.PropertyClasses.Probabilistic;
@@ -158,5 +157,35 @@
                                                                             "De betrouwbaarheidsindex van de faalkans voor deze berekening.",
                                                                             true);
         }
+
+        [Test]
+        public void GetProperties_WithData_ReturnExpectedValues()
+        {
+            // Setup
+            TestPipingFailureMechanism failureMechanism = TestPipingFailureMechanism.GetFailureMechanismWithSurfaceLinesAndStochasticSoilModels();
+            IAssessmentSection assessmentSection = new AssessmentSectionStub();
+
+            var calculation = new ProbabilisticPipingCalculationScenario
+            {
+                InputParameters =
+                {
+                    SurfaceLine = failureMechanism.SurfaceLines.First()
+                }
+            };
+
+            PartialProbabilisticPipingOutput output = PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput();
+
+            // Call
+            var properties = new ProbabilisticPipingSectionSpecificOutputProperties(output);
+
+            // Assert
+            ProbabilityAssessmentOutput expectedProbabilityAssessmentOutput = PipingProbabilityAssessmentOutputFactory.Create(output,
+                                                                                                                              calculation,
+                                                                                                                              failureMechanism,
+                                                                                                                              assessmentSection);
+
+            Assert.AreEqual(ProbabilityFormattingHelper.Format(expectedProbabilityAssessmentOutput.Probability), properties.Probability);
+            Assert.AreEqual(expectedProbabilityAssessmentOutput.Reliability, properties.Reliability, properties.Reliability.GetAccuracy());
+        }
     }
 }
\ No newline at end of file
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/Probabilistic/ProbabilisticPipingProfileSpecificOutputPropertyInfoTest.cs
===================================================================
diff -u -r6f9faf2191aaab7e438551794102cbdadf386b1e -r7f5ab0442e7a0248ce85199d107b872d7866967c
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/Probabilistic/ProbabilisticPipingProfileSpecificOutputPropertyInfoTest.cs	(.../ProbabilisticPipingProfileSpecificOutputPropertyInfoTest.cs)	(revision 6f9faf2191aaab7e438551794102cbdadf386b1e)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/Probabilistic/ProbabilisticPipingProfileSpecificOutputPropertyInfoTest.cs	(.../ProbabilisticPipingProfileSpecificOutputPropertyInfoTest.cs)	(revision 7f5ab0442e7a0248ce85199d107b872d7866967c)
@@ -64,34 +64,13 @@
         public void CreateInstance_WithContext_ExpectedProperties()
         {
             // Setup
-            var surfaceLine = new PipingSurfaceLine(string.Empty)
-            {
-                ReferenceLineIntersectionWorldPoint = new Point2D(0.0, 0.0)
-            };
-            surfaceLine.SetGeometry(new[]
-            {
-                new Point3D(0.0, 5.0, 0.0),
-                new Point3D(0.0, 0.0, 1.0),
-                new Point3D(0.0, -5.0, 0.0)
-            });
-            var referenceLine = new ReferenceLine();
-            referenceLine.SetGeometry(new[]
-            {
-                new Point2D(0.0, 0.0),
-                new Point2D(10.0, 0.0)
-            });
+            TestPipingFailureMechanism failureMechanism = TestPipingFailureMechanism.GetFailureMechanismWithSurfaceLinesAndStochasticSoilModels();
 
-            var failureMechanism = new TestPipingFailureMechanism();
-            failureMechanism.SetSections(new[]
-            {
-                FailureMechanismSectionTestFactory.CreateFailureMechanismSection()
-            }, "");
-
             var calculation = new ProbabilisticPipingCalculationScenario
             {
                 InputParameters =
                 {
-                    SurfaceLine = surfaceLine
+                    SurfaceLine = failureMechanism.SurfaceLines.First()
                 },
                 Output = PipingTestDataGenerator.GetRandomProbabilisticPipingOutput()
             };