Index: Core/Common/src/Core.Common.Base/RingtoetsUserDataFolderConverter.cs
===================================================================
diff -u -rf1c02b2d47dc561deec70a24128d8dd49d9bed6a -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/src/Core.Common.Base/RingtoetsUserDataFolderConverter.cs	(.../RingtoetsUserDataFolderConverter.cs)	(revision f1c02b2d47dc561deec70a24128d8dd49d9bed6a)
+++ Core/Common/src/Core.Common.Base/RingtoetsUserDataFolderConverter.cs	(.../RingtoetsUserDataFolderConverter.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -27,7 +27,7 @@
             var daysToKeepLogFiles = 30;
 
             // HACK: don't keep log files for tests
-            if (settingsDirectory.ToLower().Contains("tests"))
+            if (settingsDirectory.ToLower().Contains("test"))
             {
                 daysToKeepLogFiles = 0;
             }
Index: Core/Common/src/Core.Common.Gui/Properties/AssemblyInfo.cs
===================================================================
diff -u -re388ea76d1d044298cc89156c8744fbea1bcb736 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/src/Core.Common.Gui/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision e388ea76d1d044298cc89156c8744fbea1bcb736)
+++ Core/Common/src/Core.Common.Gui/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -5,4 +5,4 @@
 [assembly: AssemblyTitle("Core.Common.Gui")]
 [assembly: AssemblyProduct("Core.Common.Gui")]
 [assembly: Guid("b3c117b3-ebeb-43cd-9784-6ec81d1ced36")]
