Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/Configurations/PipingCalculationConfigurationReaderTest.cs
===================================================================
diff -u -re9ac8660f203ae4e88f4360340ffef47c0de0656 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/Configurations/PipingCalculationConfigurationReaderTest.cs	(.../PipingCalculationConfigurationReaderTest.cs)	(revision e9ac8660f203ae4e88f4360340ffef47c0de0656)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/Configurations/PipingCalculationConfigurationReaderTest.cs	(.../PipingCalculationConfigurationReaderTest.cs)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -42,12 +42,6 @@
         {
             get
             {
-                yield return new TestCaseData("invalidAssessmentLevelEmpty.xml",
-                                              "The 'toetspeil' element is invalid - The value '' is invalid according to its datatype 'Double'")
-                    .SetName("invalidAssessmentLevelEmpty");
-                yield return new TestCaseData("invalidAssessmentLevelNoDouble.xml",
-                                              "The 'toetspeil' element is invalid - The value 'string' is invalid according to its datatype 'Double'")
-                    .SetName("invalidAssessmentLevelNoDouble");
                 yield return new TestCaseData("invalidWaterLevelEmpty.xml",
                                               "The 'waterstand' element is invalid - The value '' is invalid according to its datatype 'Double'")
                     .SetName("invalidWaterLevelEmpty");
@@ -91,35 +85,20 @@
                                               "The 'standaardafwijking' element is invalid - The value 'string' is invalid according to its datatype 'Double'")
                     .SetName("invalidStochastStandardDeviationNoDouble");
                 yield return new TestCaseData("invalidMultiplePhreaticLevelExitStochast.xml",
-                                              "There is a duplicate key sequence 'polderpeil' for the 'uniqueStochastNameConstraint' key or unique identity constraint.")
+                                              "There is a duplicate key sequence 'binnendijksewaterstand' for the 'uniqueStochastNameConstraint' key or unique identity constraint.")
                     .SetName("invalidMultiplePhreaticLevelExitStochast");
                 yield return new TestCaseData("invalidMultipleDampingFactorExitStochast.xml",
                                               "There is a duplicate key sequence 'dempingsfactor' for the 'uniqueStochastNameConstraint' key or unique identity constraint.")
                     .SetName("invalidMultipleDampingFactorExitStochast");
