Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationReaderTest.cs
===================================================================
diff -u -r25a6f6fc7f89feb479282171ab01fc277e5c8d64 -r41530eae976ee7acac59916ba1eff10417221acc
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationReaderTest.cs	(.../ClosingStructuresCalculationConfigurationReaderTest.cs)	(revision 25a6f6fc7f89feb479282171ab01fc277e5c8d64)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationReaderTest.cs	(.../ClosingStructuresCalculationConfigurationReaderTest.cs)	(revision 41530eae976ee7acac59916ba1eff10417221acc)
@@ -53,19 +53,28 @@
                                               "The 'voorlandprofiel' element is invalid - The value '' is invalid according to its datatype 'String'")
                     .SetName("invalidCalculationForeshoreProfileEmpty");
 
-                yield return new TestCaseData("invalidCalculationHydraulicBoundaryLocationEmpty.xml",
+                yield return new TestCaseData("invalidCalculationHydraulicBoundaryLocationEmptyOld.xml",
                                               "The 'hrlocatie' element is invalid - The value '' is invalid according to its datatype 'String'")
-                    .SetName("invalidCalculationHydraulicBoundaryLocationEmpty");
+                    .SetName("invalidCalculationHydraulicBoundaryLocationEmptyOld");
+                yield return new TestCaseData("invalidCalculationHydraulicBoundaryLocationEmptyNew.xml",
+                                              "The 'hblocatie' element is invalid - The value '' is invalid according to its datatype 'String'")
+                    .SetName("invalidCalculationHydraulicBoundaryLocationEmptyNew");
+                yield return new TestCaseData("invalidCalculationHydraulicBoundaryLocationOldAndNew.xml",
+                                              "Element 'hblocatie' cannot appear more than once if content model type is \"all\".")
+                    .SetName("invalidCalculationHydraulicBoundaryLocationOldAndNew");
 
                 yield return new TestCaseData("invalidCalculationMultipleFailureProbabilityStructureWithErosion.xml",
                                               "Element 'faalkansgegevenerosiebodem' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationMultipleFailureProbabilityStructureWithErosion");
                 yield return new TestCaseData("invalidCalculationMultipleForeshoreProfile.xml",
                                               "Element 'voorlandprofiel' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationMultipleForeshoreProfile");
-                yield return new TestCaseData("invalidCalculationMultipleHydraulicBoundaryLocation.xml",
+                yield return new TestCaseData("invalidCalculationMultipleHydraulicBoundaryLocationOld.xml",
                                               "Element 'hrlocatie' cannot appear more than once if content model type is \"all\".")
-                    .SetName("invalidCalculationMultipleHydraulicBoundaryLocation");
+                    .SetName("invalidCalculationMultipleHydraulicBoundaryLocationOld");
+                yield return new TestCaseData("invalidCalculationMultipleHydraulicBoundaryLocationNew.xml",
+                                              "Element 'hblocatie' cannot appear more than once if content model type is \"all\".")
+                    .SetName("invalidCalculationMultipleHydraulicBoundaryLocationNew");
                 yield return new TestCaseData("invalidCalculationMultipleOrientation.xml",
                                               "Element 'orientatie' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationMultipleOrientation");
@@ -329,8 +338,10 @@
         }
 
         [Test]
-        [TestCase("validFullConfiguration")]
-        [TestCase("validFullConfiguration_differentOrder")]
+        [TestCase("validFullConfigurationOld")]
+        [TestCase("validFullConfiguration_differentOrder_old")]
+        [TestCase("validFullConfigurationNew")]
+        [TestCase("validFullConfiguration_differentOrder_new")]
         public void Read_ValidFullConfigurations_ExpectedValues(string fileName)
         {
             // Setup
@@ -498,10 +509,12 @@
         }
 
         [Test]
-        public void Read_ValidPartialConfigurations_ExpectedValues()
+        [TestCase("validPartialConfigurationOld")]
+        [TestCase("validPartialConfigurationNew")]
+        public void Read_ValidPartialConfigurations_ExpectedValues(string fileName)
         {
             // Setup
-            string filePath = Path.Combine(testDirectoryPath, "validPartialConfiguration.xml");
+            string filePath = Path.Combine(testDirectoryPath, $"{fileName}.xml");
             var reader = new ClosingStructuresCalculationConfigurationReader(filePath);
 
             // Call