Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -r28d6abf02f62f0e4c09e4e27baffc625a69ce00d -rcad3a7c58eceeb254a69309e6cd66d0a0fa970ad
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 28d6abf02f62f0e4c09e4e27baffc625a69ce00d)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision cad3a7c58eceeb254a69309e6cd66d0a0fa970ad)
@@ -1273,7 +1273,7 @@
                                                     context.AvailableStochasticSoilModels,
                                                     context.FailureMechanism,
                                                     context.AssessmentSection),
-                new ProbabilisticPipingOutputContext(calculation, context.FailureMechanism, context.AssessmentSection)
+                new ProbabilisticPipingOutputContext(calculation)
             };
 
             return childNodes.ToArray();
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/Probabilistic/ProbabilisticPipingOutputContextTest.cs
===================================================================
diff -u -rc37eebd9171a53987f5929013edbe3d82e618ed0 -rcad3a7c58eceeb254a69309e6cd66d0a0fa970ad
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/Probabilistic/ProbabilisticPipingOutputContextTest.cs	(.../ProbabilisticPipingOutputContextTest.cs)	(revision c37eebd9171a53987f5929013edbe3d82e618ed0)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/Probabilistic/ProbabilisticPipingOutputContextTest.cs	(.../ProbabilisticPipingOutputContextTest.cs)	(revision cad3a7c58eceeb254a69309e6cd66d0a0fa970ad)
@@ -19,12 +19,8 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using Core.Common.Controls.PresentationObjects;
 using NUnit.Framework;
-using Rhino.Mocks;
-using Riskeer.Common.Data.AssessmentSection;
-using Riskeer.Piping.Data;
 using Riskeer.Piping.Data.Probabilistic;
 using Riskeer.Piping.Forms.PresentationObjects.Probabilistic;
 
@@ -34,73 +30,17 @@
     public class ProbabilisticPipingOutputContextTest
     {
         [Test]
-        public void Constructor_CalculationNull_ThrowsArgumentNullException()
-        {
-            // Setup
-            var mocks = new MockRepository();
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            mocks.ReplayAll();
-
-            // Call
-            void Call() => new ProbabilisticPipingOutputContext(null, new PipingFailureMechanism(), assessmentSection);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(Call);
-            Assert.AreEqual("wrappedData", exception.ParamName);
-
-            mocks.VerifyAll();
-        }
-
-        [Test]
-        public void Constructor_FailureMechanismNull_ThrowsArgumentNullException()
-        {
-            // Setup
-            var mocks = new MockRepository();
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            mocks.ReplayAll();
-
-            // Call
-            void Call() => new ProbabilisticPipingOutputContext(new ProbabilisticPipingCalculationScenario(), null, assessmentSection);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(Call);
-            Assert.AreEqual("failureMechanism", exception.ParamName);
-
-            mocks.VerifyAll();
-        }
-
-        [Test]
-        public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
-        {
-            // Call
-            void Call() => new ProbabilisticPipingOutputContext(new ProbabilisticPipingCalculationScenario(), new PipingFailureMechanism(), null);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(Call);
-            Assert.AreEqual("assessmentSection", exception.ParamName);
-        }
-
-        [Test]
         public void Constructor_ExpectedValues()
         {
             // Setup
-            var mocks = new MockRepository();
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            mocks.ReplayAll();
-
             var calculation = new ProbabilisticPipingCalculationScenario();
-            var failureMechanism = new PipingFailureMechanism();
 
             // Call
-            var context = new ProbabilisticPipingOutputContext(calculation, failureMechanism, assessmentSection);
+            var context = new ProbabilisticPipingOutputContext(calculation);
 
             // Assert
             Assert.IsInstanceOf<ObservableWrappedObjectContextBase<ProbabilisticPipingCalculationScenario>>(context);
             Assert.AreSame(calculation, context.WrappedData);
-            Assert.AreSame(failureMechanism, context.FailureMechanism);
-            Assert.AreSame(assessmentSection, context.AssessmentSection);
-
-            mocks.VerifyAll();
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/Probabilistic/ProbabilisticPipingOutputContextTreeNodeInfoTest.cs
===================================================================
diff -u -r1cca1c0441944245b1bfbcae16646737ad11a8df -rcad3a7c58eceeb254a69309e6cd66d0a0fa970ad
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/Probabilistic/ProbabilisticPipingOutputContextTreeNodeInfoTest.cs	(.../ProbabilisticPipingOutputContextTreeNodeInfoTest.cs)	(revision 1cca1c0441944245b1bfbcae16646737ad11a8df)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/Probabilistic/ProbabilisticPipingOutputContextTreeNodeInfoTest.cs	(.../ProbabilisticPipingOutputContextTreeNodeInfoTest.cs)	(revision cad3a7c58eceeb254a69309e6cd66d0a0fa970ad)
@@ -24,9 +24,6 @@
 using Core.Common.Controls.TreeView;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Rhino.Mocks;
-using Riskeer.Common.Data.AssessmentSection;
-using Riskeer.Piping.Data;
 using Riskeer.Piping.Data.Probabilistic;
 using Riskeer.Piping.Data.TestUtil;
 using Riskeer.Piping.Forms.PresentationObjects.Probabilistic;
@@ -91,43 +88,31 @@
         public void ForeColor_HasNoOutput_ReturnGrayText()
         {
             // Setup
-            var mocks = new MockRepository();
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            mocks.ReplayAll();
+            var context = new ProbabilisticPipingOutputContext(new ProbabilisticPipingCalculationScenario());
 
-            var context = new ProbabilisticPipingOutputContext(new ProbabilisticPipingCalculationScenario(), new PipingFailureMechanism(), assessmentSection);
-
             // Call
             Color color = info.ForeColor(context);
 
             // Assert
             Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), color);
-
-            mocks.VerifyAll();
         }
 
         [Test]
         public void ForeColor_HasOutput_ReturnControlText()
         {
             // Setup
-            var mocks = new MockRepository();
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            mocks.ReplayAll();
-
             var calculation = new ProbabilisticPipingCalculationScenario
             {
                 Output = PipingTestDataGenerator.GetRandomProbabilisticPipingOutputWithIllustrationPoints()
             };
 
-            var context = new ProbabilisticPipingOutputContext(calculation, new PipingFailureMechanism(), assessmentSection);
+            var context = new ProbabilisticPipingOutputContext(calculation);
 
             // Call
             Color color = info.ForeColor(context);
 
             // Assert
             Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), color);
-
-            mocks.VerifyAll();
         }
 
         [Test]
@@ -146,16 +131,11 @@
         public void ChildNodeObjects_Always_ReturnsCollectionWithOutputObjects(bool hasOutput)
         {
             // Setup
-            var mocks = new MockRepository();
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            mocks.ReplayAll();
-
             var calculation = new ProbabilisticPipingCalculationScenario
             {
                 Output = hasOutput ? PipingTestDataGenerator.GetRandomProbabilisticPipingOutputWithIllustrationPoints() : null
             };
-            var failureMechanism = new PipingFailureMechanism();
-            var context = new ProbabilisticPipingOutputContext(calculation, failureMechanism, assessmentSection);
+            var context = new ProbabilisticPipingOutputContext(calculation);
 
             // Call
             object[] children = info.ChildNodeObjects(context).ToArray();