-                yield return new TestCaseData("invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocationOld.xml",
-                                              "Element 'hrlocatie' cannot appear more than once if content model type is \"all\".")
-                    .SetName("invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocationOld");
-                yield return new TestCaseData("invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocationNew.xml",
+                yield return new TestCaseData("invalidContainingBothWaterLevelAndHydraulicBoundaryLocation.xml",
                                               "Element 'hblocatie' cannot appear more than once if content model type is \"all\".")
-                    .SetName("invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocationNew");
-                yield return new TestCaseData("invalidContainingBothWaterLevelAndHydraulicBoundaryLocationOld.xml",
-                                              "Element 'hrlocatie' cannot appear more than once if content model type is \"all\".")
-                    .SetName("invalidContainingBothWaterLevelAndHydraulicBoundaryLocationOld");
-                yield return new TestCaseData("invalidContainingBothWaterLevelAndHydraulicBoundaryLocationNew.xml",
-                                              "Element 'hblocatie' cannot appear more than once if content model type is \"all\".")
-                    .SetName("invalidContainingBothWaterLevelAndHydraulicBoundaryLocationNew");
-                yield return new TestCaseData("invalidCalculationMultipleAssessmentLevel.xml",
-                                              "Element 'toetspeil' cannot appear more than once if content model type is \"all\".")
-                    .SetName("invalidCalculationMultipleAssessmentLevel");
+                    .SetName("invalidContainingBothWaterLevelAndHydraulicBoundaryLocation");
                 yield return new TestCaseData("invalidCalculationMultipleWaterLevel.xml",
                                               "Element 'waterstand' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationMultipleWaterLevel");
-                yield return new TestCaseData("invalidCalculationMultipleHydraulicBoundaryLocationOld.xml",
-                                              "Element 'hrlocatie' cannot appear more than once if content model type is \"all\".")
-                    .SetName("invalidCalculationMultipleHydraulicBoundaryLocationOld");
-                yield return new TestCaseData("invalidCalculationMultipleHydraulicBoundaryLocationNew.xml",
+                yield return new TestCaseData("invalidCalculationMultipleHydraulicBoundaryLocation.xml",
                                               "Element 'hblocatie' cannot appear more than once if content model type is \"all\".")
-                    .SetName("invalidCalculationMultipleHydraulicBoundaryLocationNew");
+                    .SetName("invalidCalculationMultipleHydraulicBoundaryLocation");
                 yield return new TestCaseData("invalidCalculationMultipleSurfaceLine.xml",
                                               "Element 'profielschematisatie' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationMultipleSurfaceLine");
@@ -138,12 +117,9 @@
                 yield return new TestCaseData("invalidCalculationMultipleStochasts.xml",
                                               "Element 'stochasten' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationMultipleStochasts");
-                yield return new TestCaseData("invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocationOld.xml",
-                                              "The 'hrlocatie' element is invalid - The value '' is invalid according to its datatype 'String' - The actual length is less than the MinLength value.")
-                    .SetName("invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocationOld");
-                yield return new TestCaseData("invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocationNew.xml",
+                yield return new TestCaseData("invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocation.xml",
                                               "The 'hblocatie' element is invalid - The value '' is invalid according to its datatype 'String' - The actual length is less than the MinLength value.")
-                    .SetName("invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocationNew");
+                    .SetName("invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocation");
                 yield return new TestCaseData("invalidConfigurationCalculationContainingEmptySurfaceLine.xml",
                                               "The 'profielschematisatie' element is invalid - The value '' is invalid according to its datatype 'String' - The actual length is less than the MinLength value.")
                     .SetName("invalidConfigurationCalculationContainingEmptySurfaceLine");
@@ -175,24 +151,8 @@
                                               "The 'gebruik' element is invalid - The value 'string' is invalid according to its datatype 'Boolean'")
                     .SetName("invalidScenarioRelevantNoBoolean");
                 yield return new TestCaseData("invalidContainingBothAssessmentLevelAndWaterLevel.xml",
-                                              "Element 'toetspeil' cannot appear more than once if content model type is \"all\".")
+                                              "Element 'waterstand' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidContainingBothAssessmentLevelAndWaterLevel");
-                yield return new TestCaseData("invalidContainingBothHydraulicBoundaryLocationOldAndNew.xml",
-                                              "Element 'hrlocatie' cannot appear more than once if content model type is \"all\".")
-                    .SetName("invalidContainingBothHydraulicBoundaryLocationOldAndNew");
-
-                yield return new TestCaseData("invalidCalculationVersion1HydraulicBoundaryLocationOld.xml",
-                                              "The element 'berekening' has invalid child element 'hrlocatie'.")
-                    .SetName("invalidCalculationVersion1HydraulicBoundaryLocationOld");
-                yield return new TestCaseData("invalidCalculationVersion1AssessmentLevel.xml",
-                                              "The element 'berekening' has invalid child element 'toetspeil'.")
-                    .SetName("invalidCalculationVersion1AssessmentLevel");
-                yield return new TestCaseData("invalidCalculationVersion1ContainingBothAssessmentLevelAndHydraulicBoundaryLocation.xml",
-                                              "Element 'hblocatie' cannot appear more than once if content model type is \"all\".")
-                    .SetName("invalidCalculationVersion1ContainingBothAssessmentLevelAndHydraulicBoundaryLocation");
-                yield return new TestCaseData("invalidCalculationVersion1OldStochastName.xml",
-                                              "The 'naam' attribute is invalid - The value 'polderpeil' is invalid according to its datatype 'nameType' - The Enumeration constraint failed.")
-                    .SetName("invalidCalculationVersion1OldStochastName");
             }
         }
 
@@ -332,8 +292,6 @@
         [TestCase("validConfigurationFullCalculationContainingHydraulicBoundaryLocationNew")]
         [TestCase("validConfigurationFullCalculationContainingHydraulicBoundaryLocation_differentOrder_old")]
         [TestCase("validConfigurationFullCalculationContainingHydraulicBoundaryLocation_differentOrder_new")]
-        [TestCase("validConfigurationFullCalculationVersion1ContainingHydraulicBoundaryLocation")]
-        [TestCase("validConfigurationFullCalculationVersion1ContainingHydraulicBoundaryLocation_differentOrder")]
         public void Read_ValidConfigurationWithFullCalculationContainingHydraulicBoundaryLocation_ReturnExpectedReadPipingCalculation(string fileName)
         {
             // Setup
@@ -367,8 +325,6 @@
         [TestCase("validConfigurationFullCalculationContainingWaterLevel")]
         [TestCase("validConfigurationFullCalculationContainingAssessmentLevel_differentOrder")]
         [TestCase("validConfigurationFullCalculationContainingWaterLevel_differentOrder")]
-        [TestCase("validConfigurationFullCalculationVersion1ContainingWaterLevel")]
-        [TestCase("validConfigurationFullCalculationVersion1ContainingWaterLevel_differentOrder")]
         public void Read_ValidConfigurationWithFullCalculationContainingAssessmentLevel_ReturnExpectedReadPipingCalculation(string fileName)
         {
             // Setup
Fisheye: Tag 5771c3ba6863748fcaa7d3499a02c6b49c6c137e refers to a dead (removed) revision in file `Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidAssessmentLevelEmpty.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 5771c3ba6863748fcaa7d3499a02c6b49c6c137e refers to a dead (removed) revision in file `Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidAssessmentLevelNoDouble.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 5771c3ba6863748fcaa7d3499a02c6b49c6c137e refers to a dead (removed) revision in file `Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleAssessmentLevel.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleEntryPoint.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleEntryPoint.xml	(.../invalidCalculationMultipleEntryPoint.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleEntryPoint.xml	(.../invalidCalculationMultipleEntryPoint.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <intredepunt>1.1</intredepunt>
     <intredepunt>2.2</intredepunt>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleExitPoint.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleExitPoint.xml	(.../invalidCalculationMultipleExitPoint.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleExitPoint.xml	(.../invalidCalculationMultipleExitPoint.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <uittredepunt>1.1</uittredepunt>
     <uittredepunt>2.2</uittredepunt>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocation.xml
===================================================================
diff -u
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocation.xml	(revision 0)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocation.xml	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie versie="1">
+  <berekening naam="Calculation">
+    <hblocatie>Locatie 1</hblocatie>
+    <hblocatie>Locatie 2</hblocatie>
+  </berekening>
+</configuratie>
\ No newline at end of file
Fisheye: Tag 5771c3ba6863748fcaa7d3499a02c6b49c6c137e refers to a dead (removed) revision in file `Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocationNew.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 5771c3ba6863748fcaa7d3499a02c6b49c6c137e refers to a dead (removed) revision in file `Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocationOld.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleScenario.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleScenario.xml	(.../invalidCalculationMultipleScenario.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleScenario.xml	(.../invalidCalculationMultipleScenario.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <scenario>
       <bijdrage>1.1</bijdrage>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleStochasticSoilModel.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleStochasticSoilModel.xml	(.../invalidCalculationMultipleStochasticSoilModel.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleStochasticSoilModel.xml	(.../invalidCalculationMultipleStochasticSoilModel.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <ondergrondmodel>Ondergrondmodel 1</ondergrondmodel>
     <ondergrondmodel>Ondergrondmodel 2</ondergrondmodel>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleStochasticSoilProfile.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleStochasticSoilProfile.xml	(.../invalidCalculationMultipleStochasticSoilProfile.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleStochasticSoilProfile.xml	(.../invalidCalculationMultipleStochasticSoilProfile.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <ondergrondschematisatie>Ondergrondschematisatie 1</ondergrondschematisatie>
     <ondergrondschematisatie>Ondergrondschematisatie 2</ondergrondschematisatie>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleStochasts.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleStochasts.xml	(.../invalidCalculationMultipleStochasts.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleStochasts.xml	(.../invalidCalculationMultipleStochasts.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <stochasten/>
     <stochasten/>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleSurfaceLine.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleSurfaceLine.xml	(.../invalidCalculationMultipleSurfaceLine.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleSurfaceLine.xml	(.../invalidCalculationMultipleSurfaceLine.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <profielschematisatie>Profielschematisatie 1</profielschematisatie>
     <profielschematisatie>Profielschematisatie 2</profielschematisatie>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleWaterLevel.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleWaterLevel.xml	(.../invalidCalculationMultipleWaterLevel.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleWaterLevel.xml	(.../invalidCalculationMultipleWaterLevel.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <waterstand>1.1</waterstand>
     <waterstand>2.2</waterstand>
Fisheye: Tag 5771c3ba6863748fcaa7d3499a02c6b49c6c137e refers to a dead (removed) revision in file `Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationVersion1AssessmentLevel.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 5771c3ba6863748fcaa7d3499a02c6b49c6c137e refers to a dead (removed) revision in file `Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationVersion1ContainingBothAssessmentLevelAndHydraulicBoundaryLocation.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 5771c3ba6863748fcaa7d3499a02c6b49c6c137e refers to a dead (removed) revision in file `Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationVersion1HydraulicBoundaryLocationOld.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 5771c3ba6863748fcaa7d3499a02c6b49c6c137e refers to a dead (removed) revision in file `Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationVersion1OldStochastName.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocation.xml
===================================================================
diff -u
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocation.xml	(revision 0)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocation.xml	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie versie="1">
+  <berekening naam="Calculation">
+    <hblocatie/>
+  </berekening>
+</configuratie>
\ No newline at end of file
Fisheye: Tag 5771c3ba6863748fcaa7d3499a02c6b49c6c137e refers to a dead (removed) revision in file `Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocationNew.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 5771c3ba6863748fcaa7d3499a02c6b49c6c137e refers to a dead (removed) revision in file `Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocationOld.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptySoilModel.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptySoilModel.xml	(.../invalidConfigurationCalculationContainingEmptySoilModel.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptySoilModel.xml	(.../invalidConfigurationCalculationContainingEmptySoilModel.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <ondergrondmodel></ondergrondmodel>
   </berekening>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptySoilProfile.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptySoilProfile.xml	(.../invalidConfigurationCalculationContainingEmptySoilProfile.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptySoilProfile.xml	(.../invalidConfigurationCalculationContainingEmptySoilProfile.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <ondergrondschematisatie></ondergrondschematisatie>
   </berekening>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptyStrings.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptyStrings.xml	(.../invalidConfigurationCalculationContainingEmptyStrings.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptyStrings.xml	(.../invalidConfigurationCalculationContainingEmptyStrings.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
-    <hrlocatie/>
+    <hblocatie/>
     <profielschematisatie></profielschematisatie>
     <ondergrondmodel></ondergrondmodel>
     <ondergrondschematisatie></ondergrondschematisatie>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptySurfaceLine.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptySurfaceLine.xml	(.../invalidConfigurationCalculationContainingEmptySurfaceLine.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptySurfaceLine.xml	(.../invalidConfigurationCalculationContainingEmptySurfaceLine.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <profielschematisatie></profielschematisatie>
   </berekening>
Fisheye: Tag 5771c3ba6863748fcaa7d3499a02c6b49c6c137e refers to a dead (removed) revision in file `Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocationNew.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 5771c3ba6863748fcaa7d3499a02c6b49c6c137e refers to a dead (removed) revision in file `Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocationOld.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 5771c3ba6863748fcaa7d3499a02c6b49c6c137e refers to a dead (removed) revision in file `Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothAssessmentLevelAndWaterLevel.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 5771c3ba6863748fcaa7d3499a02c6b49c6c137e refers to a dead (removed) revision in file `Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothHydraulicBoundaryLocationOldAndNew.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothWaterLevelAndHydraulicBoundaryLocation.xml
===================================================================
diff -u
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothWaterLevelAndHydraulicBoundaryLocation.xml	(revision 0)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothWaterLevelAndHydraulicBoundaryLocation.xml	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie versie="1">
+  <berekening naam="Calculation">
+    <waterstand>1.1</waterstand>
+    <hblocatie>Locatie</hblocatie>
+  </berekening>
+</configuratie>
\ No newline at end of file
Fisheye: Tag 5771c3ba6863748fcaa7d3499a02c6b49c6c137e refers to a dead (removed) revision in file `Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothWaterLevelAndHydraulicBoundaryLocationNew.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 5771c3ba6863748fcaa7d3499a02c6b49c6c137e refers to a dead (removed) revision in file `Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothWaterLevelAndHydraulicBoundaryLocationOld.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidEntryPointEmpty.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidEntryPointEmpty.xml	(.../invalidEntryPointEmpty.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidEntryPointEmpty.xml	(.../invalidEntryPointEmpty.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <intredepunt/>
   </berekening>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidEntryPointNoDouble.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidEntryPointNoDouble.xml	(.../invalidEntryPointNoDouble.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidEntryPointNoDouble.xml	(.../invalidEntryPointNoDouble.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <intredepunt>string</intredepunt>
   </berekening>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidExitPointEmpty.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidExitPointEmpty.xml	(.../invalidExitPointEmpty.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidExitPointEmpty.xml	(.../invalidExitPointEmpty.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <uittredepunt/>
   </berekening>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidExitPointNoDouble.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidExitPointNoDouble.xml	(.../invalidExitPointNoDouble.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidExitPointNoDouble.xml	(.../invalidExitPointNoDouble.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <uittredepunt>string</uittredepunt>
   </berekening>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidMultipleDampingFactorExitStochast.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidMultipleDampingFactorExitStochast.xml	(.../invalidMultipleDampingFactorExitStochast.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidMultipleDampingFactorExitStochast.xml	(.../invalidMultipleDampingFactorExitStochast.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation 2">
     <stochasten>
       <stochast naam="dempingsfactor">
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidMultiplePhreaticLevelExitStochast.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidMultiplePhreaticLevelExitStochast.xml	(.../invalidMultiplePhreaticLevelExitStochast.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidMultiplePhreaticLevelExitStochast.xml	(.../invalidMultiplePhreaticLevelExitStochast.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation 2">
     <stochasten>
-      <stochast naam="polderpeil">
+      <stochast naam="binnendijksewaterstand">
         <verwachtingswaarde>0.000</verwachtingswaarde>
         <standaardafwijking>0.100</standaardafwijking>
       </stochast>
-      <stochast naam="polderpeil">
+      <stochast naam="binnendijksewaterstand">
         <verwachtingswaarde>0.000</verwachtingswaarde>
         <standaardafwijking>0.100</standaardafwijking>
       </stochast>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidScenarioContributionEmpty.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidScenarioContributionEmpty.xml	(.../invalidScenarioContributionEmpty.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidScenarioContributionEmpty.xml	(.../invalidScenarioContributionEmpty.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <scenario>
       <bijdrage />
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidScenarioContributionNoDouble.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidScenarioContributionNoDouble.xml	(.../invalidScenarioContributionNoDouble.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidScenarioContributionNoDouble.xml	(.../invalidScenarioContributionNoDouble.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <scenario>
       <bijdrage>string</bijdrage>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidScenarioMultipleContribution.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidScenarioMultipleContribution.xml	(.../invalidScenarioMultipleContribution.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidScenarioMultipleContribution.xml	(.../invalidScenarioMultipleContribution.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <scenario>
       <bijdrage>1.1</bijdrage>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidScenarioMultipleRelevant.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidScenarioMultipleRelevant.xml	(.../invalidScenarioMultipleRelevant.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidScenarioMultipleRelevant.xml	(.../invalidScenarioMultipleRelevant.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <scenario>
       <gebruik>true</gebruik>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidScenarioRelevantEmpty.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidScenarioRelevantEmpty.xml	(.../invalidScenarioRelevantEmpty.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidScenarioRelevantEmpty.xml	(.../invalidScenarioRelevantEmpty.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <scenario>
       <gebruik />
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidScenarioRelevantNoBoolean.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidScenarioRelevantNoBoolean.xml	(.../invalidScenarioRelevantNoBoolean.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidScenarioRelevantNoBoolean.xml	(.../invalidScenarioRelevantNoBoolean.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <scenario>
       <gebruik>string</gebruik>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidStochastMeanEmpty.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidStochastMeanEmpty.xml	(.../invalidStochastMeanEmpty.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidStochastMeanEmpty.xml	(.../invalidStochastMeanEmpty.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <stochasten>
-      <stochast naam="polderpeil">
+      <stochast naam="binnendijksewaterstand">
         <verwachtingswaarde></verwachtingswaarde>
         <standaardafwijking>0.100</standaardafwijking>
       </stochast>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidStochastMeanNoDouble.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidStochastMeanNoDouble.xml	(.../invalidStochastMeanNoDouble.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidStochastMeanNoDouble.xml	(.../invalidStochastMeanNoDouble.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <stochasten>
-      <stochast naam="polderpeil">
+      <stochast naam="binnendijksewaterstand">
         <verwachtingswaarde>string</verwachtingswaarde>
         <standaardafwijking>0.100</standaardafwijking>
       </stochast>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidStochastMultipleMean.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidStochastMultipleMean.xml	(.../invalidStochastMultipleMean.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidStochastMultipleMean.xml	(.../invalidStochastMultipleMean.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <stochasten>
-      <stochast naam="polderpeil">
+      <stochast naam="binnendijksewaterstand">
         <verwachtingswaarde>0.000</verwachtingswaarde>
         <verwachtingswaarde>1.000</verwachtingswaarde>
         <standaardafwijking>0.100</standaardafwijking>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidStochastMultipleStandardDeviation.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidStochastMultipleStandardDeviation.xml	(.../invalidStochastMultipleStandardDeviation.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidStochastMultipleStandardDeviation.xml	(.../invalidStochastMultipleStandardDeviation.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <stochasten>
-      <stochast naam="polderpeil">
+      <stochast naam="binnendijksewaterstand">
         <verwachtingswaarde>0.000</verwachtingswaarde>
         <standaardafwijking>0.100</standaardafwijking>
         <standaardafwijking>0.200</standaardafwijking>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidStochastNoName.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidStochastNoName.xml	(.../invalidStochastNoName.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidStochastNoName.xml	(.../invalidStochastNoName.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <stochasten>
       <stochast>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidStochastStandardDeviationEmpty.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidStochastStandardDeviationEmpty.xml	(.../invalidStochastStandardDeviationEmpty.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidStochastStandardDeviationEmpty.xml	(.../invalidStochastStandardDeviationEmpty.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <stochasten>
-      <stochast naam="polderpeil">
+      <stochast naam="binnendijksewaterstand">
         <verwachtingswaarde>0.000</verwachtingswaarde>
         <standaardafwijking></standaardafwijking>
       </stochast>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidStochastStandardDeviationNoDouble.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidStochastStandardDeviationNoDouble.xml	(.../invalidStochastStandardDeviationNoDouble.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidStochastStandardDeviationNoDouble.xml	(.../invalidStochastStandardDeviationNoDouble.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <stochasten>
-      <stochast naam="polderpeil">
+      <stochast naam="binnendijksewaterstand">
         <verwachtingswaarde>0.000</verwachtingswaarde>
         <standaardafwijking>string</standaardafwijking>
       </stochast>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidStochastUnknownName.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidStochastUnknownName.xml	(.../invalidStochastUnknownName.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidStochastUnknownName.xml	(.../invalidStochastUnknownName.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <stochasten>
       <stochast naam="Test">
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidWaterLevelEmpty.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidWaterLevelEmpty.xml	(.../invalidWaterLevelEmpty.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidWaterLevelEmpty.xml	(.../invalidWaterLevelEmpty.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <waterstand/>
   </berekening>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidWaterLevelNoDouble.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidWaterLevelNoDouble.xml	(.../invalidWaterLevelNoDouble.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidWaterLevelNoDouble.xml	(.../invalidWaterLevelNoDouble.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <waterstand>string</waterstand>
   </berekening>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationCalculationContainingAssessmentLevelAndInfinities.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationCalculationContainingAssessmentLevelAndInfinities.xml	(.../validConfigurationCalculationContainingAssessmentLevelAndInfinities.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationCalculationContainingAssessmentLevelAndInfinities.xml	(.../validConfigurationCalculationContainingAssessmentLevelAndInfinities.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
-    <toetspeil>-INF</toetspeil>
+    <waterstand>-INF</waterstand>
     <intredepunt>-INF</intredepunt>
     <uittredepunt>INF</uittredepunt>
     <stochasten>
-      <stochast naam="polderpeil">
+      <stochast naam="binnendijksewaterstand">
         <verwachtingswaarde>-INF</verwachtingswaarde>
         <standaardafwijking>INF</standaardafwijking>
       </stochast>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationCalculationContainingAssessmentLevelAndNaNs.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationCalculationContainingAssessmentLevelAndNaNs.xml	(.../validConfigurationCalculationContainingAssessmentLevelAndNaNs.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationCalculationContainingAssessmentLevelAndNaNs.xml	(.../validConfigurationCalculationContainingAssessmentLevelAndNaNs.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
-    <toetspeil>NaN</toetspeil>
+    <waterstand>NaN</waterstand>
     <intredepunt>NaN</intredepunt>
     <uittredepunt>NaN</uittredepunt>
     <stochasten>
-      <stochast naam="polderpeil">
+      <stochast naam="binnendijksewaterstand">
         <verwachtingswaarde>NaN</verwachtingswaarde>
         <standaardafwijking>NaN</standaardafwijking>
       </stochast>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationCalculationContainingEmptyStochasts.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationCalculationContainingEmptyStochasts.xml	(.../validConfigurationCalculationContainingEmptyStochasts.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationCalculationContainingEmptyStochasts.xml	(.../validConfigurationCalculationContainingEmptyStochasts.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <stochasten/>
   </berekening>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationCalculationContainingWaterLevelAndInfinities.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationCalculationContainingWaterLevelAndInfinities.xml	(.../validConfigurationCalculationContainingWaterLevelAndInfinities.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationCalculationContainingWaterLevelAndInfinities.xml	(.../validConfigurationCalculationContainingWaterLevelAndInfinities.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <waterstand>-INF</waterstand>
     <intredepunt>-INF</intredepunt>
     <uittredepunt>INF</uittredepunt>
     <stochasten>
-      <stochast naam="polderpeil">
+      <stochast naam="binnendijksewaterstand">
         <verwachtingswaarde>-INF</verwachtingswaarde>
         <standaardafwijking>INF</standaardafwijking>
       </stochast>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationCalculationContainingWaterLevelAndNaNs.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationCalculationContainingWaterLevelAndNaNs.xml	(.../validConfigurationCalculationContainingWaterLevelAndNaNs.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationCalculationContainingWaterLevelAndNaNs.xml	(.../validConfigurationCalculationContainingWaterLevelAndNaNs.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <waterstand>NaN</waterstand>
     <intredepunt>NaN</intredepunt>
     <uittredepunt>NaN</uittredepunt>
     <stochasten>
-      <stochast naam="polderpeil">
+      <stochast naam="binnendijksewaterstand">
         <verwachtingswaarde>NaN</verwachtingswaarde>
         <standaardafwijking>NaN</standaardafwijking>
       </stochast>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationEmptyCalculation.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationEmptyCalculation.xml	(.../validConfigurationEmptyCalculation.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationEmptyCalculation.xml	(.../validConfigurationEmptyCalculation.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation"/>
 </configuratie>
\ No newline at end of file
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationEmptyScenario.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationEmptyScenario.xml	(.../validConfigurationEmptyScenario.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationEmptyScenario.xml	(.../validConfigurationEmptyScenario.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <scenario />
   </berekening>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationEmptyStochasts.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationEmptyStochasts.xml	(.../validConfigurationEmptyStochasts.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationEmptyStochasts.xml	(.../validConfigurationEmptyStochasts.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <stochasten>
-      <stochast naam="polderpeil" />
+      <stochast naam="binnendijksewaterstand" />
       <stochast naam="dempingsfactor" />
     </stochasten>
   </berekening>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingAssessmentLevel.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingAssessmentLevel.xml	(.../validConfigurationFullCalculationContainingAssessmentLevel.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingAssessmentLevel.xml	(.../validConfigurationFullCalculationContainingAssessmentLevel.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
-    <toetspeil>1.1</toetspeil>
+    <waterstand>1.1</waterstand>
     <profielschematisatie>Profielschematisatie</profielschematisatie>
     <uittredepunt>3.3</uittredepunt>
     <intredepunt>2.2</intredepunt>
     <ondergrondmodel>Ondergrondmodel</ondergrondmodel>
     <ondergrondschematisatie>Ondergrondschematisatie</ondergrondschematisatie>
     <stochasten>
-      <stochast naam="polderpeil">
+      <stochast naam="binnendijksewaterstand">
         <verwachtingswaarde>4.4</verwachtingswaarde>
         <standaardafwijking>5.5</standaardafwijking>
       </stochast>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingAssessmentLevel_differentOrder.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingAssessmentLevel_differentOrder.xml	(.../validConfigurationFullCalculationContainingAssessmentLevel_differentOrder.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingAssessmentLevel_differentOrder.xml	(.../validConfigurationFullCalculationContainingAssessmentLevel_differentOrder.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <stochasten>
       <stochast naam="dempingsfactor">
         <standaardafwijking>7.7</standaardafwijking>
         <verwachtingswaarde>6.6</verwachtingswaarde>
       </stochast>
-      <stochast naam="polderpeil">
+      <stochast naam="binnendijksewaterstand">
         <standaardafwijking>5.5</standaardafwijking>
         <verwachtingswaarde>4.4</verwachtingswaarde>
       </stochast>
@@ -20,6 +20,6 @@
     </scenario>
     <uittredepunt>3.3</uittredepunt>
     <profielschematisatie>Profielschematisatie</profielschematisatie>
-    <toetspeil>1.1</toetspeil>
+    <waterstand>1.1</waterstand>
   </berekening>
 </configuratie>
\ No newline at end of file
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocationNew.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocationNew.xml	(.../validConfigurationFullCalculationContainingHydraulicBoundaryLocationNew.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocationNew.xml	(.../validConfigurationFullCalculationContainingHydraulicBoundaryLocationNew.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <hblocatie>Locatie</hblocatie>
     <profielschematisatie>Profielschematisatie</profielschematisatie>
@@ -8,7 +8,7 @@
     <ondergrondmodel>Ondergrondmodel</ondergrondmodel>
     <ondergrondschematisatie>Ondergrondschematisatie</ondergrondschematisatie>
     <stochasten>
-      <stochast naam="polderpeil">
+      <stochast naam="binnendijksewaterstand">
         <verwachtingswaarde>4.4</verwachtingswaarde>
         <standaardafwijking>5.5</standaardafwijking>
       </stochast>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocationOld.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocationOld.xml	(.../validConfigurationFullCalculationContainingHydraulicBoundaryLocationOld.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocationOld.xml	(.../validConfigurationFullCalculationContainingHydraulicBoundaryLocationOld.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
-    <hrlocatie>Locatie</hrlocatie>
+    <hblocatie>Locatie</hblocatie>
     <profielschematisatie>Profielschematisatie</profielschematisatie>
     <intredepunt>2.2</intredepunt>
     <uittredepunt>3.3</uittredepunt>
     <ondergrondmodel>Ondergrondmodel</ondergrondmodel>
     <ondergrondschematisatie>Ondergrondschematisatie</ondergrondschematisatie>
     <stochasten>
-      <stochast naam="polderpeil">
+      <stochast naam="binnendijksewaterstand">
         <verwachtingswaarde>4.4</verwachtingswaarde>
         <standaardafwijking>5.5</standaardafwijking>
       </stochast>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocation_differentOrder_new.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocation_differentOrder_new.xml	(.../validConfigurationFullCalculationContainingHydraulicBoundaryLocation_differentOrder_new.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocation_differentOrder_new.xml	(.../validConfigurationFullCalculationContainingHydraulicBoundaryLocation_differentOrder_new.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <stochasten>
       <stochast naam="dempingsfactor">
         <standaardafwijking>7.7</standaardafwijking>
         <verwachtingswaarde>6.6</verwachtingswaarde>
       </stochast>
-      <stochast naam="polderpeil">
+      <stochast naam="binnendijksewaterstand">
         <standaardafwijking>5.5</standaardafwijking>
         <verwachtingswaarde>4.4</verwachtingswaarde>
       </stochast>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocation_differentOrder_old.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocation_differentOrder_old.xml	(.../validConfigurationFullCalculationContainingHydraulicBoundaryLocation_differentOrder_old.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocation_differentOrder_old.xml	(.../validConfigurationFullCalculationContainingHydraulicBoundaryLocation_differentOrder_old.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <stochasten>
       <stochast naam="dempingsfactor">
         <standaardafwijking>7.7</standaardafwijking>
         <verwachtingswaarde>6.6</verwachtingswaarde>
       </stochast>
-      <stochast naam="polderpeil">
+      <stochast naam="binnendijksewaterstand">
         <standaardafwijking>5.5</standaardafwijking>
         <verwachtingswaarde>4.4</verwachtingswaarde>
       </stochast>
@@ -20,6 +20,6 @@
       <bijdrage>8.8</bijdrage>
     </scenario>
     <profielschematisatie>Profielschematisatie</profielschematisatie>
-    <hrlocatie>Locatie</hrlocatie>
+    <hblocatie>Locatie</hblocatie>
   </berekening>
 </configuratie>
\ No newline at end of file
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingWaterLevel.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingWaterLevel.xml	(.../validConfigurationFullCalculationContainingWaterLevel.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingWaterLevel.xml	(.../validConfigurationFullCalculationContainingWaterLevel.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <waterstand>1.1</waterstand>
     <profielschematisatie>Profielschematisatie</profielschematisatie>
@@ -8,7 +8,7 @@
     <ondergrondmodel>Ondergrondmodel</ondergrondmodel>
     <ondergrondschematisatie>Ondergrondschematisatie</ondergrondschematisatie>
     <stochasten>
-      <stochast naam="polderpeil">
+      <stochast naam="binnendijksewaterstand">
         <verwachtingswaarde>4.4</verwachtingswaarde>
         <standaardafwijking>5.5</standaardafwijking>
       </stochast>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingWaterLevel_differentOrder.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingWaterLevel_differentOrder.xml	(.../validConfigurationFullCalculationContainingWaterLevel_differentOrder.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingWaterLevel_differentOrder.xml	(.../validConfigurationFullCalculationContainingWaterLevel_differentOrder.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <stochasten>
       <stochast naam="dempingsfactor">
         <standaardafwijking>7.7</standaardafwijking>
         <verwachtingswaarde>6.6</verwachtingswaarde>
       </stochast>
-      <stochast naam="polderpeil">
+      <stochast naam="binnendijksewaterstand">
         <standaardafwijking>5.5</standaardafwijking>
         <verwachtingswaarde>4.4</verwachtingswaarde>
       </stochast>
Fisheye: Tag 5771c3ba6863748fcaa7d3499a02c6b49c6c137e refers to a dead (removed) revision in file `Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationVersion1ContainingHydraulicBoundaryLocation.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 5771c3ba6863748fcaa7d3499a02c6b49c6c137e refers to a dead (removed) revision in file `Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationVersion1ContainingHydraulicBoundaryLocation_differentOrder.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 5771c3ba6863748fcaa7d3499a02c6b49c6c137e refers to a dead (removed) revision in file `Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationVersion1ContainingWaterLevel.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 5771c3ba6863748fcaa7d3499a02c6b49c6c137e refers to a dead (removed) revision in file `Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationVersion1ContainingWaterLevel_differentOrder.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationPartialCalculation.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationPartialCalculation.xml	(.../validConfigurationPartialCalculation.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationPartialCalculation.xml	(.../validConfigurationPartialCalculation.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <uittredepunt>2.2</uittredepunt>
     <ondergrondschematisatie>Ondergrondschematisatie</ondergrondschematisatie>
     <stochasten>
-      <stochast naam="polderpeil">
+      <stochast naam="binnendijksewaterstand">
         <verwachtingswaarde>3.3</verwachtingswaarde>
         <standaardafwijking>4.4</standaardafwijking>
       </stochast>
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationStochastsNoMean.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationStochastsNoMean.xml	(.../validConfigurationStochastsNoMean.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationStochastsNoMean.xml	(.../validConfigurationStochastsNoMean.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <stochasten>
-      <stochast naam="polderpeil">
+      <stochast naam="binnendijksewaterstand">
         <standaardafwijking>0.100</standaardafwijking>
       </stochast>
       <stochast naam="dempingsfactor">
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationStochastsNoStandardDeviation.xml
===================================================================
diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r5771c3ba6863748fcaa7d3499a02c6b49c6c137e
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationStochastsNoStandardDeviation.xml	(.../validConfigurationStochastsNoStandardDeviation.xml)	(revision bf1fde9d2147a6eeaecebbb371be2c4856759159)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationStochastsNoStandardDeviation.xml	(.../validConfigurationStochastsNoStandardDeviation.xml)	(revision 5771c3ba6863748fcaa7d3499a02c6b49c6c137e)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuratie>
+<configuratie versie="1">
   <berekening naam="Calculation">
     <stochasten>
-      <stochast naam="polderpeil">
+      <stochast naam="binnendijksewaterstand">
         <verwachtingswaarde>0.000</verwachtingswaarde>
       </stochast>
       <stochast naam="dempingsfactor">