Index: Core/Common/test/Core.Common.Base.Tests/Controls/Swf/Table/TableViewTest.cs
===================================================================
diff -u -r0c662ac435fd244395ce5fd7d94eeefcf940364c -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/Common/test/Core.Common.Base.Tests/Controls/Swf/Table/TableViewTest.cs	(.../TableViewTest.cs)	(revision 0c662ac435fd244395ce5fd7d94eeefcf940364c)
+++ Core/Common/test/Core.Common.Base.Tests/Controls/Swf/Table/TableViewTest.cs	(.../TableViewTest.cs)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -22,8 +22,8 @@
 using DevExpress.XtraGrid.Views.Grid;
 using DevExpress.XtraGrid.Views.Grid.ViewInfo;
 using NUnit.Framework;
+using PostSharp.Reflection;
 using Rhino.Mocks;
-using SharpTestsEx;
 
 namespace Core.Common.Base.Tests.Controls.Swf.Table
 {
@@ -573,7 +573,7 @@
             tableView.Columns[1].CustomFormatter = new AddDashTestFormatter();
             tableView.Columns[1].Editor = comboBoxTypeEditor; // inject it under the 2nd column
 
-            WindowsFormsTestHelper.ShowModal(tableView, f => tableView.GetCellDisplayText(0, 1).Should().Be.EqualTo("-item type1-"));
+            WindowsFormsTestHelper.ShowModal(tableView, f => Assert.AreEqual("-item type1-", tableView.GetCellDisplayText(0, 1)));
         }
 
         [Test]
@@ -626,9 +626,9 @@
 
             WindowsFormsTestHelper.ShowModal(tableView, f =>
             {
-                var dxColumn = tableView.Columns[1].FieldValue<GridColumn>("dxColumn");
+                var dxColumn = (GridColumn) TypeUtils.GetField(tableView.Columns[1], "dxColumn");
                 var dxEditor = (RepositoryItemComboBox) dxColumn.ColumnEdit;
-                TypeUtils.GetPropertyValue(dxEditor.Items[0], "DisplayText").Should().Be.EqualTo("[item type1]");
+                Assert.AreEqual("[item type1]",TypeUtils.GetPropertyValue(dxEditor.Items[0], "DisplayText"));
             });
         }
 
@@ -683,7 +683,7 @@
             // * Table view should show to entries using 'AddDashTestFormatter' in 2nd column only.
             // * Editor of 2nd column should show entries using 'AddBrackerTestFormatter'.
             // * Transitioning between editing (dropdown box visible) and non-editing (no dropdown box visible) should work with the correct custom formatter.
-            WindowsFormsTestHelper.ShowModal(tableView, f => tableView.GetCellDisplayText(0, 1).Should().Be.EqualTo("-item type1-"));
+            WindowsFormsTestHelper.ShowModal(tableView, f => Assert.AreEqual("-item type1-", tableView.GetCellDisplayText(0, 1)));
         }
 
         [Test]
@@ -700,8 +700,7 @@
                 Data = table
             };
 
-            tableView.SelectedCells
-                     .Should().Be.Empty();
+            CollectionAssert.IsEmpty(tableView.SelectedCells);
         }
 
         [Test]
@@ -1377,12 +1376,12 @@
             tableView.GetColumnByName("DateOfBirth").DisplayFormat = dtFormat1;
             tableView.GetColumnByName("DateOfDeath").DisplayFormat = dtFormat2;
 
-            tableView.GetColumnByName("Name").DisplayFormat.Should().Be.EqualTo("Name = {0}");
+            Assert.AreEqual("Name = {0}", tableView.GetColumnByName("Name").DisplayFormat);
 
-            tableView.GetCellDisplayText(0, 0).Should().Be.EqualTo("Name = Aaltje");
-            tableView.GetCellDisplayText(0, 1).Should().Be.EqualTo("012");
-            tableView.GetCellDisplayText(0, 2).Should().Be.EqualTo(dateOfBirth.ToString(dtFormat1));
-            tableView.GetCellDisplayText(0, 3).Should().Be.EqualTo(dateOfDeath.ToString(dtFormat2));
+            Assert.AreEqual("Name = Aaltje", tableView.GetCellDisplayText(0, 0));
+            Assert.AreEqual("012", tableView.GetCellDisplayText(0, 1));
+            Assert.AreEqual(dateOfBirth.ToString(dtFormat1), tableView.GetCellDisplayText(0, 2));
+            Assert.AreEqual(dateOfDeath.ToString(dtFormat2), tableView.GetCellDisplayText(0, 3));
         }
 
         [Test]
@@ -1416,12 +1415,12 @@
             tableView.GetColumnByName("DateOfBirth").DisplayFormat = dtFormat1;
             tableView.GetColumnByName("DateOfDeath").CustomFormatter = dtFormatter;
 
-            tableView.GetColumnByName("Name").DisplayFormat.Should().Be.EqualTo("Name = {0}");
+            Assert.AreEqual("Name = {0}", tableView.GetColumnByName("Name").DisplayFormat);
 
-            tableView.GetCellDisplayText(0, 0).Should().Be.EqualTo("Name = Aaltje");
-            tableView.GetCellDisplayText(0, 1).Should().Be.EqualTo("012");
-            tableView.GetCellDisplayText(0, 2).Should().Be.EqualTo(dateOfBirth.ToString(dtFormat1));
-            tableView.GetCellDisplayText(0, 3).Should().Be.EqualTo(dtFormatter.Format("", dateOfDeath, null));
+            Assert.AreEqual("Name = Aaltje", tableView.GetCellDisplayText(0, 0));
+            Assert.AreEqual("012", tableView.GetCellDisplayText(0, 1));
+            Assert.AreEqual(dateOfBirth.ToString(dtFormat1), tableView.GetCellDisplayText(0, 2));
+            Assert.AreEqual(dtFormatter.Format("", dateOfDeath, null), tableView.GetCellDisplayText(0, 3));
         }
 
         [Test]
@@ -1449,7 +1448,7 @@
             nameColumn.DisplayFormat = "Name = {0}";
             nameColumn.CustomFormatter = new NameTableCellFormatter();
 
-            tableView.GetCellDisplayText(0, 0).Should().Be.EqualTo("Name with custom formatter : Aaltje");
+            Assert.AreEqual("Name with custom formatter : Aaltje", tableView.GetCellDisplayText(0, 0));
         }
 
         [Test]
