Index: Core/Common/src/Core.Common.Gui/ContextMenu/GuiContextMenuItemFactory.cs
===================================================================
diff -u -r0d3788fdf7aa5b050974f69bcea4f8e71a096d58 -r0324c332753d36bb804a804b9757ef1cd336435f
--- Core/Common/src/Core.Common.Gui/ContextMenu/GuiContextMenuItemFactory.cs	(.../GuiContextMenuItemFactory.cs)	(revision 0d3788fdf7aa5b050974f69bcea4f8e71a096d58)
+++ Core/Common/src/Core.Common.Gui/ContextMenu/GuiContextMenuItemFactory.cs	(.../GuiContextMenuItemFactory.cs)	(revision 0324c332753d36bb804a804b9757ef1cd336435f)
@@ -145,12 +145,15 @@
         /// <param name="toolTip">The toolTip of the import item.</param>
         /// <param name="image">The image of the import item.</param>
         /// <returns>The created <see cref="ToolStripItem"/>.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="text"/>
+        /// is <c>null</c> or only whitespace.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="toolTip"/>
+        /// or <paramref name="image"/> is <c>null</c>.</exception>
         public ToolStripItem CreateCustomImportItem(string text, string toolTip, Image image)
         {
-            if (text == null)
+            if(string.IsNullOrWhiteSpace(text))
             {
-                throw new ArgumentNullException("text");
+                throw new ArgumentException(@"Text should be set.", "text");
             }
             if (toolTip == null)
             {
Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/GuiContextMenuItemFactoryTest.cs
===================================================================
diff -u -r0d3788fdf7aa5b050974f69bcea4f8e71a096d58 -r0324c332753d36bb804a804b9757ef1cd336435f
--- Core/Common/test/Core.Common.Gui.Test/ContextMenu/GuiContextMenuItemFactoryTest.cs	(.../GuiContextMenuItemFactoryTest.cs)	(revision 0d3788fdf7aa5b050974f69bcea4f8e71a096d58)
+++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/GuiContextMenuItemFactoryTest.cs	(.../GuiContextMenuItemFactoryTest.cs)	(revision 0324c332753d36bb804a804b9757ef1cd336435f)
@@ -325,7 +325,10 @@
         }
 
         [Test]
-        public void CreateCustomImportItem_TextNull_ThrowArgumentNullException()
+        [TestCase(null)]
+        [TestCase("")]
+        [TestCase("   ")]
+        public void CreateCustomImportItem_TextInvalid_ThrowArgumentException(string text)
         {
             // Setup
             const string toolTip = "Import tooltip";
@@ -346,11 +349,12 @@
                                                                    nodeData);
 
             // Call
-            TestDelegate test = () => contextMenuFactory.CreateCustomImportItem(null, toolTip, image);
+            TestDelegate test = () => contextMenuFactory.CreateCustomImportItem(text, toolTip, image);
 
             // Assert
-            var exception = Assert.Throws<ArgumentNullException>(test);
+            var exception = TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(test, "Text should be set.");
             Assert.AreEqual("text", exception.ParamName);
+            mocks.VerifyAll();
         }
 
         [Test]
@@ -380,6 +384,7 @@
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
             Assert.AreEqual("toolTip", exception.ParamName);
+            mocks.VerifyAll();
         }
 
         [Test]
@@ -409,6 +414,7 @@
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
             Assert.AreEqual("image", exception.ParamName);
+            mocks.VerifyAll();
         }
 
         [Test]
