Index: Core/Components/src/Core.Components.Gis.IO/Readers/WmtsConnectionInfoReader.cs
===================================================================
diff -u -r773c8bead12417f353dc62c006f93fee5a68d06e -r2db5ccc1fb164fc6f43733359a0e745ec6891edd
--- Core/Components/src/Core.Components.Gis.IO/Readers/WmtsConnectionInfoReader.cs	(.../WmtsConnectionInfoReader.cs)	(revision 773c8bead12417f353dc62c006f93fee5a68d06e)
+++ Core/Components/src/Core.Components.Gis.IO/Readers/WmtsConnectionInfoReader.cs	(.../WmtsConnectionInfoReader.cs)	(revision 2db5ccc1fb164fc6f43733359a0e745ec6891edd)
@@ -87,8 +87,6 @@
         /// Reads the default WMTS Connection info objects.
         /// </summary>
         /// <returns>The read <see cref="WmtsConnectionInfo"/> information.</returns>
-        /// <exception cref="XmlException">Thrown when an error occurred while parsing the XML.</exception>
-        /// <exception cref="InvalidOperationException">Thrown when an error occurred while reading the XML.</exception>
         public ReadOnlyCollection<WmtsConnectionInfo> ReadDefaultWmtsConnectionInfos()
         {
             using (XmlReader reader = XmlReader.Create(new StringReader(Resources.defaultWmtsConnectionInfo)))
@@ -103,6 +101,7 @@
         /// </summary>
         /// <returns>The read collection.</returns>
         /// <exception cref="XmlException">Thrown when an error occurred while parsing the XML.</exception>
+        /// <exception cref="InvalidOperationException">Thrown when an error occurred while reading the XML.</exception>
         private IEnumerable<WmtsConnectionInfo> ReadWmtsConnectionInfos()
         {
             using (XmlReader reader = XmlReader.Create(filePath))
Index: Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsLocationControlTest.cs
===================================================================
diff -u -r773c8bead12417f353dc62c006f93fee5a68d06e -r2db5ccc1fb164fc6f43733359a0e745ec6891edd
--- Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsLocationControlTest.cs	(.../WmtsLocationControlTest.cs)	(revision 773c8bead12417f353dc62c006f93fee5a68d06e)
+++ Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsLocationControlTest.cs	(.../WmtsLocationControlTest.cs)	(revision 2db5ccc1fb164fc6f43733359a0e745ec6891edd)
@@ -146,25 +146,25 @@
                 form.Controls.Add(control);
 
                 // Assert
-                var urlLocationLabel = new LabelTester("urlLocationLabel", form);
+                Label urlLocationLabel = form.Controls.Find("urlLocationLabel", true).OfType<Label>().First();
                 Assert.AreEqual("Locatie (URL)", urlLocationLabel.Text);
 
-                var urlLocations = (ComboBox) new ComboBoxTester("urlLocationComboBox", form).TheObject;
+                ComboBox urlLocations = form.Controls.Find("urlLocationComboBox", true).OfType<ComboBox>().First();
                 Assert.AreEqual(ComboBoxStyle.DropDownList, urlLocations.DropDownStyle);
                 Assert.IsInstanceOf<ICollection<WmtsConnectionInfo>>(urlLocations.DataSource);
                 Assert.AreEqual("Name", urlLocations.DisplayMember);
                 Assert.AreEqual("Url", urlLocations.ValueMember);
                 Assert.IsTrue(urlLocations.Sorted);
                 Assert.IsNotNull(urlLocations.SelectedItem);
 
-                var buttonConnectTo = (Button) new ButtonTester("connectToButton", form).TheObject;
+                Button buttonConnectTo = form.Controls.Find("connectToButton", true).OfType<Button>().First();
                 Assert.AreEqual("Verbinding maken", buttonConnectTo.Text);
                 Assert.IsTrue(buttonConnectTo.Enabled);
 
-                var buttonAddLocation = new ButtonTester("addLocationButton", form);
+                Button buttonAddLocation = form.Controls.Find("addLocationButton", true).OfType<Button>().First();
                 Assert.AreEqual("Locatie toevoegen...", buttonAddLocation.Text);
 
-                var buttonEditLocation = (Button) new ButtonTester("editLocationButton", form).TheObject;
+                Button buttonEditLocation = form.Controls.Find("editLocationButton", true).OfType<Button>().First();
                 Assert.AreEqual("Locatie aanpassen...", buttonEditLocation.Text);
             }
         }