Index: Core/Common/test/Core.Common.Base.Tests/Controls/Swf/TreeViewControls/TreeNodeTest.cs
===================================================================
diff -u -rf304476c67fb717c18861e55f54e628055cd84f7 -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/Common/test/Core.Common.Base.Tests/Controls/Swf/TreeViewControls/TreeNodeTest.cs	(.../TreeNodeTest.cs)	(revision f304476c67fb717c18861e55f54e628055cd84f7)
+++ Core/Common/test/Core.Common.Base.Tests/Controls/Swf/TreeViewControls/TreeNodeTest.cs	(.../TreeNodeTest.cs)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -1,6 +1,5 @@
 using Core.Common.Controls.Swf.TreeViewControls;
 using NUnit.Framework;
-using SharpTestsEx;
 
 namespace Core.Common.Base.Tests.Controls.Swf.TreeViewControls
 {
@@ -28,7 +27,7 @@
 
             var node = node12.GetParentOfLevel(0);
 
-            node.Should().Be.EqualTo(node1);
+            Assert.AreEqual(node1, node);
         }
     
         [Test]
Index: Core/Common/test/Core.Common.Base.Tests/Controls/Swf/TreeViewControls/TreeViewTest.cs
===================================================================
diff -u -r1e4d2363eb853577139c402364c4462dad821046 -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/Common/test/Core.Common.Base.Tests/Controls/Swf/TreeViewControls/TreeViewTest.cs	(.../TreeViewTest.cs)	(revision 1e4d2363eb853577139c402364c4462dad821046)
+++ Core/Common/test/Core.Common.Base.Tests/Controls/Swf/TreeViewControls/TreeViewTest.cs	(.../TreeViewTest.cs)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -11,7 +11,6 @@
 using Core.Common.TestUtils;
 using NUnit.Framework;
 using Rhino.Mocks;
-using SharpTestsEx;
 using MessageBox = Core.Common.Controls.Swf.MessageBox;
 using TreeView = Core.Common.Controls.Swf.TreeViewControls.TreeView;
 
@@ -60,7 +59,7 @@
         [Test]
         public void HideSelectionIsFalseByDefault()
         {
-            new TreeView().HideSelection.Should().Be.False();
+            Assert.IsFalse(new TreeView().HideSelection);
         }
 
         [Test]
@@ -240,8 +239,7 @@
             node1.Nodes.Add(node2);
             node1.Nodes.Add(node3);
 
-            node1.Nodes.Count
-                 .Should().Be.EqualTo(2);
+            Assert.AreEqual(2, node1.Nodes.Count);
         }
 
         [Test]
@@ -259,8 +257,7 @@
 
             node1.Expand();
 
-            node1.Nodes.Count
-                 .Should().Be.EqualTo(2);
+            Assert.AreEqual(2, node1.Nodes.Count);
         }
 
         [Test]
@@ -279,8 +276,8 @@
             // set data to tree view
             treeView.Data = rootObject;
 
-            treeView.SelectedNode.Should().Not.Be.Null();
-            treeView.SelectedNode.Tag.Should().Be.SameInstanceAs(rootObject);
+            Assert.NotNull(treeView.SelectedNode);
+            Assert.AreSame(rootObject, treeView.SelectedNode.Tag);
         }
 
         /// <summary>
@@ -311,7 +308,7 @@
                 treeView.Refresh();
 
                 // asserts
-                treeView.Nodes[0].Nodes[0].IsExpanded.Should("node remains expanded").Be.True();
+                Assert.IsTrue(treeView.Nodes[0].Nodes[0].IsExpanded, "node remains expanded");
             }
             finally
             {
Index: Core/Common/test/Core.Common.Base.Tests/Core.Common.Base.Tests.csproj
===================================================================
diff -u -r94ef875f26bff005b1d53880c92f350b373a31ec -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/Common/test/Core.Common.Base.Tests/Core.Common.Base.Tests.csproj	(.../Core.Common.Base.Tests.csproj)	(revision 94ef875f26bff005b1d53880c92f350b373a31ec)
+++ Core/Common/test/Core.Common.Base.Tests/Core.Common.Base.Tests.csproj	(.../Core.Common.Base.Tests.csproj)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -87,9 +87,6 @@
       <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SharpTestsEx">
-      <HintPath>..\..\..\..\lib\SharpTestsEx.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Activities" />
     <Reference Include="System.Core">
Index: Core/Common/test/Core.Common.Integration.Tests/Core.Common.Integration.Tests.csproj
===================================================================
diff -u -ree60be046a1b4e4151bb567e9a9c3ab0876d3b55 -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/Common/test/Core.Common.Integration.Tests/Core.Common.Integration.Tests.csproj	(.../Core.Common.Integration.Tests.csproj)	(revision ee60be046a1b4e4151bb567e9a9c3ab0876d3b55)
+++ Core/Common/test/Core.Common.Integration.Tests/Core.Common.Integration.Tests.csproj	(.../Core.Common.Integration.Tests.csproj)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -70,9 +70,6 @@
       <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SharpTestsEx">
-      <HintPath>..\..\..\..\lib\SharpTestsEx.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
Index: Core/Common/test/Core.Common.Integration.Tests/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs
===================================================================
diff -u -r4d688bb446eb4508ff3b54b06baefbb71f60237a -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/Common/test/Core.Common.Integration.Tests/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs	(.../RingtoetsGuiIntegrationTest.cs)	(revision 4d688bb446eb4508ff3b54b06baefbb71f60237a)
+++ Core/Common/test/Core.Common.Integration.Tests/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs	(.../RingtoetsGuiIntegrationTest.cs)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -11,7 +11,6 @@
 using Core.Plugins.SharpMapGis;
 using Core.Plugins.SharpMapGis.Gui;
 using NUnit.Framework;
-using SharpTestsEx;
 using Control = System.Windows.Controls.Control;
 
 namespace Core.Common.Integration.Tests.Ringtoets.Application.Ringtoets
@@ -188,7 +187,7 @@
                 gui.Plugins.Add(new ProjectExplorerGuiPlugin());
                 gui.Run();
 
-                gui.Selection.Should().Be.EqualTo(gui.Application.Project);
+                Assert.AreEqual(gui.Application.Project, gui.Selection);
             }
         }
 
@@ -221,7 +220,7 @@
                 var treeView = projectExplorer.TreeView;
                 treeView.SelectedNode = treeView.Nodes[0]; // project node
 
-                gui.Selection.Should().Be.EqualTo(app.Project);
+                Assert.AreEqual(app.Project, gui.Selection);
             }
         }
 
