Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs
===================================================================
diff -u -r4a876bc30ca9373e8e2fa4f1f7d3e0553d4115a2 -r1bc819a56d1680c99010ec65c0e2967edcf23628
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs)	(revision 4a876bc30ca9373e8e2fa4f1f7d3e0553d4115a2)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs)	(revision 1bc819a56d1680c99010ec65c0e2967edcf23628)
@@ -84,8 +84,7 @@
             calculationService.OnProgressChanged += UpdateProgressText;
 
             GrassCoverErosionOutwardsDataSynchronizationService.ClearWaveConditionsCalculationOutput(calculation);
-            calculationService.Calculate(
-                calculation, failureMechanism, assessmentSection);
+            calculationService.Calculate(calculation, failureMechanism, assessmentSection);
         }
 
         protected override void OnCancel()
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -ree02643cbf3a28b95aaa1131ba54bb2a0c21e073 -r1bc819a56d1680c99010ec65c0e2967edcf23628
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs)	(revision ee02643cbf3a28b95aaa1131ba54bb2a0c21e073)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs)	(revision 1bc819a56d1680c99010ec65c0e2967edcf23628)
@@ -285,13 +285,8 @@
 
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
-            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
-                             .WhenCalled(invocation =>
-                             {
-                                 HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
-                                     HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase),
-                                     (HydraRingCalculationSettings) invocation.Arguments[0]);
-                             })
+            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(null))
+                             .IgnoreArguments()
                              .Return(waveConditionsCosineCalculator)
                              .Repeat
                              .Times(nrOfCalculators);
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r6787ede2e334d4c01c9aab34ecf951a10a07c7c4 -r1bc819a56d1680c99010ec65c0e2967edcf23628
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 6787ede2e334d4c01c9aab34ecf951a10a07c7c4)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 1bc819a56d1680c99010ec65c0e2967edcf23628)
@@ -1264,14 +1264,6 @@
                 gui.Stub(g => g.MainWindow).Return(mainWindow);
 
                 var calculatorFactory = mocks.Stub<IHydraRingCalculatorFactory>();
-                calculatorFactory.Stub(cf => cf.CreateWaveConditionsCosineCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
-                                 .WhenCalled(invocation =>
-                                 {
-                                     HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
-                                         HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase),
-                                         (HydraRingCalculationSettings) invocation.Arguments[0]);
-                                 })
-                                 .Return(new TestWaveConditionsCosineCalculator());
                 mocks.ReplayAll();
 
                 using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs
===================================================================
diff -u -r4a876bc30ca9373e8e2fa4f1f7d3e0553d4115a2 -r1bc819a56d1680c99010ec65c0e2967edcf23628
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs)	(revision 4a876bc30ca9373e8e2fa4f1f7d3e0553d4115a2)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs)	(revision 1bc819a56d1680c99010ec65c0e2967edcf23628)
@@ -84,7 +84,7 @@
         }
 
         [Test]
-        public void Calculate_FailureMechniamsNull_ThrowArgumentNullException()
+        public void Calculate_FailureMechanismNull_ThrowArgumentNullException()
         {
             // Setup
             var mockRepository = new MockRepository();
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs
===================================================================
diff -u -r5f79a720fc22eee311073ce2af9ab7613b2d357b -r1bc819a56d1680c99010ec65c0e2967edcf23628
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs	(.../WaveConditionsCalculationServiceBaseTest.cs)	(revision 5f79a720fc22eee311073ce2af9ab7613b2d357b)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs	(.../WaveConditionsCalculationServiceBaseTest.cs)	(revision 1bc819a56d1680c99010ec65c0e2967edcf23628)
@@ -678,21 +678,14 @@
             var calculator = new TestWaveConditionsCosineCalculator();
             int nrOfCalculators = input.GetWaterLevels(waterLevel).Count();
 
-            string expectedHlcdFilePath = Path.Combine(testDataPath, "HLCD.sqlite");
-            string expectedPreprocessorDirectory = hydraulicBoundaryDatabase.UsePreprocessor
-                                                       ? validPreprocessorDirectory
-                                                       : string.Empty;
-            var expectedCalculationSettings = new HydraulicBoundaryCalculationSettings(hydraulicBoundaryDatabase.FilePath,
-                                                                                       expectedHlcdFilePath,
-                                                                                       expectedPreprocessorDirectory);
-
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
                              .WhenCalled(invocation =>
                              {
                                  HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
-                                     expectedCalculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]);
+                                     HydraulicBoundaryCalculationSettingsFactory.CreateSettings(hydraulicBoundaryDatabase),
+                                     (HydraRingCalculationSettings) invocation.Arguments[0]);
                              })
                              .Return(calculator)
                              .Repeat
