Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs
===================================================================
diff -u -rce190360da30edf73fb464cc0fea1d9a795aa5d4 -rfae43a9590e1fd964bd37cdcdf62b4d7f8a00b15
--- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs	(.../DesignWaterLevelCalculationService.cs)	(revision ce190360da30edf73fb464cc0fea1d9a795aa5d4)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs	(.../DesignWaterLevelCalculationService.cs)	(revision fae43a9590e1fd964bd37cdcdf62b4d7f8a00b15)
@@ -30,7 +30,6 @@
     /// </summary>
     public class DesignWaterLevelCalculationService : HydraulicBoundaryLocationCalculationService<AssessmentLevelCalculationInput>
     {
-        private static readonly ILog log = LogManager.GetLogger(typeof(DesignWaterLevelCalculationService));
         private static IHydraulicBoundaryLocationCalculationService instance;
 
         /// <summary>
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs
===================================================================
diff -u -rce190360da30edf73fb464cc0fea1d9a795aa5d4 -rfae43a9590e1fd964bd37cdcdf62b4d7f8a00b15
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs	(.../DesignWaterLevelCalculationActivityTest.cs)	(revision ce190360da30edf73fb464cc0fea1d9a795aa5d4)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs	(.../DesignWaterLevelCalculationActivityTest.cs)	(revision fae43a9590e1fd964bd37cdcdf62b4d7f8a00b15)
@@ -156,6 +156,7 @@
                 StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculationName), msgs[2]);
             });
             Assert.AreEqual(ActivityState.Failed, activity.State);
+            mockRepository.VerifyAll();
         }
 
         [Test]
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs
===================================================================
diff -u -rce190360da30edf73fb464cc0fea1d9a795aa5d4 -rfae43a9590e1fd964bd37cdcdf62b4d7f8a00b15
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs	(.../DesignWaterLevelCalculationServiceTest.cs)	(revision ce190360da30edf73fb464cc0fea1d9a795aa5d4)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs	(.../DesignWaterLevelCalculationServiceTest.cs)	(revision fae43a9590e1fd964bd37cdcdf62b4d7f8a00b15)
@@ -160,8 +160,8 @@
 
             var mockRepository = new MockRepository();
             var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
-            calculationMessageProviderMock.Expect(calc => calc.GetCalculationName(locationName)).Return(calculationName);
-            calculationMessageProviderMock.Expect(calc => calc.GetCalculationFailedMessage(locationName)).Return(calculationFailedMessage);
+            calculationMessageProviderMock.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName);
+            calculationMessageProviderMock.Stub(calc => calc.GetCalculationFailedMessage(locationName)).Return(calculationFailedMessage);
             mockRepository.ReplayAll();
 
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, locationName, 0, 0)
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/HydraulicBoundaryLocationCalculationServiceTest.cs
===================================================================
diff -u -rce190360da30edf73fb464cc0fea1d9a795aa5d4 -rfae43a9590e1fd964bd37cdcdf62b4d7f8a00b15
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/HydraulicBoundaryLocationCalculationServiceTest.cs	(.../HydraulicBoundaryLocationCalculationServiceTest.cs)	(revision ce190360da30edf73fb464cc0fea1d9a795aa5d4)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/HydraulicBoundaryLocationCalculationServiceTest.cs	(.../HydraulicBoundaryLocationCalculationServiceTest.cs)	(revision fae43a9590e1fd964bd37cdcdf62b4d7f8a00b15)
@@ -117,8 +117,8 @@
 
             var mockRepository = new MockRepository();
             var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
-            calculationMessageProviderMock.Expect(calc => calc.GetCalculationName(locationName)).Return(calculationName);
-            calculationMessageProviderMock.Expect(calc => calc.GetCalculationFailedMessage(locationName)).Return(calculationFailedMessage);
+            calculationMessageProviderMock.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName);
+            calculationMessageProviderMock.Stub(calc => calc.GetCalculationFailedMessage(locationName)).Return(calculationFailedMessage);
             mockRepository.ReplayAll();
 
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1300001, locationName, 0, 0)
@@ -166,8 +166,8 @@
 
             var mockRepository = new MockRepository();
             var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
