Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs
===================================================================
diff -u -rd2e3909720db05a11d4cd821e8b8dc8b444ea402 -r05f1e980d28b12f13fd803d9a6c682f708a325d9
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs	(.../AssessmentSectionViewTest.cs)	(revision d2e3909720db05a11d4cd821e8b8dc8b444ea402)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs	(.../AssessmentSectionViewTest.cs)	(revision 05f1e980d28b12f13fd803d9a6c682f708a325d9)
@@ -121,18 +121,11 @@
             var view = new AssessmentSectionView();
             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);
 
             view.Data = assessmentSectionBase;
             var mapData = map.Data;
@@ -146,7 +139,6 @@
             // Assert
             Assert.AreNotEqual(mapData, map.Data);
             Assert.IsInstanceOf<MapDataCollection>(map.Data);
-            mocks.VerifyAll();
         }
 
         [Test]
@@ -156,12 +148,6 @@
             var view = new AssessmentSectionView();
             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()
@@ -171,7 +157,6 @@
                 new Point2D(1.0, 2.0),
                 new Point2D(2.0, 1.0)
             });
-            assessmentSectionBase.Attach(observer);
 
             view.Data = assessmentSectionBase;
             var mapData = map.Data;
@@ -189,7 +174,6 @@
             // Assert
             Assert.AreNotEqual(mapData, map.Data);
             Assert.IsInstanceOf<MapDataCollection>(map.Data);
-            mocks.VerifyAll();
         }
 
         [Test]
@@ -199,12 +183,6 @@
             var view = new AssessmentSectionView();
             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(),
@@ -216,7 +194,6 @@
                 new Point2D(1.0, 2.0),
                 new Point2D(2.0, 1.0)
             });
-            assessmentSectionBase.Attach(observer);
 
             view.Data = assessmentSectionBase;
 
@@ -231,15 +208,13 @@
                 new Point2D(2.0, 1.0),
                 new Point2D(4.0, 3.0)
             });
-            assessmentSectionBase2.Attach(observer);
 
             // Call
             assessmentSectionBase2.NotifyObservers();
 
             // Assert
             Assert.AreEqual(assessmentSectionBase, view.Data);
             Assert.IsInstanceOf<MapDataCollection>(map.Data);
-            mocks.VerifyAll();
         }
 
         [Test]
@@ -248,13 +223,7 @@
             // Setup
             var view = new AssessmentSectionView();
             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(),
@@ -268,8 +237,6 @@
             });
 
             view.Data = assessmentSectionBase;
-            
-            assessmentSectionBase.Attach(observer);
 
             MapData dataBeforeUpdate = map.Data;
             view.Data = null;
@@ -287,7 +254,6 @@
             // Assert
             Assert.IsNull(view.Data);
             Assert.AreEqual(dataBeforeUpdate, map.Data);
-            mocks.VerifyAll();
         }
 
         private class TestAssessmentSectionBase : AssessmentSectionBase