Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/GuiServices/DuneLocationCalculationGuiServiceTest.cs
===================================================================
diff -u -r90da65d29cffe6603e285dd47eb922125f11b692 -rac1eb38be88180c3e64b68888111f8efc4abd537
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/GuiServices/DuneLocationCalculationGuiServiceTest.cs	(.../DuneLocationCalculationGuiServiceTest.cs)	(revision 90da65d29cffe6603e285dd47eb922125f11b692)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/GuiServices/DuneLocationCalculationGuiServiceTest.cs	(.../DuneLocationCalculationGuiServiceTest.cs)	(revision ac1eb38be88180c3e64b68888111f8efc4abd537)
@@ -216,9 +216,12 @@
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 FilePath = validFilePath,
-                CanUsePreprocessor = true,
-                UsePreprocessor = true,
-                PreprocessorDirectory = validPreprocessorDirectory
+                HydraulicLocationConfigurationSettings =
+                {
+                    CanUsePreprocessor = true,
+                    UsePreprocessor = true,
+                    PreprocessorDirectory = validPreprocessorDirectory
+                }
             };
             HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase);
 
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewTest.cs
===================================================================
diff -u -r1ee2605815d118a7eaf5d96df7f9a3fd55c00550 -rac1eb38be88180c3e64b68888111f8efc4abd537
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewTest.cs	(.../DuneLocationCalculationsViewTest.cs)	(revision 1ee2605815d118a7eaf5d96df7f9a3fd55c00550)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewTest.cs	(.../DuneLocationCalculationsViewTest.cs)	(revision ac1eb38be88180c3e64b68888111f8efc4abd537)
@@ -693,9 +693,12 @@
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 FilePath = hydraulicBoundaryDatabaseFilePath,
-                CanUsePreprocessor = true,
-                UsePreprocessor = true,
-                PreprocessorDirectory = validPreprocessorDirectory
+                HydraulicLocationConfigurationSettings =
+                {
+                    CanUsePreprocessor = true,
+                    UsePreprocessor = true,
+                    PreprocessorDirectory = validPreprocessorDirectory
+                }
             };
             HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase);
 
@@ -760,9 +763,12 @@
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 FilePath = hydraulicBoundaryDatabaseFilePath,
-                CanUsePreprocessor = true,
-                UsePreprocessor = false,
-                PreprocessorDirectory = "InvalidPreprocessorDirectory"
+                HydraulicLocationConfigurationSettings =
+                {
+                    CanUsePreprocessor = true,
+                    UsePreprocessor = false,
+                    PreprocessorDirectory = "InvalidPreprocessorDirectory"
+                }
             };
             HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase);
 
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r90da65d29cffe6603e285dd47eb922125f11b692 -rac1eb38be88180c3e64b68888111f8efc4abd537
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsContextTreeNodeInfoTest.cs	(.../DuneLocationCalculationsContextTreeNodeInfoTest.cs)	(revision 90da65d29cffe6603e285dd47eb922125f11b692)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsContextTreeNodeInfoTest.cs	(.../DuneLocationCalculationsContextTreeNodeInfoTest.cs)	(revision ac1eb38be88180c3e64b68888111f8efc4abd537)
@@ -551,9 +551,12 @@
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 FilePath = validFilePath,
-                CanUsePreprocessor = true,
-                UsePreprocessor = true,
-                PreprocessorDirectory = preprocessorDirectory
+                HydraulicLocationConfigurationSettings =
+                {
+                    CanUsePreprocessor = true,
+                    UsePreprocessor = true,
+                    PreprocessorDirectory = preprocessorDirectory
+                }
             };
             HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase);
 
@@ -634,9 +637,12 @@
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 FilePath = validFilePath,
-                CanUsePreprocessor = true,
-                UsePreprocessor = false,
-                PreprocessorDirectory = "InvalidPreprocessorDirectory"
+                HydraulicLocationConfigurationSettings =
+                {
+                    CanUsePreprocessor = true,
+                    UsePreprocessor = false,
+                    PreprocessorDirectory = "InvalidPreprocessorDirectory"
+                }
             };
             HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase);
 
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneLocationCalculationActivityFactoryTest.cs
===================================================================
diff -u -r1ee2605815d118a7eaf5d96df7f9a3fd55c00550 -rac1eb38be88180c3e64b68888111f8efc4abd537
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneLocationCalculationActivityFactoryTest.cs	(.../DuneLocationCalculationActivityFactoryTest.cs)	(revision 1ee2605815d118a7eaf5d96df7f9a3fd55c00550)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneLocationCalculationActivityFactoryTest.cs	(.../DuneLocationCalculationActivityFactoryTest.cs)	(revision ac1eb38be88180c3e64b68888111f8efc4abd537)
@@ -251,10 +251,10 @@
         {
             var assessmentSection = new AssessmentSectionStub();
 
-            assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true;
-            assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor = usePreprocessor;
             assessmentSection.HydraulicBoundaryDatabase.FilePath = validFilePath;
-            assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory = validPreprocessorDirectory;
+            assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.CanUsePreprocessor = true;
+            assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.UsePreprocessor = usePreprocessor;
+            assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.PreprocessorDirectory = validPreprocessorDirectory;
             HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(assessmentSection.HydraulicBoundaryDatabase);
 
             return assessmentSection;