Index: Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs
===================================================================
diff -u -r1d7f9c7875b22fe69fd5b1a32b2bc817dd6cf192 -r1f74d23ddb19c459145cbb9aa93294695b033f5e
--- Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs	(.../MapControl.cs)	(revision 1d7f9c7875b22fe69fd5b1a32b2bc817dd6cf192)
+++ Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs	(.../MapControl.cs)	(revision 1f74d23ddb19c459145cbb9aa93294695b033f5e)
@@ -194,84 +194,84 @@
 
         #region Background layer
 
+        /// <summary>
+        /// Attempts to initialize the background layer.
+        /// </summary>
+        /// <returns><c>true</c> if initialization of the background layer was successful,
+        /// <c>false</c> otherwise.
+        /// </returns>
         private bool InitializeBackgroundLayer()
         {
-            var wmtsBackgroundMapData = backgroundMapData as WmtsMapData;
-            var wellKnownMapDataBackgroundMapData = backgroundMapData as WellKnownTileSourceMapData;
+            IConfiguration configuration = CreateInitializedConfiguration(backgroundMapData);
+            if (configuration == null)
+            {
+                return false;
+            }
+
+            var backgroundLayer = new BruTileLayer(configuration)
+            {
+                IsVisible = backgroundMapData.IsVisible,
+                Transparency = Convert.ToSingle(backgroundMapData.Transparency)
+            };
+            backgroundLayerStatus.SuccessfullyInitializedLayer(backgroundLayer, backgroundMapData);
+
+            return true;
+        }
+
+        private IConfiguration CreateInitializedConfiguration(ImageBasedMapData mapdata)
+        {
+            var wmtsBackgroundMapData = mapdata as WmtsMapData;
+            var wellKnownMapDataBackgroundMapData = mapdata as WellKnownTileSourceMapData;
             if (wmtsBackgroundMapData != null)
             {
-                return InitializeBackgroundLayer(wmtsBackgroundMapData);
+                return TryCreateInitializedConfiguration(wmtsBackgroundMapData);
             }
+
             if (wellKnownMapDataBackgroundMapData != null)
             {
-                return InitializeBackgroundLayer(wellKnownMapDataBackgroundMapData);
+                return TryCreateInitializedConfiguration(wellKnownMapDataBackgroundMapData);
             }
-            return false;
+            return null;
         }
 
-        private bool InitializeBackgroundLayer(WellKnownTileSourceMapData wellKnownMapDataBackgroundMapData)
+        private IConfiguration TryCreateInitializedConfiguration(WellKnownTileSourceMapData wellKnownMapDataBackgroundMapData)
         {
             try
             {
-                WellKnownTileSourceLayerConfiguration configuration = WellKnownTileSourceLayerConfiguration.CreateInitializedConfiguration(
-                    wellKnownMapDataBackgroundMapData.TileSource);
-
-                var backgroundLayer = new BruTileLayer(configuration)
-                {
-                    IsVisible = backgroundMapData.IsVisible,
-                    Transparency = Convert.ToSingle(backgroundMapData.Transparency)
-                };
-                backgroundLayerStatus.SuccessfullyInitializedLayer(backgroundLayer, wellKnownMapDataBackgroundMapData);
-
-                return true;
+                return WellKnownTileSourceLayerConfiguration.CreateInitializedConfiguration(wellKnownMapDataBackgroundMapData.TileSource);
             }
             catch (NotSupportedException e)
             {
                 string tileDisplayName = TypeUtils.GetDisplayName(wellKnownMapDataBackgroundMapData.TileSource);
-                HandleBruTileInitializationException(e, $"Verbinden met '{tileDisplayName}' is mislukt waardoor geen kaartgegevens ingeladen kunnen worden.");
+                HandleBruTileInitializationException(e, string.Format(Resources.MapControl_InitializeBackgroundLayer_Connect_to_0_failed, tileDisplayName));
 
-                return false;
+                return null;
             }
             catch (CannotCreateTileCacheException e)
             {
                 HandleBruTileInitializationException(e, Resources.MapControl_InitializeBackgroundLayer_Persistent_cache_creation_failed);
 
-                return false;
+                return null;
             }
         }
 