@@ -191,10 +191,10 @@
                 form.Controls.Add(control);
 
                 // Assert
-                var urlLocationLabel = new LabelTester("urlLocationLabel", form);
+                Label urlLocationLabel = form.Controls.Find("urlLocationLabel", true).OfType<Label>().First();
                 Assert.AreEqual("Locatie (URL)", urlLocationLabel.Text);
 
-                var urlLocations = (ComboBox) new ComboBoxTester("urlLocationComboBox", form).TheObject;
+                ComboBox urlLocations = form.Controls.Find("urlLocationComboBox", true).OfType<ComboBox>().First();
                 Assert.AreEqual(ComboBoxStyle.DropDownList, urlLocations.DropDownStyle);
                 var connectionInfos = (IList<WmtsConnectionInfo>) urlLocations.DataSource;
                 Assert.Contains(activeWmtsConnectionInfo, connectionInfos.ToArray());
@@ -204,7 +204,7 @@
                 Assert.IsTrue(urlLocations.Sorted);
                 Assert.IsNotNull(urlLocations.SelectedItem);
 
-                var buttonConnectTo = (Button) new ButtonTester("connectToButton", form).TheObject;
+                Button buttonConnectTo = form.Controls.Find("connectToButton", true).OfType<Button>().First();
                 Assert.AreEqual("Verbinding maken", buttonConnectTo.Text);
                 Assert.IsTrue(buttonConnectTo.Enabled);
             }
@@ -226,7 +226,7 @@
                     form.Controls.Add(control);
 
                     // Assert
-                    var dataGridViewControl = (DataGridViewControl) new ControlTester("dataGridViewControl", form).TheObject;
+                    DataGridViewControl dataGridViewControl = form.Controls.Find("dataGridViewControl", true).OfType<DataGridViewControl>().First();
                     var dataGridView = dataGridViewControl.Controls.OfType<DataGridView>().First();
 
                     Assert.AreEqual(DataGridViewSelectionMode.FullRowSelect, dataGridViewControl.SelectionMode);
@@ -280,7 +280,7 @@
                     form.Controls.Add(control);
 
                     // Assert
-                    var dataGridViewControl = (DataGridViewControl) new ControlTester("dataGridViewControl", form).TheObject;
+                    DataGridViewControl dataGridViewControl = form.Controls.Find("dataGridViewControl", true).OfType<DataGridViewControl>().First();
                     Assert.AreEqual(2, dataGridViewControl.Rows.Count);
                     DataGridViewRow currentRow = dataGridViewControl.CurrentRow;
                     Assert.IsNotNull(currentRow);
@@ -307,7 +307,7 @@
                     form.Controls.Add(control);
 
                     // Assert
-                    var dataGridViewControl = (DataGridViewControl) new ControlTester("dataGridViewControl", form).TheObject;
+                    DataGridViewControl dataGridViewControl = form.Controls.Find("dataGridViewControl", true).OfType<DataGridViewControl>().First();
                     Assert.IsEmpty(dataGridViewControl.Rows);
                 }
             }