@@ -1007,6 +1000,7 @@
 
         private static IEnumerable<TestCaseData> GetHydraulicBoundaryDatabaseConfigurations()
         {
+            string expectedHlcdDirectory = Path.Combine(testDataPath, "HLCD.sqlite");
             yield return new TestCaseData(new HydraulicBoundaryDatabase
             {
                 CanUsePreprocessor = true,
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationActivity.cs
===================================================================
diff -u -r1b2f308e90780fcde51b1ffb06233fc7d211fa9e -r1bc819a56d1680c99010ec65c0e2967edcf23628
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationActivity.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivity.cs)	(revision 1b2f308e90780fcde51b1ffb06233fc7d211fa9e)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationActivity.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivity.cs)	(revision 1bc819a56d1680c99010ec65c0e2967edcf23628)
@@ -83,8 +83,7 @@
             calculationService.OnProgressChanged += UpdateProgressText;
 
             StabilityStoneCoverDataSynchronizationService.ClearWaveConditionsCalculationOutput(calculation);
-            calculationService.Calculate(
-                calculation, assessmentSection, failureMechanism.GeneralInput);
+            calculationService.Calculate(calculation, assessmentSection, failureMechanism.GeneralInput);
         }
 
         protected override void OnFinish()
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r90c396499c28da9984873b9eadce8ed2fbfc6eb2 -r1bc819a56d1680c99010ec65c0e2967edcf23628
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs)	(revision 90c396499c28da9984873b9eadce8ed2fbfc6eb2)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs)	(revision 1bc819a56d1680c99010ec65c0e2967edcf23628)
@@ -249,13 +249,8 @@
             RoundedDouble[] waterLevels = GetWaterLevels(calculation, assessmentSection).ToArray();
             int nrOfCalculators = waterLevels.Length * 2;
 
-            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
-                             .WhenCalled(invocation =>
-                             {
-                                 HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
-                                     HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase),
-                                     (HydraRingCalculationSettings) invocation.Arguments[0]);
-                             })
+            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(null))
+                             .IgnoreArguments()
                              .Return(calculator)
                              .Repeat
                              .Times(nrOfCalculators);
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs
===================================================================
diff -u -r1b2f308e90780fcde51b1ffb06233fc7d211fa9e -r1bc819a56d1680c99010ec65c0e2967edcf23628
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs)	(revision 1b2f308e90780fcde51b1ffb06233fc7d211fa9e)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs)	(revision 1bc819a56d1680c99010ec65c0e2967edcf23628)
@@ -331,13 +331,8 @@
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             RoundedDouble[] waterLevels = GetWaterLevels(calculation, assessmentSection).ToArray();
             int nrOfCalculators = waterLevels.Length * 2;
-            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
-                             .WhenCalled(invocation =>
-                             {
-                                 HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
-                                     HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase),
-                                     (HydraRingCalculationSettings) invocation.Arguments[0]);
-                             })
+            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(null))
+                             .IgnoreArguments()
                              .Return(calculator)
                              .Repeat
                              .Times(nrOfCalculators);
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs
===================================================================
diff -u -reac7f671d426fac073e5d154d020f56f45fa3669 -r1bc819a56d1680c99010ec65c0e2967edcf23628
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs)	(revision eac7f671d426fac073e5d154d020f56f45fa3669)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs)	(revision 1bc819a56d1680c99010ec65c0e2967edcf23628)
@@ -83,8 +83,7 @@
             calculationService.OnProgressChanged += UpdateProgressText;
 
             WaveImpactAsphaltCoverDataSynchronizationService.ClearWaveConditionsCalculationOutput(calculation);
-            calculationService.Calculate(
-                calculation, assessmentSection, failureMechanism.GeneralInput);
+            calculationService.Calculate(calculation, assessmentSection, failureMechanism.GeneralInput);
         }
 
         protected override void OnCancel()
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs
===================================================================
diff -u -reac7f671d426fac073e5d154d020f56f45fa3669 -r1bc819a56d1680c99010ec65c0e2967edcf23628
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs)	(revision eac7f671d426fac073e5d154d020f56f45fa3669)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs)	(revision 1bc819a56d1680c99010ec65c0e2967edcf23628)
@@ -269,13 +269,8 @@
 
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
-            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
-                             .WhenCalled(invocation =>
-                             {
-                                 HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
-                                     HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase),
-                                     (HydraRingCalculationSettings) invocation.Arguments[0]);
-                             })
+            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(null))
+                             .IgnoreArguments()
                              .Return(calculator)
                              .Repeat
                              .Times(3);