Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r0b1d32f7e945fcf7ba1f9fdaeebb61765af3f7b0 -r53bfde12ab449eba06567e6ff64627faec1d8026
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs	(.../WaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision 0b1d32f7e945fcf7ba1f9fdaeebb61765af3f7b0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs	(.../WaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision 53bfde12ab449eba06567e6ff64627faec1d8026)
@@ -58,11 +58,6 @@
 
         private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
 
-        public override void Setup()
-        {
-            mockRepository = new MockRepository();
-        }
-
         [Test]
         public void Initialized_Always_ExpectedPropertiesSet()
         {
@@ -111,7 +106,7 @@
         }
 
         [Test]
-        public void Image_Always_ReturnsGeneralFolderIcon()
+        public void Image_Always_ReturnsGenericInputOutputIcon()
         {
             // Setup
             using (var plugin = new RingtoetsPlugin())
@@ -122,7 +117,7 @@
                 Image image = info.Image(null);
 
                 // Assert
-                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GeneralFolderIcon, image);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
             }
         }
 
@@ -143,7 +138,7 @@
                 menuBuilder.Expect(mb => mb.Build()).Return(null);
             }
 
-            var nodeData = new WaveHeightLocationsContext(new ObservableList<HydraulicBoundaryLocation>(), 
+            var nodeData = new WaveHeightLocationsContext(new ObservableList<HydraulicBoundaryLocation>(),
                                                           assessmentSection);
 
             using (var treeViewControl = new TreeViewControl())
@@ -164,6 +159,7 @@
                     info.ContextMenuStrip(nodeData, null, treeViewControl);
                 }
             }
+
             // Assert
             mockRepository.VerifyAll();
         }
@@ -354,6 +350,7 @@
                     }
                 }
             }
+
             mockRepository.VerifyAll();
         }
 
@@ -422,6 +419,7 @@
                     }
                 }
             }
+
             mockRepository.VerifyAll();
         }
 
@@ -489,6 +487,7 @@
                     }
                 }
             }
+
             mockRepository.VerifyAll();
         }
 
@@ -567,9 +566,15 @@
                     }
                 }
             }
+
             mockRepository.VerifyAll();
         }
 
+        public override void Setup()
+        {
+            mockRepository = new MockRepository();
+        }
+
         private static TreeNodeInfo GetInfo(RingtoetsPlugin plugin)
         {
             return plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(WaveHeightLocationsContext));