Index: Core/Components/test/Core.Components.DotSpatial.Test/MapFunctions/MapFunctionSelectionZoomTest.cs
===================================================================
diff -u -rccfc7c8e0f80ebd556d1aa0bc13cf36572051c8a -r4460ddb55a94abda77ad35d839d9a46d0e164ecd
--- Core/Components/test/Core.Components.DotSpatial.Test/MapFunctions/MapFunctionSelectionZoomTest.cs	(.../MapFunctionSelectionZoomTest.cs)	(revision ccfc7c8e0f80ebd556d1aa0bc13cf36572051c8a)
+++ Core/Components/test/Core.Components.DotSpatial.Test/MapFunctions/MapFunctionSelectionZoomTest.cs	(.../MapFunctionSelectionZoomTest.cs)	(revision 4460ddb55a94abda77ad35d839d9a46d0e164ecd)
@@ -111,8 +111,7 @@
             var expectedRectangle = new Rectangle(x, y, mx - x, my - y);
             
             var mapMock = mockingRepository.Stub<IMap>();
-            mapMock.Expect(e => e.PixelToProj(Arg.Is(new Point(startPointX, startPointY)))).Return(null);
-            mapMock.Expect(e => e.PixelToProj(Arg.Is(new Point(endPointX, endPointY)))).Return(null);
+            mapMock.Stub(e => e.PixelToProj(Arg<Point>.Is.Anything)).Return(null);
             mapMock.Expect(e => e.Invalidate(Arg<Rectangle>.Matches(m => m.Equals(expectedRectangle))));
             mockingRepository.ReplayAll();
 
@@ -157,14 +156,14 @@
         public void OnMouseUp_DraggingToOtherLocation_ZoomsToCoordinates(int startPointX, int startPointY, int endPointX, int endPointY)
         {
             // Setup
-            double geoStartPointX = 0.0 + startPointX;
-            double geoStartPointY = 0.0 + startPointY;
-            double geoEndPointX = 0.0 + endPointX;
-            double geoEndPointY = 0.0 + endPointY;
+            double geoStartPointX = startPointX;
+            double geoStartPointY = startPointY;
+            double geoEndPointX = endPointX;
+            double geoEndPointY = endPointY;
 
             var mapMock = mockingRepository.Stub<IMap>();
-            mapMock.Expect(e => e.PixelToProj(Arg.Is(new Point(startPointX, startPointY)))).Return(new Coordinate(geoStartPointX, geoStartPointY));
-            mapMock.Expect(e => e.PixelToProj(Arg.Is(new Point(endPointX, endPointY)))).Return(new Coordinate(geoEndPointX, geoEndPointY));
+            mapMock.Expect(e => e.PixelToProj(new Point(startPointX, startPointY))).Return(new Coordinate(geoStartPointX, geoStartPointY));
+            mapMock.Expect(e => e.PixelToProj(new Point(endPointX, endPointY))).Return(new Coordinate(geoEndPointX, geoEndPointY));
             mapMock.Expect(e => e.Invalidate());
             mockingRepository.ReplayAll();
 
@@ -193,10 +192,10 @@
             var mapFrame = mockingRepository.Stub<IMapFrame>();
             mapMock.MapFrame = mapFrame;
 
-            double geoStartPointX = 0.0 + startPointX;
-            double geoStartPointY = 0.0 + startPointY;
+            double geoStartPointX = startPointX;
+            double geoStartPointY = startPointY;
 
-            mapMock.Expect(e => e.PixelToProj(Arg.Is(new Point(startPointX, startPointY)))).Return(new Coordinate(geoStartPointX, geoStartPointY));
+            mapMock.Expect(e => e.PixelToProj(new Point(startPointX, startPointY))).Return(new Coordinate(geoStartPointX, geoStartPointY));
             mapMock.Expect(e => e.Invalidate());
             mapFrame.Expect(e => e.ResetExtents());
             mockingRepository.ReplayAll();
Index: Core/Components/test/Core.Components.DotSpatial.Test/MouseCoordinatesMapExtensionTest.cs
===================================================================
diff -u -rccfc7c8e0f80ebd556d1aa0bc13cf36572051c8a -r4460ddb55a94abda77ad35d839d9a46d0e164ecd
--- Core/Components/test/Core.Components.DotSpatial.Test/MouseCoordinatesMapExtensionTest.cs	(.../MouseCoordinatesMapExtensionTest.cs)	(revision ccfc7c8e0f80ebd556d1aa0bc13cf36572051c8a)
+++ Core/Components/test/Core.Components.DotSpatial.Test/MouseCoordinatesMapExtensionTest.cs	(.../MouseCoordinatesMapExtensionTest.cs)	(revision 4460ddb55a94abda77ad35d839d9a46d0e164ecd)
@@ -58,15 +58,13 @@
         {
             // Setup
             using (var map = new Map())
+            using (var extension = new MouseCoordinatesMapExtension(map))
             {
-                using (var extension = new MouseCoordinatesMapExtension(map))
-                {
-                    // Call
-                    extension.Activate();
+                // Call
+                extension.Activate();
 
-                    // Assert
-                    Assert.AreEqual(1, map.Controls.Count);
-                }
+                // Assert
+                Assert.AreEqual(1, map.Controls.Count);
             }
         }
 
@@ -75,20 +73,18 @@
         {
             // Setup
             using (var map = new Map())
+            using (var extension = new MouseCoordinatesMapExtension(map))
             {
-                using (var extension = new MouseCoordinatesMapExtension(map))
-                {
-                    extension.Activate();
+                extension.Activate();
 
-                    // Precondition
-                    Assert.AreEqual(1, map.Controls.Count);
+                // Precondition
+                Assert.AreEqual(1, map.Controls.Count);
 
-                    // Call
-                    extension.Deactivate();
+                // Call
+                extension.Deactivate();
 
-                    // Assert
-                    Assert.AreEqual(0, map.Controls.Count);
-                }
+                // Assert
+                Assert.AreEqual(0, map.Controls.Count);
             }
         }
     }