Index: Core/Common/test/Core.Common.Test/App.config
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r2705c81f73c3fee936ccc31385625a30d6a3a10f
--- Core/Common/test/Core.Common.Test/App.config	(.../App.config)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Test/App.config	(.../App.config)	(revision 2705c81f73c3fee936ccc31385625a30d6a3a10f)
@@ -6,7 +6,7 @@
       <section name="TestRunner" type="System.Configuration.NameValueSectionHandler, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     </sectionGroup>
         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="Core.Common.Tests.TestSettings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+            <section name="Core.Common.Test.TestSettings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
         </sectionGroup>
   </configSections>
   <log4net>
@@ -27,11 +27,11 @@
     </TestRunner>
   </NUnit>
   <userSettings>
-    <Core.Common.Tests.TestSettings>
+    <Core.Common.Test.TestSettings>
       <setting name="Name" serializeAs="String">
         <value />
       </setting>
-    </Core.Common.Tests.TestSettings>
+    </Core.Common.Test.TestSettings>
   </userSettings>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/App.config
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r2705c81f73c3fee936ccc31385625a30d6a3a10f
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/App.config	(.../App.config)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/App.config	(.../App.config)	(revision 2705c81f73c3fee936ccc31385625a30d6a3a10f)
@@ -5,7 +5,7 @@
       <section name="TestRunner" type="System.Configuration.NameValueSectionHandler, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     </sectionGroup>
     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="Core.Common.Plugins.SharpMapGis.Tests.Forms.ImportMultipleFiles" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+      <section name="Core.Common.Plugins.SharpMapGis.Test.Forms.ImportMultipleFiles" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
     </sectionGroup>
   </configSections>
   <NUnit>
@@ -15,11 +15,11 @@
     </TestRunner>
   </NUnit>
   <userSettings>
-    <Core.Common.Plugins.SharpMapGis.Tests.Forms.ImportMultipleFiles>
+    <Core.Common.Plugins.SharpMapGis.Test.Forms.ImportMultipleFiles>
       <setting name="lastVisitedPath" serializeAs="String">
         <value />
       </setting>
-    </Core.Common.Plugins.SharpMapGis.Tests.Forms.ImportMultipleFiles>
+    </Core.Common.Plugins.SharpMapGis.Test.Forms.ImportMultipleFiles>
   </userSettings>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
Index: packages/repositories.config
===================================================================
diff -u -r40c530ce4087ef0accbddb31c74b38905beee0e0 -r2705c81f73c3fee936ccc31385625a30d6a3a10f
--- packages/repositories.config	(.../repositories.config)	(revision 40c530ce4087ef0accbddb31c74b38905beee0e0)
+++ packages/repositories.config	(.../repositories.config)	(revision 2705c81f73c3fee936ccc31385625a30d6a3a10f)
@@ -7,40 +7,28 @@
   <repository path="..\Core\Common\src\Core.Common.Gui\packages.config" />
   <repository path="..\Core\Common\src\Core.Common.Utils\packages.config" />
   <repository path="..\Core\Common\test\Core.Common.Base.Test\packages.config" />
-  <repository path="..\Core\Common\test\Core.Common.Base.Tests\packages.config" />
   <repository path="..\Core\Common\test\Core.Common.Gui.Test\packages.config" />
   <repository path="..\Core\Common\test\Core.Common.Integration.Test\packages.config" />
-  <repository path="..\Core\Common\test\Core.Common.Integration.Tests\packages.config" />
   <repository path="..\Core\Common\test\Core.Common.Test\packages.config" />
-  <repository path="..\Core\Common\test\Core.Common.Tests\packages.config" />
   <repository path="..\Core\Common\test\Core.Common.TestUtils\packages.config" />
   <repository path="..\Core\Common\test\Core.Common.Utils.Test\packages.config" />
-  <repository path="..\Core\Common\test\Core.Common.Utils.Tests\packages.config" />
   <repository path="..\Core\GIS\src\Core.GIS.NetTopologySuite\packages.config" />
   <repository path="..\Core\GIS\src\Core.GIS.SharpMap.Extensions\packages.config" />
   <repository path="..\Core\GIS\src\Core.GIS.SharpMap.UI\packages.config" />
   <repository path="..\Core\GIS\src\Core.GIS.SharpMap\packages.config" />
   <repository path="..\Core\GIS\test\Core.GIS.NetTopologySuite.Extensions.Test\packages.config" />
-  <repository path="..\Core\GIS\test\Core.GIS.NetTopologySuite.Extensions.Tests\packages.config" />
   <repository path="..\Core\GIS\test\Core.GIS.NetTopologySuite.Test\packages.config" />
-  <repository path="..\Core\GIS\test\Core.GIS.NetTopologySuite.Tests\packages.config" />
   <repository path="..\Core\GIS\test\Core.GIS.SharpMap.Extensions.Test\packages.config" />
-  <repository path="..\Core\GIS\test\Core.GIS.SharpMap.Extensions.Tests\packages.config" />
   <repository path="..\Core\GIS\test\Core.GIS.SharpMap.Test\packages.config" />
-  <repository path="..\Core\GIS\test\Core.GIS.SharpMap.Tests\packages.config" />
   <repository path="..\Core\GIS\test\Core.GIS.SharpMap.UI.Test\packages.config" />
-  <repository path="..\Core\GIS\test\Core.GIS.SharpMap.UI.Tests\packages.config" />
   <repository path="..\Core\Plugins\src\Core.Plugins.CommonTools.Gui\packages.config" />
   <repository path="..\Core\Plugins\src\Core.Plugins.CommonTools\packages.config" />
   <repository path="..\Core\Plugins\src\Core.Plugins.ProjectExplorer\packages.config" />
   <repository path="..\Core\Plugins\src\Core.Plugins.SharpMapGis.Gui\packages.config" />
   <repository path="..\Core\Plugins\src\Core.Plugins.SharpMapGis\packages.config" />
   <repository path="..\Core\Plugins\test\Core.Plugins.CommonTools.Test\packages.config" />
-  <repository path="..\Core\Plugins\test\Core.Plugins.CommonTools.Tests\packages.config" />
   <repository path="..\Core\Plugins\test\Core.Plugins.ProjectExplorer.Test\packages.config" />
-  <repository path="..\Core\Plugins\test\Core.Plugins.ProjectExplorer.Tests\packages.config" />
   <repository path="..\Core\Plugins\test\Core.Plugins.SharpMapGis.Test\packages.config" />
-  <repository path="..\Core\Plugins\test\Core.Plugins.SharpMapGis.Tests\packages.config" />
   <repository path="..\Ringtoets\Common\test\Ringtoets.Common.Forms.Test\packages.config" />
   <repository path="..\Ringtoets\Demo\src\Ringtoets.Demo\packages.config" />
   <repository path="..\Ringtoets\Demo\test\Ringtoets.Demo.Test\packages.config" />