Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs
===================================================================
diff -u -r93d214db8ac0a90b6f1bf1712a414e4f31c3eed9 -r28743d8fed7b8b658764829b629fda81786aa808
--- Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs	(.../TreeViewContextMenuItemFactoryTest.cs)	(revision 93d214db8ac0a90b6f1bf1712a414e4f31c3eed9)
+++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs	(.../TreeViewContextMenuItemFactoryTest.cs)	(revision 28743d8fed7b8b658764829b629fda81786aa808)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using System.Windows.Forms;
 using Core.Common.Controls.TreeView;
 using Core.Common.Gui.ContextMenu;
 using Core.Common.Gui.Properties;
@@ -137,7 +138,7 @@
             var factory = new TreeViewContextMenuItemFactory(nodeData, treeViewControlMock);
 
             // Call
-            var item = factory.CreateDeleteChildrenItem();
+            ToolStripItem item = factory.CreateDeleteChildrenItem();
             item.PerformClick();
 
             // Assert
Index: Core/Common/test/Core.Common.Gui.TestUtil/ContextMenu/CustomItemsOnlyContextMenuBuilder.cs
===================================================================
diff -u -rb6f4e414fc874653cc6ad84b80f330b28e69b823 -r28743d8fed7b8b658764829b629fda81786aa808
--- Core/Common/test/Core.Common.Gui.TestUtil/ContextMenu/CustomItemsOnlyContextMenuBuilder.cs	(.../CustomItemsOnlyContextMenuBuilder.cs)	(revision b6f4e414fc874653cc6ad84b80f330b28e69b823)
+++ Core/Common/test/Core.Common.Gui.TestUtil/ContextMenu/CustomItemsOnlyContextMenuBuilder.cs	(.../CustomItemsOnlyContextMenuBuilder.cs)	(revision 28743d8fed7b8b658764829b629fda81786aa808)
@@ -35,7 +35,7 @@
         private readonly ContextMenuStrip contextMenu = new ContextMenuStrip();
 
         /// <summary>
-        /// Does nothing.
+        /// Adds a <see cref="StrictContextMenuItem"/> to the <see cref="ContextMenuStrip"/>.
         /// </summary>
         /// <returns>The <see cref="CustomItemsOnlyContextMenuBuilder"/>.</returns>
         public IContextMenuBuilder AddRenameItem()
@@ -45,7 +45,7 @@
         }
 
         /// <summary>
-        /// Does nothing.
+        /// Adds a <see cref="StrictContextMenuItem"/> to the <see cref="ContextMenuStrip"/>.
         /// </summary>
         /// <returns>The <see cref="CustomItemsOnlyContextMenuBuilder"/>.</returns>
         public IContextMenuBuilder AddDeleteItem()
@@ -55,7 +55,7 @@
         }
 
         /// <summary>
-        /// Does nothing.
+        /// Adds a <see cref="StrictContextMenuItem"/> to the <see cref="ContextMenuStrip"/>.
         /// </summary>
         /// <returns>The <see cref="CustomItemsOnlyContextMenuBuilder"/>.</returns>
         public IContextMenuBuilder AddDeleteChildrenItem()
@@ -74,7 +74,7 @@
         }
 
         /// <summary>
-        /// Does nothing.
+        /// Adds a <see cref="StrictContextMenuItem"/> to the <see cref="ContextMenuStrip"/>.
         /// </summary>
         /// <returns>The <see cref="CustomItemsOnlyContextMenuBuilder"/>.</returns>
         public IContextMenuBuilder AddCollapseAllItem()
@@ -93,7 +93,7 @@
         }
 
         /// <summary>
-        /// Does nothing.
+        /// Adds a <see cref="StrictContextMenuItem"/> to the <see cref="ContextMenuStrip"/>.
         /// </summary>
         /// <returns>The <see cref="CustomItemsOnlyContextMenuBuilder"/>.</returns>
         public IContextMenuBuilder AddExportItem()
@@ -103,7 +103,7 @@
         }
 
         /// <summary>
-        /// Does nothing.
+        /// Adds a <see cref="StrictContextMenuItem"/> to the <see cref="ContextMenuStrip"/>.
         /// </summary>
         /// <returns>The <see cref="CustomItemsOnlyContextMenuBuilder"/>.</returns>
         public IContextMenuBuilder AddImportItem()
@@ -113,7 +113,7 @@
         }
 
         /// <summary>
-        /// Does nothing.
+        /// Adds a <see cref="StrictContextMenuItem"/> to the <see cref="ContextMenuStrip"/>.
         /// </summary>
         /// <returns>The <see cref="CustomItemsOnlyContextMenuBuilder"/>.</returns>
         public IContextMenuBuilder AddPropertiesItem()
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb6f4e414fc874653cc6ad84b80f330b28e69b823 -r28743d8fed7b8b658764829b629fda81786aa808
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision b6f4e414fc874653cc6ad84b80f330b28e69b823)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 28743d8fed7b8b658764829b629fda81786aa808)
@@ -28,7 +28,6 @@
 using Core.Common.Gui;
 using Core.Common.Gui.Commands;
 using Core.Common.Gui.ContextMenu;
