Index: Ringtoets/Common/src/Ringtoets.Common.Service/IWaveHeightCalculationService.cs
===================================================================
diff -u -r1e533850c7711172462df1e8f569b9f3ff950045 -ra97c4ffe5254af061462539883d25722be13e539
--- Ringtoets/Common/src/Ringtoets.Common.Service/IWaveHeightCalculationService.cs	(.../IWaveHeightCalculationService.cs)	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/IWaveHeightCalculationService.cs	(.../IWaveHeightCalculationService.cs)	(revision a97c4ffe5254af061462539883d25722be13e539)
@@ -26,7 +26,7 @@
 namespace Ringtoets.Common.Service
 {
     /// <summary>
-    /// Interface that provides methods for performing Hydra-Ring calculations for design water level.
+    /// Interface that provides methods for performing Hydra-Ring calculations for wave height.
     /// </summary>
     public interface IWaveHeightCalculationService
     {
@@ -43,15 +43,12 @@
         /// Performs a wave height calculation based on the supplied <see cref="IHydraulicBoundaryLocation"/> and returns the result
         /// if the calculation was successful. Error and status information is logged during the execution of the operation.
         /// </summary>
-        /// <param name="messageProvider">The message provider for the services.</param>
         /// <param name="hydraulicBoundaryLocation">The <see cref="IHydraulicBoundaryLocation"/> to perform the calculation for.</param>
         /// <param name="hydraulicBoundaryDatabaseFilePath">The HLCD file that should be used for performing the calculation.</param>
         /// <param name="ringId">The id of the ring to perform the calculation for.</param>
         /// <param name="norm">The norm to use during the calculation.</param>
+        /// <param name="messageProvider">The message provider for the services.</param>
         /// <returns>A <see cref="ReliabilityIndexCalculationOutput"/> on a successful calculation, <c>null</c> otherwise.</returns>
-        ReliabilityIndexCalculationOutput Calculate(ICalculationMessageProvider messageProvider,
-                                                    IHydraulicBoundaryLocation hydraulicBoundaryLocation,
-                                                    string hydraulicBoundaryDatabaseFilePath,
-                                                    string ringId, double norm);
+        ReliabilityIndexCalculationOutput Calculate(IHydraulicBoundaryLocation hydraulicBoundaryLocation, string hydraulicBoundaryDatabaseFilePath, string ringId, double norm, ICalculationMessageProvider messageProvider);
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationActivity.cs
===================================================================
diff -u -r1e533850c7711172462df1e8f569b9f3ff950045 -ra97c4ffe5254af061462539883d25722be13e539
--- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationActivity.cs	(.../WaveHeightCalculationActivity.cs)	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationActivity.cs	(.../WaveHeightCalculationActivity.cs)	(revision a97c4ffe5254af061462539883d25722be13e539)
@@ -86,9 +86,9 @@
                 messageProvider.GetCalculationName(hydraulicBoundaryLocation.Name),
                 hydraulicBoundaryDatabaseFilePath),
                        () => hydraulicBoundaryLocation.WaveHeight = (RoundedDouble) double.NaN,
-                       () => WaveHeightCalculationService.Instance.Calculate(
-                           messageProvider, hydraulicBoundaryLocation, hydraulicBoundaryDatabaseFilePath,
-                           ringId, norm));
+                       () => WaveHeightCalculationService.Instance.Calculate(hydraulicBoundaryLocation,
+                                                                             hydraulicBoundaryDatabaseFilePath,
+                                                                             ringId, norm, messageProvider));
         }
 
         protected override void OnFinish()
Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs
===================================================================
diff -u -r03b153b8f94dc5ff3619bdd52c79394a0d7fde85 -ra97c4ffe5254af061462539883d25722be13e539
--- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs	(.../WaveHeightCalculationService.cs)	(revision 03b153b8f94dc5ff3619bdd52c79394a0d7fde85)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs	(.../WaveHeightCalculationService.cs)	(revision a97c4ffe5254af061462539883d25722be13e539)
@@ -74,10 +74,11 @@
             return isValid;
         }
 
