Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs
===================================================================
diff -u -r32f5a8663400beb92dc30ab135890d999040cbe9 -r888d7ef462f65ecdfb3714051bb370907bca6619
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs	(.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs)	(revision 32f5a8663400beb92dc30ab135890d999040cbe9)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs	(.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs)	(revision 888d7ef462f65ecdfb3714051bb370907bca6619)
@@ -421,9 +421,10 @@
             calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
                              .WhenCalled(invocation =>
                              {
-                                 var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
-                                 Assert.AreEqual(validFilePath, settings.HlcdFilePath);
-                                 Assert.IsEmpty(settings.PreprocessorDirectory);
+                                 var hydraRingCalculationSettings = (HydraRingCalculationSettings)invocation.Arguments[0];
+                                 HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
+                                     HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase),
+                                     hydraRingCalculationSettings);
                              })
                              .Return(new TestWaveHeightCalculator());
             mockRepository.ReplayAll();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs
===================================================================
diff -u -rf883c0a77e1db83a61e3d2860660bbbb6f9fbf01 -r888d7ef462f65ecdfb3714051bb370907bca6619
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision f883c0a77e1db83a61e3d2860660bbbb6f9fbf01)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision 888d7ef462f65ecdfb3714051bb370907bca6619)
@@ -853,9 +853,9 @@
                 calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
                                  .WhenCalled(invocation =>
                                  {
-                                     var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
-                                     Assert.AreEqual(validFilePath, settings.HlcdFilePath);
-                                     Assert.IsEmpty(settings.PreprocessorDirectory);
+                                     var hydraRingCalculationSettings = (HydraRingCalculationSettings) invocation.Arguments[0];
+                                     HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(expectedSettings,
+                                                                                                               hydraRingCalculationSettings);
                                  }).Return(waveHeightCalculator)
                                  .Repeat
                                  .Times(4);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r58bb28c3d0e0ccfc1a3cfcd29bd4f5e5ead4d0a9 -r888d7ef462f65ecdfb3714051bb370907bca6619
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsContextTreeNodeInfoTest.cs	(.../WaveHeightCalculationsContextTreeNodeInfoTest.cs)	(revision 58bb28c3d0e0ccfc1a3cfcd29bd4f5e5ead4d0a9)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsContextTreeNodeInfoTest.cs	(.../WaveHeightCalculationsContextTreeNodeInfoTest.cs)	(revision 888d7ef462f65ecdfb3714051bb370907bca6619)
@@ -400,9 +400,10 @@
                 calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
                                  .WhenCalled(invocation =>
                                  {
-                                     var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
-                                     Assert.AreEqual(validFilePath, settings.HlcdFilePath);
-                                     Assert.IsEmpty(settings.PreprocessorDirectory);
+                                     var hydraRingCalculationSettings = (HydraRingCalculationSettings) invocation.Arguments[0];
+                                     HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
+                                         HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase),
+                                         hydraRingCalculationSettings);
                                  })
                                  .Return(waveHeightCalculator);
                 mockRepository.ReplayAll();
@@ -481,9 +482,10 @@
                 calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
                                  .WhenCalled(invocation =>
                                  {
-                                     var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
-                                     Assert.AreEqual(validFilePath, settings.HlcdFilePath);
-                                     Assert.AreEqual(preprocessorDirectory, settings.PreprocessorDirectory);
+                                     var hydraRingCalculationSettings = (HydraRingCalculationSettings) invocation.Arguments[0];
+                                     HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
+                                         HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase),
+                                         hydraRingCalculationSettings);
                                  })
                                  .Return(waveHeightCalculator);
                 mockRepository.ReplayAll();
@@ -561,9 +563,10 @@
                 calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
                                  .WhenCalled(invocation =>
                                  {
-                                     var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
-                                     Assert.AreEqual(validFilePath, settings.HlcdFilePath);
-                                     Assert.IsEmpty(settings.PreprocessorDirectory);
+                                     var hydraRingCalculationSettings = (HydraRingCalculationSettings) invocation.Arguments[0];
+                                     HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
+                                         HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase),
+                                         hydraRingCalculationSettings);
                                  })
                                  .Return(waveHeightCalculator);
                 mockRepository.ReplayAll();
@@ -640,13 +643,8 @@
                     Converged = false
                 };
                 var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();