-        /// <summary>
-        /// Attempts to initialize the background layer.
-        /// </summary>
-        /// <returns><c>true</c> if initialization of the background layer was successful,
-        /// <c>false</c> otherwise.
-        /// </returns>
-        private bool InitializeBackgroundLayer(WmtsMapData wmtsMapDataBackgroundMapData)
+        private PersistentCacheConfiguration TryCreateInitializedConfiguration(WmtsMapData wmtsMapDataBackgroundMapData)
         {
             try
             {
-                WmtsLayerConfiguration configuration = WmtsLayerConfiguration.CreateInitializedConfiguration(wmtsMapDataBackgroundMapData.SourceCapabilitiesUrl,
-                                                                                                             wmtsMapDataBackgroundMapData.SelectedCapabilityIdentifier,
-                                                                                                             wmtsMapDataBackgroundMapData.PreferredFormat);
-                var backgroundLayer = new BruTileLayer(configuration)
-                {
-                    IsVisible = backgroundMapData.IsVisible,
-                    Transparency = Convert.ToSingle(backgroundMapData.Transparency)
-                };
-                backgroundLayerStatus.SuccessfullyInitializedLayer(backgroundLayer, wmtsMapDataBackgroundMapData);
-                return true;
+                return WmtsLayerConfiguration.CreateInitializedConfiguration(wmtsMapDataBackgroundMapData.SourceCapabilitiesUrl,
+                                                                             wmtsMapDataBackgroundMapData.SelectedCapabilityIdentifier,
+                                                                             wmtsMapDataBackgroundMapData.PreferredFormat);
             }
             catch (Exception e) when (e is CannotFindTileSourceException || e is CannotReceiveTilesException)
             {
                 HandleBruTileInitializationException(e, Resources.MapControl_InitializeBackgroundLayer_Wmts_connection_failed);
-
-                return false;
+                return null;
             }
             catch (CannotCreateTileCacheException e)
             {
                 HandleBruTileInitializationException(e, Resources.MapControl_InitializeBackgroundLayer_Persistent_cache_creation_failed);
-
-                return false;
+                return null;
             }
         }
 
