Index: Core/Common/test/Core.Common.TestUtils.Test/Core.Common.TestUtils.Test.csproj
===================================================================
diff -u -r3dad752f3493dbb0a5ea24ec8671605f334ced80 -r81d0f0f181b11f624d8bf1f4aa11c066096addca
--- Core/Common/test/Core.Common.TestUtils.Test/Core.Common.TestUtils.Test.csproj	(.../Core.Common.TestUtils.Test.csproj)	(revision 3dad752f3493dbb0a5ea24ec8671605f334ced80)
+++ Core/Common/test/Core.Common.TestUtils.Test/Core.Common.TestUtils.Test.csproj	(.../Core.Common.TestUtils.Test.csproj)	(revision 81d0f0f181b11f624d8bf1f4aa11c066096addca)
@@ -38,12 +38,26 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="nunit.framework">
+      <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="WindowsFormsTestHelperTest.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
+      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
+      <Name>Core.Common.TestUtils</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Core/Common/test/Core.Common.TestUtils.Test/WindowsFormsTestHelperTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.TestUtils.Test/WindowsFormsTestHelperTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.TestUtils.Test/WindowsFormsTestHelperTest.cs	(revision 81d0f0f181b11f624d8bf1f4aa11c066096addca)
@@ -0,0 +1,135 @@
+using System;
+using System.Threading;
+using System.Windows.Forms;
+using NUnit.Framework;
+
+namespace Core.Common.TestUtils.Test
+{
+    [TestFixture]
+    public class WindowsFormsTestHelperTest
+    {
+        [Test]
+        public void ShowActionIsRunForAFormUsingShow()
+        {
+            var form = new Form();
+            int callCount = 0;
+
+            WindowsFormsTestHelper.Show(form, delegate { callCount++; });
+
+            Assert.AreEqual(1, callCount);
+
+            WindowsFormsTestHelper.CloseAll();
+        }
+
+        [Test]
+        public void ShowActionIsRunForUserControl()
+        {
+            var uc = new UserControl();
+            int callCount = 0;
+
+            WindowsFormsTestHelper.Show(uc, delegate { callCount++; });
+
+            Assert.AreEqual(1, callCount);
+
+            WindowsFormsTestHelper.CloseAll();
+        }
+
+        [Test]
+        public void ShowActionIsRunForForm()
+        {
+            var form = new Form();
+            int callCount = 0;
+
+            WindowsFormsTestHelper.Show(form, delegate { callCount++; });
+
+            Assert.AreEqual(1, callCount);
+
+            WindowsFormsTestHelper.CloseAll();
+        }
+
+        [Test]
+        public void ExceptionsInActionLogsStackTraceCorrectlyCorrectly()
+        {
+            try
+            {
+                WindowsFormsTestHelper.Show(new Label(), MethodWithException);
+            }
+            catch (Exception e)
+            {
+                Assert.AreEqual(typeof(InvalidOperationException), e.GetType());
+                Assert.AreEqual("my message", e.Message);
+                Assert.IsTrue(e.StackTrace.Contains("MethodWithException"));
+            }
+
+            WindowsFormsTestHelper.CloseAll();
+        }
+
+        [Test]
+        public void UnhandledThreadExceptionsInActionLogsStackTraceCorrectlyCorrectly()
+        {
+            var thread = new Thread(MethodWithExceptionInSeparateThread);
+
+            try
+            {
+                WindowsFormsTestHelper.Show(new Label(),
+                                            delegate
+                                            {
+                                                thread.Start();
+                                                thread.Join();
+                                            });
+            }
+            catch (Exception e)
+            {
+                Assert.AreEqual(typeof(GuiTestHelper.UnhandledException), e.GetType());
+                Assert.IsTrue(e.Message.Contains("my message from thread"));
+                Assert.IsTrue(e.StackTrace.Contains("MethodWithExceptionInSeparateThread"));
+            }
+
+            WindowsFormsTestHelper.CloseAll();
+        }
+
+        [Test]
+        public void CallActionOnShowModal()
+        {
+            var callCount = 0;
+
+            WindowsFormsTestHelper.ShowModal(new Form(), delegate { callCount++; });
+
+            Assert.AreEqual(1, callCount);
+        }
+
+        [Test]
+        public void ShownCalledOnShowModal()
+        {
+            var callCount = 0;
+            var form = new Form();
+
+            form.Shown += delegate { callCount++; };
+
+            WindowsFormsTestHelper.ShowModal(form);
+
+            Assert.AreEqual(1, callCount);
+        }
+
+        [Test]
+        [ExpectedException(typeof(GuiTestHelper.UnhandledException))]
+        public void ExceptionIsCatchedWhenFromShownEvent()
+        {
+            var form = new Form();
+
+            form.Shown += delegate { Assert.Fail(); };
+
+            WindowsFormsTestHelper.ShowModal(form);
+        }
+
+        private void MethodWithException(Form obj)
+        {
+            throw new InvalidOperationException("my message");
+        }
+
+        private void MethodWithExceptionInSeparateThread()
+        {
+            throw new InvalidOperationException("my message from thread");
+        }
+    }
+}
\ No newline at end of file
Index: Core/Common/test/Core.Common.TestUtils.Test/packages.config
===================================================================
diff -u
--- Core/Common/test/Core.Common.TestUtils.Test/packages.config	(revision 0)
+++ Core/Common/test/Core.Common.TestUtils.Test/packages.config	(revision 81d0f0f181b11f624d8bf1f4aa11c066096addca)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit" version="2.6.4" targetFramework="net40" />
+</packages>
\ No newline at end of file
Index: Core/Common/test/Core.Common.TestUtils/Core.Common.TestUtils.csproj
===================================================================
diff -u -r2e855cfd58cca717db843b13e1e24f1fc9c4f451 -r81d0f0f181b11f624d8bf1f4aa11c066096addca
--- Core/Common/test/Core.Common.TestUtils/Core.Common.TestUtils.csproj	(.../Core.Common.TestUtils.csproj)	(revision 2e855cfd58cca717db843b13e1e24f1fc9c4f451)
+++ Core/Common/test/Core.Common.TestUtils/Core.Common.TestUtils.csproj	(.../Core.Common.TestUtils.csproj)	(revision 81d0f0f181b11f624d8bf1f4aa11c066096addca)
@@ -76,20 +76,13 @@
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="Rhino.Mocks, Version=3.6.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
@@ -110,24 +103,15 @@
     <Compile Include="WindowsFormsTestHelper.Designer.cs">
       <DependentUpon>WindowsFormsTestHelper.cs</DependentUpon>
     </Compile>
