Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs
===================================================================
diff -u -r32f5a8663400beb92dc30ab135890d999040cbe9 -r5d85231b68fed820235a1ac76e937d8527acf5ca
--- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs	(.../AssessmentSectionCalculationActivityFactoryTest.cs)	(revision 32f5a8663400beb92dc30ab135890d999040cbe9)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs	(.../AssessmentSectionCalculationActivityFactoryTest.cs)	(revision 5d85231b68fed820235a1ac76e937d8527acf5ca)
@@ -109,9 +109,8 @@
                 calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
                                  .WhenCalled(invocation =>
                                  {
-                                     var hydraRingCalculationSettings = (HydraRingCalculationSettings) invocation.Arguments[0];
-                                     HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(expectedCalculationSettings,
-                                                                                                               hydraRingCalculationSettings);
+                                     HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
+                                         expectedCalculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]);
                                  })
                                  .Return(new TestDesignWaterLevelCalculator
                                  {
@@ -147,17 +146,15 @@
                 calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
                                  .WhenCalled(invocation =>
                                  {
-                                     var hydraRingCalculationSettings = (HydraRingCalculationSettings)invocation.Arguments[0];
-                                     HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(expectedCalculationSettings,
-                                                                                                               hydraRingCalculationSettings);
+                                     HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
+                                         expectedCalculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]);
                                  })
                                  .Return(new TestDesignWaterLevelCalculator()).Repeat.Times(3);
                 calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
                                  .WhenCalled(invocation =>
                                  {
-                                     var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
-                                     Assert.AreEqual(hydraulicBoundaryDatabaseFilePath, settings.HlcdFilePath);
-                                     Assert.IsEmpty(settings.PreprocessorDirectory);
+                                     HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
+                                         expectedCalculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]);
                                  })
                                  .Return(new TestWaveHeightCalculator()).Repeat.Times(3);
 
@@ -203,9 +200,8 @@
                 calculatorFactory.Expect(cf => cf.CreateDunesBoundaryConditionsCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
                                  .WhenCalled(invocation =>
                                  {
-                                     var hydraRingCalculationSettings = (HydraRingCalculationSettings)invocation.Arguments[0];
-                                     HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(expectedCalculationSettings,
-                                                                                                               hydraRingCalculationSettings);
+                                     HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
+                                         expectedCalculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]);
                                  })
                                  .Return(new TestDunesBoundaryConditionsCalculator()).Repeat.Times(5);
             }