Index: test/Common/DelftTools.Tests/Controls/Swf/DataEditorGenerator/SelfCollapsingGroupboxTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r94a72e46a5b6c508e4532436e96f10351aa73956
--- test/Common/DelftTools.Tests/Controls/Swf/DataEditorGenerator/SelfCollapsingGroupboxTest.cs	(.../SelfCollapsingGroupboxTest.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/Common/DelftTools.Tests/Controls/Swf/DataEditorGenerator/SelfCollapsingGroupboxTest.cs	(.../SelfCollapsingGroupboxTest.cs)	(revision 94a72e46a5b6c508e4532436e96f10351aa73956)
@@ -1,100 +1,86 @@
 using System.Windows.Forms;
 using DelftTools.Controls.Swf.DataEditorGenerator;
-using DelftTools.TestUtils;
 using NUnit.Framework;
 
 namespace DelftTools.Tests.Controls.Swf.DataEditorGenerator
 {
     [TestFixture]
-    class SelfCollapsingGroupboxTest
+    public class SelfCollapsingGroupboxTest
     {
         [Test]
-        [Category(TestCategory.WindowsForms)]
         public void OneChildTest()
         {
-            SelfCollapsingGroupbox box = new SelfCollapsingGroupbox();
+            var box = new SelfCollapsingGroupbox();
 
-            FlowLayoutPanel panel = new FlowLayoutPanel();
+            var panel = new FlowLayoutPanel();
             box.Controls.Add(panel);
             box.SetChildContainer(panel);
 
-            SelfCollapsingPanel child1 = new SelfCollapsingPanel();
+            var child1 = new SelfCollapsingPanel();
             panel.Controls.Add(child1);
             box.SubscribeChild(child1);
-            
-            WindowsFormsTestHelper.Show(box);
 
             Assert.IsTrue(box.Visible);
 
             child1.Visible = false;
-
             Assert.IsFalse(box.Visible);
-
-            WindowsFormsTestHelper.CloseAll();
         }
 
         [Test]
-        [Category(TestCategory.WindowsForms)]
         public void TwoChildrenTest()
         {
-            SelfCollapsingGroupbox box = new SelfCollapsingGroupbox();
+            var box = new SelfCollapsingGroupbox();
 
-            FlowLayoutPanel panel = new FlowLayoutPanel();
+            var panel = new FlowLayoutPanel();
             box.Controls.Add(panel);
             box.SetChildContainer(panel);
 
-            SelfCollapsingPanel child1 = new SelfCollapsingPanel();
+            var child1 = new SelfCollapsingPanel();
             panel.Controls.Add(child1);
             box.SubscribeChild(child1);
 
-            SelfCollapsingPanel child2 = new SelfCollapsingPanel();
+            var child2 = new SelfCollapsingPanel();
             panel.Controls.Add(child2);
             box.SubscribeChild(child2);
 
-            WindowsFormsTestHelper.Show(box);
-
             Assert.IsTrue(box.Visible);
 
             child1.Visible = false;
-
             Assert.IsTrue(box.Visible);
 
             child2.Visible = false;
-
             Assert.IsFalse(box.Visible);
-
-            WindowsFormsTestHelper.CloseAll();
         }
 
         [Test]
-        [Category(TestCategory.WindowsForms)]
         public void AlreadyInvisibleTest()
         {
-            SelfCollapsingGroupbox box = new SelfCollapsingGroupbox();
+            var box = new SelfCollapsingGroupbox();
 
-            FlowLayoutPanel panel = new FlowLayoutPanel();
+            var panel = new FlowLayoutPanel();
             box.Controls.Add(panel);
             box.SetChildContainer(panel);
 
-            SelfCollapsingPanel child1 = new SelfCollapsingPanel();
-            child1.Visible = false;
+            var child1 = new SelfCollapsingPanel
+                         {
+                             Visible = false
+                         };
+
             panel.Controls.Add(child1);
             box.SubscribeChild(child1);
 
-            SelfCollapsingPanel child2 = new SelfCollapsingPanel();
-            child2.Visible = false;
+            var child2 = new SelfCollapsingPanel
+                         {
+                             Visible = false
+                         };
+
             panel.Controls.Add(child2);
             box.SubscribeChild(child2);
 
-            WindowsFormsTestHelper.Show(box);
-
             Assert.IsFalse(box.Visible);
 
             child1.Visible = true;
-
             Assert.IsTrue(box.Visible);
-
-            WindowsFormsTestHelper.CloseAll();
         }
     }
 }
Index: test/DeltaShell/DeltaShell.Plugins.CommonTools.Tests/DeltaShell.Plugins.CommonTools.Tests.csproj
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r94a72e46a5b6c508e4532436e96f10351aa73956
--- test/DeltaShell/DeltaShell.Plugins.CommonTools.Tests/DeltaShell.Plugins.CommonTools.Tests.csproj	(.../DeltaShell.Plugins.CommonTools.Tests.csproj)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/DeltaShell/DeltaShell.Plugins.CommonTools.Tests/DeltaShell.Plugins.CommonTools.Tests.csproj	(.../DeltaShell.Plugins.CommonTools.Tests.csproj)	(revision 94a72e46a5b6c508e4532436e96f10351aa73956)
@@ -90,21 +90,10 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Property\Charting\AreaChartSeriesPropertiesTest.cs" />
-    <Compile Include="Property\Charting\ChartAxisPropertiesTest.cs" />
     <Compile Include="Forms\Charting\ChartLegendViewTest.cs" />
-    <Compile Include="Property\Charting\ChartPropertiesTest.cs" />
-    <Compile Include="Property\Charting\ChartSeriesPropertiesTest.cs" />
-    <Compile Include="Property\Charting\LineChartSeriesPropertiesTest.cs" />
-    <Compile Include="Property\Charting\PointChartSeriesPropertiesTest.cs" />
     <Compile Include="TestViewList.cs" />
     <Compile Include="Forms\TextDocumentViewTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Property\CompositeActivityPropertiesTest.cs" />
-    <Compile Include="Property\DocumentPropertiesTest.cs" />
-    <Compile Include="Property\ProjectPropertiesTest.cs" />
-    <Compile Include="Property\TreeFolderPropertiesTest.cs" />
-    <Compile Include="Property\UrlPropertiesTest.cs" />
     <Compile Include="CommonToolsGuiPluginTest.cs" />
   </ItemGroup>
   <ItemGroup>
Fisheye: Tag 94a72e46a5b6c508e4532436e96f10351aa73956 refers to a dead (removed) revision in file `test/DeltaShell/DeltaShell.Plugins.CommonTools.Tests/Property/CompositeActivityPropertiesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 94a72e46a5b6c508e4532436e96f10351aa73956 refers to a dead (removed) revision in file `test/DeltaShell/DeltaShell.Plugins.CommonTools.Tests/Property/DocumentPropertiesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 94a72e46a5b6c508e4532436e96f10351aa73956 refers to a dead (removed) revision in file `test/DeltaShell/DeltaShell.Plugins.CommonTools.Tests/Property/ProjectPropertiesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 94a72e46a5b6c508e4532436e96f10351aa73956 refers to a dead (removed) revision in file `test/DeltaShell/DeltaShell.Plugins.CommonTools.Tests/Property/TreeFolderPropertiesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 94a72e46a5b6c508e4532436e96f10351aa73956 refers to a dead (removed) revision in file `test/DeltaShell/DeltaShell.Plugins.CommonTools.Tests/Property/UrlPropertiesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/DeltaShell.Plugins.SharpMapGis.Tests.csproj
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r94a72e46a5b6c508e4532436e96f10351aa73956
--- test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/DeltaShell.Plugins.SharpMapGis.Tests.csproj	(.../DeltaShell.Plugins.SharpMapGis.Tests.csproj)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/DeltaShell.Plugins.SharpMapGis.Tests.csproj	(.../DeltaShell.Plugins.SharpMapGis.Tests.csproj)	(revision 94a72e46a5b6c508e4532436e96f10351aa73956)
@@ -107,17 +107,10 @@
     <Compile Include="BackGroundMapLayerTest.cs" />
     <Compile Include="Commands\CommandTests.cs" />
     <Compile Include="Commands\MapZoomToFeatureCommandTest.cs" />
-    <Compile Include="Forms\GridProperties\FeatureDataRowPropertiesTest.cs" />
-    <Compile Include="Forms\GridProperties\GroupLayerPropertiesTest.cs" />
-    <Compile Include="Forms\GridProperties\LegendToolPropertiesTest.cs" />
     <Compile Include="Forms\GridProperties\LineStylePropertiesTest.cs" />
-    <Compile Include="Forms\GridProperties\MapPropertiesTest.cs" />
     <Compile Include="Forms\GridProperties\PointStylePropertiesTest.cs" />
     <Compile Include="Forms\GridProperties\PolygonStylePropertiesTest.cs" />
     <Compile Include="Forms\GridProperties\ThemeItemPropertiesTest.cs" />
-    <Compile Include="Forms\GridProperties\VectorLayerLinePropertiesTest.cs" />
-    <Compile Include="Forms\GridProperties\VectorLayerPointPropertiesTest.cs" />
-    <Compile Include="Forms\GridProperties\VectorLayerPolygonPropertiesTest.cs" />
     <Compile Include="Forms\GridProperties\VectorLayerPropertiesTest.cs" />
     <Compile Include="Forms\GridProperties\VectorStylePropertiesTest.cs" />
     <Compile Include="Forms\MapLayerTreeViewNodePresenterTest.cs" />
Fisheye: Tag 94a72e46a5b6c508e4532436e96f10351aa73956 refers to a dead (removed) revision in file `test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/GridProperties/FeatureDataRowPropertiesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 94a72e46a5b6c508e4532436e96f10351aa73956 refers to a dead (removed) revision in file `test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/GridProperties/GroupLayerPropertiesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 94a72e46a5b6c508e4532436e96f10351aa73956 refers to a dead (removed) revision in file `test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/GridProperties/LegendToolPropertiesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/GridProperties/LineStylePropertiesTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r94a72e46a5b6c508e4532436e96f10351aa73956
--- test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/GridProperties/LineStylePropertiesTest.cs	(.../LineStylePropertiesTest.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/GridProperties/LineStylePropertiesTest.cs	(.../LineStylePropertiesTest.cs)	(revision 94a72e46a5b6c508e4532436e96f10351aa73956)
@@ -1,5 +1,4 @@
-using DelftTools.TestUtils;
-using DeltaShell.Plugins.SharpMapGis.Gui.Forms.GridProperties;
+using DeltaShell.Plugins.SharpMapGis.Gui.Forms.GridProperties;
 using NUnit.Framework;
 using SharpMap.Styles;
 
@@ -8,12 +7,6 @@
     [TestFixture]
     public class LineStylePropertiesTest
     {
-        [Test, Category(TestCategory.WindowsForms)]
-        public void ShowProperties()
-        {
-            WindowsFormsTestHelper.ShowPropertyGridForObject(new LineStyleProperties { Data = new VectorStyle() });
-        }
-
         [Test]
         public void TestMaximumValueClipping()
         {
Fisheye: Tag 94a72e46a5b6c508e4532436e96f10351aa73956 refers to a dead (removed) revision in file `test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/GridProperties/MapPropertiesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/GridProperties/PointStylePropertiesTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r94a72e46a5b6c508e4532436e96f10351aa73956
--- test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/GridProperties/PointStylePropertiesTest.cs	(.../PointStylePropertiesTest.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/GridProperties/PointStylePropertiesTest.cs	(.../PointStylePropertiesTest.cs)	(revision 94a72e46a5b6c508e4532436e96f10351aa73956)
@@ -1,5 +1,4 @@
-using DelftTools.TestUtils;
-using DeltaShell.Plugins.SharpMapGis.Gui.Forms.GridProperties;
+using DeltaShell.Plugins.SharpMapGis.Gui.Forms.GridProperties;
 using NUnit.Framework;
 using SharpMap.Styles;
 
@@ -8,12 +7,6 @@
     [TestFixture]
     public class PointStylePropertiesTest
     {
-        [Test, Category(TestCategory.WindowsForms)]
-        public void ShowProperties()
-        {
-            WindowsFormsTestHelper.ShowPropertyGridForObject(new PointStyleProperties { Data = new VectorStyle() });
-        }
-
         [Test]
         public void TestMaximumValueClipping()
         {
Index: test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/GridProperties/PolygonStylePropertiesTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r94a72e46a5b6c508e4532436e96f10351aa73956
--- test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/GridProperties/PolygonStylePropertiesTest.cs	(.../PolygonStylePropertiesTest.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/GridProperties/PolygonStylePropertiesTest.cs	(.../PolygonStylePropertiesTest.cs)	(revision 94a72e46a5b6c508e4532436e96f10351aa73956)
@@ -1,5 +1,4 @@
-using DelftTools.TestUtils;
-using DeltaShell.Plugins.SharpMapGis.Gui.Forms.GridProperties;
+using DeltaShell.Plugins.SharpMapGis.Gui.Forms.GridProperties;
 using NUnit.Framework;
 using SharpMap.Styles;
 
@@ -8,12 +7,6 @@
     [TestFixture]
     public class PolygonStylePropertiesTest
     {
-        [Test, Category(TestCategory.WindowsForms)]
-        public void ShowProperties()
-        {
-            WindowsFormsTestHelper.ShowPropertyGridForObject(new PolygonStyleProperties { Data = new VectorStyle() });
-        }
-
         [Test]
         public void TestMaximumValueClipping()
         {
Index: test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/GridProperties/ThemeItemPropertiesTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r94a72e46a5b6c508e4532436e96f10351aa73956
--- test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/GridProperties/ThemeItemPropertiesTest.cs	(.../ThemeItemPropertiesTest.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/GridProperties/ThemeItemPropertiesTest.cs	(.../ThemeItemPropertiesTest.cs)	(revision 94a72e46a5b6c508e4532436e96f10351aa73956)
@@ -1,5 +1,4 @@
-using DelftTools.TestUtils;
-using DeltaShell.Plugins.SharpMapGis.Gui.Forms.GridProperties;
+using DeltaShell.Plugins.SharpMapGis.Gui.Forms.GridProperties;
 using NUnit.Framework;
 using SharpMap.Rendering.Thematics;
 
@@ -9,13 +8,6 @@
     public class ThemeItemPropertiesTest
     {
         [Test]
-        [Category(TestCategory.WindowsForms)]
-        public void ShowProperties()
-        {
-            WindowsFormsTestHelper.ShowPropertyGridForObject(new ThemeItemProperties { Data = new GradientThemeItem() });
-        }
-
-        [Test]
         public void TestMaximumValueClipping()
         {
             const int maxValue = 999999;
Fisheye: Tag 94a72e46a5b6c508e4532436e96f10351aa73956 refers to a dead (removed) revision in file `test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/GridProperties/VectorLayerLinePropertiesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 94a72e46a5b6c508e4532436e96f10351aa73956 refers to a dead (removed) revision in file `test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/GridProperties/VectorLayerPointPropertiesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 94a72e46a5b6c508e4532436e96f10351aa73956 refers to a dead (removed) revision in file `test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/GridProperties/VectorLayerPolygonPropertiesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/GridProperties/VectorLayerPropertiesTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r94a72e46a5b6c508e4532436e96f10351aa73956
--- test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/GridProperties/VectorLayerPropertiesTest.cs	(.../VectorLayerPropertiesTest.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/GridProperties/VectorLayerPropertiesTest.cs	(.../VectorLayerPropertiesTest.cs)	(revision 94a72e46a5b6c508e4532436e96f10351aa73956)
@@ -1,5 +1,4 @@
-using DelftTools.TestUtils;
-using DeltaShell.Plugins.SharpMapGis.Gui.Forms.GridProperties;
+using DeltaShell.Plugins.SharpMapGis.Gui.Forms.GridProperties;
 using NUnit.Framework;
 using SharpMap.Layers;
 
@@ -9,13 +8,6 @@
     public class VectorLayerPropertiesTest
     {
         [Test]
-        [Category(TestCategory.WindowsForms)]
-        public void ShowProperties()
-        {
-            WindowsFormsTestHelper.ShowPropertyGridForObject(new VectorLayerProperties { Data = new VectorLayer() });
-        }
-
-        [Test]
         public void TestMaximumValueClipping()
         {
             const int maxValue = 999999;
Index: test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/GridProperties/VectorStylePropertiesTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r94a72e46a5b6c508e4532436e96f10351aa73956
--- test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/GridProperties/VectorStylePropertiesTest.cs	(.../VectorStylePropertiesTest.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/GridProperties/VectorStylePropertiesTest.cs	(.../VectorStylePropertiesTest.cs)	(revision 94a72e46a5b6c508e4532436e96f10351aa73956)
@@ -1,5 +1,4 @@
-using DelftTools.TestUtils;
-using DeltaShell.Plugins.SharpMapGis.Gui.Forms.GridProperties;
+using DeltaShell.Plugins.SharpMapGis.Gui.Forms.GridProperties;
 using NUnit.Framework;
 using SharpMap.Styles;
 
@@ -9,13 +8,6 @@
     public class VectorStylePropertiesTest
     {
         [Test]
-        [Category(TestCategory.WindowsForms)]
-        public void ShowProperties()
-        {
-            WindowsFormsTestHelper.ShowPropertyGridForObject(new VectorStyleProperties { Data = new VectorStyle()});
-        }
-
-        [Test]
         public void TestMaximumValueClipping()
         {
             const int maxValue = 999999;