Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationReaderTest.cs
===================================================================
diff -u -r6949918830314633db5cc8c16bb2188779fffc93 -re39e5eb381bc6b71f5aa713a3094ae2a8def6013
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationReaderTest.cs	(.../MacroStabilityInwardsCalculationConfigurationReaderTest.cs)	(revision 6949918830314633db5cc8c16bb2188779fffc93)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationReaderTest.cs	(.../MacroStabilityInwardsCalculationConfigurationReaderTest.cs)	(revision e39e5eb381bc6b71f5aa713a3094ae2a8def6013)
@@ -565,7 +565,8 @@
 
         private static IEnumerable<NameAdapter> GetNameAdaptersOfStringProperties()
         {
-            yield return new NameAdapter("HydraulicBoundaryLocation", "hrlocatie");
+            yield return new NameAdapter("HydraulicBoundaryLocationOld", "hrlocatie");
+            yield return new NameAdapter("HydraulicBoundaryLocationNew", "hblocatie");
             yield return new NameAdapter("SurfaceLine", "profielschematisatie");
             yield return new NameAdapter("StochasticSoilModel", "ondergrondmodel");
             yield return new NameAdapter("StochasticSoilProfile", "ondergrondschematisatie");
@@ -593,6 +594,7 @@
         private static IEnumerable<NameAdapter> GetNameAdaptersOfDoubleProperties()
         {
             yield return new NameAdapter("AssessmentLevel", "toetspeil");
+            yield return new NameAdapter("WaterLevel", "waterstand");
             yield return new NameAdapter("ScenarioContribution", "bijdrage");
             yield return new NameAdapter("SlipPlaneMinimumDepth", "minimaleglijvlakdiepte");
             yield return new NameAdapter("SlipPlaneMinimumLength", "minimaleglijvlaklengte");
@@ -674,8 +676,18 @@
                                               string.Format(message, tagElement));
             }
 
-            yield return new TestCaseData("invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocation.xml",
+            yield return new TestCaseData("invalidContainingBothAssessmentLevelAndWaterLevel.xml",
+                                          string.Format(message, "toetspeil"));
+            yield return new TestCaseData("invalidContainingBothHydraulicBoundaryLocationOldAndNew.xml",
                                           string.Format(message, "hrlocatie"));
+            yield return new TestCaseData("invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocationOld.xml",
+                                          string.Format(message, "hrlocatie"));
+            yield return new TestCaseData("invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocationNew.xml",
+                                          string.Format(message, "hblocatie"));
+            yield return new TestCaseData("invalidContainingBothWaterLevelAndHydraulicBoundaryLocationOld.xml",
+                                          string.Format(message, "hrlocatie"));
+            yield return new TestCaseData("invalidContainingBothWaterLevelAndHydraulicBoundaryLocationNew.xml",
+                                          string.Format(message, "hblocatie"));
         }
 
         private static IEnumerable<NameAdapter> GetNameAdaptersOfAllProperties()
Fisheye: Tag e39e5eb381bc6b71f5aa713a3094ae2a8def6013 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocation.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocationNew.xml
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocationNew.xml	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocationNew.xml	(revision e39e5eb381bc6b71f5aa713a3094ae2a8def6013)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <hblocatie>HBlocatie 1</hblocatie>
+    <hblocatie>HBlocatie 2</hblocatie>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocationOld.xml
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocationOld.xml	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocationOld.xml	(revision e39e5eb381bc6b71f5aa713a3094ae2a8def6013)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <hrlocatie>HBlocatie 1</hrlocatie>
+    <hrlocatie>HBlocatie 2</hrlocatie>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidCalculationMultipleWaterLevel.xml
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidCalculationMultipleWaterLevel.xml	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidCalculationMultipleWaterLevel.xml	(revision e39e5eb381bc6b71f5aa713a3094ae2a8def6013)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <waterstand>1.1</waterstand>
+    <waterstand>2.2</waterstand>
+  </berekening>
+</configuratie>
\ No newline at end of file
Fisheye: Tag e39e5eb381bc6b71f5aa713a3094ae2a8def6013 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocation.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocationNew.xml
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocationNew.xml	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocationNew.xml	(revision e39e5eb381bc6b71f5aa713a3094ae2a8def6013)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <toetspeil>1.1</toetspeil>
+    <hblocatie>HBlocatie</hblocatie>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocationOld.xml
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocationOld.xml	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocationOld.xml	(revision e39e5eb381bc6b71f5aa713a3094ae2a8def6013)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <toetspeil>1.1</toetspeil>
+    <hrlocatie>HBlocatie</hrlocatie>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidContainingBothAssessmentLevelAndWaterLevel.xml
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidContainingBothAssessmentLevelAndWaterLevel.xml	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidContainingBothAssessmentLevelAndWaterLevel.xml	(revision e39e5eb381bc6b71f5aa713a3094ae2a8def6013)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <waterstand>1.1</waterstand>
+    <toetspeil>2.2</toetspeil>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidContainingBothHydraulicBoundaryLocationOldAndNew.xml
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidContainingBothHydraulicBoundaryLocationOldAndNew.xml	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidContainingBothHydraulicBoundaryLocationOldAndNew.xml	(revision e39e5eb381bc6b71f5aa713a3094ae2a8def6013)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <hblocatie>HBlocatie</hblocatie>
+    <hrlocatie>HBlocatie</hrlocatie>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidContainingBothWaterLevelAndHydraulicBoundaryLocationNew.xml
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidContainingBothWaterLevelAndHydraulicBoundaryLocationNew.xml	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidContainingBothWaterLevelAndHydraulicBoundaryLocationNew.xml	(revision e39e5eb381bc6b71f5aa713a3094ae2a8def6013)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <waterstand>1.1</waterstand>
+    <hblocatie>HBlocatie</hblocatie>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidContainingBothWaterLevelAndHydraulicBoundaryLocationOld.xml
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidContainingBothWaterLevelAndHydraulicBoundaryLocationOld.xml	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidContainingBothWaterLevelAndHydraulicBoundaryLocationOld.xml	(revision e39e5eb381bc6b71f5aa713a3094ae2a8def6013)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <waterstand>1.1</waterstand>
+    <hrlocatie>HBlocatie</hrlocatie>
+  </berekening>
+</configuratie>
\ No newline at end of file
Fisheye: Tag e39e5eb381bc6b71f5aa713a3094ae2a8def6013 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidHydraulicBoundaryLocationEmpty.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidHydraulicBoundaryLocationNewEmpty.xml
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidHydraulicBoundaryLocationNewEmpty.xml	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidHydraulicBoundaryLocationNewEmpty.xml	(revision e39e5eb381bc6b71f5aa713a3094ae2a8def6013)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <hblocatie/>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidHydraulicBoundaryLocationOldEmpty.xml
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidHydraulicBoundaryLocationOldEmpty.xml	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidHydraulicBoundaryLocationOldEmpty.xml	(revision e39e5eb381bc6b71f5aa713a3094ae2a8def6013)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <hrlocatie/>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidWaterLevelEmpty.xml
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidWaterLevelEmpty.xml	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidWaterLevelEmpty.xml	(revision e39e5eb381bc6b71f5aa713a3094ae2a8def6013)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <waterstand/>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidWaterLevelNoDouble.xml
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidWaterLevelNoDouble.xml	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidWaterLevelNoDouble.xml	(revision e39e5eb381bc6b71f5aa713a3094ae2a8def6013)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <waterstand>string</waterstand>
+  </berekening>
+</configuratie>
\ No newline at end of file