Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapDataConverter.cs
===================================================================
diff -u -r5c3f702f76f617808344416749d1ec1cfb104559 -r5176a8556903c3008c33c96f4bd693b602e5547e
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapDataConverter.cs	(.../MapDataConverter.cs)	(revision 5c3f702f76f617808344416749d1ec1cfb104559)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapDataConverter.cs	(.../MapDataConverter.cs)	(revision 5176a8556903c3008c33c96f4bd693b602e5547e)
@@ -40,7 +40,7 @@
         {
             if (data == null)
             {
-                throw new ArgumentNullException("Null data cannot be converted into feature sets.");
+                throw new ArgumentNullException("data", "Null data cannot be converted into feature sets.");
             }
 
             if (!CanConvertMapData(data))
Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataCollectionConverterTest.cs
===================================================================
diff -u -r5c3f702f76f617808344416749d1ec1cfb104559 -r5176a8556903c3008c33c96f4bd693b602e5547e
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataCollectionConverterTest.cs	(.../MapDataCollectionConverterTest.cs)	(revision 5c3f702f76f617808344416749d1ec1cfb104559)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataCollectionConverterTest.cs	(.../MapDataCollectionConverterTest.cs)	(revision 5176a8556903c3008c33c96f4bd693b602e5547e)
@@ -58,13 +58,11 @@
             // Setup
             var testConverter = new MapDataCollectionConverter();
 
+            // Call
             TestDelegate test = () => testConverter.Convert(null);
 
-            // Call
-            var message = Assert.Throws<ArgumentNullException>(test).Message;
-
             // Assert
-            StringAssert.EndsWith("Null data cannot be converted into feature sets.", message);
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, "Null data cannot be converted into feature sets.");
         }
 
         [Test]
Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataConverterTest.cs
===================================================================
diff -u -r5c3f702f76f617808344416749d1ec1cfb104559 -r5176a8556903c3008c33c96f4bd693b602e5547e
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataConverterTest.cs	(.../MapDataConverterTest.cs)	(revision 5c3f702f76f617808344416749d1ec1cfb104559)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataConverterTest.cs	(.../MapDataConverterTest.cs)	(revision 5176a8556903c3008c33c96f4bd693b602e5547e)
@@ -35,13 +35,11 @@
             // Setup
             var testConverter = new TestMapDataConverter<Class>();
 
+            // Call
             TestDelegate test = () => testConverter.Convert(null);
 
-            // Call
-            var message = Assert.Throws<ArgumentNullException>(test).Message;
-
             // Assert
-            StringAssert.EndsWith("Null data cannot be converted into feature sets.", message);
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, "Null data cannot be converted into feature sets.");
         }
 
         [Test]
Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapLineDataConverterTest.cs
===================================================================
diff -u -r80a4afe88db94aaaa16ab83bedb51b05be62b31d -r5176a8556903c3008c33c96f4bd693b602e5547e
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapLineDataConverterTest.cs	(.../MapLineDataConverterTest.cs)	(revision 80a4afe88db94aaaa16ab83bedb51b05be62b31d)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapLineDataConverterTest.cs	(.../MapLineDataConverterTest.cs)	(revision 5176a8556903c3008c33c96f4bd693b602e5547e)
@@ -58,13 +58,11 @@
             // Setup
             var testConverter = new MapLineDataConverter();
 
+            // Call
             TestDelegate test = () => testConverter.Convert(null);
 
-            // Call
-            var message = Assert.Throws<ArgumentNullException>(test).Message;
-
             // Assert
-            StringAssert.EndsWith("Null data cannot be converted into feature sets.", message);
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, "Null data cannot be converted into feature sets.");
         }
 
         [Test]
Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPointDataConverterTest.cs
===================================================================
diff -u -r5c3f702f76f617808344416749d1ec1cfb104559 -r5176a8556903c3008c33c96f4bd693b602e5547e
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPointDataConverterTest.cs	(.../MapPointDataConverterTest.cs)	(revision 5c3f702f76f617808344416749d1ec1cfb104559)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPointDataConverterTest.cs	(.../MapPointDataConverterTest.cs)	(revision 5176a8556903c3008c33c96f4bd693b602e5547e)
@@ -87,13 +87,11 @@
             // Setup
             var testConverter = new MapPointDataConverter();
 
+            // Call
             TestDelegate test = () => testConverter.Convert(null);
 
-            // Call
-            var message = Assert.Throws<ArgumentNullException>(test).Message;
-
             // Assert
-            StringAssert.EndsWith("Null data cannot be converted into feature sets.", message);
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, "Null data cannot be converted into feature sets.");
         }
 
         [Test]
Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPolygonDataConverterTest.cs
===================================================================
diff -u -r5c3f702f76f617808344416749d1ec1cfb104559 -r5176a8556903c3008c33c96f4bd693b602e5547e
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPolygonDataConverterTest.cs	(.../MapPolygonDataConverterTest.cs)	(revision 5c3f702f76f617808344416749d1ec1cfb104559)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPolygonDataConverterTest.cs	(.../MapPolygonDataConverterTest.cs)	(revision 5176a8556903c3008c33c96f4bd693b602e5547e)
@@ -86,13 +86,11 @@
             // Setup
             var testConverter = new MapPolygonDataConverter();
 
+            // Call
             TestDelegate test = () => testConverter.Convert(null);
 
-            // Call
-            var message = Assert.Throws<ArgumentNullException>(test).Message;
-
             // Assert