@@ -357,7 +357,7 @@
                 using (ShowFullyConfiguredWmtsLocationControl(form, wmtsCapabilityFactory))
                 {
                     // Assert
-                    var dataGridViewControl = (DataGridViewControl) new ControlTester("dataGridViewControl", form).TheObject;
+                    DataGridViewControl dataGridViewControl = form.Controls.Find("dataGridViewControl", true).OfType<DataGridViewControl>().First();
                     DataGridViewRowCollection rows = dataGridViewControl.Rows;
                     Assert.AreEqual(2, rows.Count);
 
@@ -438,7 +438,7 @@
             using (var form = new Form())
             using (WmtsLocationControl control = ShowFullyConfiguredWmtsLocationControl(form, wmtsCapabilityFactory))
             {
-                var dataGridViewControl = (DataGridViewControl) new ControlTester("dataGridViewControl", form).TheObject;
+                DataGridViewControl dataGridViewControl = form.Controls.Find("dataGridViewControl", true).OfType<DataGridViewControl>().First();
                 dataGridViewControl.SetCurrentCell(dataGridViewControl.GetCell(1, 0));
 
                 // Call
@@ -484,22 +484,22 @@
                     form.Show();
 
                     // Then
-                    var comboBox = (ComboBox) new ComboBoxTester("urlLocationComboBox", form).TheObject;
-                    var dataSource = (IList<WmtsConnectionInfo>) comboBox.DataSource;
+                    ComboBox urlLocations = form.Controls.Find("urlLocationComboBox", true).OfType<ComboBox>().First();
+                    var dataSource = (IList<WmtsConnectionInfo>) urlLocations.DataSource;
                     Assert.AreEqual(2, dataSource.Count);
 
-                    var firstWmtsConnectionInfo = (WmtsConnectionInfo) comboBox.Items[0];
+                    var firstWmtsConnectionInfo = (WmtsConnectionInfo) urlLocations.Items[0];
                     Assert.AreEqual("Actueel Hoogtebestand Nederland (AHN1)", firstWmtsConnectionInfo.Name);
                     Assert.AreEqual(url, firstWmtsConnectionInfo.Url);
 
-                    var secondWmtsConnectionInfo = (WmtsConnectionInfo) comboBox.Items[1];
+                    var secondWmtsConnectionInfo = (WmtsConnectionInfo) urlLocations.Items[1];
                     Assert.AreEqual("Zeegraskartering", secondWmtsConnectionInfo.Name);
                     Assert.AreEqual("https://geodata.nationaalgeoregister.nl/zeegraskartering/wfs?request=GetCapabilities",
                                     secondWmtsConnectionInfo.Url);
 
-                    Assert.AreSame(comboBox.SelectedItem, firstWmtsConnectionInfo);
+                    Assert.AreSame(urlLocations.SelectedItem, firstWmtsConnectionInfo);
 
-                    var dataGridViewControl = (DataGridViewControl) new ControlTester("dataGridViewControl", form).TheObject;
+                    DataGridViewControl dataGridViewControl = form.Controls.Find("dataGridViewControl", true).OfType<DataGridViewControl>().First();
                     Assert.AreSame(dataGridViewControl.Rows[0], dataGridViewControl.CurrentRow);
                 }
             }
@@ -536,22 +536,22 @@
                     form.Show();
 
                     // Then
-                    var comboBox = (ComboBox) new ComboBoxTester("urlLocationComboBox", form).TheObject;
-                    var dataSource = (IList<WmtsConnectionInfo>) comboBox.DataSource;
+                    ComboBox urlLocations = form.Controls.Find("urlLocationComboBox", true).OfType<ComboBox>().First();
+                    var dataSource = (IList<WmtsConnectionInfo>) urlLocations.DataSource;
                     Assert.AreEqual(2, dataSource.Count);
 
-                    var firstWmtsConnectionInfo = (WmtsConnectionInfo) comboBox.Items[0];
+                    var firstWmtsConnectionInfo = (WmtsConnectionInfo) urlLocations.Items[0];
                     Assert.AreEqual("Actueel Hoogtebestand Nederland (AHN1)", firstWmtsConnectionInfo.Name);
                     Assert.AreEqual("https://geodata.nationaalgeoregister.nl/tiles/service/wmts/ahn1?request=GetCapabilities",
                                     firstWmtsConnectionInfo.Url);
 