-        public ReliabilityIndexCalculationOutput Calculate(ICalculationMessageProvider messageProvider,
-                                                           IHydraulicBoundaryLocation hydraulicBoundaryLocation,
+        public ReliabilityIndexCalculationOutput Calculate(IHydraulicBoundaryLocation hydraulicBoundaryLocation,
                                                            string hydraulicBoundaryDatabaseFilePath,
-                                                           string ringId, double norm)
+                                                           string ringId,
+                                                           double norm,
+                                                           ICalculationMessageProvider messageProvider)
         {
             var hlcdDirectory = Path.GetDirectoryName(hydraulicBoundaryDatabaseFilePath);
             var input = CreateInput(hydraulicBoundaryLocation, norm);
Index: Ringtoets/Common/src/Ringtoets.Common.Service/packages.config
===================================================================
diff -u -r1e533850c7711172462df1e8f569b9f3ff950045 -ra97c4ffe5254af061462539883d25722be13e539
--- Ringtoets/Common/src/Ringtoets.Common.Service/packages.config	(.../packages.config)	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/packages.config	(.../packages.config)	(revision a97c4ffe5254af061462539883d25722be13e539)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
 Copyright (C) Stichting Deltares 2016. All rights reserved.
 
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs
===================================================================
diff -u -r1e533850c7711172462df1e8f569b9f3ff950045 -ra97c4ffe5254af061462539883d25722be13e539
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision a97c4ffe5254af061462539883d25722be13e539)
@@ -271,7 +271,7 @@
             using (new WaveHeightCalculationServiceConfig())
             {
                 var testService = (TestWaveHeightCalculationService) WaveHeightCalculationService.Instance;
-                testService.SetCalculationConvergenceOutput = CalculationConvergence.NotCalculated;
+                testService.CalculationConvergenceOutput = CalculationConvergence.NotCalculated;
 
                 activity.Run();
             }
@@ -306,13 +306,16 @@
 
             string validFilePath = Path.Combine(testDataPath, validFile);
             const int norm = 300;