-                calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
-                                 .WhenCalled(invocation =>
-                                 {
-                                     var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
-                                     Assert.AreEqual(validFilePath, settings.HlcdFilePath);
-                                     Assert.IsEmpty(settings.PreprocessorDirectory);
-                                 })
+                calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(null))
+                                 .IgnoreArguments()
                                  .Return(calculator);
                 mockRepository.ReplayAll();
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r58bb28c3d0e0ccfc1a3cfcd29bd4f5e5ead4d0a9 -r888d7ef462f65ecdfb3714051bb370907bca6619
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs	(.../WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs)	(revision 58bb28c3d0e0ccfc1a3cfcd29bd4f5e5ead4d0a9)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs	(.../WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs)	(revision 888d7ef462f65ecdfb3714051bb370907bca6619)
@@ -42,6 +42,7 @@
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Common.Plugin.TestUtil;
+using Ringtoets.Common.Service.TestUtil;
 using Ringtoets.HydraRing.Calculation.Calculator;
 using Ringtoets.HydraRing.Calculation.Calculator.Factory;
 using Ringtoets.HydraRing.Calculation.Data.Input;
@@ -330,9 +331,10 @@
                 calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
                                  .WhenCalled(invocation =>
                                  {
-                                     var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
-                                     Assert.AreEqual(filePath, settings.HlcdFilePath);
-                                     Assert.IsEmpty(settings.PreprocessorDirectory);
+                                     var hydraRingCalculationSettings = (HydraRingCalculationSettings) invocation.Arguments[0];
+                                     HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
+                                         HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase),
+                                         hydraRingCalculationSettings);
                                  })
                                  .Return(waveHeightCalculator).Repeat.Times(4);
                 mockRepository.ReplayAll();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactoryTest.cs
===================================================================
diff -u -r32f5a8663400beb92dc30ab135890d999040cbe9 -r888d7ef462f65ecdfb3714051bb370907bca6619
--- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactoryTest.cs	(.../AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactoryTest.cs)	(revision 32f5a8663400beb92dc30ab135890d999040cbe9)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactoryTest.cs	(.../AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactoryTest.cs)	(revision 888d7ef462f65ecdfb3714051bb370907bca6619)
@@ -90,7 +90,7 @@
             double lowerLimitNorm = assessmentSection.FailureMechanismContribution.LowerLimitNorm;
             double factorizedLowerLimitNorm = lowerLimitNorm * 30;
 
-            var hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase;
+            HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase;
             AssertDesignWaterLevelCalculationActivity(activities.ElementAt(0),
                                                       hydraulicBoundaryLocation1,
                                                       factorizedSignalingNorm,
@@ -139,45 +139,45 @@
                                                 hydraulicBoundaryLocation1,
                                                 factorizedSignalingNorm,
                                                 expectedCategoryBoundaryName1,
-                                                usePreprocessor);
+                                                hydraulicBoundaryDatabase);
             AssertWaveHeightCalculationActivity(activities.ElementAt(9),
                                                 hydraulicBoundaryLocation2,
                                                 factorizedSignalingNorm,
                                                 expectedCategoryBoundaryName1,
-                                                usePreprocessor);
+                                                hydraulicBoundaryDatabase);
 
             AssertWaveHeightCalculationActivity(activities.ElementAt(10),
                                                 hydraulicBoundaryLocation1,
                                                 signalingNorm,
                                                 expectedCategoryBoundaryName2,
-                                                usePreprocessor);
+                                                hydraulicBoundaryDatabase);
             AssertWaveHeightCalculationActivity(activities.ElementAt(11),
                                                 hydraulicBoundaryLocation2,
                                                 signalingNorm,
                                                 expectedCategoryBoundaryName2,
-                                                usePreprocessor);
+                                                hydraulicBoundaryDatabase);
 
             AssertWaveHeightCalculationActivity(activities.ElementAt(12),
                                                 hydraulicBoundaryLocation1,
                                                 lowerLimitNorm,
                                                 expectedCategoryBoundaryName3,
-                                                usePreprocessor);
+                                                hydraulicBoundaryDatabase);
             AssertWaveHeightCalculationActivity(activities.ElementAt(13),
                                                 hydraulicBoundaryLocation2,
                                                 lowerLimitNorm,
                                                 expectedCategoryBoundaryName3,
-                                                usePreprocessor);
+                                                hydraulicBoundaryDatabase);
 
             AssertWaveHeightCalculationActivity(activities.ElementAt(14),
                                                 hydraulicBoundaryLocation1,
                                                 factorizedLowerLimitNorm,
                                                 expectedCategoryBoundaryName4,
-                                                usePreprocessor);
+                                                hydraulicBoundaryDatabase);
             AssertWaveHeightCalculationActivity(activities.ElementAt(15),
                                                 hydraulicBoundaryLocation2,
                                                 factorizedLowerLimitNorm,
                                                 expectedCategoryBoundaryName4,
-                                                usePreprocessor);
+                                                hydraulicBoundaryDatabase);
         }
 
         [Test]
@@ -219,7 +219,7 @@
             double lowerLimitNorm = assessmentSection.FailureMechanismContribution.LowerLimitNorm;
             double factorizedLowerLimitNorm = lowerLimitNorm * 30;
 