Index: Core/Common/test/Core.Common.Tests/Core.Common.Tests.csproj
===================================================================
diff -u -ree60be046a1b4e4151bb567e9a9c3ab0876d3b55 -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/Common/test/Core.Common.Tests/Core.Common.Tests.csproj	(.../Core.Common.Tests.csproj)	(revision ee60be046a1b4e4151bb567e9a9c3ab0876d3b55)
+++ Core/Common/test/Core.Common.Tests/Core.Common.Tests.csproj	(.../Core.Common.Tests.csproj)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -71,9 +71,6 @@
       <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SharpTestsEx">
-      <HintPath>..\..\..\..\lib\SharpTestsEx.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
Index: Core/Common/test/Core.Common.Tests/Gui/GuiExportHandlerTest.cs
===================================================================
diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/Common/test/Core.Common.Tests/Gui/GuiExportHandlerTest.cs	(.../GuiExportHandlerTest.cs)	(revision eee6c7815d1e418eac38c1c552fb279c0887ef55)
+++ Core/Common/test/Core.Common.Tests/Gui/GuiExportHandlerTest.cs	(.../GuiExportHandlerTest.cs)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -1,12 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
-using Application.Ringtoets;
 using Core.Common.Base;
 using Core.Common.Gui;
 using NUnit.Framework;
 using Rhino.Mocks;
-using SharpTestsEx;
 
 namespace Core.Common.Tests.Gui
 {
@@ -18,7 +16,7 @@
         {
             var handler = new GuiExportHandler(FileExportersGetter, null);
 
-            handler.GetSupportedExportersForItem("string item").Should().Not.Be.Empty();
+            CollectionAssert.IsNotEmpty(handler.GetSupportedExportersForItem("string item"));
         }
 
         [Test]
@@ -39,7 +37,7 @@
             {
                 exporter
             }, null);
-            handler.GetSupportedExportersForItem("string").Should().Be.Empty();
+            CollectionAssert.IsEmpty(handler.GetSupportedExportersForItem("string"));
 
             mocks.BackToRecordAll();
 
@@ -51,7 +49,7 @@
 
             mocks.ReplayAll();
 
-            handler.GetSupportedExportersForItem("string").Should().Not.Be.Empty();
+            CollectionAssert.IsNotEmpty(handler.GetSupportedExportersForItem("string"));
 
             mocks.VerifyAll();
         }
Index: Core/Common/test/Core.Common.Tests/Gui/RingtoetsGuiTests.cs
===================================================================
diff -u -r293be5aa0c9cfb58fea075f0ce6943fdfb310406 -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/Common/test/Core.Common.Tests/Gui/RingtoetsGuiTests.cs	(.../RingtoetsGuiTests.cs)	(revision 293be5aa0c9cfb58fea075f0ce6943fdfb310406)
+++ Core/Common/test/Core.Common.Tests/Gui/RingtoetsGuiTests.cs	(.../RingtoetsGuiTests.cs)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -3,7 +3,6 @@
 using Core.Common.TestUtils;
 using log4net.Core;
 using NUnit.Framework;
-using SharpTestsEx;
 
 namespace Core.Common.Tests.Gui
 {
@@ -54,7 +53,7 @@
         [Test]
         public void CheckViewPropertyEditorIsInitialized()
         {
-            ViewPropertyEditor.Gui.Should().Not.Be.Null();
+            Assert.NotNull(ViewPropertyEditor.Gui);
         }
     }
 }
\ No newline at end of file
Index: Core/Common/test/Core.Common.Tests/Gui/ViewListTest.cs
===================================================================
diff -u -r6a3a7c7e3442a1c99598c8f0fe7bd95062bc8845 -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/Common/test/Core.Common.Tests/Gui/ViewListTest.cs	(.../ViewListTest.cs)	(revision 6a3a7c7e3442a1c99598c8f0fe7bd95062bc8845)
+++ Core/Common/test/Core.Common.Tests/Gui/ViewListTest.cs	(.../ViewListTest.cs)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -8,7 +8,6 @@
 using Core.Common.Utils;
 using Core.Common.Utils.Collections;
 using NUnit.Framework;
-using SharpTestsEx;
 
 namespace Core.Common.Tests.Gui
 {
@@ -278,9 +277,9 @@
 
             var returnedViews = viewResolver.GetViewsForData(wrapper); // <-- must trigger IViewProvider.IsViewForData()
 
-            returnedViews.Count.Should("number of compatible views").Be.EqualTo(1);
+            Assert.AreEqual(1, returnedViews.Count, "number of compatible views");
 
-            returnedViews.First().Should("correct view is returned back").Be.EqualTo(view);
+            Assert.AreSame(view, returnedViews.First(), "correct view is returned back");
         }
 
         [Test]
Index: Core/Common/test/Core.Common.Utils.Tests/ChartViewDateTimeFormatProviderTest.cs
===================================================================
diff -u -r84870bd16bee99c65768649303e2679cd7e69fba -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/Common/test/Core.Common.Utils.Tests/ChartViewDateTimeFormatProviderTest.cs	(.../ChartViewDateTimeFormatProviderTest.cs)	(revision 84870bd16bee99c65768649303e2679cd7e69fba)
+++ Core/Common/test/Core.Common.Utils.Tests/ChartViewDateTimeFormatProviderTest.cs	(.../ChartViewDateTimeFormatProviderTest.cs)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -2,7 +2,6 @@
 using System.Globalization;
 using System.Threading;
 using NUnit.Framework;
-using SharpTestsEx;
 
 namespace Core.Common.Utils.Tests
 {
@@ -22,7 +21,7 @@
             provider.CustomDateTimeFormatInfo = CultureInfo.InvariantCulture.DateTimeFormat;
             var outputString = provider.GetRangeLabel(new DateTime(2010, 1, 1), new DateTime(2010, 1, 1));
 
-            outputString.Should("Datetime formatted output not as expected").Be.EqualTo("(Friday, 01 January 2010)");
+            Assert.AreEqual("(Friday, 01 January 2010)", outputString, "Datetime formatted output not as expected");
 
             Thread.CurrentThread.CurrentCulture = oldCulture;
             Thread.CurrentThread.CurrentUICulture = oldCultureUI;
Index: Core/Common/test/Core.Common.Utils.Tests/Collections/EnumerableExtensionsTest.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/Common/test/Core.Common.Utils.Tests/Collections/EnumerableExtensionsTest.cs	(.../EnumerableExtensionsTest.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/test/Core.Common.Utils.Tests/Collections/EnumerableExtensionsTest.cs	(.../EnumerableExtensionsTest.cs)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -4,7 +4,6 @@
 using System.Linq;
 using Core.Common.Utils.Collections;
 using NUnit.Framework;
-using SharpTestsEx;
 
 namespace Core.Common.Utils.Tests.Collections
 {
@@ -20,12 +19,10 @@
             //has two
             IEnumerable two = Enumerable.Range(1, 2);
 
-            two.HasExactlyOneValue()
-               .Should().Be.False();
+            Assert.IsFalse(two.HasExactlyOneValue());
 
             //has none
-            Enumerable.Empty<double>().HasExactlyOneValue()
-                      .Should().Be.False();
+            Assert.IsFalse(Enumerable.Empty<double>().HasExactlyOneValue());
         }
 
         [Test]
@@ -39,24 +36,11 @@
             };
             var results = items.Plus(4);
 
-            results.Should().Have.SameSequenceAs(new[]
-            {
-                1,
-                2,
-                3,
-                4
-            });
+            CollectionAssert.AreEqual(Enumerable.Range(1,4), results);
 
             results = items.Plus(4, 5);
 
-            results.Should().Have.SameSequenceAs(new[]
-            {
-                1,
-                2,
-                3,
-                4,
-                5
-            });
+            CollectionAssert.AreEqual(Enumerable.Range(1, 5), results);
         }
 
         [Test]