-            calculationMessageProviderMock.Expect(calc => calc.GetCalculationName(locationName)).Return(calculationName);
-            calculationMessageProviderMock.Expect(calc => calc.GetCalculationFailedMessage(locationName)).Return(calculationFailedMessage);
+            calculationMessageProviderMock.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName);
+            calculationMessageProviderMock.Stub(calc => calc.GetCalculationFailedMessage(locationName)).Return(calculationFailedMessage);
             mockRepository.ReplayAll();
 
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, locationName, 0, 0)
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs
===================================================================
diff -u -rce190360da30edf73fb464cc0fea1d9a795aa5d4 -rfae43a9590e1fd964bd37cdcdf62b4d7f8a00b15
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision ce190360da30edf73fb464cc0fea1d9a795aa5d4)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision fae43a9590e1fd964bd37cdcdf62b4d7f8a00b15)
@@ -62,7 +62,7 @@
             string validFilePath = Path.Combine(testDataPath, validFile);
 
             // Call
-            var activity = new WaveHeightCalculationActivity(hydraulicBoundaryLocation, validFilePath, "", 1, calculationMessageProviderMock);
+            var activity = new WaveHeightCalculationActivity(hydraulicBoundaryLocation, validFilePath, string.Empty, 1, calculationMessageProviderMock);
 
             // Assert
             Assert.IsInstanceOf<Activity>(activity);
@@ -81,7 +81,7 @@
             string validFilePath = Path.Combine(testDataPath, validFile);
 
             // Call
-            TestDelegate call = () => new WaveHeightCalculationActivity(hydraulicBoundaryLocation, validFilePath, "", 1, null);
+            TestDelegate call = () => new WaveHeightCalculationActivity(hydraulicBoundaryLocation, validFilePath, string.Empty, 1, null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -98,7 +98,7 @@
             string validFilePath = Path.Combine(testDataPath, validFile);
 
             // Call
-            TestDelegate call = () => new WaveHeightCalculationActivity(null, validFilePath, "", 1, calculationMessageProviderMock);
+            TestDelegate call = () => new WaveHeightCalculationActivity(null, validFilePath, string.Empty, 1, calculationMessageProviderMock);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -125,7 +125,7 @@
                 WaveHeight = new RoundedDouble(2, double.NaN)
             };
 
-            var activity = new WaveHeightCalculationActivity(hydraulicBoundaryLocation, inValidFilePath, "", 1, calculationMessageProviderMock);
+            var activity = new WaveHeightCalculationActivity(hydraulicBoundaryLocation, inValidFilePath, string.Empty, 1, calculationMessageProviderMock);
 
             // Call
             Action call = () => activity.Run();
@@ -229,8 +229,8 @@
             const string locationName = "locationName";
 
             var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
-            calculationMessageProviderMock.Expect(calc => calc.GetActivityName(locationName)).Return("");
-            calculationMessageProviderMock.Expect(calc => calc.GetCalculationName(locationName)).Return("").Repeat.AtLeastOnce();
+            calculationMessageProviderMock.Expect(calc => calc.GetActivityName(locationName)).Return(string.Empty);
+            calculationMessageProviderMock.Expect(calc => calc.GetCalculationName(locationName)).Return(string.Empty).Repeat.AtLeastOnce();
             mockRepository.ReplayAll();
 
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, locationName, 0, 0)
@@ -267,8 +267,8 @@
             // Setup
             var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
             const string locationName = "locationName";
-            calculationMessageProviderMock.Expect(calc => calc.GetActivityName(locationName)).Return("");
-            calculationMessageProviderMock.Expect(calc => calc.GetCalculationName(locationName)).Return("").Repeat.AtLeastOnce();
+            calculationMessageProviderMock.Expect(calc => calc.GetActivityName(locationName)).Return(string.Empty);
+            calculationMessageProviderMock.Expect(calc => calc.GetCalculationName(locationName)).Return(string.Empty).Repeat.AtLeastOnce();
             mockRepository.ReplayAll();
 
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, locationName, 0, 0)
@@ -359,7 +359,7 @@
             const string locationName = "Name";
 
             var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
