Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -r94f68f51cd9b8fd8c0c162cf874ef7e4580b0ee4 -rd831947ee7defd3a0b22ef43a3a41490f7e87ac7
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs	(.../PipingFailureMechanismResultViewInfoTest.cs)	(revision 94f68f51cd9b8fd8c0c162cf874ef7e4580b0ee4)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs	(.../PipingFailureMechanismResultViewInfoTest.cs)	(revision d831947ee7defd3a0b22ef43a3a41490f7e87ac7)
@@ -95,7 +95,9 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            using (var view = new PipingFailureMechanismResultView(assessmentSection, new ObservableList<PipingFailureMechanismSectionResult>()))
+            using (var view = new PipingFailureMechanismResultView(assessmentSection, 
+                                                                   new PipingFailureMechanism(), 
+                                                                   new ObservableList<PipingFailureMechanismSectionResult>()))
             {
                 // Call
                 string viewName = info.GetViewName(view, null);
@@ -127,11 +129,10 @@
 
             var failureMechanism = new PipingFailureMechanism();
 
-            using (var view = new PipingFailureMechanismResultView(assessmentSection, failureMechanism.SectionResults)
+            using (var view = new PipingFailureMechanismResultView(assessmentSection, 
+                                                                   new PipingFailureMechanism(),
+                                                                   failureMechanism.SectionResults))
             {
-                Data = failureMechanism.SectionResults
-            })
-            {
                 // Call
                 bool closeForData = info.CloseForData(view, assessmentSection);
 
@@ -157,11 +158,10 @@
 
             var failureMechanism = new PipingFailureMechanism();
 
-            using (var view = new PipingFailureMechanismResultView(assessmentSection, failureMechanism.SectionResults)
+            using (var view = new PipingFailureMechanismResultView(assessmentSection, 
+                                                                   new PipingFailureMechanism(),
+                                                                   failureMechanism.SectionResults))
             {
-                Data = failureMechanism.SectionResults
-            })
-            {
                 // Call
                 bool closeForData = info.CloseForData(view, assessmentSection);
 
@@ -186,11 +186,10 @@
             });
             mocks.ReplayAll();
 
-            using (var view = new PipingFailureMechanismResultView(assessmentSection, failureMechanism.SectionResults)
+            using (var view = new PipingFailureMechanismResultView(assessmentSection, 
+                                                                   failureMechanism,
+                                                                   failureMechanism.SectionResults))
             {
-                Data = failureMechanism.SectionResults
-            })
-            {
                 // Call
                 bool closeForData = info.CloseForData(view, assessmentSection);
 
@@ -210,11 +209,10 @@
 
             var failureMechanism = new PipingFailureMechanism();
 
-            using (var view = new PipingFailureMechanismResultView(assessmentSection, failureMechanism.SectionResults)
+            using (var view = new PipingFailureMechanismResultView(assessmentSection, 
+                                                                   failureMechanism,
+                                                                   failureMechanism.SectionResults))
             {
-                Data = failureMechanism.SectionResults
-            })
-            {
                 // Call
                 bool closeForData = info.CloseForData(view, failureMechanism);
 
@@ -233,11 +231,10 @@
             mocks.ReplayAll();
 
             var failureMechanism = new PipingFailureMechanism();
-            using (var view = new PipingFailureMechanismResultView(assessmentSection, failureMechanism.SectionResults)
+            using (var view = new PipingFailureMechanismResultView(assessmentSection, 
+                                                                   new PipingFailureMechanism(),
+                                                                   failureMechanism.SectionResults))
             {
-                Data = failureMechanism.SectionResults
-            })
-            {
                 // Call
                 bool closeForData = info.CloseForData(view, new PipingFailureMechanism());
 
@@ -257,11 +254,10 @@
 
             var failureMechanism = new PipingFailureMechanism();
             var failureMechanismContext = new PipingFailureMechanismContext(failureMechanism, assessmentSection);
-            using (var view = new PipingFailureMechanismResultView(assessmentSection, failureMechanism.SectionResults)
+            using (var view = new PipingFailureMechanismResultView(assessmentSection, 
+                                                                   failureMechanism,
+                                                                   failureMechanism.SectionResults))
             {
-                Data = failureMechanism.SectionResults
-            })
-            {
                 // Call
                 bool closeForData = info.CloseForData(view, failureMechanismContext);
 
@@ -280,11 +276,10 @@
             mocks.ReplayAll();
 
             var failureMechanism = new PipingFailureMechanism();
-            using (var view = new PipingFailureMechanismResultView(assessmentSection, failureMechanism.SectionResults)
+            using (var view = new PipingFailureMechanismResultView(assessmentSection, 
+                                                                   new PipingFailureMechanism(),
+                                                                   failureMechanism.SectionResults))
             {
-                Data = failureMechanism.SectionResults
-            })
-            {
                 var failureMechanismContext = new PipingFailureMechanismContext(
                     new PipingFailureMechanism(),
                     assessmentSection);
@@ -300,28 +295,6 @@
         }
 
         [Test]
-        public void AfterCreate_Always_SetsSpecificPropertiesToView()
-        {
-            // Setup
-            var failureMechanism = new PipingFailureMechanism();
-
-            IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks);
-            var view = mocks.StrictMock<PipingFailureMechanismResultView>();
-            view.Expect(v => v.FailureMechanism = failureMechanism);
-            mocks.ReplayAll();
-
-            var context = new ProbabilityFailureMechanismSectionResultContext<PipingFailureMechanismSectionResult>(failureMechanism.SectionResults,
-                                                                                                                   failureMechanism,
-                                                                                                                   assessmentSection);
-
-            // Call
-            info.AfterCreate(view, context);
-
-            // Assert
-            mocks.VerifyAll();
-        }
-
-        [Test]
         public void CreateInstance_WithContext_ReturnsView()
         {
             // Setup