@@ -73,8 +57,7 @@
 
             items.ForEach(results.Add);
 
-            results
-                .Should("elements should be equal").Have.SameSequenceAs(items);
+            CollectionAssert.AreEqual(items, results, "elements should be equal");
         }
 
         [Test]
@@ -96,13 +79,8 @@
                 resultIndices.Add(i);
             });
 
-            resultElements.Should().Have.SameSequenceAs(items);
-            resultIndices.Should().Have.SameSequenceAs(new[]
-            {
-                0,
-                1,
-                2
-            });
+            CollectionAssert.AreEqual(items, resultElements);
+            CollectionAssert.AreEqual(Enumerable.Range(0,3), resultIndices);
         }
 
         [Test]
Index: Core/Common/test/Core.Common.Utils.Tests/Core.Common.Utils.Tests.csproj
===================================================================
diff -u -ree60be046a1b4e4151bb567e9a9c3ab0876d3b55 -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/Common/test/Core.Common.Utils.Tests/Core.Common.Utils.Tests.csproj	(.../Core.Common.Utils.Tests.csproj)	(revision ee60be046a1b4e4151bb567e9a9c3ab0876d3b55)
+++ Core/Common/test/Core.Common.Utils.Tests/Core.Common.Utils.Tests.csproj	(.../Core.Common.Utils.Tests.csproj)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -72,9 +72,6 @@
       <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SharpTestsEx">
-      <HintPath>..\..\..\..\lib\SharpTestsEx.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
Index: Core/Common/test/Core.Common.Utils.Tests/Globalization/RegionalSettingsManagerTest.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/Common/test/Core.Common.Utils.Tests/Globalization/RegionalSettingsManagerTest.cs	(.../RegionalSettingsManagerTest.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/test/Core.Common.Utils.Tests/Globalization/RegionalSettingsManagerTest.cs	(.../RegionalSettingsManagerTest.cs)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -3,7 +3,6 @@
 using System.Threading;
 using Core.Common.Utils.Globalization;
 using NUnit.Framework;
-using SharpTestsEx;
 
 namespace Core.Common.Utils.Tests.Globalization
 {
@@ -19,11 +18,9 @@
 
             RegionalSettingsManager.Language = "ru-RU";
 
-            languageChangedCallCount
-                .Should("event is fired when language is changed").Be.EqualTo(1);
+            Assert.AreEqual(1, languageChangedCallCount, "event is fired when language is changed");
 
-            RegionalSettingsManager.Language
-                                   .Should().Be.EqualTo("ru-RU");
+            Assert.AreEqual("ru-RU", RegionalSettingsManager.Language);
         }
 
         [Test]
@@ -42,11 +39,8 @@
 
             var currentNumberFormat = Thread.CurrentThread.CurrentCulture.NumberFormat;
 
-            str
-                .Should().Be.EqualTo("1000000" + currentNumberFormat.NumberDecimalSeparator + "0");
-
-            formatChangedCallCount
-                .Should().Be.EqualTo(1);
+            Assert.AreEqual("1000000" + currentNumberFormat.NumberDecimalSeparator + "0", str);
+            Assert.AreEqual(1, formatChangedCallCount);
         }
 
         [Test]
Index: Core/Common/test/Core.Common.Utils.Tests/PropertyBag/DynamicPropertyBagTest.cs
===================================================================
diff -u -r84a9db62e2fb9699c289b2df788b6d622e4f637a -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/Common/test/Core.Common.Utils.Tests/PropertyBag/DynamicPropertyBagTest.cs	(.../DynamicPropertyBagTest.cs)	(revision 84a9db62e2fb9699c289b2df788b6d622e4f637a)
+++ Core/Common/test/Core.Common.Utils.Tests/PropertyBag/DynamicPropertyBagTest.cs	(.../DynamicPropertyBagTest.cs)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -6,7 +6,6 @@
 using Core.Common.Utils.PropertyBag;
 using Core.Common.Utils.PropertyBag.Dynamic;
 using NUnit.Framework;
-using SharpTestsEx;
 using CategoryComponentModelAttribute = System.ComponentModel.CategoryAttribute;
 
 namespace Core.Common.Utils.Tests.PropertyBag
@@ -19,8 +18,7 @@
         {
             var dynamicPropertyBag = new DynamicPropertyBag(new TestProperties());
 
-            dynamicPropertyBag.Properties.Count
-                              .Should("Expected property count wrong").Be.EqualTo(4);
+            Assert.AreEqual(4, dynamicPropertyBag.Properties.Count, "Expected property count wrong");
         }
 
         [Test]
@@ -44,11 +42,9 @@
             }
 
             // asserts
-            nameProperty.Attributes.Any(x => x.GetType() == typeof(CategoryComponentModelAttribute))
-                        .Should("Static Category attribute not copied!").Be.True();
+            Assert.IsTrue(nameProperty.Attributes.Any(x => x.GetType() == typeof(CategoryComponentModelAttribute)), "Static Category attribute not copied!");
 
-            descriptionProperty.Attributes
-                               .Should("Static ReadOnly attribute not copied!").Contain(ReadOnlyAttribute.Yes);
+            CollectionAssert.Contains(descriptionProperty.Attributes, ReadOnlyAttribute.Yes, "Static ReadOnly attribute not copied!");
         }
 
         [Test]
@@ -68,11 +64,9 @@
             namePropertyDescriptor.GetValue(dynamicPropertyBag);
 
             // asserts