Index: Core/Components/src/Core.Components.DotSpatial.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r99f9004206bfb9de084275d749b7aeccafd6da18 -r1f74d23ddb19c459145cbb9aa93294695b033f5e
--- Core/Components/src/Core.Components.DotSpatial.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 99f9004206bfb9de084275d749b7aeccafd6da18)
+++ Core/Components/src/Core.Components.DotSpatial.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 1f74d23ddb19c459145cbb9aa93294695b033f5e)
@@ -92,6 +92,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Verbinden met &apos;{0}&apos; is mislukt waardoor geen kaartgegevens ingeladen kunnen worden..
+        /// </summary>
+        internal static string MapControl_InitializeBackgroundLayer_Connect_to_0_failed {
+            get {
+                return ResourceManager.GetString("MapControl_InitializeBackgroundLayer_Connect_to_0_failed", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Configuratie van kaartgegevens hulpbestanden is mislukt..
         /// </summary>
         internal static string MapControl_InitializeBackgroundLayer_Persistent_cache_creation_failed {
Index: Core/Components/src/Core.Components.DotSpatial.Forms/Properties/Resources.resx
===================================================================
diff -u -r99f9004206bfb9de084275d749b7aeccafd6da18 -r1f74d23ddb19c459145cbb9aa93294695b033f5e
--- Core/Components/src/Core.Components.DotSpatial.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 99f9004206bfb9de084275d749b7aeccafd6da18)
+++ Core/Components/src/Core.Components.DotSpatial.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 1f74d23ddb19c459145cbb9aa93294695b033f5e)
@@ -126,4 +126,7 @@
   <data name="MapControl_InitializeBackgroundLayer_Persistent_cache_creation_failed" xml:space="preserve">
     <value>Configuratie van kaartgegevens hulpbestanden is mislukt.</value>
   </data>
+  <data name="MapControl_InitializeBackgroundLayer_Connect_to_0_failed" xml:space="preserve">
+    <value>Verbinden met '{0}' is mislukt waardoor geen kaartgegevens ingeladen kunnen worden.</value>
+  </data>
 </root>
\ No newline at end of file
Index: Core/Components/test/Core.Components.DotSpatial.Forms.Test/MapControlTest.cs
===================================================================
diff -u -r1d7f9c7875b22fe69fd5b1a32b2bc817dd6cf192 -r1f74d23ddb19c459145cbb9aa93294695b033f5e
--- Core/Components/test/Core.Components.DotSpatial.Forms.Test/MapControlTest.cs	(.../MapControlTest.cs)	(revision 1d7f9c7875b22fe69fd5b1a32b2bc817dd6cf192)
+++ Core/Components/test/Core.Components.DotSpatial.Forms.Test/MapControlTest.cs	(.../MapControlTest.cs)	(revision 1f74d23ddb19c459145cbb9aa93294695b033f5e)
@@ -56,9 +56,9 @@
     public class MapControlTest
     {
         private const double padding = 0.05;
-        private const string tileCachesFolder = "tilecaches";
-        private static readonly string rootPath = TestHelper.GetScratchPadPath();
         private DirectoryDisposeHelper directoryDisposeHelper;
+        private TestSettingsHelper testSettingsHelper;
+        private string settingsDirectory;
 
         [Test]
         public void DefaultConstructor_DefaultValues()
@@ -104,25 +104,13 @@
             }
         }
 
-        [OneTimeSetUp]
-        public void SetUp()
-        {
-            directoryDisposeHelper = new DirectoryDisposeHelper(rootPath, tileCachesFolder);
-        }
-
-        [OneTimeTearDown]
-        public void TearDown()
-        {
-            directoryDisposeHelper.Dispose();
-        }
-
         [Test]
         public void RemoveAllData_Always_SetDataAndBackgroundMapDataNull()
         {
             // Setup
             WmtsMapData backgroundMapData = WmtsMapData.CreateDefaultPdokMapData();
 
-            using (new UseCustomSettingsHelper(new TestSettingsHelper()))
+            using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
             using (var map = new MapControl())
             {
@@ -159,6 +147,23 @@
             }
         }
 
+        [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");
@@ -284,7 +289,7 @@
             backgroundMapData.IsVisible = isVisible;
             backgroundMapData.Transparency = (RoundedDouble) 0.25;
 
-            using (new UseCustomSettingsHelper(new TestSettingsHelper()))
+            using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
             using (var map = new MapControl())
             {
@@ -314,7 +319,7 @@
             // Given
             WmtsMapData backgroundMapData = WmtsMapData.CreateDefaultPdokMapData();
 
-            using (new UseCustomSettingsHelper(new TestSettingsHelper()))
+            using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(problematicFactory))
             using (var map = new MapControl())
             {
@@ -344,9 +349,9 @@
 
             using (new UseCustomSettingsHelper(new TestSettingsHelper
             {
-                ApplicationLocalUserSettingsDirectory = Path.Combine(rootPath, folderWithoutPermission)
+                ApplicationLocalUserSettingsDirectory = Path.Combine(settingsDirectory, folderWithoutPermission)
             }))
-            using (var disposeHelper = new DirectoryDisposeHelper(rootPath, folderWithoutPermission, tileCachesFolder))
+            using (var disposeHelper = new DirectoryDisposeHelper(settingsDirectory, folderWithoutPermission))
             using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
             using (var map = new MapControl())
             {
@@ -379,7 +384,7 @@
             // Given
             WmtsMapData backgroundMapData = WmtsMapData.CreateDefaultPdokMapData();
 
-            using (new UseCustomSettingsHelper(new TestSettingsHelper()))
+            using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(problematicFactory))
             using (var map = new MapControl())
             {
@@ -410,27 +415,26 @@
         {
             // Given
             string folderWithoutPermission = Path.GetRandomFileName();
-            string settingsDirectory = Path.Combine(rootPath, folderWithoutPermission);
-
             WmtsMapData backgroundMapData = WmtsMapData.CreateDefaultPdokMapData();
 
             using (new UseCustomSettingsHelper(new TestSettingsHelper
             {
-                ApplicationLocalUserSettingsDirectory = settingsDirectory
+                ApplicationLocalUserSettingsDirectory = Path.Combine(settingsDirectory, folderWithoutPermission)
             }))
-            using (new DirectoryDisposeHelper(rootPath, folderWithoutPermission, tileCachesFolder))
+            using (var helper = new DirectoryDisposeHelper(settingsDirectory, folderWithoutPermission))
             using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
             using (var map = new MapControl())
             {
-                using (new DirectoryPermissionsRevoker(settingsDirectory, FileSystemRights.Write))
-                {
-                    // Precondition
-                    Action setAndCauseCacheInitializationFailure = () => map.BackgroundMapData = backgroundMapData;
-                    const string expectedMessage = "Configuratie van kaartgegevens hulpbestanden is mislukt. "
-                                                   + "De achtergrondkaart kan nu niet getoond worden.";
-                    TestHelper.AssertLogMessageIsGenerated(setAndCauseCacheInitializationFailure, expectedMessage, 1);
-                }
+                helper.LockDirectory(FileSystemRights.Write);
 
+                // Precondition
+                Action setAndCauseCacheInitializationFailure = () => map.BackgroundMapData = backgroundMapData;
+                const string expectedMessage = "Configuratie van kaartgegevens hulpbestanden is mislukt. "
+                                               + "De achtergrondkaart kan nu niet getoond worden.";
+                TestHelper.AssertLogMessageIsGenerated(setAndCauseCacheInitializationFailure, expectedMessage, 1);
+
+                helper.UnlockDirectory();
+
                 // When
                 backgroundMapData.NotifyObservers();
 
@@ -454,7 +458,7 @@
             // Given
             WmtsMapData backgroundMapData = WmtsMapData.CreateDefaultPdokMapData();
 
-            using (new UseCustomSettingsHelper(new TestSettingsHelper()))
+            using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(problematicFactory))
             using (var map = new MapControl())
             {
@@ -489,9 +493,9 @@
 
             using (new UseCustomSettingsHelper(new TestSettingsHelper
             {
-                ApplicationLocalUserSettingsDirectory = Path.Combine(rootPath, folderWithoutPermission)
+                ApplicationLocalUserSettingsDirectory = Path.Combine(settingsDirectory, folderWithoutPermission)
             }))
-            using (var disposeHelper = new DirectoryDisposeHelper(rootPath, folderWithoutPermission, tileCachesFolder))
+            using (var disposeHelper = new DirectoryDisposeHelper(settingsDirectory, folderWithoutPermission))
             using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
             using (var map = new MapControl())
             {
@@ -547,7 +551,7 @@
             originalBackgroundMapData.IsVisible = true;
             originalBackgroundMapData.Transparency = (RoundedDouble) 0.25;
 
-            using (new UseCustomSettingsHelper(new TestSettingsHelper()))
+            using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(originalBackgroundMapData))
             using (var map = new MapControl())
 
@@ -582,7 +586,7 @@
             newBackgroundMapData.IsVisible = true;
             newBackgroundMapData.Transparency = (RoundedDouble) 0.75;
 
-            using (new UseCustomSettingsHelper(new TestSettingsHelper()))
+            using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(newBackgroundMapData))
             using (var map = new MapControl())
             {
@@ -617,7 +621,7 @@
             backgroundMapData.IsVisible = true;
             backgroundMapData.Transparency = (RoundedDouble) 0.25;
 
-            using (new UseCustomSettingsHelper(new TestSettingsHelper()))
+            using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
             using (var map = new MapControl
             {
@@ -649,7 +653,7 @@
             var newBackgroundMapData = WmtsMapData.CreateAlternativePdokMapData();
             var startingBackgroundMapData = WmtsMapData.CreateUnconnectedMapData();
 
-            using (new UseCustomSettingsHelper(new TestSettingsHelper()))
+            using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(newBackgroundMapData))
             using (var map = new MapControl
             {
@@ -711,7 +715,7 @@
             // Given
             var backgroundMapData = WmtsMapData.CreateAlternativePdokMapData();
 
-            using (new UseCustomSettingsHelper(new TestSettingsHelper()))
+            using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
             using (var map = new MapControl
             {
@@ -775,7 +779,7 @@
             // Given
             WmtsMapData backgroundMapData = WmtsMapData.CreateAlternativePdokMapData();
 
-            using (new UseCustomSettingsHelper(new TestSettingsHelper()))
+            using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
             using (var map = new MapControl())
             {
@@ -826,7 +830,7 @@
             // Given
             WmtsMapData backgroundMapData = WmtsMapData.CreateUnconnectedMapData();
 
-            using (new UseCustomSettingsHelper(new TestSettingsHelper()))
+            using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
             using (var map = new MapControl())
             {
@@ -874,7 +878,7 @@
             // Given
             WmtsMapData backgroundMapData = WmtsMapData.CreateDefaultPdokMapData();
 
-            using (new UseCustomSettingsHelper(new TestSettingsHelper()))
+            using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
             using (var map = new MapControl())
             {
@@ -932,7 +936,7 @@
             // Given
             WmtsMapData backgroundMapData = WmtsMapData.CreateAlternativePdokMapData();
 
-            using (new UseCustomSettingsHelper(new TestSettingsHelper()))
+            using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
             using (var map = new MapControl())
             {
@@ -1042,7 +1046,7 @@
             // Given
             WmtsMapData backgroundMapData = WmtsMapData.CreateAlternativePdokMapData();
 
-            using (new UseCustomSettingsHelper(new TestSettingsHelper()))
+            using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
             using (var map = new MapControl
             {
@@ -1107,7 +1111,7 @@
             // Given
             WmtsMapData backgroundMapData = WmtsMapData.CreateDefaultPdokMapData();
 
-            using (new UseCustomSettingsHelper(new TestSettingsHelper()))
+            using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(problematicFactory))
             using (var map = new MapControl())
             {
@@ -1163,9 +1167,9 @@
 
             using (new UseCustomSettingsHelper(new TestSettingsHelper
             {
-                ApplicationLocalUserSettingsDirectory = Path.Combine(rootPath, folderWithoutPermission)
+                ApplicationLocalUserSettingsDirectory = Path.Combine(settingsDirectory, folderWithoutPermission)
             }))
-            using (var disposeHelper = new DirectoryDisposeHelper(rootPath, folderWithoutPermission, tileCachesFolder))
+            using (var disposeHelper = new DirectoryDisposeHelper(settingsDirectory, folderWithoutPermission))
             using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
             using (var map = new MapControl())
             {
@@ -1410,7 +1414,7 @@
             // Given
             var backgroundMapData = WmtsMapData.CreateAlternativePdokMapData();
 
-            using (new UseCustomSettingsHelper(new TestSettingsHelper()))
+            using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
             using (var map = new MapControl
             {
@@ -1516,7 +1520,7 @@
                 Transparency = (RoundedDouble) 0.25
             };
 
-            using (new UseCustomSettingsHelper(new TestSettingsHelper()))
+            using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
             using (var map = new MapControl())
             {
@@ -1546,7 +1550,7 @@
             // Given
             var backgroundMapData = new WellKnownTileSourceMapData(new Random(123).NextEnum<WellKnownTileSource>());
 
-            using (new UseCustomSettingsHelper(new TestSettingsHelper()))
+            using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(problematicFactory))
             using (var map = new MapControl())
             {
@@ -1577,9 +1581,9 @@
 
             using (new UseCustomSettingsHelper(new TestSettingsHelper
             {
-                ApplicationLocalUserSettingsDirectory = Path.Combine(rootPath, folderWithoutPermission)
+                ApplicationLocalUserSettingsDirectory = Path.Combine(settingsDirectory, folderWithoutPermission)
             }))
-            using (var disposeHelper = new DirectoryDisposeHelper(rootPath, folderWithoutPermission, tileCachesFolder))
+            using (var disposeHelper = new DirectoryDisposeHelper(settingsDirectory, folderWithoutPermission))
             using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
             using (var map = new MapControl())
             {
@@ -1612,7 +1616,7 @@
             // Given
             var backgroundMapData = new WellKnownTileSourceMapData(new Random(123).NextEnum<WellKnownTileSource>());
 
-            using (new UseCustomSettingsHelper(new TestSettingsHelper()))
+            using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(problematicFactory))
             using (var map = new MapControl())
             {
@@ -1644,26 +1648,23 @@
         {
             // Given
             string folderWithoutPermission = Path.GetRandomFileName();
-            string settingsDirectory = Path.Combine(rootPath, folderWithoutPermission);
-
             var backgroundMapData = new WellKnownTileSourceMapData(new Random(123).NextEnum<WellKnownTileSource>());
 
             using (new UseCustomSettingsHelper(new TestSettingsHelper
             {
-                ApplicationLocalUserSettingsDirectory = settingsDirectory
+                ApplicationLocalUserSettingsDirectory = Path.Combine(settingsDirectory, folderWithoutPermission)
             }))
-            using (new DirectoryDisposeHelper(rootPath, folderWithoutPermission, tileCachesFolder))
+            using (var helper = new DirectoryDisposeHelper(settingsDirectory, folderWithoutPermission))
             using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
             using (var map = new MapControl())
             {
-                using (new DirectoryPermissionsRevoker(settingsDirectory, FileSystemRights.Write))
-                {
-                    // Precondition
-                    Action setAndCauseCacheInitializationFailure = () => map.BackgroundMapData = backgroundMapData;
-                    const string expectedMessage = "Configuratie van kaartgegevens hulpbestanden is mislukt. "
-                                                   + "De achtergrondkaart kan nu niet getoond worden.";
-                    TestHelper.AssertLogMessageIsGenerated(setAndCauseCacheInitializationFailure, expectedMessage, 1);
-                }
+                helper.LockDirectory(FileSystemRights.Write);
+                // Precondition
+                Action setAndCauseCacheInitializationFailure = () => map.BackgroundMapData = backgroundMapData;
+                const string expectedMessage = "Configuratie van kaartgegevens hulpbestanden is mislukt. "
+                                               + "De achtergrondkaart kan nu niet getoond worden.";
+                TestHelper.AssertLogMessageIsGenerated(setAndCauseCacheInitializationFailure, expectedMessage, 1);
+                helper.UnlockDirectory();
 
                 // When
                 backgroundMapData.NotifyObservers();
@@ -1688,7 +1689,7 @@
             // Given
             var backgroundMapData = new WellKnownTileSourceMapData(new Random(123).NextEnum<WellKnownTileSource>());
 
-            using (new UseCustomSettingsHelper(new TestSettingsHelper()))
+            using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(problematicFactory))
             using (var map = new MapControl())
             {
@@ -1717,14 +1718,13 @@
         {
             // Given
             string folderWithoutPermission = Path.GetRandomFileName();
-
             var backgroundMapData = new WellKnownTileSourceMapData(new Random(123).NextEnum<WellKnownTileSource>());
 
             using (new UseCustomSettingsHelper(new TestSettingsHelper
             {
-                ApplicationLocalUserSettingsDirectory = Path.Combine(rootPath, folderWithoutPermission)
+                ApplicationLocalUserSettingsDirectory = Path.Combine(settingsDirectory, folderWithoutPermission)
             }))
-            using (var disposeHelper = new DirectoryDisposeHelper(rootPath, folderWithoutPermission, tileCachesFolder))
+            using (var disposeHelper = new DirectoryDisposeHelper(settingsDirectory, folderWithoutPermission))
             using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
             using (var map = new MapControl())
             {
@@ -1750,44 +1750,6 @@
         }
 
         [Test]
-        public void GivenMapControlWithWellKnownBackgroundMapData_WhenWellKnownBackgroundMapDataSet_ThenMapControlUpdated()
-        {
-            // Given
-            var random = new Random(123);
-            var newBackgroundMapData = new WellKnownTileSourceMapData(random.NextEnum<WellKnownTileSource>())
-            {
-                IsVisible = true,
-                Transparency = (RoundedDouble) 0.75
-            };
-
-            using (new UseCustomSettingsHelper(new TestSettingsHelper()))
-            using (new UseCustomTileSourceFactoryConfig(newBackgroundMapData))
-            using (var map = new MapControl())
-            {
-                var originalBackgroundMapData = new WellKnownTileSourceMapData(random.NextEnum<WellKnownTileSource>());
-
-                var mapView = map.Controls.OfType<Map>().First();
-                ProjectionInfo originalProjection = mapView.Projection;
-
-                map.BackgroundMapData = originalBackgroundMapData;
-
-                // Precondition
-                Assert.AreEqual(1, mapView.Layers.Count);
-                //Assert.IsTrue(originalProjection.Equals(mapView.Projection));
-
-                // When
-                map.BackgroundMapData = newBackgroundMapData;
-
-                // Then
-                Assert.AreEqual(1, mapView.Layers.Count);
-                var layer = (BruTileLayer) mapView.Layers[0];
-                Assert.AreEqual(true, layer.IsVisible);
-                Assert.AreEqual(0.75, layer.Transparency);
-                Assert.IsTrue(layer.Projection.Equals(mapView.Projection));
-            }
-        }
-
-        [Test]
         public void GivenMapControlWithWellKnownBackgroundData_WhenVisibilityPropertiesChangeAndNotified_ThenBackgroundLayerReused()
         {
             // Given
@@ -1798,7 +1760,7 @@
                 Transparency = (RoundedDouble) random.NextDouble()
             };
 
-            using (new UseCustomSettingsHelper(new TestSettingsHelper()))
+            using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
             using (var map = new MapControl
             {
@@ -1829,7 +1791,7 @@
             // Given
             var backgroundMapData = new WellKnownTileSourceMapData(new Random(123).NextEnum<WellKnownTileSource>());
 
-            using (new UseCustomSettingsHelper(new TestSettingsHelper()))
+            using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
             using (var map = new MapControl())
             {
@@ -1884,7 +1846,7 @@
             // Given
             var backgroundMapData = new WellKnownTileSourceMapData(new Random(123).NextEnum<WellKnownTileSource>());
 
-            using (new UseCustomSettingsHelper(new TestSettingsHelper()))
+            using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(problematicFactory))
             using (var map = new MapControl())
             {
@@ -1937,14 +1899,13 @@
         {
             // Given
             string folderWithoutPermission = Path.GetRandomFileName();
-
             var backgroundMapData = new WellKnownTileSourceMapData(new Random(123).NextEnum<WellKnownTileSource>());
 
             using (new UseCustomSettingsHelper(new TestSettingsHelper
             {
-                ApplicationLocalUserSettingsDirectory = Path.Combine(rootPath, folderWithoutPermission)
+                ApplicationLocalUserSettingsDirectory = Path.Combine(settingsDirectory, folderWithoutPermission)
             }))
-            using (var disposeHelper = new DirectoryDisposeHelper(rootPath, folderWithoutPermission, tileCachesFolder))
+            using (var disposeHelper = new DirectoryDisposeHelper(settingsDirectory, folderWithoutPermission))
             using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
             using (var map = new MapControl())
             {
@@ -2715,9 +2676,9 @@
 
                 // Precondition
                 Assert.AreEqual(isRectangleZooming, map.IsRectangleZoomingEnabled,
-                                string.Format("Precondition failed: IsRectangleZoomingEnabled is {0}", map.IsRectangleZoomingEnabled));
+                                $"Precondition failed: IsRectangleZoomingEnabled is {map.IsRectangleZoomingEnabled}");
                 Assert.AreEqual(!isRectangleZooming, map.IsPanningEnabled,
-                                string.Format("Precondition failed: IsPanningEnabled is {0}", map.IsPanningEnabled));
+                                $"Precondition failed: IsPanningEnabled is {map.IsPanningEnabled}");
 
                 // Call
                 map.ToggleRectangleZooming();