Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -r9b7cadea8b8f2e8a9eab25d6af2d7c3a71cbfe0f -rf530cb0234582e6d63d24045b0dc7943967ae04e
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 9b7cadea8b8f2e8a9eab25d6af2d7c3a71cbfe0f)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision f530cb0234582e6d63d24045b0dc7943967ae04e)
@@ -961,9 +961,9 @@
                 Text = context => noProbabilityValueDoubleConverter.ConvertToString(context.WrappedData.TargetProbability),
                 Image = context => RiskeerCommonFormsResources.GenericInputOutputIcon,
                 EnsureVisibleOnCreate = (context, o) => true,
-                ContextMenuStrip = WaterLevelCalculationsForUserDefinedTargetProbabilityContextMenuStrip,
                 CanRemove = (context, o) => true,
-                OnNodeRemoved = WaterLevelCalculationsForUserDefinedTargetProbabilityOnNodeRemoved
+                OnNodeRemoved = WaterLevelCalculationsForUserDefinedTargetProbabilityOnNodeRemoved,
+                ContextMenuStrip = WaterLevelCalculationsForUserDefinedTargetProbabilityContextMenuStrip
             };
 
             yield return new TreeNodeInfo<WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContext>
@@ -979,9 +979,9 @@
                 Text = context => noProbabilityValueDoubleConverter.ConvertToString(context.WrappedData.TargetProbability),
                 Image = context => RiskeerCommonFormsResources.GenericInputOutputIcon,
                 EnsureVisibleOnCreate = (context, o) => true,
-                ContextMenuStrip = WaveHeightCalculationsForUserDefinedTargetProbabilityContextMenuStrip,
                 CanRemove = (context, o) => true,
-                OnNodeRemoved = WaveHeightCalculationsForUserDefinedTargetProbabilityOnNodeRemoved
+                OnNodeRemoved = WaveHeightCalculationsForUserDefinedTargetProbabilityOnNodeRemoved,
+                ContextMenuStrip = WaveHeightCalculationsForUserDefinedTargetProbabilityContextMenuStrip
             };
 
             yield return new TreeNodeInfo<DesignWaterLevelCalculationsGroupContext>
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs
===================================================================
diff -u -re3d3809f19ac64445c80f130aa5d775fafc2a28e -rf530cb0234582e6d63d24045b0dc7943967ae04e
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs	(.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs)	(revision e3d3809f19ac64445c80f130aa5d775fafc2a28e)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs	(.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs)	(revision f530cb0234582e6d63d24045b0dc7943967ae04e)
@@ -141,6 +141,38 @@
         }
 
         [Test]
+        public void EnsureVisibleOnCreate_Always_ReturnsTrue()
+        {
+            // Setup
+            using (var plugin = new RiskeerPlugin())
+            {
+                TreeNodeInfo info = GetInfo(plugin);
+
+                // Call
+                bool ensureVisibleOnCreate = info.EnsureVisibleOnCreate(null, null);
+
+                // Assert
+                Assert.IsTrue(ensureVisibleOnCreate);
+            }
+        }
+
+        [Test]
+        public void CanRemove_Always_ReturnsTrue()
+        {
+            // Setup
+            using (var plugin = new RiskeerPlugin())
+            {
+                TreeNodeInfo info = GetInfo(plugin);
+
+                // Call
+                bool canRemove = info.CanRemove(null, null);
+
+                // Assert
+                Assert.IsTrue(canRemove);
+            }
+        }
+
+        [Test]
         public void ContextMenuStrip_Always_CallsContextMenuBuilderMethods()
         {
             // Setup