-            StringAssert.EndsWith("Null data cannot be converted into feature sets.", message);
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, "Null data cannot be converted into feature sets.");
         }
 
         [Test]
Index: Core/Components/test/Core.Components.DotSpatial.Test/Data/MapDataCollectionTest.cs
===================================================================
diff -u -r5c3f702f76f617808344416749d1ec1cfb104559 -r5176a8556903c3008c33c96f4bd693b602e5547e
--- Core/Components/test/Core.Components.DotSpatial.Test/Data/MapDataCollectionTest.cs	(.../MapDataCollectionTest.cs)	(revision 5c3f702f76f617808344416749d1ec1cfb104559)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Data/MapDataCollectionTest.cs	(.../MapDataCollectionTest.cs)	(revision 5176a8556903c3008c33c96f4bd693b602e5547e)
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using Core.Common.TestUtil;
 using Core.Components.DotSpatial.Data;
 using NUnit.Framework;
 
@@ -11,14 +12,11 @@
         [Test]
         public void Constructor_NullList_ThrowsArgumentNullException()
         {
-            // Setup
+            // Call
             TestDelegate test = () => new MapDataCollection(null);
 
-            // Call
-            var message = Assert.Throws<ArgumentNullException>(test).Message;
-
             // Assert
-            StringAssert.Contains("A list collection is required when creating MapDataCollection.", message);
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, "A list collection is required when creating MapDataCollection.");
         }
 
         [Test]
Index: Core/Components/test/Core.Components.DotSpatial.Test/Data/MapLineDataTest.cs
===================================================================
diff -u -r5c3f702f76f617808344416749d1ec1cfb104559 -r5176a8556903c3008c33c96f4bd693b602e5547e
--- Core/Components/test/Core.Components.DotSpatial.Test/Data/MapLineDataTest.cs	(.../MapLineDataTest.cs)	(revision 5c3f702f76f617808344416749d1ec1cfb104559)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Data/MapLineDataTest.cs	(.../MapLineDataTest.cs)	(revision 5176a8556903c3008c33c96f4bd693b602e5547e)
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.ObjectModel;
+using Core.Common.TestUtil;
 using Core.Components.DotSpatial.Data;
 using NUnit.Framework;
 
@@ -11,14 +12,11 @@
         [Test]
         public void Constructor_NullPoints_ThrowsArgumentNullException()
         {
-            // Setup
+            // Call
             TestDelegate test = () => new MapLineData(null);
 
-            // Call
-            var message = Assert.Throws<ArgumentNullException>(test).Message;
-
             // Assert
-            StringAssert.Contains(string.Format("A point collection is required when creating a subclass of {0}.", typeof(PointBasedMapData)), message);
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, string.Format("A point collection is required when creating a subclass of {0}.", typeof(PointBasedMapData)));
         }
 
         [Test]
Index: Core/Components/test/Core.Components.DotSpatial.Test/Data/MapPointDataTest.cs
===================================================================
diff -u -r5c3f702f76f617808344416749d1ec1cfb104559 -r5176a8556903c3008c33c96f4bd693b602e5547e
--- Core/Components/test/Core.Components.DotSpatial.Test/Data/MapPointDataTest.cs	(.../MapPointDataTest.cs)	(revision 5c3f702f76f617808344416749d1ec1cfb104559)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Data/MapPointDataTest.cs	(.../MapPointDataTest.cs)	(revision 5176a8556903c3008c33c96f4bd693b602e5547e)
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.ObjectModel;
+using Core.Common.TestUtil;
 using Core.Components.DotSpatial.Data;
 using NUnit.Framework;
 
@@ -11,14 +12,11 @@
         [Test]
         public void Constructor_NullPoints_ThrowsArgumentNullException()
         {
-            // Setup
+            // Call
             TestDelegate test = () => new MapPointData(null);
 
-            // Call
-            var message = Assert.Throws<ArgumentNullException>(test).Message;
-
             // Assert
-            StringAssert.Contains(string.Format("A point collection is required when creating a subclass of {0}.", typeof(PointBasedMapData)), message);
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, string.Format("A point collection is required when creating a subclass of {0}.", typeof(PointBasedMapData)));
         }
 
         [Test]
Index: Core/Components/test/Core.Components.DotSpatial.Test/Data/MapPolygonDataTest.cs
===================================================================
diff -u -r5c3f702f76f617808344416749d1ec1cfb104559 -r5176a8556903c3008c33c96f4bd693b602e5547e
--- Core/Components/test/Core.Components.DotSpatial.Test/Data/MapPolygonDataTest.cs	(.../MapPolygonDataTest.cs)	(revision 5c3f702f76f617808344416749d1ec1cfb104559)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Data/MapPolygonDataTest.cs	(.../MapPolygonDataTest.cs)	(revision 5176a8556903c3008c33c96f4bd693b602e5547e)
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.ObjectModel;
+using Core.Common.TestUtil;
 using Core.Components.DotSpatial.Data;
 using NUnit.Framework;
 
@@ -11,14 +12,11 @@
         [Test]
         public void Constructor_NullPoints_ThrowsArgumentNullException()
         {
-            // Setup
+            // Call
             TestDelegate test = () => new MapPolygonData(null);
 
-            // Call
-            var message = Assert.Throws<ArgumentNullException>(test).Message;
-
             // Assert
-            StringAssert.Contains(string.Format("A point collection is required when creating a subclass of {0}.", typeof(PointBasedMapData)), message);
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, string.Format("A point collection is required when creating a subclass of {0}.", typeof(PointBasedMapData)));
         }
 
         [Test]