Index: Riskeer/Common/test/Riskeer.Common.Data.Test/Hydraulics/HydraulicBoundaryCalculationSettingsFactoryTest.cs
===================================================================
diff -u -rcb270950eb3a2b866b4472b60eeae68ad875bbd4 -r582c0f62bf91c503b3fa230bcb6c9e15fd3ced27
--- Riskeer/Common/test/Riskeer.Common.Data.Test/Hydraulics/HydraulicBoundaryCalculationSettingsFactoryTest.cs	(.../HydraulicBoundaryCalculationSettingsFactoryTest.cs)	(revision cb270950eb3a2b866b4472b60eeae68ad875bbd4)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/Hydraulics/HydraulicBoundaryCalculationSettingsFactoryTest.cs	(.../HydraulicBoundaryCalculationSettingsFactoryTest.cs)	(revision 582c0f62bf91c503b3fa230bcb6c9e15fd3ced27)
@@ -66,14 +66,14 @@
             {
                 HydraulicLocationConfigurationDatabase =
                 {
-                    FilePath = hlcdFilePath,
-                    UsePreprocessorClosure = usePreprocessorClosure
+                    FilePath = hlcdFilePath
                 },
                 HydraulicBoundaryDatabases =
                 {
                     new HydraulicBoundaryDatabase
                     {
                         FilePath = hrdFilePath,
+                        UsePreprocessorClosure = usePreprocessorClosure,
                         Locations =
                         {
                             hydraulicBoundaryLocation1
@@ -105,14 +105,14 @@
             {
                 HydraulicLocationConfigurationDatabase =
                 {
-                    FilePath = hlcdFilePath,
-                    UsePreprocessorClosure = usePreprocessorClosure
+                    FilePath = hlcdFilePath
                 },
                 HydraulicBoundaryDatabases =
                 {
                     new HydraulicBoundaryDatabase
                     {
                         FilePath = hrdFilePath1,
+                        UsePreprocessorClosure = usePreprocessorClosure,
                         Locations =
                         {
                             hydraulicBoundaryLocation1
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/Hydraulics/HydraulicLocationConfigurationDatabaseTest.cs
===================================================================
diff -u -ra8354b244099cf1a660aea8676a5e325ce8f513b -r582c0f62bf91c503b3fa230bcb6c9e15fd3ced27
--- Riskeer/Common/test/Riskeer.Common.Data.Test/Hydraulics/HydraulicLocationConfigurationDatabaseTest.cs	(.../HydraulicLocationConfigurationDatabaseTest.cs)	(revision a8354b244099cf1a660aea8676a5e325ce8f513b)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/Hydraulics/HydraulicLocationConfigurationDatabaseTest.cs	(.../HydraulicLocationConfigurationDatabaseTest.cs)	(revision 582c0f62bf91c503b3fa230bcb6c9e15fd3ced27)
@@ -44,7 +44,6 @@
             Assert.IsNull(hydraulicLocationConfigurationDatabase.WindDirection);
             Assert.IsNull(hydraulicLocationConfigurationDatabase.WindSpeed);
             Assert.IsNull(hydraulicLocationConfigurationDatabase.Comment);
-            Assert.IsFalse(hydraulicLocationConfigurationDatabase.UsePreprocessorClosure);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil/AssessmentSectionTestHelper.cs
===================================================================
diff -u -r7ce3ac89b20a5668039162e2f5ecd778187e8491 -r582c0f62bf91c503b3fa230bcb6c9e15fd3ced27
--- Riskeer/Common/test/Riskeer.Common.Data.TestUtil/AssessmentSectionTestHelper.cs	(.../AssessmentSectionTestHelper.cs)	(revision 7ce3ac89b20a5668039162e2f5ecd778187e8491)
+++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil/AssessmentSectionTestHelper.cs	(.../AssessmentSectionTestHelper.cs)	(revision 582c0f62bf91c503b3fa230bcb6c9e15fd3ced27)
@@ -111,16 +111,15 @@
                 hydraulicBoundaryData.HydraulicBoundaryDatabases.Add(new HydraulicBoundaryDatabase
                 {
                     FilePath = hrdFilePath,
+                    UsePreprocessorClosure = usePreprocessorClosure,
                     Locations =
                     {
                         new HydraulicBoundaryLocation(1300001, string.Empty, 0, 0)
                     },
-                    UsePreprocessorClosure = usePreprocessorClosure
                 });
 
                 HydraulicLocationConfigurationDatabase hydraulicLocationConfigurationDatabase = hydraulicBoundaryData.HydraulicLocationConfigurationDatabase;
                 hydraulicLocationConfigurationDatabase.FilePath = Path.Combine(Path.GetDirectoryName(hrdFilePath), "hlcd.sqlite");
-                hydraulicLocationConfigurationDatabase.UsePreprocessorClosure = usePreprocessorClosure;
             }
 
             return hydraulicBoundaryData;