Index: Core/Components/test/Core.Components.DotSpatial.Forms.Test/MapControlBackgroundLayerStatusTest.cs
===================================================================
diff -u -r7fc071aa21ada037052184432c734ce79adf5c8c -rdd85ed9f154fd7189c74ae3d9485d761fb6678de
--- Core/Components/test/Core.Components.DotSpatial.Forms.Test/MapControlBackgroundLayerStatusTest.cs	(.../MapControlBackgroundLayerStatusTest.cs)	(revision 7fc071aa21ada037052184432c734ce79adf5c8c)
+++ Core/Components/test/Core.Components.DotSpatial.Forms.Test/MapControlBackgroundLayerStatusTest.cs	(.../MapControlBackgroundLayerStatusTest.cs)	(revision dd85ed9f154fd7189c74ae3d9485d761fb6678de)
@@ -36,6 +36,40 @@
     [TestFixture]
     public class MapControlBackgroundLayerStatusTest
     {
+        private static IEnumerable<TestCaseData> SameMapDataTypes
+        {
+            get
+            {
+                var source = new Random().NextEnum<WellKnownTileSource>();
+                yield return new TestCaseData(new WellKnownTileSourceMapData(source),
+                                              new WellKnownTileSourceMapData(source))
+                    .SetName("WellKnownMapDataType");
+                yield return new TestCaseData(WmtsMapDataTestHelper.CreateDefaultPdokMapData(),
+                                              WmtsMapDataTestHelper.CreateDefaultPdokMapData())
+                    .SetName("WmtsMapDataType");
+            }
+        }
+
+        private static IEnumerable<TestCaseData> OtherConfigurations
+        {
+            get
+            {
+                var source = new Random().NextEnum<WellKnownTileSource>();
+                yield return new TestCaseData(new WellKnownTileSourceMapData(source),
+                                              WmtsMapDataTestHelper.CreateDefaultPdokMapData())
+                    .SetName("WellKnownToWmts");
+                yield return new TestCaseData(WmtsMapDataTestHelper.CreateDefaultPdokMapData(),
+                                              new WellKnownTileSourceMapData(source))
+                    .SetName("WmtsToWellKnown");
+                yield return new TestCaseData(new WellKnownTileSourceMapData(WellKnownTileSource.BingAerial),
+                                              new WellKnownTileSourceMapData(WellKnownTileSource.BingHybrid))
+                    .SetName("OtherWellKnownConfiguration");
+                yield return new TestCaseData(WmtsMapDataTestHelper.CreateDefaultPdokMapData(),
+                                              WmtsMapDataTestHelper.CreateAlternativePdokMapData())
+                    .SetName("OtherWmtsConfiguration");
+            }
+        }
+
         [Test]
         public void Constructor_ExpectedValues()
         {
@@ -73,11 +107,11 @@
             // Setup
             var mocks = new MockRepository();
             var tileFetcher = mocks.Stub<ITileFetcher>();
+            IConfiguration configuration = CreateStubConfiguration(mocks, tileFetcher);
+            mocks.ReplayAll();
+
             using (var layerStatus = new MapControlBackgroundLayerStatus())
             {
-                IConfiguration configuration = CreateStubConfiguration(mocks, tileFetcher);
-                mocks.ReplayAll();
-
                 using (var layer = new BruTileLayer(configuration))
                 {
                     layerStatus.LayerInitializationSuccessful(layer, mapData1);
@@ -99,11 +133,11 @@
             // Setup
             var mocks = new MockRepository();
             var tileFetcher = mocks.Stub<ITileFetcher>();
+            IConfiguration configuration = CreateStubConfiguration(mocks, tileFetcher);
+            mocks.ReplayAll();
+
             using (var layerStatus = new MapControlBackgroundLayerStatus())
             {
-                IConfiguration configuration = CreateStubConfiguration(mocks, tileFetcher);
-                mocks.ReplayAll();
-
                 using (var layer = new BruTileLayer(configuration))
                 {
                     layerStatus.LayerInitializationSuccessful(layer, mapData1);
@@ -166,41 +200,6 @@
             }
         }
 
-        private static IEnumerable<TestCaseData> SameMapDataTypes
-        {
-            get
-            {
-                var source = new Random().NextEnum<WellKnownTileSource>();
-                yield return new TestCaseData(new WellKnownTileSourceMapData(source),
-                                              new WellKnownTileSourceMapData(source))
-                    .SetName("WellKnownMapDataType");
-
-                yield return new TestCaseData(WmtsMapDataTestHelper.CreateDefaultPdokMapData(),
-                                              WmtsMapDataTestHelper.CreateDefaultPdokMapData())
-                    .SetName("WmtsMapDataType");
-            }
-        }
-         
-        private static IEnumerable<TestCaseData> OtherConfigurations
-        {
-            get
-            {
-                var source = new Random().NextEnum<WellKnownTileSource>();
-                yield return new TestCaseData(new WellKnownTileSourceMapData(source),
-                                              WmtsMapDataTestHelper.CreateDefaultPdokMapData())
-                    .SetName("WellKnownToWmts");
-                yield return new TestCaseData(WmtsMapDataTestHelper.CreateDefaultPdokMapData(),
-                                              new WellKnownTileSourceMapData(source))
-                    .SetName("WmtsToWellKnown");
-                yield return new TestCaseData(new WellKnownTileSourceMapData(WellKnownTileSource.BingAerial),
-                                              new WellKnownTileSourceMapData(WellKnownTileSource.BingHybrid))
-                    .SetName("OtherWellKnownConfiguration");
-                yield return new TestCaseData(WmtsMapDataTestHelper.CreateDefaultPdokMapData(),
-                                              WmtsMapDataTestHelper.CreateAlternativePdokMapData())
-                    .SetName("OtherWmtsConfiguration");
-            }
-        }
-
         private static IEnumerable<TestCaseData> Configurations(string prefix)
         {
             yield return new TestCaseData(WmtsMapDataTestHelper.CreateDefaultPdokMapData())