Index: Core/Components/src/Core.Components.DotSpatial.Forms/BackgroundLayerStatus.cs
===================================================================
diff -u -rcb3993d6878d38a6199d4d94fb1723d1f879763e -r928db212d234bb6eb83f29a9f06c1b4453249d66
--- Core/Components/src/Core.Components.DotSpatial.Forms/BackgroundLayerStatus.cs	(.../BackgroundLayerStatus.cs)	(revision cb3993d6878d38a6199d4d94fb1723d1f879763e)
+++ Core/Components/src/Core.Components.DotSpatial.Forms/BackgroundLayerStatus.cs	(.../BackgroundLayerStatus.cs)	(revision 928db212d234bb6eb83f29a9f06c1b4453249d66)
@@ -112,14 +112,14 @@
         }
 
         /// <summary>
-        /// Template method that marks that a (new) background layer has successfully been initialized.
+        /// Mark that a (new) background layer has successfully been initialized.
         /// </summary>
         /// <param name="backgroundLayer">The constructed layer.</param>
         /// <param name="dataSource">The data used to construct <paramref name="backgroundLayer"/>.</param>
         protected abstract void OnLayerInitializationSuccessful(BruTileLayer backgroundLayer, ImageBasedMapData dataSource);
 
         /// <summary>
-        /// Template method that indicates if a <see cref="ImageBasedMapData"/> corresponds with the <see cref="BackgroundLayer"/>.
+        /// Indicates if a <see cref="ImageBasedMapData"/> corresponds with the <see cref="BackgroundLayer"/>.
         /// </summary>
         /// <param name="mapData">The map data.</param>
         /// <returns>Returns <c>true</c> if <paramref name="mapData"/> corresponds with
Index: Core/Components/test/Core.Components.DotSpatial.Forms.Test/MapControlTest.cs
===================================================================
diff -u -r7fc071aa21ada037052184432c734ce79adf5c8c -r928db212d234bb6eb83f29a9f06c1b4453249d66
--- Core/Components/test/Core.Components.DotSpatial.Forms.Test/MapControlTest.cs	(.../MapControlTest.cs)	(revision 7fc071aa21ada037052184432c734ce79adf5c8c)
+++ Core/Components/test/Core.Components.DotSpatial.Forms.Test/MapControlTest.cs	(.../MapControlTest.cs)	(revision 928db212d234bb6eb83f29a9f06c1b4453249d66)
@@ -148,134 +148,6 @@
             }
         }
 
-        [OneTimeSetUp]
-        public void SetUp()
-        {
-            directoryDisposeHelper = new DirectoryDisposeHelper(TestHelper.GetScratchPadPath(), nameof(MapControlTest));
-            testSettingsHelper = new TestSettingsHelper
-            {
-                ApplicationLocalUserSettingsDirectory = TestHelper.GetScratchPadPath(nameof(MapControlTest))
-            };
-            settingsDirectory = testSettingsHelper.GetApplicationLocalUserSettingsDirectory();
-        }
-
-        [OneTimeTearDown]
-        public void TearDown()
-        {
-            directoryDisposeHelper.Dispose();
-        }
-
-        private static MapDataCollection GetTestData()
-        {
-            var mapDataCollection = new MapDataCollection("Test data");
-
-            mapDataCollection.Add(new MapPointData("Test data")
-            {
-                Features = new[]
-                {
-                    new MapFeature(new[]
-                    {
-                        new MapGeometry(new[]
-                        {
-                            new[]
-                            {
-                                new Point2D(1.5, 2)
-                            }
-                        }),
-                        new MapGeometry(new[]
-                        {
-                            new[]
-                            {
-                                new Point2D(1.1, 1)
-                            }
-                        }),
-                        new MapGeometry(new[]
-                        {
-                            new[]
-                            {
-                                new Point2D(0.8, 0.5)
-                            }
-                        })
-                    })
-                }
-            });
-
-            mapDataCollection.Add(new MapLineData("Test data")
-            {
-                Features = new[]
-                {
-                    new MapFeature(new[]
-                    {
-                        new MapGeometry(new[]
-                        {
-                            new[]
-                            {
-                                new Point2D(0.0, 1.1),
-                                new Point2D(1.0, 2.1),
-                                new Point2D(1.6, 1.6)
-                            }
-                        })
-                    })
-                }
-            });
-
-            mapDataCollection.Add(new MapPolygonData("Test data")
-            {
-                Features = new[]
-                {
-                    new MapFeature(new[]
-                    {
-                        new MapGeometry(new[]
-                        {
-                            new[]
-                            {
-                                new Point2D(1.0, 1.3),
-                                new Point2D(3.0, 2.6),
-                                new Point2D(5.6, 1.6)
-                            }
-                        })
-                    })
-                },
-                IsVisible = false
-            });
-
-            return mapDataCollection;
-        }
-
-        private static void ExtendWithExpectedMargin(Extent expectedExtent)
-        {
-            double smallestDimension = Math.Min(expectedExtent.Height, expectedExtent.Width);
-            expectedExtent.ExpandBy(smallestDimension * padding);
-        }
-
-        private static Extent GetExpectedExtent(FeatureBasedMapData visibleMapData)
-        {
-            double minX = double.MaxValue;
-            double maxX = double.MinValue;
-            double minY = double.MaxValue;
-            double maxY = double.MinValue;
-
-            foreach (MapFeature feature in visibleMapData.Features)
-            {
-                foreach (MapGeometry geometry in feature.MapGeometries)
-                {
-                    foreach (IEnumerable<Point2D> pointCollection in geometry.PointCollections)
-                    {
-                        foreach (Point2D point in pointCollection)
-                        {
-                            minX = Math.Min(minX, point.X);
-                            maxX = Math.Max(maxX, point.X);
-
-                            minY = Math.Min(minY, point.Y);
-                            maxY = Math.Max(maxY, point.Y);
-                        }
-                    }
-                }
-            }
-
-            return new Extent(minX, minY, maxX, maxY);
-        }
-
         [Test]
         public void GivenMapControlWithoutData_WhenDataSetToMapDataCollection_ThenMapControlUpdated()
         {
@@ -349,7 +221,7 @@
 
                 // Precondition
                 Assert.AreEqual(1, mapView.Layers.Count);
-                Assert.AreEqual("Points", ((FeatureLayer)mapView.Layers[0]).Name);
+                Assert.AreEqual("Points", ((FeatureLayer) mapView.Layers[0]).Name);
 
                 // When
                 map.Data = mapDataCollection2;
@@ -518,6 +390,134 @@
             }
         }
 
