Index: Core/Components/test/Core.Components.DotSpatial.Forms.Test/MapControlTest.cs
===================================================================
diff -u -r41af8c6e09c689cd4195e25bffca11ecb77b9035 -r6db74b3e83d3170ca84dac650ba8bbf383409d30
--- Core/Components/test/Core.Components.DotSpatial.Forms.Test/MapControlTest.cs	(.../MapControlTest.cs)	(revision 41af8c6e09c689cd4195e25bffca11ecb77b9035)
+++ Core/Components/test/Core.Components.DotSpatial.Forms.Test/MapControlTest.cs	(.../MapControlTest.cs)	(revision 6db74b3e83d3170ca84dac650ba8bbf383409d30)
@@ -117,18 +117,14 @@
         public void GivenMapControlWithNestedMapData_WhenNestedMapDataChanged_MapControlUpdated()
         {
             // Given
-            using (var form = new Form())
+            using (var map = new MapControl())
             {
-                var map = new MapControl();
                 var testData = new MapPointData("test data");
                 var view = map.Controls.OfType<Map>().First();
 
                 map.Data.Add(testData);
                 map.Data.NotifyObservers();
 
-                form.Controls.Add(map);
-                form.Show();
-
                 var layers = view.Layers.ToList();
 
                 // Call
@@ -145,20 +141,17 @@
         public void ZoomToAllVisibleLayers_MapInFormWithEmptyDataset_ViewInvalidatedLayersSame()
         {
             // Setup
-            using (var form = new Form())
+            using (var map = new MapControl())
             {
-                var map = new MapControl();
                 var testData = new MapPointData("test data");
                 var mapView = map.Controls.OfType<Map>().First();
                 var invalidated = 0;
 
                 map.Data.Add(testData);
                 map.Data.NotifyObservers();
-                form.Controls.Add(map);
 
                 mapView.Invalidated += (sender, args) => { invalidated++; };
 
-                form.Show();
                 Assert.AreEqual(0, invalidated, "Precondition failed: mapView.Invalidated > 0");
 
                 // Call
@@ -226,26 +219,28 @@
         public void ZoomToAllVisibleLayers_NotAllLayersVisible_ZoomToVisibleLayersExtent()
         {
             // Setup
-            var map = new MapControl();
-            var mapView = map.Controls.OfType<Map>().First();
-            var testData = GetTestData();
-            map.Data.Add(testData);
-            map.Data.NotifyObservers();
+            using (var map = new MapControl())
+            {
+                var mapView = map.Controls.OfType<Map>().First();
+                var testData = GetTestData();
+                map.Data.Add(testData);
+                map.Data.NotifyObservers();
 
-            var expectedExtent = new Extent(0.0, 0.5, 1.6, 2.1);
-            var smallest = expectedExtent.Height < expectedExtent.Width ? expectedExtent.Height : expectedExtent.Width;
-            expectedExtent.ExpandBy(smallest*padding);
+                var expectedExtent = new Extent(0.0, 0.5, 1.6, 2.1);
+                var smallest = expectedExtent.Height < expectedExtent.Width ? expectedExtent.Height : expectedExtent.Width;
+                expectedExtent.ExpandBy(smallest*padding);
 
-            // Precondition
-            Assert.AreEqual(3, mapView.Layers.Count, "Precondition failed: mapView.Layers != 3");
-            Assert.IsFalse(mapView.Layers.All(l => l.IsVisible), "Precondition failed: not all map layers should be visible.");
+                // Precondition
+                Assert.AreEqual(3, mapView.Layers.Count, "Precondition failed: mapView.Layers != 3");
+                Assert.IsFalse(mapView.Layers.All(l => l.IsVisible), "Precondition failed: not all map layers should be visible.");
 
-            // Call
-            map.ZoomToAllVisibleLayers();
+                // Call
+                map.ZoomToAllVisibleLayers();
 
-            // Assert
-            Assert.AreNotEqual(mapView.GetMaxExtent(), mapView.ViewExtents);
-            Assert.AreEqual(expectedExtent, mapView.ViewExtents);
+                // Assert
+                Assert.AreNotEqual(mapView.GetMaxExtent(), mapView.ViewExtents);
+                Assert.AreEqual(expectedExtent, mapView.ViewExtents);
+            }
         }
 
         [Test]
@@ -257,49 +252,51 @@
         public void ZoomToAllVisibleLayers_LayersOfVariousDimensions_ZoomToVisibleLayersExtent(double xMax, double yMax)
         {
             // Setup
-            var map = new MapControl();
-            var mapView = map.Controls.OfType<Map>().First();
-            var mapDataCollection = new MapDataCollection("test data");
-
-            mapDataCollection.Add(new MapPointData("test data")
+            using (var map = new MapControl())
             {
-                Features = new[]
+                var mapView = map.Controls.OfType<Map>().First();
+                var mapDataCollection = new MapDataCollection("test data");
+
+                mapDataCollection.Add(new MapPointData("test data")
                 {
-                    new MapFeature(new[]
+                    Features = new[]
                     {
-                        new MapGeometry(new[]
+                        new MapFeature(new[]
                         {
-                            new[]
+                            new MapGeometry(new[]
                             {
-                                new Point2D(0.0, 0.0),
-                                new Point2D(xMax, yMax)
-                            }
+                                new[]
+                                {
+                                    new Point2D(0.0, 0.0),
+                                    new Point2D(xMax, yMax)
+                                }
+                            })
                         })
-                    })
-                }
-            });
+                    }
+                });
 
-            map.Data.Add(mapDataCollection);
-            map.Data.NotifyObservers();
+                map.Data.Add(mapDataCollection);
+                map.Data.NotifyObservers();
 
-            var expectedExtent = new Extent(0.0, 0.0, xMax, yMax);
-            var smallest = expectedExtent.Height < expectedExtent.Width ? expectedExtent.Height : expectedExtent.Width;
-            expectedExtent.ExpandBy(smallest*padding);
+                var expectedExtent = new Extent(0.0, 0.0, xMax, yMax);
+                var smallest = expectedExtent.Height < expectedExtent.Width ? expectedExtent.Height : expectedExtent.Width;
+                expectedExtent.ExpandBy(smallest*padding);
 
-            // Call
-            map.ZoomToAllVisibleLayers();
+                // Call
+                map.ZoomToAllVisibleLayers();
 
-            // Assert
-            if (double.IsInfinity(expectedExtent.Height) || double.IsInfinity(expectedExtent.Width))
-            {
-                Assert.AreEqual(mapView.GetMaxExtent(), mapView.ViewExtents);
-                Assert.AreNotEqual(expectedExtent, mapView.ViewExtents);
+                // Assert
+                if (double.IsInfinity(expectedExtent.Height) || double.IsInfinity(expectedExtent.Width))
+                {
+                    Assert.AreEqual(mapView.GetMaxExtent(), mapView.ViewExtents);
+                    Assert.AreNotEqual(expectedExtent, mapView.ViewExtents);
+                }
+                else
+                {
+                    Assert.AreNotEqual(mapView.GetMaxExtent(), mapView.ViewExtents);
+                    Assert.AreEqual(expectedExtent, mapView.ViewExtents);
+                }
             }
-            else
-            {
-                Assert.AreNotEqual(mapView.GetMaxExtent(), mapView.ViewExtents);
-                Assert.AreEqual(expectedExtent, mapView.ViewExtents);
-            }
         }
 
         [Test]