Index: test/Common/DelftTools.Tests/Controls/Swf/Table/TableViewCopyPasteTest.cs
===================================================================
diff -u -ra2fd8090e90349e5276d73d89035c7c7a1fec641 -r89a1f10b30400ae7b2cb1fb364610407a389cfa5
--- test/Common/DelftTools.Tests/Controls/Swf/Table/TableViewCopyPasteTest.cs	(.../TableViewCopyPasteTest.cs)	(revision a2fd8090e90349e5276d73d89035c7c7a1fec641)
+++ test/Common/DelftTools.Tests/Controls/Swf/Table/TableViewCopyPasteTest.cs	(.../TableViewCopyPasteTest.cs)	(revision 89a1f10b30400ae7b2cb1fb364610407a389cfa5)
@@ -46,7 +46,6 @@
         }
 
         [Test]
-        [Category(TestCategory.Performance)]
         public void PasteLargeAmountOfDataShouldBeFast()
         {
             using (CultureUtils.SwitchToCulture("nl-NL"))
Index: test/Common/DelftTools.Tests/Controls/Swf/TreeViewControls/TreeViewTest.cs
===================================================================
diff -u -r46a4fad668405071c38e90d895b59eb8a78eb784 -r89a1f10b30400ae7b2cb1fb364610407a389cfa5
--- test/Common/DelftTools.Tests/Controls/Swf/TreeViewControls/TreeViewTest.cs	(.../TreeViewTest.cs)	(revision 46a4fad668405071c38e90d895b59eb8a78eb784)
+++ test/Common/DelftTools.Tests/Controls/Swf/TreeViewControls/TreeViewTest.cs	(.../TreeViewTest.cs)	(revision 89a1f10b30400ae7b2cb1fb364610407a389cfa5)
@@ -266,8 +266,7 @@
         }
 
         [Test]
