Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PresentationObjects/WaveConditionsInputContextTest.cs
===================================================================
diff -u -rbda1b9542e899c34dfa695d5e14411a4f52de809 -r1ab13c60f0a6168b2e959bc213d229d2c77af3b6
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PresentationObjects/WaveConditionsInputContextTest.cs	(.../WaveConditionsInputContextTest.cs)	(revision bda1b9542e899c34dfa695d5e14411a4f52de809)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PresentationObjects/WaveConditionsInputContextTest.cs	(.../WaveConditionsInputContextTest.cs)	(revision 1ab13c60f0a6168b2e959bc213d229d2c77af3b6)
@@ -23,11 +23,11 @@
 using System.Collections.Generic;
 using Core.Common.Controls.PresentationObjects;
 using NUnit.Framework;
+using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.Hydraulics;
-using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Revetment.Data;
 using Ringtoets.Revetment.Data.TestUtil;
 using Ringtoets.Revetment.Forms.PresentationObjects;
@@ -42,8 +42,11 @@
         {
             // Setup
             var waveConditionsInput = new WaveConditionsInput();
-            var assessmentSection = new ObservableTestAssessmentSectionStub();
 
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.StrictMock<IAssessmentSection>();
+            mocks.ReplayAll();
+
             // Call
             TestDelegate call = () => new TestWaveConditionsInputContext(waveConditionsInput,
                                                                          null,
@@ -52,6 +55,7 @@
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
             Assert.AreEqual("calculation", paramName);
+            mocks.VerifyAll();
         }
 
         [Test]
@@ -77,8 +81,11 @@
             // Setup
             var waveConditionsInput = new WaveConditionsInput();
             var calculation = new TestWaveConditionsCalculation();
-            var assessmentSection = new ObservableTestAssessmentSectionStub();
 
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.StrictMock<IAssessmentSection>();
+            mocks.ReplayAll();
+
             // Call
             var context = new TestWaveConditionsInputContext(waveConditionsInput,
                                                              calculation,
@@ -89,6 +96,7 @@
             Assert.AreSame(waveConditionsInput, context.WrappedData);
             Assert.AreSame(calculation, context.Calculation);
             Assert.AreSame(assessmentSection, context.AssessmentSection);
+            mocks.VerifyAll();
         }
 
         private class TestWaveConditionsInputContext : WaveConditionsInputContext