Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingInputViewInfoTest.cs
===================================================================
diff -u -r87fcb2097e3a58e611c0de6913cb48851006f7af -r417318f41aef73c060b5fe7c6d723d75d335430a
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingInputViewInfoTest.cs	(.../PipingInputViewInfoTest.cs)	(revision 87fcb2097e3a58e611c0de6913cb48851006f7af)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingInputViewInfoTest.cs	(.../PipingInputViewInfoTest.cs)	(revision 417318f41aef73c060b5fe7c6d723d75d335430a)
@@ -286,7 +286,7 @@
         }
 
         [Test]
-        public void CloseForData_ViewCorrespondingToRemovedFailureMechanism_ReturnsTrue()
+        public void CloseForData_ViewCorrespondingToRemovedFailureMechanismContext_ReturnsTrue()
         {
             // Setup
             IAssessmentSection assessmentSection = mocks.StrictMock<IAssessmentSection>();
@@ -313,7 +313,7 @@
         }
 
         [Test]
-        public void CloseForData_ViewNotCorrespondingToRemovedFailureMechanism_ReturnsFalse()
+        public void CloseForData_ViewNotCorrespondingToRemovedFailureMechanismContext_ReturnsFalse()
         {
             // Setup
             IAssessmentSection assessmentSection = mocks.StrictMock<IAssessmentSection>();
@@ -340,7 +340,7 @@
         }
 
         [Test]
-        public void CloseForData_NestedViewCorrespondingToRemovedFailureMechanism_ReturnsTrue()
+        public void CloseForData_NestedViewCorrespondingToRemovedFailureMechanismContext_ReturnsTrue()
         {
             // Setup
             IAssessmentSection assessmentSection = mocks.StrictMock<IAssessmentSection>();
@@ -370,7 +370,7 @@
         }
 
         [Test]
-        public void CloseForData_NestedViewNotCorrespondingToRemovedFailureMechanism_ReturnsFalse()
+        public void CloseForData_NestedViewNotCorrespondingToRemovedFailureMechanismContext_ReturnsFalse()
         {
             // Setup
             IAssessmentSection assessmentSection = mocks.StrictMock<IAssessmentSection>();
@@ -398,8 +398,98 @@
                 mocks.VerifyAll();
             }
         }
+        
+        [Test]
+        public void CloseForData_ViewCorrespondingToRemovedFailureMechanism_ReturnsTrue()
+        {
+            // Setup
+            PipingCalculationScenario calculation = new PipingCalculationScenario(new GeneralPipingInput());
+            PipingFailureMechanism failureMechanism = new PipingFailureMechanism();
+            failureMechanism.CalculationsGroup.Children.Add(calculation);
 
+            using (PipingInputView view = new PipingInputView
+            {
+                Data = calculation.InputParameters
+            })
+            {
+                // Call
+                bool closeForData = info.CloseForData(view, failureMechanism);
+
+                // Assert
+                Assert.IsTrue(closeForData);
+            }
+        }
+
         [Test]
+        public void CloseForData_ViewNotCorrespondingToRemovedFailureMechanism_ReturnsFalse()
+        {
+            // Setup
+            PipingCalculationScenario calculation = new PipingCalculationScenario(new GeneralPipingInput());
+            PipingFailureMechanism failureMechanism = new PipingFailureMechanism();
+            failureMechanism.CalculationsGroup.Children.Add(calculation);
+
+            using (PipingInputView view = new PipingInputView
+            {
+                Data = calculation.InputParameters
+            })
+            {
+                // Call
+                bool closeForData = info.CloseForData(view, new PipingFailureMechanism());
+
+                // Assert
+                Assert.IsFalse(closeForData);
+            }
+        }
+
+        [Test]
+        public void CloseForData_NestedViewCorrespondingToRemovedFailureMechanism_ReturnsTrue()
+        {
+            // Setup
+            PipingCalculationScenario calculation = new PipingCalculationScenario(new GeneralPipingInput());
+            CalculationGroup calculationGroup = new CalculationGroup();
+            calculationGroup.Children.Add(calculation);
+
+            PipingFailureMechanism failureMechanism = new PipingFailureMechanism();
+            failureMechanism.CalculationsGroup.Children.Add(calculationGroup);
+
+            using (PipingInputView view = new PipingInputView
+            {
+                Data = calculation.InputParameters
+            })
+            {
+                // Call
+                bool closeForData = info.CloseForData(view, failureMechanism);
+
+                // Assert
+                Assert.IsTrue(closeForData);
+            }
+        }
+
+        [Test]
+        public void CloseForData_NestedViewNotCorrespondingToRemovedFailureMechanism_ReturnsFalse()
+        {
+            // Setup
+            PipingCalculationScenario calculation = new PipingCalculationScenario(new GeneralPipingInput());
+            CalculationGroup calculationGroup = new CalculationGroup();
+            calculationGroup.Children.Add(calculation);
+
+            PipingFailureMechanism failureMechanism = new PipingFailureMechanism();
+            failureMechanism.CalculationsGroup.Children.Add(calculationGroup);
+
+            using (PipingInputView view = new PipingInputView
+            {
+                Data = calculation.InputParameters
+            })
+            {
+                // Call
+                bool closeForData = info.CloseForData(view, new PipingFailureMechanism());
+
+                // Assert
+                Assert.IsFalse(closeForData);
+            }
+        }
+
+        [Test]
         public void CloseForData_ViewCorrespondingToRemovedAssessmentSection_ReturnsTrue()
         {
             // Setup