-            calculationMessageProviderMock.Expect(calc => calc.GetActivityName(locationName)).Return("");
+            calculationMessageProviderMock.Expect(calc => calc.GetActivityName(locationName)).Return(string.Empty);
             mockRepository.ReplayAll();
 
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, locationName, 0, 0)
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs
===================================================================
diff -u -rce190360da30edf73fb464cc0fea1d9a795aa5d4 -rfae43a9590e1fd964bd37cdcdf62b4d7f8a00b15
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs	(.../WaveHeightCalculationServiceTest.cs)	(revision ce190360da30edf73fb464cc0fea1d9a795aa5d4)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs	(.../WaveHeightCalculationServiceTest.cs)	(revision fae43a9590e1fd964bd37cdcdf62b4d7f8a00b15)
@@ -113,8 +113,8 @@
 
             var mockRepository = new MockRepository();
             var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
-            calculationMessageProviderMock.Expect(calc => calc.GetCalculationName(locationName)).Return(calculationName);
-            calculationMessageProviderMock.Expect(calc => calc.GetCalculationFailedMessage(locationName)).Return(calculationFailedMessage);
+            calculationMessageProviderMock.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName);
+            calculationMessageProviderMock.Stub(calc => calc.GetCalculationFailedMessage(locationName)).Return(calculationFailedMessage);
             mockRepository.ReplayAll();
 
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1300001, locationName, 0, 0)
@@ -158,8 +158,8 @@
 
             var mockRepository = new MockRepository();
             var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
-            calculationMessageProviderMock.Expect(calc => calc.GetCalculationName(locationName)).Return(calculationName);
-            calculationMessageProviderMock.Expect(calc => calc.GetCalculationFailedMessage(locationName)).Return(calculationFailedMessage).Repeat.AtLeastOnce();
+            calculationMessageProviderMock.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName);
+            calculationMessageProviderMock.Stub(calc => calc.GetCalculationFailedMessage(locationName)).Return(calculationFailedMessage).Repeat.AtLeastOnce();
             mockRepository.ReplayAll();
 
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, locationName, 0, 0)
Index: Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/TestHydraulicBoundaryLocationCalculationServiceTest.cs
===================================================================
diff -u -rce190360da30edf73fb464cc0fea1d9a795aa5d4 -rfae43a9590e1fd964bd37cdcdf62b4d7f8a00b15
--- Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/TestHydraulicBoundaryLocationCalculationServiceTest.cs	(.../TestHydraulicBoundaryLocationCalculationServiceTest.cs)	(revision ce190360da30edf73fb464cc0fea1d9a795aa5d4)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/TestHydraulicBoundaryLocationCalculationServiceTest.cs	(.../TestHydraulicBoundaryLocationCalculationServiceTest.cs)	(revision fae43a9590e1fd964bd37cdcdf62b4d7f8a00b15)
@@ -53,7 +53,7 @@
             const string ringId = "11-1";
 
             var mockRepository = new MockRepository();
-            var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
+            var calculationMessageProviderMock = mockRepository.Stub<ICalculationMessageProvider>();
             mockRepository.ReplayAll();
 
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, string.Empty, 0, 0);
@@ -81,7 +81,7 @@
             const double norm = 12.34;
 
             var mockRepository = new MockRepository();
-            var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
+            var calculationMessageProviderMock = mockRepository.Stub<ICalculationMessageProvider>();
             mockRepository.ReplayAll();
 
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, string.Empty, 0, 0);
@@ -107,7 +107,7 @@
             const double norm = 12.34;
 
             var mockRepository = new MockRepository();
-            var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
+            var calculationMessageProviderMock = mockRepository.Stub<ICalculationMessageProvider>();
             mockRepository.ReplayAll();
 
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, string.Empty, 0, 0);
@@ -124,7 +124,6 @@
                                                                          calculationMessageProviderMock);
 
             // Assert
-            Assert.AreSame(calculationMessageProviderMock, service.MessageProvider);
             var expectedOutput = new ReliabilityIndexCalculationOutput(norm, StatisticsConverter.NormToBeta(norm));
             AssertReliabilityIndexCalculationOutput(expectedOutput, output);
             mockRepository.VerifyAll();
@@ -137,7 +136,7 @@
             const double norm = 12.34;
 
             var mockRepository = new MockRepository();
-            var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
+            var calculationMessageProviderMock = mockRepository.Stub<ICalculationMessageProvider>();
             mockRepository.ReplayAll();
 
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, string.Empty, 0, 0);
@@ -154,7 +153,6 @@
                                                                          calculationMessageProviderMock);
 
             // Assert
-            Assert.AreSame(calculationMessageProviderMock, service.MessageProvider);
             Assert.IsNull(output);
             mockRepository.VerifyAll();
         }