-        [Category(TestCategory.Performance)]
-        public void TreeViewUpdatesShouldBeVeryFastOnManyPropertyChanges(string a)
+        public void TreeViewUpdateOnManyPropertyChangesShouldBeFast(string a)
         {
             var parent = new Child { Name = "parent" };
 
Index: test/Common/DelftTools.Utils.Tests/Aop/EntityAttributeTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r89a1f10b30400ae7b2cb1fb364610407a389cfa5
--- test/Common/DelftTools.Utils.Tests/Aop/EntityAttributeTest.cs	(.../EntityAttributeTest.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/Common/DelftTools.Utils.Tests/Aop/EntityAttributeTest.cs	(.../EntityAttributeTest.cs)	(revision 89a1f10b30400ae7b2cb1fb364610407a389cfa5)
@@ -141,7 +141,6 @@
         }
         
         [Test]
-        [NUnit.Framework.Category(TestCategory.Performance)]
         public void ConstructingManyObjectsShouldBeFast()
         {
             //450-500 on my pc (TS)
@@ -155,7 +154,6 @@
         }
 
         [Test]
-        [NUnit.Framework.Category(TestCategory.Performance)]
         public void MemoryUsageOfEntityAttributeShouldNotGrow()
         {
             var numToCreate = 100000;
Index: test/Common/DelftTools.Utils.Tests/ChunkedListTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r89a1f10b30400ae7b2cb1fb364610407a389cfa5
--- test/Common/DelftTools.Utils.Tests/ChunkedListTest.cs	(.../ChunkedListTest.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/Common/DelftTools.Utils.Tests/ChunkedListTest.cs	(.../ChunkedListTest.cs)	(revision 89a1f10b30400ae7b2cb1fb364610407a389cfa5)
@@ -113,7 +113,6 @@
         }
 
         [Test]
-        [Category(TestCategory.Performance)]
         public void ComparePerformanceWithNativeList()
         {
             var size = 1000000;
Index: test/Common/DelftTools.Utils.Tests/Collections/Generic/EnumerableListTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r89a1f10b30400ae7b2cb1fb364610407a389cfa5
--- test/Common/DelftTools.Utils.Tests/Collections/Generic/EnumerableListTest.cs	(.../EnumerableListTest.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/Common/DelftTools.Utils.Tests/Collections/Generic/EnumerableListTest.cs	(.../EnumerableListTest.cs)	(revision 89a1f10b30400ae7b2cb1fb364610407a389cfa5)
@@ -26,8 +26,7 @@
         }
 
         [Test]
-        [Category(TestCategory.Performance)]
-        public void EnumerableListAddManyAndTestCount()
+        public void EnumerableListItemCountShouldBeFast()
         {
             var items = new EventedList<object>();
             var editor = new EnumerableListEditor(items);
@@ -60,8 +59,7 @@
         }
 
         [Test]
-        [Category(TestCategory.Performance)]
-        public void EnumerableListWithCacheAddManyAndTestCount()
+        public void EnumerableListWithCacheItemCountShouldBeFast()
         {
             EventedList<object> f = new EventedList<object>();
             var sampleFeatures = f.OfType<string>();
@@ -82,8 +80,6 @@
 
             EnumerableList<string> featureCollection = features;
 
-
-            
             long count = 0;
             Action action = delegate
                                 {
@@ -99,7 +95,6 @@
         }
     }
 
-
     public class EnumerableListEditor : IEnumerableListEditor
     {
         public EventedList<object> EventedList { get; set; }
Index: test/Common/DelftTools.Utils.Tests/Collections/Generic/EventedListTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r89a1f10b30400ae7b2cb1fb364610407a389cfa5
--- test/Common/DelftTools.Utils.Tests/Collections/Generic/EventedListTest.cs	(.../EventedListTest.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/Common/DelftTools.Utils.Tests/Collections/Generic/EventedListTest.cs	(.../EventedListTest.cs)	(revision 89a1f10b30400ae7b2cb1fb364610407a389cfa5)
@@ -174,8 +174,7 @@
         }
 
         [Test]
-        [NUnit.Framework.Category(TestCategory.Performance)]
-        public void EventSubscription()
+        public void EventSubscriptionShouldBeFast()
         {
             var eventedList = new EventedList<MockWithPropertyAndCollectionChange>();
 
Index: test/Common/DelftTools.Utils.Tests/NamingHelperTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r89a1f10b30400ae7b2cb1fb364610407a389cfa5
--- test/Common/DelftTools.Utils.Tests/NamingHelperTest.cs	(.../NamingHelperTest.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/Common/DelftTools.Utils.Tests/NamingHelperTest.cs	(.../NamingHelperTest.cs)	(revision 89a1f10b30400ae7b2cb1fb364610407a389cfa5)
@@ -135,8 +135,7 @@
         }
 
         [Test]
-        [Category(TestCategory.Performance)]
-        public void MakeNamesUniqueForWorstCaseShouldBeQuick()
+        public void MakeNamesUniqueForWorstCaseShouldBeFast()
         {
             var nameables = Enumerable.Range(0, 10000).Select(i =>
             {
Index: test/Common/DelftTools.Utils.Tests/NetCdf/NetCdfFileTest.cs
===================================================================
diff -u -rb1728d26142119f9e21c35acb4c390fdae8abcac -r89a1f10b30400ae7b2cb1fb364610407a389cfa5
--- test/Common/DelftTools.Utils.Tests/NetCdf/NetCdfFileTest.cs	(.../NetCdfFileTest.cs)	(revision b1728d26142119f9e21c35acb4c390fdae8abcac)
+++ test/Common/DelftTools.Utils.Tests/NetCdf/NetCdfFileTest.cs	(.../NetCdfFileTest.cs)	(revision 89a1f10b30400ae7b2cb1fb364610407a389cfa5)
@@ -27,8 +27,7 @@
         }
 
         [Test]
-        [Category(TestCategory.Performance)]
-        public void WritingPerSliceShouldBeBloodyFast()
+        public void WritingPerSliceShouldBeFast()
         {
             int ncId;
             var ncFile = NetCdfFile.CreateNew(TestHelper.GetCurrentMethodName() + ".nc");
Index: test/Common/DelftTools.Utils.Tests/Remoting/RemoteInstanceContainerTest.cs
===================================================================
diff -u -re78db153a35565d71fd5662ecf41379f68cb3240 -r89a1f10b30400ae7b2cb1fb364610407a389cfa5
--- test/Common/DelftTools.Utils.Tests/Remoting/RemoteInstanceContainerTest.cs	(.../RemoteInstanceContainerTest.cs)	(revision e78db153a35565d71fd5662ecf41379f68cb3240)
+++ test/Common/DelftTools.Utils.Tests/Remoting/RemoteInstanceContainerTest.cs	(.../RemoteInstanceContainerTest.cs)	(revision 89a1f10b30400ae7b2cb1fb364610407a389cfa5)
@@ -256,7 +256,6 @@
         }
 
         [Test]
-        [Category(TestCategory.Performance)]
         [Category(TestCategory.WorkInProgress)]
         public void StartRemoteInstanceShouldBeFast()
         {
Index: test/Common/DelftTools.Utils.Tests/Threading/ThreadedWorkerTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r89a1f10b30400ae7b2cb1fb364610407a389cfa5
--- test/Common/DelftTools.Utils.Tests/Threading/ThreadedWorkerTest.cs	(.../ThreadedWorkerTest.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/Common/DelftTools.Utils.Tests/Threading/ThreadedWorkerTest.cs	(.../ThreadedWorkerTest.cs)	(revision 89a1f10b30400ae7b2cb1fb364610407a389cfa5)
@@ -11,8 +11,7 @@
     public class ThreadedWorkerTest
     {
         [Test]
-        [Category(TestCategory.Performance)]
-        public void TestPerformanceIsImproved()
+        public void ThreadedWorkerShouldBeFast()
         {
             const int timePerWorkItem = 50;
             const int numWorkItems = 20;
Index: test/Common/DelftTools.Utils.Tests/UniqueTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r89a1f10b30400ae7b2cb1fb364610407a389cfa5
--- test/Common/DelftTools.Utils.Tests/UniqueTest.cs	(.../UniqueTest.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/Common/DelftTools.Utils.Tests/UniqueTest.cs	(.../UniqueTest.cs)	(revision 89a1f10b30400ae7b2cb1fb364610407a389cfa5)
@@ -18,7 +18,6 @@
         }
 
         [Test]
-        [Category(TestCategory.Performance)]
         public void GetHashCodeShouldBeFast()
         {
             var uniques = Enumerable.Range(1, 100000).Select(i => new Unique<long>()).ToList();
Index: test/Common/NetTopologySuite.Extensions.Tests/Features/FeatureAttributeAccessorHelperTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r89a1f10b30400ae7b2cb1fb364610407a389cfa5
--- test/Common/NetTopologySuite.Extensions.Tests/Features/FeatureAttributeAccessorHelperTest.cs	(.../FeatureAttributeAccessorHelperTest.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/Common/NetTopologySuite.Extensions.Tests/Features/FeatureAttributeAccessorHelperTest.cs	(.../FeatureAttributeAccessorHelperTest.cs)	(revision 89a1f10b30400ae7b2cb1fb364610407a389cfa5)
@@ -33,8 +33,7 @@
         }
 
         [Test]
-        [Category(TestCategory.Performance)]
-        public void GetAttributeFast()
+        public void GetAttributeShouldBeFast()
         {
             var testFeature = new TestFeature();
             testFeature.Attributes = new DictionaryFeatureAttributeCollection();
Index: test/Common/NetTopologySuite.Tests/Geometry/GeometryTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r89a1f10b30400ae7b2cb1fb364610407a389cfa5
--- test/Common/NetTopologySuite.Tests/Geometry/GeometryTest.cs	(.../GeometryTest.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/Common/NetTopologySuite.Tests/Geometry/GeometryTest.cs	(.../GeometryTest.cs)	(revision 89a1f10b30400ae7b2cb1fb364610407a389cfa5)
@@ -63,8 +63,7 @@
         }
 
         [Test]
-        [Category(TestCategory.Performance)]
-        public void GetHashCodeShouldBeComputedLazyAndShouldBeVeryFast()
+        public void GetHashCodeShouldBeComputedLazyAndShouldBeFast()
         {
             var geometryCount = 1000000;
             var geometries = new IGeometry[geometryCount];
Index: test/Common/SharpMap.Tests/Data/Providers/QuadTreeTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r89a1f10b30400ae7b2cb1fb364610407a389cfa5
--- test/Common/SharpMap.Tests/Data/Providers/QuadTreeTest.cs	(.../QuadTreeTest.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/Common/SharpMap.Tests/Data/Providers/QuadTreeTest.cs	(.../QuadTreeTest.cs)	(revision 89a1f10b30400ae7b2cb1fb364610407a389cfa5)
@@ -13,8 +13,7 @@
         private static readonly Random Rand = new Random(1234); //deterministic random (for fair comparison)
 
         [Test]
-        [Category(TestCategory.Performance)]
-        public void ConstructQuadTree()
+        public void ConstructQuadTreeShouldBeFast()
         {
             // generate random bounds
             RectangleF extends;
@@ -31,8 +30,7 @@
         }
 
         [Test]
-        [Category(TestCategory.Performance)]
-        public void QueryQuadTree()
+        public void QueryQuadTreeShouldBeFast()
         {
             // generate random bounds
             RectangleF extends;
Index: test/Common/SharpMap.Tests/Editors/FallOff/NoFallOffPolicyTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r89a1f10b30400ae7b2cb1fb364610407a389cfa5
--- test/Common/SharpMap.Tests/Editors/FallOff/NoFallOffPolicyTest.cs	(.../NoFallOffPolicyTest.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/Common/SharpMap.Tests/Editors/FallOff/NoFallOffPolicyTest.cs	(.../NoFallOffPolicyTest.cs)	(revision 89a1f10b30400ae7b2cb1fb364610407a389cfa5)
@@ -113,7 +113,6 @@
         }
 
         [Test]
-        [Category(TestCategory.Performance)]
         public void MovePolygonWithTrackersShouldBeFast()
         {
             var factory = new GeometricShapeFactory();
Index: test/Common/SharpMap.Tests/Rendering/VectorRenderingHelperTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r89a1f10b30400ae7b2cb1fb364610407a389cfa5
--- test/Common/SharpMap.Tests/Rendering/VectorRenderingHelperTest.cs	(.../VectorRenderingHelperTest.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/Common/SharpMap.Tests/Rendering/VectorRenderingHelperTest.cs	(.../VectorRenderingHelperTest.cs)	(revision 89a1f10b30400ae7b2cb1fb364610407a389cfa5)
@@ -28,7 +28,6 @@
         }
 
         [Test]
-        [Category(TestCategory.Performance)]
         public void RenderManyLinesShouldBeFast()
         {
             using (var bmp = new Bitmap(200, 200))
Index: test/Common/SharpMap.UI.Tests/Tools/SelectToolTest.cs
===================================================================
diff -u -rc911dd539d1c78029e363c35adbee1c92f98d3ea -r89a1f10b30400ae7b2cb1fb364610407a389cfa5
--- test/Common/SharpMap.UI.Tests/Tools/SelectToolTest.cs	(.../SelectToolTest.cs)	(revision c911dd539d1c78029e363c35adbee1c92f98d3ea)
+++ test/Common/SharpMap.UI.Tests/Tools/SelectToolTest.cs	(.../SelectToolTest.cs)	(revision 89a1f10b30400ae7b2cb1fb364610407a389cfa5)
@@ -199,7 +199,7 @@
 
         [Test]
         [Category(TestCategory.Performance)]
-        public void SetLayerWithManySelectedFeaturesVisibilityFalse()
+        public void SetLayerWithManySelectedFeaturesVisibilityFalseShouldBeFast()
         {
             var mapControl = new MapControl();
             var features = Enumerable.Range(0, 10000).Select(i => new TestFeature {Geometry = new Point(i, i)}).ToList();