-            var hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase;
+            HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase;
             AssertDesignWaterLevelCalculationActivity(activities.ElementAt(0),
                                                       hydraulicBoundaryLocation1,
                                                       factorizedSignalingNorm,
@@ -304,49 +304,50 @@
             double lowerLimitNorm = assessmentSection.FailureMechanismContribution.LowerLimitNorm;
             double factorizedLowerLimitNorm = lowerLimitNorm * 30;
 
+            var hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase;
             AssertWaveHeightCalculationActivity(activities.ElementAt(0),
                                                 hydraulicBoundaryLocation1,
                                                 factorizedSignalingNorm,
                                                 expectedCategoryBoundaryName1,
-                                                usePreprocessor);
+                                                hydraulicBoundaryDatabase);
             AssertWaveHeightCalculationActivity(activities.ElementAt(1),
                                                 hydraulicBoundaryLocation2,
                                                 factorizedSignalingNorm,
                                                 expectedCategoryBoundaryName1,
-                                                usePreprocessor);
+                                                hydraulicBoundaryDatabase);
 
             AssertWaveHeightCalculationActivity(activities.ElementAt(2),
                                                 hydraulicBoundaryLocation1,
                                                 signalingNorm,
                                                 expectedCategoryBoundaryName2,
-                                                usePreprocessor);
+                                                hydraulicBoundaryDatabase);
             AssertWaveHeightCalculationActivity(activities.ElementAt(3),
                                                 hydraulicBoundaryLocation2,
                                                 signalingNorm,
                                                 expectedCategoryBoundaryName2,
-                                                usePreprocessor);
+                                                hydraulicBoundaryDatabase);
 
             AssertWaveHeightCalculationActivity(activities.ElementAt(4),
                                                 hydraulicBoundaryLocation1,
                                                 lowerLimitNorm,
                                                 expectedCategoryBoundaryName3,
-                                                usePreprocessor);
+                                                hydraulicBoundaryDatabase);
             AssertWaveHeightCalculationActivity(activities.ElementAt(5),
                                                 hydraulicBoundaryLocation2,
                                                 lowerLimitNorm,
                                                 expectedCategoryBoundaryName3,
-                                                usePreprocessor);
+                                                hydraulicBoundaryDatabase);
 
             AssertWaveHeightCalculationActivity(activities.ElementAt(6),
                                                 hydraulicBoundaryLocation1,
                                                 factorizedLowerLimitNorm,
                                                 expectedCategoryBoundaryName4,
-                                                usePreprocessor);
+                                                hydraulicBoundaryDatabase);
             AssertWaveHeightCalculationActivity(activities.ElementAt(7),
                                                 hydraulicBoundaryLocation2,
                                                 factorizedLowerLimitNorm,
                                                 expectedCategoryBoundaryName4,
-                                                usePreprocessor);
+                                                hydraulicBoundaryDatabase);
         }
 
         private static AssessmentSectionStub CreateAssessmentSection(bool usePreprocessor)
@@ -373,10 +374,9 @@
             calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
                              .WhenCalled(invocation =>
                              {
-                                 var hydraRingCalculationSettings = (HydraRingCalculationSettings) invocation.Arguments[0];
                                  HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
                                      HydraulicBoundaryCalculationSettingsFactory.CreateSettings(hydraulicBoundaryDatabase),
-                                     hydraRingCalculationSettings);
+                                     (HydraRingCalculationSettings) invocation.Arguments[0]);
                              })
                              .Return(designWaterLevelCalculator);
             mocks.ReplayAll();
@@ -400,18 +400,17 @@
                                                                 HydraulicBoundaryLocation hydraulicBoundaryLocation,
                                                                 double norm,
                                                                 string categoryBoundaryName,
-                                                                bool usePreprocessor)
+                                                                HydraulicBoundaryDatabase hydraulicBoundaryDatabase)
         {
             var mocks = new MockRepository();
             var waveHeightCalculator = new TestWaveHeightCalculator();
             var calculatorFactory = mocks.Stub<IHydraRingCalculatorFactory>();
-            string preprocessorDirectory = usePreprocessor ? validPreprocessorDirectory : string.Empty;
             calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
                              .WhenCalled(invocation =>
                              {
-                                 var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
-                                 Assert.AreEqual(validFilePath, settings.HlcdFilePath);
-                                 Assert.AreEqual(preprocessorDirectory, settings.PreprocessorDirectory);
+                                 HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
+                                     HydraulicBoundaryCalculationSettingsFactory.CreateSettings(hydraulicBoundaryDatabase),
+                                     (HydraRingCalculationSettings) invocation.Arguments[0]);
                              }).Return(waveHeightCalculator);
             mocks.ReplayAll();