Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabasesContextTreeNodeInfoTest.cs
===================================================================
diff -u -rf172813bf1ed4296c8ae572a38a915409ff05ad8 -r80c51bd39dcd01a666c52b1b6dc9fc2e250a70d6
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabasesContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabasesContextTreeNodeInfoTest.cs)	(revision f172813bf1ed4296c8ae572a38a915409ff05ad8)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabasesContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabasesContextTreeNodeInfoTest.cs)	(revision 80c51bd39dcd01a666c52b1b6dc9fc2e250a70d6)
@@ -196,15 +196,19 @@
         public void ContextMenuStrip_ClickOnAddHydraulicBoundaryDatabaseItem_HydraulicBoundaryDatabaseAddedAndObserversNotified()
         {
             // Setup
-            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
+            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
+            {
+                HydraulicBoundaryData =
+                {
+                    HydraulicLocationConfigurationSettings =
+                    {
+                        FilePath = "hlcd.sqlite"
+                    }
+                }
+            };
 
             HydraulicBoundaryData hydraulicBoundaryData = assessmentSection.HydraulicBoundaryData;
 
-            hydraulicBoundaryData.HydraulicLocationConfigurationSettings.SetValues("some/path/hlcd.sqlite", "scenarioName", 0,
-                                                                                   "scope", false, "seaLevel", "riverDischarge",
-                                                                                   "lakeLevel", "windDirection", "windSpeed",
-                                                                                   "comment");
-
             var context = new HydraulicBoundaryDatabasesContext(hydraulicBoundaryData, assessmentSection);
 
             var mockRepository = new MockRepository();
Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/Comparers/AssessmentSectionMergeComparerTest.cs
===================================================================
diff -u -re7c92ff908eaab2823cadfe330a2de5e62705f28 -r80c51bd39dcd01a666c52b1b6dc9fc2e250a70d6
--- Riskeer/Integration/test/Riskeer.Integration.Service.Test/Comparers/AssessmentSectionMergeComparerTest.cs	(.../AssessmentSectionMergeComparerTest.cs)	(revision e7c92ff908eaab2823cadfe330a2de5e62705f28)
+++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/Comparers/AssessmentSectionMergeComparerTest.cs	(.../AssessmentSectionMergeComparerTest.cs)	(revision 80c51bd39dcd01a666c52b1b6dc9fc2e250a70d6)
@@ -231,58 +231,76 @@
 
         private static IEnumerable<ChangePropertyData<HydraulicLocationConfigurationSettings>> ChangeSingleDataOfHydraulicLocationConfigurationSettings()
         {
-            const string hlcdFilePath = "path";
-            const string scenarioName = "ScenarioName";
-            const int year = 2017;
-            const string scope = "Scope";
-            const bool usePreprocessorClosure = false;
-            const string seaLevel = "SeaLevel";
-            const string riverDischarge = "RiverDischarge";
-            const string lakeLevel = "LakeLevel";
-            const string windDirection = "WindDirection";
-            const string windSpeed = "WindSpeed";
-            const string comment = "Comment";
+            yield return new ChangePropertyData<HydraulicLocationConfigurationSettings>(settings =>
+                                                                                        {
+                                                                                            SetHydraulicLocationConfigurationValues(settings);
 
-            yield return new ChangePropertyData<HydraulicLocationConfigurationSettings>(settings => settings.SetValues(hlcdFilePath, "Other ScenarionName", year, scope,
-                                                                                                                       usePreprocessorClosure, seaLevel, riverDischarge,
-                                                                                                                       lakeLevel, windDirection, windSpeed, comment),
+                                                                                            settings.ScenarioName = "Other ScenarioName";
+                                                                                        },
                                                                                         "Different ScenarioName");
-            yield return new ChangePropertyData<HydraulicLocationConfigurationSettings>(settings => settings.SetValues(hlcdFilePath, scenarioName, 2023, scope,
-                                                                                                                       usePreprocessorClosure, seaLevel, riverDischarge,
-                                                                                                                       lakeLevel, windDirection, windSpeed, comment),
+            yield return new ChangePropertyData<HydraulicLocationConfigurationSettings>(settings =>
+                                                                                        {
+                                                                                            SetHydraulicLocationConfigurationValues(settings);
+
+                                                                                            settings.Year = 2023;
+                                                                                        },
                                                                                         "Different Year");
-            yield return new ChangePropertyData<HydraulicLocationConfigurationSettings>(settings => settings.SetValues(hlcdFilePath, scenarioName, year, "Other Scope",
-                                                                                                                       usePreprocessorClosure, seaLevel, riverDischarge,
-                                                                                                                       lakeLevel, windDirection, windSpeed, comment),
+            yield return new ChangePropertyData<HydraulicLocationConfigurationSettings>(settings =>
+                                                                                        {
+                                                                                            SetHydraulicLocationConfigurationValues(settings);
+
+                                                                                            settings.Scope = "Other Scope";
+                                                                                        },
                                                                                         "Different Scope");
-            yield return new ChangePropertyData<HydraulicLocationConfigurationSettings>(settings => settings.SetValues(hlcdFilePath, scenarioName, year, scope,
-                                                                                                                       true, seaLevel, riverDischarge,
-                                                                                                                       lakeLevel, windDirection, windSpeed, comment),
-                                                                                        "Different UsePreprocessorClosure");
-            yield return new ChangePropertyData<HydraulicLocationConfigurationSettings>(settings => settings.SetValues(hlcdFilePath, scenarioName, year, scope,
-                                                                                                                       usePreprocessorClosure, "Other SeaLevel", riverDischarge,
-                                                                                                                       lakeLevel, windDirection, windSpeed, comment),
+            yield return new ChangePropertyData<HydraulicLocationConfigurationSettings>(settings =>
+                                                                                        {
+                                                                                            SetHydraulicLocationConfigurationValues(settings);
+
+                                                                                            settings.SeaLevel = "Other SeaLevel";
+                                                                                        },
                                                                                         "Different SeaLevel");
-            yield return new ChangePropertyData<HydraulicLocationConfigurationSettings>(settings => settings.SetValues(hlcdFilePath, scenarioName, year, scope,
-                                                                                                                       usePreprocessorClosure, seaLevel, "Other RiverDischarge",
-                                                                                                                       lakeLevel, windDirection, windSpeed, comment),
+            yield return new ChangePropertyData<HydraulicLocationConfigurationSettings>(settings =>
+                                                                                        {
+                                                                                            SetHydraulicLocationConfigurationValues(settings);
+
+                                                                                            settings.RiverDischarge = "Other RiverDischarge";
+                                                                                        },
                                                                                         "Different RiverDischarge");
-            yield return new ChangePropertyData<HydraulicLocationConfigurationSettings>(settings => settings.SetValues(hlcdFilePath, scenarioName, year, scope,
-                                                                                                                       usePreprocessorClosure, seaLevel, riverDischarge,
-                                                                                                                       "Other LakeLevel", windDirection, windSpeed, comment),
+            yield return new ChangePropertyData<HydraulicLocationConfigurationSettings>(settings =>
+                                                                                        {
+                                                                                            SetHydraulicLocationConfigurationValues(settings);
+
+                                                                                            settings.LakeLevel = "Other LakeLevel";
+                                                                                        },
                                                                                         "Different LakeLevel");
-            yield return new ChangePropertyData<HydraulicLocationConfigurationSettings>(settings => settings.SetValues(hlcdFilePath, scenarioName, year, scope,
-                                                                                                                       usePreprocessorClosure, seaLevel, riverDischarge,
-                                                                                                                       lakeLevel, "Other WindDirection", windSpeed, comment),
+            yield return new ChangePropertyData<HydraulicLocationConfigurationSettings>(settings =>
+                                                                                        {
+                                                                                            SetHydraulicLocationConfigurationValues(settings);
+
+                                                                                            settings.WindDirection = "Other WindDirection";
+                                                                                        },
                                                                                         "Different WindDirection");
-            yield return new ChangePropertyData<HydraulicLocationConfigurationSettings>(settings => settings.SetValues(hlcdFilePath, scenarioName, year, scope,
-                                                                                                                       usePreprocessorClosure, seaLevel, riverDischarge,
-                                                                                                                       lakeLevel, windDirection, "Other Windspeed", comment),
+            yield return new ChangePropertyData<HydraulicLocationConfigurationSettings>(settings =>
+                                                                                        {
+                                                                                            SetHydraulicLocationConfigurationValues(settings);
+
+                                                                                            settings.WindSpeed = "Other Windspeed";
+                                                                                        },
                                                                                         "Different WindSpeed");
-            yield return new ChangePropertyData<HydraulicLocationConfigurationSettings>(settings => settings.SetValues(hlcdFilePath, scenarioName, year, scope,
-                                                                                                                       usePreprocessorClosure, seaLevel, riverDischarge,
-                                                                                                                       lakeLevel, windDirection, windSpeed, "Other Comment"),
+            yield return new ChangePropertyData<HydraulicLocationConfigurationSettings>(settings =>
+                                                                                        {
+                                                                                            SetHydraulicLocationConfigurationValues(settings);
+
+                                                                                            settings.Comment = "Other Comment";
+                                                                                        },
                                                                                         "Different Comment");
+            yield return new ChangePropertyData<HydraulicLocationConfigurationSettings>(settings =>
+                                                                                        {
+                                                                                            SetHydraulicLocationConfigurationValues(settings);
+
+                                                                                            settings.UsePreprocessorClosure = true;
+                                                                                        },
+                                                                                        "Different UsePreprocessorClosure");
         }
     }
 }
\ No newline at end of file