-            namePropertyDescriptor.Attributes.Matches(new DynamicReadOnlyAttribute())
-                                  .Should("Dynamic ReadOnly attribute was not added").Be.True();
+            Assert.IsTrue(namePropertyDescriptor.Attributes.Matches(new DynamicReadOnlyAttribute()),"Dynamic ReadOnly attribute was not added");
 
-            namePropertyDescriptor.Attributes.Matches(new ReadOnlyAttribute(true))
-                                  .Should("Inactive dynamic ReadOnly attribute was resolved to static attribute: wrong.").Be.False();
+            Assert.IsFalse(namePropertyDescriptor.Attributes.Matches(new ReadOnlyAttribute(true)), "Inactive dynamic ReadOnly attribute was resolved to static attribute: wrong.");
         }
 
         [Test]
@@ -87,11 +81,9 @@
             namePropertyDescriptor.GetValue(dynamicPropertyBag);
 
             // asserts
-            namePropertyDescriptor.Attributes.Matches(new DynamicReadOnlyAttribute())
-                                  .Should("Dynamic ReadOnly attribute was not added").Be.True();
+            Assert.IsTrue(namePropertyDescriptor.Attributes.Matches(new DynamicReadOnlyAttribute()), "Dynamic ReadOnly attribute was not added");
 
-            namePropertyDescriptor.Attributes.Matches(new ReadOnlyAttribute(true))
-                                  .Should("Dynamic ReadOnly attribute was not resolved to static attribute: wrong.").Be.True();
+            Assert.IsTrue(namePropertyDescriptor.Attributes.Matches(new ReadOnlyAttribute(true)), "Dynamic ReadOnly attribute was not resolved to static attribute: wrong.");
         }
 
         [Test]
@@ -163,7 +155,7 @@
             var wrappedValue = propertiesCollection[0].GetValue(dynamicPropertyBag);
 
             // check the object properties are wrapped in a dynamic property bag
-            wrappedValue.Should("Object properties wrapped in dynamic property bag").Be.OfType<DynamicPropertyBag>();
+            Assert.IsInstanceOf<DynamicPropertyBag>(wrappedValue, "Object properties wrapped in dynamic property bag");
         }
 
         [Test]
@@ -182,8 +174,7 @@
             var expected = "newName";
             propertyGrid.SelectedGridItem.PropertyDescriptor.SetValue(null, expected);
 
-            testProperties.Name
-                          .Should("Name not correctly set").Be.EqualTo(expected);
+            Assert.AreEqual(expected, testProperties.Name, "Name not correctly set");
         }
 
         [Test]
Index: Core/Common/test/Core.Common.Utils.Tests/Reflection/TypeExtensionsTest.cs
===================================================================
diff -u -r6a3a7c7e3442a1c99598c8f0fe7bd95062bc8845 -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/Common/test/Core.Common.Utils.Tests/Reflection/TypeExtensionsTest.cs	(.../TypeExtensionsTest.cs)	(revision 6a3a7c7e3442a1c99598c8f0fe7bd95062bc8845)
+++ Core/Common/test/Core.Common.Utils.Tests/Reflection/TypeExtensionsTest.cs	(.../TypeExtensionsTest.cs)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -1,7 +1,6 @@
 using System.ComponentModel;
 using Core.Common.Utils.Reflection;
 using NUnit.Framework;
-using SharpTestsEx;
 
 namespace Core.Common.Utils.Tests.Reflection
 {
@@ -11,8 +10,7 @@
         [Test]
         public void GetDisplayName()
         {
-            typeof(Person).GetDisplayName()
-                          .Should().Be.EqualTo("person");
+            Assert.AreEqual("person", typeof(Person).GetDisplayName());
         }
 
         [DisplayName(@"person")]
Index: Core/Common/test/Core.Common.Utils.Tests/StringExtensionsTests.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/Common/test/Core.Common.Utils.Tests/StringExtensionsTests.cs	(.../StringExtensionsTests.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/test/Core.Common.Utils.Tests/StringExtensionsTests.cs	(.../StringExtensionsTests.cs)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -1,7 +1,6 @@
 using System;
 using System.Globalization;
 using NUnit.Framework;
-using SharpTestsEx;
 
 namespace Core.Common.Utils.Tests
 {
@@ -11,17 +10,17 @@
         [Test]
         public void Parse()
         {
-            "12.34".Parse<double>(CultureInfo.InvariantCulture).Should().Be.EqualTo(12.34);
+            Assert.AreEqual(12.34, "12.34".Parse<double>(CultureInfo.GetCultureInfo("nl-NL")));
 
-            "1234".Parse<int>().Should().Be.EqualTo(1234);
+            Assert.AreEqual(1234, "1234".Parse<int>());
 
-            "asdf".Parse<int>().Should().Be.EqualTo(0); // i.e. default(int)
+            Assert.AreEqual(0, "asdf".Parse<int>()); // i.e. default(int)
 
-            "1234".Parse<int?>().Should().Be.EqualTo(1234);
+            Assert.AreEqual(1234, "1234".Parse<int?>());
 
-            "asdf".Parse<int?>().Should().Be.EqualTo(null);
+            Assert.IsNull("asdf".Parse<int?>());
 
-            "2001-02-03".Parse<DateTime?>().Should().Be.EqualTo(new DateTime(2001, 2, 3));
+            Assert.AreEqual(new DateTime(2001, 2, 3), "2001-02-03".Parse<DateTime?>());
         }
 
         [Test]
Index: Core/Common/test/Core.Common.Utils.Tests/TestHelperTests.cs
===================================================================
diff -u -r71fa16075699948cabba65c56d646e0268fd2b89 -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/Common/test/Core.Common.Utils.Tests/TestHelperTests.cs	(.../TestHelperTests.cs)	(revision 71fa16075699948cabba65c56d646e0268fd2b89)
+++ Core/Common/test/Core.Common.Utils.Tests/TestHelperTests.cs	(.../TestHelperTests.cs)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -8,7 +8,6 @@
 
 using log4net;
 using NUnit.Framework;
-using SharpTestsEx;
 
 namespace Core.Common.Utils.Tests
 {
@@ -85,16 +84,11 @@
                 0.25
             });
 
-            colorRed.Name
-                    .Should().Be.EqualTo("Red");
-            colorYellow1.Name
-                        .Should().Be.EqualTo("fffcfe00");
-            colorYellow2.Name
-                        .Should().Be.EqualTo("fffcfe00");
-            colorYellow3.Name
-                        .Should().Be.EqualTo("fffcfe00");
-            colorGreen.Name
-                      .Should().Be.EqualTo("ff008000");
+            Assert.AreEqual("Red", colorRed.Name);
+            Assert.AreEqual("fffcfe00", colorYellow1.Name);
+            Assert.AreEqual("fffcfe00", colorYellow2.Name);
+            Assert.AreEqual("fffcfe00", colorYellow3.Name);
+            Assert.AreEqual("ff008000", colorGreen.Name);
 
             // dump all colors to html file for visual test
             const string path = "GetPerformanceColors.html";
Index: Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Tests/Core.GIS.NetTopologySuite.Extensions.Tests.csproj
===================================================================
diff -u -r31d7b5552adb7b89eaf1552855f88c5df887e4f9 -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Tests/Core.GIS.NetTopologySuite.Extensions.Tests.csproj	(.../Core.GIS.NetTopologySuite.Extensions.Tests.csproj)	(revision 31d7b5552adb7b89eaf1552855f88c5df887e4f9)
+++ Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Tests/Core.GIS.NetTopologySuite.Extensions.Tests.csproj	(.../Core.GIS.NetTopologySuite.Extensions.Tests.csproj)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -62,9 +62,6 @@
     <Reference Include="nunit.framework">
       <HintPath>..\..\..\..\lib\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="SharpTestsEx">
-      <HintPath>..\..\..\..\lib\SharpTestsEx.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
Index: Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Tests/Geometries/GeometryHelperTest.cs
===================================================================
diff -u -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Tests/Geometries/GeometryHelperTest.cs	(.../GeometryHelperTest.cs)	(revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd)
+++ Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Tests/Geometries/GeometryHelperTest.cs	(.../GeometryHelperTest.cs)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -6,7 +6,6 @@
 using Core.GIS.NetTopologySuite.IO;
 using Core.GIS.NetTopologySuite.Utilities;
 using NUnit.Framework;
-using SharpTestsEx;
 using Assert = NUnit.Framework.Assert;
 
 namespace Core.Gis.NetTopologySuite.Extensions.Tests.Geometries
@@ -35,9 +34,7 @@
 
             var feature1 = GeometryHelper.GetNearestFeature(new Coordinate(1, 1), features, 3);
 
-            feature1
-                .Should("the last feature is chosen if more than 1 featres with the same distance are found")
-                .Be.EqualTo(features[2]);
+            Assert.AreEqual(features[2], feature1, "the last feature is chosen if more than 1 features with the same distance are found");
         }
 
         [Test]
@@ -61,9 +58,7 @@
 
             var feature2 = GeometryHelper.GetNearestFeature(new Coordinate(1, 1), features, 0.5);
 
-            feature2
-                .Should("tolerance is too small")
-                .Be.Null();
+            Assert.IsNull(feature2, "tolerance is too small");
         }
 
         [Test]
