Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismViewInfoTest.cs
===================================================================
diff -u -rad2852e2af051883dd1de3075de273f1d4e97815 -rad6323c867e2715dfe4af5fb09f601bd61284092
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismViewInfoTest.cs	(.../PipingFailureMechanismViewInfoTest.cs)	(revision ad2852e2af051883dd1de3075de273f1d4e97815)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismViewInfoTest.cs	(.../PipingFailureMechanismViewInfoTest.cs)	(revision ad6323c867e2715dfe4af5fb09f601bd61284092)
@@ -79,6 +79,7 @@
 
             // Assert
             Assert.AreEqual(failureMechanism.Name, viewName);
+            mocks.VerifyAll();
         }
 
         [Test]
@@ -95,18 +96,14 @@
         public void CloseForData_ViewNotCorrespondingToRemovedAssessmentSection_ReturnsFalse()
         {
             // Setup
-            var assessmentSection = new ObservableTestAssessmentSectionStub();
             var otherAssessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
+            var assessmentSection = new ObservableTestAssessmentSectionStub();
             var failureMechanism = new PipingFailureMechanism();
-            var pipingFailureMechanismContext = new PipingFailureMechanismContext(failureMechanism, assessmentSection);
 
-            using (var view = new PipingFailureMechanismView(failureMechanism, assessmentSection)
+            using (var view = new PipingFailureMechanismView(failureMechanism, assessmentSection))
             {
-                Data = pipingFailureMechanismContext
-            })
-            {
                 // Call
                 bool closeForData = info.CloseForData(view, otherAssessmentSection);
 
@@ -122,15 +119,10 @@
         {
             // Setup
             var assessmentSection = new ObservableTestAssessmentSectionStub();
-
             var failureMechanism = new PipingFailureMechanism();
-            var pipingFailureMechanismContext = new PipingFailureMechanismContext(failureMechanism, assessmentSection);
 
-            using (var view = new PipingFailureMechanismView(failureMechanism, assessmentSection)
+            using (var view = new PipingFailureMechanismView(failureMechanism, assessmentSection))
             {
-                Data = pipingFailureMechanismContext
-            })
-            {
                 // Call
                 bool closeForData = info.CloseForData(view, assessmentSection);
 
@@ -144,17 +136,11 @@
         {
             // Setup
             var assessmentSection = new ObservableTestAssessmentSectionStub();
-
             var failureMechanism = new PipingFailureMechanism();
             var otherPipingFailureMechanism = new PipingFailureMechanism();
 
-            var pipingFailureMechanismContext = new PipingFailureMechanismContext(failureMechanism, assessmentSection);
-
-            using (var view = new PipingFailureMechanismView(failureMechanism, assessmentSection)
+            using (var view = new PipingFailureMechanismView(failureMechanism, assessmentSection))
             {
-                Data = pipingFailureMechanismContext
-            })
-            {
                 // Call
                 bool closeForData = info.CloseForData(view, otherPipingFailureMechanism);
 
@@ -168,15 +154,10 @@
         {
             // Setup
             var assessmentSection = new ObservableTestAssessmentSectionStub();
-
             var failureMechanism = new PipingFailureMechanism();
-            var pipingFailureMechanismContext = new PipingFailureMechanismContext(failureMechanism, assessmentSection);
 
-            using (var view = new PipingFailureMechanismView(failureMechanism, assessmentSection)
+            using (var view = new PipingFailureMechanismView(failureMechanism, assessmentSection))
             {
-                Data = pipingFailureMechanismContext
-            })
-            {
                 // Call
                 bool closeForData = info.CloseForData(view, failureMechanism);
 
@@ -213,9 +194,7 @@
         public void CreateInstance_WithContext_ReturnPipingFailureMechanismView()
         {
             // Setup
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            mocks.ReplayAll();
-
+            var assessmentSection = new ObservableTestAssessmentSectionStub();
             var failureMechanism = new PipingFailureMechanism();
 
             var context = new PipingFailureMechanismContext(failureMechanism, assessmentSection);