Index: src/Common/SharpMap.UI/Forms/MapControl.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -rc911dd539d1c78029e363c35adbee1c92f98d3ea
--- src/Common/SharpMap.UI/Forms/MapControl.cs	(.../MapControl.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ src/Common/SharpMap.UI/Forms/MapControl.cs	(.../MapControl.cs)	(revision c911dd539d1c78029e363c35adbee1c92f98d3ea)
@@ -234,16 +234,6 @@
             }
         }
 
-        public void WaitUntilAllEventsAreProcessed()
-        {
-            while (mapCollectionChangedEventHandler != null && mapPropertyChangedEventHandler != null
-                   && (mapCollectionChangedEventHandler.HasEventsToProcess || mapCollectionChangedEventHandler.IsRunning
-                       || mapPropertyChangedEventHandler.HasEventsToProcess || mapPropertyChangedEventHandler.IsRunning))
-            {
-                Application.DoEvents();
-            }
-        }
-
         public IMapTool GetToolByName(string toolName)
         {
             return Tools.SingleOrDefault(tool => tool.Name == toolName);
Index: test/Common/SharpMap.UI.Tests/Tools/SelectToolTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -rc911dd539d1c78029e363c35adbee1c92f98d3ea
--- test/Common/SharpMap.UI.Tests/Tools/SelectToolTest.cs	(.../SelectToolTest.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/Common/SharpMap.UI.Tests/Tools/SelectToolTest.cs	(.../SelectToolTest.cs)	(revision c911dd539d1c78029e363c35adbee1c92f98d3ea)
@@ -20,7 +20,6 @@
     public class SelectToolTest
     {
         [Test]
-        [Category(TestCategory.WindowsForms)]
         public void ClearSelectionOnLayerRemove()
         {
             var featureProvider = new FeatureCollection
@@ -35,21 +34,14 @@
 
                 selectTool.Select(featureProvider.Features.Cast<IFeature>());
 
-                WindowsFormsTestHelper.Show(mapControl);
-
                 mapControl.Map.Layers.Clear();
 
-                mapControl.WaitUntilAllEventsAreProcessed();
-
                 selectTool.Selection
                     .Should("selection is cleared on layer remove").Be.Empty();
             }
-
-            WindowsFormsTestHelper.CloseAll();
         }
 
         [Test]
-        [Category(TestCategory.WindowsForms)]
         public void ClearSelectionOnParentGroupLayerRemove()
         {
             var featureProvider = new FeatureCollection
@@ -65,17 +57,11 @@
 
                 selectTool.Select(featureProvider.Features.Cast<IFeature>());
 
-                WindowsFormsTestHelper.Show(mapControl);
-
                 mapControl.Map.Layers.Remove(groupLayer);
 
-                mapControl.WaitUntilAllEventsAreProcessed();
-
                 selectTool.Selection
                     .Should("selection is cleared on layer remove").Be.Empty();
             }
-
-            WindowsFormsTestHelper.CloseAll();
         }
 
         [Test]
@@ -223,15 +209,14 @@
             mapControl.Map.Layers.Add(vectorLayer);
             mapControl.SelectTool.AddSelection(features.Take(5000));
 
-            TestHelper.AssertIsFasterThan(5000, () => WindowsFormsTestHelper.ShowModal(mapControl, f =>
-                {
-                    vectorLayer.Visible = false;
-                    mapControl.SelectTool.RefreshSelection();
-                }));
+            TestHelper.AssertIsFasterThan(5000, () =>
+            {
+                vectorLayer.Visible = false;
+                mapControl.SelectTool.RefreshSelection();
+            });
         }
 
         [Test]
-        [Category(TestCategory.WindowsForms)]
         public void SelectionMultipleFeaturesOnMultipleLayers()
         {
             var featureProvider1 = new FeatureCollection
@@ -266,20 +251,12 @@
 
                 selectTool.Select(listOfSelectedFeatures.Cast<IFeature>());
 
-                WindowsFormsTestHelper.Show(mapControl);
-
-                
-                mapControl.WaitUntilAllEventsAreProcessed();
-
                 selectTool.Selection.Count()
                     .Should("selection are 3 features in 2 layers, 2 features in layer1, 1 feature in layer 2").Be.EqualTo(3);
             }
