Index: Core/Components/src/Core.Components.DotSpatial.Forms/app.config
===================================================================
diff -u -r7cc1fd960a912443ccc3c6995eccb5673d1d8d22 -r20d628d409984082edb491f5fe246d1ea80f382f
--- Core/Components/src/Core.Components.DotSpatial.Forms/app.config	(.../app.config)	(revision 7cc1fd960a912443ccc3c6995eccb5673d1d8d22)
+++ Core/Components/src/Core.Components.DotSpatial.Forms/app.config	(.../app.config)	(revision 20d628d409984082edb491f5fe246d1ea80f382f)
@@ -1,4 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) Stichting Deltares 2016. All rights reserved.
+
+This file is part of Ringtoets.
+
+Ringtoets is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+All names, logos, and references to "Deltares" are registered trademarks of
+Stichting Deltares and remain full property of Stichting Deltares at all times.
+All rights reserved.
+-->
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
Index: Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/BruTileLayer.cs
===================================================================
diff -u -r6c1eddbd3f88a9dcedec6c113de50416073ddfb3 -r20d628d409984082edb491f5fe246d1ea80f382f
--- Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/BruTileLayer.cs	(.../BruTileLayer.cs)	(revision 6c1eddbd3f88a9dcedec6c113de50416073ddfb3)
+++ Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/BruTileLayer.cs	(.../BruTileLayer.cs)	(revision 20d628d409984082edb491f5fe246d1ea80f382f)
@@ -84,14 +84,11 @@
     public class BruTileLayer : DotSpatialLayer, IMapLayer
     {
         private const string webMercatorEpsgIdentifier = "EPSG:3857";
-        private const int autoRefreshTimeMs = 250;
         private static readonly ProjectionInfo defaultProjection = new ProjectionInfo();
         private readonly IConfiguration configuration;
 
         private readonly AsyncTileFetcher tileFetcher;
 
-        private readonly Stopwatch stopwatch = new Stopwatch();
-
         private readonly ImageAttributes imageAttributes;
 
         private readonly object drawLock = new object();
@@ -241,8 +238,6 @@
                 return;
             }
 
-            stopwatch.Reset();
-
             IEnumerable<DotSpatialExtent> regionsToDraw = regions.Any() ?
                                                               (IEnumerable<DotSpatialExtent>) regions :
                                                               new[]
@@ -457,15 +452,6 @@
                 return;
             }
 