-                    var secondWmtsConnectionInfo = (WmtsConnectionInfo) comboBox.Items[1];
+                    var secondWmtsConnectionInfo = (WmtsConnectionInfo) urlLocations.Items[1];
                     Assert.AreEqual(mapDataName, secondWmtsConnectionInfo.Name);
                     Assert.AreEqual(mapDataUrl, secondWmtsConnectionInfo.Url);
 
-                    Assert.AreSame(comboBox.SelectedItem, secondWmtsConnectionInfo);
+                    Assert.AreSame(urlLocations.SelectedItem, secondWmtsConnectionInfo);
 
-                    var dataGridViewControl = (DataGridViewControl) new ControlTester("dataGridViewControl", form).TheObject;
+                    DataGridViewControl dataGridViewControl = form.Controls.Find("dataGridViewControl", true).OfType<DataGridViewControl>().First();
                     Assert.AreSame(dataGridViewControl.Rows[0], dataGridViewControl.CurrentRow);
                 }
             }
@@ -582,8 +582,8 @@
                         form.Controls.Add(control);
 
                         // Then
-                        var comboBox = (ComboBox) new ComboBoxTester("urlLocationComboBox", form).TheObject;
-                        var dataSource = (IList<WmtsConnectionInfo>) comboBox.DataSource;
+                        ComboBox urlLocations = form.Controls.Find("urlLocationComboBox", true).OfType<ComboBox>().First();
+                        var dataSource = (IList<WmtsConnectionInfo>) urlLocations.DataSource;
                         Assert.AreEqual(0, dataSource.Count);
                     }
                 };
@@ -628,8 +628,8 @@
                 buttonAddLocation.Click();
 
                 // Then
-                var comboBox = (ComboBox) new ComboBoxTester("urlLocationComboBox", form).TheObject;
-                var dataSource = (IList<WmtsConnectionInfo>) comboBox.DataSource;
+                ComboBox urlLocations = form.Controls.Find("urlLocationComboBox", true).OfType<ComboBox>().First();
+                var dataSource = (IList<WmtsConnectionInfo>) urlLocations.DataSource;
                 Assert.AreEqual(2, dataSource.Count);
             }
         }
@@ -650,8 +650,8 @@
                 using (var formTester = new FormTester(formName))
                 {
                     var dialog = (WmtsConnectionDialog) formTester.TheObject;
-                    var nameTextBox = (TextBox) new TextBoxTester("nameTextBox", dialog).TheObject;
-                    var urlTextBox = (TextBox) new TextBoxTester("urlTextBox", dialog).TheObject;
+                    TextBox nameTextBox = dialog.Controls.Find("nameTextBox", true).OfType<TextBox>().First();
+                    TextBox urlTextBox = dialog.Controls.Find("urlTextBox", true).OfType<TextBox>().First();
                     var actionButton = new ButtonTester("actionButton", dialog);
 
                     nameTextBox.Text = name;
@@ -680,14 +680,14 @@
                 buttonAddLocation.Click();
 
                 // Then
-                var comboBox = (ComboBox) new ComboBoxTester("urlLocationComboBox", form).TheObject;
-                var dataSource = (IList<WmtsConnectionInfo>) comboBox.DataSource;
+                ComboBox urlLocations = form.Controls.Find("urlLocationComboBox", true).OfType<ComboBox>().First();
+                var dataSource = (IList<WmtsConnectionInfo>) urlLocations.DataSource;
                 Assert.AreEqual(1, dataSource.Count);
-                var item = (WmtsConnectionInfo) comboBox.Items[0];
+                var item = (WmtsConnectionInfo) urlLocations.Items[0];
                 Assert.AreEqual(name, item.Name);
                 Assert.AreEqual(url, item.Url);
 
-                var connectToButton = (Button) new ButtonTester("connectToButton", form).TheObject;
+                Button connectToButton = form.Controls.Find("connectToButton", true).OfType<Button>().First();
                 Assert.IsTrue(connectToButton.Enabled);
             }
         }
@@ -730,11 +730,11 @@
                 buttonAddLocation.Click();
 
                 // Then
