Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs
===================================================================
diff -u -r3607710d80a1f77bf97f81b10869074b765686a0 -rb909f6664a8d22063cb0516befb25f8935c12478
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs	(.../PipingFailureMechanismViewTest.cs)	(revision 3607710d80a1f77bf97f81b10869074b765686a0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs	(.../PipingFailureMechanismViewTest.cs)	(revision b909f6664a8d22063cb0516befb25f8935c12478)
@@ -113,18 +113,11 @@
             var view = new PipingFailureMechanismView();
             var map = (BaseMap)view.Controls[0];
 
-            var mocks = new MockRepository();
-            var observer = mocks.StrictMock<IObserver>();
-            observer.Expect(o => o.UpdateObserver());
-
-            mocks.ReplayAll();
-
             var assessmentSectionBase = new TestAssessmentSectionBase
             {
                 HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase()
             };
             assessmentSectionBase.HydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "test", 1.0, 2.0));
-            assessmentSectionBase.Attach(observer);
 
             var pipingFailureMechanism = new PipingFailureMechanism();
             var pipingContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSectionBase);
@@ -141,7 +134,6 @@
             // Assert
             Assert.AreNotEqual(mapData, map.Data);
             Assert.IsInstanceOf<MapDataCollection>(map.Data);
-            mocks.VerifyAll();
         }
 
         [Test]
@@ -151,12 +143,6 @@
             var view = new PipingFailureMechanismView();
             var map = (BaseMap)view.Controls[0];
 
-            var mocks = new MockRepository();
-            var observer = mocks.StrictMock<IObserver>();
-            observer.Expect(o => o.UpdateObserver());
-
-            mocks.ReplayAll();
-
             var assessmentSectionBase = new TestAssessmentSectionBase
             {
                 ReferenceLine = new ReferenceLine()
@@ -166,7 +152,6 @@
                 new Point2D(1.0, 2.0),
                 new Point2D(2.0, 1.0)
             });
-            assessmentSectionBase.Attach(observer);
 
             var pipingFailureMechanism = new PipingFailureMechanism();
             var pipingContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSectionBase);
@@ -186,7 +171,6 @@
             // Assert
             Assert.AreNotEqual(mapData, map.Data);
             Assert.IsInstanceOf<MapDataCollection>(map.Data);
-            mocks.VerifyAll();
         }
 
         [Test]
@@ -196,15 +180,8 @@
             var view = new PipingFailureMechanismView();
             var map = (BaseMap)view.Controls[0];
 
-            var mocks = new MockRepository();
-            var observer = mocks.StrictMock<IObserver>();
-            observer.Expect(o => o.UpdateObserver());
-
-            mocks.ReplayAll();
-
             var assessmentSectionBase = new TestAssessmentSectionBase();
             var pipingFailureMechanism = new PipingFailureMechanism();
-            ((IObservable)pipingFailureMechanism.SurfaceLines).Attach(observer);
 
             var pipingContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSectionBase);
 
@@ -225,7 +202,6 @@
             // Assert
             Assert.AreNotEqual(mapData, map.Data);
             Assert.IsInstanceOf<MapDataCollection>(map.Data);
-            mocks.VerifyAll();
         }
 
         [Test]
@@ -235,12 +211,6 @@
             var view = new PipingFailureMechanismView();
             var map = (BaseMap)view.Controls[0];
 
-            var mocks = new MockRepository();
-            var observer = mocks.StrictMock<IObserver>();
-            observer.Expect(o => o.UpdateObserver());
-
-            mocks.ReplayAll();
-
             var assessmentSectionBase = new TestAssessmentSectionBase
             {
                 HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(),
@@ -252,7 +222,6 @@
                 new Point2D(1.0, 2.0),
                 new Point2D(2.0, 1.0)
             });
-            assessmentSectionBase.Attach(observer);
 
             var pipingFailureMechanism = new PipingFailureMechanism();
             var pipingContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSectionBase);
@@ -270,15 +239,13 @@
                 new Point2D(2.0, 1.0),
                 new Point2D(4.0, 3.0)
             });
-            assessmentSectionBase2.Attach(observer);
 
             // Call
             assessmentSectionBase2.NotifyObservers();
 
             // Assert
             Assert.AreEqual(pipingContext, view.Data);
             Assert.IsInstanceOf<MapDataCollection>(map.Data);
-            mocks.VerifyAll();
         }
 
         [Test]
@@ -288,12 +255,6 @@
             var view = new PipingFailureMechanismView();
             var map = (BaseMap)view.Controls[0];
 
-            var mocks = new MockRepository();
-            var observer = mocks.StrictMock<IObserver>();
-            observer.Expect(o => o.UpdateObserver());
-
-            mocks.ReplayAll();
-
             var assessmentSectionBase = new TestAssessmentSectionBase
             {
                 HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(),
@@ -311,8 +272,6 @@
 
             view.Data = pipingContext;
 
-            assessmentSectionBase.Attach(observer);
-
             view.Data = null;
             MapData dataBeforeUpdate = map.Data;
 
@@ -328,7 +287,6 @@
 
             // Assert
             Assert.AreEqual(dataBeforeUpdate, map.Data);
-            mocks.VerifyAll();
         }
 
         [Test]