Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r624268bcc5f60b5965bb056ca72cea15daff06f3 -r74e4e0c7b938a3c3080ff6b4a09eb01a961fed6a
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationsContextTreeNodeInfoTest.cs	(.../DuneLocationsContextTreeNodeInfoTest.cs)	(revision 624268bcc5f60b5965bb056ca72cea15daff06f3)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationsContextTreeNodeInfoTest.cs	(.../DuneLocationsContextTreeNodeInfoTest.cs)	(revision 74e4e0c7b938a3c3080ff6b4a09eb01a961fed6a)
@@ -208,10 +208,8 @@
             // Setup
             using (var treeViewControl = new TreeViewControl())
             {
-                var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
-
                 var assessmentSection = mocks.Stub<IAssessmentSection>();
-                assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
+                assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
 
                 var failureMechanism = new DuneErosionFailureMechanism
                 {
@@ -252,15 +250,13 @@
 
             using (var treeViewControl = new TreeViewControl())
             {
-                var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+                var assessmentSection = mocks.Stub<IAssessmentSection>();
+                assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
                 {
                     FilePath = validFilePath,
                     Version = "1.0"
                 };
 
-                var assessmentSection = mocks.Stub<IAssessmentSection>();
-                assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
-
                 var failureMechanism = new DuneErosionFailureMechanism
                 {
                     Contribution = 10
@@ -297,15 +293,13 @@
 
             using (var treeViewControl = new TreeViewControl())
             {
-                var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+                var assessmentSection = mocks.Stub<IAssessmentSection>();
+                assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
                 {
                     FilePath = validFilePath,
                     Version = "1.0"
                 };
 
-                var assessmentSection = mocks.Stub<IAssessmentSection>();
-                assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
-
                 var failureMechanism = new DuneErosionFailureMechanism();
 
                 var builder = new CustomItemsOnlyContextMenuBuilder();
@@ -341,15 +335,13 @@
 
             using (var treeViewControl = new TreeViewControl())
             {
-                var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+                var assessmentSection = mocks.Stub<IAssessmentSection>();
+                assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
                 {
                     FilePath = validFilePath,
                     Version = "1.0"
                 };
 
-                var assessmentSection = mocks.Stub<IAssessmentSection>();
-                assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
-
                 var failureMechanism = new DuneErosionFailureMechanism
                 {
                     Contribution = 10
@@ -409,13 +401,11 @@
                     })
                 });
 
-                var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+                var assessmentSection = mocks.Stub<IAssessmentSection>();
+                assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
                 {
                     FilePath = validFilePath
                 };
-
-                var assessmentSection = mocks.Stub<IAssessmentSection>();
-                assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
                 assessmentSection.Stub(a => a.Id).Return("13-1");
                 assessmentSection.Stub(a => a.GetFailureMechanisms()).Return(new[]
                 {