-    <Compile Include="WindowsFormsTestHelperTest.cs" />
     <Compile Include="WpfTestHelper.xaml.cs">
       <DependentUpon>WpfTestHelper.xaml</DependentUpon>
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Core.Common.Controls.Swf\Core.Common.Controls.Swf.csproj">
-      <Project>{3dbd23ce-5c4a-4a49-b51c-b268cb2b510e}</Project>
-      <Name>Core.Common.Controls.Swf</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\src\Core.Common.Utils\Core.Common.Utils.csproj">
       <Project>{f49bd8b2-332a-4c91-a196-8cce0a2c7d98}</Project>
       <Name>Core.Common.Utils</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\GIS\src\Core.GIS.GeoAPI\Core.GIS.GeoAPI.csproj">
-      <Project>{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}</Project>
-      <Name>Core.GIS.GeoAPI</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources.resx">
Fisheye: Tag 81d0f0f181b11f624d8bf1f4aa11c066096addca refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtils/WindowsFormsTestHelperTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: packages/repositories.config
===================================================================
diff -u -r5dc6b11ada2c7d2e4ca14413b1ddca577ba34d08 -r81d0f0f181b11f624d8bf1f4aa11c066096addca
--- packages/repositories.config	(.../repositories.config)	(revision 5dc6b11ada2c7d2e4ca14413b1ddca577ba34d08)
+++ packages/repositories.config	(.../repositories.config)	(revision 81d0f0f181b11f624d8bf1f4aa11c066096addca)
@@ -14,6 +14,7 @@
   <repository path="..\Core\Common\test\Core.Common.Gui.TestUtils\packages.config" />
   <repository path="..\Core\Common\test\Core.Common.Integration.Test\packages.config" />
   <repository path="..\Core\Common\test\Core.Common.Test\packages.config" />
+  <repository path="..\Core\Common\test\Core.Common.TestUtils.Test\packages.config" />
   <repository path="..\Core\Common\test\Core.Common.TestUtils\packages.config" />
   <repository path="..\Core\Common\test\Core.Common.Utils.Test\packages.config" />
   <repository path="..\Core\GIS\src\Core.GIS.NetTopologySuite\packages.config" />