-using Core.Common.Gui.Properties;
 using Core.Common.Gui.TestUtil.ContextMenu;
 using Core.Common.TestUtil;
 using NUnit.Extensions.Forms;
@@ -42,7 +41,6 @@
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.HydraRing.Data;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
-using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
 
 namespace Ringtoets.ClosingStructures.Forms.Test.TreeNodeInfos
 {
@@ -245,7 +243,8 @@
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexRootGroup,
                                                                   "Berekening &toevoegen",
                                                                   "Voeg een nieuwe berekening toe aan deze berekeningsmap.",
-                                                                  RingtoetsCommonFormsResources.FailureMechanismIcon);;
+                                                                  RingtoetsCommonFormsResources.FailureMechanismIcon);
+                    ;
 
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexRootGroup,
                                                                   "Alles &valideren",
@@ -382,8 +381,8 @@
             };
 
             var nodeData = new ClosingStructuresCalculationGroupContext(group,
-                                                                       failureMechanism,
-                                                                       assessmentSectionMock);
+                                                                        failureMechanism,
+                                                                        assessmentSectionMock);
 
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
@@ -436,8 +435,8 @@
             assessmentSectionMock.HydraulicBoundaryDatabase = null;
 
             var nodeData = new ClosingStructuresCalculationGroupContext(group,
-                                                                       failureMechanism,
-                                                                       assessmentSectionMock);
+                                                                        failureMechanism,
+                                                                        assessmentSectionMock);
 
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
@@ -490,8 +489,8 @@
             assessmentSectionMock.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
 
             var nodeData = new ClosingStructuresCalculationGroupContext(group,
-                                                                       failureMechanism,
-                                                                       assessmentSectionMock);
+                                                                        failureMechanism,
+                                                                        assessmentSectionMock);
 
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
@@ -554,8 +553,8 @@
             assessmentSectionMock.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
 
             var nodeData = new ClosingStructuresCalculationGroupContext(group,
-                                                                       failureMechanism,
-                                                                       assessmentSectionMock);
+                                                                        failureMechanism,
+                                                                        assessmentSectionMock);
 
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
@@ -592,8 +591,8 @@
             var failureMechanism = new ClosingStructuresFailureMechanism();
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             var nodeData = new ClosingStructuresCalculationGroupContext(group,
-                                                                       failureMechanism,
-                                                                       assessmentSectionMock);
+                                                                        failureMechanism,
+                                                                        assessmentSectionMock);
             var calculationGroup = new CalculationGroup
             {
                 Name = "Nieuwe map"
@@ -639,8 +638,8 @@
             var failureMechanism = new ClosingStructuresFailureMechanism();
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             var nodeData = new ClosingStructuresCalculationGroupContext(group,
-                                                                       failureMechanism,
-                                                                       assessmentSectionMock);
+                                                                        failureMechanism,
+                                                                        assessmentSectionMock);
             var calculation = new ClosingStructuresCalculation
             {
                 Name = "Nieuwe berekening"
Index: Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/IFailureMechanism.cs
===================================================================
diff -u -r38600213ce6ca43c1819c81dd95c8ce786650ac3 -r28743d8fed7b8b658764829b629fda81786aa808
--- Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/IFailureMechanism.cs	(.../IFailureMechanism.cs)	(revision 38600213ce6ca43c1819c81dd95c8ce786650ac3)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/IFailureMechanism.cs	(.../IFailureMechanism.cs)	(revision 28743d8fed7b8b658764829b629fda81786aa808)
@@ -54,7 +54,7 @@
         bool IsRelevant { get; set; }
 
         /// <summary>
-        /// Gets a <see cref="IEnumerable{T}"/> of all the <see cref="ICalculation"/> instances added to
+        /// Gets an <see cref="IEnumerable{T}"/> of all the <see cref="ICalculation"/> instances added to
         /// the failure mechanism.
         /// </summary>
         IEnumerable<ICalculation> Calculations { get; }
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/IScenarioRow.cs
===================================================================
diff -u -rd39f2e1a0a36628bbd7751d426425d8f99b2b5af -r28743d8fed7b8b658764829b629fda81786aa808
--- Ringtoets/Common/src/Ringtoets.Common.Forms/IScenarioRow.cs	(.../IScenarioRow.cs)	(revision d39f2e1a0a36628bbd7751d426425d8f99b2b5af)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/IScenarioRow.cs	(.../IScenarioRow.cs)	(revision 28743d8fed7b8b658764829b629fda81786aa808)
@@ -36,7 +36,7 @@
         string Name { get; }
 
         /// <summary>
-        /// Gets or sets the normative calculation for the section.
+        /// Gets the normative calculation for the section.
         /// </summary>
         T Calculation { get; }
     }