@@ -166,7 +164,7 @@
             const double norm = 12.34;
 
             var mockRepository = new MockRepository();
-            var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
+            var calculationMessageProviderMock = mockRepository.Stub<ICalculationMessageProvider>();
             mockRepository.ReplayAll();
 
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, string.Empty, 0, 0);
@@ -183,7 +181,6 @@
                                                                          calculationMessageProviderMock);
 
             // Assert
-            Assert.AreSame(calculationMessageProviderMock, service.MessageProvider);
             var expectedOutput = new ReliabilityIndexCalculationOutput(norm, norm);
             AssertReliabilityIndexCalculationOutput(expectedOutput, output);
             mockRepository.VerifyAll();
Index: Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/WaveHeightCalculationServiceConfigTest.cs
===================================================================
diff -u -rce190360da30edf73fb464cc0fea1d9a795aa5d4 -rfae43a9590e1fd964bd37cdcdf62b4d7f8a00b15
--- Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/WaveHeightCalculationServiceConfigTest.cs	(.../WaveHeightCalculationServiceConfigTest.cs)	(revision ce190360da30edf73fb464cc0fea1d9a795aa5d4)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/WaveHeightCalculationServiceConfigTest.cs	(.../WaveHeightCalculationServiceConfigTest.cs)	(revision fae43a9590e1fd964bd37cdcdf62b4d7f8a00b15)
@@ -19,146 +19,47 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using Core.Common.Utils;
+using System;
 using NUnit.Framework;
-using Rhino.Mocks;
-using Ringtoets.Common.Service.MessageProviders;
-using Ringtoets.HydraRing.Calculation.Data.Output;
-using Ringtoets.HydraRing.Data;
 
 namespace Ringtoets.Common.Service.TestUtil.Test
 {
     [TestFixture]
     public class WaveHeightCalculationServiceConfigTest
     {
         [Test]
-        public void Validate_Always_ReturnTrue()
+        public void Constructor_NewInstanceCanBeDisposed()
         {
-            // Setup
-            var service = new TestHydraulicBoundaryLocationCalculationService();
-
             // Call
-            bool validated = service.Validate(string.Empty, string.Empty);
+            var service = new WaveHeightCalculationServiceConfig();
 
             // Assert
-            Assert.IsTrue(validated);
+            Assert.IsInstanceOf<IDisposable>(service);
+            Assert.DoesNotThrow(() => service.Dispose());
         }
 
         [Test]
-        public void Calculate_SetCalculationConvergenceOutputDefault_ReturnsExpectedValue()
+        public void Constructor_SetsTestWaveConditionsCalculationService()
         {
-            // Setup
-            var mockRepository = new MockRepository();
-            var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
-            mockRepository.ReplayAll();
-            
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, string.Empty, 0, 0);
-            var service = new TestHydraulicBoundaryLocationCalculationService();
-            const double norm = 12.34;
-
             // Call
-            ReliabilityIndexCalculationOutput output = service.Calculate(hydraulicBoundaryLocation,
-                                                                         string.Empty,
-                                                                         string.Empty,
-                                                                         norm,
-                                                                         calculationMessageProviderMock);
-
-            // Assert
-            var expectedOutput = new ReliabilityIndexCalculationOutput(norm, StatisticsConverter.NormToBeta(norm));
-            AssertReliabilityIndexCalculationOutput(expectedOutput, output);
-            mockRepository.VerifyAll();
-        }
-
-        [Test]
-        public void Calculate_SetCalculationConvergenceOutputCalculatedConverged_ReturnsExpectedValue()
-        {
-            // Setup
-            var mockRepository = new MockRepository();
-            var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
-            mockRepository.ReplayAll();
-
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, string.Empty, 0, 0);
-            var service = new TestHydraulicBoundaryLocationCalculationService
+            using (new WaveHeightCalculationServiceConfig())
             {
-                CalculationConvergenceOutput = CalculationConvergence.CalculatedConverged
-            };
-            const double norm = 12.34;
-
-            // Call
-            ReliabilityIndexCalculationOutput output = service.Calculate(hydraulicBoundaryLocation,
-                                                                         string.Empty,
-                                                                         string.Empty,
-                                                                         norm,
-                                                                         calculationMessageProviderMock);
-
-            // Assert
-            Assert.AreSame(calculationMessageProviderMock, service.MessageProvider);
-            var expectedOutput = new ReliabilityIndexCalculationOutput(norm, StatisticsConverter.NormToBeta(norm));
-            AssertReliabilityIndexCalculationOutput(expectedOutput, output);
-            mockRepository.VerifyAll();
+                // Assert
+                Assert.IsInstanceOf<TestHydraulicBoundaryLocationCalculationService>(WaveHeightCalculationService.Instance);
+            }
         }
 
         [Test]
