Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.TestUtil.Test/ReadHydraulicLocationConfigurationDatabaseTestFactoryTest.cs
===================================================================
diff -u -r24396275ce37cc1519c2df4d41e390bd8d0103bb -r8446587099fe2aa21ab7d83ee8876c7c07f410e0
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.TestUtil.Test/ReadHydraulicLocationConfigurationDatabaseTestFactoryTest.cs	(.../ReadHydraulicLocationConfigurationDatabaseTestFactoryTest.cs)	(revision 24396275ce37cc1519c2df4d41e390bd8d0103bb)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.TestUtil.Test/ReadHydraulicLocationConfigurationDatabaseTestFactoryTest.cs	(.../ReadHydraulicLocationConfigurationDatabaseTestFactoryTest.cs)	(revision 8446587099fe2aa21ab7d83ee8876c7c07f410e0)
@@ -36,7 +36,7 @@
 
             // Assert
             Assert.AreEqual(2, database.LocationIdMappings.Count());
-            CollectionAssert.IsEmpty(database.ReadHydraulicLocationConfigurationDatabaseSettings);
+            Assert.IsNull(database.ReadHydraulicLocationConfigurationDatabaseSettings);
 
             var i = 1;
             foreach (ReadHydraulicLocationMapping databaseLocationIdMapping in database.LocationIdMappings)
@@ -63,6 +63,7 @@
 
             // Assert
             Assert.AreEqual(locationsIds.Length, database.LocationIdMappings.Count());
+            Assert.IsNull(database.ReadHydraulicLocationConfigurationDatabaseSettings);
 
             var i = 0;
             foreach (ReadHydraulicLocationMapping databaseLocationIdMapping in database.LocationIdMappings)
@@ -71,12 +72,10 @@
                 Assert.AreEqual(locationsIds[i] + 100, databaseLocationIdMapping.HlcdLocationId);
                 i++;
             }
-
-            CollectionAssert.IsEmpty(database.ReadHydraulicLocationConfigurationDatabaseSettings);
         }
 
         [Test]
-        public void CreateWithScenarioInformation_WithHydraulicLocationCalculationSettings_ExpectedValues()
+        public void CreateWithScenarioInformation_ExpectedValues()
         {
             // Call
             ReadHydraulicLocationConfigurationDatabase database = ReadHydraulicLocationConfigurationDatabaseTestFactory.CreateWithScenarioInformation();
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationDatabaseTestFactory.cs
===================================================================
diff -u -r24396275ce37cc1519c2df4d41e390bd8d0103bb -r8446587099fe2aa21ab7d83ee8876c7c07f410e0
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationDatabaseTestFactory.cs	(.../ReadHydraulicLocationConfigurationDatabaseTestFactory.cs)	(revision 24396275ce37cc1519c2df4d41e390bd8d0103bb)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationDatabaseTestFactory.cs	(.../ReadHydraulicLocationConfigurationDatabaseTestFactory.cs)	(revision 8446587099fe2aa21ab7d83ee8876c7c07f410e0)
@@ -51,9 +51,7 @@
         /// <returns>The created <see cref="ReadHydraulicLocationConfigurationDatabase"/>.</returns>
         public static ReadHydraulicLocationConfigurationDatabase Create(IEnumerable<long> locationIds)
         {
-            return new ReadHydraulicLocationConfigurationDatabase(locationIds.Select(locationId => new ReadHydraulicLocationMapping(locationId, locationId + 100))
-                                                                             .ToList(),
-                                                                  Enumerable.Empty<ReadHydraulicLocationConfigurationDatabaseSettings>());
+            return Create(locationIds, null);
         }
 
         /// <summary>
@@ -63,22 +61,26 @@
         /// <returns>The created <see cref="ReadHydraulicLocationConfigurationDatabase"/> with scenario information.</returns>
         public static ReadHydraulicLocationConfigurationDatabase CreateWithScenarioInformation()
         {
-            var locationIds = new long[]
+            var settings = new[]
             {
+                new ReadHydraulicLocationConfigurationDatabaseSettings("scenarioName", 1337, "scope", "seaLevel",
+                                                                       "riverDischarge", "lakeLevel", "windDirection",
+                                                                       "windSpeed", "comment")
+            };
+
+            return Create(new long[]
+            {
                 1,
                 2
-            };
+            }, settings);
+        }
 
-            var setting = new ReadHydraulicLocationConfigurationDatabaseSettings("scenarioName", 1337, "scope", "seaLevel",
-                                                                                 "riverDischarge", "lakeLevel", "windDirection",
-                                                                                 "windSpeed", "comment");
-
+        private static ReadHydraulicLocationConfigurationDatabase Create(IEnumerable<long> locationIds,
+                                                                         IEnumerable<ReadHydraulicLocationConfigurationDatabaseSettings> settings)
+        {
             return new ReadHydraulicLocationConfigurationDatabase(locationIds.Select(locationId => new ReadHydraulicLocationMapping(locationId, locationId + 100))
                                                                              .ToList(),
-                                                                  new[]
-                                                                  {
-                                                                      setting
-                                                                  });
+                                                                  settings);
         }
     }
 }
\ No newline at end of file