Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -rbf6f075099ac4af95a9c0065604d2c5a8a55cf8d -rdaad7104ad012ba7dd5526597d183b87eb7bd564
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs	(.../WaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision bf6f075099ac4af95a9c0065604d2c5a8a55cf8d)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs	(.../WaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision daad7104ad012ba7dd5526597d183b87eb7bd564)
@@ -99,7 +99,7 @@
             var context = new WaveHeightLocationsContext(new ObservableList<HydraulicBoundaryLocation>(),
                                                          assessmentSection,
                                                          () => 0.01,
-                                                         hbl => new HydraulicBoundaryLocationCalculation(),
+                                                         hbl => new HydraulicBoundaryLocationCalculation(hbl),
                                                          categoryBoundaryName);
 
             // Setup
@@ -153,7 +153,7 @@
             var nodeData = new WaveHeightLocationsContext(new ObservableList<HydraulicBoundaryLocation>(),
                                                           assessmentSection,
                                                           () => 0.01,
-                                                          hbl => new HydraulicBoundaryLocationCalculation(),
+                                                          hbl => new HydraulicBoundaryLocationCalculation(hbl),
                                                           "Category");
 
             using (var treeViewControl = new TreeViewControl())
@@ -188,7 +188,7 @@
             var nodeData = new WaveHeightLocationsContext(new ObservableList<HydraulicBoundaryLocation>(),
                                                           assessmentSection,
                                                           () => 0.01,
-                                                          hbl => new HydraulicBoundaryLocationCalculation(),
+                                                          hbl => new HydraulicBoundaryLocationCalculation(hbl),
                                                           "Category");
 
             using (var treeViewControl = new TreeViewControl())
@@ -231,7 +231,7 @@
             var nodeData = new WaveHeightLocationsContext(assessmentSection.HydraulicBoundaryDatabase.Locations,
                                                           assessmentSection,
                                                           () => 0.01,
-                                                          hbl => new HydraulicBoundaryLocationCalculation(),
+                                                          hbl => new HydraulicBoundaryLocationCalculation(hbl),
                                                           "Category");
 
             using (var treeViewControl = new TreeViewControl())
@@ -280,7 +280,7 @@
             var nodeData = new WaveHeightLocationsContext(hydraulicBoundaryDatabase.Locations,
                                                           assessmentSection,
                                                           () => 0.01,
-                                                          hbl => new HydraulicBoundaryLocationCalculation(),
+                                                          hbl => new HydraulicBoundaryLocationCalculation(hbl),
                                                           "Category");
 
             using (var treeViewControl = new TreeViewControl())
@@ -335,7 +335,7 @@
             var context = new WaveHeightLocationsContext(assessmentSection.HydraulicBoundaryDatabase.Locations,
                                                          assessmentSection,
                                                          getNormFunc,
-                                                         hbl => new HydraulicBoundaryLocationCalculation(),
+                                                         hbl => new HydraulicBoundaryLocationCalculation(hbl),
                                                          "Category");
 
             using (var treeViewControl = new TreeViewControl())
@@ -407,7 +407,7 @@
             var context = new WaveHeightLocationsContext(assessmentSection.HydraulicBoundaryDatabase.Locations,
                                                          assessmentSection,
                                                          getNormFunc,
-                                                         hbl => new HydraulicBoundaryLocationCalculation(),
+                                                         hbl => new HydraulicBoundaryLocationCalculation(hbl),
                                                          "Category");
 
             using (var treeViewControl = new TreeViewControl())
@@ -478,7 +478,7 @@
             var context = new WaveHeightLocationsContext(assessmentSection.HydraulicBoundaryDatabase.Locations,
                                                          assessmentSection,
                                                          getNormFunc,
-                                                         hbl => new HydraulicBoundaryLocationCalculation(),
+                                                         hbl => new HydraulicBoundaryLocationCalculation(hbl),
                                                          "Category");
 
             using (var treeViewControl = new TreeViewControl())
@@ -530,22 +530,22 @@
         {
             // Given
             const string locationName = "locationName";
-            var location = new TestHydraulicBoundaryLocation(locationName);
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(locationName);
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
             {
                 HydraulicBoundaryDatabase =
                 {
                     Locations =
                     {
-                        location
+                        hydraulicBoundaryLocation
                     },
                     FilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite")
                 },
                 Id = string.Empty
             };
 
             const string categoryBoundaryName = "Category";
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation();
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation);
             var context = new WaveHeightLocationsContext(assessmentSection.HydraulicBoundaryDatabase.Locations,
                                                          assessmentSection,
                                                          () => 0.01,