-
-            WindowsFormsTestHelper.CloseAll();
         }
         
         [Test]
-        [Category(TestCategory.WindowsForms)]
         public void SelectionMultipleFeaturesInMultipleLayersOnOnlyOneLayer()
         {
             var featureProvider1 = new FeatureCollection
@@ -314,33 +291,20 @@
 
                 selectTool.Select(listOfSelectedFeatures.Cast<IFeature>(), layer1);
 
-                WindowsFormsTestHelper.Show(mapControl);
-
-
-                mapControl.WaitUntilAllEventsAreProcessed();
-
                 selectTool.Selection.Count()
                     .Should("selection are 3 features in 2 layers, but only select the 2 features in layer1!").Be.EqualTo(2);
                 
                 selectTool.Select(listOfSelectedFeatures.Cast<IFeature>(), layer2);
 
-                WindowsFormsTestHelper.Show(mapControl);
-
-
-                mapControl.WaitUntilAllEventsAreProcessed();
-
                 selectTool.Selection.Count()
                     .Should("selection are 3 features in 2 layers, but only select the 1 feature in layer2!").Be.EqualTo(1);
             }
-
-            WindowsFormsTestHelper.CloseAll();
         }
 
         /// <summary>
         /// Test for TOOLS-22796:'Selecting area feature type in project tree selects all features in map which can be extremely slow'
         /// </summary>
         [Test]
-        [Category(TestCategory.WindowsForms)]
         public void SelectionMoreThanMaxMultipleFeaturesInMultipleLayers()
         {
             var maxSelectableFeatures = SelectTool.MaxSelectedFeatures;
@@ -367,17 +331,11 @@
                 var ofSelectedFeatures = listOfSelectedFeatures as IFeature[] ?? listOfSelectedFeatures.ToArray();
                 selectTool.Select(ofSelectedFeatures);
 
-                WindowsFormsTestHelper.Show(mapControl);
-
-
-                mapControl.WaitUntilAllEventsAreProcessed();
                 var message =
                     string.Format("selection are all {1} features in 2 layers, but only select the first {0} features!", maxSelectableFeatures, ofSelectedFeatures.Count());
                 selectTool.Selection.Count()
                     .Should(message).Be.EqualTo(maxSelectableFeatures);
             }
-
-            WindowsFormsTestHelper.CloseAll();
         }
 
         private class TestFeature : Feature
Fisheye: Tag c911dd539d1c78029e363c35adbee1c92f98d3ea refers to a dead (removed) revision in file `test/DeltaShell/DeltaShell.Plugins.CommonTools.Tests/Property/Charting/AreaChartSeriesPropertiesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c911dd539d1c78029e363c35adbee1c92f98d3ea refers to a dead (removed) revision in file `test/DeltaShell/DeltaShell.Plugins.CommonTools.Tests/Property/Charting/ChartAxisPropertiesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c911dd539d1c78029e363c35adbee1c92f98d3ea refers to a dead (removed) revision in file `test/DeltaShell/DeltaShell.Plugins.CommonTools.Tests/Property/Charting/ChartPropertiesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c911dd539d1c78029e363c35adbee1c92f98d3ea refers to a dead (removed) revision in file `test/DeltaShell/DeltaShell.Plugins.CommonTools.Tests/Property/Charting/ChartSeriesPropertiesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c911dd539d1c78029e363c35adbee1c92f98d3ea refers to a dead (removed) revision in file `test/DeltaShell/DeltaShell.Plugins.CommonTools.Tests/Property/Charting/LineChartSeriesPropertiesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c911dd539d1c78029e363c35adbee1c92f98d3ea refers to a dead (removed) revision in file `test/DeltaShell/DeltaShell.Plugins.CommonTools.Tests/Property/Charting/PointChartSeriesPropertiesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?