-        public void Calculate_SetCalculationConvergenceOutputNotCalculated_ReturnsNull()
+        public void Dispose_Always_ResetsDesignWaterLevelCalculationServiceToPreviousValue()
         {
             // Setup
-            var mockRepository = new MockRepository();
-            var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
-            mockRepository.ReplayAll();
+            var expectedService = WaveHeightCalculationService.Instance;
 
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, string.Empty, 0, 0);
-            var service = new TestHydraulicBoundaryLocationCalculationService
-            {
-                CalculationConvergenceOutput = CalculationConvergence.NotCalculated
-            };
-            const double norm = 12.34;
-
             // Call
-            ReliabilityIndexCalculationOutput output = service.Calculate(hydraulicBoundaryLocation,
-                                                                         string.Empty,
-                                                                         string.Empty,
-                                                                         norm,
-                                                                         calculationMessageProviderMock);
+            using (new WaveHeightCalculationServiceConfig()) { }
 
             // Assert
-            Assert.AreSame(calculationMessageProviderMock, service.MessageProvider);
-            Assert.IsNull(output);
-            mockRepository.VerifyAll();
+            Assert.AreSame(expectedService, WaveHeightCalculationService.Instance);
         }
-
-        [Test]
-        public void Calculate_SetCalculationConvergenceOutputCalculatedNotConverged_ReturnsExpectedValue()
-        {
-            // Setup
-            var mockRepository = new MockRepository();
-            var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
-            mockRepository.ReplayAll();
-
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, string.Empty, 0, 0);
-            var service = new TestHydraulicBoundaryLocationCalculationService
-            {
-                CalculationConvergenceOutput = CalculationConvergence.CalculatedNotConverged
-            };
-            const double norm = 12.34;
-
-            // Call
-            ReliabilityIndexCalculationOutput output = service.Calculate(hydraulicBoundaryLocation,
-                                                                         string.Empty,
-                                                                         string.Empty,
-                                                                         norm,
-                                                                         calculationMessageProviderMock);
-
-            // Assert
-            Assert.AreSame(calculationMessageProviderMock, service.MessageProvider);
-            var expectedOutput = new ReliabilityIndexCalculationOutput(norm, norm);
-            AssertReliabilityIndexCalculationOutput(expectedOutput, output);
-            mockRepository.VerifyAll();
-        }
-
-        private static void AssertReliabilityIndexCalculationOutput(ReliabilityIndexCalculationOutput expected, ReliabilityIndexCalculationOutput actual)
-        {
-            Assert.AreEqual(expected.CalculatedReliabilityIndex, actual.CalculatedReliabilityIndex);
-            Assert.AreEqual(expected.Result, actual.Result, 1e-6);
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/Ringtoets.GrassCoverErosionOutwards.Plugin.csproj
===================================================================
diff -u -r9f5fa34afb489eb0d46dab724e9d8121a31a04bb -rfae43a9590e1fd964bd37cdcdf62b4d7f8a00b15
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/Ringtoets.GrassCoverErosionOutwards.Plugin.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Plugin.csproj)	(revision 9f5fa34afb489eb0d46dab724e9d8121a31a04bb)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/Ringtoets.GrassCoverErosionOutwards.Plugin.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Plugin.csproj)	(revision fae43a9590e1fd964bd37cdcdf62b4d7f8a00b15)
@@ -80,11 +80,6 @@
       <Name>Core.Common.Gui</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
-      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
-      <Name>Core.Common.Utils</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Data\Ringtoets.Common.Data.csproj">
       <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
       <Name>Ringtoets.Common.Data</Name>
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismTest.cs
===================================================================
diff -u -r65cec137f19d9ded25248ba376b2ea8d43c18c2c -rfae43a9590e1fd964bd37cdcdf62b4d7f8a00b15
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismTest.cs)	(revision 65cec137f19d9ded25248ba376b2ea8d43c18c2c)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismTest.cs)	(revision fae43a9590e1fd964bd37cdcdf62b4d7f8a00b15)
@@ -64,7 +64,7 @@
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
 
             // Call
