Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuBuilderTest.cs
===================================================================
diff -u -rbd29bacc20bc58cc67f27dd33fa4fa6b41db873c -r09e76611c2a789b6f015368968a18ea5b9b138cc
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuBuilderTest.cs	(.../RingtoetsContextMenuBuilderTest.cs)	(revision bd29bacc20bc58cc67f27dd33fa4fa6b41db873c)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuBuilderTest.cs	(.../RingtoetsContextMenuBuilderTest.cs)	(revision 09e76611c2a789b6f015368968a18ea5b9b138cc)
@@ -386,7 +386,9 @@
         }
 
         [Test]
-        public void AddChangeRelevancyOfFailureMechanismItem_WhenBuild_ItemAddedToContextMenuEnabled()
+        [TestCase(true)]
+        [TestCase(false)]
+        public void AddToggleRelevancyOfFailureMechanismItem_WhenBuild_ItemAddedToContextMenuEnabled(bool isRelevant)
         {
             // Setup
             var mocks = new MockRepository();
@@ -395,22 +397,25 @@
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
             var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var failureMechanismMock = mocks.StrictMock<IFailureMechanism>();
+            failureMechanismMock.Expect(fm => fm.IsRelevant).Return(isRelevant);
             var failureMechanismContextMock = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
+            failureMechanismContextMock.Expect(fmc => fmc.WrappedData).Return(failureMechanismMock);
             mocks.ReplayAll();
 
             var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, failureMechanismMock, treeViewControlMock);
             var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
             // Call
-            var result = ringtoetsContextMenuBuilder.AddChangeRelevancyOfFailureMechanismItem(failureMechanismContextMock, null).Build();
+            var result = ringtoetsContextMenuBuilder.AddToggleRelevancyOfFailureMechanismItem(failureMechanismContextMock, null).Build();
 
             // Assert
             Assert.IsInstanceOf<ContextMenuStrip>(result);
             Assert.AreEqual(1, result.Items.Count);
+            var checkboxIcon = isRelevant ? RingtoetsFormsResources.Checkbox_empty : RingtoetsFormsResources.Checkbox_ticked;
             TestHelper.AssertContextMenuStripContainsItem(result, 0,
                                                           RingtoetsFormsResources.FailureMechanismContextMenuStrip_Is_relevant,
                                                           RingtoetsFormsResources.FailureMechanismContextMenuStrip_Is_relevant_Tooltip,
-                                                          RingtoetsFormsResources.Checkbox_ticked);
+                                                          checkboxIcon);
 
             mocks.VerifyAll();
         }
@@ -550,37 +555,6 @@
         }
 
         [Test]
-        public void AddDisabledChangeRelevancyItem_WhenBuild_ItemAddedToContextMenu()
-        {
-            // Setup
-            var mocks = new MockRepository();
-            var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
-            var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
-            var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
-            var failureMechanismContextMock = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
-
-            mocks.ReplayAll();
-
-            var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, failureMechanismContextMock, treeViewControlMock);
-            var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
-
-            // Call
-            var result = ringtoetsContextMenuBuilder.AddDisabledChangeRelevancyItem(failureMechanismContextMock).Build();
-
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
-
-            TestHelper.AssertContextMenuStripContainsItem(result, 0,
-                                                          RingtoetsFormsResources.FailureMechanismContextMenuStrip_Is_relevant,
-                                                          RingtoetsFormsResources.FailureMechanismContextMenuStrip_Is_relevant_Tooltip,
-                                                          RingtoetsFormsResources.Checkbox_empty);
-
-            mocks.VerifyAll();
-        }
-
-        [Test]
         public void AddPerformAllCalculationsInFailureMechanismItem_WhenBuildWithAllValidData_ItemAddedToContextmenuEnabled()
         {
             // Setup