Index: Core/GIS/test/Core.GIS.SharpMap.Extensions.Tests/Core.GIS.SharpMap.Extensions.Tests.csproj
===================================================================
diff -u -rbc5c669eb6bf927e997d5b88b5c9eddd1ba87f00 -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/GIS/test/Core.GIS.SharpMap.Extensions.Tests/Core.GIS.SharpMap.Extensions.Tests.csproj	(.../Core.GIS.SharpMap.Extensions.Tests.csproj)	(revision bc5c669eb6bf927e997d5b88b5c9eddd1ba87f00)
+++ Core/GIS/test/Core.GIS.SharpMap.Extensions.Tests/Core.GIS.SharpMap.Extensions.Tests.csproj	(.../Core.GIS.SharpMap.Extensions.Tests.csproj)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -67,9 +67,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\lib\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="SharpTestsEx">
-      <HintPath>..\..\..\..\lib\SharpTestsEx.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
Index: Core/GIS/test/Core.GIS.SharpMap.Extensions.Tests/Layers/BingLayerTest.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/GIS/test/Core.GIS.SharpMap.Extensions.Tests/Layers/BingLayerTest.cs	(.../BingLayerTest.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/GIS/test/Core.GIS.SharpMap.Extensions.Tests/Layers/BingLayerTest.cs	(.../BingLayerTest.cs)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -1,6 +1,5 @@
 using Core.GIS.SharpMap.Extensions.Layers;
 using NUnit.Framework;
-using SharpTestsEx;
 
 namespace Core.GIS.SharpMap.Extensions.Tests.Layers
 {
@@ -25,12 +24,10 @@
         [Test]
         public void CacheDirectoryIsDefined()
         {
-            new BingLayer
+            StringAssert.EndsWith(@"cache_bing_aerial", new BingLayer
             {
                 MapType = "Aerial"
-            }.CacheLocation
-             .Should("Cache directory is defined")
-             .EndWith(@"cache_bing_aerial");
+            }.CacheLocation, "Cache directory is defined");
         }
     }
 }
\ No newline at end of file
Index: Core/GIS/test/Core.GIS.SharpMap.Extensions.Tests/Layers/OpenStreetMapLayerTest.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/GIS/test/Core.GIS.SharpMap.Extensions.Tests/Layers/OpenStreetMapLayerTest.cs	(.../OpenStreetMapLayerTest.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/GIS/test/Core.GIS.SharpMap.Extensions.Tests/Layers/OpenStreetMapLayerTest.cs	(.../OpenStreetMapLayerTest.cs)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -1,6 +1,5 @@
 using Core.GIS.SharpMap.Extensions.Layers;
 using NUnit.Framework;
-using SharpTestsEx;
 
 namespace Core.GIS.SharpMap.Extensions.Tests.Layers
 {
@@ -10,9 +9,7 @@
         [Test]
         public void CacheDirectoryIsDefined()
         {
-            OpenStreetMapLayer.CacheLocation
-                              .Should("Cache directory is defined")
-                              .EndWith(@"cache_open_street_map");
+            StringAssert.EndsWith(@"cache_open_street_map", OpenStreetMapLayer.CacheLocation, "Cache directory is defined");
         }
     }
 }
\ No newline at end of file
Index: Core/GIS/test/Core.GIS.SharpMap.Tests/Core.GIS.SharpMap.Tests.csproj
===================================================================
diff -u -ree60be046a1b4e4151bb567e9a9c3ab0876d3b55 -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/GIS/test/Core.GIS.SharpMap.Tests/Core.GIS.SharpMap.Tests.csproj	(.../Core.GIS.SharpMap.Tests.csproj)	(revision ee60be046a1b4e4151bb567e9a9c3ab0876d3b55)
+++ Core/GIS/test/Core.GIS.SharpMap.Tests/Core.GIS.SharpMap.Tests.csproj	(.../Core.GIS.SharpMap.Tests.csproj)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -89,9 +89,6 @@
       <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SharpTestsEx">
