Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -rf4c4fe2feedd73d2f45395017b77df2bb56d5c27 -rdf44be36b5c375ff32cd94086af5e6610ec9fc3a
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs	(.../PipingFailureMechanismResultViewInfoTest.cs)	(revision f4c4fe2feedd73d2f45395017b77df2bb56d5c27)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs	(.../PipingFailureMechanismResultViewInfoTest.cs)	(revision df44be36b5c375ff32cd94086af5e6610ec9fc3a)
@@ -64,7 +64,7 @@
         public void Initialized_Always_ExpectedPropertiesSet()
         {
             // Assert
-            Assert.AreEqual(typeof(FailureMechanismSectionResultContext<PipingFailureMechanismSectionResult>), info.DataType);
+            Assert.AreEqual(typeof(PipingFailureMechanismSectionResultContext), info.DataType);
             Assert.AreEqual(typeof(IEnumerable<PipingFailureMechanismSectionResult>), info.ViewDataType);
         }
 
@@ -73,13 +73,19 @@
         {
             // Setup
             var failureMechanism = new PipingFailureMechanism();
-            var context = new FailureMechanismSectionResultContext<PipingFailureMechanismSectionResult>(failureMechanism.SectionResults, failureMechanism);
+            IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks);
+            mocks.ReplayAll();
 
+            var context = new PipingFailureMechanismSectionResultContext(failureMechanism.SectionResults,
+                                                                         failureMechanism,
+                                                                         assessmentSection);
+
             // Call
             object viewData = info.GetViewData(context);
 
             // Assert
             Assert.AreSame(failureMechanism.SectionResults, viewData);
+            mocks.VerifyAll();
         }
 
         [Test]
@@ -103,36 +109,6 @@
         }
 
         [Test]
-        public void ViewType_Always_ReturnsViewType()
-        {
-            // Call
-            Type viewType = info.ViewType;
-
-            // Assert
-            Assert.AreEqual(typeof(PipingFailureMechanismResultView), viewType);
-        }
-
-        [Test]
-        public void DataType_Always_ReturnsDataType()
-        {
-            // Call
-            Type dataType = info.DataType;
-
-            // Assert
-            Assert.AreEqual(typeof(FailureMechanismSectionResultContext<PipingFailureMechanismSectionResult>), dataType);
-        }
-
-        [Test]
-        public void ViewDataType_Always_ReturnsViewDataType()
-        {
-            // Call
-            Type viewDataType = info.ViewDataType;
-
-            // Assert
-            Assert.AreEqual(typeof(IEnumerable<PipingFailureMechanismSectionResult>), viewDataType);
-        }
-
-        [Test]
         public void Image_Always_ReturnsGenericInputOutputIcon()
         {
             // Call
@@ -331,13 +307,16 @@
         {
             // Setup
             var failureMechanism = new PipingFailureMechanism();
-            var context = new FailureMechanismSectionResultContext<PipingFailureMechanismSectionResult>(failureMechanism.SectionResults,
-                                                                                                        failureMechanism);
+
+            IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks);
             var view = mocks.StrictMock<PipingFailureMechanismResultView>();
             view.Expect(v => v.FailureMechanism = failureMechanism);
-
             mocks.ReplayAll();
 
+            var context = new PipingFailureMechanismSectionResultContext(failureMechanism.SectionResults,
+                                                                         failureMechanism,
+                                                                         assessmentSection);
+
             // Call
             info.AfterCreate(view, context);
 
@@ -350,9 +329,14 @@
         {
             // Setup
             var failureMechanism = new PipingFailureMechanism();
-            var context = new FailureMechanismSectionResultContext<PipingFailureMechanismSectionResult>(failureMechanism.SectionResults,
-                                                                                                        failureMechanism);
 
+            IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks);
+            mocks.ReplayAll();
+
+            var context = new PipingFailureMechanismSectionResultContext(failureMechanism.SectionResults,
+                                                                         failureMechanism,
+                                                                         assessmentSection);
+
             // Call
             IView view = info.CreateInstance(context);