Index: Core/Common/test/Core.Common.TestUtil/TestDataPath.cs
===================================================================
diff -u -rc7bd36bfc84e3d9111ee0676888bb58a054bad2a -r27c758a14c9658eb064ec971f10611b9994d28e7
--- Core/Common/test/Core.Common.TestUtil/TestDataPath.cs	(.../TestDataPath.cs)	(revision c7bd36bfc84e3d9111ee0676888bb58a054bad2a)
+++ Core/Common/test/Core.Common.TestUtil/TestDataPath.cs	(.../TestDataPath.cs)	(revision 27c758a14c9658eb064ec971f10611b9994d28e7)
@@ -57,10 +57,6 @@
 
             public static class Components
             {
-                public static class DotSpatial
-                {
-                    public static readonly TestDataPath Forms = System.IO.Path.Combine("Core", "Components", "test", "Core.Components.DotSpatial.Forms.Test");
-                }
                 public static class Gis
                 {
                     public static readonly TestDataPath IO = System.IO.Path.Combine("Core", "Components", "test", "Core.Components.Gis.IO.Test");
Fisheye: Tag 27c758a14c9658eb064ec971f10611b9994d28e7 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.DotSpatial.Forms.Test/test-data/WmtsConnectionInfo/WmtsConnectionInfosWithoutWmtsConnectionsElement.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 27c758a14c9658eb064ec971f10611b9994d28e7 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.DotSpatial.Forms.Test/test-data/WmtsConnectionInfo/WmtsConnectionInfosZeroWmtsConnections.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 27c758a14c9658eb064ec971f10611b9994d28e7 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.DotSpatial.Forms.Test/test-data/WmtsConnectionInfo/twoValidWmtsConnectionInfos.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 27c758a14c9658eb064ec971f10611b9994d28e7 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.DotSpatial.Forms.Test/test-data/WmtsConnectionInfo/twoValidWmtsConnectionInfosReversedOrder.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 27c758a14c9658eb064ec971f10611b9994d28e7 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.DotSpatial.Forms.Test/test-data/WmtsConnectionInfo/twoWmtsConnectionInfosOneEmptyUrl.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 27c758a14c9658eb064ec971f10611b9994d28e7 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.DotSpatial.Forms.Test/test-data/WmtsConnectionInfo/twoWmtsConnectionInfosOneWithoutNameElement.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 27c758a14c9658eb064ec971f10611b9994d28e7 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.DotSpatial.Forms.Test/test-data/WmtsConnectionInfo/twoWmtsConnectionInfosOneWithoutUrlElement.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 27c758a14c9658eb064ec971f10611b9994d28e7 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.DotSpatial.Forms.Test/test-data/WmtsConnectionInfosWithoutWmtsConnectionsElement/wmtsConnectionInfo.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 27c758a14c9658eb064ec971f10611b9994d28e7 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.DotSpatial.Forms.Test/test-data/twoValidWmtsConnectionInfos/wmtsConnectionInfo.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsLocationControlTest.cs
===================================================================
diff -u -rf6f7505803cfaf42422b61d33b16a7b714ce6400 -r27c758a14c9658eb064ec971f10611b9994d28e7
--- Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsLocationControlTest.cs	(.../WmtsLocationControlTest.cs)	(revision f6f7505803cfaf42422b61d33b16a7b714ce6400)
+++ Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsLocationControlTest.cs	(.../WmtsLocationControlTest.cs)	(revision 27c758a14c9658eb064ec971f10611b9994d28e7)
@@ -50,7 +50,7 @@
         private const int mapLayerCoordinateSystemColumnIndex = 3;
         private const string wmtsconnectioninfoConfigFile = "wmtsConnectionInfo.config";
 
-        private static readonly TestDataPath testPath = TestDataPath.Core.Components.DotSpatial.Forms;
+        private static readonly TestDataPath testPath = TestDataPath.Core.Components.Gis.IO;
 
         private MockRepository mockRepository;
         private ITileSourceFactory tileFactory;
Index: Core/Components/test/Core.Components.Gis.IO.Test/Readers/WmtsConnectionInfoReaderTest.cs
===================================================================
diff -u -r99f9004206bfb9de084275d749b7aeccafd6da18 -r27c758a14c9658eb064ec971f10611b9994d28e7
--- Core/Components/test/Core.Components.Gis.IO.Test/Readers/WmtsConnectionInfoReaderTest.cs	(.../WmtsConnectionInfoReaderTest.cs)	(revision 99f9004206bfb9de084275d749b7aeccafd6da18)
+++ Core/Components/test/Core.Components.Gis.IO.Test/Readers/WmtsConnectionInfoReaderTest.cs	(.../WmtsConnectionInfoReaderTest.cs)	(revision 27c758a14c9658eb064ec971f10611b9994d28e7)
@@ -34,7 +34,7 @@
     [TestFixture]
     public class WmtsConnectionInfoReaderTest
     {
-        private static readonly string testPath = TestHelper.GetTestDataPath(TestDataPath.Core.Components.DotSpatial.Forms, "WmtsConnectionInfo");
+        private static readonly string testPath = TestHelper.GetTestDataPath(TestDataPath.Core.Components.Gis.IO, "WmtsConnectionInfo");
 
         [Test]
         [TestCase("")]
Index: Core/Components/test/Core.Components.Gis.IO.Test/test-data/WmtsConnectionInfo/WmtsConnectionInfosWithoutWmtsConnectionsElement.txt
===================================================================
diff -u
--- Core/Components/test/Core.Components.Gis.IO.Test/test-data/WmtsConnectionInfo/WmtsConnectionInfosWithoutWmtsConnectionsElement.txt	(revision 0)
+++ Core/Components/test/Core.Components.Gis.IO.Test/test-data/WmtsConnectionInfo/WmtsConnectionInfosWithoutWmtsConnectionsElement.txt	(revision 27c758a14c9658eb064ec971f10611b9994d28e7)
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?>
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.IO.Test/test-data/WmtsConnectionInfo/WmtsConnectionInfosZeroWmtsConnections.txt
===================================================================
diff -u
--- Core/Components/test/Core.Components.Gis.IO.Test/test-data/WmtsConnectionInfo/WmtsConnectionInfosZeroWmtsConnections.txt	(revision 0)
+++ Core/Components/test/Core.Components.Gis.IO.Test/test-data/WmtsConnectionInfo/WmtsConnectionInfosZeroWmtsConnections.txt	(revision 27c758a14c9658eb064ec971f10611b9994d28e7)
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><WmtsConnections></WmtsConnections>
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.IO.Test/test-data/WmtsConnectionInfo/twoValidWmtsConnectionInfos.txt
===================================================================
diff -u
--- Core/Components/test/Core.Components.Gis.IO.Test/test-data/WmtsConnectionInfo/twoValidWmtsConnectionInfos.txt	(revision 0)
+++ Core/Components/test/Core.Components.Gis.IO.Test/test-data/WmtsConnectionInfo/twoValidWmtsConnectionInfos.txt	(revision 27c758a14c9658eb064ec971f10611b9994d28e7)
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><WmtsConnections><WmtsConnection><Name>Actueel Hoogtebestand Nederland (AHN1)</Name><URL>https://geodata.nationaalgeoregister.nl/tiles/service/wmts/ahn1?request=GetCapabilities</URL></WmtsConnection><WmtsConnection><Name>Zeegraskartering</Name><URL>https://geodata.nationaalgeoregister.nl/zeegraskartering/wfs?request=GetCapabilities</URL></WmtsConnection></WmtsConnections>
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.IO.Test/test-data/WmtsConnectionInfo/twoValidWmtsConnectionInfosReversedOrder.txt
===================================================================
diff -u
--- Core/Components/test/Core.Components.Gis.IO.Test/test-data/WmtsConnectionInfo/twoValidWmtsConnectionInfosReversedOrder.txt	(revision 0)
+++ Core/Components/test/Core.Components.Gis.IO.Test/test-data/WmtsConnectionInfo/twoValidWmtsConnectionInfosReversedOrder.txt	(revision 27c758a14c9658eb064ec971f10611b9994d28e7)
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><WmtsConnections><WmtsConnection><URL>https://geodata.nationaalgeoregister.nl/tiles/service/wmts/ahn1?request=GetCapabilities</URL><Name>Actueel Hoogtebestand Nederland (AHN1)</Name></WmtsConnection><WmtsConnection><URL>https://geodata.nationaalgeoregister.nl/zeegraskartering/wfs?request=GetCapabilities</URL><Name>Zeegraskartering</Name></WmtsConnection></WmtsConnections>
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.IO.Test/test-data/WmtsConnectionInfo/twoWmtsConnectionInfosOneEmptyUrl.txt
===================================================================
diff -u
--- Core/Components/test/Core.Components.Gis.IO.Test/test-data/WmtsConnectionInfo/twoWmtsConnectionInfosOneEmptyUrl.txt	(revision 0)
+++ Core/Components/test/Core.Components.Gis.IO.Test/test-data/WmtsConnectionInfo/twoWmtsConnectionInfosOneEmptyUrl.txt	(revision 27c758a14c9658eb064ec971f10611b9994d28e7)
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><WmtsConnections><WmtsConnection><Name>First name</Name><URL></URL></WmtsConnection><WmtsConnection><Name>second name</Name><URL>https://domain.com</URL></WmtsConnection></WmtsConnections>
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.IO.Test/test-data/WmtsConnectionInfo/twoWmtsConnectionInfosOneWithoutNameElement.txt
===================================================================
diff -u
--- Core/Components/test/Core.Components.Gis.IO.Test/test-data/WmtsConnectionInfo/twoWmtsConnectionInfosOneWithoutNameElement.txt	(revision 0)
+++ Core/Components/test/Core.Components.Gis.IO.Test/test-data/WmtsConnectionInfo/twoWmtsConnectionInfosOneWithoutNameElement.txt	(revision 27c758a14c9658eb064ec971f10611b9994d28e7)
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><WmtsConnections><WmtsConnection><URL>First URL</URL></WmtsConnection><WmtsConnection><Name>second name</Name><URL>https://domain.com</URL></WmtsConnection></WmtsConnections>
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.IO.Test/test-data/WmtsConnectionInfo/twoWmtsConnectionInfosOneWithoutUrlElement.txt
===================================================================
diff -u
--- Core/Components/test/Core.Components.Gis.IO.Test/test-data/WmtsConnectionInfo/twoWmtsConnectionInfosOneWithoutUrlElement.txt	(revision 0)
+++ Core/Components/test/Core.Components.Gis.IO.Test/test-data/WmtsConnectionInfo/twoWmtsConnectionInfosOneWithoutUrlElement.txt	(revision 27c758a14c9658eb064ec971f10611b9994d28e7)
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><WmtsConnections><WmtsConnection><Name>First name</Name></WmtsConnection><WmtsConnection><Name>second name</Name><URL>https://domain.com</URL></WmtsConnection></WmtsConnections>
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.IO.Test/test-data/WmtsConnectionInfosWithoutWmtsConnectionsElement/wmtsConnectionInfo.config
===================================================================
diff -u
--- Core/Components/test/Core.Components.Gis.IO.Test/test-data/WmtsConnectionInfosWithoutWmtsConnectionsElement/wmtsConnectionInfo.config	(revision 0)
+++ Core/Components/test/Core.Components.Gis.IO.Test/test-data/WmtsConnectionInfosWithoutWmtsConnectionsElement/wmtsConnectionInfo.config	(revision 27c758a14c9658eb064ec971f10611b9994d28e7)
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?>
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.IO.Test/test-data/twoValidWmtsConnectionInfos/wmtsConnectionInfo.config
===================================================================
diff -u
--- Core/Components/test/Core.Components.Gis.IO.Test/test-data/twoValidWmtsConnectionInfos/wmtsConnectionInfo.config	(revision 0)
+++ Core/Components/test/Core.Components.Gis.IO.Test/test-data/twoValidWmtsConnectionInfos/wmtsConnectionInfo.config	(revision 27c758a14c9658eb064ec971f10611b9994d28e7)
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><WmtsConnections><WmtsConnection><Name>Actueel Hoogtebestand Nederland (AHN1)</Name><URL>https://geodata.nationaalgeoregister.nl/tiles/service/wmts/ahn1?request=GetCapabilities</URL></WmtsConnection><WmtsConnection><Name>Zeegraskartering</Name><URL>https://geodata.nationaalgeoregister.nl/zeegraskartering/wfs?request=GetCapabilities</URL></WmtsConnection></WmtsConnections>
\ No newline at end of file