Index: Core/Components/src/Core.Components.BruTile.Forms/BrutileConfigurationFactory.cs
===================================================================
diff -u
--- Core/Components/src/Core.Components.BruTile.Forms/BrutileConfigurationFactory.cs	(revision 0)
+++ Core/Components/src/Core.Components.BruTile.Forms/BrutileConfigurationFactory.cs	(revision bb84e8f229fbe284207a2ca2f4ce2244f4ce6076)
@@ -0,0 +1,140 @@
+// 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.
+
+using System;
+using System.ComponentModel;
+using Core.Common.Utils.Reflection;
+using Core.Components.BruTile.Configurations;
+using Core.Components.BruTile.Forms.Properties;
+using Core.Components.Gis.Data;
+using Core.Components.Gis.Exceptions;
+
+namespace Core.Components.BruTile.Forms
+{
+    /// <summary>
+    /// Class responsible for creating <see cref="IConfiguration"/> instances for a given
+    /// map data.
+    /// </summary>
+    public static class BrutileConfigurationFactory
+    {
+        /// <summary>
+        /// Creates a new initialized <see cref="IConfiguration"/>.
+        /// </summary>
+        /// <param name="mapData">The <see cref="ImageBasedMapData"/> to create an
+        /// <see cref="IConfiguration"/> for.</param>
+        /// <returns>A new initialized configuration.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="mapData"/>
+        /// is <c>null</c>.</exception>
+        /// <exception cref="NotSupportedException">Thrown when a configuration can't
+        /// be created for the type of <paramref name="mapData"/>.</exception>
+        /// <exception cref="ConfigurationInitializationException">Thrown when the configuration
+        /// can't connect with the tile service or creating the file cache failed.</exception>
+        public static IConfiguration CreateInitializedConfiguration(ImageBasedMapData mapData)
+        {
+            if (mapData == null)
+            {
+                throw new ArgumentNullException(nameof(mapData));
+            }
+
+            var wmtsBackgroundMapData = mapData as WmtsMapData;
+            var wellKnownBackgroundMapData = mapData as WellKnownTileSourceMapData;
+            if (wmtsBackgroundMapData != null)
+            {
+                return CreateInitializedConfiguration(wmtsBackgroundMapData);
+            }
+
+            if (wellKnownBackgroundMapData != null)
+            {
+                return CreateInitializedConfiguration(wellKnownBackgroundMapData);
+            }
+            throw new NotSupportedException($"Cannot create a configuration for type {mapData.GetType()}.");
+        }
+
+        /// <summary>
+        /// Creates a new initialized <see cref="WellKnownTileSourceLayerConfiguration"/>.
+        /// </summary>
+        /// <param name="wellKnownBackgroundMapData">The <see cref="WellKnownTileSourceMapData"/>
+        /// to create the configuration for.</param>
+        /// <returns>A new initialized <see cref="WellKnownTileSourceLayerConfiguration"/>.</returns>
+        /// <exception cref="ConfigurationInitializationException">Thrown when the configuration
+        /// can't connect with the tile service or creating the file cache failed.</exception>
+        private static WellKnownTileSourceLayerConfiguration CreateInitializedConfiguration(WellKnownTileSourceMapData wellKnownBackgroundMapData)
+        {
+            try
+            {
+                return WellKnownTileSourceLayerConfiguration.CreateInitializedConfiguration(wellKnownBackgroundMapData.TileSource);
+            }
+            catch (NotSupportedException e)
+            {
+                string tileDisplayName;
+                try
+                {
+                    tileDisplayName = TypeUtils.GetDisplayName(wellKnownBackgroundMapData.TileSource);
+                }
+                catch (InvalidEnumArgumentException)
+                {
+                    tileDisplayName = wellKnownBackgroundMapData.TileSource.ToString();
+                }
+
+                throw new ConfigurationInitializationException(
+                    string.Format(Resources.TryCreateInitializedConfiguration_InitializeBackgroundLayer_Connect_to_TileSourceName_0_failed,
+                                  tileDisplayName),
+                    e);
+            }
+            catch (CannotCreateTileCacheException e)
+            {
+                throw new ConfigurationInitializationException(
+                    Resources.TryCreateInitializedConfiguration_InitializeBackgroundLayer_Persistent_cache_creation_failed,
+                    e);
+            }
+        }
+
+        /// <summary>
+        /// Creates a new initialized <see cref="PersistentCacheConfiguration"/>.
+        /// </summary>
+        /// <param name="wmtsBackgroundMapData">The <see cref="WmtsMapData"/>
+        /// to create the configuration for.</param>
+        /// <returns>A new initialized <see cref="PersistentCacheConfiguration"/>.</returns>
+        /// <exception cref="ConfigurationInitializationException">Thrown when the configuration
+        /// can't connect with the tile service or creating the file cache failed.</exception>
+        private static PersistentCacheConfiguration CreateInitializedConfiguration(WmtsMapData wmtsBackgroundMapData)
+        {
+            try
+            {
+                return WmtsLayerConfiguration.CreateInitializedConfiguration(wmtsBackgroundMapData.SourceCapabilitiesUrl,
+                                                                             wmtsBackgroundMapData.SelectedCapabilityIdentifier,
+                                                                             wmtsBackgroundMapData.PreferredFormat);
+            }
+            catch (Exception e) when (e is CannotFindTileSourceException || e is CannotReceiveTilesException)
+            {
+                throw new ConfigurationInitializationException(
+                    Resources.TryCreateInitializedConfiguration_InitializeBackgroundLayer_Wmts_connection_failed,
+                    e);
+            }
+            catch (CannotCreateTileCacheException e)
+            {
+                throw new ConfigurationInitializationException(
+                    Resources.TryCreateInitializedConfiguration_InitializeBackgroundLayer_Persistent_cache_creation_failed,
+                    e);
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Core/Components/src/Core.Components.BruTile.Forms/Core.Components.BruTile.Forms.csproj
===================================================================
diff -u -r396d39591f11aad05a6cd0e66ead43fefd9713c3 -rbb84e8f229fbe284207a2ca2f4ce2244f4ce6076
--- Core/Components/src/Core.Components.BruTile.Forms/Core.Components.BruTile.Forms.csproj	(.../Core.Components.BruTile.Forms.csproj)	(revision 396d39591f11aad05a6cd0e66ead43fefd9713c3)
+++ Core/Components/src/Core.Components.BruTile.Forms/Core.Components.BruTile.Forms.csproj	(.../Core.Components.BruTile.Forms.csproj)	(revision bb84e8f229fbe284207a2ca2f4ce2244f4ce6076)
@@ -43,8 +43,14 @@
     <Compile Include="..\..\..\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
+    <Compile Include="BrutileConfigurationFactory.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="BrutileWmtsCapabilityFactory.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
@@ -53,6 +59,16 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj">
+      <Project>{3BBFD65B-B277-4E50-AE6D-BD24C3434609}</Project>
+      <Name>Core.Common.Base</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
+      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
+      <Name>Core.Common.Utils</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\Core.Components.BruTile\Core.Components.BruTile.csproj">
       <Project>{E02482C7-F12B-42F0-BB2B-C7EC17503A72}</Project>
       <Name>Core.Components.BruTile</Name>
@@ -68,6 +84,12 @@
       <Name>Core.Components.Gis</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Core/Components/src/Core.Components.BruTile.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u
--- Core/Components/src/Core.Components.BruTile.Forms/Properties/Resources.Designer.cs	(revision 0)
+++ Core/Components/src/Core.Components.BruTile.Forms/Properties/Resources.Designer.cs	(revision bb84e8f229fbe284207a2ca2f4ce2244f4ce6076)
@@ -0,0 +1,114 @@
+// 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.
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Core.Components.BruTile.Forms.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Core.Components.BruTile.Forms.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <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 TryCreateInitializedConfiguration_InitializeBackgroundLayer_Connect_to_TileSourceName_0_failed {
+            get {
+                return ResourceManager.GetString("TryCreateInitializedConfiguration_InitializeBackgroundLayer_Connect_to_TileSource" +
+                        "Name_0_failed", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Configuratie van kaartgegevens hulpbestanden is mislukt..
+        /// </summary>
+        internal static string TryCreateInitializedConfiguration_InitializeBackgroundLayer_Persistent_cache_creation_failed {
+            get {
+                return ResourceManager.GetString("TryCreateInitializedConfiguration_InitializeBackgroundLayer_Persistent_cache_crea" +
+                        "tion_failed", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Verbinden met WMTS is mislukt waardoor geen kaartgegevens ingeladen kunnen worden..
+        /// </summary>
+        internal static string TryCreateInitializedConfiguration_InitializeBackgroundLayer_Wmts_connection_failed {
+            get {
+                return ResourceManager.GetString("TryCreateInitializedConfiguration_InitializeBackgroundLayer_Wmts_connection_faile" +
+                        "d", resourceCulture);
+            }
+        }
+    }
+}
Index: Core/Components/src/Core.Components.BruTile.Forms/Properties/Resources.resx
===================================================================
diff -u
--- Core/Components/src/Core.Components.BruTile.Forms/Properties/Resources.resx	(revision 0)
+++ Core/Components/src/Core.Components.BruTile.Forms/Properties/Resources.resx	(revision bb84e8f229fbe284207a2ca2f4ce2244f4ce6076)
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="TryCreateInitializedConfiguration_InitializeBackgroundLayer_Connect_to_TileSourceName_0_failed" xml:space="preserve">
+    <value>Verbinden met '{0}' is mislukt waardoor geen kaartgegevens ingeladen kunnen worden.</value>
+  </data>
+  <data name="TryCreateInitializedConfiguration_InitializeBackgroundLayer_Persistent_cache_creation_failed" xml:space="preserve">
+    <value>Configuratie van kaartgegevens hulpbestanden is mislukt.</value>
+  </data>
+  <data name="TryCreateInitializedConfiguration_InitializeBackgroundLayer_Wmts_connection_failed" xml:space="preserve">
+    <value>Verbinden met WMTS is mislukt waardoor geen kaartgegevens ingeladen kunnen worden.</value>
+  </data>
+</root>
\ No newline at end of file
Index: Core/Components/src/Core.Components.BruTile.Forms/packages.config
===================================================================
diff -u -r99f9004206bfb9de084275d749b7aeccafd6da18 -rbb84e8f229fbe284207a2ca2f4ce2244f4ce6076
--- Core/Components/src/Core.Components.BruTile.Forms/packages.config	(.../packages.config)	(revision 99f9004206bfb9de084275d749b7aeccafd6da18)
+++ Core/Components/src/Core.Components.BruTile.Forms/packages.config	(.../packages.config)	(revision bb84e8f229fbe284207a2ca2f4ce2244f4ce6076)
@@ -20,7 +20,6 @@
 Stichting Deltares and remain full property of Stichting Deltares at all times.
 All rights reserved.
 -->
-
 <packages>
   <package id="BruTile" version="0.19.0" targetFramework="net40" />
 </packages>
\ No newline at end of file
Index: Core/Components/src/Core.Components.BruTile/Configurations/WmtsLayerConfiguration.cs
===================================================================
diff -u -rc779a09fcdb11c7263b460e664e93cc36d0daf6f -rbb84e8f229fbe284207a2ca2f4ce2244f4ce6076
--- Core/Components/src/Core.Components.BruTile/Configurations/WmtsLayerConfiguration.cs	(.../WmtsLayerConfiguration.cs)	(revision c779a09fcdb11c7263b460e664e93cc36d0daf6f)
+++ Core/Components/src/Core.Components.BruTile/Configurations/WmtsLayerConfiguration.cs	(.../WmtsLayerConfiguration.cs)	(revision bb84e8f229fbe284207a2ca2f4ce2244f4ce6076)
@@ -98,6 +98,8 @@
         /// <exception cref="CannotFindTileSourceException">Thrown when it has become impossible
         /// to create an <see cref="ITileSource"/> based on the given information (for example:
         /// unable to connect to server).</exception>
+        /// <exception cref="CannotReceiveTilesException">Thrown when the configured <see cref="ITileSource"/>
+        /// doesn't contain a <see cref="WmtsTileSchema"/>.</exception>
         public static WmtsLayerConfiguration CreateInitializedConfiguration(string wmtsCapabilitiesUrl, string capabilityIdentifier, string preferredFormat)
         {
             ValidateConfigurationParameters(wmtsCapabilitiesUrl, capabilityIdentifier, preferredFormat);
Index: Core/Components/src/Core.Components.DotSpatial.Forms/Core.Components.DotSpatial.Forms.csproj
===================================================================
diff -u -r44fd917df62795d3f13fff346544cd5232c0986b -rbb84e8f229fbe284207a2ca2f4ce2244f4ce6076
--- Core/Components/src/Core.Components.DotSpatial.Forms/Core.Components.DotSpatial.Forms.csproj	(.../Core.Components.DotSpatial.Forms.csproj)	(revision 44fd917df62795d3f13fff346544cd5232c0986b)
+++ Core/Components/src/Core.Components.DotSpatial.Forms/Core.Components.DotSpatial.Forms.csproj	(.../Core.Components.DotSpatial.Forms.csproj)	(revision bb84e8f229fbe284207a2ca2f4ce2244f4ce6076)
@@ -100,6 +100,11 @@
       <Name>Core.Common.Utils</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\Core.Components.BruTile.Forms\Core.Components.BruTile.Forms.csproj">
+      <Project>{1BA9EBD0-AA64-4BE3-9791-B2EE344EC938}</Project>
+      <Name>Core.Components.BruTile.Forms</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\Core.Components.BruTile\Core.Components.BruTile.csproj">
       <Project>{E02482C7-F12B-42F0-BB2B-C7EC17503A72}</Project>
       <Name>Core.Components.BruTile</Name>
Index: Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs
===================================================================
diff -u -r44fd917df62795d3f13fff346544cd5232c0986b -rbb84e8f229fbe284207a2ca2f4ce2244f4ce6076
--- Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs	(.../MapControl.cs)	(revision 44fd917df62795d3f13fff346544cd5232c0986b)
+++ Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs	(.../MapControl.cs)	(revision bb84e8f229fbe284207a2ca2f4ce2244f4ce6076)
@@ -26,6 +26,7 @@
 using Core.Common.Base;
 using Core.Common.Utils.Reflection;
 using Core.Components.BruTile.Configurations;
+using Core.Components.BruTile.Forms;
 using Core.Components.DotSpatial.Forms.Properties;
 using Core.Components.DotSpatial.Layer;
 using Core.Components.DotSpatial.Layer.BruTile;
@@ -202,7 +203,25 @@
         /// </returns>
         private bool InitializeBackgroundLayer()
         {
-            IConfiguration configuration = CreateInitializedConfiguration(backgroundMapData);
+            IConfiguration configuration;
+
+            try
+            {
+                configuration = BrutileConfigurationFactory.CreateInitializedConfiguration(backgroundMapData);
+            }
+            catch (ConfigurationInitializationException e)
+            {
+                if (!backgroundLayerStatus.PreviousBackgroundLayerCreationFailed)
+                {
+                    string fullMessage = string.Format(Resources.MapControl_HandleBruTileInitializationException_Message_0_therefore_cannot_show_background_layer,
+                                                       e.Message);
+                    log.Error(fullMessage, e);
+                }
+
+                backgroundLayerStatus.LayerInitializationFailed();
+                return false;
+            }
+
             if (configuration == null)
             {
                 return false;
@@ -218,63 +237,6 @@
             return true;
         }
 
-        private IConfiguration CreateInitializedConfiguration(ImageBasedMapData mapdata)
-        {
-            var wmtsBackgroundMapData = mapdata as WmtsMapData;
-            var wellKnownMapDataBackgroundMapData = mapdata as WellKnownTileSourceMapData;
-            if (wmtsBackgroundMapData != null)
-            {
-                return TryCreateInitializedConfiguration(wmtsBackgroundMapData);
-            }
-
-            if (wellKnownMapDataBackgroundMapData != null)
-            {
-                return TryCreateInitializedConfiguration(wellKnownMapDataBackgroundMapData);
-            }
-            return null;
-        }
-
-        private IConfiguration TryCreateInitializedConfiguration(WellKnownTileSourceMapData wellKnownMapDataBackgroundMapData)
-        {
-            try
-            {
-                return WellKnownTileSourceLayerConfiguration.CreateInitializedConfiguration(wellKnownMapDataBackgroundMapData.TileSource);
-            }
-            catch (NotSupportedException e)
-            {
-                string tileDisplayName = TypeUtils.GetDisplayName(wellKnownMapDataBackgroundMapData.TileSource);
-                HandleBruTileInitializationException(e, string.Format(Resources.MapControl_InitializeBackgroundLayer_Connect_to_TileSourceName_0_failed, tileDisplayName));
-
-                return null;
-            }
-            catch (CannotCreateTileCacheException e)
-            {
-                HandleBruTileInitializationException(e, Resources.MapControl_InitializeBackgroundLayer_Persistent_cache_creation_failed);
-
-                return null;
-            }
-        }
-
-        private PersistentCacheConfiguration TryCreateInitializedConfiguration(WmtsMapData wmtsMapDataBackgroundMapData)
-        {
-            try
-            {
-                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 null;
-            }
-            catch (CannotCreateTileCacheException e)
-            {
-                HandleBruTileInitializationException(e, Resources.MapControl_InitializeBackgroundLayer_Persistent_cache_creation_failed);
-                return null;
-            }
-        }
-
         private void InsertBackgroundLayer()
         {
             if (backgroundMapData.IsConfigured)
@@ -329,18 +291,6 @@
             return !backgroundLayerStatus.HasSameConfiguration(wmtsMapDataBackgroundMapData);
         }
 
-        private void HandleBruTileInitializationException(Exception e, string message)
-        {
-            if (!backgroundLayerStatus.PreviousBackgroundLayerCreationFailed)
-            {
-                string fullMessage = string.Format(Resources.MapControl_HandleBruTileInitializationException_Message_0_therefore_cannot_show_background_layer,
-                                                   message);
-                log.Error(fullMessage, e);
-            }
-
-            backgroundLayerStatus.LayerInitializationFailed();
-        }
-
         #endregion
 
         #region Event handlers
Index: Core/Components/src/Core.Components.DotSpatial.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r44fd917df62795d3f13fff346544cd5232c0986b -rbb84e8f229fbe284207a2ca2f4ce2244f4ce6076
--- Core/Components/src/Core.Components.DotSpatial.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 44fd917df62795d3f13fff346544cd5232c0986b)
+++ Core/Components/src/Core.Components.DotSpatial.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision bb84e8f229fbe284207a2ca2f4ce2244f4ce6076)
@@ -90,32 +90,5 @@
                         "ackground_layer", resourceCulture);
             }
         }
-        
-        /// <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_TileSourceName_0_failed {
-            get {
-                return ResourceManager.GetString("MapControl_InitializeBackgroundLayer_Connect_to_TileSourceName_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 {
-            get {
-                return ResourceManager.GetString("MapControl_InitializeBackgroundLayer_Persistent_cache_creation_failed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Verbinden met WMTS is mislukt waardoor geen kaartgegevens ingeladen kunnen worden..
-        /// </summary>
-        internal static string MapControl_InitializeBackgroundLayer_Wmts_connection_failed {
-            get {
-                return ResourceManager.GetString("MapControl_InitializeBackgroundLayer_Wmts_connection_failed", resourceCulture);
-            }
-        }
     }
 }
Index: Core/Components/src/Core.Components.DotSpatial.Forms/Properties/Resources.resx
===================================================================
diff -u -r44fd917df62795d3f13fff346544cd5232c0986b -rbb84e8f229fbe284207a2ca2f4ce2244f4ce6076
--- Core/Components/src/Core.Components.DotSpatial.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 44fd917df62795d3f13fff346544cd5232c0986b)
+++ Core/Components/src/Core.Components.DotSpatial.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision bb84e8f229fbe284207a2ca2f4ce2244f4ce6076)
@@ -117,16 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="MapControl_InitializeBackgroundLayer_Wmts_connection_failed" xml:space="preserve">
-    <value>Verbinden met WMTS is mislukt waardoor geen kaartgegevens ingeladen kunnen worden.</value>
-  </data>
   <data name="MapControl_HandleBruTileInitializationException_Message_0_therefore_cannot_show_background_layer" xml:space="preserve">
     <value>{0} De achtergrondkaart kan nu niet getoond worden.</value>
   </data>
-  <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_TileSourceName_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/src/Core.Components.Gis/Core.Components.Gis.csproj
===================================================================
diff -u -rd00d30719d5bffa635f40b975e490af4e4c298e9 -rbb84e8f229fbe284207a2ca2f4ce2244f4ce6076
--- Core/Components/src/Core.Components.Gis/Core.Components.Gis.csproj	(.../Core.Components.Gis.csproj)	(revision d00d30719d5bffa635f40b975e490af4e4c298e9)
+++ Core/Components/src/Core.Components.Gis/Core.Components.Gis.csproj	(.../Core.Components.Gis.csproj)	(revision bb84e8f229fbe284207a2ca2f4ce2244f4ce6076)
@@ -54,6 +54,7 @@
     <Compile Include="Exceptions\CannotCreateTileCacheException.cs" />
     <Compile Include="Exceptions\CannotFindTileSourceException.cs" />
     <Compile Include="Exceptions\CannotReceiveTilesException.cs" />
+    <Compile Include="Exceptions\ConfigurationInitializationException.cs" />
     <Compile Include="Features\MapFeature.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
Index: Core/Components/src/Core.Components.Gis/Exceptions/ConfigurationInitializationException.cs
===================================================================
diff -u
--- Core/Components/src/Core.Components.Gis/Exceptions/ConfigurationInitializationException.cs	(revision 0)
+++ Core/Components/src/Core.Components.Gis/Exceptions/ConfigurationInitializationException.cs	(revision bb84e8f229fbe284207a2ca2f4ce2244f4ce6076)
@@ -0,0 +1,57 @@
+// 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.
+
+using System;
+using System.Runtime.Serialization;
+
+namespace Core.Components.Gis.Exceptions
+{
+    /// <summary>
+    /// The exception that is thrown when the initialization of a configuration failed.
+    /// </summary>
+    [Serializable]
+    public class ConfigurationInitializationException : Exception
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ConfigurationInitializationException"/> class.
+        /// </summary>
+        public ConfigurationInitializationException() { }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ConfigurationInitializationException"/> class
+        /// with a specified error message.
+        /// </summary>
+        /// <param name="message">The error message that explains the reason for the exception.</param>
+        public ConfigurationInitializationException(string message) : base(message) { }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ConfigurationInitializationException"/> class
+        /// with a specified error message and a reference to the inner exception that is
+        /// the cause of this exception.
+        /// </summary>
+        /// <param name="message">The error message that explains the reason for the exception.</param>
+        /// <param name="inner">The exception that is the cause of the current exception, 
+        /// or a null reference if no inner exception is specified.</param>
+        public ConfigurationInitializationException(string message, Exception inner) : base(message, inner) { }
+
+        protected ConfigurationInitializationException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+    }
+}
\ No newline at end of file
Index: Core/Components/test/Core.Components.BruTile.Forms.Test/BrutileConfigurationFactoryTest.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.BruTile.Forms.Test/BrutileConfigurationFactoryTest.cs	(revision 0)
+++ Core/Components/test/Core.Components.BruTile.Forms.Test/BrutileConfigurationFactoryTest.cs	(revision bb84e8f229fbe284207a2ca2f4ce2244f4ce6076)
@@ -0,0 +1,223 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Security.AccessControl;
+using BruTile;
+using BruTile.Predefined;
+using Core.Common.Gui.TestUtil.Settings;
+using Core.Common.TestUtil;
+using Core.Components.BruTile.Configurations;
+using Core.Components.BruTile.TestUtil;
+using Core.Components.Gis.Data;
+using Core.Components.Gis.Exceptions;
+using Core.Components.Gis.TestUtil;
+using NUnit.Framework;
+using Rhino.Mocks;
+
+namespace Core.Components.BruTile.Forms.Test
+{
+    [TestFixture]
+    public class BrutileConfigurationFactoryTest
+    {
+        [Test]
+        public void CreateInitializedConfiguration_MapDataNull_ThrowArgumentNullException()
+        {
+            // Call
+            TestDelegate test = () => BrutileConfigurationFactory.CreateInitializedConfiguration(null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("mapData", exception.ParamName);
+        }
+
+        [Test]
+        public void CreateInitializedConfiguration_MapDataNotWellKnownOrWmts_ThrowNotSupportedException()
+        {
+            // Setup
+            var mapData = new TestImageBasedMapData("test", true);
+
+            // Call
+            TestDelegate test = () => BrutileConfigurationFactory.CreateInitializedConfiguration(mapData);
+
+            // Assert
+            var exception = Assert.Throws<NotSupportedException>(test);
+            Assert.AreEqual($"Cannot create a configuration for type {mapData.GetType()}.", exception.Message);
+        }
+
+        [Test]
+        public void CreateInitializedConfiguration_InvalidWellKnownTileSource_ThrowConfigurationInitializationException()
+        {
+            // Setup
+            var wellKnownMapData = new WellKnownTileSourceMapData(WellKnownTileSource.BingAerial)
+            {
+                TileSource = (WellKnownTileSource) 99
+            };
+
+            // Call
+            TestDelegate test = () => BrutileConfigurationFactory.CreateInitializedConfiguration(wellKnownMapData);
+
+            // Assert
+            var exception = Assert.Throws<ConfigurationInitializationException>(test);
+            Assert.IsInstanceOf<NotSupportedException>(exception.InnerException);
+            Assert.AreEqual("Verbinden met '99' is mislukt waardoor geen kaartgegevens ingeladen kunnen worden.", exception.Message);
+        }
+
+        [Test]
+        public void CreateInitializedConfiguration_WellKnownTileSourceFactoryThrowsNotSupportedException_ThrowConfigurationInitializationException()
+        {
+            // Setup
+            var factoryThrowingNotSupportedException = MockRepository.GenerateStub<ITileSourceFactory>();
+            factoryThrowingNotSupportedException.Stub(f => f.GetKnownTileSource(Arg<KnownTileSource>.Is.NotNull))
+                                                .Throw(new NotSupportedException());
+
+            using (new UseCustomTileSourceFactoryConfig(factoryThrowingNotSupportedException))
+            {
+                var wellKnownMapData = new WellKnownTileSourceMapData(WellKnownTileSource.BingAerial);
+
+                // Call
+                TestDelegate test = () => BrutileConfigurationFactory.CreateInitializedConfiguration(wellKnownMapData);
+
+                // Assert
+                var exception = Assert.Throws<ConfigurationInitializationException>(test);
+                Assert.IsInstanceOf<NotSupportedException>(exception.InnerException);
+                Assert.AreEqual("Verbinden met 'Bing Maps - Satelliet' is mislukt waardoor geen kaartgegevens ingeladen kunnen worden.", exception.Message);
+            }
+        }
+
+        [Test]
+        [TestCaseSource(nameof(GetBackgroundData))]
+        public void CreateInitializedConfiguration_CannotCreateFileCache_ThrowConfigurationInitializationException(ImageBasedMapData mapData)
+        {
+            // Setup
+            using (new UseCustomSettingsHelper(new TestSettingsHelper
+            {
+                ApplicationLocalUserSettingsDirectory = Path.Combine(TestHelper.GetScratchPadPath(), nameof(BrutileConfigurationFactoryTest))
+            }))
+            using (var disposeHelper = new DirectoryDisposeHelper(TestHelper.GetScratchPadPath(), nameof(BrutileConfigurationFactoryTest)))
+            using (new UseCustomTileSourceFactoryConfig(mapData))
+            {
+                disposeHelper.LockDirectory(FileSystemRights.Write);
+
+                // Call
+                TestDelegate test = () => BrutileConfigurationFactory.CreateInitializedConfiguration(mapData);
+
+                // Assert
+                var exception = Assert.Throws<ConfigurationInitializationException>(test);
+                Assert.IsInstanceOf<CannotCreateTileCacheException>(exception.InnerException);
+                Assert.AreEqual("Configuratie van kaartgegevens hulpbestanden is mislukt.", exception.Message);
+            }
+        }
+
+        [Test]
+        public void CreateInitializedConfiguration_ValidWellKnownMapData_ReturnWellKnownTileSourceLayerConfiguration()
+        {
+            // Setup
+            var wellKnownMapData = new WellKnownTileSourceMapData(WellKnownTileSource.BingAerial);
+
+            using (new UseCustomTileSourceFactoryConfig(wellKnownMapData))
+            {
+                // Call
+                IConfiguration configuration = BrutileConfigurationFactory.CreateInitializedConfiguration(wellKnownMapData);
+
+                // Assert
+                Assert.IsInstanceOf<WellKnownTileSourceLayerConfiguration>(configuration);
+                Assert.IsTrue(configuration.Initialized);
+            }
+        }
+
+        [Test]
+        [TestCaseSource(nameof(GetProblematicTileSourceFactoryTestCaseData), new object[]
+        {
+            "CreateInitializedConfiguration"
+        })]
+        public void CreateInitializedConfiguration_ProblematicTileSourceFactory_ThrowConfigurationInitializationException(ITileSourceFactory factory)
+        {
+            // Setup
+            WmtsMapData backgroundMapData = WmtsMapData.CreateDefaultPdokMapData();
+
+            using (new UseCustomTileSourceFactoryConfig(factory))
+            {
+                // Call
+                TestDelegate test = () => BrutileConfigurationFactory.CreateInitializedConfiguration(backgroundMapData);
+
+                // Assert
+                var exception = Assert.Throws<ConfigurationInitializationException>(test);
+                Assert.IsInstanceOf<CannotFindTileSourceException>(exception.InnerException);
+                Assert.AreEqual("Verbinden met WMTS is mislukt waardoor geen kaartgegevens ingeladen kunnen worden.", exception.Message);
+            }
+        }
+
+        [Test]
+        public void CreateInitializedConfiguration_ValidWmtsMapData_ReturnWmtsTileSourceLayerConfiguration()
+        {
+            // Setup
+            WmtsMapData mapData = WmtsMapData.CreateDefaultPdokMapData();
+
+            using (new UseCustomTileSourceFactoryConfig(mapData))
+            {
+                // Call
+                IConfiguration configuration = BrutileConfigurationFactory.CreateInitializedConfiguration(mapData);
+
+                // Assert
+                Assert.IsInstanceOf<WmtsLayerConfiguration>(configuration);
+                Assert.IsTrue(configuration.Initialized);
+            }
+        }
+
+        /// <summary>
+        /// Generates <see cref="TestCaseData"/> containing problematic <see cref="ITileSourceFactory"/>.
+        /// </summary>
+        /// <param name="prefix">The test-name prefix.</param>
+        /// <returns>The data for the test cases.</returns>
+        /// <remarks>Some test runners, like TeamCity, cannot properly deal with reuse of
+        /// <see cref="TestCaseData"/> sources where the source defines a name of the test,
+        /// as these testrunners to not display tests in hierarchical form.</remarks>
+        private static IEnumerable<TestCaseData> GetProblematicTileSourceFactoryTestCaseData(string prefix)
+        {
+            var factoryWithoutRequiredTileSource = MockRepository.GenerateStub<ITileSourceFactory>();
+            factoryWithoutRequiredTileSource.Stub(f => f.GetWmtsTileSources(Arg<string>.Is.NotNull))
+                                            .Return(Enumerable.Empty<ITileSource>());
+
+            var factoryThrowingCannotFindTileSourceException = MockRepository.GenerateStub<ITileSourceFactory>();
+            factoryThrowingCannotFindTileSourceException.Stub(f => f.GetWmtsTileSources(Arg<string>.Is.NotNull))
+                                                        .Throw(new CannotFindTileSourceException());
+
+            yield return new TestCaseData(factoryWithoutRequiredTileSource)
+                .SetName($"{prefix}: Required tile source not returned by factory.");
+
+            yield return new TestCaseData(factoryThrowingCannotFindTileSourceException)
+                .SetName($"{prefix}: Tile source factory throws CannotFindTileSourceException.");
+        }
+
+        private static IEnumerable<TestCaseData> GetBackgroundData()
+        {
+            yield return new TestCaseData(new WellKnownTileSourceMapData(WellKnownTileSource.BingAerial))
+                .SetName("WellKnownMapData");
+
+            yield return new TestCaseData(WmtsMapData.CreateDefaultPdokMapData())
+                .SetName("WmtsMapData");
+        }
+    }
+}
\ No newline at end of file
Index: Core/Components/test/Core.Components.BruTile.Forms.Test/Core.Components.BruTile.Forms.Test.csproj
===================================================================
diff -u -r99f9004206bfb9de084275d749b7aeccafd6da18 -rbb84e8f229fbe284207a2ca2f4ce2244f4ce6076
--- Core/Components/test/Core.Components.BruTile.Forms.Test/Core.Components.BruTile.Forms.Test.csproj	(.../Core.Components.BruTile.Forms.Test.csproj)	(revision 99f9004206bfb9de084275d749b7aeccafd6da18)
+++ Core/Components/test/Core.Components.BruTile.Forms.Test/Core.Components.BruTile.Forms.Test.csproj	(.../Core.Components.BruTile.Forms.Test.csproj)	(revision bb84e8f229fbe284207a2ca2f4ce2244f4ce6076)
@@ -39,31 +39,53 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="BruTile, Version=0.19.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\BruTile.0.19.0\lib\net40\BruTile.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Rhino.Mocks, Version=3.6.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
+    <Compile Include="BrutileConfigurationFactoryTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="BruTileWmtsCapabilityFactoryTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj">
       <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
       <Name>Core.Common.Base</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Gui\Core.Common.Gui.csproj">
+      <Project>{30e4c2ae-719e-4d70-9fa9-668a9767fbfa}</Project>
+      <Name>Core.Common.Gui</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.Gui.TestUtil\Core.Common.Gui.TestUtil.csproj">
+      <Project>{26214BD0-DAFB-4CFC-8EB2-80C5D53C859E}</Project>
+      <Name>Core.Common.Gui.TestUtil</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
+      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
+      <Name>Core.Common.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Core.Components.BruTile.Forms\Core.Components.BruTile.Forms.csproj">
       <Project>{1BA9EBD0-AA64-4BE3-9791-B2EE344EC938}</Project>
       <Name>Core.Components.BruTile.Forms</Name>
@@ -84,6 +106,10 @@
       <Project>{1081336C-D919-4249-AB33-9AF15F4D19EC}</Project>
       <Name>Core.Components.BruTile.TestUtil</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Core.Components.Gis.TestUtils\Core.Components.Gis.TestUtils.csproj">
+      <Project>{F0FB401A-3494-4237-9E6D-02CDF77912A8}</Project>
+      <Name>Core.Components.Gis.TestUtils</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
Index: Core/Components/test/Core.Components.BruTile.Forms.Test/app.config
===================================================================
diff -u
--- Core/Components/test/Core.Components.BruTile.Forms.Test/app.config	(revision 0)
+++ Core/Components/test/Core.Components.BruTile.Forms.Test/app.config	(revision bb84e8f229fbe284207a2ca2f4ce2244f4ce6076)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.104.0" newVersion="1.0.104.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
Index: Core/Components/test/Core.Components.BruTile.Forms.Test/packages.config
===================================================================
diff -u -r99f9004206bfb9de084275d749b7aeccafd6da18 -rbb84e8f229fbe284207a2ca2f4ce2244f4ce6076
--- Core/Components/test/Core.Components.BruTile.Forms.Test/packages.config	(.../packages.config)	(revision 99f9004206bfb9de084275d749b7aeccafd6da18)
+++ Core/Components/test/Core.Components.BruTile.Forms.Test/packages.config	(.../packages.config)	(revision bb84e8f229fbe284207a2ca2f4ce2244f4ce6076)
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
 Copyright (C) Stichting Deltares 2016. All rights reserved.
 
 This file is part of Ringtoets.
@@ -20,7 +21,8 @@
 Stichting Deltares and remain full property of Stichting Deltares at all times.
 All rights reserved.
 -->
-
 <packages>
+  <package id="BruTile" version="0.19.0" targetFramework="net40" />
   <package id="NUnit" version="3.6.0" targetFramework="net40" />
+  <package id="RhinoMocks" version="3.6.1" targetFramework="net40" />
 </packages>
\ No newline at end of file
Index: Core/Components/test/Core.Components.BruTile.TestUtil/TestTileSourceFactory.cs
===================================================================
diff -u -r0f778d2d9cc904175274baf4d6a21996ccef8d54 -rbb84e8f229fbe284207a2ca2f4ce2244f4ce6076
--- Core/Components/test/Core.Components.BruTile.TestUtil/TestTileSourceFactory.cs	(.../TestTileSourceFactory.cs)	(revision 0f778d2d9cc904175274baf4d6a21996ccef8d54)
+++ Core/Components/test/Core.Components.BruTile.TestUtil/TestTileSourceFactory.cs	(.../TestTileSourceFactory.cs)	(revision bb84e8f229fbe284207a2ca2f4ce2244f4ce6076)
@@ -33,32 +33,29 @@
     /// </summary>
     public class TestTileSourceFactory : ITileSourceFactory
     {
-        private readonly TestWmtsTileSource wmtsTileSource;
-        private readonly TestWellKnownTileSource wellKnownTileSource;
+        private TestWmtsTileSource wmtsTileSource;
+        private TestWellKnownTileSource wellKnownTileSource;
 
         /// <summary>
         /// Initializes a new instance of <see cref="TestTileSourceFactory"/> for a given
-        /// <see cref="WmtsMapData"/>.
+        /// <see cref="ImageBasedMapData"/>.
         /// </summary>
         /// <param name="backgroundMapData">The map data to work for.</param>
         /// <remarks>If <paramref name="backgroundMapData"/> isn't initialized at construction
         /// time, then <see cref="GetWmtsTileSources"/> returns no tile sources.</remarks>
-        public TestTileSourceFactory(WmtsMapData backgroundMapData)
+        public TestTileSourceFactory(ImageBasedMapData backgroundMapData)
         {
-            if (backgroundMapData.IsConfigured)
+            var wellKnownMapData = backgroundMapData as WellKnownTileSourceMapData;
+            if (wellKnownMapData != null)
             {
-                wmtsTileSource = new TestWmtsTileSource(backgroundMapData);
+                SetWellKnownTileSource(wellKnownMapData);
             }
-        }
 
-        /// <summary>
-        /// Initializes a new instance of <see cref="TestTileSourceFactory"/> for a given
-        /// <see cref="WellKnownTileSourceMapData"/>.
-        /// </summary>
-        /// <param name="backgroundMapData">The map data to work for.</param>
-        public TestTileSourceFactory(WellKnownTileSourceMapData backgroundMapData)
-        {
-            wellKnownTileSource = new TestWellKnownTileSource(backgroundMapData);
+            var wmtsMapData = backgroundMapData as WmtsMapData;
+            if (wmtsMapData != null && wmtsMapData.IsConfigured)
+            {
+                SetWmtsTileSource(wmtsMapData);
+            }
         }
 
         public IEnumerable<ITileSource> GetWmtsTileSources(string capabilitiesUrl)
@@ -77,5 +74,18 @@
             }
             return wellKnownTileSource;
         }
+
+        private void SetWmtsTileSource(WmtsMapData backgroundMapData)
+        {
+            if (backgroundMapData.IsConfigured)
+            {
+                wmtsTileSource = new TestWmtsTileSource(backgroundMapData);
+            }
+        }
+
+        private void SetWellKnownTileSource(WellKnownTileSourceMapData wellKnownMapData)
+        {
+            wellKnownTileSource = new TestWellKnownTileSource(wellKnownMapData);
+        }
     }
 }
\ No newline at end of file
Index: Core/Components/test/Core.Components.BruTile.TestUtil/UseCustomTileSourceFactoryConfig.cs
===================================================================
diff -u -rfcf14f1da32f6de8d99c7f446ec27fbe30a6abe8 -rbb84e8f229fbe284207a2ca2f4ce2244f4ce6076
--- Core/Components/test/Core.Components.BruTile.TestUtil/UseCustomTileSourceFactoryConfig.cs	(.../UseCustomTileSourceFactoryConfig.cs)	(revision fcf14f1da32f6de8d99c7f446ec27fbe30a6abe8)
+++ Core/Components/test/Core.Components.BruTile.TestUtil/UseCustomTileSourceFactoryConfig.cs	(.../UseCustomTileSourceFactoryConfig.cs)	(revision bb84e8f229fbe284207a2ca2f4ce2244f4ce6076)
@@ -45,20 +45,12 @@
 
         /// <summary>
         /// Creates a new instance of <see cref="UseCustomTileSourceFactoryConfig"/> that
-        /// initializes test stubs to work for a <see cref="WmtsMapData"/> instance.
+        /// initializes test stubs to work for a <see cref="ImageBasedMapData"/> instance.
         /// </summary>
         /// <param name="backgroundMapData">The map data to work with.</param>
-        public UseCustomTileSourceFactoryConfig(WmtsMapData backgroundMapData)
+        public UseCustomTileSourceFactoryConfig(ImageBasedMapData backgroundMapData)
             : this(new TestTileSourceFactory(backgroundMapData)) {}
 
-        /// <summary>
-        /// Creates a new instance of <see cref="UseCustomTileSourceFactoryConfig"/> that
-        /// initializes test stubs to work for a <see cref="WellKnownTileSourceMapData"/> instance.
-        /// </summary>
-        /// <param name="backgroundMapData">The map data to work with.</param>
-        public UseCustomTileSourceFactoryConfig(WellKnownTileSourceMapData backgroundMapData)
-            : this(new TestTileSourceFactory(backgroundMapData)) {}
-
         public void Dispose()
         {
             TileSourceFactory.Instance = originalFactory;
Index: Core/Components/test/Core.Components.Gis.Test/Core.Components.Gis.Test.csproj
===================================================================
diff -u -r797872a6e0525f12c0f84b03e996a9d42630ad0b -rbb84e8f229fbe284207a2ca2f4ce2244f4ce6076
--- Core/Components/test/Core.Components.Gis.Test/Core.Components.Gis.Test.csproj	(.../Core.Components.Gis.Test.csproj)	(revision 797872a6e0525f12c0f84b03e996a9d42630ad0b)
+++ Core/Components/test/Core.Components.Gis.Test/Core.Components.Gis.Test.csproj	(.../Core.Components.Gis.Test.csproj)	(revision bb84e8f229fbe284207a2ca2f4ce2244f4ce6076)
@@ -60,6 +60,7 @@
     <Compile Include="Exceptions\CannotCreateTileCacheExceptionTest.cs" />
     <Compile Include="Exceptions\CannotFindTileSourceExceptionTest.cs" />
     <Compile Include="Exceptions\CannotReceiveTilesExceptionTest.cs" />
+    <Compile Include="Exceptions\ConfigurationInitializationExceptionTest.cs" />
     <Compile Include="Features\MapFeatureTest.cs" />
     <Compile Include="Geometries\MapGeometryTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
Index: Core/Components/test/Core.Components.Gis.Test/Exceptions/ConfigurationInitializationExceptionTest.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.Gis.Test/Exceptions/ConfigurationInitializationExceptionTest.cs	(revision 0)
+++ Core/Components/test/Core.Components.Gis.Test/Exceptions/ConfigurationInitializationExceptionTest.cs	(revision bb84e8f229fbe284207a2ca2f4ce2244f4ce6076)
@@ -0,0 +1,32 @@
+// 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.
+
+using System;
+using Core.Common.TestUtil;
+using Core.Components.Gis.Exceptions;
+using NUnit.Framework;
+
+namespace Core.Components.Gis.Test.Exceptions
+{
+    [TestFixture]
+    public class ConfigurationInitializationExceptionTest :
+        CustomExceptionDesignGuidelinesTestFixture<ConfigurationInitializationException, Exception> {}
+}
\ No newline at end of file