-[assembly: InternalsVisibleTo("Core.Common.Gui.Tests")]
\ No newline at end of file
+[assembly: InternalsVisibleTo("Core.Common.Gui.Test")]
\ No newline at end of file
Index: Core/Common/test/Core.Common.Base.Test/Controls/Swf/Charting/ChartTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Controls/Swf/Charting/ChartTest.cs	(.../ChartTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Controls/Swf/Charting/ChartTest.cs	(.../ChartTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -5,7 +5,7 @@
 using Core.Common.TestUtils;
 using NUnit.Framework;
 
-namespace Core.Common.Base.Tests.Controls.Swf.Charting
+namespace Core.Common.Base.Test.Controls.Swf.Charting
 {
     [TestFixture]
     public class ChartTest
Index: Core/Common/test/Core.Common.Base.Test/Controls/Swf/Charting/Series/AreaChartSeriesTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Controls/Swf/Charting/Series/AreaChartSeriesTest.cs	(.../AreaChartSeriesTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Controls/Swf/Charting/Series/AreaChartSeriesTest.cs	(.../AreaChartSeriesTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,7 +1,7 @@
 using Core.Common.Controls.Swf.Charting.Series;
 using NUnit.Framework;
 
-namespace Core.Common.Base.Tests.Controls.Swf.Charting.Series
+namespace Core.Common.Base.Test.Controls.Swf.Charting.Series
 {
     [TestFixture]
     public class AreaChartSeriesTest
Index: Core/Common/test/Core.Common.Base.Test/Controls/Swf/Charting/Series/BarSeriesTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Controls/Swf/Charting/Series/BarSeriesTest.cs	(.../BarSeriesTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Controls/Swf/Charting/Series/BarSeriesTest.cs	(.../BarSeriesTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,7 +1,7 @@
 using Core.Common.Controls.Swf.Charting.Series;
 using NUnit.Framework;
 
-namespace Core.Common.Base.Tests.Controls.Swf.Charting.Series
+namespace Core.Common.Base.Test.Controls.Swf.Charting.Series
 {
     [TestFixture]
     public class BarSeriesTest
Index: Core/Common/test/Core.Common.Base.Test/Controls/Swf/Charting/Series/LineChartSeriesTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Controls/Swf/Charting/Series/LineChartSeriesTest.cs	(.../LineChartSeriesTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Controls/Swf/Charting/Series/LineChartSeriesTest.cs	(.../LineChartSeriesTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,7 +1,7 @@
 using Core.Common.Controls.Swf.Charting.Series;
 using NUnit.Framework;
 
-namespace Core.Common.Base.Tests.Controls.Swf.Charting.Series
+namespace Core.Common.Base.Test.Controls.Swf.Charting.Series
 {
     [TestFixture]
     public class LineChartSeriesTest
Index: Core/Common/test/Core.Common.Base.Test/Controls/Swf/Charting/Series/PointChartSeriesTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Controls/Swf/Charting/Series/PointChartSeriesTest.cs	(.../PointChartSeriesTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Controls/Swf/Charting/Series/PointChartSeriesTest.cs	(.../PointChartSeriesTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,7 +1,7 @@
 using Core.Common.Controls.Swf.Charting.Series;
 using NUnit.Framework;
 
-namespace Core.Common.Base.Tests.Controls.Swf.Charting.Series
+namespace Core.Common.Base.Test.Controls.Swf.Charting.Series
 {
     [TestFixture]
     public class PointChartSeriesTest
Index: Core/Common/test/Core.Common.Base.Test/Controls/Swf/Charting/Series/PolygonChartSeriesTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Controls/Swf/Charting/Series/PolygonChartSeriesTest.cs	(.../PolygonChartSeriesTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Controls/Swf/Charting/Series/PolygonChartSeriesTest.cs	(.../PolygonChartSeriesTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,7 +1,7 @@
 using Core.Common.Controls.Swf.Charting.Series;
 using NUnit.Framework;
 
-namespace Core.Common.Base.Tests.Controls.Swf.Charting.Series
+namespace Core.Common.Base.Test.Controls.Swf.Charting.Series
 {
     [TestFixture]
     public class PolygonChartSeriesTest
Index: Core/Common/test/Core.Common.Base.Test/Controls/Swf/Charting/Series/TeeChartSeriesDecoratorTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Controls/Swf/Charting/Series/TeeChartSeriesDecoratorTest.cs	(.../TeeChartSeriesDecoratorTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Controls/Swf/Charting/Series/TeeChartSeriesDecoratorTest.cs	(.../TeeChartSeriesDecoratorTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -3,7 +3,7 @@
 using Core.Common.Controls.Swf.Charting.Series;
 using NUnit.Framework;
 
-namespace Core.Common.Base.Tests.Controls.Swf.Charting.Series
+namespace Core.Common.Base.Test.Controls.Swf.Charting.Series
 {
     [TestFixture]
     public class TeeChartSeriesDecoratorTest
Index: Core/Common/test/Core.Common.Base.Test/Controls/Swf/FileSystemTreeViewTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Controls/Swf/FileSystemTreeViewTest.cs	(.../FileSystemTreeViewTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Controls/Swf/FileSystemTreeViewTest.cs	(.../FileSystemTreeViewTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,7 +2,7 @@
 using Core.Common.Controls.Swf;
 using NUnit.Framework;
 
-namespace Core.Common.Base.Tests.Controls.Swf
+namespace Core.Common.Base.Test.Controls.Swf
 {
     [TestFixture]
     public class FileSystemTreeViewTest
Index: Core/Common/test/Core.Common.Base.Test/Controls/Swf/FindAndReplaceControlTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Controls/Swf/FindAndReplaceControlTest.cs	(.../FindAndReplaceControlTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Controls/Swf/FindAndReplaceControlTest.cs	(.../FindAndReplaceControlTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,7 +2,7 @@
 using Core.Common.Utils.Reflection;
 using NUnit.Framework;
 
-namespace Core.Common.Base.Tests.Controls.Swf
+namespace Core.Common.Base.Test.Controls.Swf
 {
     [TestFixture]
     public class FindAndReplaceControlTest
Index: Core/Common/test/Core.Common.Base.Test/Controls/Swf/MessageBoxTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Controls/Swf/MessageBoxTest.cs	(.../MessageBoxTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Controls/Swf/MessageBoxTest.cs	(.../MessageBoxTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -4,7 +4,7 @@
 using Rhino.Mocks;
 using MessageBox = Core.Common.Controls.Swf.MessageBox;
 
-namespace Core.Common.Base.Tests.Controls.Swf
+namespace Core.Common.Base.Test.Controls.Swf
 {
     [TestFixture]
     public class MessageBoxTest
Index: Core/Common/test/Core.Common.Base.Test/Controls/Swf/Table/TableViewCopyPasteTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Controls/Swf/Table/TableViewCopyPasteTest.cs	(.../TableViewCopyPasteTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Controls/Swf/Table/TableViewCopyPasteTest.cs	(.../TableViewCopyPasteTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,18 +1,17 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
-using Core.Common.Base.Tests.Controls.Swf.Table.TestClasses;
+using Core.Common.Base.Test.Controls.Swf.Table.TestClasses;
 using Core.Common.Controls.Swf.Table;
 using Core.Common.TestUtils;
 using Core.Common.Utils;
 using DevExpress.XtraGrid;
 using NUnit.Framework;
 
-namespace Core.Common.Base.Tests.Controls.Swf.Table
+namespace Core.Common.Base.Test.Controls.Swf.Table
 {
     [TestFixture]
     public class TableViewCopyPasteTest
Index: Core/Common/test/Core.Common.Base.Test/Controls/Swf/Table/TableViewPasteControllerTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Controls/Swf/Table/TableViewPasteControllerTest.cs	(.../TableViewPasteControllerTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Controls/Swf/Table/TableViewPasteControllerTest.cs	(.../TableViewPasteControllerTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -3,13 +3,13 @@
 using System.Data;
 using System.Linq;
 using System.Windows.Forms;
-using Core.Common.Base.Tests.Controls.Swf.Table.TestClasses;
+using Core.Common.Base.Test.Controls.Swf.Table.TestClasses;
 using Core.Common.Controls;
 using Core.Common.Controls.Swf.Editors;
 using Core.Common.Controls.Swf.Table;
 using NUnit.Framework;
 
-namespace Core.Common.Base.Tests.Controls.Swf.Table
+namespace Core.Common.Base.Test.Controls.Swf.Table
 {
     [TestFixture]
     public class TableViewPasteControllerTest
Index: Core/Common/test/Core.Common.Base.Test/Controls/Swf/Table/TableViewTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Controls/Swf/Table/TableViewTest.cs	(.../TableViewTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Controls/Swf/Table/TableViewTest.cs	(.../TableViewTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -8,7 +8,7 @@
 using System.Linq;
 using System.Threading;
 using System.Windows.Forms;
-using Core.Common.Base.Tests.Controls.Swf.Table.TestClasses;
+using Core.Common.Base.Test.Controls.Swf.Table.TestClasses;
 using Core.Common.Controls;
 using Core.Common.Controls.Swf.Editors;
 using Core.Common.Controls.Swf.Table;
@@ -23,7 +23,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Core.Common.Base.Tests.Controls.Swf.Table
+namespace Core.Common.Base.Test.Controls.Swf.Table
 {
     [TestFixture]
     public class TableViewTest
Index: Core/Common/test/Core.Common.Base.Test/Controls/Swf/Table/TestClasses/ClassWithEnum.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Controls/Swf/Table/TestClasses/ClassWithEnum.cs	(.../ClassWithEnum.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Controls/Swf/Table/TestClasses/ClassWithEnum.cs	(.../ClassWithEnum.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,7 +2,7 @@
 using System.ComponentModel;
 using System.Globalization;
 
-namespace Core.Common.Base.Tests.Controls.Swf.Table.TestClasses
+namespace Core.Common.Base.Test.Controls.Swf.Table.TestClasses
 {
     internal class ClassWithEnum
     {
Index: Core/Common/test/Core.Common.Base.Test/Controls/Swf/Table/TestClasses/Person.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Controls/Swf/Table/TestClasses/Person.cs	(.../Person.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Controls/Swf/Table/TestClasses/Person.cs	(.../Person.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,6 +1,6 @@
 using System;
 
-namespace Core.Common.Base.Tests.Controls.Swf.Table.TestClasses
+namespace Core.Common.Base.Test.Controls.Swf.Table.TestClasses
 {
     public class Person
     {
Index: Core/Common/test/Core.Common.Base.Test/Controls/Swf/TreeViewControls/TreeNodeGraphicExtensionsTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Controls/Swf/TreeViewControls/TreeNodeGraphicExtensionsTest.cs	(.../TreeNodeGraphicExtensionsTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Controls/Swf/TreeViewControls/TreeNodeGraphicExtensionsTest.cs	(.../TreeNodeGraphicExtensionsTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -4,7 +4,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Core.Common.Base.Tests.Controls.Swf.TreeViewControls
+namespace Core.Common.Base.Test.Controls.Swf.TreeViewControls
 {
     [TestFixture]
     public class TreeNodeGraphicExtensionsTest
Index: Core/Common/test/Core.Common.Base.Test/Controls/Swf/TreeViewControls/TreeNodeTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Controls/Swf/TreeViewControls/TreeNodeTest.cs	(.../TreeNodeTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Controls/Swf/TreeViewControls/TreeNodeTest.cs	(.../TreeNodeTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,7 +1,7 @@
 using Core.Common.Controls.Swf.TreeViewControls;
 using NUnit.Framework;
 
-namespace Core.Common.Base.Tests.Controls.Swf.TreeViewControls
+namespace Core.Common.Base.Test.Controls.Swf.TreeViewControls
 {
     [TestFixture]
     public class TreeNodeTest
Index: Core/Common/test/Core.Common.Base.Test/Controls/Swf/TreeViewControls/TreeViewControllerTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Controls/Swf/TreeViewControls/TreeViewControllerTest.cs	(.../TreeViewControllerTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Controls/Swf/TreeViewControls/TreeViewControllerTest.cs	(.../TreeViewControllerTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using Core.Common.Base.Tests.TestObjects;
+using Core.Common.Base.Test.TestObjects;
 using Core.Common.Controls;
 using Core.Common.Controls.Swf.TreeViewControls;
 using Core.Common.Utils.Collections;
@@ -11,7 +11,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Core.Common.Base.Tests.Controls.Swf.TreeViewControls
+namespace Core.Common.Base.Test.Controls.Swf.TreeViewControls
 {
     [TestFixture]
     public class TreeViewControllerTest
Index: Core/Common/test/Core.Common.Base.Test/Controls/Swf/TreeViewControls/TreeViewNodePresenterBaseTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Controls/Swf/TreeViewControls/TreeViewNodePresenterBaseTest.cs	(.../TreeViewNodePresenterBaseTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Controls/Swf/TreeViewControls/TreeViewNodePresenterBaseTest.cs	(.../TreeViewNodePresenterBaseTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -6,7 +6,7 @@
 using Core.Common.TestUtils;
 using NUnit.Framework;
 
-namespace Core.Common.Base.Tests.Controls.Swf.TreeViewControls
+namespace Core.Common.Base.Test.Controls.Swf.TreeViewControls
 {
     [TestFixture]
     public class TreeViewNodePresenterBaseTest
Index: Core/Common/test/Core.Common.Base.Test/Controls/Swf/TreeViewControls/TreeViewTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Controls/Swf/TreeViewControls/TreeViewTest.cs	(.../TreeViewTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Controls/Swf/TreeViewControls/TreeViewTest.cs	(.../TreeViewTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Threading;
 using System.Windows.Forms;
-using Core.Common.Base.Tests.TestObjects;
+using Core.Common.Base.Test.TestObjects;
 using Core.Common.Controls;
 using Core.Common.Controls.Swf;
 using Core.Common.Controls.Swf.TreeViewControls;
@@ -14,7 +14,7 @@
 using MessageBox = Core.Common.Controls.Swf.MessageBox;
 using TreeView = Core.Common.Controls.Swf.TreeViewControls.TreeView;
 
-namespace Core.Common.Base.Tests.Controls.Swf.TreeViewControls
+namespace Core.Common.Base.Test.Controls.Swf.TreeViewControls
 {
     [TestFixture]
     public class TreeViewTest
Index: Core/Common/test/Core.Common.Base.Test/Controls/Swf/WindowsFormsHelperTests.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Controls/Swf/WindowsFormsHelperTests.cs	(.../WindowsFormsHelperTests.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Controls/Swf/WindowsFormsHelperTests.cs	(.../WindowsFormsHelperTests.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -3,7 +3,7 @@
 using Core.Common.Controls.Swf;
 using NUnit.Framework;
 
-namespace Core.Common.Base.Tests.Controls.Swf
+namespace Core.Common.Base.Test.Controls.Swf
 {
     [TestFixture]
     public class WindowsFormsHelperTests
Index: Core/Common/test/Core.Common.Base.Test/Core.Common.Base.Test.csproj
===================================================================
diff -u
--- Core/Common/test/Core.Common.Base.Test/Core.Common.Base.Test.csproj	(revision 0)
+++ Core/Common/test/Core.Common.Base.Test/Core.Common.Base.Test.csproj	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{FAFDB463-9612-41F4-B3DD-FF9C6E7023BA}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Core.Common.Base.Test</RootNamespace>
+    <AssemblyName>Core.Common.Base.Test</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <SignAssembly>false</SignAssembly>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <DontImportPostSharp>True</DontImportPostSharp>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\Release\</OutputPath>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CreateInstallerWithDemoProject|x86'">
+    <OutputPath>bin\CreateInstallerWithDemoProject\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="DevExpress.Data.v9.3">
+      <HintPath>..\..\..\..\lib\DevExpress.Data.v9.3.dll</HintPath>
+    </Reference>
+    <Reference Include="DevExpress.Utils.v9.3">
+      <HintPath>..\..\..\..\lib\DevExpress.Utils.v9.3.dll</HintPath>
+    </Reference>
+    <Reference Include="DevExpress.XtraEditors.v9.3">
+      <HintPath>..\..\..\..\lib\DevExpress.XtraEditors.v9.3.dll</HintPath>
+    </Reference>
+    <Reference Include="DevExpress.XtraGrid.v9.3">
+      <HintPath>..\..\..\..\lib\DevExpress.XtraGrid.v9.3.dll</HintPath>
+    </Reference>
+    <Reference Include="log4net, Version=1.2.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\log4net.2.0.4\lib\net40-full\log4net.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="PostSharp">
+      <HintPath>..\..\..\..\packages\PostSharp.2.1.7.28\lib\net20\PostSharp.dll</HintPath>
+    </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.Activities" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Data.DataSetExtensions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Controls\Swf\Charting\ChartTest.cs" />
+    <Compile Include="Controls\Swf\Charting\Series\AreaChartSeriesTest.cs" />
+    <Compile Include="Controls\Swf\Charting\Series\BarSeriesTest.cs" />
+    <Compile Include="Controls\Swf\Charting\Series\LineChartSeriesTest.cs" />
+    <Compile Include="Controls\Swf\Charting\Series\PointChartSeriesTest.cs" />
+    <Compile Include="Controls\Swf\Charting\Series\PolygonChartSeriesTest.cs" />
+    <Compile Include="Controls\Swf\Charting\Series\TeeChartSeriesDecoratorTest.cs" />
+    <Compile Include="Controls\Swf\FindAndReplaceControlTest.cs" />
+    <Compile Include="Controls\Swf\MessageBoxTest.cs" />
+    <Compile Include="Controls\Swf\Table\TableViewPasteControllerTest.cs" />
+    <Compile Include="Controls\Swf\Table\TableViewCopyPasteTest.cs" />
+    <Compile Include="Controls\Swf\Table\TestClasses\ClassWithEnum.cs" />
+    <Compile Include="Controls\Swf\Table\TestClasses\Person.cs" />
+    <Compile Include="Controls\Swf\Table\TableViewTest.cs" />
+    <Compile Include="Controls\Swf\TreeViewControls\TreeNodeTest.cs" />
+    <Compile Include="Controls\Swf\TreeViewControls\TreeNodeGraphicExtensionsTest.cs" />
+    <Compile Include="Controls\Swf\TreeViewControls\TreeViewNodePresenterBaseTest.cs" />
+    <Compile Include="Controls\Swf\TreeViewControls\TreeViewControllerTest.cs" />
+    <Compile Include="Controls\Swf\TreeViewControls\TreeViewTest.cs" />
+    <Compile Include="ObservableTest.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Shell\Core\ApplicationPluginTest.cs" />
+    <Compile Include="Shell\Core\DataItemInfoTest.cs" />
+    <Compile Include="Shell\Core\ObservableListTest.cs" />
+    <Compile Include="Shell\Core\WorkFlow\ActivityTest.cs" />
+    <Compile Include="Shell\Core\WorkFlow\BackgroundWorkerTest.cs" />
+    <Compile Include="Shell\Core\WorkFlow\FileImportActivityTest.cs" />
+    <Compile Include="Shell\Gui\ExpandableArrayConverterTest.cs" />
+    <Compile Include="Shell\Gui\MapLayerProviderHelperTest.cs" />
+    <Compile Include="Controls\Swf\WindowsFormsHelperTests.cs" />
+    <Compile Include="Shell\Core\WorkFlow\ActivityRunnerTest.cs" />
+    <Compile Include="Shell\Core\WorkFlow\AsyncActivityRunnerTest.cs" />
+    <Compile Include="Shell\Core\ProjectTest.cs" />
+    <Compile Include="Shell\Core\UrlTest.cs" />
+    <Compile Include="Controls\Swf\FileSystemTreeViewTest.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Shell\Gui\Swf\ControlExtensionTest.cs" />
+    <Compile Include="TestObjects\Child.cs" />
+    <Compile Include="TestObjects\ChildNodePresenter.cs" />
+    <Compile Include="TestObjects\MockTestNode.cs" />
+    <Compile Include="TestObjects\Parent.cs" />
+    <Compile Include="TestObjects\ParentNodePresenter.cs" />
+    <Compile Include="TestObjects\TestClasses.cs" />
+    <Compile Include="TestUtils\WindowsFormsTestHelperTest.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Application\Application.Ringtoets\Application.Ringtoets.csproj">
+      <Project>{4a7d6720-4aa1-4f0b-a796-a0436db3d7d7}</Project>
+      <Name>Application.Ringtoets</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj">
+      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
+      <Name>Core.Common.Base</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Common.Gui\Core.Common.Gui.csproj">
+      <Project>{30E4C2AE-719E-4D70-9FA9-668A9767FBFA}</Project>
+      <Name>Core.Common.Gui</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\GIS\src\Core.GIS.GeoAPI.Extensions\Core.GIS.GeoAPI.Extensions.csproj">
+      <Project>{016DBD27-99BF-489A-81B5-50D66964BB90}</Project>
+      <Name>Core.GIS.GeoAPI.Extensions</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\GIS\src\Core.GIS.GeoAPI\Core.GIS.GeoAPI.csproj">
+      <Project>{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}</Project>
+      <Name>Core.GIS.GeoAPI</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Common.Controls.Swf\Core.Common.Controls.Swf.csproj">
+      <Project>{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}</Project>
+      <Name>Core.Common.Controls.Swf</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Common.Controls\Core.Common.Controls.csproj">
+      <Project>{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}</Project>
+      <Name>Core.Common.Controls</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Common.Gui.Swf\Core.Common.Gui.Swf.csproj">
+      <Project>{08205620-D756-4533-922C-D6A4C0038535}</Project>
+      <Name>Core.Common.Gui.Swf</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\GIS\src\Core.GIS.SharpMap.Api\Core.GIS.SharpMap.Api.csproj">
+      <Project>{A3C9DF74-978A-44B1-B55D-A72AC4221E3A}</Project>
+      <Name>Core.GIS.SharpMap.Api</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\GIS\src\Core.GIS.SharpMap\Core.GIS.SharpMap.csproj">
+      <Project>{C83777FC-AABB-47D9-911F-D76255D4D541}</Project>
+      <Name>Core.GIS.SharpMap</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\test\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
+      <Project>{EFA25023-CF6A-4FF7-8C42-B24D7F9509E1}</Project>
+      <Name>Core.Common.TestUtils</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Common.Utils\Core.Common.Utils.csproj">
+      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
+      <Name>Core.Common.Utils</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\alarm-clock-blue.png" />
+  </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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <Import Project="..\..\..\..\build\Ringtoets.targets" />
+  <ProjectExtensions>
+    <MonoDevelop>
+      <Properties InternalTargetFrameworkVersion="3.5" />
+    </MonoDevelop>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file
Fisheye: Tag 41c77f9f36ae74a406fd382187426cc06d2b0200 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Base.Test/Core.Common.Base.Tests.csproj'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Base.Test/ObservableTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/ObservableTest.cs	(.../ObservableTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/ObservableTest.cs	(.../ObservableTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,7 +2,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Core.Common.Base.Tests
+namespace Core.Common.Base.Test
 {
     [TestFixture]
     public class ObservableTest
Index: Core/Common/test/Core.Common.Base.Test/Properties/AssemblyInfo.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,8 +2,8 @@
 using System.Runtime.InteropServices;
 using NUnit.Framework;
 
-[assembly: AssemblyTitle("Core.Common.Base.Tests")]
-[assembly: AssemblyProduct("Core.Common.Base.Tests")]
+[assembly: AssemblyTitle("Core.Common.Base.Test")]
+[assembly: AssemblyProduct("Core.Common.Base.Test")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
Index: Core/Common/test/Core.Common.Base.Test/Properties/Resources.Designer.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Core.Common.Base.Tests.Properties {
+namespace Core.Common.Base.Test.Properties {
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -36,7 +36,7 @@
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Core.Common.Base.Tests.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Core.Common.Base.Test.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
Index: Core/Common/test/Core.Common.Base.Test/Shell/Core/ApplicationPluginTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Shell/Core/ApplicationPluginTest.cs	(.../ApplicationPluginTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Shell/Core/ApplicationPluginTest.cs	(.../ApplicationPluginTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,7 +1,7 @@
 using System.Linq;
 using NUnit.Framework;
 
-namespace Core.Common.Base.Tests.Shell.Core
+namespace Core.Common.Base.Test.Shell.Core
 {
     [TestFixture]
     public class ApplicationPluginTest
Index: Core/Common/test/Core.Common.Base.Test/Shell/Core/DataItemInfoTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Shell/Core/DataItemInfoTest.cs	(.../DataItemInfoTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Shell/Core/DataItemInfoTest.cs	(.../DataItemInfoTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,8 +1,8 @@
 using System.Drawing;
-using Core.Common.Base.Tests.Properties;
+using Core.Common.Base.Test.Properties;
 using NUnit.Framework;
 
-namespace Core.Common.Base.Tests.Shell.Core
+namespace Core.Common.Base.Test.Shell.Core
 {
     [TestFixture]
     public class DataItemInfoTest
Index: Core/Common/test/Core.Common.Base.Test/Shell/Core/ObservableListTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Shell/Core/ObservableListTest.cs	(.../ObservableListTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Shell/Core/ObservableListTest.cs	(.../ObservableListTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -3,7 +3,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Core.Common.Base.Tests.Shell.Core
+namespace Core.Common.Base.Test.Shell.Core
 {
     [TestFixture]
     public class ObservableListTest
Index: Core/Common/test/Core.Common.Base.Test/Shell/Core/ProjectTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Shell/Core/ProjectTest.cs	(.../ProjectTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Shell/Core/ProjectTest.cs	(.../ProjectTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,8 +1,7 @@
-using System.ComponentModel;
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Core.Common.Base.Tests.Shell.Core
+namespace Core.Common.Base.Test.Shell.Core
 {
     [TestFixture]
     public class ProjectTest
Index: Core/Common/test/Core.Common.Base.Test/Shell/Core/UrlTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Shell/Core/UrlTest.cs	(.../UrlTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Shell/Core/UrlTest.cs	(.../UrlTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,7 +1,7 @@
 using Core.Common.Utils;
 using NUnit.Framework;
 
-namespace Core.Common.Base.Tests.Shell.Core
+namespace Core.Common.Base.Test.Shell.Core
 {
     [TestFixture]
     public class UrlTest
Index: Core/Common/test/Core.Common.Base.Test/Shell/Core/WorkFlow/ActivityRunnerTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Shell/Core/WorkFlow/ActivityRunnerTest.cs	(.../ActivityRunnerTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Shell/Core/WorkFlow/ActivityRunnerTest.cs	(.../ActivityRunnerTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -3,7 +3,7 @@
 using Core.Common.Base.Workflow;
 using NUnit.Framework;
 
-namespace Core.Common.Base.Tests.Shell.Core.WorkFlow
+namespace Core.Common.Base.Test.Shell.Core.WorkFlow
 {
     [TestFixture]
     public class ActivityRunnerTest
Index: Core/Common/test/Core.Common.Base.Test/Shell/Core/WorkFlow/ActivityTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Shell/Core/WorkFlow/ActivityTest.cs	(.../ActivityTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Shell/Core/WorkFlow/ActivityTest.cs	(.../ActivityTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -3,7 +3,7 @@
 using Core.Common.TestUtils;
 using NUnit.Framework;
 
-namespace Core.Common.Base.Tests.Shell.Core.WorkFlow
+namespace Core.Common.Base.Test.Shell.Core.WorkFlow
 {
     [TestFixture]
     public class ActivityTest
Index: Core/Common/test/Core.Common.Base.Test/Shell/Core/WorkFlow/AsyncActivityRunnerTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Shell/Core/WorkFlow/AsyncActivityRunnerTest.cs	(.../AsyncActivityRunnerTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Shell/Core/WorkFlow/AsyncActivityRunnerTest.cs	(.../AsyncActivityRunnerTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -6,7 +6,7 @@
 using Rhino.Mocks;
 using WindowsFormsApplication = System.Windows.Forms.Application;
 
-namespace Core.Common.Base.Tests.Shell.Core.WorkFlow
+namespace Core.Common.Base.Test.Shell.Core.WorkFlow
 {
     [TestFixture]
     public class AsyncActivityRunnerTest
Index: Core/Common/test/Core.Common.Base.Test/Shell/Core/WorkFlow/BackgroundWorkerTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Shell/Core/WorkFlow/BackgroundWorkerTest.cs	(.../BackgroundWorkerTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Shell/Core/WorkFlow/BackgroundWorkerTest.cs	(.../BackgroundWorkerTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -4,7 +4,7 @@
 using NUnit.Framework;
 using WindowsFormApplication = System.Windows.Forms.Application;
 
-namespace Core.Common.Base.Tests.Shell.Core.WorkFlow
+namespace Core.Common.Base.Test.Shell.Core.WorkFlow
 {
     [TestFixture]
     public class BackgroundWorkerTest
Index: Core/Common/test/Core.Common.Base.Test/Shell/Core/WorkFlow/FileImportActivityTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Shell/Core/WorkFlow/FileImportActivityTest.cs	(.../FileImportActivityTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Shell/Core/WorkFlow/FileImportActivityTest.cs	(.../FileImportActivityTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,7 +2,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Core.Common.Base.Tests.Shell.Core.WorkFlow
+namespace Core.Common.Base.Test.Shell.Core.WorkFlow
 {
     [TestFixture]
     public class FileImportActivityTest
Index: Core/Common/test/Core.Common.Base.Test/Shell/Gui/ExpandableArrayConverterTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Shell/Gui/ExpandableArrayConverterTest.cs	(.../ExpandableArrayConverterTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Shell/Gui/ExpandableArrayConverterTest.cs	(.../ExpandableArrayConverterTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -3,7 +3,7 @@
 using Core.Common.Gui;
 using NUnit.Framework;
 
-namespace Core.Common.Base.Tests.Shell.Gui
+namespace Core.Common.Base.Test.Shell.Gui
 {
     [TestFixture]
     public class ExpandableArrayConverterTest
Index: Core/Common/test/Core.Common.Base.Test/Shell/Gui/MapLayerProviderHelperTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Shell/Gui/MapLayerProviderHelperTest.cs	(.../MapLayerProviderHelperTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Shell/Gui/MapLayerProviderHelperTest.cs	(.../MapLayerProviderHelperTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -8,7 +8,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Core.Common.Base.Tests.Shell.Gui
+namespace Core.Common.Base.Test.Shell.Gui
 {
     [TestFixture]
     public class MapLayerProviderHelperTest
Index: Core/Common/test/Core.Common.Base.Test/Shell/Gui/Swf/ControlExtensionTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/Shell/Gui/Swf/ControlExtensionTest.cs	(.../ControlExtensionTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/Shell/Gui/Swf/ControlExtensionTest.cs	(.../ControlExtensionTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -3,7 +3,7 @@
 using Core.Common.Controls.Swf;
 using NUnit.Framework;
 
-namespace Core.Common.Base.Tests.Shell.Gui.Swf
+namespace Core.Common.Base.Test.Shell.Gui.Swf
 {
     [TestFixture]
     public class ControlExtensionsTest
Index: Core/Common/test/Core.Common.Base.Test/TestObjects/Child.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/TestObjects/Child.cs	(.../Child.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/TestObjects/Child.cs	(.../Child.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Core.Common.Utils.Collections.Generic;
 
-namespace Core.Common.Base.Tests.TestObjects
+namespace Core.Common.Base.Test.TestObjects
 {
     public class Child : Observable
     {
Index: Core/Common/test/Core.Common.Base.Test/TestObjects/ChildNodePresenter.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/TestObjects/ChildNodePresenter.cs	(.../ChildNodePresenter.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/TestObjects/ChildNodePresenter.cs	(.../ChildNodePresenter.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -3,7 +3,7 @@
 using Core.Common.Controls;
 using Core.Common.Controls.Swf.TreeViewControls;
 
-namespace Core.Common.Base.Tests.TestObjects
+namespace Core.Common.Base.Test.TestObjects
 {
     public class ChildNodePresenter : TreeViewNodePresenterBase<Child>
     {
Index: Core/Common/test/Core.Common.Base.Test/TestObjects/MockTestNode.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/TestObjects/MockTestNode.cs	(.../MockTestNode.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/TestObjects/MockTestNode.cs	(.../MockTestNode.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,6 +1,6 @@
 using Core.Common.Controls.Swf.TreeViewControls;
 
-namespace Core.Common.Base.Tests.TestObjects
+namespace Core.Common.Base.Test.TestObjects
 {
     public class MockTestNode : TreeNode
     {
Index: Core/Common/test/Core.Common.Base.Test/TestObjects/Parent.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/TestObjects/Parent.cs	(.../Parent.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/TestObjects/Parent.cs	(.../Parent.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Core.Common.Base.Tests.TestObjects
+namespace Core.Common.Base.Test.TestObjects
 {
     public class Parent : Observable
     {
Index: Core/Common/test/Core.Common.Base.Test/TestObjects/ParentNodePresenter.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/TestObjects/ParentNodePresenter.cs	(.../ParentNodePresenter.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/TestObjects/ParentNodePresenter.cs	(.../ParentNodePresenter.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,7 +2,7 @@
 using Core.Common.Controls;
 using Core.Common.Controls.Swf.TreeViewControls;
 
-namespace Core.Common.Base.Tests.TestObjects
+namespace Core.Common.Base.Test.TestObjects
 {
     public class ParentNodePresenter : TreeViewNodePresenterBase<Parent>
     {
Index: Core/Common/test/Core.Common.Base.Test/TestObjects/TestClasses.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/TestObjects/TestClasses.cs	(.../TestClasses.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/TestObjects/TestClasses.cs	(.../TestClasses.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,7 +1,7 @@
 using Core.Common.Controls;
 using Core.Common.Controls.Swf.TreeViewControls;
 
-namespace Core.Common.Base.Tests.TestObjects
+namespace Core.Common.Base.Test.TestObjects
 {
     public interface SomeInterface {}
 
Index: Core/Common/test/Core.Common.Base.Test/TestUtils/WindowsFormsTestHelperTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Base.Test/TestUtils/WindowsFormsTestHelperTest.cs	(.../WindowsFormsTestHelperTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Base.Test/TestUtils/WindowsFormsTestHelperTest.cs	(.../WindowsFormsTestHelperTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -4,7 +4,7 @@
 using Core.Common.TestUtils;
 using NUnit.Framework;
 
-namespace Core.Common.Base.Tests.TestUtils
+namespace Core.Common.Base.Test.TestUtils
 {
     [TestFixture]
     public class WindowsFormsTestHelperTest
Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs
===================================================================
diff -u -r828cad36498a378e8313e41abb0377b311ab8530 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs	(.../ContextMenuBuilderTest.cs)	(revision 828cad36498a378e8313e41abb0377b311ab8530)
+++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs	(.../ContextMenuBuilderTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -8,7 +8,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Core.Common.Gui.Tests.ContextMenu
+namespace Core.Common.Gui.Test.ContextMenu
 {
     [TestFixture]
     public class ContextMenuBuilderTest
Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/GuiContextMenuItemFactoryTest.cs
===================================================================
diff -u -re6e92cb42b1e4983add2406300958b6b116ba781 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Gui.Test/ContextMenu/GuiContextMenuItemFactoryTest.cs	(.../GuiContextMenuItemFactoryTest.cs)	(revision e6e92cb42b1e4983add2406300958b6b116ba781)
+++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/GuiContextMenuItemFactoryTest.cs	(.../GuiContextMenuItemFactoryTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -8,7 +8,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Core.Common.Gui.Tests.ContextMenu
+namespace Core.Common.Gui.Test.ContextMenu
 {
     [TestFixture]
     public class ContextMenuItemFactoryTest
Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs
===================================================================
diff -u -r97989f272e0b9aadccf3a444a90e61879616a0ab -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs	(.../TreeViewContextMenuItemFactoryTest.cs)	(revision 97989f272e0b9aadccf3a444a90e61879616a0ab)
+++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs	(.../TreeViewContextMenuItemFactoryTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -6,7 +6,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Core.Common.Gui.Tests.ContextMenu
+namespace Core.Common.Gui.Test.ContextMenu
 {
     [TestFixture]
     public class TreeViewContextMenuItemFactoryTest
Index: Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Test.csproj
===================================================================
diff -u
--- Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Test.csproj	(revision 0)
+++ Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Test.csproj	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{D5EC1DF2-03C9-467B-B6AF-BE5AC83417F8}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Core.Common.Gui.Test</RootNamespace>
+    <AssemblyName>Core.Common.Gui.Test</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <IsCodedUITest>False</IsCodedUITest>
+    <TestProjectType>UnitTest</TestProjectType>
+    <SignAssembly>false</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <PlatformTarget>x86</PlatformTarget>
+    <OutputPath>bin\Debug\</OutputPath>
+    <Optimize>false</Optimize>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <PlatformTarget>x86</PlatformTarget>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CreateInstallerWithDemoProject|x86'">
+    <OutputPath>bin\CreateInstallerWithDemoProject\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="Rhino.Mocks">
+      <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xaml" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ContextMenu\ContextMenuBuilderTest.cs" />
+    <Compile Include="ContextMenu\TreeViewContextMenuItemFactoryTest.cs" />
+    <Compile Include="ContextMenu\GuiContextMenuItemFactoryTest.cs" />
+    <Compile Include="ExpandableArrayConverterTest.cs" />
+    <Compile Include="Forms\SplashScreenTest.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj">
+      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
+      <Name>Core.Common.Base</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Common.Controls\Core.Common.Controls.csproj">
+      <Project>{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}</Project>
+      <Name>Core.Common.Controls</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Common.Gui\Core.Common.Gui.csproj">
+      <Project>{30e4c2ae-719e-4d70-9fa9-668a9767fbfa}</Project>
+      <Name>Core.Common.Gui</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
+      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
+      <Name>Core.Common.TestUtils</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
Fisheye: Tag 41c77f9f36ae74a406fd382187426cc06d2b0200 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Tests.csproj'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Gui.Test/ExpandableArrayConverterTest.cs
===================================================================
diff -u -r05061cff6fc2d63d6be48e570153eb7909e01298 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Gui.Test/ExpandableArrayConverterTest.cs	(.../ExpandableArrayConverterTest.cs)	(revision 05061cff6fc2d63d6be48e570153eb7909e01298)
+++ Core/Common/test/Core.Common.Gui.Test/ExpandableArrayConverterTest.cs	(.../ExpandableArrayConverterTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,9 +1,8 @@
 using System;
 using System.ComponentModel;
-
 using NUnit.Framework;
 
-namespace Core.Common.Gui.Tests
+namespace Core.Common.Gui.Test
 {
     [TestFixture]
     public class ExpandableArrayConverterTest
Index: Core/Common/test/Core.Common.Gui.Test/Forms/SplashScreenTest.cs
===================================================================
diff -u -r348561b759148215da2985a8af9cd7cc8e78e304 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Gui.Test/Forms/SplashScreenTest.cs	(.../SplashScreenTest.cs)	(revision 348561b759148215da2985a8af9cd7cc8e78e304)
+++ Core/Common/test/Core.Common.Gui.Test/Forms/SplashScreenTest.cs	(.../SplashScreenTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -5,7 +5,7 @@
 using SplashScreen = Core.Common.Gui.Forms.SplashScreen.SplashScreen;
 using Application = System.Windows.Forms.Application;
 
-namespace Core.Common.Gui.Tests.Forms
+namespace Core.Common.Gui.Test.Forms
 {
     [TestFixture]
     public class SplashScreenTest
Index: Core/Common/test/Core.Common.Gui.Test/Properties/AssemblyInfo.cs
===================================================================
diff -u -r15a233072ba850ce1a378baa460081b6bc0e0298 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Gui.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 15a233072ba850ce1a378baa460081b6bc0e0298)
+++ Core/Common/test/Core.Common.Gui.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -5,8 +5,8 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Core.Common.Gui.Tests")]
-[assembly: AssemblyProduct("Core.Common.Gui.Tests")]
+[assembly: AssemblyTitle("Core.Common.Gui.Test")]
+[assembly: AssemblyProduct("Core.Common.Gui.Test")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
Index: Core/Common/test/Core.Common.Integration.Test/Core.Common.Integration.Test.csproj
===================================================================
diff -u
--- Core/Common/test/Core.Common.Integration.Test/Core.Common.Integration.Test.csproj	(revision 0)
+++ Core/Common/test/Core.Common.Integration.Test/Core.Common.Integration.Test.csproj	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{A6A434E0-AE5A-4D5B-97D7-532B00FBDFE9}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Core.Common.Integration.Test</RootNamespace>
+    <AssemblyName>Core.Common.Integration.Test</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <DontImportPostSharp>True</DontImportPostSharp>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <DefineConstants>TRACE;DEBUG;</DefineConstants>
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\Release\</OutputPath>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <DefineConstants>TRACE;</DefineConstants>
+    <Optimize>true</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CreateInstallerWithDemoProject|x86'">
+    <OutputPath>bin\CreateInstallerWithDemoProject\</OutputPath>
+    <DefineConstants>TRACE;</DefineConstants>
+    <Optimize>true</Optimize>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="log4net, Version=1.2.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\log4net.2.0.4\lib\net40-full\log4net.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <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">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xaml" />
+    <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Ringtoets\Application.Ringtoets\RingtoetsGuiIntegrationTest.cs">
+    </Compile>
+    <Compile Include="Ringtoets\Application.Ringtoets\GuiImportHandlerTest.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\GIS\src\Core.GIS.GeoAPI.Extensions\Core.GIS.GeoAPI.Extensions.csproj">
+      <Project>{016DBD27-99BF-489A-81B5-50D66964BB90}</Project>
+      <Name>Core.GIS.GeoAPI.Extensions</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\GIS\src\Core.GIS.GeoAPI\Core.GIS.GeoAPI.csproj">
+      <Project>{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}</Project>
+      <Name>Core.GIS.GeoAPI</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\GIS\src\Core.GIS.NetTopologySuite\Core.GIS.NetTopologySuite.csproj">
+      <Project>{5770DAA9-84E5-4770-AF43-F6B815894368}</Project>
+      <Name>Core.GIS.NetTopologySuite</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\GIS\src\Core.GIS.SharpMap.Api\Core.GIS.SharpMap.Api.csproj">
+      <Project>{a3c9df74-978a-44b1-b55d-a72ac4221e3a}</Project>
+      <Name>Core.GIS.SharpMap.Api</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\GIS\src\Core.GIS.SharpMap.UI\Core.GIS.SharpMap.UI.csproj">
+      <Project>{dd1cc1db-4bf9-4c88-a100-733d84795f3a}</Project>
+      <Name>Core.GIS.SharpMap.UI</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\GIS\src\Core.GIS.SharpMap\Core.GIS.SharpMap.csproj">
+      <Project>{c83777fc-aabb-47d9-911f-d76255d4d541}</Project>
+      <Name>Core.GIS.SharpMap</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Plugins\src\Core.Plugins.CommonTools.Gui\Core.Plugins.CommonTools.Gui.csproj">
+      <Project>{93e73fab-fae8-49c6-9abb-27d24df761f6}</Project>
+      <Name>Core.Plugins.CommonTools.Gui</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Plugins\src\Core.Plugins.CommonTools\Core.Plugins.CommonTools.csproj">
+      <Project>{befdcc44-2638-4972-b353-42d14c7da2c6}</Project>
+      <Name>Core.Plugins.CommonTools</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Plugins\src\Core.Plugins.ProjectExplorer\Core.Plugins.ProjectExplorer.csproj">
+      <Project>{ed20dba9-d577-423f-a68d-a0a8130fb10b}</Project>
+      <Name>Core.Plugins.ProjectExplorer</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Plugins\src\Core.Plugins.SharpMapGis.Gui\Core.Plugins.SharpMapGis.Gui.csproj">
+      <Project>{0bc3751e-ec42-40a0-a7d3-b7c2aa66976e}</Project>
+      <Name>Core.Plugins.SharpMapGis.Gui</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Plugins\src\Core.Plugins.SharpMapGis\Core.Plugins.SharpMapGis.csproj">
+      <Project>{696daaee-d1d8-42d0-86ac-471b970fb17e}</Project>
+      <Name>Core.Plugins.SharpMapGis</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Application\Application.Ringtoets\Application.Ringtoets.csproj">
+      <Project>{4A7D6720-4AA1-4F0B-A796-A0436DB3D7D7}</Project>
+      <Name>Application.Ringtoets</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls.Swf\Core.Common.Controls.Swf.csproj">
+      <Project>{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}</Project>
+      <Name>Core.Common.Controls.Swf</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
+      <Project>{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}</Project>
+      <Name>Core.Common.Controls</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj">
+      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
+      <Name>Core.Common.Base</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Common.Gui\Core.Common.Gui.csproj">
+      <Project>{30E4C2AE-719E-4D70-9FA9-668A9767FBFA}</Project>
+      <Name>Core.Common.Gui</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Common.Utils\Core.Common.Utils.csproj">
+      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
+      <Name>Core.Common.Utils</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
+      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
+      <Name>Core.Common.TestUtils</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildBinPath)\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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <PropertyGroup>
+    <ExternalDependencies1>lib\Common\SharpMap.Extensions</ExternalDependencies1>
+  </PropertyGroup>
+  <Import Project="..\..\..\..\build\Ringtoets.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
Fisheye: Tag 41c77f9f36ae74a406fd382187426cc06d2b0200 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Integration.Test/Core.Common.Integration.Tests.csproj'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Integration.Test/Properties/AssemblyInfo.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Integration.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Integration.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,8 +2,8 @@
 using System.Runtime.InteropServices;
 using NUnit.Framework;
 
-[assembly: AssemblyTitle("Core.Common.Integration.Tests")]
-[assembly: AssemblyProduct("Core.Common.Integration.Tests")]
+[assembly: AssemblyTitle("Core.Common.Integration.Test")]
+[assembly: AssemblyProduct("Core.Common.Integration.Test")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
Index: Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/GuiImportHandlerTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/GuiImportHandlerTest.cs	(.../GuiImportHandlerTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/GuiImportHandlerTest.cs	(.../GuiImportHandlerTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -7,7 +7,7 @@
 using Rhino.Mocks;
 using MessageBox = Core.Common.Controls.Swf.MessageBox;
 
-namespace Core.Common.Integration.Tests.Ringtoets.Application.Ringtoets
+namespace Core.Common.Integration.Test.Ringtoets.Application.Ringtoets
 {
     [TestFixture]
     public class GuiImportHandlerTest
Index: Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs	(.../RingtoetsGuiIntegrationTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs	(.../RingtoetsGuiIntegrationTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -14,7 +14,7 @@
 using NUnit.Framework;
 using Control = System.Windows.Controls.Control;
 
-namespace Core.Common.Integration.Tests.Ringtoets.Application.Ringtoets
+namespace Core.Common.Integration.Test.Ringtoets.Application.Ringtoets
 {
     [TestFixture]
     public class RingtoetsGuiIntegrationTest
Index: Core/Common/test/Core.Common.Test/Core.Common.Test.csproj
===================================================================
diff -u
--- Core/Common/test/Core.Common.Test/Core.Common.Test.csproj	(revision 0)
+++ Core/Common/test/Core.Common.Test/Core.Common.Test.csproj	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{E0990383-FB2E-47D1-99CD-9B9FA2929E5B}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Core.Common.Test</RootNamespace>
+    <AssemblyName>Core.Common.Test</AssemblyName>
+    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\Release\</OutputPath>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CreateInstallerWithDemoProject|x86'">
+    <OutputPath>bin\CreateInstallerWithDemoProject\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="log4net, Version=1.2.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\log4net.2.0.4\lib\net40-full\log4net.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <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">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xaml" />
+    <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
+    <Reference Include="Xceed.Wpf.AvalonDock">
+      <HintPath>..\..\..\..\packages\AvalonDock.2.0.2000\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Core\AssemblyInfoTest.cs" />
+    <Compile Include="Core\ApplicationCoreTest.cs" />
+    <Compile Include="Gui\Forms\AvalonDockDockingManagerTest.cs" />
+    <Compile Include="Gui\Forms\ProgressBarDialogTest.cs" />
+    <Compile Include="Gui\Forms\ProgressDialogTest.cs" />
+    <Compile Include="Gui\Forms\PropertyGridView\PropertyResolverTest.cs" />
+    <Compile Include="Gui\RingtoetsGuiTests.cs" />
+    <Compile Include="Gui\ImportActivityTest.cs" />
+    <Compile Include="Gui\Log4netTest.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="TestObjects\TestReusableView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="TestObjects\TestReusableView.Designer.cs">
+      <DependentUpon>TestReusableView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="TestObjects\TestDockingManager.cs" />
+    <Compile Include="Gui\ToolWindowTestControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Gui\ToolWindowTestControl.Designer.cs">
+      <DependentUpon>ToolWindowTestControl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Gui\ViewListTest.cs" />
+    <Compile Include="TestObjects\TestView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="TestObjects\TestView.Designer.cs">
+      <DependentUpon>TestView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TestObjects\TestSettings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>TestSettings.settings</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="packages.config" />
+    <None Include="TestObjects\TestSettings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>TestSettings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Gui\ToolWindowTestControl.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>ToolWindowTestControl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="TestObjects\TestView.resx">
+      <DependentUpon>TestView.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Gui\Resources\image1.png" />
+    <Content Include="Gui\Resources\image2.png" />
+    <Content Include="Gui\Resources\image3.png" />
+    <None Include="Gui\Resources\image6.png" />
+    <None Include="Gui\Resources\image4.png" />
+    <None Include="Gui\Resources\image5.png" />
+    <Content Include="Gui\Resources\image7.png" />
+    <Content Include="Gui\Resources\image8.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Application\Application.Ringtoets\Application.Ringtoets.csproj">
+      <Project>{4a7d6720-4aa1-4f0b-a796-a0436db3d7d7}</Project>
+      <Name>Application.Ringtoets</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls.Swf\Core.Common.Controls.Swf.csproj">
+      <Project>{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}</Project>
+      <Name>Core.Common.Controls.Swf</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
+      <Project>{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}</Project>
+      <Name>Core.Common.Controls</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="..\..\..\Plugins\src\Core.Plugins.CommonTools\Core.Plugins.CommonTools.csproj">
+      <Project>{befdcc44-2638-4972-b353-42d14c7da2c6}</Project>
+      <Name>Core.Plugins.CommonTools</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj">
+      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
+      <Name>Core.Common.Base</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
+      <Project>{EFA25023-CF6A-4FF7-8C42-B24D7F9509E1}</Project>
+      <Name>Core.Common.TestUtils</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
+      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
+      <Name>Core.Common.Utils</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{B4F97281-0DBD-4835-9ED8-7DFB966E87FF}" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\..\..\..\build\Ringtoets.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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ProjectExtensions>
+    <MonoDevelop>
+      <Properties InternalTargetFrameworkVersion="3.5" />
+    </MonoDevelop>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file
Fisheye: Tag 41c77f9f36ae74a406fd382187426cc06d2b0200 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Test/Core.Common.Tests.csproj'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Test/Core/ApplicationCoreTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Test/Core/ApplicationCoreTest.cs	(.../ApplicationCoreTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Test/Core/ApplicationCoreTest.cs	(.../ApplicationCoreTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -5,7 +5,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Core.Common.Tests.Core
+namespace Core.Common.Test.Core
 {
     [TestFixture]
     public class ApplicationCoreTest
Index: Core/Common/test/Core.Common.Test/Core/AssemblyInfoTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Test/Core/AssemblyInfoTest.cs	(.../AssemblyInfoTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Test/Core/AssemblyInfoTest.cs	(.../AssemblyInfoTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,7 +2,7 @@
 using Core.Common.Utils.Reflection;
 using NUnit.Framework;
 
-namespace Core.Common.Tests.Core
+namespace Core.Common.Test.Core
 {
     [TestFixture]
     public class AssemblyInfoTest
Index: Core/Common/test/Core.Common.Test/Gui/Forms/AvalonDockDockingManagerTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Test/Gui/Forms/AvalonDockDockingManagerTest.cs	(.../AvalonDockDockingManagerTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Test/Gui/Forms/AvalonDockDockingManagerTest.cs	(.../AvalonDockDockingManagerTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,13 +1,13 @@
 using Core.Common.Gui;
 using Core.Common.Gui.Forms.ViewManager;
-using Core.Common.Tests.TestObjects;
+using Core.Common.Test.TestObjects;
 using Core.Common.Utils.Reflection;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Xceed.Wpf.AvalonDock;
 using Xceed.Wpf.AvalonDock.Layout;
 
-namespace Core.Common.Tests.Gui.Forms
+namespace Core.Common.Test.Gui.Forms
 {
     [TestFixture]
     public class AvalonDockDockingManagerTest
Index: Core/Common/test/Core.Common.Test/Gui/Forms/ProgressBarDialogTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Test/Gui/Forms/ProgressBarDialogTest.cs	(.../ProgressBarDialogTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Test/Gui/Forms/ProgressBarDialogTest.cs	(.../ProgressBarDialogTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -3,7 +3,7 @@
 using Core.Common.Controls.Swf;
 using NUnit.Framework;
 
-namespace Core.Common.Tests.Gui.Forms
+namespace Core.Common.Test.Gui.Forms
 {
     [TestFixture]
     public class ProgressBarDialogTest
Index: Core/Common/test/Core.Common.Test/Gui/Forms/ProgressDialogTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Test/Gui/Forms/ProgressDialogTest.cs	(.../ProgressDialogTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Test/Gui/Forms/ProgressDialogTest.cs	(.../ProgressDialogTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -5,7 +5,7 @@
 using Core.Common.Gui.Forms.ProgressDialog;
 using NUnit.Framework;
 
-namespace Core.Common.Tests.Gui.Forms
+namespace Core.Common.Test.Gui.Forms
 {
     [TestFixture]
     public class ProgressDialogTest
Index: Core/Common/test/Core.Common.Test/Gui/Forms/PropertyGridView/PropertyResolverTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Test/Gui/Forms/PropertyGridView/PropertyResolverTest.cs	(.../PropertyResolverTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Test/Gui/Forms/PropertyGridView/PropertyResolverTest.cs	(.../PropertyResolverTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -4,7 +4,7 @@
 using Core.Common.Utils.PropertyBag.Dynamic;
 using NUnit.Framework;
 
-namespace Core.Common.Tests.Gui.Forms.PropertyGridView
+namespace Core.Common.Test.Gui.Forms.PropertyGridView
 {
     [TestFixture]
     public class PropertyResolverTest
Index: Core/Common/test/Core.Common.Test/Gui/ImportActivityTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Test/Gui/ImportActivityTest.cs	(.../ImportActivityTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Test/Gui/ImportActivityTest.cs	(.../ImportActivityTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -3,7 +3,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Core.Common.Tests.Gui
+namespace Core.Common.Test.Gui
 {
     [TestFixture]
     public class ImportActivityTest
Index: Core/Common/test/Core.Common.Test/Gui/Log4netTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Test/Gui/Log4netTest.cs	(.../Log4netTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Test/Gui/Log4netTest.cs	(.../Log4netTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -7,22 +7,22 @@
 using log4net;
 using NUnit.Framework;
 
-namespace Core.Common.Tests.Gui
+namespace Core.Common.Test.Gui
 {
     [TestFixture]
     public class Log4net
     {
         [Test]
         public void CreateLogger()
         {
-            ILog log = LogManager.GetLogger("Core.Common.tests.log4net");
-            Assert.AreEqual(log.Logger.Name, "Core.Common.tests.log4net");
+            ILog log = LogManager.GetLogger("Core.Common.test.log4net");
+            Assert.AreEqual(log.Logger.Name, "Core.Common.test.log4net");
         }
 
         [Test]
         public void LoggingTypes()
         {
-            ILog log = LogManager.GetLogger("Core.Common.tests.log4net");
+            ILog log = LogManager.GetLogger("Core.Common.test.log4net");
             log.Info("LoggingTypes");
             log.Debug("LoggingTypes");
             log.Warn("LoggingTypes");
@@ -33,7 +33,7 @@
         [Test]
         public void LoggingFormat()
         {
-            ILog log = LogManager.GetLogger("Core.Common.tests.log4net");
+            ILog log = LogManager.GetLogger("Core.Common.test.log4net");
             //The following methods somehow dont work under mono.....
             //TODO: find the cause of this
             log.InfoFormat("LoggingTypes {0}", 1);
Index: Core/Common/test/Core.Common.Test/Gui/RingtoetsGuiTests.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Test/Gui/RingtoetsGuiTests.cs	(.../RingtoetsGuiTests.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Test/Gui/RingtoetsGuiTests.cs	(.../RingtoetsGuiTests.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -3,7 +3,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Core.Common.Tests.Gui
+namespace Core.Common.Test.Gui
 {
     [TestFixture]
     public class RingtoetsGuiTests
Index: Core/Common/test/Core.Common.Test/Gui/ToolWindowTestControl.Designer.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Test/Gui/ToolWindowTestControl.Designer.cs	(.../ToolWindowTestControl.Designer.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Test/Gui/ToolWindowTestControl.Designer.cs	(.../ToolWindowTestControl.Designer.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,4 +1,4 @@
-namespace Core.Common.Tests.Gui
+namespace Core.Common.Test.Gui
 {
     partial class ToolWindowTestControl
     {
Index: Core/Common/test/Core.Common.Test/Gui/ToolWindowTestControl.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Test/Gui/ToolWindowTestControl.cs	(.../ToolWindowTestControl.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Test/Gui/ToolWindowTestControl.cs	(.../ToolWindowTestControl.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,7 +2,7 @@
 using System.Windows.Forms;
 using Core.Common.Controls;
 
-namespace Core.Common.Tests.Gui
+namespace Core.Common.Test.Gui
 {
     public partial class ToolWindowTestControl : UserControl, IView
     {
Index: Core/Common/test/Core.Common.Test/Gui/ViewListTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Test/Gui/ViewListTest.cs	(.../ViewListTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Test/Gui/ViewListTest.cs	(.../ViewListTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -4,12 +4,12 @@
 using Core.Common.Controls.Swf;
 using Core.Common.Gui;
 using Core.Common.Gui.Forms.ViewManager;
-using Core.Common.Tests.TestObjects;
+using Core.Common.Test.TestObjects;
 using Core.Common.Utils;
 using Core.Common.Utils.Collections;
 using NUnit.Framework;
 
-namespace Core.Common.Tests.Gui
+namespace Core.Common.Test.Gui
 {
     [TestFixture]
     public class ViewListTest
Index: Core/Common/test/Core.Common.Test/Properties/AssemblyInfo.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,8 +2,8 @@
 using System.Runtime.InteropServices;
 using NUnit.Framework;
 
-[assembly: AssemblyTitle("Core.Common.Tests")]
-[assembly: AssemblyProduct("Core.Common.Tests")]
+[assembly: AssemblyTitle("Core.Common.Test")]
+[assembly: AssemblyProduct("Core.Common.Test")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
Index: Core/Common/test/Core.Common.Test/Properties/Resources.Designer.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Test/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Test/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Core.Common.Tests.Properties {
+namespace Core.Common.Test.Properties {
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -36,7 +36,7 @@
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Core.Common.Tests.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Core.Common.Test.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
Index: Core/Common/test/Core.Common.Test/TestObjects/TestDockingManager.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Test/TestObjects/TestDockingManager.cs	(.../TestDockingManager.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Test/TestObjects/TestDockingManager.cs	(.../TestDockingManager.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -5,7 +5,7 @@
 using Core.Common.Gui;
 using Core.Common.Gui.Forms.ViewManager;
 
-namespace Core.Common.Tests.TestObjects
+namespace Core.Common.Test.TestObjects
 {
     /// <summary>
     /// Docking manager for test...does nothing
Index: Core/Common/test/Core.Common.Test/TestObjects/TestReusableView.Designer.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Test/TestObjects/TestReusableView.Designer.cs	(.../TestReusableView.Designer.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Test/TestObjects/TestReusableView.Designer.cs	(.../TestReusableView.Designer.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,4 +1,4 @@
-namespace Core.Common.Tests.TestObjects
+namespace Core.Common.Test.TestObjects
 {
     partial class TestReusableView
     {
Index: Core/Common/test/Core.Common.Test/TestObjects/TestReusableView.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Test/TestObjects/TestReusableView.cs	(.../TestReusableView.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Test/TestObjects/TestReusableView.cs	(.../TestReusableView.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -3,7 +3,7 @@
 using System.Windows.Forms;
 using Core.Common.Controls;
 
-namespace Core.Common.Tests.TestObjects
+namespace Core.Common.Test.TestObjects
 {
     public partial class TestReusableView : UserControl, IReusableView
     {
Index: Core/Common/test/Core.Common.Test/TestObjects/TestSettings.Designer.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Test/TestObjects/TestSettings.Designer.cs	(.../TestSettings.Designer.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Test/TestObjects/TestSettings.Designer.cs	(.../TestSettings.Designer.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Core.Common.Tests.TestObjects {
+namespace Core.Common.Test.TestObjects {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
Index: Core/Common/test/Core.Common.Test/TestObjects/TestView.Designer.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Test/TestObjects/TestView.Designer.cs	(.../TestView.Designer.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Test/TestObjects/TestView.Designer.cs	(.../TestView.Designer.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,4 +1,4 @@
-namespace Core.Common.Tests.TestObjects
+namespace Core.Common.Test.TestObjects
 {
     partial class TestView
     {
Index: Core/Common/test/Core.Common.Test/TestObjects/TestView.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Test/TestObjects/TestView.cs	(.../TestView.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Test/TestObjects/TestView.cs	(.../TestView.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -3,7 +3,7 @@
 using System.Windows.Forms;
 using Core.Common.Controls;
 
-namespace Core.Common.Tests.TestObjects
+namespace Core.Common.Test.TestObjects
 {
     public partial class TestView : UserControl, IView
     {
Index: Core/Common/test/Core.Common.TestUtils/TestDataPath.cs
===================================================================
diff -u -r293be5aa0c9cfb58fea075f0ce6943fdfb310406 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.TestUtils/TestDataPath.cs	(.../TestDataPath.cs)	(revision 293be5aa0c9cfb58fea075f0ce6943fdfb310406)
+++ Core/Common/test/Core.Common.TestUtils/TestDataPath.cs	(.../TestDataPath.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -18,11 +18,11 @@
         public static class Common
         {
             public static readonly TestDataPath CoreCommonUtilsTests =
-                System.IO.Path.Combine("Core", "Common", "test", "Core.Common.Utils.Tests");
+                System.IO.Path.Combine("Core", "Common", "test", "Core.Common.Utils.Test");
 
             public static class Base
             {
-                public static readonly TestDataPath CoreCommonBaseTests = @"Core/Common/test/Core.Common.Base.Tests";
+                public static readonly TestDataPath CoreCommonBaseTests = @"Core/Common/test/Core.Common.Base.Test";
             }
         }
 
@@ -34,7 +34,7 @@
             }
 
             public static readonly TestDataPath CorePluginsSharpMapGisTests =
-                @"Core/Plugins/test/Core.Plugins.SharpMapGis.Tests/";
+                @"Core/Plugins/test/Core.Plugins.SharpMapGis.Test/";
         }
     }
 }
\ No newline at end of file
Index: Core/Common/test/Core.Common.Utils.Test/Aop/InvokeRequiredAttributeTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Utils.Test/Aop/InvokeRequiredAttributeTest.cs	(.../InvokeRequiredAttributeTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Utils.Test/Aop/InvokeRequiredAttributeTest.cs	(.../InvokeRequiredAttributeTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,10 +1,10 @@
 using System.Threading;
 using System.Windows.Forms;
 using Core.Common.Utils.Aop;
-using Core.Common.Utils.Tests.Aop.TestClasses;
+using Core.Common.Utils.Test.Aop.TestClasses;
 using NUnit.Framework;
 
-namespace Core.Common.Utils.Tests.Aop
+namespace Core.Common.Utils.Test.Aop
 {
     [TestFixture]
     public class InvokeRequiredAttributeTest
Index: Core/Common/test/Core.Common.Utils.Test/Aop/TestClasses/DllImports.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Utils.Test/Aop/TestClasses/DllImports.cs	(.../DllImports.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Utils.Test/Aop/TestClasses/DllImports.cs	(.../DllImports.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,7 +2,7 @@
 using System.Runtime.InteropServices;
 using Core.Common.Utils.Aop;
 
-namespace Core.Common.Utils.Tests.Aop.TestClasses
+namespace Core.Common.Utils.Test.Aop.TestClasses
 {
     [TraceDllImportCalls]
     public class DllImports
Index: Core/Common/test/Core.Common.Utils.Test/Aop/TestClasses/InvokeRequiredTestClass.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Utils.Test/Aop/TestClasses/InvokeRequiredTestClass.cs	(.../InvokeRequiredTestClass.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Utils.Test/Aop/TestClasses/InvokeRequiredTestClass.cs	(.../InvokeRequiredTestClass.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -3,7 +3,7 @@
 using System.Threading;
 using Core.Common.Utils.Aop;
 
-namespace Core.Common.Utils.Tests.Aop.TestClasses
+namespace Core.Common.Utils.Test.Aop.TestClasses
 {
     public class InvokeRequiredTestClass : ISynchronizeInvoke, IDisposable
     {
Index: Core/Common/test/Core.Common.Utils.Test/Aop/TraceDllImportCallsAttributeTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Utils.Test/Aop/TraceDllImportCallsAttributeTest.cs	(.../TraceDllImportCallsAttributeTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Utils.Test/Aop/TraceDllImportCallsAttributeTest.cs	(.../TraceDllImportCallsAttributeTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,10 +1,10 @@
 using System;
 using System.IO;
 using Core.Common.Utils.Aop;
-using Core.Common.Utils.Tests.Aop.TestClasses;
+using Core.Common.Utils.Test.Aop.TestClasses;
 using NUnit.Framework;
 
-namespace Core.Common.Utils.Tests.Aop
+namespace Core.Common.Utils.Test.Aop
 {
     [TestFixture]
     public class TraceDllImportCallsAttributeTest
Index: Core/Common/test/Core.Common.Utils.Test/ChartViewDateTimeFormatProviderTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Utils.Test/ChartViewDateTimeFormatProviderTest.cs	(.../ChartViewDateTimeFormatProviderTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Utils.Test/ChartViewDateTimeFormatProviderTest.cs	(.../ChartViewDateTimeFormatProviderTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -3,7 +3,7 @@
 using System.Threading;
 using NUnit.Framework;
 
-namespace Core.Common.Utils.Tests
+namespace Core.Common.Utils.Test
 {
     [TestFixture]
     public class ChartViewDateTimeFormatProviderTest
Index: Core/Common/test/Core.Common.Utils.Test/Collections/EnumerableExtensionsTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Utils.Test/Collections/EnumerableExtensionsTest.cs	(.../EnumerableExtensionsTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Utils.Test/Collections/EnumerableExtensionsTest.cs	(.../EnumerableExtensionsTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -5,7 +5,7 @@
 using Core.Common.Utils.Collections;
 using NUnit.Framework;
 
-namespace Core.Common.Utils.Tests.Collections
+namespace Core.Common.Utils.Test.Collections
 {
     [TestFixture]
     public class EnumerableExtensionsTest
Index: Core/Common/test/Core.Common.Utils.Test/Collections/Extensions/ListExtensions.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Utils.Test/Collections/Extensions/ListExtensions.cs	(.../ListExtensions.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Utils.Test/Collections/Extensions/ListExtensions.cs	(.../ListExtensions.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,7 +2,7 @@
 using Core.Common.Utils.Collections.Extensions;
 using NUnit.Framework;
 
-namespace Core.Common.Utils.Tests.Collections.Extensions
+namespace Core.Common.Utils.Test.Collections.Extensions
 {
     [TestFixture]
     public class ListExtensionsTest
Index: Core/Common/test/Core.Common.Utils.Test/Collections/Generic/EnumerableListTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Utils.Test/Collections/Generic/EnumerableListTest.cs	(.../EnumerableListTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Utils.Test/Collections/Generic/EnumerableListTest.cs	(.../EnumerableListTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -5,7 +5,7 @@
 using log4net.Core;
 using NUnit.Framework;
 
-namespace Core.Common.Utils.Tests.Collections.Generic
+namespace Core.Common.Utils.Test.Collections.Generic
 {
     [TestFixture]
     public class EnumerableListTest
Index: Core/Common/test/Core.Common.Utils.Test/Collections/Generic/EventedListTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Utils.Test/Collections/Generic/EventedListTest.cs	(.../EventedListTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Utils.Test/Collections/Generic/EventedListTest.cs	(.../EventedListTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,12 +1,11 @@
-using System;
 using System.ComponentModel;
 using System.Linq;
 using Core.Common.TestUtils;
 using Core.Common.Utils.Collections;
 using Core.Common.Utils.Collections.Generic;
 using NUnit.Framework;
 
-namespace Core.Common.Utils.Tests.Collections.Generic
+namespace Core.Common.Utils.Test.Collections.Generic
 {
     [TestFixture]
     public class EventedListTest
Index: Core/Common/test/Core.Common.Utils.Test/ComparableExtensionsTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Utils.Test/ComparableExtensionsTest.cs	(.../ComparableExtensionsTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Utils.Test/ComparableExtensionsTest.cs	(.../ComparableExtensionsTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,7 +1,7 @@
 using System;
 using NUnit.Framework;
 
-namespace Core.Common.Utils.Tests
+namespace Core.Common.Utils.Test
 {
     [TestFixture]
     public class ComparableExtensionsTest
Index: Core/Common/test/Core.Common.Utils.Test/ComparerTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Utils.Test/ComparerTest.cs	(.../ComparerTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Utils.Test/ComparerTest.cs	(.../ComparerTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,6 +1,6 @@
 using NUnit.Framework;
 
-namespace Core.Common.Utils.Tests
+namespace Core.Common.Utils.Test
 {
     [TestFixture]
     public class ComparerTest
Index: Core/Common/test/Core.Common.Utils.Test/ConversionHelperTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Utils.Test/ConversionHelperTest.cs	(.../ConversionHelperTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Utils.Test/ConversionHelperTest.cs	(.../ConversionHelperTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -3,7 +3,7 @@
 using System.Threading;
 using NUnit.Framework;
 
-namespace Core.Common.Utils.Tests
+namespace Core.Common.Utils.Test
 {
     [TestFixture]
     public class ConversionHelperTest
Index: Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Test.csproj
===================================================================
diff -u
--- Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Test.csproj	(revision 0)
+++ Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Test.csproj	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{7F937E31-02CA-41D9-B7D4-1079CF452C72}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Core.Common.Utils.Test</RootNamespace>
+    <AssemblyName>Core.Common.Utils.Test</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <DontImportPostSharp>True</DontImportPostSharp>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\Release\</OutputPath>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CreateInstallerWithDemoProject|x86'">
+    <OutputPath>bin\CreateInstallerWithDemoProject\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="log4net, Version=1.2.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\log4net.2.0.4\lib\net40-full\log4net.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="PostSharp">
+      <HintPath>..\..\..\..\packages\PostSharp.2.1.7.28\lib\net20\PostSharp.dll</HintPath>
+    </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">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.ServiceModel">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Data.DataSetExtensions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Aop\InvokeRequiredAttributeTest.cs" />
+    <Compile Include="Aop\TestClasses\InvokeRequiredTestClass.cs" />
+    <Compile Include="Aop\TestClasses\DllImports.cs" />
+    <Compile Include="Aop\TraceDllImportCallsAttributeTest.cs" />
+    <Compile Include="ChartViewDateTimeFormatProviderTest.cs" />
+    <Compile Include="Collections\EnumerableExtensionsTest.cs" />
+    <Compile Include="Collections\Extensions\ListExtensions.cs" />
+    <Compile Include="Collections\Generic\EnumerableListTest.cs" />
+    <Compile Include="Collections\Generic\EventedListTest.cs" />
+    <Compile Include="ComparableExtensionsTest.cs" />
+    <Compile Include="ComparerTest.cs" />
+    <Compile Include="ConversionHelperTest.cs" />
+    <Compile Include="General\TypeConverterTest.cs" />
+    <Compile Include="Globalization\RegionalSettingsManagerTest.cs" />
+    <Compile Include="IO\FileUtilsTest.cs" />
+    <Compile Include="IO\FileWatcherTest.cs" />
+    <Compile Include="MathUtilsTest.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="PropertyBag\DynamicPropertyBagTest.cs" />
+    <Compile Include="Reflection\AssemblyUtilsTest.cs" />
+    <Compile Include="Reflection\DynamicTypeUtilsTest.cs" />
+    <Compile Include="Reflection\TypeConverterTest.cs" />
+    <Compile Include="Reflection\TypeExtensionsTest.cs" />
+    <Compile Include="Reflection\TypeUtilsTest.cs" />
+    <Compile Include="SnappingCalculatorTest.cs" />
+    <Compile Include="StringExtensionsTests.cs" />
+    <Compile Include="TestHelperTests.cs" />
+    <Compile Include="TextDocumentTest.cs" />
+    <Compile Include="Validation\ValidationReportTest.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Core.Common.Utils\Core.Common.Utils.csproj">
+      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
+      <Name>Core.Common.Utils</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
+      <Project>{EFA25023-CF6A-4FF7-8C42-B24D7F9509E1}</Project>
+      <Name>Core.Common.TestUtils</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\abacus.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\acorn.png" />
+  </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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <Import Project="..\..\..\..\build\Ringtoets.targets" />
+  <Import Project="..\..\..\..\packages\PostSharp.2.1.7.28\tools\PostSharp.targets" Condition="Exists('..\..\..\..\packages\PostSharp.2.1.7.28\tools\PostSharp.targets')" />
+</Project>
\ No newline at end of file
Fisheye: Tag 41c77f9f36ae74a406fd382187426cc06d2b0200 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Tests.csproj'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Utils.Test/General/TypeConverterTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Utils.Test/General/TypeConverterTest.cs	(.../TypeConverterTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Utils.Test/General/TypeConverterTest.cs	(.../TypeConverterTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -3,7 +3,7 @@
 using System.Globalization;
 using NUnit.Framework;
 
-namespace Core.Common.Utils.Tests.General
+namespace Core.Common.Utils.Test.General
 {
     [TestFixture]
     public class TypeConverterTest
Index: Core/Common/test/Core.Common.Utils.Test/Globalization/RegionalSettingsManagerTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Utils.Test/Globalization/RegionalSettingsManagerTest.cs	(.../RegionalSettingsManagerTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Utils.Test/Globalization/RegionalSettingsManagerTest.cs	(.../RegionalSettingsManagerTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -4,7 +4,7 @@
 using Core.Common.Utils.Globalization;
 using NUnit.Framework;
 
-namespace Core.Common.Utils.Tests.Globalization
+namespace Core.Common.Utils.Test.Globalization
 {
     [TestFixture]
     public class RegionalSettingsManagerTest
Index: Core/Common/test/Core.Common.Utils.Test/IO/FileUtilsTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Utils.Test/IO/FileUtilsTest.cs	(.../FileUtilsTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Utils.Test/IO/FileUtilsTest.cs	(.../FileUtilsTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -5,7 +5,7 @@
 using Core.Common.Utils.IO;
 using NUnit.Framework;
 
-namespace Core.Common.Utils.Tests.IO
+namespace Core.Common.Utils.Test.IO
 {
     /// <summary/>
     [TestFixture]
Index: Core/Common/test/Core.Common.Utils.Test/IO/FileWatcherTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Utils.Test/IO/FileWatcherTest.cs	(.../FileWatcherTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Utils.Test/IO/FileWatcherTest.cs	(.../FileWatcherTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,7 +1,7 @@
 using Core.Common.Utils.IO;
 using NUnit.Framework;
 
-namespace Core.Common.Utils.Tests.IO
+namespace Core.Common.Utils.Test.IO
 {
     [TestFixture]
     public class FileWatcherTest
Index: Core/Common/test/Core.Common.Utils.Test/MathUtilsTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Utils.Test/MathUtilsTest.cs	(.../MathUtilsTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Utils.Test/MathUtilsTest.cs	(.../MathUtilsTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,6 +1,6 @@
 using NUnit.Framework;
 
-namespace Core.Common.Utils.Tests
+namespace Core.Common.Utils.Test
 {
     [TestFixture]
     public class MathUtilsTest
Index: Core/Common/test/Core.Common.Utils.Test/Properties/AssemblyInfo.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Utils.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Utils.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,8 +1,8 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyTitle("Core.Common.Utils.Tests")]
-[assembly: AssemblyProduct("Core.Common.Utils.Tests")]
+[assembly: AssemblyTitle("Core.Common.Utils.Test")]
+[assembly: AssemblyProduct("Core.Common.Utils.Test")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
Index: Core/Common/test/Core.Common.Utils.Test/Properties/Resources.Designer.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Utils.Test/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Utils.Test/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -8,10 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Core.Common.Utils.Tests.Properties {
-    using System;
-    
-    
+namespace Core.Common.Utils.Test.Properties {
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -39,7 +36,7 @@
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Core.Common.Utils.Tests.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Core.Common.Utils.Test.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
Index: Core/Common/test/Core.Common.Utils.Test/PropertyBag/DynamicPropertyBagTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Utils.Test/PropertyBag/DynamicPropertyBagTest.cs	(.../DynamicPropertyBagTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Utils.Test/PropertyBag/DynamicPropertyBagTest.cs	(.../DynamicPropertyBagTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -8,7 +8,7 @@
 using NUnit.Framework;
 using CategoryComponentModelAttribute = System.ComponentModel.CategoryAttribute;
 
-namespace Core.Common.Utils.Tests.PropertyBag
+namespace Core.Common.Utils.Test.PropertyBag
 {
     [TestFixture]
     public class DynamicPropertyBagTest
@@ -115,7 +115,7 @@
         }
 
         [Test]
-        [ExpectedException(typeof(MissingMethodException), ExpectedMessage = "DynamicReadOnlyValidationMethod niet gevonden (of geen 'public' toegankelijkheid). Klasse: Core.Common.Utils.Tests.PropertyBag.DynamicPropertyBagTest+TestWithoutValidationMethodClassProperties")]
+        [ExpectedException(typeof(MissingMethodException), ExpectedMessage = "DynamicReadOnlyValidationMethod niet gevonden (of geen 'public' toegankelijkheid). Klasse: Core.Common.Utils.Test.PropertyBag.DynamicPropertyBagTest+TestWithoutValidationMethodClassProperties")]
         public void ThrowsExceptionOnTypoInDynamicAttributeFunction()
         {
             var dynamicPropertyBag = new DynamicPropertyBag(new TestWithoutValidationMethodClassProperties());
@@ -178,7 +178,7 @@
         }
 
         [Test]
-        [ExpectedException(typeof(MissingMethodException), ExpectedMessage = "DynamicReadOnlyValidationMethod heeft een incorrecte aantal argumenten. Zou er één moeten zijn. Klasse: Core.Common.Utils.Tests.PropertyBag.DynamicPropertyBagTest+TestInvalidValidationMethodClassProperties")]
+        [ExpectedException(typeof(MissingMethodException), ExpectedMessage = "DynamicReadOnlyValidationMethod heeft een incorrecte aantal argumenten. Zou er één moeten zijn. Klasse: Core.Common.Utils.Test.PropertyBag.DynamicPropertyBagTest+TestInvalidValidationMethodClassProperties")]
         public void ThrowsExceptionOnInvalidValidationMethod()
         {
             var dynamicPropertyBag = new DynamicPropertyBag(new TestInvalidValidationMethodClassProperties());
@@ -200,7 +200,7 @@
         }
 
         [Test]
-        [ExpectedException(typeof(MissingMethodException), ExpectedMessage = "Slechts één DynamicReadOnlyValidationMethod toegestaan per klasse: Core.Common.Utils.Tests.PropertyBag.DynamicPropertyBagTest+TestWithTwoValidationMethodsClassProperties.")]
+        [ExpectedException(typeof(MissingMethodException), ExpectedMessage = "Slechts één DynamicReadOnlyValidationMethod toegestaan per klasse: Core.Common.Utils.Test.PropertyBag.DynamicPropertyBagTest+TestWithTwoValidationMethodsClassProperties.")]
         public void OnlySingleValidationMethodIsAllowed()
         {
             var dynamicPropertyBag = new DynamicPropertyBag(new TestWithTwoValidationMethodsClassProperties());
Index: Core/Common/test/Core.Common.Utils.Test/Reflection/AssemblyUtilsTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Utils.Test/Reflection/AssemblyUtilsTest.cs	(.../AssemblyUtilsTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Utils.Test/Reflection/AssemblyUtilsTest.cs	(.../AssemblyUtilsTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,7 +2,7 @@
 using Core.Common.Utils.Reflection;
 using NUnit.Framework;
 
-namespace Core.Common.Utils.Tests.Reflection
+namespace Core.Common.Utils.Test.Reflection
 {
     [TestFixture]
     public class AssemblyUtilsTest
@@ -12,7 +12,7 @@
         {
             Assembly assembly = Assembly.GetExecutingAssembly();
             AssemblyUtils.AssemblyInfo assemblyInfo = AssemblyUtils.GetAssemblyInfo(assembly);
-            Assert.AreEqual("Core.Common.Utils.Tests", assemblyInfo.Title);
+            Assert.AreEqual("Core.Common.Utils.Test", assemblyInfo.Title);
         }
     }
 }
\ No newline at end of file
Index: Core/Common/test/Core.Common.Utils.Test/Reflection/DynamicTypeUtilsTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Utils.Test/Reflection/DynamicTypeUtilsTest.cs	(.../DynamicTypeUtilsTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Utils.Test/Reflection/DynamicTypeUtilsTest.cs	(.../DynamicTypeUtilsTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,7 +2,7 @@
 using Core.Common.Utils.Reflection;
 using NUnit.Framework;
 
-namespace Core.Common.Utils.Tests.Reflection
+namespace Core.Common.Utils.Test.Reflection
 {
     [TestFixture]
     public class DynamicTypeUtilsTest
Index: Core/Common/test/Core.Common.Utils.Test/Reflection/TypeConverterTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Utils.Test/Reflection/TypeConverterTest.cs	(.../TypeConverterTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Utils.Test/Reflection/TypeConverterTest.cs	(.../TypeConverterTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -4,7 +4,7 @@
 using log4net;
 using NUnit.Framework;
 
-namespace Core.Common.Utils.Tests.Reflection
+namespace Core.Common.Utils.Test.Reflection
 {
     [TestFixture]
     public class TypeConverterTest
Index: Core/Common/test/Core.Common.Utils.Test/Reflection/TypeExtensionsTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Utils.Test/Reflection/TypeExtensionsTest.cs	(.../TypeExtensionsTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Utils.Test/Reflection/TypeExtensionsTest.cs	(.../TypeExtensionsTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,7 +2,7 @@
 using Core.Common.Utils.Reflection;
 using NUnit.Framework;
 
-namespace Core.Common.Utils.Tests.Reflection
+namespace Core.Common.Utils.Test.Reflection
 {
     [TestFixture]
     public class TypeExtensionsTest
Index: Core/Common/test/Core.Common.Utils.Test/Reflection/TypeUtilsTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Utils.Test/Reflection/TypeUtilsTest.cs	(.../TypeUtilsTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Utils.Test/Reflection/TypeUtilsTest.cs	(.../TypeUtilsTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,16 +1,14 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
 using System.Reflection.Emit;
-using Core.Common.Utils.Aop;
 using Core.Common.Utils.Reflection;
 using NUnit.Framework;
 using DescriptionAttribute = System.ComponentModel.DescriptionAttribute;
 
-namespace Core.Common.Utils.Tests.Reflection
+namespace Core.Common.Utils.Test.Reflection
 {
     [TestFixture]
     public class TypeUtilsTest
Index: Core/Common/test/Core.Common.Utils.Test/SnappingCalculatorTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Utils.Test/SnappingCalculatorTest.cs	(.../SnappingCalculatorTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Utils.Test/SnappingCalculatorTest.cs	(.../SnappingCalculatorTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,7 +2,7 @@
 using System.Linq;
 using NUnit.Framework;
 
-namespace Core.Common.Utils.Tests
+namespace Core.Common.Utils.Test
 {
     [TestFixture]
     public class SnappingCalculatorTest
Index: Core/Common/test/Core.Common.Utils.Test/StringExtensionsTests.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Utils.Test/StringExtensionsTests.cs	(.../StringExtensionsTests.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Utils.Test/StringExtensionsTests.cs	(.../StringExtensionsTests.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,7 +2,7 @@
 using System.Globalization;
 using NUnit.Framework;
 
-namespace Core.Common.Utils.Tests
+namespace Core.Common.Utils.Test
 {
     [TestFixture]
     public class StringExtensionsTests
Index: Core/Common/test/Core.Common.Utils.Test/TestHelperTests.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Utils.Test/TestHelperTests.cs	(.../TestHelperTests.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Utils.Test/TestHelperTests.cs	(.../TestHelperTests.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -5,12 +5,11 @@
 using System.Windows.Forms;
 using Core.Common.TestUtils;
 using Core.Common.Utils.IO;
-using Core.Common.Utils.Tests.Properties;
-
+using Core.Common.Utils.Test.Properties;
 using log4net;
 using NUnit.Framework;
 
-namespace Core.Common.Utils.Tests
+namespace Core.Common.Utils.Test
 {
     [TestFixture]
     public class TestHelperTests
Index: Core/Common/test/Core.Common.Utils.Test/TextDocumentTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Utils.Test/TextDocumentTest.cs	(.../TextDocumentTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Utils.Test/TextDocumentTest.cs	(.../TextDocumentTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,6 +1,6 @@
 using NUnit.Framework;
 
-namespace Core.Common.Utils.Tests
+namespace Core.Common.Utils.Test
 {
     public class TextDocumentTest
     {
Index: Core/Common/test/Core.Common.Utils.Test/Validation/ValidationReportTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Common/test/Core.Common.Utils.Test/Validation/ValidationReportTest.cs	(.../ValidationReportTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Common/test/Core.Common.Utils.Test/Validation/ValidationReportTest.cs	(.../ValidationReportTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,7 +2,7 @@
 using Core.Common.Utils.Validation;
 using NUnit.Framework;
 
-namespace Core.Common.Utils.Tests.Validation
+namespace Core.Common.Utils.Test.Validation
 {
     [TestFixture]
     public class ValidationReportTest
Index: Core/GIS/test/Core.GIS.GeoAPI.Extentions.Test/Core.GIS.GeoAPI.Extentions.Test.csproj
===================================================================
diff -u
--- Core/GIS/test/Core.GIS.GeoAPI.Extentions.Test/Core.GIS.GeoAPI.Extentions.Test.csproj	(revision 0)
+++ Core/GIS/test/Core.GIS.GeoAPI.Extentions.Test/Core.GIS.GeoAPI.Extentions.Test.csproj	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{B750C8AF-F947-4F90-97FC-3211D1D7336A}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Core.Gis.GeoAPI.Extentions.Test</RootNamespace>
+    <AssemblyName>Core.Gis.GeoAPI.Extentions.Test</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <WarningLevel>0</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\Release\</OutputPath>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <WarningLevel>0</WarningLevel>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="nunit.framework">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\lib\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\..\..\..\build\Ringtoets.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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
Fisheye: Tag 41c77f9f36ae74a406fd382187426cc06d2b0200 refers to a dead (removed) revision in file `Core/GIS/test/Core.GIS.GeoAPI.Extentions.Test/Core.GIS.GeoAPI.Extentions.Tests.csproj'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/GIS/test/Core.GIS.GeoAPI.Extentions.Test/Properties/AssemblyInfo.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.GeoAPI.Extentions.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.GeoAPI.Extentions.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -5,11 +5,11 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 
-[assembly: AssemblyTitle("GeoAPI.Extentions.Tests")]
+[assembly: AssemblyTitle("GeoAPI.Extentions.Test")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Deltares")]
-[assembly: AssemblyProduct("GeoAPI.Extentions.Tests")]
+[assembly: AssemblyProduct("GeoAPI.Extentions.Test")]
 [assembly: AssemblyCopyright("Copyright © Deltares 2010")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
Index: Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Test/Core.GIS.NetTopologySuite.Extensions.Test.csproj
===================================================================
diff -u
--- Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Test/Core.GIS.NetTopologySuite.Extensions.Test.csproj	(revision 0)
+++ Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Test/Core.GIS.NetTopologySuite.Extensions.Test.csproj	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{9D8E844F-20C7-4335-B3A9-2222976470DA}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Core.Gis.NetTopologySuite.Extensions.Test</RootNamespace>
+    <AssemblyName>Core.Gis.NetTopologySuite.Extensions.Test</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <WarningLevel>0</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\Release\</OutputPath>
+    <WarningLevel>0</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CreateInstallerWithDemoProject|x86'">
+    <OutputPath>bin\CreateInstallerWithDemoProject\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <WarningLevel>0</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Features\FeatureAttributeAccessorHelperTest.cs" />
+    <Compile Include="Geometries\GeometryHelperTest.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TestObjects\TestFeature.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
+      <Project>{EFA25023-CF6A-4FF7-8C42-B24D7F9509E1}</Project>
+      <Name>Core.Common.TestUtils</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
+      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
+      <Name>Core.Common.Utils</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.GeoAPI.Extensions\Core.GIS.GeoAPI.Extensions.csproj">
+      <Project>{016DBD27-99BF-489A-81B5-50D66964BB90}</Project>
+      <Name>Core.GIS.GeoAPI.Extensions</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.GeoAPI\Core.GIS.GeoAPI.csproj">
+      <Project>{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}</Project>
+      <Name>Core.GIS.GeoAPI</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.NetTopologySuite.Extensions\Core.GIS.NetTopologySuite.Extensions.csproj">
+      <Project>{8A3636FB-31B4-4F4B-9165-F718F87A92DF}</Project>
+      <Name>Core.GIS.NetTopologySuite.Extensions</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.NetTopologySuite\Core.GIS.NetTopologySuite.csproj">
+      <Project>{5770DAA9-84E5-4770-AF43-F6B815894368}</Project>
+      <Name>Core.GIS.NetTopologySuite</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\..\..\..\build\Ringtoets.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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <PropertyGroup>
+    <ExternalDependencies>lib\Common\SharpMap.Extensions</ExternalDependencies>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
Fisheye: Tag 41c77f9f36ae74a406fd382187426cc06d2b0200 refers to a dead (removed) revision in file `Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Test/Core.GIS.NetTopologySuite.Extensions.Tests.csproj'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Test/Features/FeatureAttributeAccessorHelperTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Test/Features/FeatureAttributeAccessorHelperTest.cs	(.../FeatureAttributeAccessorHelperTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Test/Features/FeatureAttributeAccessorHelperTest.cs	(.../FeatureAttributeAccessorHelperTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,11 +1,11 @@
 using System;
 using System.Linq;
 using Core.Common.TestUtils;
-using Core.Gis.NetTopologySuite.Extensions.Tests.TestObjects;
+using Core.Gis.NetTopologySuite.Extensions.Test.TestObjects;
 using Core.GIS.NetTopologySuite.Extensions.Features;
 using NUnit.Framework;
 
-namespace Core.Gis.NetTopologySuite.Extensions.Tests.Features
+namespace Core.Gis.NetTopologySuite.Extensions.Test.Features
 {
     [TestFixture]
     public class FeatureAttributeAccessorHelperTest
Index: Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Test/Geometries/GeometryHelperTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Test/Geometries/GeometryHelperTest.cs	(.../GeometryHelperTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Test/Geometries/GeometryHelperTest.cs	(.../GeometryHelperTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -8,7 +8,7 @@
 using NUnit.Framework;
 using Assert = NUnit.Framework.Assert;
 
-namespace Core.Gis.NetTopologySuite.Extensions.Tests.Geometries
+namespace Core.Gis.NetTopologySuite.Extensions.Test.Geometries
 {
     [TestFixture]
     public class GeometryHelperTest
Index: Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Test/Properties/AssemblyInfo.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -6,11 +6,11 @@
 using System.Runtime.InteropServices;
 using NUnit.Framework;
 
-[assembly: AssemblyTitle("NetTopologySuite.Extensions.Tests")]
+[assembly: AssemblyTitle("NetTopologySuite.Extensions.Test")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Deltares")]
-[assembly: AssemblyProduct("NetTopologySuite.Extensions.Tests")]
+[assembly: AssemblyProduct("NetTopologySuite.Extensions.Test")]
 [assembly: AssemblyCopyright("Copyright © Deltares 2010")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
Index: Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Test/TestObjects/TestFeature.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Test/TestObjects/TestFeature.cs	(.../TestFeature.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Test/TestObjects/TestFeature.cs	(.../TestFeature.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -3,7 +3,7 @@
 using Core.GIS.GeoAPI.Extensions.Feature;
 using Core.GIS.GeoAPI.Geometries;
 
-namespace Core.Gis.NetTopologySuite.Extensions.Tests.TestObjects
+namespace Core.Gis.NetTopologySuite.Extensions.Test.TestObjects
 {
     //Just a subclass
     internal class TestFeatureSubClass : TestFeature {}
Index: Core/GIS/test/Core.GIS.NetTopologySuite.Test/Core.GIS.NetTopologySuite.Test.csproj
===================================================================
diff -u
--- Core/GIS/test/Core.GIS.NetTopologySuite.Test/Core.GIS.NetTopologySuite.Test.csproj	(revision 0)
+++ Core/GIS/test/Core.GIS.NetTopologySuite.Test/Core.GIS.NetTopologySuite.Test.csproj	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{FBA4B48A-CF75-4958-B1E5-412B75D29416}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Core.GIS.NetTopologySuite.Test</RootNamespace>
+    <AssemblyName>Core.GIS.NetTopologySuite.Test</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <WarningLevel>0</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\Release\</OutputPath>
+    <WarningLevel>0</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CreateInstallerWithDemoProject|x86'">
+    <OutputPath>bin\CreateInstallerWithDemoProject\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <WarningLevel>0</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Geometry\GeometryTest.cs" />
+    <Compile Include="Geometry\LineStringTest.cs" />
+    <Compile Include="Geometry\MultiPointTest.cs" />
+    <Compile Include="Geometry\PointTest.cs" />
+    <Compile Include="Geometry\PolygonTest.cs" />
+    <Compile Include="IO\WKBWriterTest.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
+      <Project>{EFA25023-CF6A-4FF7-8C42-B24D7F9509E1}</Project>
+      <Name>Core.Common.TestUtils</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.SharpMap.Api\Core.GIS.SharpMap.Api.csproj">
+      <Project>{a3c9df74-978a-44b1-b55d-a72ac4221e3a}</Project>
+      <Name>Core.GIS.SharpMap.Api</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.SharpMap\Core.GIS.SharpMap.csproj">
+      <Project>{C83777FC-AABB-47D9-911F-D76255D4D541}</Project>
+      <Name>Core.GIS.SharpMap</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
+      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
+      <Name>Core.Common.Utils</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.GeoAPI.Extensions\Core.GIS.GeoAPI.Extensions.csproj">
+      <Project>{016DBD27-99BF-489A-81B5-50D66964BB90}</Project>
+      <Name>Core.GIS.GeoAPI.Extensions</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.GeoAPI\Core.GIS.GeoAPI.csproj">
+      <Project>{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}</Project>
+      <Name>Core.GIS.GeoAPI</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.NetTopologySuite\Core.GIS.NetTopologySuite.csproj">
+      <Project>{5770DAA9-84E5-4770-AF43-F6B815894368}</Project>
+      <Name>Core.GIS.NetTopologySuite</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Core.GIS.SharpMapTestUtils\Core.GIS.SharpMapTestUtils.csproj">
+      <Project>{0A82E7D2-26F8-4A30-9787-7EEABCD7F470}</Project>
+      <Name>Core.GIS.SharpMapTestUtils</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{B4F97281-0DBD-4835-9ED8-7DFB966E87FF}" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\..\..\..\build\Ringtoets.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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <PropertyGroup>
+  </PropertyGroup>
+  <ProjectExtensions>
+    <MonoDevelop>
+      <Properties InternalTargetFrameworkVersion="3.5" />
+    </MonoDevelop>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file
Fisheye: Tag 41c77f9f36ae74a406fd382187426cc06d2b0200 refers to a dead (removed) revision in file `Core/GIS/test/Core.GIS.NetTopologySuite.Test/Core.GIS.NetTopologySuite.Tests.csproj'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/GIS/test/Core.GIS.NetTopologySuite.Test/Geometry/GeometryTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.NetTopologySuite.Test/Geometry/GeometryTest.cs	(.../GeometryTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.NetTopologySuite.Test/Geometry/GeometryTest.cs	(.../GeometryTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -7,7 +7,7 @@
 using Core.GIS.SharpMap.CoordinateSystems.Transformations;
 using NUnit.Framework;
 
-namespace Core.GIS.NetTopologySuite.Tests.Geometry
+namespace Core.GIS.NetTopologySuite.Test.Geometry
 {
     [TestFixture]
     public class GeometryTest
Index: Core/GIS/test/Core.GIS.NetTopologySuite.Test/Geometry/LineStringTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.NetTopologySuite.Test/Geometry/LineStringTest.cs	(.../LineStringTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.NetTopologySuite.Test/Geometry/LineStringTest.cs	(.../LineStringTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,7 +2,7 @@
 using Core.GIS.NetTopologySuite.Geometries;
 using NUnit.Framework;
 
-namespace Core.GIS.NetTopologySuite.Tests.Geometry
+namespace Core.GIS.NetTopologySuite.Test.Geometry
 {
     [TestFixture]
     public class LineStringTest
Index: Core/GIS/test/Core.GIS.NetTopologySuite.Test/Geometry/MultiPointTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.NetTopologySuite.Test/Geometry/MultiPointTest.cs	(.../MultiPointTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.NetTopologySuite.Test/Geometry/MultiPointTest.cs	(.../MultiPointTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,7 +2,7 @@
 using Core.GIS.NetTopologySuite.Geometries;
 using NUnit.Framework;
 
-namespace Core.GIS.NetTopologySuite.Tests.Geometry
+namespace Core.GIS.NetTopologySuite.Test.Geometry
 {
     [TestFixture]
     public class MultiPointTest
Index: Core/GIS/test/Core.GIS.NetTopologySuite.Test/Geometry/PointTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.NetTopologySuite.Test/Geometry/PointTest.cs	(.../PointTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.NetTopologySuite.Test/Geometry/PointTest.cs	(.../PointTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,7 +1,7 @@
 using Core.GIS.NetTopologySuite.Geometries;
 using NUnit.Framework;
 
-namespace Core.GIS.NetTopologySuite.Tests.Geometry
+namespace Core.GIS.NetTopologySuite.Test.Geometry
 {
     [TestFixture]
     public class PointTest
Index: Core/GIS/test/Core.GIS.NetTopologySuite.Test/Geometry/PolygonTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.NetTopologySuite.Test/Geometry/PolygonTest.cs	(.../PolygonTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.NetTopologySuite.Test/Geometry/PolygonTest.cs	(.../PolygonTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,7 +2,7 @@
 using Core.GIS.NetTopologySuite.Geometries;
 using NUnit.Framework;
 
-namespace Core.GIS.NetTopologySuite.Tests.Geometry
+namespace Core.GIS.NetTopologySuite.Test.Geometry
 {
     [TestFixture]
     public class PolygonTest
Index: Core/GIS/test/Core.GIS.NetTopologySuite.Test/IO/WKBWriterTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.NetTopologySuite.Test/IO/WKBWriterTest.cs	(.../WKBWriterTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.NetTopologySuite.Test/IO/WKBWriterTest.cs	(.../WKBWriterTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -4,7 +4,7 @@
 using Core.GIS.NetTopologySuite.IO;
 using NUnit.Framework;
 
-namespace Core.GIS.NetTopologySuite.Tests.IO
+namespace Core.GIS.NetTopologySuite.Test.IO
 {
     [TestFixture]
     public class WKBWriterTest
Index: Core/GIS/test/Core.GIS.NetTopologySuite.Test/Properties/AssemblyInfo.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.NetTopologySuite.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.NetTopologySuite.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -5,11 +5,11 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 
-[assembly: AssemblyTitle("NetTopologySuite.Tests")]
+[assembly: AssemblyTitle("NetTopologySuite.Test")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Deltares")]
-[assembly: AssemblyProduct("NetTopologySuite.Tests")]
+[assembly: AssemblyProduct("NetTopologySuite.Test")]
 [assembly: AssemblyCopyright("Copyright © Deltares 2008")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
Index: Core/GIS/test/Core.GIS.SharpMap.Extensions.Test/CoordinateSystems/GeodeticDistanceTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Extensions.Test/CoordinateSystems/GeodeticDistanceTest.cs	(.../GeodeticDistanceTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Extensions.Test/CoordinateSystems/GeodeticDistanceTest.cs	(.../GeodeticDistanceTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -3,7 +3,7 @@
 using Core.GIS.SharpMap.Extensions.CoordinateSystems;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.Extensions.Tests.CoordinateSystems
+namespace Core.GIS.SharpMap.Extensions.Test.CoordinateSystems
 {
     [TestFixture]
     public class GeodeticDistanceTest
Index: Core/GIS/test/Core.GIS.SharpMap.Extensions.Test/Core.GIS.SharpMap.Extensions.Test.csproj
===================================================================
diff -u
--- Core/GIS/test/Core.GIS.SharpMap.Extensions.Test/Core.GIS.SharpMap.Extensions.Test.csproj	(revision 0)
+++ Core/GIS/test/Core.GIS.SharpMap.Extensions.Test/Core.GIS.SharpMap.Extensions.Test.csproj	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{9A1F1308-F324-4905-A52A-6D718825960E}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Core.GIS.SharpMap.Extensions.Test</RootNamespace>
+    <AssemblyName>Core.GIS.SharpMap.Extensions.Test</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <StartupObject>
+    </StartupObject>
+    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <WarningLevel>0</WarningLevel>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\Release\</OutputPath>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <WarningLevel>0</WarningLevel>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CreateInstallerWithDemoProject|x86'">
+    <OutputPath>bin\CreateInstallerWithDemoProject\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <WarningLevel>0</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="BruTile">
+      <HintPath>..\..\..\..\packages\BruTile.0.12.0\lib\net40\BruTile.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="CoordinateSystems\GeodeticDistanceTest.cs" />
+    <Compile Include="Layers\BingLayerTest.cs" />
+    <Compile Include="Layers\DeltaresOpenDapDdbTileServerTest.cs" />
+    <Compile Include="Layers\OpenStreetMapLayerTest.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </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.Utils\Core.Common.Utils.csproj">
+      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
+      <Name>Core.Common.Utils</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.GeoAPI\Core.GIS.GeoAPI.csproj">
+      <Project>{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}</Project>
+      <Name>Core.GIS.GeoAPI</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\GIS\src\Core.GIS.NetTopologySuite\Core.GIS.NetTopologySuite.csproj">
+      <Project>{5770DAA9-84E5-4770-AF43-F6B815894368}</Project>
+      <Name>Core.GIS.NetTopologySuite</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.SharpMap.Api\Core.GIS.SharpMap.Api.csproj">
+      <Project>{a3c9df74-978a-44b1-b55d-a72ac4221e3a}</Project>
+      <Name>Core.GIS.SharpMap.Api</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.SharpMap.Extensions\Core.GIS.SharpMap.Extensions.csproj">
+      <Project>{A4140C12-53F5-438C-8D24-9E48C504FECF}</Project>
+      <Name>Core.GIS.SharpMap.Extensions</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.SharpMap.UI\Core.GIS.SharpMap.UI.csproj">
+      <Project>{DD1CC1DB-4BF9-4C88-A100-733D84795F3A}</Project>
+      <Name>Core.GIS.SharpMap.UI</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.SharpMap\Core.GIS.SharpMap.csproj">
+      <Project>{C83777FC-AABB-47D9-911F-D76255D4D541}</Project>
+      <Name>Core.GIS.SharpMap</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
+      <Project>{EFA25023-CF6A-4FF7-8C42-B24D7F9509E1}</Project>
+      <Name>Core.Common.TestUtils</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <None Include="App.config" />
+    <EmbeddedResource Include="CoordinateSystems\Data\gcs.csv" />
+    <EmbeddedResource Include="CoordinateSystems\Data\pcs.csv" />
+    <None Include="CoordinateSystems\Data\esri_extra.csv" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\..\..\..\build\Ringtoets.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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <PropertyGroup>
+    <ExternalDependencies>lib\Common\SharpMap.Extensions\**</ExternalDependencies>
+  </PropertyGroup>
+  <ProjectExtensions>
+    <MonoDevelop>
+      <Properties InternalTargetFrameworkVersion="3.5" />
+    </MonoDevelop>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file
Fisheye: Tag 41c77f9f36ae74a406fd382187426cc06d2b0200 refers to a dead (removed) revision in file `Core/GIS/test/Core.GIS.SharpMap.Extensions.Test/Core.GIS.SharpMap.Extensions.Tests.csproj'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/GIS/test/Core.GIS.SharpMap.Extensions.Test/Layers/BingLayerTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Extensions.Test/Layers/BingLayerTest.cs	(.../BingLayerTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Extensions.Test/Layers/BingLayerTest.cs	(.../BingLayerTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,7 +1,7 @@
 using Core.GIS.SharpMap.Extensions.Layers;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.Extensions.Tests.Layers
+namespace Core.GIS.SharpMap.Extensions.Test.Layers
 {
     [TestFixture]
     public class BingLayerTest
Index: Core/GIS/test/Core.GIS.SharpMap.Extensions.Test/Layers/DeltaresOpenDapDdbTileServerTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Extensions.Test/Layers/DeltaresOpenDapDdbTileServerTest.cs	(.../DeltaresOpenDapDdbTileServerTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Extensions.Test/Layers/DeltaresOpenDapDdbTileServerTest.cs	(.../DeltaresOpenDapDdbTileServerTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -3,7 +3,7 @@
 using Core.GIS.SharpMap.Extensions.Layers;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.Extensions.Tests.Layers
+namespace Core.GIS.SharpMap.Extensions.Test.Layers
 {
     [TestFixture]
     public class DeltaresOpenDapDdbTileServerTest
Index: Core/GIS/test/Core.GIS.SharpMap.Extensions.Test/Layers/OpenStreetMapLayerTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Extensions.Test/Layers/OpenStreetMapLayerTest.cs	(.../OpenStreetMapLayerTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Extensions.Test/Layers/OpenStreetMapLayerTest.cs	(.../OpenStreetMapLayerTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,7 +1,7 @@
 using Core.GIS.SharpMap.Extensions.Layers;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.Extensions.Tests.Layers
+namespace Core.GIS.SharpMap.Extensions.Test.Layers
 {
     [TestFixture]
     public class OpenStreetMapLayerTest
Index: Core/GIS/test/Core.GIS.SharpMap.Extensions.Test/Properties/AssemblyInfo.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Extensions.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Extensions.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -6,11 +6,11 @@
 using System.Runtime.InteropServices;
 using NUnit.Framework;
 
-[assembly: AssemblyTitle("SharpMap.Extensions.Tests")]
+[assembly: AssemblyTitle("SharpMap.Extensions.Test")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Deltares")]
-[assembly: AssemblyProduct("SharpMap.Extensions.Tests")]
+[assembly: AssemblyProduct("SharpMap.Extensions.Test")]
 [assembly: AssemblyCopyright("Copyright © Deltares 2010")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
Index: Core/GIS/test/Core.GIS.SharpMap.Extensions.Test/Properties/Resources.Designer.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Extensions.Test/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Extensions.Test/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Core.GIS.SharpMap.Extensions.Tests.Properties {
+namespace Core.GIS.SharpMap.Extensions.Test.Properties {
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -36,7 +36,7 @@
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Core.GIS.SharpMap.Extensions.Tests.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Core.GIS.SharpMap.Extensions.Test.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
@@ -58,15 +58,15 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to #
-        /// # This file derived from a subset of definitions from the &quot;epsg&quot; directory
-        /// # distributed with ArcGIS.  This file only contains definitions that aren&apos;t
-        /// # real EPSG definitions.  The definitions were &quot;morphed&quot; into OGR WKT format,
-        /// # and the authority clause added during processing. 
-        /// #
-        /// # NOTE: I&apos;m not too clear on what version of ArcGIS these definitions were
-        /// # derived from. 
-        /// #
+        ///   Looks up a localized string similar to #
+        /// # This file derived from a subset of definitions from the &quot;epsg&quot; directory
+        /// # distributed with ArcGIS.  This file only contains definitions that aren&apos;t
+        /// # real EPSG definitions.  The definitions were &quot;morphed&quot; into OGR WKT format,
+        /// # and the authority clause added during processing. 
+        /// #
+        /// # NOTE: I&apos;m not too clear on what version of ArcGIS these definitions were
+        /// # derived from. 
+        /// #
         /// 31491,PROJCS[&quot;Germany_Zone_1&quot;,GEOGCS[&quot;GCS_Deutsches_Hauptdreiecksnetz&quot;,DATUM[&quot;D_Deutsches_Hauptdreiecksnetz&quot;,SPHEROID[&quot;Bessel_1841&quot;, [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string esri_extra {
@@ -76,10 +76,10 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to &quot;COORD_REF_SYS_CODE&quot;,&quot;COORD_REF_SYS_NAME&quot;,&quot;DATUM_CODE&quot;,&quot;DATUM_NAME&quot;,&quot;GREENWICH_DATUM&quot;,&quot;UOM_CODE&quot;,&quot;ELLIPSOID_CODE&quot;,&quot;PRIME_MERIDIAN_CODE&quot;,&quot;SHOW_CRS&quot;,&quot;DEPRECATED&quot;,&quot;COORD_SYS_CODE&quot;,&quot;COORD_OP_METHOD_CODE&quot;,&quot;DX&quot;,&quot;DY&quot;,&quot;DZ&quot;,&quot;RX&quot;,&quot;RY&quot;,&quot;RZ&quot;,&quot;DS&quot;
-        /// 3819,HD1909,1024,Hungarian Datum 1909,1024,9122,7004,8901,1,0,6422,9607,595.48,121.69,515.35,-4.115,2.9383,-0.853,-3.408
-        /// 3821,TWD67,1025,Taiwan Datum 1967,1025,9122,7050,8901,1,0,6422,,,,,,,,
-        /// 3824,TWD97,1026,Taiwan Datum 1997,1026,9122,7019,8901,1,0,6422,9603,0,0,0,,,,
+        ///   Looks up a localized string similar to &quot;COORD_REF_SYS_CODE&quot;,&quot;COORD_REF_SYS_NAME&quot;,&quot;DATUM_CODE&quot;,&quot;DATUM_NAME&quot;,&quot;GREENWICH_DATUM&quot;,&quot;UOM_CODE&quot;,&quot;ELLIPSOID_CODE&quot;,&quot;PRIME_MERIDIAN_CODE&quot;,&quot;SHOW_CRS&quot;,&quot;DEPRECATED&quot;,&quot;COORD_SYS_CODE&quot;,&quot;COORD_OP_METHOD_CODE&quot;,&quot;DX&quot;,&quot;DY&quot;,&quot;DZ&quot;,&quot;RX&quot;,&quot;RY&quot;,&quot;RZ&quot;,&quot;DS&quot;
+        /// 3819,HD1909,1024,Hungarian Datum 1909,1024,9122,7004,8901,1,0,6422,9607,595.48,121.69,515.35,-4.115,2.9383,-0.853,-3.408
+        /// 3821,TWD67,1025,Taiwan Datum 1967,1025,9122,7050,8901,1,0,6422,,,,,,,,
+        /// 3824,TWD97,1026,Taiwan Datum 1997,1026,9122,7019,8901,1,0,6422,9603,0,0,0,,,,
         /// 3889,IG [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string gcs {
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Converters/WKB/WKBTests.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Converters/WKB/WKBTests.cs	(.../WKBTests.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Converters/WKB/WKBTests.cs	(.../WKBTests.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -3,7 +3,7 @@
 using Core.GIS.SharpMap.Converters.WellKnownText;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.Tests.Converters.WKB
+namespace Core.GIS.SharpMap.Test.Converters.WKB
 {
     [TestFixture]
     public class WKBTests
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Converters/WKT/WktGeometryTests.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Converters/WKT/WktGeometryTests.cs	(.../WktGeometryTests.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Converters/WKT/WktGeometryTests.cs	(.../WktGeometryTests.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -3,7 +3,7 @@
 using Core.GIS.SharpMap.Converters.WellKnownText;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.Tests.Converters.WKT
+namespace Core.GIS.SharpMap.Test.Converters.WKT
 {
     [TestFixture]
     public class WktGeometryTests
Index: Core/GIS/test/Core.GIS.SharpMap.Test/CoordinateSystems/CoordinateSystemValidatorTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/CoordinateSystems/CoordinateSystemValidatorTest.cs	(.../CoordinateSystemValidatorTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/CoordinateSystems/CoordinateSystemValidatorTest.cs	(.../CoordinateSystemValidatorTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -3,7 +3,7 @@
 using Core.GIS.SharpMap.Extensions.CoordinateSystems;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.Tests.CoordinateSystems
+namespace Core.GIS.SharpMap.Test.CoordinateSystems
 {
     [TestFixture]
     public class CoordinateSystemValidatorTest
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Core.GIS.SharpMap.Test.csproj
===================================================================
diff -u
--- Core/GIS/test/Core.GIS.SharpMap.Test/Core.GIS.SharpMap.Test.csproj	(revision 0)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Core.GIS.SharpMap.Test.csproj	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{0C76DD99-AC5D-47C0-B76F-CE70092A9AC7}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Core.GIS.SharpMap.Test</RootNamespace>
+    <AssemblyName>Core.GIS.SharpMap.Test</AssemblyName>
+    <StartupObject>
+    </StartupObject>
+    <SccProjectName>
+    </SccProjectName>
+    <SccLocalPath>
+    </SccLocalPath>
+    <SccAuxPath>
+    </SccAuxPath>
+    <SccProvider>
+    </SccProvider>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <WarningLevel>0</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\Release\</OutputPath>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <WarningLevel>0</WarningLevel>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CreateInstallerWithDemoProject|x86'">
+    <OutputPath>bin\CreateInstallerWithDemoProject\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <WarningLevel>0</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\..\..\..\build\Ringtoets.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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <ItemGroup>
+    <Reference Include="log4net, Version=1.2.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\log4net.2.0.4\lib\net40-full\log4net.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\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">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Converters\WKB\WKBTests.cs" />
+    <Compile Include="Converters\WKT\WktGeometryTests.cs" />
+    <Compile Include="CoordinateSystems\CoordinateSystemValidatorTest.cs" />
+    <Compile Include="Data\FeatureDataRowAttributeAccessorTest.cs" />
+    <Compile Include="Data\FeatureDataSetTest.cs" />
+    <Compile Include="Data\Providers\DataTableFeatureProviderTest.cs" />
+    <Compile Include="Data\Providers\FeatureCollectionTest.cs" />
+    <Compile Include="Data\Providers\FeatureProviderTest.cs">
+    </Compile>
+    <Compile Include="Data\Providers\GeometryProviderTest.cs">
+    </Compile>
+    <Compile Include="Data\Providers\QuadTreeTest.cs" />
+    <Compile Include="Data\Providers\ShapeFileTests.cs" />
+    <Compile Include="Editors\FallOff\LinearFallOffPolicyTest.cs" />
+    <Compile Include="Editors\FallOff\NoFallOffPolicyTest.cs" />
+    <Compile Include="Editors\FallOff\RingFallOffPolicyTest.cs" />
+    <Compile Include="Editors\FeatureInteractorTest.cs" />
+    <Compile Include="Editors\LineStringInteractorTest.cs" />
+    <Compile Include="Editors\PointFeaureEditorTest.cs" />
+    <Compile Include="Editors\Snapping\SnapStrategyTest.cs" />
+    <Compile Include="Layers\GroupLayerTest.cs" />
+    <Compile Include="Layers\LabelLayerTest.cs" />
+    <Compile Include="Layers\LayerTest.cs" />
+    <Compile Include="Layers\VectorLayerTest.cs" />
+    <Compile Include="MapTest.cs">
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\MapHelperTest.cs" />
+    <Compile Include="Rendering\Thematics\CategorialThemeItemTest.cs" />
+    <Compile Include="Rendering\Thematics\CategorialThemeTest.cs" />
+    <Compile Include="Rendering\Thematics\ColorBlendTest.cs" />
+    <Compile Include="Rendering\Thematics\CustomThemeTest.cs" />
+    <Compile Include="Rendering\Thematics\GradientThemeItemTest.cs" />
+    <Compile Include="Rendering\Thematics\GradientThemeTest.cs" />
+    <Compile Include="Rendering\VectorRenderingHelperTest.cs" />
+  </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.Utils\Core.Common.Utils.csproj">
+      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
+      <Name>Core.Common.Utils</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.GeoAPI.Extensions\Core.GIS.GeoAPI.Extensions.csproj">
+      <Project>{016DBD27-99BF-489A-81B5-50D66964BB90}</Project>
+      <Name>Core.GIS.GeoAPI.Extensions</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.GeoAPI\Core.GIS.GeoAPI.csproj">
+      <Project>{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}</Project>
+      <Name>Core.GIS.GeoAPI</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.NetTopologySuite.Extensions\Core.GIS.NetTopologySuite.Extensions.csproj">
+      <Project>{8A3636FB-31B4-4F4B-9165-F718F87A92DF}</Project>
+      <Name>Core.GIS.NetTopologySuite.Extensions</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\GIS\src\Core.GIS.NetTopologySuite\Core.GIS.NetTopologySuite.csproj">
+      <Project>{5770DAA9-84E5-4770-AF43-F6B815894368}</Project>
+      <Name>Core.GIS.NetTopologySuite</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.SharpMap.Api\Core.GIS.SharpMap.Api.csproj">
+      <Project>{A3C9DF74-978A-44B1-B55D-A72AC4221E3A}</Project>
+      <Name>Core.GIS.SharpMap.Api</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.SharpMap.Extensions\Core.GIS.SharpMap.Extensions.csproj">
+      <Project>{A4140C12-53F5-438C-8D24-9E48C504FECF}</Project>
+      <Name>Core.GIS.SharpMap.Extensions</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.SharpMap.UI\Core.GIS.SharpMap.UI.csproj">
+      <Project>{DD1CC1DB-4BF9-4C88-A100-733D84795F3A}</Project>
+      <Name>Core.GIS.SharpMap.UI</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.SharpMap\Core.GIS.SharpMap.csproj">
+      <Project>{C83777FC-AABB-47D9-911F-D76255D4D541}</Project>
+      <Name>Core.GIS.SharpMap</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Core.GIS.SharpMapTestUtils\Core.GIS.SharpMapTestUtils.csproj">
+      <Project>{0A82E7D2-26F8-4A30-9787-7EEABCD7F470}</Project>
+      <Name>Core.GIS.SharpMapTestUtils</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
+      <Project>{EFA25023-CF6A-4FF7-8C42-B24D7F9509E1}</Project>
+      <Name>Core.Common.TestUtils</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <PropertyGroup>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ExternalDependencies>lib\Common\SharpMap.Extensions</ExternalDependencies>
+    <ExternalDependencies1>lib\Common\SharpMap\**</ExternalDependencies1>
+  </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{B4F97281-0DBD-4835-9ED8-7DFB966E87FF}" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <PropertyGroup>
+  </PropertyGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+    <None Include="Resources\noordpijl.png" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
Fisheye: Tag 41c77f9f36ae74a406fd382187426cc06d2b0200 refers to a dead (removed) revision in file `Core/GIS/test/Core.GIS.SharpMap.Test/Core.GIS.SharpMap.Tests.csproj'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Data/FeatureDataRowAttributeAccessorTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Data/FeatureDataRowAttributeAccessorTest.cs	(.../FeatureDataRowAttributeAccessorTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Data/FeatureDataRowAttributeAccessorTest.cs	(.../FeatureDataRowAttributeAccessorTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,7 +1,7 @@
 using Core.GIS.SharpMap.Data;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.Tests.Data
+namespace Core.GIS.SharpMap.Test.Data
 {
     [TestFixture]
     public class FeatureDataRowAttributeAccessorTest
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Data/FeatureDataSetTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Data/FeatureDataSetTest.cs	(.../FeatureDataSetTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Data/FeatureDataSetTest.cs	(.../FeatureDataSetTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -3,7 +3,7 @@
 using Core.GIS.SharpMap.Data;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.Tests.Data
+namespace Core.GIS.SharpMap.Test.Data
 {
     [TestFixture]
     public class FeatureDataSetTest
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/DataTableFeatureProviderTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/DataTableFeatureProviderTest.cs	(.../DataTableFeatureProviderTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/DataTableFeatureProviderTest.cs	(.../DataTableFeatureProviderTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -3,7 +3,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Core.GIS.SharpMap.Tests.Data.Providers
+namespace Core.GIS.SharpMap.Test.Data.Providers
 {
     [TestFixture]
     public class DataTableFeatureProviderTest
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/FeatureCollectionTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/FeatureCollectionTest.cs	(.../FeatureCollectionTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/FeatureCollectionTest.cs	(.../FeatureCollectionTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -10,7 +10,7 @@
 using Core.GIS.SharpMap.Data.Providers;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.Tests.Data.Providers
+namespace Core.GIS.SharpMap.Test.Data.Providers
 {
     [TestFixture]
     public class FeatureCollectionTest
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/FeatureProviderTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/FeatureProviderTest.cs	(.../FeatureProviderTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/FeatureProviderTest.cs	(.../FeatureProviderTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -6,7 +6,7 @@
 using Core.GIS.SharpMapTestUtils.TestClasses;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.Tests.Data.Providers
+namespace Core.GIS.SharpMap.Test.Data.Providers
 {
     [TestFixture]
     public class FeatureProviderTest
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/GeometryProviderTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/GeometryProviderTest.cs	(.../GeometryProviderTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/GeometryProviderTest.cs	(.../GeometryProviderTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -6,7 +6,7 @@
 using Core.GIS.SharpMap.Layers;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.Tests.Data.Providers
+namespace Core.GIS.SharpMap.Test.Data.Providers
 {
     [TestFixture]
     public class GeometryProviderTest
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/QuadTreeTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/QuadTreeTest.cs	(.../QuadTreeTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/QuadTreeTest.cs	(.../QuadTreeTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -5,7 +5,7 @@
 using Core.GIS.SharpMap.Data.Providers.EGIS.ShapeFileLib;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.Tests.Data.Providers
+namespace Core.GIS.SharpMap.Test.Data.Providers
 {
     [TestFixture]
     public class QuadTreeTest
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/ShapeFileTests.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/ShapeFileTests.cs	(.../ShapeFileTests.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/ShapeFileTests.cs	(.../ShapeFileTests.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -4,7 +4,7 @@
 using Core.GIS.SharpMap.Data.Providers;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.Tests.Data.Providers
+namespace Core.GIS.SharpMap.Test.Data.Providers
 {
     [TestFixture]
     public class ShapeFileTests
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Editors/FallOff/LinearFallOffPolicyTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Editors/FallOff/LinearFallOffPolicyTest.cs	(.../LinearFallOffPolicyTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Editors/FallOff/LinearFallOffPolicyTest.cs	(.../LinearFallOffPolicyTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -4,7 +4,7 @@
 using Core.GIS.SharpMap.Editors.FallOff;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.Tests.Editors.FallOff
+namespace Core.GIS.SharpMap.Test.Editors.FallOff
 {
     [TestFixture]
     public class LinearFallOffPolicyTest
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Editors/FallOff/NoFallOffPolicyTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Editors/FallOff/NoFallOffPolicyTest.cs	(.../NoFallOffPolicyTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Editors/FallOff/NoFallOffPolicyTest.cs	(.../NoFallOffPolicyTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -9,7 +9,7 @@
 using NUnit.Framework;
 using Assert = NUnit.Framework.Assert;
 
-namespace Core.GIS.SharpMap.Tests.Editors.FallOff
+namespace Core.GIS.SharpMap.Test.Editors.FallOff
 {
     [TestFixture]
     public class NoFallOffPolicyTest
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Editors/FallOff/RingFallOffPolicyTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Editors/FallOff/RingFallOffPolicyTest.cs	(.../RingFallOffPolicyTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Editors/FallOff/RingFallOffPolicyTest.cs	(.../RingFallOffPolicyTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -4,7 +4,7 @@
 using Core.GIS.SharpMap.Editors.FallOff;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.Tests.Editors.FallOff
+namespace Core.GIS.SharpMap.Test.Editors.FallOff
 {
     [TestFixture]
     public class RingFallOffPolicyTest
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Editors/FeatureInteractorTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Editors/FeatureInteractorTest.cs	(.../FeatureInteractorTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Editors/FeatureInteractorTest.cs	(.../FeatureInteractorTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -5,7 +5,7 @@
 using Core.GIS.SharpMap.Styles;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.Tests.Editors
+namespace Core.GIS.SharpMap.Test.Editors
 {
     [TestFixture]
     public class FeatureInteractorTest
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Editors/LineStringInteractorTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Editors/LineStringInteractorTest.cs	(.../LineStringInteractorTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Editors/LineStringInteractorTest.cs	(.../LineStringInteractorTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -10,7 +10,7 @@
 using Core.GIS.SharpMapTestUtils.TestClasses;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.Tests.Editors
+namespace Core.GIS.SharpMap.Test.Editors
 {
     /// <summary>
     /// For more basec test of FeatureMutator please refer to PointInteractorTest
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Editors/PointFeaureEditorTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Editors/PointFeaureEditorTest.cs	(.../PointFeaureEditorTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Editors/PointFeaureEditorTest.cs	(.../PointFeaureEditorTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -9,7 +9,7 @@
 using NUnit.Framework;
 using Point = Core.GIS.NetTopologySuite.Geometries.Point;
 
-namespace Core.GIS.SharpMap.Tests.Editors
+namespace Core.GIS.SharpMap.Test.Editors
 {
     [TestFixture]
     public class PointInteractorTest
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Editors/Snapping/SnapStrategyTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Editors/Snapping/SnapStrategyTest.cs	(.../SnapStrategyTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Editors/Snapping/SnapStrategyTest.cs	(.../SnapStrategyTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -9,7 +9,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Core.GIS.SharpMap.Tests.Editors.Snapping
+namespace Core.GIS.SharpMap.Test.Editors.Snapping
 {
     [TestFixture]
     public class SnapStrategyTest
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Layers/GroupLayerTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Layers/GroupLayerTest.cs	(.../GroupLayerTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Layers/GroupLayerTest.cs	(.../GroupLayerTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -5,7 +5,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Core.GIS.SharpMap.Tests.Layers
+namespace Core.GIS.SharpMap.Test.Layers
 {
     [TestFixture]
     public class GroupLayerTest
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Layers/LabelLayerTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Layers/LabelLayerTest.cs	(.../LabelLayerTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Layers/LabelLayerTest.cs	(.../LabelLayerTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -6,7 +6,7 @@
 using NUnit.Framework;
 using Point = Core.GIS.NetTopologySuite.Geometries.Point;
 
-namespace Core.GIS.SharpMap.Tests.Layers
+namespace Core.GIS.SharpMap.Test.Layers
 {
     [TestFixture]
     public class LabelLayerTest
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Layers/LayerTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Layers/LayerTest.cs	(.../LayerTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Layers/LayerTest.cs	(.../LayerTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -5,7 +5,7 @@
 using Core.GIS.SharpMap.Rendering.Thematics;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.Tests.Layers
+namespace Core.GIS.SharpMap.Test.Layers
 {
     [TestFixture]
     public class LayerTest
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Layers/VectorLayerTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Layers/VectorLayerTest.cs	(.../VectorLayerTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Layers/VectorLayerTest.cs	(.../VectorLayerTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -13,7 +13,7 @@
 using Core.GIS.SharpMap.Styles;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.Tests.Layers
+namespace Core.GIS.SharpMap.Test.Layers
 {
     [TestFixture]
     public class VectorLayerTest
Index: Core/GIS/test/Core.GIS.SharpMap.Test/MapTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/MapTest.cs	(.../MapTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/MapTest.cs	(.../MapTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -20,7 +20,7 @@
 using Rhino.Mocks;
 using GeometryFactory = Core.GIS.SharpMap.Converters.Geometries.GeometryFactory;
 
-namespace Core.GIS.SharpMap.Tests
+namespace Core.GIS.SharpMap.Test
 {
     [TestFixture]
     public class MapTest
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Properties/AssemblyInfo.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -6,11 +6,11 @@
 using System.Runtime.InteropServices;
 using NUnit.Framework;
 
-[assembly: AssemblyTitle("SharpMap.Tests")]
+[assembly: AssemblyTitle("SharpMap.Test")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Deltares")]
-[assembly: AssemblyProduct("SharpMap.Tests")]
+[assembly: AssemblyProduct("SharpMap.Test")]
 [assembly: AssemblyCopyright("Copyright © Deltares 2008")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Properties/Resources.Designer.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Core.GIS.SharpMap.Tests.Properties {
+namespace Core.GIS.SharpMap.Test.Properties {
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -36,7 +36,7 @@
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Core.GIS.SharpMap.Tests.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Core.GIS.SharpMap.Test.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/MapHelperTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/MapHelperTest.cs	(.../MapHelperTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/MapHelperTest.cs	(.../MapHelperTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -3,7 +3,7 @@
 using Core.GIS.SharpMap.Rendering;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.Tests.Rendering
+namespace Core.GIS.SharpMap.Test.Rendering
 {
     [TestFixture]
     public class MapHelperTest
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/Thematics/CategorialThemeItemTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/Thematics/CategorialThemeItemTest.cs	(.../CategorialThemeItemTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/Thematics/CategorialThemeItemTest.cs	(.../CategorialThemeItemTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -4,7 +4,7 @@
 using Core.GIS.SharpMap.Styles;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.Tests.Rendering.Thematics
+namespace Core.GIS.SharpMap.Test.Rendering.Thematics
 {
     [TestFixture]
     public class CategorialThemeItemTest
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/Thematics/CategorialThemeTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/Thematics/CategorialThemeTest.cs	(.../CategorialThemeTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/Thematics/CategorialThemeTest.cs	(.../CategorialThemeTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -7,7 +7,7 @@
 using Core.GIS.SharpMap.Styles;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.Tests.Rendering.Thematics
+namespace Core.GIS.SharpMap.Test.Rendering.Thematics
 {
     [TestFixture]
     public class CategorialThemeTest
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/Thematics/ColorBlendTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/Thematics/ColorBlendTest.cs	(.../ColorBlendTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/Thematics/ColorBlendTest.cs	(.../ColorBlendTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,7 +1,7 @@
 using Core.GIS.SharpMap.Rendering.Thematics;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.Tests.Rendering.Thematics
+namespace Core.GIS.SharpMap.Test.Rendering.Thematics
 {
     [TestFixture]
     public class ColorBlendTest
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/Thematics/CustomThemeTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/Thematics/CustomThemeTest.cs	(.../CustomThemeTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/Thematics/CustomThemeTest.cs	(.../CustomThemeTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -4,7 +4,7 @@
 using Core.GIS.SharpMap.Styles;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.Tests.Rendering.Thematics
+namespace Core.GIS.SharpMap.Test.Rendering.Thematics
 {
     [TestFixture]
     public class CustomThemeTest
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/Thematics/GradientThemeItemTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/Thematics/GradientThemeItemTest.cs	(.../GradientThemeItemTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/Thematics/GradientThemeItemTest.cs	(.../GradientThemeItemTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -4,7 +4,7 @@
 using Core.GIS.SharpMap.Styles;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.Tests.Rendering.Thematics
+namespace Core.GIS.SharpMap.Test.Rendering.Thematics
 {
     [TestFixture]
     public class GradientThemeItemTest
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/Thematics/GradientThemeTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/Thematics/GradientThemeTest.cs	(.../GradientThemeTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/Thematics/GradientThemeTest.cs	(.../GradientThemeTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -7,7 +7,7 @@
 using Core.GIS.SharpMap.Styles;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.Tests.Rendering.Thematics
+namespace Core.GIS.SharpMap.Test.Rendering.Thematics
 {
     [TestFixture]
     public class GradientThemeTest
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/VectorRenderingHelperTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/VectorRenderingHelperTest.cs	(.../VectorRenderingHelperTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/VectorRenderingHelperTest.cs	(.../VectorRenderingHelperTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -4,7 +4,7 @@
 using Core.GIS.SharpMap.Rendering;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.Tests.Rendering
+namespace Core.GIS.SharpMap.Test.Rendering
 {
     [TestFixture]
     public class VectorRenderingHelperTest
Index: Core/GIS/test/Core.GIS.SharpMap.UI.Test/Core.GIS.SharpMap.UI.Test.csproj
===================================================================
diff -u
--- Core/GIS/test/Core.GIS.SharpMap.UI.Test/Core.GIS.SharpMap.UI.Test.csproj	(revision 0)
+++ Core/GIS/test/Core.GIS.SharpMap.UI.Test/Core.GIS.SharpMap.UI.Test.csproj	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{93708508-7B00-4A26-80DA-C73A7251BCF6}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Core.GIS.SharpMap.UI.Test</RootNamespace>
+    <AssemblyName>Core.GIS.SharpMap.UI.Test</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <WarningLevel>0</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\Release\</OutputPath>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <WarningLevel>0</WarningLevel>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CreateInstallerWithDemoProject|x86'">
+    <OutputPath>bin\CreateInstallerWithDemoProject\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <WarningLevel>0</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="log4net, Version=1.2.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\log4net.2.0.4\lib\net40-full\log4net.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\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">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Forms\GeometryEditorTests.cs">
+    </Compile>
+    <Compile Include="Forms\MapControlTest.cs" />
+    <Compile Include="Helpers\MapCursorsTest.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Tools\CurvePointToolTest.cs" />
+    <Compile Include="Tools\DeleteToolTest.cs" />
+    <Compile Include="Tools\SelectToolTest.cs" />
+    <Compile Include="Tools\ZoomHistoryTest.cs" />
+  </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="..\..\src\Core.GIS.SharpMap.Api\Core.GIS.SharpMap.Api.csproj">
+      <Project>{A3C9DF74-978A-44B1-B55D-A72AC4221E3A}</Project>
+      <Name>Core.GIS.SharpMap.Api</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.SharpMap.Extensions\Core.GIS.SharpMap.Extensions.csproj">
+      <Project>{A4140C12-53F5-438C-8D24-9E48C504FECF}</Project>
+      <Name>Core.GIS.SharpMap.Extensions</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
+      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
+      <Name>Core.Common.Utils</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.GeoAPI.Extensions\Core.GIS.GeoAPI.Extensions.csproj">
+      <Project>{016DBD27-99BF-489A-81B5-50D66964BB90}</Project>
+      <Name>Core.GIS.GeoAPI.Extensions</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.GeoAPI\Core.GIS.GeoAPI.csproj">
+      <Project>{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}</Project>
+      <Name>Core.GIS.GeoAPI</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.NetTopologySuite.Extensions\Core.GIS.NetTopologySuite.Extensions.csproj">
+      <Project>{8A3636FB-31B4-4F4B-9165-F718F87A92DF}</Project>
+      <Name>Core.GIS.NetTopologySuite.Extensions</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\GIS\src\Core.GIS.NetTopologySuite\Core.GIS.NetTopologySuite.csproj">
+      <Project>{5770DAA9-84E5-4770-AF43-F6B815894368}</Project>
+      <Name>Core.GIS.NetTopologySuite</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.SharpMap.UI\Core.GIS.SharpMap.UI.csproj">
+      <Project>{DD1CC1DB-4BF9-4C88-A100-733D84795F3A}</Project>
+      <Name>Core.GIS.SharpMap.UI</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.SharpMap\Core.GIS.SharpMap.csproj">
+      <Project>{C83777FC-AABB-47D9-911F-D76255D4D541}</Project>
+      <Name>Core.GIS.SharpMap</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
+      <Project>{EFA25023-CF6A-4FF7-8C42-B24D7F9509E1}</Project>
+      <Name>Core.Common.TestUtils</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{B4F97281-0DBD-4835-9ED8-7DFB966E87FF}" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\..\..\..\build\Ringtoets.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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <PropertyGroup>
+    <ExternalDependencies>lib\Common\SharpMap.Extensions</ExternalDependencies>
+    <ExternalDependencies2>lib\Common\SharpMap\**</ExternalDependencies2>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ProjectExtensions>
+    <MonoDevelop>
+      <Properties InternalTargetFrameworkVersion="3.5" />
+    </MonoDevelop>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file
Fisheye: Tag 41c77f9f36ae74a406fd382187426cc06d2b0200 refers to a dead (removed) revision in file `Core/GIS/test/Core.GIS.SharpMap.UI.Test/Core.GIS.SharpMap.UI.Tests.csproj'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/GIS/test/Core.GIS.SharpMap.UI.Test/Forms/GeometryEditorTests.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.UI.Test/Forms/GeometryEditorTests.cs	(.../GeometryEditorTests.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.UI.Test/Forms/GeometryEditorTests.cs	(.../GeometryEditorTests.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -6,7 +6,7 @@
 using Core.GIS.SharpMap.UI.Tools.Zooming;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.UI.Tests.Forms
+namespace Core.GIS.SharpMap.UI.Test.Forms
 {
     [TestFixture]
     public class GeometryEditorTests
Index: Core/GIS/test/Core.GIS.SharpMap.UI.Test/Forms/MapControlTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.UI.Test/Forms/MapControlTest.cs	(.../MapControlTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.UI.Test/Forms/MapControlTest.cs	(.../MapControlTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -7,7 +7,7 @@
 using Core.GIS.SharpMap.UI.Forms;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.UI.Tests.Forms
+namespace Core.GIS.SharpMap.UI.Test.Forms
 {
     [TestFixture]
     public class MapControlTest
Index: Core/GIS/test/Core.GIS.SharpMap.UI.Test/Helpers/MapCursorsTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.UI.Test/Helpers/MapCursorsTest.cs	(.../MapCursorsTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.UI.Test/Helpers/MapCursorsTest.cs	(.../MapCursorsTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,7 +1,7 @@
 using Core.GIS.SharpMap.UI.Helpers;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.UI.Tests.Helpers
+namespace Core.GIS.SharpMap.UI.Test.Helpers
 {
     [TestFixture]
     public class MapCursorsTest
Index: Core/GIS/test/Core.GIS.SharpMap.UI.Test/Properties/AssemblyInfo.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.UI.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.UI.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -6,11 +6,11 @@
 using System.Runtime.InteropServices;
 using NUnit.Framework;
 
-[assembly: AssemblyTitle("SharpMap.UI.Tests")]
+[assembly: AssemblyTitle("SharpMap.UI.Test")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Deltares")]
-[assembly: AssemblyProduct("SharpMap.UI.Tests")]
+[assembly: AssemblyProduct("SharpMap.UI.Test")]
 [assembly: AssemblyCopyright("Copyright © Deltares 2008")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
Index: Core/GIS/test/Core.GIS.SharpMap.UI.Test/Tools/CurvePointToolTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.UI.Test/Tools/CurvePointToolTest.cs	(.../CurvePointToolTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.UI.Test/Tools/CurvePointToolTest.cs	(.../CurvePointToolTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -9,7 +9,7 @@
 using Core.GIS.SharpMap.UI.Tools;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.UI.Tests.Tools
+namespace Core.GIS.SharpMap.UI.Test.Tools
 {
     public class CloneableFeature : Feature
     {
Index: Core/GIS/test/Core.GIS.SharpMap.UI.Test/Tools/DeleteToolTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.UI.Test/Tools/DeleteToolTest.cs	(.../DeleteToolTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.UI.Test/Tools/DeleteToolTest.cs	(.../DeleteToolTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -9,7 +9,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Core.GIS.SharpMap.UI.Tests.Tools
+namespace Core.GIS.SharpMap.UI.Test.Tools
 {
     [TestFixture]
     public class DeleteToolTest
Index: Core/GIS/test/Core.GIS.SharpMap.UI.Test/Tools/SelectToolTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.UI.Test/Tools/SelectToolTest.cs	(.../SelectToolTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.UI.Test/Tools/SelectToolTest.cs	(.../SelectToolTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -13,7 +13,7 @@
 using Core.GIS.SharpMap.UI.Tools;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.UI.Tests.Tools
+namespace Core.GIS.SharpMap.UI.Test.Tools
 {
     [TestFixture]
     public class SelectToolTest
Index: Core/GIS/test/Core.GIS.SharpMap.UI.Test/Tools/ZoomHistoryTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/GIS/test/Core.GIS.SharpMap.UI.Test/Tools/ZoomHistoryTest.cs	(.../ZoomHistoryTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/GIS/test/Core.GIS.SharpMap.UI.Test/Tools/ZoomHistoryTest.cs	(.../ZoomHistoryTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -3,7 +3,7 @@
 using Core.GIS.SharpMap.UI.Tools.Zooming;
 using NUnit.Framework;
 
-namespace Core.GIS.SharpMap.UI.Tests.Tools
+namespace Core.GIS.SharpMap.UI.Test.Tools
 {
     [TestFixture]
     public class ZoomHistoryTest
Index: Core/Plugins/test/Core.Plugins.CommonTools.Test/CommonToolsGuiPluginTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Plugins/test/Core.Plugins.CommonTools.Test/CommonToolsGuiPluginTest.cs	(.../CommonToolsGuiPluginTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Plugins/test/Core.Plugins.CommonTools.Test/CommonToolsGuiPluginTest.cs	(.../CommonToolsGuiPluginTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -9,7 +9,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Core.Plugins.CommonTools.Tests
+namespace Core.Plugins.CommonTools.Test
 {
     [TestFixture]
     public class CommonToolsGuiPluginTest
Index: Core/Plugins/test/Core.Plugins.CommonTools.Test/Core.Plugins.CommonTools.Test.csproj
===================================================================
diff -u
--- Core/Plugins/test/Core.Plugins.CommonTools.Test/Core.Plugins.CommonTools.Test.csproj	(revision 0)
+++ Core/Plugins/test/Core.Plugins.CommonTools.Test/Core.Plugins.CommonTools.Test.csproj	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{8BD31773-6F6D-42EE-810D-0A5DAD809F9D}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Core.Plugins.CommonTools.Test</RootNamespace>
+    <AssemblyName>Core.Plugins.CommonTools.Test</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\Release\</OutputPath>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CreateInstallerWithDemoProject|x86'">
+    <OutputPath>bin\CreateInstallerWithDemoProject\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\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">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="TestViewList.cs" />
+    <Compile Include="Forms\TextDocumentViewTest.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="CommonToolsGuiPluginTest.cs" />
+  </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.Swf\Core.Common.Gui.Swf.csproj">
+      <Project>{08205620-D756-4533-922C-D6A4C0038535}</Project>
+      <Name>Core.Common.Gui.Swf</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
+      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
+      <Name>Core.Common.Utils</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Plugins\src\Core.Plugins.CommonTools.Gui\Core.Plugins.CommonTools.Gui.csproj">
+      <Project>{93E73FAB-FAE8-49C6-9ABB-27D24DF761F6}</Project>
+      <Name>Core.Plugins.CommonTools.Gui</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls.Swf\Core.Common.Controls.Swf.csproj">
+      <Project>{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}</Project>
+      <Name>Core.Common.Controls.Swf</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
+      <Project>{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}</Project>
+      <Name>Core.Common.Controls</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>
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
Fisheye: Tag 41c77f9f36ae74a406fd382187426cc06d2b0200 refers to a dead (removed) revision in file `Core/Plugins/test/Core.Plugins.CommonTools.Test/Core.Plugins.CommonTools.Tests.csproj'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Plugins/test/Core.Plugins.CommonTools.Test/Forms/TextDocumentViewTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Plugins/test/Core.Plugins.CommonTools.Test/Forms/TextDocumentViewTest.cs	(.../TextDocumentViewTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Plugins/test/Core.Plugins.CommonTools.Test/Forms/TextDocumentViewTest.cs	(.../TextDocumentViewTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,7 +2,7 @@
 using Core.Plugins.CommonTools.Gui.Forms;
 using NUnit.Framework;
 
-namespace Core.Plugins.CommonTools.Tests.Forms
+namespace Core.Plugins.CommonTools.Test.Forms
 {
     [TestFixture]
     public class TextDocumentViewTest
Index: Core/Plugins/test/Core.Plugins.CommonTools.Test/Properties/AssemblyInfo.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Plugins/test/Core.Plugins.CommonTools.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Plugins/test/Core.Plugins.CommonTools.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,8 +2,8 @@
 using System.Runtime.InteropServices;
 using NUnit.Framework;
 
-[assembly: AssemblyTitle("Core.Plugins.CommonTools.Tests")]
-[assembly: AssemblyProduct("Core.Plugins.CommonTools.Tests")]
+[assembly: AssemblyTitle("Core.Plugins.CommonTools.Test")]
+[assembly: AssemblyProduct("Core.Plugins.CommonTools.Test")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
Index: Core/Plugins/test/Core.Plugins.CommonTools.Test/TestViewList.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Plugins/test/Core.Plugins.CommonTools.Test/TestViewList.cs	(.../TestViewList.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Plugins/test/Core.Plugins.CommonTools.Test/TestViewList.cs	(.../TestViewList.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -6,7 +6,7 @@
 using Core.Common.Gui;
 using Core.Common.Utils.Collections;
 
-namespace Core.Plugins.CommonTools.Tests
+namespace Core.Plugins.CommonTools.Test
 {
     public class TestViewList : IViewList
     {
Index: Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/Core.Plugins.ProjectExplorer.Test.csproj
===================================================================
diff -u
--- Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/Core.Plugins.ProjectExplorer.Test.csproj	(revision 0)
+++ Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/Core.Plugins.ProjectExplorer.Test.csproj	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{07206938-9671-4DC7-BDE4-35B0F6E20DBC}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Core.Plugins.ProjectExplorer.Test</RootNamespace>
+    <AssemblyName>Core.Plugins.ProjectExplorer.Test</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\Release\</OutputPath>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CreateInstallerWithDemoProject|x86'">
+    <OutputPath>bin\CreateInstallerWithDemoProject\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <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">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xaml" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ProjectExplorerPluginGuiTest.cs" />
+    <Compile Include="ProjectTreeViewTest.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Application\Application.Ringtoets\Application.Ringtoets.csproj">
+      <Project>{4A7D6720-4AA1-4F0B-A796-A0436DB3D7D7}</Project>
+      <Name>Application.Ringtoets</Name>
+    </ProjectReference>
+    <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.Controls.Swf\Core.Common.Controls.Swf.csproj">
+      <Project>{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}</Project>
+      <Name>Core.Common.Controls.Swf</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
+      <Project>{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}</Project>
+      <Name>Core.Common.Controls</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Gui.Swf\Core.Common.Gui.Swf.csproj">
+      <Project>{08205620-D756-4533-922C-D6A4C0038535}</Project>
+      <Name>Core.Common.Gui.Swf</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="..\..\..\Plugins\src\Core.Plugins.CommonTools.Gui\Core.Plugins.CommonTools.Gui.csproj">
+      <Project>{93E73FAB-FAE8-49C6-9ABB-27D24DF761F6}</Project>
+      <Name>Core.Plugins.CommonTools.Gui</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
+      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
+      <Name>Core.Common.Utils</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Plugins.CommonTools\Core.Plugins.CommonTools.csproj">
+      <Project>{BEFDCC44-2638-4972-B353-42D14C7DA2C6}</Project>
+      <Name>Core.Plugins.CommonTools</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Plugins.ProjectExplorer\Core.Plugins.ProjectExplorer.csproj">
+      <Project>{ED20DBA9-D577-423F-A68D-A0A8130FB10B}</Project>
+      <Name>Core.Plugins.ProjectExplorer</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{B4F97281-0DBD-4835-9ED8-7DFB966E87FF}" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\..\..\..\build\Ringtoets.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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <PropertyGroup>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
Fisheye: Tag 41c77f9f36ae74a406fd382187426cc06d2b0200 refers to a dead (removed) revision in file `Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/Core.Plugins.ProjectExplorer.Tests.csproj'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectExplorerPluginGuiTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectExplorerPluginGuiTest.cs	(.../ProjectExplorerPluginGuiTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectExplorerPluginGuiTest.cs	(.../ProjectExplorerPluginGuiTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -6,7 +6,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Core.Plugins.ProjectExplorer.Tests
+namespace Core.Plugins.ProjectExplorer.Test
 {
     [TestFixture]
     public class ProjectExplorerPluginGuiTest
Index: Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectTreeViewTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectTreeViewTest.cs	(.../ProjectTreeViewTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectTreeViewTest.cs	(.../ProjectTreeViewTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -4,7 +4,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Core.Plugins.ProjectExplorer.Tests
+namespace Core.Plugins.ProjectExplorer.Test
 {
     [TestFixture]
     public class ProjectTreeViewTest
Index: Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/Properties/AssemblyInfo.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,8 +2,8 @@
 using System.Runtime.InteropServices;
 using NUnit.Framework;
 
-[assembly: AssemblyTitle("Core.Plugins.ProjectExplorer.Tests")]
-[assembly: AssemblyProduct("Core.Plugins.ProjectExplorer.Tests")]
+[assembly: AssemblyTitle("Core.Plugins.ProjectExplorer.Test")]
+[assembly: AssemblyProduct("Core.Plugins.ProjectExplorer.Test")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/BackGroundMapLayerTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/BackGroundMapLayerTest.cs	(.../BackGroundMapLayerTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/BackGroundMapLayerTest.cs	(.../BackGroundMapLayerTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,7 +2,7 @@
 using Core.GIS.SharpMap.Map;
 using NUnit.Framework;
 
-namespace Core.Plugins.SharpMapGis.Tests
+namespace Core.Plugins.SharpMapGis.Test
 {
     [TestFixture]
     public class BackGroundMapLayerTest
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Commands/MapZoomToFeatureCommandTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Commands/MapZoomToFeatureCommandTest.cs	(.../MapZoomToFeatureCommandTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Commands/MapZoomToFeatureCommandTest.cs	(.../MapZoomToFeatureCommandTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -10,7 +10,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Core.Plugins.SharpMapGis.Tests.Commands
+namespace Core.Plugins.SharpMapGis.Test.Commands
 {
     [TestFixture]
     public class MapZoomToFeatureCommandTest
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Core.Plugins.SharpMapGis.Test.csproj
===================================================================
diff -u
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Core.Plugins.SharpMapGis.Test.csproj	(revision 0)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Core.Plugins.SharpMapGis.Test.csproj	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{4FDA4BD2-2C84-4C7C-9908-818884D52DBB}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Core.Plugins.SharpMapGis.Test</RootNamespace>
+    <AssemblyName>Core.Plugins.SharpMapGis.Test</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <WarningLevel>0</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\Release\</OutputPath>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <WarningLevel>0</WarningLevel>
+    <Optimize>true</Optimize>
+    <DefineConstants>TRACE</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CreateInstallerWithDemoProject|x86'">
+    <OutputPath>bin\CreateInstallerWithDemoProject\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <WarningLevel>0</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="log4net, Version=1.2.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\log4net.2.0.4\lib\net40-full\log4net.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="PresentationCore" />
+    <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">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xaml" />
+    <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BackGroundMapLayerTest.cs" />
+    <Compile Include="Commands\MapZoomToFeatureCommandTest.cs" />
+    <Compile Include="Forms\GridProperties\LineStylePropertiesTest.cs" />
+    <Compile Include="Forms\GridProperties\PointStylePropertiesTest.cs" />
+    <Compile Include="Forms\GridProperties\PolygonStylePropertiesTest.cs" />
+    <Compile Include="Forms\GridProperties\ThemeItemPropertiesTest.cs" />
+    <Compile Include="Forms\GridProperties\VectorLayerPropertiesTest.cs" />
+    <Compile Include="Forms\GridProperties\VectorStylePropertiesTest.cs" />
+    <Compile Include="Forms\MapLayerTreeViewNodePresenterTest.cs" />
+    <Compile Include="Forms\MapTreeViewNodePresenterTest.cs" />
+    <Compile Include="Forms\MapViewTabControlTest.cs" />
+    <Compile Include="Forms\MapViewTest.cs">
+    </Compile>
+    <Compile Include="Forms\ImportMultipleFilesUserSettings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>ImportMultipleFilesUserSettings.settings</DependentUpon>
+    </Compile>
+    <Compile Include="Forms\VectorLayerAttributeTableViewTest.cs" />
+    <Compile Include="Forms\VectorStyleNodePresenterTest.cs" />
+    <Compile Include="Forms\MapLegendViewTest.cs" />
+    <Compile Include="MapDependencyResolverTest.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Resource.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resource.resx</DependentUpon>
+    </Compile>
+    <Compile Include="SharpMapGisPluginGuiIntegrationTest.cs" />
+    <Compile Include="SharpMapGisGuiPluginTest.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{B4F97281-0DBD-4835-9ED8-7DFB966E87FF}" />
+  </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="..\..\..\GIS\src\Core.GIS.GeoAPI.Extensions\Core.GIS.GeoAPI.Extensions.csproj">
+      <Project>{016DBD27-99BF-489A-81B5-50D66964BB90}</Project>
+      <Name>Core.GIS.GeoAPI.Extensions</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\GIS\src\Core.GIS.GeoAPI\Core.GIS.GeoAPI.csproj">
+      <Project>{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}</Project>
+      <Name>Core.GIS.GeoAPI</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\GIS\src\Core.GIS.SharpMap.Api\Core.GIS.SharpMap.Api.csproj">
+      <Project>{A3C9DF74-978A-44B1-B55D-A72AC4221E3A}</Project>
+      <Name>Core.GIS.SharpMap.Api</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\GIS\src\Core.GIS.SharpMap.Extensions\Core.GIS.SharpMap.Extensions.csproj">
+      <Project>{a4140c12-53f5-438c-8d24-9e48c504fecf}</Project>
+      <Name>Core.GIS.SharpMap.Extensions</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\GIS\src\Core.GIS.SharpMap.UI\Core.GIS.SharpMap.UI.csproj">
+      <Project>{dd1cc1db-4bf9-4c88-a100-733d84795f3a}</Project>
+      <Name>Core.GIS.SharpMap.UI</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\GIS\src\Core.GIS.SharpMap\Core.GIS.SharpMap.csproj">
+      <Project>{c83777fc-aabb-47d9-911f-d76255d4d541}</Project>
+      <Name>Core.GIS.SharpMap</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Application\Application.Ringtoets\Application.Ringtoets.csproj">
+      <Project>{4A7D6720-4AA1-4F0B-A796-A0436DB3D7D7}</Project>
+      <Name>Application.Ringtoets</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls.Swf\Core.Common.Controls.Swf.csproj">
+      <Project>{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}</Project>
+      <Name>Core.Common.Controls.Swf</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
+      <Project>{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}</Project>
+      <Name>Core.Common.Controls</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Gui.Swf\Core.Common.Gui.Swf.csproj">
+      <Project>{08205620-D756-4533-922C-D6A4C0038535}</Project>
+      <Name>Core.Common.Gui.Swf</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="..\..\..\Plugins\src\Core.Plugins.SharpMapGis.Gui\Core.Plugins.SharpMapGis.Gui.csproj">
+      <Project>{0BC3751E-EC42-40A0-A7D3-B7C2AA66976E}</Project>
+      <Name>Core.Plugins.SharpMapGis.Gui</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
+      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
+      <Name>Core.Common.Utils</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Plugins.SharpMapGis\Core.Plugins.SharpMapGis.csproj">
+      <Project>{696DAAEE-D1D8-42D0-86AC-471B970FB17E}</Project>
+      <Name>Core.Plugins.SharpMapGis</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\GIS\src\Core.GIS.NetTopologySuite.Extensions\Core.GIS.NetTopologySuite.Extensions.csproj">
+      <Project>{8A3636FB-31B4-4F4B-9165-F718F87A92DF}</Project>
+      <Name>Core.GIS.NetTopologySuite.Extensions</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\GIS\src\Core.GIS.NetTopologySuite\Core.GIS.NetTopologySuite.csproj">
+      <Project>{5770DAA9-84E5-4770-AF43-F6B815894368}</Project>
+      <Name>Core.GIS.NetTopologySuite</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\GIS\test\Core.GIS.SharpMapTestUtils\Core.GIS.SharpMapTestUtils.csproj">
+      <Project>{0A82E7D2-26F8-4A30-9787-7EEABCD7F470}</Project>
+      <Name>Core.GIS.SharpMapTestUtils</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
+      <Project>{EFA25023-CF6A-4FF7-8C42-B24D7F9509E1}</Project>
+      <Name>Core.Common.TestUtils</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resource.resx">
+      <SubType>Designer</SubType>
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Forms\ImportMultipleFilesUserSettings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>ImportMultipleFilesUserSettings.Designer.cs</LastGenOutput>
+    </None>
+    <None Include="packages.config" />
+    <None Include="Resources\pic_160_north.jpg" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Resources\Noordpijl.png" />
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\..\..\..\build\Ringtoets.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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <PropertyGroup>
+    <ExternalDependencies>lib\Common\SharpMap.Extensions\**</ExternalDependencies>
+    <ExternalDependencies1>lib\Common\SharpMap\**</ExternalDependencies1>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
Fisheye: Tag 41c77f9f36ae74a406fd382187426cc06d2b0200 refers to a dead (removed) revision in file `Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Core.Plugins.SharpMapGis.Tests.csproj'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/GridProperties/LineStylePropertiesTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/GridProperties/LineStylePropertiesTest.cs	(.../LineStylePropertiesTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/GridProperties/LineStylePropertiesTest.cs	(.../LineStylePropertiesTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,7 +2,7 @@
 using Core.Plugins.SharpMapGis.Gui.Forms.GridProperties;
 using NUnit.Framework;
 
-namespace Core.Plugins.SharpMapGis.Tests.Forms.GridProperties
+namespace Core.Plugins.SharpMapGis.Test.Forms.GridProperties
 {
     [TestFixture]
     public class LineStylePropertiesTest
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/GridProperties/PointStylePropertiesTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/GridProperties/PointStylePropertiesTest.cs	(.../PointStylePropertiesTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/GridProperties/PointStylePropertiesTest.cs	(.../PointStylePropertiesTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,7 +2,7 @@
 using Core.Plugins.SharpMapGis.Gui.Forms.GridProperties;
 using NUnit.Framework;
 
-namespace Core.Plugins.SharpMapGis.Tests.Forms.GridProperties
+namespace Core.Plugins.SharpMapGis.Test.Forms.GridProperties
 {
     [TestFixture]
     public class PointStylePropertiesTest
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/GridProperties/PolygonStylePropertiesTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/GridProperties/PolygonStylePropertiesTest.cs	(.../PolygonStylePropertiesTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/GridProperties/PolygonStylePropertiesTest.cs	(.../PolygonStylePropertiesTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,7 +2,7 @@
 using Core.Plugins.SharpMapGis.Gui.Forms.GridProperties;
 using NUnit.Framework;
 
-namespace Core.Plugins.SharpMapGis.Tests.Forms.GridProperties
+namespace Core.Plugins.SharpMapGis.Test.Forms.GridProperties
 {
     [TestFixture]
     public class PolygonStylePropertiesTest
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/GridProperties/ThemeItemPropertiesTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/GridProperties/ThemeItemPropertiesTest.cs	(.../ThemeItemPropertiesTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/GridProperties/ThemeItemPropertiesTest.cs	(.../ThemeItemPropertiesTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,7 +2,7 @@
 using Core.Plugins.SharpMapGis.Gui.Forms.GridProperties;
 using NUnit.Framework;
 
-namespace Core.Plugins.SharpMapGis.Tests.Forms.GridProperties
+namespace Core.Plugins.SharpMapGis.Test.Forms.GridProperties
 {
     [TestFixture]
     public class ThemeItemPropertiesTest
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/GridProperties/VectorLayerPropertiesTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/GridProperties/VectorLayerPropertiesTest.cs	(.../VectorLayerPropertiesTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/GridProperties/VectorLayerPropertiesTest.cs	(.../VectorLayerPropertiesTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,7 +2,7 @@
 using Core.Plugins.SharpMapGis.Gui.Forms.GridProperties;
 using NUnit.Framework;
 
-namespace Core.Plugins.SharpMapGis.Tests.Forms.GridProperties
+namespace Core.Plugins.SharpMapGis.Test.Forms.GridProperties
 {
     [TestFixture]
     public class VectorLayerPropertiesTest
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/GridProperties/VectorStylePropertiesTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/GridProperties/VectorStylePropertiesTest.cs	(.../VectorStylePropertiesTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/GridProperties/VectorStylePropertiesTest.cs	(.../VectorStylePropertiesTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,7 +2,7 @@
 using Core.Plugins.SharpMapGis.Gui.Forms.GridProperties;
 using NUnit.Framework;
 
-namespace Core.Plugins.SharpMapGis.Tests.Forms.GridProperties
+namespace Core.Plugins.SharpMapGis.Test.Forms.GridProperties
 {
     [TestFixture]
     public class VectorStylePropertiesTest
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/ImportMultipleFilesUserSettings.Designer.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/ImportMultipleFilesUserSettings.Designer.cs	(.../ImportMultipleFilesUserSettings.Designer.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/ImportMultipleFilesUserSettings.Designer.cs	(.../ImportMultipleFilesUserSettings.Designer.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Core.Plugins.SharpMapGis.Tests.Forms {
+namespace Core.Plugins.SharpMapGis.Test.Forms {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapLayerTreeViewNodePresenterTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapLayerTreeViewNodePresenterTest.cs	(.../MapLayerTreeViewNodePresenterTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapLayerTreeViewNodePresenterTest.cs	(.../MapLayerTreeViewNodePresenterTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -13,7 +13,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Core.Plugins.SharpMapGis.Tests.Forms
+namespace Core.Plugins.SharpMapGis.Test.Forms
 {
     [TestFixture]
     public class MapLayerTreeViewNodePresenterTest
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapLegendViewTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapLegendViewTest.cs	(.../MapLegendViewTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapLegendViewTest.cs	(.../MapLegendViewTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -13,7 +13,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Core.Plugins.SharpMapGis.Tests.Forms
+namespace Core.Plugins.SharpMapGis.Test.Forms
 {
     [TestFixture]
     public class MapLegendViewTest
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapTreeViewNodePresenterTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapTreeViewNodePresenterTest.cs	(.../MapTreeViewNodePresenterTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapTreeViewNodePresenterTest.cs	(.../MapTreeViewNodePresenterTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -8,7 +8,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Core.Plugins.SharpMapGis.Tests.Forms
+namespace Core.Plugins.SharpMapGis.Test.Forms
 {
     [TestFixture]
     public class MapTreeViewNodePresenterTest
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapViewTabControlTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapViewTabControlTest.cs	(.../MapViewTabControlTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapViewTabControlTest.cs	(.../MapViewTabControlTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -9,7 +9,7 @@
 using Core.Plugins.SharpMapGis.Gui.Forms;
 using NUnit.Framework;
 
-namespace Core.Plugins.SharpMapGis.Tests.Forms
+namespace Core.Plugins.SharpMapGis.Test.Forms
 {
     [TestFixture]
     public class MapViewTabControlTest
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapViewTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapViewTest.cs	(.../MapViewTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapViewTest.cs	(.../MapViewTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -19,7 +19,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Core.Plugins.SharpMapGis.Tests.Forms
+namespace Core.Plugins.SharpMapGis.Test.Forms
 {
     [TestFixture]
     public class MapViewTest
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/VectorLayerAttributeTableViewTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/VectorLayerAttributeTableViewTest.cs	(.../VectorLayerAttributeTableViewTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/VectorLayerAttributeTableViewTest.cs	(.../VectorLayerAttributeTableViewTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -11,7 +11,7 @@
 using Core.Plugins.SharpMapGis.Gui.Forms;
 using NUnit.Framework;
 
-namespace Core.Plugins.SharpMapGis.Tests.Forms
+namespace Core.Plugins.SharpMapGis.Test.Forms
 {
     [TestFixture]
     public class VectorLayerAttributeTableViewTest
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/VectorStyleNodePresenterTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/VectorStyleNodePresenterTest.cs	(.../VectorStyleNodePresenterTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/VectorStyleNodePresenterTest.cs	(.../VectorStyleNodePresenterTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -4,7 +4,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Core.Plugins.SharpMapGis.Tests.Forms
+namespace Core.Plugins.SharpMapGis.Test.Forms
 {
     [TestFixture]
     public class VectorStyleNodePresenterTest
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/MapDependencyResolverTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/MapDependencyResolverTest.cs	(.../MapDependencyResolverTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/MapDependencyResolverTest.cs	(.../MapDependencyResolverTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -1,7 +1,7 @@
 using Core.GIS.SharpMap.Map;
 using NUnit.Framework;
 
-namespace Core.Plugins.SharpMapGis.Tests
+namespace Core.Plugins.SharpMapGis.Test
 {
     [TestFixture]
     public class MapDependencyResolverTest
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Properties/AssemblyInfo.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -2,8 +2,8 @@
 using System.Runtime.InteropServices;
 using NUnit.Framework;
 
-[assembly: AssemblyTitle("Core.Plugins.SharpMapGis.Tests")]
-[assembly: AssemblyProduct("Core.Plugins.SharpMapGis.Tests")]
+[assembly: AssemblyTitle("Core.Plugins.SharpMapGis.Test")]
+[assembly: AssemblyProduct("Core.Plugins.SharpMapGis.Test")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Resource.Designer.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Resource.Designer.cs	(.../Resource.Designer.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Resource.Designer.cs	(.../Resource.Designer.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Core.Plugins.SharpMapGis.Tests {
+namespace Core.Plugins.SharpMapGis.Test {
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -36,7 +36,7 @@
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Core.Plugins.SharpMapGis.Tests.Resource", typeof(Resource).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Core.Plugins.SharpMapGis.Test.Resource", typeof(Resource).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/SharpMapGisGuiPluginTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/SharpMapGisGuiPluginTest.cs	(.../SharpMapGisGuiPluginTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/SharpMapGisGuiPluginTest.cs	(.../SharpMapGisGuiPluginTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -6,7 +6,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 
-namespace Core.Plugins.SharpMapGis.Tests
+namespace Core.Plugins.SharpMapGis.Test
 {
     [TestFixture]
     public class SharpMapGisGuiPluginTest
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/SharpMapGisPluginGuiIntegrationTest.cs
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/SharpMapGisPluginGuiIntegrationTest.cs	(.../SharpMapGisPluginGuiIntegrationTest.cs)	(revision 6633a5deea8082d57dec6185caf4ff428f034672)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/SharpMapGisPluginGuiIntegrationTest.cs	(.../SharpMapGisPluginGuiIntegrationTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -12,7 +12,7 @@
 using Core.Plugins.SharpMapGis.Gui.Forms;
 using NUnit.Framework;
 
-namespace Core.Plugins.SharpMapGis.Tests
+namespace Core.Plugins.SharpMapGis.Test
 {
     [TestFixture]
     public class SharpMapGisPluginGuiIntegrationTest
Index: Ringtoets.sln
===================================================================
diff -u -r5c044a6799b45bec77af170dca0a84bc434c5f6f -r41c77f9f36ae74a406fd382187426cc06d2b0200
--- Ringtoets.sln	(.../Ringtoets.sln)	(revision 5c044a6799b45bec77af170dca0a84bc434c5f6f)
+++ Ringtoets.sln	(.../Ringtoets.sln)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
@@ -32,7 +32,7 @@
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "uml", "uml", "{D89FA693-A8E9-4560-9957-B74B7E9391F0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Utils.Tests", "Core\Common\test\Core.Common.Utils.Tests\Core.Common.Utils.Tests.csproj", "{7F937E31-02CA-41D9-B7D4-1079CF452C72}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Utils.Test", "Core\Common\test\Core.Common.Utils.Test\Core.Common.Utils.Test.csproj", "{7F937E31-02CA-41D9-B7D4-1079CF452C72}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.TestUtils", "Core\Common\test\Core.Common.TestUtils\Core.Common.TestUtils.csproj", "{D749EE4C-CE50-4C17-BF01-9A953028C126}"
 EndProject
@@ -80,15 +80,15 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.GIS.SharpMap.UI", "Core\GIS\src\Core.GIS.SharpMap.UI\Core.GIS.SharpMap.UI.csproj", "{DD1CC1DB-4BF9-4C88-A100-733D84795F3A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.GIS.NetTopologySuite.Extensions.Tests", "Core\GIS\test\Core.GIS.NetTopologySuite.Extensions.Tests\Core.GIS.NetTopologySuite.Extensions.Tests.csproj", "{9D8E844F-20C7-4335-B3A9-2222976470DA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.GIS.NetTopologySuite.Extensions.Test", "Core\GIS\test\Core.GIS.NetTopologySuite.Extensions.Test\Core.GIS.NetTopologySuite.Extensions.Test.csproj", "{9D8E844F-20C7-4335-B3A9-2222976470DA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.GIS.NetTopologySuite.Tests", "Core\GIS\test\Core.GIS.NetTopologySuite.Tests\Core.GIS.NetTopologySuite.Tests.csproj", "{FBA4B48A-CF75-4958-B1E5-412B75D29416}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.GIS.NetTopologySuite.Test", "Core\GIS\test\Core.GIS.NetTopologySuite.Test\Core.GIS.NetTopologySuite.Test.csproj", "{FBA4B48A-CF75-4958-B1E5-412B75D29416}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.GIS.SharpMap.Extensions.Tests", "Core\GIS\test\Core.GIS.SharpMap.Extensions.Tests\Core.GIS.SharpMap.Extensions.Tests.csproj", "{9A1F1308-F324-4905-A52A-6D718825960E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.GIS.SharpMap.Extensions.Test", "Core\GIS\test\Core.GIS.SharpMap.Extensions.Test\Core.GIS.SharpMap.Extensions.Test.csproj", "{9A1F1308-F324-4905-A52A-6D718825960E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.GIS.SharpMap.Tests", "Core\GIS\test\Core.GIS.SharpMap.Tests\Core.GIS.SharpMap.Tests.csproj", "{0C76DD99-AC5D-47C0-B76F-CE70092A9AC7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.GIS.SharpMap.Test", "Core\GIS\test\Core.GIS.SharpMap.Test\Core.GIS.SharpMap.Test.csproj", "{0C76DD99-AC5D-47C0-B76F-CE70092A9AC7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.GIS.SharpMap.UI.Tests", "Core\GIS\test\Core.GIS.SharpMap.UI.Tests\Core.GIS.SharpMap.UI.Tests.csproj", "{93708508-7B00-4A26-80DA-C73A7251BCF6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.GIS.SharpMap.UI.Test", "Core\GIS\test\Core.GIS.SharpMap.UI.Test\Core.GIS.SharpMap.UI.Test.csproj", "{93708508-7B00-4A26-80DA-C73A7251BCF6}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.GIS.SharpMapTestUtils", "Core\GIS\test\Core.GIS.SharpMapTestUtils\Core.GIS.SharpMapTestUtils.csproj", "{0A82E7D2-26F8-4A30-9787-7EEABCD7F470}"
 EndProject
@@ -102,11 +102,11 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Plugins.SharpMapGis.Gui", "Core\Plugins\src\Core.Plugins.SharpMapGis.Gui\Core.Plugins.SharpMapGis.Gui.csproj", "{0BC3751E-EC42-40A0-A7D3-B7C2AA66976E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Plugins.CommonTools.Tests", "Core\Plugins\test\Core.Plugins.CommonTools.Tests\Core.Plugins.CommonTools.Tests.csproj", "{8BD31773-6F6D-42EE-810D-0A5DAD809F9D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Plugins.CommonTools.Test", "Core\Plugins\test\Core.Plugins.CommonTools.Test\Core.Plugins.CommonTools.Test.csproj", "{8BD31773-6F6D-42EE-810D-0A5DAD809F9D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Plugins.ProjectExplorer.Tests", "Core\Plugins\test\Core.Plugins.ProjectExplorer.Tests\Core.Plugins.ProjectExplorer.Tests.csproj", "{07206938-9671-4DC7-BDE4-35B0F6E20DBC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Plugins.ProjectExplorer.Test", "Core\Plugins\test\Core.Plugins.ProjectExplorer.Test\Core.Plugins.ProjectExplorer.Test.csproj", "{07206938-9671-4DC7-BDE4-35B0F6E20DBC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Plugins.SharpMapGis.Tests", "Core\Plugins\test\Core.Plugins.SharpMapGis.Tests\Core.Plugins.SharpMapGis.Tests.csproj", "{4FDA4BD2-2C84-4C7C-9908-818884D52DBB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Plugins.SharpMapGis.Test", "Core\Plugins\test\Core.Plugins.SharpMapGis.Test\Core.Plugins.SharpMapGis.Test.csproj", "{4FDA4BD2-2C84-4C7C-9908-818884D52DBB}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Application.Ringtoets", "Application\Application.Ringtoets\Application.Ringtoets.csproj", "{4A7D6720-4AA1-4F0B-A796-A0436DB3D7D7}"
 EndProject
@@ -141,9 +141,9 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Piping.Service.Test", "Ringtoets\Piping\test\Ringtoets.Piping.Service.Test\Ringtoets.Piping.Service.Test.csproj", "{D783543B-46A1-4848-A812-AF5A5259ED7E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Tests", "Core\Common\test\Core.Common.Tests\Core.Common.Tests.csproj", "{E0990383-FB2E-47D1-99CD-9B9FA2929E5B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Test", "Core\Common\test\Core.Common.Test\Core.Common.Test.csproj", "{E0990383-FB2E-47D1-99CD-9B9FA2929E5B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Integration.Tests", "Core\Common\test\Core.Common.Integration.Tests\Core.Common.Integration.Tests.csproj", "{A6A434E0-AE5A-4D5B-97D7-532B00FBDFE9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Integration.Test", "Core\Common\test\Core.Common.Integration.Test\Core.Common.Integration.Test.csproj", "{A6A434E0-AE5A-4D5B-97D7-532B00FBDFE9}"
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Application.Ringtoets.Setup", "Application\Application.Ringtoets.Setup\Application.Ringtoets.Setup.wixproj", "{3CCB05DB-C7B3-4EF7-B41D-22B6D2A3774E}"
 EndProject
@@ -161,11 +161,11 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Piping.Data.UML", "Ringtoets\Piping\uml\Ringtoets.Piping.Data.UML\Ringtoets.Piping.Data.UML.csproj", "{5991C4E2-AC39-470C-8848-056B3A954FB1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Base.Tests", "Core\Common\test\Core.Common.Base.Tests\Core.Common.Base.Tests.csproj", "{FAFDB463-9612-41F4-B3DD-FF9C6E7023BA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Base.Test", "Core\Common\test\Core.Common.Base.Test\Core.Common.Base.Test.csproj", "{FAFDB463-9612-41F4-B3DD-FF9C6E7023BA}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Piping.Integration.Test", "Ringtoets\Piping\test\Ringtoets.Piping.Integration.Test\Ringtoets.Piping.Integration.Test.csproj", "{813FFA92-1F3F-462B-B596-5919334007A9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Gui.Tests", "Core\Common\test\Core.Common.Gui.Test\Core.Common.Gui.Tests.csproj", "{D5EC1DF2-03C9-467B-B6AF-BE5AC83417F8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Gui.Test", "Core\Common\test\Core.Common.Gui.Test\Core.Common.Gui.Test.csproj", "{D5EC1DF2-03C9-467B-B6AF-BE5AC83417F8}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demo", "Demo", "{D4C84992-DE0E-4107-B4C0-D65E3667A727}"
 EndProject