-            failureMechanism.AddSection(new FailureMechanismSection("", new[]
+            failureMechanism.AddSection(new FailureMechanismSection(string.Empty, new[]
             {
                 new Point2D(2, 1)
             }));
@@ -79,7 +79,7 @@
         {
             // Setup
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            failureMechanism.AddSection(new FailureMechanismSection("", new[]
+            failureMechanism.AddSection(new FailureMechanismSection(string.Empty, new[]
             {
                 new Point2D(2, 1)
             }));
@@ -93,7 +93,7 @@
         }
 
         [Test]
-        public void Calculations_MultipleChildrenAdded_ReturnStabilityStoneCoverWaveConditionsCalculations()
+        public void Calculations_MultipleChildrenAdded_ReturnGrassCoverErosionOutwardsWaveConditionsCalculations()
         {
             // Setup
             var mocks = new MockRepository();
@@ -105,7 +105,7 @@
                     {
                         new CalculationGroup(),
                         new GrassCoverErosionOutwardsWaveConditionsCalculation(),
-                        mocks.StrictMock<ICalculation>(),
+                        mocks.Stub<ICalculation>(),
                         new GrassCoverErosionOutwardsWaveConditionsCalculation()
                     }
                 }
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs
===================================================================
diff -u -rc96cfd7d2d167db3b0775f7d76f320c5e582ae27 -rfae43a9590e1fd964bd37cdcdf62b4d7f8a00b15
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs	(.../GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs)	(revision c96cfd7d2d167db3b0775f7d76f320c5e582ae27)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs	(.../GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs)	(revision fae43a9590e1fd964bd37cdcdf62b4d7f8a00b15)
@@ -134,7 +134,7 @@
         }
 
         [Test]
-        public void ClearAllWaveConditionsCalculationOutputAndHydraulicBoundaryLocations_WithoutAssessmentSection_ThrowsArgumentNullException()
+        public void ClearAllWaveConditionsCalculationOutputAndHydraulicBoundaryLocations_FailureMechanismNull_ThrowsArgumentNullException()
         {
             // Call
             TestDelegate call = () => GrassCoverErosionOutwardsDataSynchronizationService.ClearAllWaveConditionsCalculationOutputAndHydraulicBoundaryLocations(null);
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PresentationObjects/WaveConditionsInputContextTest.cs
===================================================================
diff -u -r50fc099174271a6f72ed94a8f024cd5377b37a53 -rfae43a9590e1fd964bd37cdcdf62b4d7f8a00b15
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PresentationObjects/WaveConditionsInputContextTest.cs	(.../WaveConditionsInputContextTest.cs)	(revision 50fc099174271a6f72ed94a8f024cd5377b37a53)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PresentationObjects/WaveConditionsInputContextTest.cs	(.../WaveConditionsInputContextTest.cs)	(revision fae43a9590e1fd964bd37cdcdf62b4d7f8a00b15)
@@ -36,7 +36,7 @@
     public class WaveConditionsInputContextTest
     {
         [Test]
-        public void Constructor_InputNull_ThrowArgumentNullException()
+        public void Constructor_WaveConditionsInputNull_ThrowArgumentNullException()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs
===================================================================
diff -u -r50fc099174271a6f72ed94a8f024cd5377b37a53 -rfae43a9590e1fd964bd37cdcdf62b4d7f8a00b15
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs	(.../WaveConditionsInputContextPropertiesTest.cs)	(revision 50fc099174271a6f72ed94a8f024cd5377b37a53)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs	(.../WaveConditionsInputContextPropertiesTest.cs)	(revision fae43a9590e1fd964bd37cdcdf62b4d7f8a00b15)
@@ -147,11 +147,11 @@
                 new BreakWater(BreakWaterType.Dam, damHeight), 
                 new ForeshoreProfile.ConstructionProperties
                 {
-                    Name = "",
+                    Name = string.Empty,
                     Orientation = foreshoreProfileOrientation,
                     X0 = -3
                 });
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "", 0, 0)
+            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0)
             {
                 DesignWaterLevel = assessmentLevel
             };