-      <HintPath>..\..\..\..\lib\SharpTestsEx.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
Index: Core/GIS/test/Core.GIS.SharpMap.Tests/Data/FeatureDataRowAttributeAccessorTest.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/GIS/test/Core.GIS.SharpMap.Tests/Data/FeatureDataRowAttributeAccessorTest.cs	(.../FeatureDataRowAttributeAccessorTest.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/GIS/test/Core.GIS.SharpMap.Tests/Data/FeatureDataRowAttributeAccessorTest.cs	(.../FeatureDataRowAttributeAccessorTest.cs)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -1,6 +1,5 @@
 using Core.GIS.SharpMap.Data;
 using NUnit.Framework;
-using SharpTestsEx;
 
 namespace Core.GIS.SharpMap.Tests.Data
 {
@@ -19,8 +18,7 @@
             // now add column and check if it is available via accessor
             table.Columns.Add("Name", typeof(string));
 
-            accessor.Count
-                    .Should().Be.EqualTo(1);
+            Assert.AreEqual(1, accessor.Count);
         }
     }
 }
\ No newline at end of file
Index: Core/GIS/test/Core.GIS.SharpMap.Tests/Data/FeatureDataSetTest.cs
===================================================================
diff -u -r9f01c4daf5b7af6549045ed6ac404d18419c2555 -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/GIS/test/Core.GIS.SharpMap.Tests/Data/FeatureDataSetTest.cs	(.../FeatureDataSetTest.cs)	(revision 9f01c4daf5b7af6549045ed6ac404d18419c2555)
+++ Core/GIS/test/Core.GIS.SharpMap.Tests/Data/FeatureDataSetTest.cs	(.../FeatureDataSetTest.cs)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -2,7 +2,6 @@
 using Core.GIS.NetTopologySuite.Geometries;
 using Core.GIS.SharpMap.Data;
 using NUnit.Framework;
-using SharpTestsEx;
 
 namespace Core.GIS.SharpMap.Tests.Data
 {
@@ -25,21 +24,16 @@
             // now access it using IFeature iterfaces
             IFeature f1 = feature1;
 
-            f1.Attributes.Count
-              .Should().Be.EqualTo(2);
+            Assert.AreEqual(2, f1.Attributes.Count);
 
-            f1.Attributes.Keys
-              .Should().Have.SameSequenceAs(new[]
+            CollectionAssert.AreEqual(new[]
               {
                   "name",
                   "attribute1"
-              });
+              },f1.Attributes.Keys);
 
-            f1.Attributes["name"]
-                .Should().Be.EqualTo("feature1");
-
-            f1.Attributes["attribute1"]
-                .Should().Be.EqualTo(1);
+            Assert.AreEqual("feature1", f1.Attributes["name"]);
+            Assert.AreEqual(1, f1.Attributes["attribute1"]);
         }
     }
 }
\ No newline at end of file
Index: Core/GIS/test/Core.GIS.SharpMap.Tests/Layers/LabelLayerTest.cs
===================================================================
diff -u -r5869dc3e57dfc3f16d35a28154f7304c66952906 -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/GIS/test/Core.GIS.SharpMap.Tests/Layers/LabelLayerTest.cs	(.../LabelLayerTest.cs)	(revision 5869dc3e57dfc3f16d35a28154f7304c66952906)
+++ Core/GIS/test/Core.GIS.SharpMap.Tests/Layers/LabelLayerTest.cs	(.../LabelLayerTest.cs)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -4,7 +4,6 @@
 using Core.GIS.SharpMap.Data.Providers;
 using Core.GIS.SharpMap.Layers;
 using NUnit.Framework;
-using SharpTestsEx;
 using Point = Core.GIS.NetTopologySuite.Geometries.Point;
 
 namespace Core.GIS.SharpMap.Tests.Layers
@@ -50,17 +49,15 @@
                 {
                     callCount++;
 
-                    feature
-                        .Should().Be.OfType<SimpleFeature>();
+                    Assert.IsInstanceOf<SimpleFeature>(feature);
 
                     return ((SimpleFeature) feature).Data.ToString();
                 }
             };
 
             labelLayer.Render();
 
-            callCount
-                .Should("labels of 2 simple feature rendered").Be.EqualTo(2);
+            Assert.AreEqual(2, callCount, "labels of 2 simple feature rendered");
         }
 
         private class SimpleFeature : Feature
Index: Core/GIS/test/Core.GIS.SharpMap.Tests/Layers/VectorLayerTest.cs
===================================================================
diff -u -re49c7935bf548061d1272e5f5bc8fdaf663b0225 -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/GIS/test/Core.GIS.SharpMap.Tests/Layers/VectorLayerTest.cs	(.../VectorLayerTest.cs)	(revision e49c7935bf548061d1272e5f5bc8fdaf663b0225)
+++ Core/GIS/test/Core.GIS.SharpMap.Tests/Layers/VectorLayerTest.cs	(.../VectorLayerTest.cs)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -12,7 +12,6 @@
 using Core.GIS.SharpMap.Layers;
 using Core.GIS.SharpMap.Styles;
 using NUnit.Framework;
-using SharpTestsEx;
 
 namespace Core.GIS.SharpMap.Tests.Layers
 {
@@ -144,16 +143,13 @@
             };
             map.Render();
 
-            callCount
-                .Should("labels are rendered for 2 features of the vector layer").Be.EqualTo(2);
+            Assert.AreEqual(2, callCount, "labels are rendered for 2 features of the vector layer");
         }
 
         [Test]
         public void LabelsLayerIsInitializedAndOffByDefault()
         {
-            var layer = new VectorLayer();
-            layer.LabelLayer.Visible
-                 .Should("label layer is off by default").Be.False();
+            Assert.IsFalse(new VectorLayer().LabelLayer.Visible, "label layer is off by default");
         }
 
         [Test]
@@ -197,8 +193,7 @@
             };
             map.Render();
 
-            callCount
-                .Should("labels are not rendered when label layer is not visible").Be.EqualTo(0);
+            Assert.AreEqual(0, callCount, "labels are not rendered when label layer is not visible");
         }
 
         [Test]
Index: Core/GIS/test/Core.GIS.SharpMap.UI.Tests/Core.GIS.SharpMap.UI.Tests.csproj
===================================================================
diff -u -ree60be046a1b4e4151bb567e9a9c3ab0876d3b55 -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/GIS/test/Core.GIS.SharpMap.UI.Tests/Core.GIS.SharpMap.UI.Tests.csproj	(.../Core.GIS.SharpMap.UI.Tests.csproj)	(revision ee60be046a1b4e4151bb567e9a9c3ab0876d3b55)
+++ Core/GIS/test/Core.GIS.SharpMap.UI.Tests/Core.GIS.SharpMap.UI.Tests.csproj	(.../Core.GIS.SharpMap.UI.Tests.csproj)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -70,9 +70,6 @@
       <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SharpTestsEx">
