Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/AssessmentSectionTestHelperTest.cs
===================================================================
diff -u -r9e4ea78a7073d17196f09f6edebc35ed7ce69348 -ra5abae6d488c369da206bacbfe08c9867ae351ec
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/AssessmentSectionTestHelperTest.cs	(.../AssessmentSectionTestHelperTest.cs)	(revision 9e4ea78a7073d17196f09f6edebc35ed7ce69348)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/AssessmentSectionTestHelperTest.cs	(.../AssessmentSectionTestHelperTest.cs)	(revision a5abae6d488c369da206bacbfe08c9867ae351ec)
@@ -89,6 +89,18 @@
             Assert.IsNull(hydraulicBoundaryDatabase.PreprocessorDirectory);
             Assert.IsNotNull(assessmentSection.ReferenceLine);
 
+            HydraulicLocationConfigurationSettings settings = hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings;
+            Assert.IsNull(settings.FilePath);
+            Assert.IsNull(settings.ScenarioName);
+            Assert.AreEqual(0, settings.Year);
+            Assert.IsNull(settings.Scope);
+            Assert.IsNull(settings.SeaLevel);
+            Assert.IsNull(settings.RiverDischarge);
+            Assert.IsNull(settings.LakeLevel);
+            Assert.IsNull(settings.WindDirection);
+            Assert.IsNull(settings.WindSpeed);
+            Assert.IsNull(settings.Comment);
+
             CollectionAssert.AreEqual(new[]
             {
                 failureMechanism
@@ -132,6 +144,18 @@
             Assert.IsNull(hydraulicBoundaryDatabase.PreprocessorDirectory);
             Assert.IsNotNull(assessmentSection.ReferenceLine);
 
+            HydraulicLocationConfigurationSettings settings = hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings;
+            Assert.AreEqual("some\\Path\\ToHlcd", settings.FilePath);
+            Assert.AreEqual("ScenarioName", settings.ScenarioName);
+            Assert.AreEqual(1337, settings.Year);
+            Assert.AreEqual("Scope", settings.Scope);
+            Assert.AreEqual("SeaLevel", settings.SeaLevel);
+            Assert.AreEqual("RiverDischarge", settings.RiverDischarge);
+            Assert.AreEqual("LakeLevel", settings.LakeLevel);
+            Assert.AreEqual("WindDirection", settings.WindDirection);
+            Assert.AreEqual("WindSpeed", settings.WindSpeed);
+            Assert.AreEqual("Comment", settings.Comment);
+
             CollectionAssert.AreEqual(new[]
             {
                 failureMechanism
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/AssessmentSectionTestHelper.cs
===================================================================
diff -u -r2d7781915c424dbd7887718775d4eb6e42a96503 -ra5abae6d488c369da206bacbfe08c9867ae351ec
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/AssessmentSectionTestHelper.cs	(.../AssessmentSectionTestHelper.cs)	(revision 2d7781915c424dbd7887718775d4eb6e42a96503)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/AssessmentSectionTestHelper.cs	(.../AssessmentSectionTestHelper.cs)	(revision a5abae6d488c369da206bacbfe08c9867ae351ec)
@@ -155,14 +155,21 @@
 
         private static HydraulicBoundaryDatabase GetHydraulicBoundaryDatabase(string filePath)
         {
-            return new HydraulicBoundaryDatabase
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 FilePath = filePath,
                 Locations =
                 {
                     new HydraulicBoundaryLocation(1300001, string.Empty, 0, 0)
                 }
             };
+
+            if (filePath != null)
+            {
+                HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase);
+            }
+
+            return hydraulicBoundaryDatabase;
         }
     }
 }
\ No newline at end of file