-            var activity = new WaveHeightCalculationActivity(calculationMessageProviderMock, hydraulicBoundaryLocationMock,
-                                                             validFilePath, "", norm);
+            var activity = new WaveHeightCalculationActivity(calculationMessageProviderMock,
+                                                             hydraulicBoundaryLocationMock,
+                                                             validFilePath,
+                                                             "",
+                                                             norm);
 
             using (new WaveHeightCalculationServiceConfig())
             {
                 var testService = (TestWaveHeightCalculationService) WaveHeightCalculationService.Instance;
-                testService.SetCalculationConvergenceOutput = CalculationConvergence.CalculatedNotConverged;
+                testService.CalculationConvergenceOutput = CalculationConvergence.CalculatedNotConverged;
                 activity.Run();
             }
 
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs
===================================================================
diff -u -r1e533850c7711172462df1e8f569b9f3ff950045 -ra97c4ffe5254af061462539883d25722be13e539
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs	(.../WaveHeightCalculationServiceTest.cs)	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs	(.../WaveHeightCalculationServiceTest.cs)	(revision a97c4ffe5254af061462539883d25722be13e539)
@@ -116,11 +116,11 @@
             {
                 var testService = (TestHydraRingCalculationService) HydraRingCalculationService.Instance;
 
-                WaveHeightCalculationService.Instance.Calculate(
-                    calculationMessageProviderMock,
-                    hydraulicBoundaryLocationMock,
-                    validFilePath, ringId,
-                    norm);
+                WaveHeightCalculationService.Instance.Calculate(hydraulicBoundaryLocationMock,
+                                                                validFilePath,
+                                                                ringId,
+                                                                norm,
+                                                                calculationMessageProviderMock);
 
                 // Assert
                 Assert.AreEqual(testDataPath, testService.HlcdDirectory);
@@ -161,10 +161,11 @@
             using (new HydraRingCalculationServiceConfig())
             {
                 // Call
-                Action call = () => output = WaveHeightCalculationService.Instance.Calculate(
-                    calculationMessageProviderMock,
-                    hydraulicBoundaryLocationMock,
-                    validFilePath, ringId, norm);
+                Action call = () => output = WaveHeightCalculationService.Instance.Calculate(hydraulicBoundaryLocationMock,
+                                                                                             validFilePath,
+                                                                                             ringId,
+                                                                                             norm,
+                                                                                             calculationMessageProviderMock);
 
                 // Assert
                 TestHelper.AssertLogMessages(call, messages =>
Index: Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/TestWaveHeightCalculationServiceTest.cs
===================================================================
diff -u -r1e533850c7711172462df1e8f569b9f3ff950045 -ra97c4ffe5254af061462539883d25722be13e539
--- Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/TestWaveHeightCalculationServiceTest.cs	(.../TestWaveHeightCalculationServiceTest.cs)	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/TestWaveHeightCalculationServiceTest.cs	(.../TestWaveHeightCalculationServiceTest.cs)	(revision a97c4ffe5254af061462539883d25722be13e539)
@@ -57,10 +57,11 @@
             const double norm = 12.34;
 
             // Call
-            ReliabilityIndexCalculationOutput output = service.Calculate(calculationMessageProviderMock,
-                                                                         hydraulicBoundaryLocationMock,
+            ReliabilityIndexCalculationOutput output = service.Calculate(hydraulicBoundaryLocationMock,
                                                                          string.Empty,
-                                                                         string.Empty, norm);
+                                                                         string.Empty,
+                                                                         norm,
+                                                                         calculationMessageProviderMock);
 
             // Assert
             var expectedOutput = new ReliabilityIndexCalculationOutput(norm, StatisticsConverter.NormToBeta(norm));
@@ -79,15 +80,16 @@
             mockRepository.ReplayAll();
             var service = new TestWaveHeightCalculationService
             {
-                SetCalculationConvergenceOutput = CalculationConvergence.CalculatedConverged
+                CalculationConvergenceOutput = CalculationConvergence.CalculatedConverged
             };
             const double norm = 12.34;
 
             // Call
-            ReliabilityIndexCalculationOutput output = service.Calculate(calculationMessageProviderMock,
-                                                                         hydraulicBoundaryLocationMock,
+            ReliabilityIndexCalculationOutput output = service.Calculate(hydraulicBoundaryLocationMock,
                                                                          string.Empty,
-                                                                         string.Empty, norm);
+                                                                         string.Empty,
+                                                                         norm,
+                                                                         calculationMessageProviderMock);
 
             // Assert
             Assert.AreSame(calculationMessageProviderMock, service.MessageProvider);
@@ -107,15 +109,16 @@
             mockRepository.ReplayAll();
             var service = new TestWaveHeightCalculationService
             {
-                SetCalculationConvergenceOutput = CalculationConvergence.NotCalculated
+                CalculationConvergenceOutput = CalculationConvergence.NotCalculated
             };
             const double norm = 12.34;
 
             // Call
-            ReliabilityIndexCalculationOutput output = service.Calculate(calculationMessageProviderMock,
-                                                                         hydraulicBoundaryLocationMock,
+            ReliabilityIndexCalculationOutput output = service.Calculate(hydraulicBoundaryLocationMock,
                                                                          string.Empty,
-                                                                         string.Empty, norm);
+                                                                         string.Empty,
+                                                                         norm,
+                                                                         calculationMessageProviderMock);
 
             // Assert
             Assert.AreSame(calculationMessageProviderMock, service.MessageProvider);
@@ -134,15 +137,16 @@
             mockRepository.ReplayAll();
             var service = new TestWaveHeightCalculationService
             {
-                SetCalculationConvergenceOutput = CalculationConvergence.CalculatedNotConverged
+                CalculationConvergenceOutput = CalculationConvergence.CalculatedNotConverged
             };
             const double norm = 12.34;
 
             // Call
-            ReliabilityIndexCalculationOutput output = service.Calculate(calculationMessageProviderMock,
-                                                                         hydraulicBoundaryLocationMock,
+            ReliabilityIndexCalculationOutput output = service.Calculate(hydraulicBoundaryLocationMock,
                                                                          string.Empty,
-                                                                         string.Empty, norm);
+                                                                         string.Empty,
+                                                                         norm,
+                                                                         calculationMessageProviderMock);
 
             // Assert
             Assert.AreSame(calculationMessageProviderMock, service.MessageProvider);
Index: Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/WaveHeightCalculationServiceConfigTest.cs
===================================================================
diff -u -r1e533850c7711172462df1e8f569b9f3ff950045 -ra97c4ffe5254af061462539883d25722be13e539
--- Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/WaveHeightCalculationServiceConfigTest.cs	(.../WaveHeightCalculationServiceConfigTest.cs)	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/WaveHeightCalculationServiceConfigTest.cs	(.../WaveHeightCalculationServiceConfigTest.cs)	(revision a97c4ffe5254af061462539883d25722be13e539)
@@ -57,10 +57,11 @@
             const double norm = 12.34;
 
             // Call
-            ReliabilityIndexCalculationOutput output = service.Calculate(calculationMessageProviderMock,
-                                                                         hydraulicBoundaryLocationMock,
+            ReliabilityIndexCalculationOutput output = service.Calculate(hydraulicBoundaryLocationMock,
                                                                          string.Empty,
-                                                                         string.Empty, norm);
+                                                                         string.Empty,
+                                                                         norm,
+                                                                         calculationMessageProviderMock);
 
             // Assert
             var expectedOutput = new ReliabilityIndexCalculationOutput(norm, StatisticsConverter.NormToBeta(norm));
@@ -79,15 +80,16 @@
             mockRepository.ReplayAll();
             var service = new TestWaveHeightCalculationService
             {
-                SetCalculationConvergenceOutput = CalculationConvergence.CalculatedConverged
+                CalculationConvergenceOutput = CalculationConvergence.CalculatedConverged
             };
             const double norm = 12.34;
 
             // Call
-            ReliabilityIndexCalculationOutput output = service.Calculate(calculationMessageProviderMock,
-                                                                         hydraulicBoundaryLocationMock,
+            ReliabilityIndexCalculationOutput output = service.Calculate(hydraulicBoundaryLocationMock,
                                                                          string.Empty,
-                                                                         string.Empty, norm);
+                                                                         string.Empty,
+                                                                         norm,
+                                                                         calculationMessageProviderMock);
 
             // Assert
             Assert.AreSame(calculationMessageProviderMock, service.MessageProvider);
@@ -107,15 +109,16 @@
             mockRepository.ReplayAll();
             var service = new TestWaveHeightCalculationService
             {
-                SetCalculationConvergenceOutput = CalculationConvergence.NotCalculated
+                CalculationConvergenceOutput = CalculationConvergence.NotCalculated
             };
             const double norm = 12.34;
 
             // Call
-            ReliabilityIndexCalculationOutput output = service.Calculate(calculationMessageProviderMock,
-                                                                         hydraulicBoundaryLocationMock,
+            ReliabilityIndexCalculationOutput output = service.Calculate(hydraulicBoundaryLocationMock,
                                                                          string.Empty,
-                                                                         string.Empty, norm);
+                                                                         string.Empty,
+                                                                         norm,
+                                                                         calculationMessageProviderMock);
 
             // Assert
             Assert.AreSame(calculationMessageProviderMock, service.MessageProvider);
@@ -134,15 +137,16 @@
             mockRepository.ReplayAll();
             var service = new TestWaveHeightCalculationService
             {
-                SetCalculationConvergenceOutput = CalculationConvergence.CalculatedNotConverged
+                CalculationConvergenceOutput = CalculationConvergence.CalculatedNotConverged
             };
             const double norm = 12.34;
 
             // Call
-            ReliabilityIndexCalculationOutput output = service.Calculate(calculationMessageProviderMock,
-                                                                         hydraulicBoundaryLocationMock,
+            ReliabilityIndexCalculationOutput output = service.Calculate(hydraulicBoundaryLocationMock,
                                                                          string.Empty,
-                                                                         string.Empty, norm);
+                                                                         string.Empty,
+                                                                         norm,
+                                                                         calculationMessageProviderMock);
 
             // Assert
             Assert.AreSame(calculationMessageProviderMock, service.MessageProvider);
Index: Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil/TestWaveHeightCalculationService.cs
===================================================================
diff -u -r1e533850c7711172462df1e8f569b9f3ff950045 -ra97c4ffe5254af061462539883d25722be13e539
--- Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil/TestWaveHeightCalculationService.cs	(.../TestWaveHeightCalculationService.cs)	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil/TestWaveHeightCalculationService.cs	(.../TestWaveHeightCalculationService.cs)	(revision a97c4ffe5254af061462539883d25722be13e539)
@@ -35,9 +35,9 @@
         private CalculationConvergence returnValidOutput = CalculationConvergence.CalculatedConverged;
 
         /// <summary>
-        /// Set the expected output for <see cref="Calculate"/>.
+        /// Sets the expected output for <see cref="Calculate"/>.
         /// </summary>
-        public CalculationConvergence SetCalculationConvergenceOutput
+        public CalculationConvergence CalculationConvergenceOutput
         {
             set
             {
@@ -55,9 +55,11 @@
             return true;
         }
 
-        public ReliabilityIndexCalculationOutput Calculate(ICalculationMessageProvider messageProvider,
-                                                           IHydraulicBoundaryLocation hydraulicBoundaryLocation, string hydraulicBoundaryDatabaseFilePath,
-                                                           string ringId, double norm)
+        public ReliabilityIndexCalculationOutput Calculate(IHydraulicBoundaryLocation hydraulicBoundaryLocation,
+                                                           string hydraulicBoundaryDatabaseFilePath,
+                                                           string ringId,
+                                                           double norm,
+                                                           ICalculationMessageProvider messageProvider)
         {
             MessageProvider = messageProvider;
             switch (returnValidOutput)
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r1e533850c7711172462df1e8f569b9f3ff950045 -ra97c4ffe5254af061462539883d25722be13e539
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision a97c4ffe5254af061462539883d25722be13e539)
@@ -229,6 +229,7 @@
                     }
                 }
             }
+            mockRepository.VerifyAll();
         }
 
         [Test]
@@ -291,6 +292,7 @@
                     }
                 }
             }
+            mockRepository.VerifyAll();
         }
 
         [Test]
@@ -324,6 +326,7 @@
                 // Assert
                 Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), color);
             }
+            mockRepository.VerifyAll();
         }
 
         [Test]
@@ -345,6 +348,7 @@
                 // Assert
                 Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), color);
             }
+            mockRepository.VerifyAll();
         }
 
         [Test]
@@ -396,7 +400,7 @@
                         using (new WaveHeightCalculationServiceConfig())
                         {
                             var testService = (TestWaveHeightCalculationService) WaveHeightCalculationService.Instance;
-                            testService.SetCalculationConvergenceOutput = CalculationConvergence.NotCalculated;
+                            testService.CalculationConvergenceOutput = CalculationConvergence.NotCalculated;
 
                             // When
                             contextMenuAdapter.Items[contextMenuRunWaveHeightCalculationsIndex].PerformClick();