Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/ReferenceLineImporterTest.cs
===================================================================
diff -u -r507e30ebf13ba63fcedbe9a5b8457f302da26429 -rf01bfd8d4c0541a96d57071b397c39792a99da26
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/ReferenceLineImporterTest.cs	(.../ReferenceLineImporterTest.cs)	(revision 507e30ebf13ba63fcedbe9a5b8457f302da26429)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/ReferenceLineImporterTest.cs	(.../ReferenceLineImporterTest.cs)	(revision f01bfd8d4c0541a96d57071b397c39792a99da26)
@@ -73,8 +73,7 @@
 
             // Assert
             Assert.IsTrue(importSuccesful);
-            Assert.IsInstanceOf<ReferenceLine>(assessmentSection.ReferenceLine);
-            Assert.AreSame(assessmentSection.ReferenceLine, referenceLineContext.WrappedData);
+            Assert.IsNotNull(assessmentSection.ReferenceLine);
             Point2D[] point2Ds = assessmentSection.ReferenceLine.Points.ToArray();
             Assert.AreEqual(803, point2Ds.Length);
             Assert.AreEqual(193515.719, point2Ds[467].X, 1e-6);
@@ -103,7 +102,7 @@
                 new ExpectedProgressNotification
                 {
                     Text = "Geïmporteerde data toevoegen aan het traject.", CurrentStep = 2, MaxNrOfSteps = 2
-                },
+                }
             };
             var progressChangedCallCount = 0;
             var importer = new ReferenceLineImporter
@@ -149,7 +148,6 @@
             TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1);
             Assert.IsFalse(importSuccesful);
             Assert.IsNull(assessmentSection.ReferenceLine);
-            Assert.IsNull(referenceLineContext.WrappedData);
             mocks.VerifyAll();
         }
 
@@ -177,7 +175,6 @@
             TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1);
             Assert.IsFalse(importSuccesful);
             Assert.IsNull(assessmentSection.ReferenceLine);
-            Assert.IsNull(referenceLineContext.WrappedData);
             mocks.VerifyAll();
         }
 
@@ -194,13 +191,13 @@
             var failureMechanism1 = mocks.Stub<IFailureMechanism>();
             failureMechanism1.Stub(fm => fm.Calculations).Return(new[]
             {
-                calculation1,
+                calculation1
             });
 
             var failureMechanism2 = mocks.Stub<IFailureMechanism>();
             failureMechanism2.Stub(fm => fm.Calculations).Return(new[]
             {
-                calculation3,
+                calculation3
             });
 
             var assessmentSection = mocks.Stub<IAssessmentSection>();
@@ -234,7 +231,6 @@
             // Assert
             Assert.IsFalse(importSuccesful);
             Assert.AreSame(originalReferenceLine, assessmentSection.ReferenceLine);
-            Assert.AreSame(assessmentSection.ReferenceLine, referenceLineContext.WrappedData);
 
             Assert.AreEqual("Bevestigen", messageBoxTitle);
             var expectedText = "Als u de referentielijn vervangt, zullen alle vakindelingen, berekende hydraulische randvoorwaarden en berekeningsresultaten worden verwijderd." + Environment.NewLine +
@@ -369,7 +365,7 @@
                 new ExpectedProgressNotification
                 {
                     Text = "Verwijderen uitvoer van hydraulische randvoorwaarden.", CurrentStep = 4, MaxNrOfSteps = 4
-                },
+                }
             };
             var progressChangedCallCount = 0;
             var importer = new ReferenceLineImporter();
@@ -491,8 +487,7 @@
 
             // Assert
             Assert.IsTrue(importSuccesful);
-            Assert.IsInstanceOf<ReferenceLine>(assessmentSection.ReferenceLine);
-            Assert.AreSame(assessmentSection.ReferenceLine, referenceLineContext.WrappedData);
+            Assert.IsNotNull(assessmentSection.ReferenceLine);
             Point2D[] point2Ds = assessmentSection.ReferenceLine.Points.ToArray();
             Assert.AreEqual(803, point2Ds.Length);
             Assert.AreEqual(195203.563, point2Ds[321].X, 1e-6);
@@ -538,17 +533,19 @@
                 calculation4
             });
 
+            var contextObserver = mocks.Stub<IObserver>();
+            contextObserver.Expect(o => o.UpdateObserver());
+
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             assessmentSection.ReferenceLine = originalReferenceLine;
             assessmentSection.Stub(a => a.GetFailureMechanisms()).Return(new[]
             {
                 failureMechanism1,
                 failureMechanism2
             });
-            assessmentSection.Expect(section => section.NotifyObservers());
+            assessmentSection.Expect(section => section.Attach(contextObserver));
+            assessmentSection.Expect(section => section.NotifyObservers()).Do((Action)(() => contextObserver.UpdateObserver()));
 
-            var contextObserver = mocks.Stub<IObserver>();
-            contextObserver.Expect(o => o.UpdateObserver());
             mocks.ReplayAll();
 
             var path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, "traject_10-2.shp");
@@ -593,7 +590,7 @@
             var path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, "traject_10-2.shp");
 
             var referenceLineContext = new ReferenceLineContext(assessmentSection);
-            referenceLineContext.Parent.Attach(observer);
+            referenceLineContext.WrappedData.Attach(observer);
 
             var importer = new ReferenceLineImporter();
 
@@ -628,14 +625,15 @@
                 calculation1
             });
 
+            var contextObserver = mocks.StrictMock<IObserver>();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             assessmentSection.ReferenceLine = originalReferenceLine;
             assessmentSection.Stub(a => a.GetFailureMechanisms()).Return(new[]
             {
                 failureMechanism1
             });
+            assessmentSection.Expect(section => section.Attach(contextObserver));
 
-            var contextObserver = mocks.StrictMock<IObserver>();
             mocks.ReplayAll();
 
             var path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, "traject_10-2.shp");
@@ -701,17 +699,19 @@
                 calculation4
             });
 
+            var contextObserver = mocks.Stub<IObserver>();
+            contextObserver.Expect(o => o.UpdateObserver());
+
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             assessmentSection.ReferenceLine = originalReferenceLine;
             assessmentSection.Stub(a => a.GetFailureMechanisms()).Return(new[]
             {
                 failureMechanism1,
                 failureMechanism2
             });
-            assessmentSection.Expect(section => section.NotifyObservers());
+            assessmentSection.Expect(section => section.Attach(contextObserver));
+            assessmentSection.Expect(section => section.NotifyObservers()).Do((Action)(() => contextObserver.UpdateObserver()));
 
-            var contextObserver = mocks.Stub<IObserver>();
-            contextObserver.Expect(o => o.UpdateObserver());
             mocks.ReplayAll();
 
             var path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, "traject_10-2.shp");