Index: Core/Components/src/Core.Components.Gis/Data/Removable/RemovableMapDataConverter.cs
===================================================================
diff -u -rbd6c70ad432ca3368d79c8bc2765de16dd0b574a -r80b47b0f25191655ae00b3e1db94dad8f0ad75b0
--- Core/Components/src/Core.Components.Gis/Data/Removable/RemovableMapDataConverter.cs	(.../RemovableMapDataConverter.cs)	(revision bd6c70ad432ca3368d79c8bc2765de16dd0b574a)
+++ Core/Components/src/Core.Components.Gis/Data/Removable/RemovableMapDataConverter.cs	(.../RemovableMapDataConverter.cs)	(revision 80b47b0f25191655ae00b3e1db94dad8f0ad75b0)
@@ -24,14 +24,14 @@
 namespace Core.Components.Gis.Data.Removable
 {
     /// <summary>
-    /// Helper for converting <see cref="FeatureBasedMapData"/> to <see cref="FeatureBasedMapData"/>
+    /// Converts <see cref="FeatureBasedMapData"/> to <see cref="FeatureBasedMapData"/>
     /// implementing <see cref="IRemovable"/>.
     /// </summary>
     public static class RemovableMapDataConverter
     {
         /// <summary>
         /// Converts the given <paramref name="mapData"/> to <see cref="FeatureBasedMapData"/> 
-        /// implementing <see cref="IRemovable"/>
+        /// implementing <see cref="IRemovable"/>.
         /// </summary>
         /// <param name="mapData">The map data to convert.</param>
         /// <returns>A new <see cref="FeatureBasedMapData"/> implementing <see cref="IRemovable"/>.</returns>
Index: Core/Components/src/Core.Components.Gis/Data/Removable/RemovableMapLineData.cs
===================================================================
diff -u -rbd6c70ad432ca3368d79c8bc2765de16dd0b574a -r80b47b0f25191655ae00b3e1db94dad8f0ad75b0
--- Core/Components/src/Core.Components.Gis/Data/Removable/RemovableMapLineData.cs	(.../RemovableMapLineData.cs)	(revision bd6c70ad432ca3368d79c8bc2765de16dd0b574a)
+++ Core/Components/src/Core.Components.Gis/Data/Removable/RemovableMapLineData.cs	(.../RemovableMapLineData.cs)	(revision 80b47b0f25191655ae00b3e1db94dad8f0ad75b0)
@@ -38,7 +38,7 @@
         public RemovableMapLineData(string name) : base(name) {}
 
         /// <summary>
-        /// Creates a new instance of <see cref="MapLineData"/> with default styling.
+        /// Creates a new instance of <see cref="MapLineData"/>.
         /// </summary>
         /// <param name="name">The name of the <see cref="MapLineData"/>.</param>
         /// <param name="style">The style of the data.</param>
Index: Core/Components/test/Core.Components.Gis.Test/Core.Components.Gis.Test.csproj
===================================================================
diff -u -rbd6c70ad432ca3368d79c8bc2765de16dd0b574a -r80b47b0f25191655ae00b3e1db94dad8f0ad75b0
--- Core/Components/test/Core.Components.Gis.Test/Core.Components.Gis.Test.csproj	(.../Core.Components.Gis.Test.csproj)	(revision bd6c70ad432ca3368d79c8bc2765de16dd0b574a)
+++ Core/Components/test/Core.Components.Gis.Test/Core.Components.Gis.Test.csproj	(.../Core.Components.Gis.Test.csproj)	(revision 80b47b0f25191655ae00b3e1db94dad8f0ad75b0)
@@ -54,9 +54,9 @@
     <Compile Include="Data\MapPointDataTest.cs" />
     <Compile Include="Data\MapPolygonDataTest.cs" />
     <Compile Include="Data\FeatureBasedMapDataTest.cs" />
-    <Compile Include="Data\Removable\MapLineDataTest.cs" />
-    <Compile Include="Data\Removable\MapPointDataTest.cs" />
-    <Compile Include="Data\Removable\MapPolygonDataTest.cs" />
+    <Compile Include="Data\Removable\RemovableMapLineDataTest.cs" />
+    <Compile Include="Data\Removable\RemovableMapPointDataTest.cs" />
+    <Compile Include="Data\Removable\RemovableMapPolygonDataTest.cs" />
     <Compile Include="Data\Removable\RemovableMapDataConverterTest.cs" />
     <Compile Include="Data\WellKnownTileSourceMapDataTest.cs" />
     <Compile Include="Data\WellKnownTileSourceTest.cs" />
Fisheye: Tag 80b47b0f25191655ae00b3e1db94dad8f0ad75b0 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.Gis.Test/Data/Removable/MapLineDataTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 80b47b0f25191655ae00b3e1db94dad8f0ad75b0 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.Gis.Test/Data/Removable/MapPointDataTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 80b47b0f25191655ae00b3e1db94dad8f0ad75b0 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.Gis.Test/Data/Removable/MapPolygonDataTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Components/test/Core.Components.Gis.Test/Data/Removable/RemovableMapDataConverterTest.cs
===================================================================
diff -u -r081badaad87a6e2a6d5c861de9ee95fa1ca6dea3 -r80b47b0f25191655ae00b3e1db94dad8f0ad75b0
--- Core/Components/test/Core.Components.Gis.Test/Data/Removable/RemovableMapDataConverterTest.cs	(.../RemovableMapDataConverterTest.cs)	(revision 081badaad87a6e2a6d5c861de9ee95fa1ca6dea3)
+++ Core/Components/test/Core.Components.Gis.Test/Data/Removable/RemovableMapDataConverterTest.cs	(.../RemovableMapDataConverterTest.cs)	(revision 80b47b0f25191655ae00b3e1db94dad8f0ad75b0)
@@ -134,5 +134,15 @@
             var exception = Assert.Throws<NotSupportedException>(test);
             Assert.AreEqual("The given mapData was not convertible to IRemovable data.", exception.Message);
         }
+
+        [Test]
+        public void FromFeatureBasedMapData_WithoutData_ThrowsNotSupportedException()
+        {
+            // Call
+            TestDelegate test = () => RemovableMapDataConverter.FromFeatureBasedMapData(null);
+
+            // Assert
+            Assert.Throws<NotSupportedException>(test);
+        }
     }
 }
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.Test/Data/Removable/RemovableMapLineDataTest.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.Gis.Test/Data/Removable/RemovableMapLineDataTest.cs	(revision 0)
+++ Core/Components/test/Core.Components.Gis.Test/Data/Removable/RemovableMapLineDataTest.cs	(revision 80b47b0f25191655ae00b3e1db94dad8f0ad75b0)
@@ -0,0 +1,57 @@
+// Copyright (C) Stichting Deltares 2017. 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 Core.Components.Gis.Data;
+using Core.Components.Gis.Data.Removable;
+using Core.Components.Gis.Style;
+using NUnit.Framework;
+
+namespace Core.Components.Gis.Test.Data.Removable
+{
+    [TestFixture]
+    public class RemovableMapLineDataTest
+    {
+        [Test]
+        public void Constructor_ValidName_NameAndDefaultValuesSet()
+        {
+            // Call
+            var data = new RemovableMapLineData("test data");
+
+            // Assert
+            Assert.IsInstanceOf<MapLineData>(data);
+            Assert.IsInstanceOf<IRemovable>(data);
+        }
+        
+        [Test]
+        public void Constructor_WithStyle_ExpectedValues()
+        {
+            // Setup
+            var style = new LineStyle();
+
+            // Call
+            var data = new RemovableMapLineData("test data", style);
+
+            // Assert
+            Assert.IsInstanceOf<MapLineData>(data);
+            Assert.IsInstanceOf<IRemovable>(data);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.Test/Data/Removable/RemovableMapPointDataTest.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.Gis.Test/Data/Removable/RemovableMapPointDataTest.cs	(revision 0)
+++ Core/Components/test/Core.Components.Gis.Test/Data/Removable/RemovableMapPointDataTest.cs	(revision 80b47b0f25191655ae00b3e1db94dad8f0ad75b0)
@@ -0,0 +1,57 @@
+// Copyright (C) Stichting Deltares 2017. 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 Core.Components.Gis.Data;
+using Core.Components.Gis.Data.Removable;
+using Core.Components.Gis.Style;
+using NUnit.Framework;
+
+namespace Core.Components.Gis.Test.Data.Removable
+{
+    [TestFixture]
+    public class RemovableMapPointDataTest
+    {
+        [Test]
+        public void Constructor_ValidName_NameAndDefaultValuesSet()
+        {
+            // Call
+            var data = new RemovableMapPointData("test data");
+
+            // Assert
+            Assert.IsInstanceOf<MapPointData>(data);
+            Assert.IsInstanceOf<IRemovable>(data);
+        }
+
+        [Test]
+        public void Constructor_WithStyle_ExpectedValues()
+        {
+            // Setup
+            var style = new PointStyle();
+
+            // Call
+            var data = new RemovableMapPointData("test data", style);
+
+            // Assert
+            Assert.IsInstanceOf<MapPointData>(data);
+            Assert.IsInstanceOf<IRemovable>(data);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.Test/Data/Removable/RemovableMapPolygonDataTest.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.Gis.Test/Data/Removable/RemovableMapPolygonDataTest.cs	(revision 0)
+++ Core/Components/test/Core.Components.Gis.Test/Data/Removable/RemovableMapPolygonDataTest.cs	(revision 80b47b0f25191655ae00b3e1db94dad8f0ad75b0)
@@ -0,0 +1,57 @@
+// Copyright (C) Stichting Deltares 2017. 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 Core.Components.Gis.Data;
+using Core.Components.Gis.Data.Removable;
+using Core.Components.Gis.Style;
+using NUnit.Framework;
+
+namespace Core.Components.Gis.Test.Data.Removable
+{
+    [TestFixture]
+    public class RemovableMapPolygonDataTest
+    {
+        [Test]
+        public void Constructor_ValidName_NameAndDefaultValuesSet()
+        {
+            // Call
+            var data = new RemovableMapPolygonData("test data");
+
+            // Assert
+            Assert.IsInstanceOf<MapPolygonData>(data);
+            Assert.IsInstanceOf<IRemovable>(data);
+        }
+
+        [Test]
+        public void Constructor_WithStyle_ExpectedValues()
+        {
+            // Setup
+            var style = new PolygonStyle();
+
+            // Call
+            var data = new RemovableMapPolygonData("test data", style);
+
+            // Assert
+            Assert.IsInstanceOf<MapPolygonData>(data);
+            Assert.IsInstanceOf<IRemovable>(data);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLineDataTreeNodeInfoTest.cs
===================================================================
diff -u -ra084e800dfabf086779d3a191064c370ad7e72bf -r80b47b0f25191655ae00b3e1db94dad8f0ad75b0
--- Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLineDataTreeNodeInfoTest.cs	(.../MapLineDataTreeNodeInfoTest.cs)	(revision a084e800dfabf086779d3a191064c370ad7e72bf)
+++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLineDataTreeNodeInfoTest.cs	(.../MapLineDataTreeNodeInfoTest.cs)	(revision 80b47b0f25191655ae00b3e1db94dad8f0ad75b0)
@@ -355,7 +355,7 @@
         }
 
         [Test]
-        public void CanRemove_WithNotRemovableData_ReturnTrue()
+        public void CanRemove_WithNotRemovableData_ReturnFalse()
         {
             // Setup
             var notRemovable = mocks.StrictMock<MapLineData>("name");
@@ -387,7 +387,7 @@
             info.OnNodeRemoved(toRemove, collection);
 
             // Assert
-            Assert.AreEqual(new[]
+            CollectionAssert.AreEqual(new[]
             {
                 otherData
             }, collection.Collection);
Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapPointDataTreeNodeInfoTest.cs
===================================================================
diff -u -ra084e800dfabf086779d3a191064c370ad7e72bf -r80b47b0f25191655ae00b3e1db94dad8f0ad75b0
--- Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapPointDataTreeNodeInfoTest.cs	(.../MapPointDataTreeNodeInfoTest.cs)	(revision a084e800dfabf086779d3a191064c370ad7e72bf)
+++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapPointDataTreeNodeInfoTest.cs	(.../MapPointDataTreeNodeInfoTest.cs)	(revision 80b47b0f25191655ae00b3e1db94dad8f0ad75b0)
@@ -355,7 +355,7 @@
         }
 
         [Test]
-        public void CanRemove_WithNotRemovableData_ReturnTrue()
+        public void CanRemove_WithNotRemovableData_ReturnFalse()
         {
             // Setup
             var notRemovable = mocks.StrictMock<MapPointData>("name");
@@ -387,7 +387,7 @@
             info.OnNodeRemoved(toRemove, collection);
 
             // Assert
-            Assert.AreEqual(new[]
+            CollectionAssert.AreEqual(new[]
             {
                 otherData
             }, collection.Collection);
Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapPolygonDataTreeNodeInfoTest.cs
===================================================================
diff -u -ra084e800dfabf086779d3a191064c370ad7e72bf -r80b47b0f25191655ae00b3e1db94dad8f0ad75b0
--- Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapPolygonDataTreeNodeInfoTest.cs	(.../MapPolygonDataTreeNodeInfoTest.cs)	(revision a084e800dfabf086779d3a191064c370ad7e72bf)
+++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapPolygonDataTreeNodeInfoTest.cs	(.../MapPolygonDataTreeNodeInfoTest.cs)	(revision 80b47b0f25191655ae00b3e1db94dad8f0ad75b0)
@@ -355,7 +355,7 @@
         }
 
         [Test]
-        public void CanRemove_WithNotRemovableData_ReturnTrue()
+        public void CanRemove_WithNotRemovableData_ReturnFalse()
         {
             // Setup
             var notRemovable = mocks.StrictMock<MapPolygonData>("name");
@@ -387,7 +387,7 @@
             info.OnNodeRemoved(toRemove, collection);
 
             // Assert
-            Assert.AreEqual(new[]
+            CollectionAssert.AreEqual(new[]
             {
                 otherData
             }, collection.Collection);