Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/RingtoetsPipingSurfaceLineTreeNodeInfoTest.cs
===================================================================
diff -u -reeb0707a591ba44c8c42839d13e525605a8b5176 -r8c9c8ad00f4a6247162bdfbb5d0fb080438405bd
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/RingtoetsPipingSurfaceLineTreeNodeInfoTest.cs	(.../RingtoetsPipingSurfaceLineTreeNodeInfoTest.cs)	(revision eeb0707a591ba44c8c42839d13e525605a8b5176)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/RingtoetsPipingSurfaceLineTreeNodeInfoTest.cs	(.../RingtoetsPipingSurfaceLineTreeNodeInfoTest.cs)	(revision 8c9c8ad00f4a6247162bdfbb5d0fb080438405bd)
@@ -125,37 +125,12 @@
         }
 
         [Test]
-        public void RemoveData_SurfaceLineFromCollection_SurfaceLineRemovedFromParentCollection()
+        public void OnNodeRemoved_RemovedSurfaceLineAssignedToCalculationInput_SurfaceLineRemovedFromFailureMechanismAndCalculationSurfaceLineCleared()
         {
             // Setup
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             var observer = mocks.StrictMock<IObserver>();
             observer.Expect(o => o.UpdateObserver());
-            mocks.ReplayAll();
-
-            var nodeData = new RingtoetsPipingSurfaceLine();
-            var failureMechanism = new PipingFailureMechanism();
-            failureMechanism.SurfaceLines.Add(nodeData);
-            failureMechanism.SurfaceLines.Add(new RingtoetsPipingSurfaceLine());
-            failureMechanism.SurfaceLines.Attach(observer);
-
-            var parentNodeData = new RingtoetsPipingSurfaceLinesContext(failureMechanism.SurfaceLines, failureMechanism, assessmentSection);
-
-            // Call
-            info.OnNodeRemoved(nodeData, parentNodeData);
-
-            // Assert
-            CollectionAssert.DoesNotContain(failureMechanism.SurfaceLines, nodeData);
-            // Expectancies checked in TearDown
-        }
-
-        [Test]
-        public void OnNodeRemoved_RemovedSurfaceLinePartOfCalculationInput_CalculationSurfaceLineCleared()
-        {
-            // Setup
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            var observer = mocks.StrictMock<IObserver>();
-            observer.Expect(o => o.UpdateObserver());
             var calculation1Observer = mocks.StrictMock<IObserver>();
             calculation1Observer.Expect(o => o.UpdateObserver());
             var calculation2Observer = mocks.StrictMock<IObserver>();
@@ -231,7 +206,7 @@
             Assert.IsNull(calculation2.InputParameters.SurfaceLine);
             Assert.IsNotNull(calculation3.InputParameters.SurfaceLine,
                              "Calculation with different surfaceline should not be affected.");
-            // Expectancies checked in TearDown
+            // Assert expectancies are called in TearDown()
         }
 
         [Test]