-                var comboBox = (ComboBox) new ComboBoxTester("urlLocationComboBox", form).TheObject;
-                var dataSource = (IList<WmtsConnectionInfo>) comboBox.DataSource;
+                ComboBox urlLocations = form.Controls.Find("urlLocationComboBox", true).OfType<ComboBox>().First();
+                var dataSource = (IList<WmtsConnectionInfo>) urlLocations.DataSource;
                 Assert.AreEqual(2, dataSource.Count);
 
-                var connectToButton = (Button) new ButtonTester("connectToButton", form).TheObject;
+                Button connectToButton = form.Controls.Find("connectToButton", true).OfType<Button>().First();
                 Assert.IsTrue(connectToButton.Enabled);
             }
         }
@@ -755,8 +755,8 @@
                 using (var formTester = new FormTester(formName))
                 {
                     var dialog = (WmtsConnectionDialog) formTester.TheObject;
-                    var nameTextBox = (TextBox) new TextBoxTester("nameTextBox", dialog).TheObject;
-                    var urlTextBox = (TextBox) new TextBoxTester("urlTextBox", dialog).TheObject;
+                    TextBox nameTextBox = dialog.Controls.Find("nameTextBox", true).OfType<TextBox>().First();
+                    TextBox urlTextBox = dialog.Controls.Find("urlTextBox", true).OfType<TextBox>().First();
                     var actionButton = new ButtonTester("actionButton", dialog);
 
                     nameTextBox.Text = name;
@@ -792,8 +792,8 @@
                     // Then
                     string exceptionMessage = $"Er is een onverwachte fout opgetreden tijdens het schrijven van het bestand '{configFilePath}'.";
                     TestHelper.AssertLogMessageWithLevelIsGenerated(action, Tuple.Create(exceptionMessage, LogLevelConstant.Error));
-                    var comboBox = (ComboBox) new ComboBoxTester("urlLocationComboBox", form).TheObject;
-                    var dataSource = (IList<WmtsConnectionInfo>) comboBox.DataSource;
+                    ComboBox urlLocations = form.Controls.Find("urlLocationComboBox", true).OfType<ComboBox>().First();
+                    var dataSource = (IList<WmtsConnectionInfo>) urlLocations.DataSource;
                     Assert.AreEqual(1, dataSource.Count);
                 }
             }
@@ -839,10 +839,10 @@
                     editLocationButton.Click();
 
                     // Then
-                    var comboBox = (ComboBox) new ComboBoxTester("urlLocationComboBox", form).TheObject;
-                    var dataSource = (IList<WmtsConnectionInfo>) comboBox.DataSource;
+                    ComboBox urlLocations = form.Controls.Find("urlLocationComboBox", true).OfType<ComboBox>().First();
+                    var dataSource = (IList<WmtsConnectionInfo>) urlLocations.DataSource;
                     Assert.AreEqual(1, dataSource.Count);
-                    var item = (WmtsConnectionInfo) comboBox.Items[0];
+                    var item = (WmtsConnectionInfo) urlLocations.Items[0];
                     Assert.AreEqual(capabilitiesName, item.Name);
                     Assert.AreEqual(capabilitiesUrl, item.Url);
                 }