-      <HintPath>..\..\..\..\lib\SharpTestsEx.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
Index: Core/GIS/test/Core.GIS.SharpMap.UI.Tests/Tools/SelectToolTest.cs
===================================================================
diff -u -reb012559c6dd84e85838dd827a99ea0b858bffd8 -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/GIS/test/Core.GIS.SharpMap.UI.Tests/Tools/SelectToolTest.cs	(.../SelectToolTest.cs)	(revision eb012559c6dd84e85838dd827a99ea0b858bffd8)
+++ Core/GIS/test/Core.GIS.SharpMap.UI.Tests/Tools/SelectToolTest.cs	(.../SelectToolTest.cs)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -12,7 +12,6 @@
 using Core.GIS.SharpMap.UI.Forms;
 using Core.GIS.SharpMap.UI.Tools;
 using NUnit.Framework;
-using SharpTestsEx;
 
 namespace Core.GIS.SharpMap.UI.Tests.Tools
 {
@@ -56,8 +55,7 @@
 
                 mapControl.Map.Layers.Clear();
 
-                selectTool.Selection
-                          .Should("selection is cleared on layer remove").Be.Empty();
+                CollectionAssert.IsEmpty(selectTool.Selection, "selection is cleared on layer remove");
             }
 
             WindowsFormsTestHelper.CloseAll();
@@ -108,8 +106,7 @@
                 mapControl.Map.Layers.Remove(groupLayer);
                 mapControl.Map.NotifyObservers();
 
-                selectTool.Selection
-                          .Should("selection is cleared on layer remove").Be.Empty();
+                CollectionAssert.IsEmpty(selectTool.Selection, "selection is cleared on layer remove");
             }
 
             WindowsFormsTestHelper.CloseAll();
@@ -349,8 +346,7 @@
 
                 selectTool.Select(listOfSelectedFeatures.Cast<IFeature>());
 
-                selectTool.Selection.Count()
-                          .Should("selection are 3 features in 2 layers, 2 features in layer1, 1 feature in layer 2").Be.EqualTo(3);
+                Assert.AreEqual(3, selectTool.Selection.Count(), "selection are 3 features in 2 layers, 2 features in layer1, 1 feature in layer 2");
             }
         }
 
@@ -416,13 +412,11 @@
 
                 selectTool.Select(listOfSelectedFeatures.Cast<IFeature>(), layer1);
 
-                selectTool.Selection.Count()
-                          .Should("selection are 3 features in 2 layers, but only select the 2 features in layer1!").Be.EqualTo(2);
+                Assert.AreEqual(2, selectTool.Selection.Count(), "selection are 3 features in 2 layers, but only select the 2 features in layer1!");
 
                 selectTool.Select(listOfSelectedFeatures.Cast<IFeature>(), layer2);
 
-                selectTool.Selection.Count()
-                          .Should("selection are 3 features in 2 layers, but only select the 1 feature in layer2!").Be.EqualTo(1);
+                Assert.AreEqual(1, selectTool.Selection.Count(), "selection are 3 features in 2 layers, but only select the 1 feature in layer2!");
             }
         }
 
@@ -479,8 +473,7 @@
 
                 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);
+                Assert.AreEqual(maxSelectableFeatures, selectTool.Selection.Count());
             }
         }
 
Index: Core/Plugins/test/Core.Plugins.ProjectExplorer.Tests/Core.Plugins.ProjectExplorer.Tests.csproj
===================================================================
diff -u -ree60be046a1b4e4151bb567e9a9c3ab0876d3b55 -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/Plugins/test/Core.Plugins.ProjectExplorer.Tests/Core.Plugins.ProjectExplorer.Tests.csproj	(.../Core.Plugins.ProjectExplorer.Tests.csproj)	(revision ee60be046a1b4e4151bb567e9a9c3ab0876d3b55)
+++ Core/Plugins/test/Core.Plugins.ProjectExplorer.Tests/Core.Plugins.ProjectExplorer.Tests.csproj	(.../Core.Plugins.ProjectExplorer.Tests.csproj)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -67,9 +67,6 @@
       <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SharpTestsEx">
-      <HintPath>..\..\..\..\lib\SharpTestsEx.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Tests/Core.Plugins.SharpMapGis.Tests.csproj
===================================================================
diff -u -ree60be046a1b4e4151bb567e9a9c3ab0876d3b55 -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Tests/Core.Plugins.SharpMapGis.Tests.csproj	(.../Core.Plugins.SharpMapGis.Tests.csproj)	(revision ee60be046a1b4e4151bb567e9a9c3ab0876d3b55)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Tests/Core.Plugins.SharpMapGis.Tests.csproj	(.../Core.Plugins.SharpMapGis.Tests.csproj)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -71,9 +71,6 @@
       <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SharpTestsEx">
-      <HintPath>..\..\..\..\lib\SharpTestsEx.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Tests/Forms/MapViewTest.cs
===================================================================
diff -u -rf1c02b2d47dc561deec70a24128d8dd49d9bed6a -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Tests/Forms/MapViewTest.cs	(.../MapViewTest.cs)	(revision f1c02b2d47dc561deec70a24128d8dd49d9bed6a)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Tests/Forms/MapViewTest.cs	(.../MapViewTest.cs)	(revision 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6)
@@ -18,7 +18,6 @@
 using log4net.Core;
 using NUnit.Framework;
 using Rhino.Mocks;
-using SharpTestsEx;
 
 namespace Core.Plugins.SharpMapGis.Tests.Forms
 {
@@ -37,7 +36,7 @@
             mapView.Map.Layers.First().Visible = false;
 
             // TODO: currently second refresh can happen because of timer in MapControl - timer must be replaced by local Map / Layer / MapControl custom event
-            refreshCount.Should("map should be refreshed once when layer property changes").Be.LessThanOrEqualTo(2);
+            Assert.LessOrEqual(refreshCount, 2, "map should be refreshed once when layer property changes");
         }
 
         [Test]
Fisheye: Tag 4e08a66b9a5e271df99e1056f928cf8adf8d9cd6 refers to a dead (removed) revision in file `lib/SharpTestsEx.XML'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lib/SharpTestsEx.dll
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r4e08a66b9a5e271df99e1056f928cf8adf8d9cd6
Binary files differ