Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Activities/HydraRingActivityTest.cs
===================================================================
diff -u -r9598b5ccb274c8aedd4d0407ef3120d82935d3fe -rec26e8cc8a4c043cfec1884597d87b3c2d81d059
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Activities/HydraRingActivityTest.cs	(.../HydraRingActivityTest.cs)	(revision 9598b5ccb274c8aedd4d0407ef3120d82935d3fe)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Activities/HydraRingActivityTest.cs	(.../HydraRingActivityTest.cs)	(revision ec26e8cc8a4c043cfec1884597d87b3c2d81d059)
@@ -20,10 +20,8 @@
 // All rights reserved.
 
 using System;
-using Core.Common.Base;
 using Core.Common.Base.Service;
 using NUnit.Framework;
-using Rhino.Mocks;
 using Ringtoets.HydraRing.Calculation.Activities;
 
 namespace Ringtoets.HydraRing.Calculation.Test.Activities
@@ -84,20 +82,11 @@
         }
 
         [Test]
-        public void Finish_StateExecuted_SetsOutputAndNotifiesObservers()
+        public void Finish_StateExecuted_SetsOutput()
         {
             // Setup
-            var mocks = new MockRepository();
-            var observerMock = mocks.StrictMock<IObserver>();
-            var observableMock = mocks.StrictMock<IObservable>();
-            observableMock.Expect(o => o.Attach(observerMock));
-            observableMock.Expect(o => o.NotifyObservers());
-            mocks.ReplayAll();
-
-            observableMock.Attach(observerMock);
-
             double newValue = 2.0;
-            TestHydraRingActivity activity = new TestHydraRingActivity(true, () => newValue, observableMock);
+            TestHydraRingActivity activity = new TestHydraRingActivity(true, () => newValue);
 
             activity.Run();
 
@@ -106,42 +95,33 @@
 
             // Assert
             Assert.AreEqual(newValue, activity.Value);
-            mocks.VerifyAll();
         }
 
         [Test]
-        public void Finish_OutputNull_DoesNotSetOutputAndNotifyObservers()
+        public void Finish_OutputNull_DoesNotSetOutput()
         {
             // Setup
-            var mocks = new MockRepository();
-            var observableMock = mocks.StrictMock<IObservable>();
-            observableMock.Expect(o => o.NotifyObservers());
-            mocks.ReplayAll();
+            TestHydraRingActivity activity = new TestHydraRingActivity(true, () => null);
 
-            TestHydraRingActivity activity = new TestHydraRingActivity(true, () => null, observableMock);
-
             activity.Run();
 
             // Call
             activity.Finish();
 
             // Assert
             Assert.IsNaN(activity.Value);
-            mocks.VerifyAll();
         }
 
         private class TestHydraRingActivity : HydraRingActivity<object>
         {
             private readonly bool valid;
             private readonly Func<object> calculationFunc;
-            private readonly IObservable observableObject;
             private double value = 3.0;
 
-            public TestHydraRingActivity(bool valid, Func<object> calculationFunc, IObservable observableObject = null)
+            public TestHydraRingActivity(bool valid, Func<object> calculationFunc)
             {
                 this.valid = valid;
                 this.calculationFunc = calculationFunc;
-                this.observableObject = observableObject;
             }
 
             public double Value
@@ -159,7 +139,7 @@
 
             protected override void OnFinish()
             {
-                PerformFinish(() => value = (double) Output, observableObject);
+                PerformFinish(() => value = (double) Output);
             }
         }
     }