Index: Core/Common/test/Core.Common.Gui.TestUtil.Test/ContextMenu/CustomItemsOnlyContextMenuBuilderTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Gui.TestUtil.Test/ContextMenu/CustomItemsOnlyContextMenuBuilderTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.Gui.TestUtil.Test/ContextMenu/CustomItemsOnlyContextMenuBuilderTest.cs	(revision 0324c332753d36bb804a804b9757ef1cd336435f)
@@ -0,0 +1,211 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Drawing;
+using System.Windows.Forms;
+using Core.Common.Gui.ContextMenu;
+using Core.Common.Gui.TestUtil.ContextMenu;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
+
+namespace Core.Common.Gui.TestUtil.Test.ContextMenu
+{
+    [TestFixture]
+    public class CustomItemsOnlyContextMenuBuilderTest
+    {
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Call
+            var builder = new CustomItemsOnlyContextMenuBuilder();
+
+            // Assert
+            Assert.IsInstanceOf<IContextMenuBuilder>(builder);
+        }
+
+        [Test]
+        public void AddRenameItem_WhenBuild_StubbedItemAddedToContextMenu()
+        {
+            // Setup
+            var builder = new CustomItemsOnlyContextMenuBuilder();
+
+            // Call
+            ContextMenuStrip result = builder.AddRenameItem().Build();
+
+            // Assert
+            AssertStubbedContextMenuItem(result);
+        }
+
+        [Test]
+        public void AddDeleteItem_WhenBuild_StubbedItemAddedToContextMenu()
+        {
+            // Setup
+            var builder = new CustomItemsOnlyContextMenuBuilder();
+
+            // Call
+            ContextMenuStrip result = builder.AddDeleteItem().Build();
+
+            // Assert
+            AssertStubbedContextMenuItem(result);
+        }
+
+        [Test]
+        public void AddDeleteChildrenItem_WhenBuild_StubbedItemAddedToContextMenu()
+        {
+            // Setup
+            var builder = new CustomItemsOnlyContextMenuBuilder();
+
+            // Call
+            ContextMenuStrip result = builder.AddDeleteChildrenItem().Build();
+
+            // Assert
+            AssertStubbedContextMenuItem(result);
+        }
+
+        [Test]
+        public void AddExpandAllItem_WhenBuild_StubbedItemAddedToContextMenu()
+        {
+            // Setup
+            var builder = new CustomItemsOnlyContextMenuBuilder();
+
+            // Call
+            ContextMenuStrip result = builder.AddExpandAllItem().Build();
+
+            // Assert
+            AssertStubbedContextMenuItem(result);
+        }
+
+        [Test]
+        public void AddCollapseAllItem_WhenBuild_StubbedItemAddedToContextMenu()
+        {
+            // Setup
+            var builder = new CustomItemsOnlyContextMenuBuilder();
+
+            // Call
+            ContextMenuStrip result = builder.AddCollapseAllItem().Build();
+
+            // Assert
+            AssertStubbedContextMenuItem(result);
+        }
+
+        [Test]
+        public void AddOpenItem_WhenBuild_StubbedItemAddedToContextMenu()
+        {
+            // Setup
+            var builder = new CustomItemsOnlyContextMenuBuilder();
+
+            // Call
+            ContextMenuStrip result = builder.AddOpenItem().Build();
+
+            // Assert
+            AssertStubbedContextMenuItem(result);
+        }
+
+        [Test]
+        public void AddExportItem_WhenBuild_StubbedItemAddedToContextMenu()
+        {
+            // Setup
+            var builder = new CustomItemsOnlyContextMenuBuilder();
+
+            // Call
+            ContextMenuStrip result = builder.AddExportItem().Build();
+
+            // Assert
+            AssertStubbedContextMenuItem(result);
+        }
+
+        [Test]
+        public void AddImportItem_WhenBuild_StubbedItemAddedToContextMenu()
+        {
+            // Setup
+            var builder = new CustomItemsOnlyContextMenuBuilder();
+
+            // Call
+            ContextMenuStrip result = builder.AddImportItem().Build();
+
+            // Assert
+            AssertStubbedContextMenuItem(result);
+        }
+
+        [Test]
+        public void AddCustomImportItem_WhenBuild_StubbedItemAddedToContextMenu()
+        {
+            // Setup
+            var builder = new CustomItemsOnlyContextMenuBuilder();
+
+            // Call
+            ContextMenuStrip result = builder.AddCustomImportItem(null, null, null).Build();
+
+            // Assert
+            AssertStubbedContextMenuItem(result);
+        }
+
+        [Test]
+        public void AddPropertiesItem_WhenBuild_StubbedItemAddedToContextMenu()
+        {
+            // Setup
+            var builder = new CustomItemsOnlyContextMenuBuilder();
+
+            // Call
+            ContextMenuStrip result = builder.AddPropertiesItem().Build();
+
+            // Assert
+            AssertStubbedContextMenuItem(result);
+        }
+
+        [Test]
+        public void AddSeparatorItem_WhenBuild_SeparatorItemAddedToContextMenu()
+        {
+            // Setup
+            var builder = new CustomItemsOnlyContextMenuBuilder();
+
+            // Call
+            ContextMenuStrip result = builder.AddSeparator().Build();
+
+            // Assert
+            Assert.IsInstanceOf<ToolStripSeparator>(result.Items[0]);
+        }
+
+        [Test]
+        public void AddCustomItem_WhenBuild_CustomItemAddedToContextMenu()
+        {
+            // Setup
+            const string text = "custom item";
+            const string toolTip = "tooltip";
+            Bitmap image = CoreCommonGuiResources.Busy_indicator;
+            var customItem = new StrictContextMenuItem(text, toolTip, image, (sender, args) => { });
+
+            var builder = new CustomItemsOnlyContextMenuBuilder();
+            
+            // Call
+            ContextMenuStrip menu = builder.AddCustomItem(customItem).Build();
+
+            // Assert
+            TestHelper.AssertContextMenuStripContainsItem(menu, 0, text, toolTip, image);
+        }
+
+        private void AssertStubbedContextMenuItem(ContextMenuStrip menu)
+        {
+            TestHelper.AssertContextMenuStripContainsItem(menu, 0, string.Empty, string.Empty, null);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Common/test/Core.Common.Gui.TestUtil.Test/Core.Common.Gui.TestUtil.Test.csproj
===================================================================
diff -u -rbc4c4000ca4a850b49a88156ca2b919ea690494b -r0324c332753d36bb804a804b9757ef1cd336435f
--- Core/Common/test/Core.Common.Gui.TestUtil.Test/Core.Common.Gui.TestUtil.Test.csproj	(.../Core.Common.Gui.TestUtil.Test.csproj)	(revision bc4c4000ca4a850b49a88156ca2b919ea690494b)
+++ Core/Common/test/Core.Common.Gui.TestUtil.Test/Core.Common.Gui.TestUtil.Test.csproj	(.../Core.Common.Gui.TestUtil.Test.csproj)	(revision 0324c332753d36bb804a804b9757ef1cd336435f)
@@ -40,11 +40,14 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
+    <Compile Include="ContextMenu\CustomItemsOnlyContextMenuBuilderTest.cs" />
     <Compile Include="PluginTestHelperTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
@@ -69,6 +72,10 @@
       <Project>{26214BD0-DAFB-4CFC-8EB2-80C5D53C859E}</Project>
       <Name>Core.Common.Gui.TestUtil</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
+      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
+      <Name>Core.Common.TestUtil</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
Index: Core/Components/src/Core.Components.Gis.IO/Importers/FeatureBasedMapDataImporter.cs
===================================================================
diff -u -r00cbbcd5cc50cdc19c838719574ae21ecf7a9b4e -r0324c332753d36bb804a804b9757ef1cd336435f
--- Core/Components/src/Core.Components.Gis.IO/Importers/FeatureBasedMapDataImporter.cs	(.../FeatureBasedMapDataImporter.cs)	(revision 00cbbcd5cc50cdc19c838719574ae21ecf7a9b4e)
+++ Core/Components/src/Core.Components.Gis.IO/Importers/FeatureBasedMapDataImporter.cs	(.../FeatureBasedMapDataImporter.cs)	(revision 0324c332753d36bb804a804b9757ef1cd336435f)
@@ -49,6 +49,8 @@
         /// </summary>
         /// <param name="importTarget">The <see cref="MapDataCollection"/> to add the imported data to.</param>
         /// <param name="filePath">The path to the file to import from.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="importTarget"/>
+        /// or <paramref name="filePath"/> is <c>null</c>.</exception>
         public FeatureBasedMapDataImporter(MapDataCollection importTarget, string filePath)
             : base(filePath, importTarget) {}
 
Index: Core/Components/test/Core.Components.Gis.IO.Test/Core.Components.Gis.IO.Test.csproj
===================================================================
diff -u -rc9667df5e30c9fc7083fd727aa497714621053f6 -r0324c332753d36bb804a804b9757ef1cd336435f
--- Core/Components/test/Core.Components.Gis.IO.Test/Core.Components.Gis.IO.Test.csproj	(.../Core.Components.Gis.IO.Test.csproj)	(revision c9667df5e30c9fc7083fd727aa497714621053f6)
+++ Core/Components/test/Core.Components.Gis.IO.Test/Core.Components.Gis.IO.Test.csproj	(.../Core.Components.Gis.IO.Test.csproj)	(revision 0324c332753d36bb804a804b9757ef1cd336435f)
@@ -95,7 +95,6 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs
===================================================================
diff -u -r4b38b853919ce956baa0970c0836c251a45c4675 -r0324c332753d36bb804a804b9757ef1cd336435f
--- Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs	(.../MapDataCollectionTreeNodeInfoTest.cs)	(revision 4b38b853919ce956baa0970c0836c251a45c4675)
+++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs	(.../MapDataCollectionTreeNodeInfoTest.cs)	(revision 0324c332753d36bb804a804b9757ef1cd336435f)
@@ -266,7 +266,7 @@
             // Setup
             var mapDataCollection = new MapDataCollection("test data");
 
-            var applicationFeatureCommandsMockMock = mocks.Stub<IApplicationFeatureCommands>();
+            var applicationFeatureCommandsStub = mocks.Stub<IApplicationFeatureCommands>();
             var importCommandHandlerMock = mocks.Stub<IImportCommandHandler>();
             importCommandHandlerMock.Stub(ich => ich.CanImportOn(null)).IgnoreArguments().Return(true);
             var exportCommandHandlerMock = mocks.Stub<IExportCommandHandler>();
@@ -275,7 +275,7 @@
             using (var treeViewControl = new TreeViewControl())
             {
                 // Call
-                var builder = new ContextMenuBuilder(applicationFeatureCommandsMockMock,
+                var builder = new ContextMenuBuilder(applicationFeatureCommandsStub,
                                                      importCommandHandlerMock,
                                                      exportCommandHandlerMock,
                                                      viewCommandsMock,
Index: Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLines/ReferenceLineImporter.cs
===================================================================
diff -u -r8e73bf849271aa3d92c161d88e8f2400a52cf65a -r0324c332753d36bb804a804b9757ef1cd336435f
--- Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLines/ReferenceLineImporter.cs	(.../ReferenceLineImporter.cs)	(revision 8e73bf849271aa3d92c161d88e8f2400a52cf65a)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLines/ReferenceLineImporter.cs	(.../ReferenceLineImporter.cs)	(revision 0324c332753d36bb804a804b9757ef1cd336435f)
@@ -28,13 +28,12 @@
 using Core.Common.IO.Readers;
 using log4net;
 using Ringtoets.Common.Data.AssessmentSection;
-using CoreCommonBaseResources = Core.Common.Base.Properties.Resources;
 using RingtoetsCommonIOResources = Ringtoets.Common.IO.Properties.Resources;
 
 namespace Ringtoets.Common.IO.ReferenceLines
 {
     /// <summary>
-    /// Imports a <see cref="ReferenceLine"/> and stores it on a <see cref="IAssessmentSection"/>,
+    /// Imports a <see cref="ReferenceLine"/> and stores it on an <see cref="IAssessmentSection"/>,
     /// taking data from a shapefile containing a single polyline.
     /// </summary>
     public class ReferenceLineImporter : FileImporterBase<IAssessmentSection>