-            // Some timed refreshes if the server becomes slooow...
-            if (stopwatch.Elapsed.Milliseconds > autoRefreshTimeMs && !tileFetcher.IsReady())
-            {
-                stopwatch.Reset();
-                MapFrame.Invalidate();
-                stopwatch.Restart();
-                return;
-            }
-
             DotSpatialExtent tileExtent = FromBruTileExtent(e.TileInfo.Extent);
             if (MapFrame.ViewExtents.Intersects(tileExtent))
             {
@@ -475,7 +461,6 @@
 
         private void HandleQueueEmpty(object sender, EventArgs empty)
         {
-            stopwatch.Reset();
             MapFrame.Invalidate();
         }
 
@@ -534,9 +519,9 @@
 
             using (var bitmap = (Bitmap) Image.FromStream(new MemoryStream(buffer)))
             {
-                WorldFile inWorldFile = new WorldFile(resolution.UnitsPerPixel, 0,
-                                                      0, -resolution.UnitsPerPixel,
-                                                      info.Extent.MinX, info.Extent.MaxY);
+                var inWorldFile = new WorldFile(resolution.UnitsPerPixel, 0,
+                                                0, -resolution.UnitsPerPixel,
+                                                info.Extent.MinX, info.Extent.MaxY);
 
                 WorldFile outWorldFile;
                 Bitmap outBitmap;
Index: Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj
===================================================================
diff -u -r6c1eddbd3f88a9dcedec6c113de50416073ddfb3 -r20d628d409984082edb491f5fe246d1ea80f382f
--- Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj	(.../Core.Components.DotSpatial.Test.csproj)	(revision 6c1eddbd3f88a9dcedec6c113de50416073ddfb3)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj	(.../Core.Components.DotSpatial.Test.csproj)	(revision 20d628d409984082edb491f5fe246d1ea80f382f)
@@ -177,6 +177,27 @@
   <ItemGroup>
     <None Include="Resources\target.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\BackgroundLayerCanvas.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\green_256x256.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\blue_256x256.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\BackgroundLayerCanvasAfterAddingTestTiles.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\BackgroundLayerCanvas_smaller.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\BackgroundLayerCanvas_smallerAfterAddingTestTiles.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\BackgroundLayerAfterAddingHalfTransparentTestTiles.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\..\..\packages\System.Data.SQLite.Core.1.0.104.0\build\net40\System.Data.SQLite.Core.targets" Condition="Exists('..\..\..\..\packages\System.Data.SQLite.Core.1.0.104.0\build\net40\System.Data.SQLite.Core.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Index: Core/Components/test/Core.Components.DotSpatial.Test/Layer/BruTile/BruTileLayerTest.cs
===================================================================
diff -u -rb38a6537a602c558abf8f8ab3e349457604fa4f4 -r20d628d409984082edb491f5fe246d1ea80f382f
--- Core/Components/test/Core.Components.DotSpatial.Test/Layer/BruTile/BruTileLayerTest.cs	(.../BruTileLayerTest.cs)	(revision b38a6537a602c558abf8f8ab3e349457604fa4f4)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Layer/BruTile/BruTileLayerTest.cs	(.../BruTileLayerTest.cs)	(revision 20d628d409984082edb491f5fe246d1ea80f382f)
@@ -22,12 +22,17 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Drawing.Imaging;
+using System.IO;
+using System.Linq;
 using BruTile;
+using BruTile.Cache;
 using Core.Common.TestUtil;
 using Core.Components.DotSpatial.Layer.BruTile;
 using Core.Components.DotSpatial.Layer.BruTile.Configurations;
 using Core.Components.DotSpatial.Layer.BruTile.Projections;
 using Core.Components.DotSpatial.Layer.BruTile.TileFetching;
+using Core.Components.DotSpatial.Test.Properties;
 using DotSpatial.Controls;
 using DotSpatial.Projections;
 using DotSpatial.Projections.AuthorityCodes;
@@ -42,6 +47,117 @@
     [TestFixture]
     public class BruTileLayerTest
     {
+        private static IEnumerable<TestCaseData> DrawRegionsTestCases
+        {
+            get
+            {
+                yield return new TestCaseData(new TileInfosTestConfig(new[]
+                                              {
+                                                  new TileInfoConfig(new Extent(99949.76, 463000.08, 155000, 518050.32),
+                                                                     7, 7, Resources.blue_256x256),
+                                                  new TileInfoConfig(new Extent(44899.52, 463000.08, 99949.76, 518050.32),
+                                                                     6, 7, Resources.green_256x256)
+                                              }, 4),
+                                              Resources.BackgroundLayerCanvas,
+                                              Resources.BackgroundLayerCanvasAfterAddingTestTiles,
+                                              new DotSpatialExtent(-78529.9210634486, 403315.730436505, 306453.46038588, 581961.051306503),
+                                              new DotSpatialExtent(-78529.9210634486, 403315.730436505, 306453.46038588, 581961.051306503),
+                                              false,
+                                              0f)
+                    .SetName("DrawRegions for 2 consecutive tiles at level 4.");
+
+                yield return new TestCaseData(new TileInfosTestConfig(new[]
+                                              {
+                                                  new TileInfoConfig(new Extent(99949.76, 463000.08, 155000, 518050.32),
+                                                                     7, 7, Resources.blue_256x256),
+                                                  new TileInfoConfig(new Extent(44899.52, 463000.08, 99949.76, 518050.32),
+                                                                     6, 7, Resources.green_256x256)
+                                              }, 4),
+                                              Resources.BackgroundLayerCanvas,
+                                              Resources.BackgroundLayerCanvasAfterAddingTestTiles,
+                                              new DotSpatialExtent(-78529.9210634486, 403315.730436505, 306453.46038588, 581961.051306503),
+                                              null,
+                                              false,
+                                              0f)
+                    .SetName("DrawRegions for 2 consecutive tiles at level 4 without specifying region.");
+
+                yield return new TestCaseData(new TileInfosTestConfig(new[]
+                                              {
+                                                  new TileInfoConfig(new Extent(113712.32, 509448.72, 115432.64, 511169.04),
+                                                                     232, 228, Resources.blue_256x256),
+                                                  new TileInfoConfig(new Extent(111992, 511169.04, 113712.32, 512889.36),
+                                                                     231, 227, Resources.green_256x256)
+                                              }, 9),
+                                              Resources.BackgroundLayerCanvas_smaller,
+                                              Resources.BackgroundLayerCanvas_smallerAfterAddingTestTiles,
+                                              new DotSpatialExtent(4.71640686348909, 52.5275200480914, 4.84542703038542, 52.622163604187),
+                                              new DotSpatialExtent(4.71640686348909, 52.5275200480914, 4.84542703038542, 52.622163604187),
+                                              true,
+                                              0f)
+                    .SetName("DrawRegions for 2 loose tiles at level 9 in WGS84.");
+
+                yield return new TestCaseData(new TileInfosTestConfig(new[]
+                                              {
+                                                  new TileInfoConfig(new Extent(113712.32, 509448.72, 115432.64, 511169.04),
+                                                                     232, 228, Resources.blue_256x256),
+                                                  new TileInfoConfig(new Extent(111992, 511169.04, 113712.32, 512889.36),
+                                                                     231, 227, Resources.green_256x256)
+                                              }, 9),
+                                              Resources.BackgroundLayerCanvas_smaller,
+                                              Resources.BackgroundLayerCanvas_smallerAfterAddingTestTiles,
+                                              new DotSpatialExtent(4.71640686348909, 52.5275200480914, 4.84542703038542, 52.622163604187),
+                                              null,
+                                              true,
+                                              0f)
+                    .SetName("DrawRegions for 2 loose tiles at level 9 in WGS84 without specifying region.");
+
+                yield return new TestCaseData(new TileInfosTestConfig(new[]
+                                              {
+                                                  new TileInfoConfig(new Extent(113712.32, 509448.72, 115432.64, 511169.04),
+                                                                     232, 228, Resources.blue_256x256),
+                                                  new TileInfoConfig(new Extent(111992, 511169.04, 113712.32, 512889.36),
+                                                                     231, 227, Resources.green_256x256)
+                                              }, 9),
+                                              Resources.BackgroundLayerCanvas_smaller,
+                                              Resources.BackgroundLayerCanvas_smaller,
+                                              new DotSpatialExtent(4.71640686348909, 52.5275200480914, 4.84542703038542, 52.622163604187),
+                                              new DotSpatialExtent(4.58738669659276, 52.5275200480914, 4.45836652969643, 52.622163604187),
+                                              false,
+                                              0f)
+                    .SetName("DrawRegions at level 9 for region outside viewport.");
+
+                yield return new TestCaseData(new TileInfosTestConfig(new[]
+                                              {
+                                                  new TileInfoConfig(new Extent(99949.76, 463000.08, 155000, 518050.32),
+                                                                     7, 7, Resources.blue_256x256),
+                                                  new TileInfoConfig(new Extent(44899.52, 463000.08, 99949.76, 518050.32),
+                                                                     6, 7, Resources.green_256x256)
+                                              }, 4),
+                                              Resources.BackgroundLayerCanvas,
+                                              Resources.BackgroundLayerCanvas,
+                                              new DotSpatialExtent(-78529.9210634486, 403315.730436505, 306453.46038588, 581961.051306503),
+                                              new DotSpatialExtent(-78529.9210634486, 403315.730436505, 306453.46038588, 581961.051306503),
+                                              false,
+                                              1f)
+                    .SetName("DrawRegions for 2 consecutive tiles at level 4 for fully transparent layer.");
+
+                yield return new TestCaseData(new TileInfosTestConfig(new[]
+                                              {
+                                                  new TileInfoConfig(new Extent(99949.76, 463000.08, 155000, 518050.32),
+                                                                     7, 7, Resources.blue_256x256),
+                                                  new TileInfoConfig(new Extent(44899.52, 463000.08, 99949.76, 518050.32),
+                                                                     6, 7, Resources.green_256x256)
+                                              }, 4),
+                                              Resources.BackgroundLayerCanvas,
+                                              Resources.BackgroundLayerAfterAddingHalfTransparentTestTiles,
+                                              new DotSpatialExtent(-78529.9210634486, 403315.730436505, 306453.46038588, 581961.051306503),
+                                              new DotSpatialExtent(-78529.9210634486, 403315.730436505, 306453.46038588, 581961.051306503),
+                                              false,
+                                              0.5f)
+                    .SetName("DrawRegions for 2 consecutive tiles at level 4 for 50% transparent layer.");
+            }
+        }
+
         [Test]
         public void Constructor_ConfigurationNull_ThrowArgumentNullException()
         {
@@ -585,6 +701,258 @@
             mocks.VerifyAll();
         }
 
+        [Test]
+        [TestCaseSource(nameof(DrawRegionsTestCases))]
+        public void DrawRegions_VariousTestCases_DrawMapTiles(TileInfosTestConfig testConfig,
+                                                              Bitmap mapCanvasSource,
+                                                              Bitmap expectedResult,
+                                                              DotSpatialExtent mapExtent,
+                                                              DotSpatialExtent regionExtent,
+                                                              bool reprojectLayerToWgs84,
+                                                              float transparency)
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var configuration = CreateConfigurationForDrawing(mocks, testConfig);
+            mocks.ReplayAll();
+
+            using (var layer = new BruTileLayer(configuration))
+            using (var mapCanvas = (Bitmap) mapCanvasSource.Clone())
+            using (var graphics = Graphics.FromImage(mapCanvas))
+            {
+                if (reprojectLayerToWgs84)
+                {
+                    layer.Reproject(KnownCoordinateSystems.Geographic.World.WGS1984);
+                }
+                layer.Transparency = transparency;
+
+                var mapArgs = new MapArgs(new Rectangle(0, 0, mapCanvas.Width, mapCanvas.Height),
+                                          mapExtent,
+                                          graphics);
+
+                var regions = new List<DotSpatialExtent>();
+                if (regionExtent != null)
+                {
+                    regions.Add(regionExtent);
+                }
+
+                // Call
+                layer.DrawRegions(mapArgs, regions);
+
+                // Assert
+                TestHelper.AssertImagesAreEqual(expectedResult, mapCanvas);
+            }
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void DrawRegions_FirstTileRetrieveNotInCacheSecondTileInCache_DrawMapTiles()
+        {
+            // Setup
+            var testConfig = new TileInfosTestConfig(new[]
+            {
+                new TileInfoConfig(new Extent(99949.76, 463000.08, 155000, 518050.32),
+                                   7, 7, Resources.blue_256x256),
+                new TileInfoConfig(new Extent(44899.52, 463000.08, 99949.76, 518050.32),
+                                   6, 7, Resources.green_256x256)
+            }, 4);
+
+            var mocks = new MockRepository();
+            var configuration = CreateConfigurationForDrawingWhereFirstTileFetchNotInCacheButSecondFetchDoes(mocks, testConfig);
+            mocks.ReplayAll();
+
+            using (var layer = new BruTileLayer(configuration))
+            using (var mapCanvas = (Bitmap) Resources.BackgroundLayerCanvas.Clone())
+            using (var graphics = Graphics.FromImage(mapCanvas))
+            {
+                var mapArgs = new MapArgs(new Rectangle(0, 0, mapCanvas.Width, mapCanvas.Height),
+                                          new DotSpatialExtent(-78529.9210634486, 403315.730436505, 306453.46038588, 581961.051306503),
+                                          graphics);
+
+                var regions = new List<DotSpatialExtent>();
+
+                // Call
+                layer.DrawRegions(mapArgs, regions);
+
+                // Assert
+                TestHelper.AssertImagesAreEqual(Resources.BackgroundLayerCanvasAfterAddingTestTiles, mapCanvas);
+            }
+            mocks.VerifyAll();
+        }
+
+        private static Resolution CreateResulutionForLevel(int level, string epsgCode)
+        {
+            int numberOfImagesAtLevel = GetNumberOfImages(level);
+            return new Resolution($"{epsgCode}:{level}", GetUnitsPerPixel(level),
+                                  256, 256,
+                                  -285401.92, 903402,
+                                  numberOfImagesAtLevel, numberOfImagesAtLevel,
+                                  GetScaleFactor(level));
+        }
+
+        private static int GetNumberOfImages(int level)
+        {
+            return Convert.ToInt32(Math.Pow(2, level));
+        }
+
+        private static double GetUnitsPerPixel(int level)
+        {
+            return 3440.64 / GetNumberOfImages(level);
+        }
+
+        private static int GetScaleFactor(int level)
+        {
+            return 12288000 / GetNumberOfImages(level);
+        }
+
+        private static IDictionary<string, Resolution> CreateResolutionDictionary(string epsgCode, int level)
+        {
+            var levelToCreateResolutionsFor = new[]
+            {
+                level - 1,
+                level,
+                level + 1
+            };
+
+            return levelToCreateResolutionsFor.ToDictionary(resolutionLevel => $"{epsgCode}:{resolutionLevel}",
+                                                            resolutionLevel => CreateResulutionForLevel(resolutionLevel, epsgCode));
+        }
+
+        public class TileInfosTestConfig
+        {
+            public TileInfosTestConfig(IEnumerable<TileInfoConfig> configs, int level)
+            {
+                TileInfoConfigurations = new List<TileInfoConfig>(configs);
+                Level = level;
+            }
+
+            public ICollection<TileInfoConfig> TileInfoConfigurations { get; }
+            public int Level { get; }
+        }
+
+        public class TileInfoConfig
+        {
+            public TileInfoConfig(Extent extent, int columnIndex, int rowIndex, Bitmap image)
+            {
+                Extent = extent;
+                ColumnIndex = columnIndex;
+                RowIndex = rowIndex;
+                Image = image;
+            }
+
+            public Extent Extent { get; }
+            public int ColumnIndex { get; }
+            public int RowIndex { get; }
+            public Bitmap Image { get; }
+        }
+
+        private static IConfiguration CreateConfigurationForDrawingWhereFirstTileFetchNotInCacheButSecondFetchDoes(MockRepository mocks, TileInfosTestConfig config)
+        {
+            var epsgCode = "EPSG:28992";
+            int level = config.Level;
+            var levelId = $"{epsgCode}:{level}";
+
+            var tileInfoImageLookup = config.TileInfoConfigurations.ToDictionary(c => new TileInfo
+                                                                                 {
+                                                                                     Extent = c.Extent,
+                                                                                     Index = new TileIndex(c.ColumnIndex, c.RowIndex, levelId)
+                                                                                 },
+                                                                                 c => c.Image);
+
+            var tileProvider = mocks.Stub<ITileProvider>();
+            tileProvider.Stub(p => p.GetTile(Arg<TileInfo>.Is.Anything)).Return(null);
+
+            var persistentCache = mocks.Stub<ITileCache<byte[]>>();
+            int callCount = 0;
+            foreach (KeyValuePair<TileInfo, Bitmap> tileInfoImagePair in tileInfoImageLookup)
+            {
+                // Configure persistent cache in such a way that first retrieve returns null for that tile
+                // and then second retrieve does return the data (simulating tile having been
+                // retrieved asynchronously):
+                persistentCache.Stub(c => c.Find(tileInfoImagePair.Key.Index))
+                               .WhenCalled(invocation =>
+                               {
+                                   invocation.ReturnValue = callCount < tileInfoImageLookup.Count ?
+                                                                null :
+                                                                ToByteArray(tileInfoImagePair.Value);
+                                   callCount++;
+                               })
+                               .Return(ToByteArray(tileInfoImagePair.Value));
+            }
+            var tileFetcher = new AsyncTileFetcher(tileProvider, 1, 5, persistentCache);
+
+            var tileSchema = mocks.Stub<ITileSchema>();
+            tileSchema.Stub(s => s.Srs).Return(epsgCode);
+            tileSchema.Stub(s => s.Extent).Return(new Extent(-285401.92, 22598.16, 595401.92, 903402));
+            tileSchema.Stub(s => s.Resolutions).Return(CreateResolutionDictionary(epsgCode, level));
+            tileSchema.Stub(s => s.GetTileInfos(Arg<Extent>.Is.NotNull,
+                                                Arg<string>.Is.Equal(levelId)))
+                      .Return(tileInfoImageLookup.Keys);
+
+            var tileSource = mocks.Stub<ITileSource>();
+            tileSource.Stub(ts => ts.Schema).Return(tileSchema);
+
+            var configuration = mocks.Stub<IConfiguration>();
+            configuration.Stub(c => c.Initialized).Return(true);
+            configuration.Stub(c => c.LegendText).Return("A");
+            configuration.Stub(c => c.TileFetcher).Return(tileFetcher);
+            configuration.Stub(c => c.TileSource).Return(tileSource);
+            configuration.Stub(c => c.Dispose());
+            return configuration;
+        }
+
+        private static IConfiguration CreateConfigurationForDrawing(MockRepository mocks, TileInfosTestConfig config)
+        {
+            var epsgCode = "EPSG:28992";
+            int level = config.Level;
+            var levelId = $"{epsgCode}:{level}";
+
+            var tileInfoImageLookup = config.TileInfoConfigurations.ToDictionary(c => new TileInfo
+                                                                                 {
+                                                                                     Extent = c.Extent,
+                                                                                     Index = new TileIndex(c.ColumnIndex, c.RowIndex, levelId)
+                                                                                 },
+                                                                                 c => c.Image);
+
+            var tileProvider = mocks.Stub<ITileProvider>();
+            var persistentCache = mocks.Stub<ITileCache<byte[]>>();
+            foreach (KeyValuePair<TileInfo, Bitmap> tileInfoImagePair in tileInfoImageLookup)
+            {
+                persistentCache.Stub(c => c.Find(tileInfoImagePair.Key.Index))
+                               .Return(ToByteArray(tileInfoImagePair.Value));
+            }
+            var tileFetcher = new AsyncTileFetcher(tileProvider, 1, 5, persistentCache);
+
+            var tileSchema = mocks.Stub<ITileSchema>();
+            tileSchema.Stub(s => s.Srs).Return(epsgCode);
+            tileSchema.Stub(s => s.Extent).Return(new Extent(-285401.92, 22598.16, 595401.92, 903402));
+            tileSchema.Stub(s => s.Resolutions).Return(CreateResolutionDictionary(epsgCode, level));
+            tileSchema.Stub(s => s.GetTileInfos(Arg<Extent>.Is.NotNull,
+                                                Arg<string>.Is.Equal(levelId)))
+                      .Return(tileInfoImageLookup.Keys);
+
+            var tileSource = mocks.Stub<ITileSource>();
+            tileSource.Stub(ts => ts.Schema).Return(tileSchema);
+
+            var configuration = mocks.Stub<IConfiguration>();
+            configuration.Stub(c => c.Initialized).Return(true);
+            configuration.Stub(c => c.LegendText).Return("A");
+            configuration.Stub(c => c.TileFetcher).Return(tileFetcher);
+            configuration.Stub(c => c.TileSource).Return(tileSource);
+            configuration.Stub(c => c.Dispose());
+            return configuration;
+        }
+
+        private static byte[] ToByteArray(Image image)
+        {
+            using (var stream = new MemoryStream())
+            {
+                image.Save(stream, ImageFormat.Png);
+                stream.Seek(0, SeekOrigin.Begin);
+                return stream.ToArray();
+            }
+        }
+
         private static IConfiguration CreateStubConfiguration(MockRepository mocks, AsyncTileFetcher tileFetcher,
                                                               string tileSchemaSrsString = "EPSG:28992",
                                                               Extent tileSourceExtent = new Extent(),
Index: Core/Components/test/Core.Components.DotSpatial.Test/Properties/Resources.Designer.cs
===================================================================
diff -u -rc0ec9f5dc0c96437c4088eea1284fe2cc33bfddd -r20d628d409984082edb491f5fe246d1ea80f382f
--- Core/Components/test/Core.Components.DotSpatial.Test/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision c0ec9f5dc0c96437c4088eea1284fe2cc33bfddd)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 20d628d409984082edb491f5fe246d1ea80f382f)
@@ -63,6 +63,76 @@
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
+        internal static System.Drawing.Bitmap BackgroundLayerAfterAddingHalfTransparentTestTiles {
+            get {
+                object obj = ResourceManager.GetObject("BackgroundLayerAfterAddingHalfTransparentTestTiles", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap BackgroundLayerCanvas {
+            get {
+                object obj = ResourceManager.GetObject("BackgroundLayerCanvas", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap BackgroundLayerCanvas_smaller {
+            get {
+                object obj = ResourceManager.GetObject("BackgroundLayerCanvas_smaller", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap BackgroundLayerCanvas_smallerAfterAddingTestTiles {
+            get {
+                object obj = ResourceManager.GetObject("BackgroundLayerCanvas_smallerAfterAddingTestTiles", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap BackgroundLayerCanvasAfterAddingTestTiles {
+            get {
+                object obj = ResourceManager.GetObject("BackgroundLayerCanvasAfterAddingTestTiles", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap blue_256x256 {
+            get {
+                object obj = ResourceManager.GetObject("blue_256x256", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap green_256x256 {
+            get {
+                object obj = ResourceManager.GetObject("green_256x256", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
         internal static System.Drawing.Bitmap source {
             get {
                 object obj = ResourceManager.GetObject("source", resourceCulture);
Index: Core/Components/test/Core.Components.DotSpatial.Test/Properties/Resources.resx
===================================================================
diff -u -rc0ec9f5dc0c96437c4088eea1284fe2cc33bfddd -r20d628d409984082edb491f5fe246d1ea80f382f
--- Core/Components/test/Core.Components.DotSpatial.Test/Properties/Resources.resx	(.../Resources.resx)	(revision c0ec9f5dc0c96437c4088eea1284fe2cc33bfddd)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Properties/Resources.resx	(.../Resources.resx)	(revision 20d628d409984082edb491f5fe246d1ea80f382f)
@@ -118,6 +118,27 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="BackgroundLayerAfterAddingHalfTransparentTestTiles" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\BackgroundLayerAfterAddingHalfTransparentTestTiles.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="BackgroundLayerCanvas" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\BackgroundLayerCanvas.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="BackgroundLayerCanvasAfterAddingTestTiles" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\BackgroundLayerCanvasAfterAddingTestTiles.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="BackgroundLayerCanvas_smaller" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\BackgroundLayerCanvas_smaller.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="BackgroundLayerCanvas_smallerAfterAddingTestTiles" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\BackgroundLayerCanvas_smallerAfterAddingTestTiles.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="blue_256x256" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\blue_256x256.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="green_256x256" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\green_256x256.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="source" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\source.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
Index: Core/Components/test/Core.Components.DotSpatial.Test/Resources/BackgroundLayerAfterAddingHalfTransparentTestTiles.png
===================================================================
diff -u
Binary files differ
Index: Core/Components/test/Core.Components.DotSpatial.Test/Resources/BackgroundLayerCanvas.png
===================================================================
diff -u
Binary files differ
Index: Core/Components/test/Core.Components.DotSpatial.Test/Resources/BackgroundLayerCanvasAfterAddingTestTiles.png
===================================================================
diff -u
Binary files differ
Index: Core/Components/test/Core.Components.DotSpatial.Test/Resources/BackgroundLayerCanvas_smaller.png
===================================================================
diff -u
Binary files differ
Index: Core/Components/test/Core.Components.DotSpatial.Test/Resources/BackgroundLayerCanvas_smallerAfterAddingTestTiles.png
===================================================================
diff -u
Binary files differ
Index: Core/Components/test/Core.Components.DotSpatial.Test/Resources/blue_256x256.png
===================================================================
diff -u
Binary files differ
Index: Core/Components/test/Core.Components.DotSpatial.Test/Resources/green_256x256.png
===================================================================
diff -u
Binary files differ