@@ -867,8 +867,8 @@
                 using (var formTester = new FormTester(formName))
                 {
                     var dialog = (WmtsConnectionDialog) formTester.TheObject;
-                    var nameTextBox = (TextBox) new TextBoxTester("nameTextBox", dialog).TheObject;
-                    var urlTextBox = (TextBox) new TextBoxTester("urlTextBox", dialog).TheObject;
+                    TextBox nameTextBox = dialog.Controls.Find("nameTextBox", true).OfType<TextBox>().First();
+                    TextBox urlTextBox = dialog.Controls.Find("urlTextBox", true).OfType<TextBox>().First();
                     var actionButton = new ButtonTester("actionButton", dialog);
 
                     nameTextBox.Text = newName;
@@ -903,10 +903,10 @@
                         editLocationButton.Click();
 
                         // Then
-                        var comboBox = (ComboBox) new ComboBoxTester("urlLocationComboBox", form).TheObject;
-                        var dataSource = (IList<WmtsConnectionInfo>) comboBox.DataSource;
+                        ComboBox urlLocations = form.Controls.Find("urlLocationComboBox", true).OfType<ComboBox>().First();
+                        var dataSource = (IList<WmtsConnectionInfo>) urlLocations.DataSource;
                         Assert.AreEqual(1, dataSource.Count);
-                        var item = (WmtsConnectionInfo) comboBox.Items[0];
+                        var item = (WmtsConnectionInfo) urlLocations.Items[0];
                         Assert.AreEqual(newName, item.Name);
                         Assert.AreEqual(newUrl, item.Url);
                     }
@@ -939,7 +939,7 @@
                 connectToButton.Click();
 
                 // Then
-                var dataGridViewControl = (DataGridViewControl) new ControlTester("dataGridViewControl", form).TheObject;
+                DataGridViewControl dataGridViewControl = form.Controls.Find("dataGridViewControl", true).OfType<DataGridViewControl>().First();
                 DataGridViewRowCollection rows = dataGridViewControl.Rows;
                 Assert.AreEqual(1, rows.Count);
 
@@ -1045,7 +1045,7 @@
                 new WmtsCapability("brtachtergrondkaart(EPSG:28992)", "image/png8", "brtachtergrondkaart", "EPSG:28992")
             };
 
-            var dataGridViewControl = (DataGridViewControl) new ControlTester("dataGridViewControl", form).TheObject;
+            DataGridViewControl dataGridViewControl = form.Controls.Find("dataGridViewControl", true).OfType<DataGridViewControl>().First();
             dataGridViewControl.SetDataSource(capabilities);
 
             return control;
@@ -1056,8 +1056,8 @@
             var control = new WmtsLocationControl(null, wmtsCapabilityFactory);
             form.Controls.Add(control);
 
-            var comboBox = (ComboBox) new ComboBoxTester("urlLocationComboBox", form).TheObject;
-            comboBox.DataSource = new List<WmtsConnectionInfo>
+            ComboBox urlLocations = form.Controls.Find("urlLocationComboBox", true).OfType<ComboBox>().First();
+            urlLocations.DataSource = new List<WmtsConnectionInfo>
             {
                 new WmtsConnectionInfo("PDOK achtergrondkaart", "https://geodata.nationaalgeoregister.nl/wmts/top10nlv2?VERSION=1.0.0&request=GetCapabilities")
             };
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/BackgroundMapDataSelectionDialogTest.cs
===================================================================
diff -u -r773c8bead12417f353dc62c006f93fee5a68d06e -r2db5ccc1fb164fc6f43733359a0e745ec6891edd
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/BackgroundMapDataSelectionDialogTest.cs	(.../BackgroundMapDataSelectionDialogTest.cs)	(revision 773c8bead12417f353dc62c006f93fee5a68d06e)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/BackgroundMapDataSelectionDialogTest.cs	(.../BackgroundMapDataSelectionDialogTest.cs)	(revision 2db5ccc1fb164fc6f43733359a0e745ec6891edd)
@@ -21,6 +21,7 @@
 
 using System;
 using System.Drawing;
+using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Windows.Forms;
@@ -46,7 +47,7 @@
     {
         private MockRepository mockRepository;
         private ITileSourceFactory tileFactory;
-        private static readonly TestDataPath testPath = TestDataPath.Ringtoets.Integration.Forms;
+        private static readonly string testPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Forms);
 
         [SetUp]
         public void SetUp()
@@ -69,9 +70,10 @@
             var dialogParent = mockRepository.Stub<IWin32Window>();
             mockRepository.ReplayAll();
 
