Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Commands/OpenMapViewCommandTest.cs
===================================================================
diff -u -ra76df67ff1bcdceeb8297286983072a14dd1229e -r9aa9d4c3668f1ce3abcd566bc9598347fbee0679
--- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Commands/OpenMapViewCommandTest.cs	(.../OpenMapViewCommandTest.cs)	(revision a76df67ff1bcdceeb8297286983072a14dd1229e)
+++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Commands/OpenMapViewCommandTest.cs	(.../OpenMapViewCommandTest.cs)	(revision 9aa9d4c3668f1ce3abcd566bc9598347fbee0679)
@@ -9,6 +9,19 @@
     public class OpenMapViewCommandTest
     {
         [Test]
+        public void DefaultConstructor_DefaultValues()
+        {
+            // Call
+            var command = new OpenMapViewCommand();
+
+            // Assert
+            Assert.IsInstanceOf<IGuiCommand>(command);
+            Assert.IsTrue(command.Enabled);
+            Assert.IsFalse(command.Checked);
+            Assert.IsNull(command.Gui);
+        }
+
+        [Test]
         public void Execute_Always_OpensViewForStringCollection()
         {
             // Setup
@@ -33,20 +46,20 @@
         [Test]
         public void Enabled_Always_ReturnsTrue()
         {
-            // Setup
+            // Call
             var command = new OpenMapViewCommand();
 
-            // Call / Assert
+            // Assert
             Assert.IsTrue(command.Enabled);
         }
 
         [Test]
         public void Checked_Always_ReturnsFalse()
         {
-            // Setup
+            // Call
             var command = new OpenMapViewCommand();
 
-            // Call / Assert
+            // Assert
             Assert.IsFalse(command.Checked);
         }
     }
Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/DotSpatialGuiPluginTest.cs
===================================================================
diff -u -rfaced786bd2b09a179d728464fbfa9575e1affca -r9aa9d4c3668f1ce3abcd566bc9598347fbee0679
--- Core/Plugins/test/Core.Plugins.DotSpatial.Test/DotSpatialGuiPluginTest.cs	(.../DotSpatialGuiPluginTest.cs)	(revision faced786bd2b09a179d728464fbfa9575e1affca)
+++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/DotSpatialGuiPluginTest.cs	(.../DotSpatialGuiPluginTest.cs)	(revision 9aa9d4c3668f1ce3abcd566bc9598347fbee0679)
@@ -31,9 +31,11 @@
             {
                 // Call
                 plugin.Activate();
+                var commandHandler = plugin.RibbonCommandHandler;
 
                 // Assert
-                Assert.NotNull(plugin.RibbonCommandHandler);
+                Assert.NotNull(commandHandler);
+                Assert.IsInstanceOf<MapRibbon>(commandHandler);
             }
         }
 
Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Forms/MapDataViewTest.cs
===================================================================
diff -u -r04c70d10f22ba007f8210813d3d02697e42f8a5d -r9aa9d4c3668f1ce3abcd566bc9598347fbee0679
--- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Forms/MapDataViewTest.cs	(.../MapDataViewTest.cs)	(revision 04c70d10f22ba007f8210813d3d02697e42f8a5d)
+++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Forms/MapDataViewTest.cs	(.../MapDataViewTest.cs)	(revision 9aa9d4c3668f1ce3abcd566bc9598347fbee0679)
@@ -1,5 +1,6 @@
 using System;
 using System.Windows.Forms;
+using Core.Common.Controls.Views;
 using Core.Components.DotSpatial;
 using Core.Components.DotSpatial.Data;
 using Core.Plugins.DotSpatial.Forms;
@@ -11,6 +12,18 @@
     public class MapDataViewTest
     {
         [Test]
+        public void DefaultConstructor_DefaultValues()
+        {
+            // Call
+            var mapView = new MapDataView();
+
+            // Assert
+            Assert.IsInstanceOf<UserControl>(mapView);
+            var interfaceImplementation = mapView as IView;
+            Assert.IsNotNull(interfaceImplementation);
+        }
+
+        [Test]
         public void DefaultConstructor_Always_AddsBaseMap()
         {
             // Call
@@ -39,6 +52,19 @@
         }
 
         [Test]
+        public void Data_SetToObject_ThrowsInvalidCastException()
+        {
+            // Setup
+            var mapView = new MapDataView();
+
+            // Call
+            TestDelegate testDelegate = () => mapView.Data = new object();
+
+            // Assert
+            Assert.Throws<InvalidCastException>(testDelegate);
+        }
+
+        [Test]
         public void Data_Always_IsMapData()
         {
             // Setup
Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/MapRibbonTest.cs
===================================================================
diff -u -ra76df67ff1bcdceeb8297286983072a14dd1229e -r9aa9d4c3668f1ce3abcd566bc9598347fbee0679
--- Core/Plugins/test/Core.Plugins.DotSpatial.Test/MapRibbonTest.cs	(.../MapRibbonTest.cs)	(revision a76df67ff1bcdceeb8297286983072a14dd1229e)
+++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/MapRibbonTest.cs	(.../MapRibbonTest.cs)	(revision 9aa9d4c3668f1ce3abcd566bc9598347fbee0679)
@@ -16,10 +16,10 @@
         [RequiresSTA]
         public void Commands_NoCommandsAssigned_ReturnsEmptyCommandCollection()
         {
-            // Setup
+            // Call
             var ribbon = new MapRibbon();
 
-            // Call / Assert
+            // Assert
             CollectionAssert.IsEmpty(ribbon.Commands);
         }
 
@@ -40,29 +40,30 @@
                 var commands = ribbon.Commands.ToArray();
 
                 // Assert
-                CollectionAssert.AreEqual(new ICommand[] {openMapViewCommand}, commands);
+                CollectionAssert.AreEquivalent(new ICommand[] {openMapViewCommand}, commands);
             }
         }
 
         [Test]
         [RequiresSTA]
         public void DefaultConstructor_Always_CreatesControl()
         {
-            // Setup
+            // Call
             var ribbon = new MapRibbon();
 
-            // Call / Assert
+            // Assert
+            Assert.IsNotNull(ribbon);
             Assert.IsInstanceOf<Control>(ribbon.GetRibbonControl());
         }
 
         [Test]
         [RequiresSTA]
         public void IsContextualTabVisible_Always_ReturnsFalse()
         {
-            // Setup
+            // Call
             var ribbon = new MapRibbon();
 
-            // Call / Assert
+            // Assert
             Assert.IsFalse(ribbon.IsContextualTabVisible(null, null));
         }