Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresContextTest.cs
===================================================================
diff -u -re8162b5b22781fbe2258f99aa208e38f3ead9133 -r0153023b4f33722b801edf55eba942048c261779
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresContextTest.cs	(.../ClosingStructuresContextTest.cs)	(revision e8162b5b22781fbe2258f99aa208e38f3ead9133)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresContextTest.cs	(.../ClosingStructuresContextTest.cs)	(revision 0153023b4f33722b801edf55eba942048c261779)
@@ -40,16 +40,16 @@
             // Setup
             var mockRepository = new MockRepository();
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
+            var target = mockRepository.Stub<IObservable>();
             mockRepository.ReplayAll();
 
-            var target = new ObservableObject();
             var failureMechanism = new ClosingStructuresFailureMechanism();
 
             // Call
-            var context = new SimpleClosingStructuresContext<ObservableObject>(target, failureMechanism, assessmentSectionMock);
+            var context = new SimpleClosingStructuresContext<IObservable>(target, failureMechanism, assessmentSectionMock);
 
             // Assert
-            Assert.IsInstanceOf<ObservableWrappedObjectContextBase<ObservableObject>>(context);
+            Assert.IsInstanceOf<ObservableWrappedObjectContextBase<IObservable>>(context);
             Assert.AreSame(target, context.WrappedData);
             Assert.AreSame(assessmentSectionMock, context.AssessmentSection);
             Assert.AreSame(failureMechanism, context.FailureMechanism);
@@ -61,13 +61,12 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
+            var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
+            var observableObject = mockRepository.Stub<IObservable>();
             mockRepository.ReplayAll();
 
-            var observableObject = new ObservableObject();
-
             // Call
-            TestDelegate call = () => new SimpleClosingStructuresContext<ObservableObject>(observableObject, null, assessmentSectionMock);
+            TestDelegate call = () => new SimpleClosingStructuresContext<IObservable>(observableObject, null, assessmentSectionMock);
 
             // Assert
             const string expectedMessage = "Het sluitings kunstwerk toetsspoor mag niet 'null' zijn.";
@@ -79,19 +78,20 @@
         public void ParameteredConstructor_AssessmentSectionIsNull_ThrowsArgumentNullException()
         {
             // Setup
-            var observableObject = new ObservableObject();
+            var mockRepository = new MockRepository();
+            var observableObject = mockRepository.Stub<IObservable>();
+            mockRepository.ReplayAll();
+
             var failureMechanism = new ClosingStructuresFailureMechanism();
 
             // Call
-            TestDelegate call = () => new SimpleClosingStructuresContext<ObservableObject>(observableObject, failureMechanism, null);
+            TestDelegate call = () => new SimpleClosingStructuresContext<IObservable>(observableObject, failureMechanism, null);
 
             // Assert
             const string expectedMessage = "Het traject mag niet 'null' zijn.";
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(call, expectedMessage);
         }
 
-        private class ObservableObject : Observable { }
-
         private class SimpleClosingStructuresContext<T> : ClosingStructuresContext<T> where T : IObservable
         {
             public SimpleClosingStructuresContext(T target, ClosingStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection)