Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r8ab9e7894ce5161b5bea48311e53fefb8b8d23f1 -r5d32f059a2c417ffaab9d7404acdf2e133ec4f18
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 8ab9e7894ce5161b5bea48311e53fefb8b8d23f1)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 5d32f059a2c417ffaab9d7404acdf2e133ec4f18)
@@ -789,8 +789,8 @@
         public void ContextMenuStrip_FailureMechanismContributionZero_CalculateAllAndValidateAllDisabled()
         {
             // Setup
-            string validHydroDatabasePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO,
-                                                                       Path.Combine("HydraulicBoundaryDatabaseImporter", "complete.sqlite"));
+            string validHydraulicBoundaryDatabasePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO,
+                                                                                   Path.Combine("HydraulicBoundaryDatabaseImporter", "complete.sqlite"));
 
             using (var treeViewControl = new TreeViewControl())
             {
@@ -806,7 +806,7 @@
                 var assessmentSection = mocks.Stub<IAssessmentSection>();
                 assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase
                 {
-                    FilePath = validHydroDatabasePath
+                    FilePath = validHydraulicBoundaryDatabasePath
                 });
 
                 var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group,
@@ -845,8 +845,8 @@
         public void ContextMenuStrip_AllRequiredInputSet_CalculateAllAndValidateAllEnabled()
         {
             // Setup
-            string validHydroDatabasePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO,
-                                                                       Path.Combine("HydraulicBoundaryDatabaseImporter", "complete.sqlite"));
+            string validHydraulicBoundaryDatabasePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO,
+                                                                                   Path.Combine("HydraulicBoundaryDatabaseImporter", "complete.sqlite"));
 
             using (var treeViewControl = new TreeViewControl())
             {
@@ -862,7 +862,7 @@
                 var assessmentSection = mocks.Stub<IAssessmentSection>();
                 assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase
                 {
-                    FilePath = validHydroDatabasePath
+                    FilePath = validHydraulicBoundaryDatabasePath
                 });
 
                 var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group,
Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs
===================================================================
diff -u -ra60ce4ca3df3613160ce8c762b35ed848543d3a2 -r5d32f059a2c417ffaab9d7404acdf2e133ec4f18
--- Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs	(.../TestDataGenerator.cs)	(revision a60ce4ca3df3613160ce8c762b35ed848543d3a2)
+++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs	(.../TestDataGenerator.cs)	(revision 5d32f059a2c417ffaab9d7404acdf2e133ec4f18)
@@ -151,7 +151,7 @@
         public static StabilityStoneCoverFailureMechanism GetStabilityStoneCoverFailureMechanismWithAllCalculationConfigurations()
         {
             var failureMechanism = new StabilityStoneCoverFailureMechanism();
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "<hydro location>", 0, 0);
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
             SetFullyConfiguredFailureMechanism(failureMechanism, hydraulicBoundaryLocation);
 
             return failureMechanism;
@@ -164,7 +164,7 @@
         public static WaveImpactAsphaltCoverFailureMechanism GetWaveImpactAsphaltCoverFailureMechanismWithAllCalculationConfigurations()
         {
             var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "<hydro location>", 0, 0);
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
             SetFullyConfiguredFailureMechanism(failureMechanism, hydraulicBoundaryLocation);
 
             return failureMechanism;
@@ -190,7 +190,7 @@
         public static HeightStructuresFailureMechanism GetHeightStructuresFailureMechanismWithAlLCalculationConfigurations()
         {
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "<hydro location>", 0, 0);
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
             SetFullyConfiguredFailureMechanism(failureMechanism, hydraulicBoundaryLocation);
 
             return failureMechanism;
@@ -203,7 +203,7 @@
         public static ClosingStructuresFailureMechanism GetClosingStructuresFailureMechanismWithAllCalculationConfigurations()
         {
             var failureMechanism = new ClosingStructuresFailureMechanism();
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "<hydro location>", 0, 0);
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
             SetFullyConfiguredFailureMechanism(failureMechanism, hydraulicBoundaryLocation);
 
             return failureMechanism;
@@ -216,7 +216,7 @@
         public static StabilityPointStructuresFailureMechanism GetStabilityPointStructuresFailureMechanismWithAllCalculationConfigurations()
         {
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "<hydro location>", 0, 0);
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
             SetFullyConfiguredFailureMechanism(failureMechanism, hydraulicBoundaryLocation);
 
             return failureMechanism;
@@ -229,7 +229,7 @@
         public static GrassCoverErosionInwardsFailureMechanism GetGrassCoverErosionInwardsFailureMechanismWithAllCalculationConfigurations()
         {
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "<hydro location>", 0, 0);
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
             SetFullyConfiguredFailureMechanism(failureMechanism, hydraulicBoundaryLocation);
 
             return failureMechanism;
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs
===================================================================
diff -u -r3f39f03a5882e75dc3742ff7c3d84bae6fb757dd -r5d32f059a2c417ffaab9d7404acdf2e133ec4f18
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs	(.../MacroStabilityInwardsTestDataGenerator.cs)	(revision 3f39f03a5882e75dc3742ff7c3d84bae6fb757dd)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs	(.../MacroStabilityInwardsTestDataGenerator.cs)	(revision 5d32f059a2c417ffaab9d7404acdf2e133ec4f18)
@@ -45,7 +45,7 @@
         public static MacroStabilityInwardsFailureMechanism GetMacroStabilityInwardsFailureMechanismWithAllCalculationConfigurations()
         {
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "<hydro location>", 0, 0);
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
             ConfigureFailureMechanismWithAllCalculationConfigurations(failureMechanism, hydraulicBoundaryLocation);
 
             return failureMechanism;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingTestDataGenerator.cs
===================================================================
diff -u -r3f39f03a5882e75dc3742ff7c3d84bae6fb757dd -r5d32f059a2c417ffaab9d7404acdf2e133ec4f18
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingTestDataGenerator.cs	(.../PipingTestDataGenerator.cs)	(revision 3f39f03a5882e75dc3742ff7c3d84bae6fb757dd)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingTestDataGenerator.cs	(.../PipingTestDataGenerator.cs)	(revision 5d32f059a2c417ffaab9d7404acdf2e133ec4f18)
@@ -47,7 +47,7 @@
         public static PipingFailureMechanism GetPipingFailureMechanismWithAllCalculationConfigurations()
         {
             var failureMechanism = new PipingFailureMechanism();
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "<hydro location>", 0, 0);
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
             ConfigureFailureMechanismWithAllCalculationConfigurations(failureMechanism, hydraulicBoundaryLocation);
 
             return failureMechanism;
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r6f33b44599df032ecae3342b0aacd606a9e87c1f -r5d32f059a2c417ffaab9d7404acdf2e133ec4f18
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 6f33b44599df032ecae3342b0aacd606a9e87c1f)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 5d32f059a2c417ffaab9d7404acdf2e133ec4f18)
@@ -770,8 +770,8 @@
         public void ContextMenuStrip_AllRequiredInputSet_CalculateAllAndValidateAllEnabled()
         {
             // Setup
-            string validHydroDatabasePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO,
-                                                                       Path.Combine("HydraulicBoundaryDatabaseImporter", "complete.sqlite"));
+            string validHydraulicBoundaryDatabasePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO,
+                                                                                   Path.Combine("HydraulicBoundaryDatabaseImporter", "complete.sqlite"));
 
             using (var treeViewControl = new TreeViewControl())
             {
@@ -784,7 +784,7 @@
                 var assessmentSection = mocks.Stub<IAssessmentSection>();
                 assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase
                 {
-                    FilePath = validHydroDatabasePath
+                    FilePath = validHydraulicBoundaryDatabasePath
                 });
 
                 var nodeData = new StabilityStoneCoverWaveConditionsCalculationGroupContext(group,
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r6f33b44599df032ecae3342b0aacd606a9e87c1f -r5d32f059a2c417ffaab9d7404acdf2e133ec4f18
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 6f33b44599df032ecae3342b0aacd606a9e87c1f)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 5d32f059a2c417ffaab9d7404acdf2e133ec4f18)
@@ -787,8 +787,8 @@
         public void ContextMenuStrip_AllRequiredInputSet_CalculateAllAndValidateAllEnabled()
         {
             // Setup
-            string validHydroDatabasePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO,
-                                                                       Path.Combine("HydraulicBoundaryDatabaseImporter", "complete.sqlite"));
+            string validHydraulicBoundaryDatabasePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO,
+                                                                                   Path.Combine("HydraulicBoundaryDatabaseImporter", "complete.sqlite"));
 
             using (var treeViewControl = new TreeViewControl())
             {
@@ -800,7 +800,7 @@
                 var assessmentSection = mocks.Stub<IAssessmentSection>();
                 assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase
                 {
-                    FilePath = validHydroDatabasePath
+                    FilePath = validHydraulicBoundaryDatabasePath
                 });
 
                 var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(group,