+        [OneTimeSetUp]
+        public void SetUp()
+        {
+            directoryDisposeHelper = new DirectoryDisposeHelper(TestHelper.GetScratchPadPath(), nameof(MapControlTest));
+            testSettingsHelper = new TestSettingsHelper
+            {
+                ApplicationLocalUserSettingsDirectory = TestHelper.GetScratchPadPath(nameof(MapControlTest))
+            };
+            settingsDirectory = testSettingsHelper.GetApplicationLocalUserSettingsDirectory();
+        }
+
+        [OneTimeTearDown]
+        public void TearDown()
+        {
+            directoryDisposeHelper.Dispose();
+        }
+
+        private static MapDataCollection GetTestData()
+        {
+            var mapDataCollection = new MapDataCollection("Test data");
+
+            mapDataCollection.Add(new MapPointData("Test data")
+            {
+                Features = new[]
+                {
+                    new MapFeature(new[]
+                    {
+                        new MapGeometry(new[]
+                        {
+                            new[]
+                            {
+                                new Point2D(1.5, 2)
+                            }
+                        }),
+                        new MapGeometry(new[]
+                        {
+                            new[]
+                            {
+                                new Point2D(1.1, 1)
+                            }
+                        }),
+                        new MapGeometry(new[]
+                        {
+                            new[]
+                            {
+                                new Point2D(0.8, 0.5)
+                            }
+                        })
+                    })
+                }
+            });
+
+            mapDataCollection.Add(new MapLineData("Test data")
+            {
+                Features = new[]
+                {
+                    new MapFeature(new[]
+                    {
+                        new MapGeometry(new[]
+                        {
+                            new[]
+                            {
+                                new Point2D(0.0, 1.1),
+                                new Point2D(1.0, 2.1),
+                                new Point2D(1.6, 1.6)
+                            }
+                        })
+                    })
+                }
+            });
+
+            mapDataCollection.Add(new MapPolygonData("Test data")
+            {
+                Features = new[]
+                {
+                    new MapFeature(new[]
+                    {
+                        new MapGeometry(new[]
+                        {
+                            new[]
+                            {
+                                new Point2D(1.0, 1.3),
+                                new Point2D(3.0, 2.6),
+                                new Point2D(5.6, 1.6)
+                            }
+                        })
+                    })
+                },
+                IsVisible = false
+            });
+
+            return mapDataCollection;
+        }
+
+        private static void ExtendWithExpectedMargin(Extent expectedExtent)
+        {
+            double smallestDimension = Math.Min(expectedExtent.Height, expectedExtent.Width);
+            expectedExtent.ExpandBy(smallestDimension * padding);
+        }
+
+        private static Extent GetExpectedExtent(FeatureBasedMapData visibleMapData)
+        {
+            double minX = double.MaxValue;
+            double maxX = double.MinValue;
+            double minY = double.MaxValue;
+            double maxY = double.MinValue;
+
+            foreach (MapFeature feature in visibleMapData.Features)
+            {
+                foreach (MapGeometry geometry in feature.MapGeometries)
+                {
+                    foreach (IEnumerable<Point2D> pointCollection in geometry.PointCollections)
+                    {
+                        foreach (Point2D point in pointCollection)
+                        {
+                            minX = Math.Min(minX, point.X);
+                            maxX = Math.Max(maxX, point.X);
+
+                            minY = Math.Min(minY, point.Y);
+                            maxY = Math.Max(maxY, point.Y);
+                        }
+                    }
+                }
+            }
+
+            return new Extent(minX, minY, maxX, maxY);
+        }
+
         #region BackgroundMapData
 
         #region WmtsMapData