Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
===================================================================
diff -u -r686466dda6406ee2c7fb1f33faa60494878b1fc8 -r0329d5c996b70d65ef323041fc5424e974c6bfc2
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision 686466dda6406ee2c7fb1f33faa60494878b1fc8)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision 0329d5c996b70d65ef323041fc5424e974c6bfc2)
@@ -77,7 +77,14 @@
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
             {
                 Name = "assessmentSection",
-                HydraulicBoundaryDatabase = GetHydraulicBoundaryDatabase(),
+                HydraulicBoundaryDatabase =
+                {
+                    FilePath = "/temp/test",
+                    Version = "1.0",
+                    CanUsePreprocessor = true,
+                    UsePreprocessor = true,
+                    PreprocessorDirectory = "/temp/preprocessor"
+                },
                 ReferenceLine = GetReferenceLine(),
                 Id = "12-2",
                 FailureMechanismContribution =
@@ -88,6 +95,8 @@
                 }
             };
 
+            assessmentSection.HydraulicBoundaryDatabase.Locations.AddRange(GetHydraulicBoundaryLocations());
+
             MacroStabilityInwardsFailureMechanism macroStabilityInwardsFailureMechanism = assessmentSection.MacroStabilityInwards;
             ConfigureMacroStabilityInwardsFailureMechanism(macroStabilityInwardsFailureMechanism, assessmentSection);
             AddSections(macroStabilityInwardsFailureMechanism);
@@ -327,9 +336,9 @@
             return referenceLine;
         }
 
-        private static HydraulicBoundaryDatabase GetHydraulicBoundaryDatabase()
+        private static IEnumerable<HydraulicBoundaryLocation> GetHydraulicBoundaryLocations()
         {
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(13001, "test", 152.3, 2938.5)
+            yield return new HydraulicBoundaryLocation(13001, "test", 152.3, 2938.5)
             {
                 DesignWaterLevelCalculation =
                 {
@@ -349,7 +358,7 @@
                                                                              GetConfiguredGeneralResultTopLevelSubMechanismIllustrationPoint());
             var waveHeightOutput = new HydraulicBoundaryLocationOutput(2.4, 0, 0, 0, 0, CalculationConvergence.CalculatedNotConverged,
                                                                        GetConfiguredGeneralResultTopLevelSubMechanismIllustrationPoint());
-            var hydraulicBoundaryLocationWithIllustrationPoints = new HydraulicBoundaryLocation(13002, "test2", 135.2, 5293.8)
+            yield return new HydraulicBoundaryLocation(13002, "test2", 135.2, 5293.8)
             {
                 DesignWaterLevelCalculation =
                 {
@@ -368,22 +377,6 @@
                     Output = waveHeightOutput
                 }
             };
-
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
-            {
-                FilePath = "/temp/test",
-                Version = "1.0",
-                Locations =
-                {
-                    hydraulicBoundaryLocation,
-                    hydraulicBoundaryLocationWithIllustrationPoints
-                },
-                CanUsePreprocessor = true,
-                UsePreprocessor = true,
-                PreprocessorDirectory = "/temp/preprocessor"
-            };
-
-            return hydraulicBoundaryDatabase;
         }
 
         private static GeneralResult<TopLevelSubMechanismIllustrationPoint> GetConfiguredGeneralResultTopLevelSubMechanismIllustrationPoint()