+            string settingsDirectory = Path.Combine(testPath, "EmptyWmtsConnectionInfo");
             using (new UseCustomSettingsHelper(new TestSettingsHelper
             {
-                ApplicationLocalUserSettingsDirectory = TestHelper.GetTestDataPath(testPath, "EmptyWmtsConnectionInfo")
+                ApplicationLocalUserSettingsDirectory = settingsDirectory
             }))
             {
                 // Call
@@ -136,9 +138,10 @@
             var random = new Random(124);
             var mapData = new WellKnownTileSourceMapData(random.NextEnumValue<WellKnownTileSource>());
 
+            string settingsDirectory = Path.Combine(testPath, "EmptyWmtsConnectionInfo");
             using (new UseCustomSettingsHelper(new TestSettingsHelper
             {
-                ApplicationLocalUserSettingsDirectory = TestHelper.GetTestDataPath(testPath, "EmptyWmtsConnectionInfo")
+                ApplicationLocalUserSettingsDirectory = settingsDirectory
             }))
             using (new UseCustomTileSourceFactoryConfig(tileFactory))
             {
@@ -158,9 +161,10 @@
             // Setup
             mockRepository.ReplayAll();
 
+            string settingsDirectory = Path.Combine(testPath, "EmptyWmtsConnectionInfo");
             using (new UseCustomSettingsHelper(new TestSettingsHelper
             {
-                ApplicationLocalUserSettingsDirectory = TestHelper.GetTestDataPath(testPath, "EmptyWmtsConnectionInfo")
+                ApplicationLocalUserSettingsDirectory = settingsDirectory
             }))
             using (var dialogParent = new Form())
             using (var dialog = new BackgroundMapDataSelectionDialog(dialogParent, null))
@@ -208,9 +212,10 @@
                 }
             };
 
+            string settingsDirectory = Path.Combine(testPath, "EmptyWmtsConnectionInfo");
             using (new UseCustomSettingsHelper(new TestSettingsHelper
             {
-                ApplicationLocalUserSettingsDirectory = TestHelper.GetTestDataPath(testPath, "EmptyWmtsConnectionInfo")
+                ApplicationLocalUserSettingsDirectory = settingsDirectory
             }))
             using (var dialogParent = new Form())
             using (var dialog = new BackgroundMapDataSelectionDialog(dialogParent, null))
@@ -241,9 +246,10 @@
                 }
             };
 
+            string settingsDirectory = Path.Combine(testPath, "EmptyWmtsConnectionInfo");
             using (new UseCustomSettingsHelper(new TestSettingsHelper
             {
-                ApplicationLocalUserSettingsDirectory = TestHelper.GetTestDataPath(testPath, "EmptyWmtsConnectionInfo")
+                ApplicationLocalUserSettingsDirectory = settingsDirectory
             }))
             using (var dialogParent = new Form())
             using (var dialog = new BackgroundMapDataSelectionDialog(dialogParent, null))
@@ -263,9 +269,10 @@
             // Given
             mockRepository.ReplayAll();
 
+            string settingsDirectory = Path.Combine(testPath, "EmptyWmtsConnectionInfo");
             using (new UseCustomSettingsHelper(new TestSettingsHelper
             {
-                ApplicationLocalUserSettingsDirectory = TestHelper.GetTestDataPath(testPath, "EmptyWmtsConnectionInfo")
+                ApplicationLocalUserSettingsDirectory = settingsDirectory
             }))
             using (new UseCustomTileSourceFactoryConfig(tileFactory))
             using (var dialogParent = new Form())
@@ -280,13 +287,13 @@
 
                 // Precondition state
                 comboBox.SelectedItem = wmtsLocationControl;
-                var wmtsDataGridViewControl = (DataGridViewControl) new ControlTester("dataGridViewControl", dialog).TheObject;
+                var wmtsDataGridViewControl = dialog.Controls.Find("dataGridViewControl", true).OfType<DataGridViewControl>().First();
                 Assert.IsNull(wmtsDataGridViewControl.CurrentRow);
                 Assert.IsFalse(selectButton.Enabled);
 
                 // When
                 comboBox.SelectedItem = wellKnownMapDataControl;
-                var wellKnownDataGridViewControl = (DataGridViewControl) new ControlTester("dataGridViewControl", dialog).TheObject;
+                var wellKnownDataGridViewControl = dialog.Controls.Find("dataGridViewControl", true).OfType<DataGridViewControl>().First();
                 DataGridViewRow currentRow = wellKnownDataGridViewControl.CurrentRow;
                 Assert.AreEqual(0, currentRow.Index);
                 Assert.IsTrue(selectButton.Enabled);
@@ -315,9 +322,10 @@
 
             var wmtsLocationControlSelectedMapDataChanged = 0;
 
+            string settingsDirectory = Path.Combine(testPath, "EmptyWmtsConnectionInfo");
             using (new UseCustomSettingsHelper(new TestSettingsHelper
             {
-                ApplicationLocalUserSettingsDirectory = TestHelper.GetTestDataPath(TestDataPath.Core.Components.Gis.IO, "noConfig")
+                ApplicationLocalUserSettingsDirectory = settingsDirectory
             }))
             using (new UseCustomTileSourceFactoryConfig(tileFactory))
             using (var dialogParent = new Form())
@@ -330,11 +338,11 @@
                 WmtsLocationControl wmtsLocationControl = GetComboBoxItem<WmtsLocationControl>(comboBox);
 
                 comboBox.SelectedItem = wmtsLocationControl;
-                var wmtsDataGridViewControl = (DataGridViewControl) new ControlTester("dataGridViewControl", dialog).TheObject;
+                var wmtsDataGridViewControl = dialog.Controls.Find("dataGridViewControl", true).OfType<DataGridViewControl>().First();
                 wmtsLocationControl.SelectedMapDataChanged += (sender, args) => { wmtsLocationControlSelectedMapDataChanged++; };
 
                 comboBox.SelectedItem = wellKnownMapDataControl;
-                var wellKnownDataGridViewControl = (DataGridViewControl) new ControlTester("dataGridViewControl", dialog).TheObject;
+                var wellKnownDataGridViewControl = dialog.Controls.Find("dataGridViewControl", true).OfType<DataGridViewControl>().First();
                 wellKnownDataGridViewControl.ClearCurrentCell();
 
                 var button = (Button) new ButtonTester("selectButton", dialog).TheObject;
@@ -366,9 +374,10 @@
 
             var wellKnownSelectedMapDataChanged = 0;
 
+            string settingsDirectory = Path.Combine(testPath, "EmptyWmtsConnectionInfo");
             using (new UseCustomSettingsHelper(new TestSettingsHelper
             {
-                ApplicationLocalUserSettingsDirectory = TestHelper.GetTestDataPath(TestDataPath.Core.Components.Gis.IO, "noConfig")
+                ApplicationLocalUserSettingsDirectory = settingsDirectory
             }))
             using (new UseCustomTileSourceFactoryConfig(tileFactory))
             using (var dialogParent = new Form())
@@ -381,7 +390,7 @@
 
                 comboBox.SelectedItem = wellKnownControl;
 
-                var wellKnownDataGridViewControl = (DataGridViewControl) new ControlTester("dataGridViewControl", dialog).TheObject;
+                var wellKnownDataGridViewControl = dialog.Controls.Find("dataGridViewControl", true).OfType<DataGridViewControl>().First();
                 wellKnownControl.SelectedMapDataChanged += (sender, args) => { wellKnownSelectedMapDataChanged++; };
 
                 // When
@@ -401,9 +410,10 @@
             // Setup
             mockRepository.ReplayAll();
 
+            string settingsDirectory = Path.Combine(testPath, "EmptyWmtsConnectionInfo");
             using (new UseCustomSettingsHelper(new TestSettingsHelper
             {
-                ApplicationLocalUserSettingsDirectory = TestHelper.GetTestDataPath(testPath, "EmptyWmtsConnectionInfo")
+                ApplicationLocalUserSettingsDirectory = settingsDirectory
             }))
             {
                 // Call