Index: Core/Common/test/Core.Common.Base.Test/Core.Common.Base.Test.csproj
===================================================================
diff -u -r13f47cf031a0cb759b4685bcdcde112f039d00d3 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/Common/test/Core.Common.Base.Test/Core.Common.Base.Test.csproj	(.../Core.Common.Base.Test.csproj)	(revision 13f47cf031a0cb759b4685bcdcde112f039d00d3)
+++ Core/Common/test/Core.Common.Base.Test/Core.Common.Base.Test.csproj	(.../Core.Common.Base.Test.csproj)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -95,9 +95,9 @@
       <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
       <Name>Core.Common.Utils</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
+    <ProjectReference Include="..\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
       <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtils</Name>
+      <Name>Core.Common.TestUtil</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
Index: Core/Common/test/Core.Common.Base.Test/Service/ActivityTest.cs
===================================================================
diff -u -r5914abad7fec8a4bf5634acaf15571b7c195f677 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/Common/test/Core.Common.Base.Test/Service/ActivityTest.cs	(.../ActivityTest.cs)	(revision 5914abad7fec8a4bf5634acaf15571b7c195f677)
+++ Core/Common/test/Core.Common.Base.Test/Service/ActivityTest.cs	(.../ActivityTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -1,6 +1,6 @@
 using System;
 using Core.Common.Base.Service;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 
 namespace Core.Common.Base.Test.Service
Index: Core/Common/test/Core.Common.Controls.Swf.Test/Charting/ChartTest.cs
===================================================================
diff -u -rdc06f24147cb5d1f94cec6f3705d07dc3142d175 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/Common/test/Core.Common.Controls.Swf.Test/Charting/ChartTest.cs	(.../ChartTest.cs)	(revision dc06f24147cb5d1f94cec6f3705d07dc3142d175)
+++ Core/Common/test/Core.Common.Controls.Swf.Test/Charting/ChartTest.cs	(.../ChartTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -2,7 +2,7 @@
 using System.IO;
 using Core.Common.Controls.Swf.Charting;
 using Core.Common.Controls.Swf.Charting.Series;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 
 namespace Core.Common.Controls.Swf.Test.Charting
Index: Core/Common/test/Core.Common.Controls.Swf.Test/Core.Common.Controls.Swf.Test.csproj
===================================================================
diff -u -r3966c8176854557199325b0465f0c6a1c9225f38 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/Common/test/Core.Common.Controls.Swf.Test/Core.Common.Controls.Swf.Test.csproj	(.../Core.Common.Controls.Swf.Test.csproj)	(revision 3966c8176854557199325b0465f0c6a1c9225f38)
+++ Core/Common/test/Core.Common.Controls.Swf.Test/Core.Common.Controls.Swf.Test.csproj	(.../Core.Common.Controls.Swf.Test.csproj)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -116,9 +116,9 @@
       <Project>{f49bd8b2-332a-4c91-a196-8cce0a2c7d98}</Project>
       <Name>Core.Common.Utils</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
+    <ProjectReference Include="..\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
       <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtils</Name>
+      <Name>Core.Common.TestUtil</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Index: Core/Common/test/Core.Common.Controls.Swf.Test/Table/TableViewCopyPasteTest.cs
===================================================================
diff -u -rdc06f24147cb5d1f94cec6f3705d07dc3142d175 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/Common/test/Core.Common.Controls.Swf.Test/Table/TableViewCopyPasteTest.cs	(.../TableViewCopyPasteTest.cs)	(revision dc06f24147cb5d1f94cec6f3705d07dc3142d175)
+++ Core/Common/test/Core.Common.Controls.Swf.Test/Table/TableViewCopyPasteTest.cs	(.../TableViewCopyPasteTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -6,7 +6,7 @@
 using System.Windows.Forms;
 using Core.Common.Controls.Swf.Table;
 using Core.Common.Controls.Swf.Test.Table.TestClasses;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using Core.Common.Utils;
 using DevExpress.XtraGrid;
 using NUnit.Framework;
Index: Core/Common/test/Core.Common.Controls.Swf.Test/Table/TableViewTest.cs
===================================================================
diff -u -r23981d00366f6ee42b7b3c2b776a687c1dc70d07 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/Common/test/Core.Common.Controls.Swf.Test/Table/TableViewTest.cs	(.../TableViewTest.cs)	(revision 23981d00366f6ee42b7b3c2b776a687c1dc70d07)
+++ Core/Common/test/Core.Common.Controls.Swf.Test/Table/TableViewTest.cs	(.../TableViewTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -11,7 +11,7 @@
 using Core.Common.Controls.Swf.Table;
 using Core.Common.Controls.Swf.Table.Editors;
 using Core.Common.Controls.Swf.Test.Table.TestClasses;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using Core.Common.Utils.Collections.Generic;
 using Core.Common.Utils.Reflection;
 using DevExpress.XtraEditors.Repository;
Index: Core/Common/test/Core.Common.Controls.Swf.Test/TreeViewControls/TreeViewNodePresenterBaseTest.cs
===================================================================
diff -u -rdc06f24147cb5d1f94cec6f3705d07dc3142d175 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/Common/test/Core.Common.Controls.Swf.Test/TreeViewControls/TreeViewNodePresenterBaseTest.cs	(.../TreeViewNodePresenterBaseTest.cs)	(revision dc06f24147cb5d1f94cec6f3705d07dc3142d175)
+++ Core/Common/test/Core.Common.Controls.Swf.Test/TreeViewControls/TreeViewNodePresenterBaseTest.cs	(.../TreeViewNodePresenterBaseTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -3,7 +3,7 @@
 using System.Linq;
 using Core.Common.Base;
 using Core.Common.Controls.Swf.TreeViewControls;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 
 namespace Core.Common.Controls.Swf.Test.TreeViewControls
Index: Core/Common/test/Core.Common.Controls.Swf.Test/TreeViewControls/TreeViewTest.cs
===================================================================
diff -u -r2e855cfd58cca717db843b13e1e24f1fc9c4f451 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/Common/test/Core.Common.Controls.Swf.Test/TreeViewControls/TreeViewTest.cs	(.../TreeViewTest.cs)	(revision 2e855cfd58cca717db843b13e1e24f1fc9c4f451)
+++ Core/Common/test/Core.Common.Controls.Swf.Test/TreeViewControls/TreeViewTest.cs	(.../TreeViewTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -7,7 +7,7 @@
 using System.Windows.Forms;
 using Core.Common.Base;
 using Core.Common.Controls.Swf.TreeViewControls;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using Core.Common.Utils.Collections.Generic;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs
===================================================================
diff -u -r6fc99be8198e5795ca4be54719dab3d1be3c6299 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs	(.../ContextMenuBuilderTest.cs)	(revision 6fc99be8198e5795ca4be54719dab3d1be3c6299)
+++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs	(.../ContextMenuBuilderTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -4,7 +4,7 @@
 using Core.Common.Controls.Swf.TreeViewControls;
 using Core.Common.Gui.ContextMenu;
 using Core.Common.Gui.Properties;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
 
Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/GuiContextMenuItemFactoryTest.cs
===================================================================
diff -u -r6fc99be8198e5795ca4be54719dab3d1be3c6299 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/Common/test/Core.Common.Gui.Test/ContextMenu/GuiContextMenuItemFactoryTest.cs	(.../GuiContextMenuItemFactoryTest.cs)	(revision 6fc99be8198e5795ca4be54719dab3d1be3c6299)
+++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/GuiContextMenuItemFactoryTest.cs	(.../GuiContextMenuItemFactoryTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -3,7 +3,7 @@
 using Core.Common.Controls.Swf.TreeViewControls;
 using Core.Common.Gui.ContextMenu;
 using Core.Common.Gui.Properties;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
 
Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/StrictContextMenuItemTest.cs
===================================================================
diff -u -r85af6861f16df8c5d57e3e39d0d2874e7bd16b8e -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/Common/test/Core.Common.Gui.Test/ContextMenu/StrictContextMenuItemTest.cs	(.../StrictContextMenuItemTest.cs)	(revision 85af6861f16df8c5d57e3e39d0d2874e7bd16b8e)
+++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/StrictContextMenuItemTest.cs	(.../StrictContextMenuItemTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -1,7 +1,7 @@
 using System;
 using Core.Common.Gui.ContextMenu;
 using Core.Common.Gui.Properties;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
 
Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs
===================================================================
diff -u -rebe6e048a6c4e9146e883e19e213f41df96aabf1 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs	(.../TreeViewContextMenuItemFactoryTest.cs)	(revision ebe6e048a6c4e9146e883e19e213f41df96aabf1)
+++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs	(.../TreeViewContextMenuItemFactoryTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -4,7 +4,7 @@
 using Core.Common.Controls.Swf.TreeViewControls;
 using Core.Common.Gui.ContextMenu;
 using Core.Common.Gui.Properties;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
 
Index: Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Test.csproj
===================================================================
diff -u -r00bf02e3c099d01fbdb84735d8fc64de0fb98aaa -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Test.csproj	(.../Core.Common.Gui.Test.csproj)	(revision 00bf02e3c099d01fbdb84735d8fc64de0fb98aaa)
+++ Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Test.csproj	(.../Core.Common.Gui.Test.csproj)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -83,13 +83,13 @@
       <Project>{30e4c2ae-719e-4d70-9fa9-668a9767fbfa}</Project>
       <Name>Core.Common.Gui</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Core.Common.Gui.TestUtils\Core.Common.Gui.TestUtils.csproj">
+    <ProjectReference Include="..\Core.Common.Gui.TestUtil\Core.Common.Gui.TestUtil.csproj">
       <Project>{26214BD0-DAFB-4CFC-8EB2-80C5D53C859E}</Project>
-      <Name>Core.Common.Gui.TestUtils</Name>
+      <Name>Core.Common.Gui.TestUtil</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
+    <ProjectReference Include="..\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
       <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtils</Name>
+      <Name>Core.Common.TestUtil</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
Index: Core/Common/test/Core.Common.Gui.TestUtil/ContextMenu/CustomItemsOnlyContextMenuBuilder.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Gui.TestUtil/ContextMenu/CustomItemsOnlyContextMenuBuilder.cs	(revision 0)
+++ Core/Common/test/Core.Common.Gui.TestUtil/ContextMenu/CustomItemsOnlyContextMenuBuilder.cs	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -0,0 +1,109 @@
+using System.Windows.Forms;
+using Core.Common.Gui.ContextMenu;
+
+namespace Core.Common.Gui.TestUtil.ContextMenu
+{
+    /// <summary>
+    /// This class can be used for easily testing the custom items which are added to a context menu.
+    /// </summary>
+    public class CustomItemsOnlyContextMenuBuilder : IContextMenuBuilder
+    {
+        /// <summary>
+        /// The context menu which is build.
+        /// </summary>
+        private readonly ContextMenuStrip contextMenu = new ContextMenuStrip();
+
+        /// <summary>
+        /// Does nothing.
+        /// </summary>
+        /// <returns>The <see cref="CustomItemsOnlyContextMenuBuilder"/>.</returns>
+        public IContextMenuBuilder AddDeleteItem()
+        {
+            return this;
+        }
+
+        /// <summary>
+        /// Does nothing.
+        /// </summary>
+        /// <returns>The <see cref="CustomItemsOnlyContextMenuBuilder"/>.</returns>
+        public IContextMenuBuilder AddExpandAllItem()
+        {
+            return this;
+        }
+
+        /// <summary>
+        /// Does nothing.
+        /// </summary>
+        /// <returns>The <see cref="CustomItemsOnlyContextMenuBuilder"/>.</returns>
+        public IContextMenuBuilder AddCollapseAllItem()
+        {
+            return this;
+        }
+
+        /// <summary>
+        /// Does nothing.
+        /// </summary>
+        /// <returns>The <see cref="CustomItemsOnlyContextMenuBuilder"/>.</returns>
+        public IContextMenuBuilder AddOpenItem()
+        {
+            return this;
+        }
+
+        /// <summary>
+        /// Does nothing.
+        /// </summary>
+        /// <returns>The <see cref="CustomItemsOnlyContextMenuBuilder"/>.</returns>
+        public IContextMenuBuilder AddExportItem()
+        {
+            return this;
+        }
+
+        /// <summary>
+        /// Does nothing.
+        /// </summary>
+        /// <returns>The <see cref="CustomItemsOnlyContextMenuBuilder"/>.</returns>
+        public IContextMenuBuilder AddImportItem()
+        {
+            return this;
+        }
+
+        /// <summary>
+        /// Does nothing.
+        /// </summary>
+        /// <returns>The <see cref="CustomItemsOnlyContextMenuBuilder"/>.</returns>
+        public IContextMenuBuilder AddPropertiesItem()
+        {
+            return this;
+        }
+
+        /// <summary>
+        /// Adds a toolstrip separator.
+        /// </summary>
+        /// <returns>The <see cref="CustomItemsOnlyContextMenuBuilder"/>.</returns>
+        public IContextMenuBuilder AddSeparator()
+        {
+            contextMenu.Items.Add(new ToolStripSeparator());
+            return this;
+        }
+
+        /// <summary>
+        /// Adds a custom item to the <see cref="ContextMenuStrip"/>.
+        /// </summary>
+        /// <param name="item">The custom <see cref="StrictContextMenuItem"/> to add to the <see cref="ContextMenuStrip"/>.</param>
+        /// <returns>The <see cref="CustomItemsOnlyContextMenuBuilder"/>.</returns>
+        public IContextMenuBuilder AddCustomItem(StrictContextMenuItem item)
+        {
+            contextMenu.Items.Add(item);
+            return this;
+        }
+
+        /// <summary>
+        /// Obtain the <see cref="ContextMenuStrip"/>, which has been constructed by using <see cref="AddCustomItem"/>.
+        /// </summary>
+        /// <returns>The constructed <see cref="ContextMenuStrip"/>.</returns>
+        public ContextMenuStrip Build()
+        {
+            return contextMenu;
+        }
+    }
+}
\ No newline at end of file
Index: Core/Common/test/Core.Common.Gui.TestUtil/ContextMenu/SimpleContextMenuBuilderProvider.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Gui.TestUtil/ContextMenu/SimpleContextMenuBuilderProvider.cs	(revision 0)
+++ Core/Common/test/Core.Common.Gui.TestUtil/ContextMenu/SimpleContextMenuBuilderProvider.cs	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -0,0 +1,34 @@
+using System;
+using Core.Common.Controls.Swf.TreeViewControls;
+using Core.Common.Gui.ContextMenu;
+
+namespace Core.Common.Gui.TestUtil.ContextMenu
+{
+    /// <summary>
+    /// Proves a simple implementation of <see cref="IContextMenuBuilderProvider"/> to be
+    /// used in tests.
+    /// </summary>
+    public class SimpleContextMenuBuilderProvider : IContextMenuBuilderProvider
+    {
+        private readonly IContextMenuBuilder contextMenuBuilder;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SimpleContextMenuBuilderProvider"/> class.
+        /// </summary>
+        /// <param name="contextMenuBuilder">The context menu builder.</param>
+        /// <exception cref="ArgumentNullException">When <paramref name="contextMenuBuilder"/> is null.</exception>
+        public SimpleContextMenuBuilderProvider(IContextMenuBuilder contextMenuBuilder)
+        {
+            if (contextMenuBuilder == null)
+            {
+                throw new ArgumentNullException("contextMenuBuilder");
+            }
+            this.contextMenuBuilder = contextMenuBuilder;
+        }
+
+        public IContextMenuBuilder Get(ITreeNode treeNode)
+        {
+            return contextMenuBuilder;
+        }
+    }
+}
\ No newline at end of file
Index: Core/Common/test/Core.Common.Gui.TestUtil/Core.Common.Gui.TestUtil.csproj
===================================================================
diff -u
--- Core/Common/test/Core.Common.Gui.TestUtil/Core.Common.Gui.TestUtil.csproj	(revision 0)
+++ Core/Common/test/Core.Common.Gui.TestUtil/Core.Common.Gui.TestUtil.csproj	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{26214BD0-DAFB-4CFC-8EB2-80C5D53C859E}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Core.Common.Gui.TestUtil</RootNamespace>
+    <AssemblyName>Core.Common.Gui.TestUtil</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <RunPostBuildEvent>Always</RunPostBuildEvent>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <SignAssembly>false</SignAssembly>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <AllowedReferenceRelatedFileExtensions>none</AllowedReferenceRelatedFileExtensions>
+    <OutputPath>bin\Release\</OutputPath>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseForCodeCoverage|x86'">
+    <OutputPath>bin\ReleaseForCodeCoverage\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ContextMenu\CustomItemsOnlyContextMenuBuilder.cs" />
+    <Compile Include="ContextMenu\SimpleContextMenuBuilderProvider.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </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.Gui\Core.Common.Gui.csproj">
+      <Project>{30E4C2AE-719E-4D70-9FA9-668A9767FBFA}</Project>
+      <Name>Core.Common.Gui</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </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.
+
+
+  <Target Name="BeforeBuild">
+    </Target>
+    <Target Name="AfterBuild">
+  </Target>
+  
+  -->
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
Index: Core/Common/test/Core.Common.Gui.TestUtil/Properties/AssemblyInfo.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Gui.TestUtil/Properties/AssemblyInfo.cs	(revision 0)
+++ Core/Common/test/Core.Common.Gui.TestUtil/Properties/AssemblyInfo.cs	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -0,0 +1,13 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Core.Common.Gui.TestUtil")]
+[assembly: AssemblyProduct("Core.Common.Gui.TestUtil")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("d749c2bb-9e8a-4211-b24b-d3b179e73042")]
\ No newline at end of file
Index: Core/Common/test/Core.Common.Gui.TestUtil/packages.config
===================================================================
diff -u
--- Core/Common/test/Core.Common.Gui.TestUtil/packages.config	(revision 0)
+++ Core/Common/test/Core.Common.Gui.TestUtil/packages.config	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="RhinoMocks" version="3.6.1" targetFramework="net40" />
+</packages>
\ No newline at end of file
Fisheye: Tag d6e6eadf4a2521df75b6d371bacbb181a43058a3 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Gui.TestUtils/ContextMenu/CustomItemsOnlyContextMenuBuilder.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d6e6eadf4a2521df75b6d371bacbb181a43058a3 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Gui.TestUtils/ContextMenu/SimpleContextMenuBuilderProvider.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d6e6eadf4a2521df75b6d371bacbb181a43058a3 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Gui.TestUtils/Core.Common.Gui.TestUtils.csproj'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d6e6eadf4a2521df75b6d371bacbb181a43058a3 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Gui.TestUtils/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d6e6eadf4a2521df75b6d371bacbb181a43058a3 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Gui.TestUtils/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Integration.Test/Core.Common.Integration.Test.csproj
===================================================================
diff -u -r73c2e06a527fc4b0d2659c388a00a2f7dfff6ccf -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/Common/test/Core.Common.Integration.Test/Core.Common.Integration.Test.csproj	(.../Core.Common.Integration.Test.csproj)	(revision 73c2e06a527fc4b0d2659c388a00a2f7dfff6ccf)
+++ Core/Common/test/Core.Common.Integration.Test/Core.Common.Integration.Test.csproj	(.../Core.Common.Integration.Test.csproj)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -160,9 +160,9 @@
       <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
       <Name>Core.Common.Utils</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
+    <ProjectReference Include="..\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
       <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtils</Name>
+      <Name>Core.Common.TestUtil</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
Index: Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs
===================================================================
diff -u -r1f79b34c12554e2b9878f6296168d18232cc9852 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs	(.../RingtoetsGuiIntegrationTest.cs)	(revision 1f79b34c12554e2b9878f6296168d18232cc9852)
+++ Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs	(.../RingtoetsGuiIntegrationTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -3,7 +3,7 @@
 using Core.Common.Base;
 using Core.Common.Base.Data;
 using Core.Common.Gui;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using Core.GIS.SharpMap.Map;
 using Core.Plugins.CommonTools;
 using Core.Plugins.CommonTools.Gui;
Index: Core/Common/test/Core.Common.TestUtil.Test/Core.Common.TestUtil.Test.csproj
===================================================================
diff -u
--- Core/Common/test/Core.Common.TestUtil.Test/Core.Common.TestUtil.Test.csproj	(revision 0)
+++ Core/Common/test/Core.Common.TestUtil.Test/Core.Common.TestUtil.Test.csproj	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{FAF691DE-EAF5-44E0-A865-5A03FB395ED1}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Core.Common.TestUtil.Test</RootNamespace>
+    <AssemblyName>Core.Common.TestUtil.Test</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseForCodeCoverage|x86'">
+    <OutputPath>bin\ReleaseForCodeCoverage\</OutputPath>
+    <PlatformTarget>x86</PlatformTarget>
+    <DefineConstants>TRACE</DefineConstants>
+    <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.TestUtil\Core.Common.TestUtil.csproj">
+      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
+      <Name>Core.Common.TestUtil</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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
Index: Core/Common/test/Core.Common.TestUtil.Test/Properties/AssemblyInfo.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.TestUtil.Test/Properties/AssemblyInfo.cs	(revision 0)
+++ Core/Common/test/Core.Common.TestUtil.Test/Properties/AssemblyInfo.cs	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Core.Common.TestUtil.Test")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Core.Common.TestUtil.Test")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("beab02d9-ffbf-4ccd-8010-44d4b2d2d4b7")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
Index: Core/Common/test/Core.Common.TestUtil.Test/WindowsFormsTestHelperTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.TestUtil.Test/WindowsFormsTestHelperTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.TestUtil.Test/WindowsFormsTestHelperTest.cs	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -0,0 +1,135 @@
+using System;
+using System.Threading;
+using System.Windows.Forms;
+using NUnit.Framework;
+
+namespace Core.Common.TestUtil.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.TestUtil.Test/packages.config
===================================================================
diff -u
--- Core/Common/test/Core.Common.TestUtil.Test/packages.config	(revision 0)
+++ Core/Common/test/Core.Common.TestUtil.Test/packages.config	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -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.TestUtil/Core.Common.TestUtil.csproj
===================================================================
diff -u
--- Core/Common/test/Core.Common.TestUtil/Core.Common.TestUtil.csproj	(revision 0)
+++ Core/Common/test/Core.Common.TestUtil/Core.Common.TestUtil.csproj	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{D749EE4C-CE50-4C17-BF01-9A953028C126}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Core.Common.TestUtil</RootNamespace>
+    <AssemblyName>Core.Common.TestUtil</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <RunPostBuildEvent>Always</RunPostBuildEvent>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <SignAssembly>false</SignAssembly>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <AllowedReferenceRelatedFileExtensions>none</AllowedReferenceRelatedFileExtensions>
+    <OutputPath>bin\Release\</OutputPath>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseForCodeCoverage|x86'">
+    <OutputPath>bin\ReleaseForCodeCoverage\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="log4net, Version=1.2.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\log4net.2.0.4\lib\net40-full\log4net.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <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" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="GuiTestHelper.cs" />
+    <Compile Include="LogHelper.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="TestDataPath.cs" />
+    <Compile Include="TestHelper.cs" />
+    <Compile Include="WindowsFormsTestHelper.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="WindowsFormsTestHelper.Designer.cs">
+      <DependentUpon>WindowsFormsTestHelper.cs</DependentUpon>
+    </Compile>
+    <Compile Include="WpfTestHelper.xaml.cs">
+      <DependentUpon>WpfTestHelper.xaml</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Core.Common.Utils\Core.Common.Utils.csproj">
+      <Project>{f49bd8b2-332a-4c91-a196-8cce0a2c7d98}</Project>
+      <Name>Core.Common.Utils</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="WindowsFormsTestHelper.resx">
+      <DependentUpon>WindowsFormsTestHelper.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+    <None Include="Resources\database.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\application_form.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\table.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="WpfTestHelper.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </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.
+
+
+  <Target Name="BeforeBuild">
+    </Target>
+    <Target Name="AfterBuild">
+  </Target>
+  
+  -->
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
Index: Core/Common/test/Core.Common.TestUtil/GuiTestHelper.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.TestUtil/GuiTestHelper.cs	(revision 0)
+++ Core/Common/test/Core.Common.TestUtil/GuiTestHelper.cs	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -0,0 +1,162 @@
+using System;
+using System.Drawing;
+using System.IO;
+using System.Threading;
+using System.Windows.Forms;
+using System.Windows.Threading;
+using log4net;
+
+namespace Core.Common.TestUtil
+{
+    /// <summary>
+    /// Used by WindowsFormsTestHelper and WpfTestHelper
+    /// 
+    /// TODO: invert it - use GuiTestHelper as entry point in tests.
+    /// </summary>
+    public class GuiTestHelper
+    {
+        private static GuiTestHelper instance;
+
+        private static readonly ILog log = LogManager.GetLogger(typeof(WindowsFormsTestHelper));
+
+        private static Form synchronizationForm;
+
+        private static Exception exception;
+
+        private static bool unhandledThreadExceptionOccured;
+
+        private static bool appDomainExceptionOccured;
+
+        static GuiTestHelper()
+        {
+            Control.CheckForIllegalCrossThreadCalls = true;
+            Application.EnableVisualStyles();
+
+            InitializeSynchronizatonObject();
+            Dispatcher.CurrentDispatcher.UnhandledException += CurrentDispatcher_UnhandledException;
+            AppDomain.CurrentDomain.UnhandledException += AppDomain_UnhandledException;
+            Application.ThreadException += Application_ThreadException;
+        }
+
+        public static GuiTestHelper Instance
+        {
+            get
+            {
+                if (instance == null)
+                {
+                    instance = new GuiTestHelper();
+                }
+
+                return instance;
+            }
+        }
+
+        /// <summary>
+        /// Checks build_number environment variable to determine whether we run on the build server.
+        /// </summary>
+        public static bool IsBuildServer
+        {
+            get
+            {
+                return File.Exists("C:\\build.server")
+                       || File.Exists("D:\\build.server")
+                       || File.Exists("/tmp/build-server")
+                       || !String.IsNullOrEmpty(Environment.GetEnvironmentVariable("BUILD_NUMBER"));
+            }
+        }
+
+        public Exception Exception
+        {
+            get
+            {
+                return exception;
+            }
+        }
+
+        public void RethrowUnhandledException()
+        {
+            if (unhandledThreadExceptionOccured)
+            {
+                throw new UnhandledException("Unhandled thread exception: " + exception.Message, exception, exception.StackTrace);
+            }
+
+            if (appDomainExceptionOccured)
+            {
+                throw new UnhandledException("Unhandled app domain exception: " + exception.Message, exception, exception.StackTrace);
+            }
+        }
+
+        public static void Initialize()
+        {
+            exception = null;
+            unhandledThreadExceptionOccured = false;
+            appDomainExceptionOccured = false;
+        }
+
+        private static void CurrentDispatcher_UnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
+        {
+            unhandledThreadExceptionOccured = true;
+            exception = e.Exception;
+            log.Error("WPF exception occured: " + e.Exception.Message, e.Exception);
+        }
+
+        private static void InitializeSynchronizatonObject()
+        {
+
+            if (synchronizationForm == null)
+            {
+                synchronizationForm = new Form
+                {
+                    ShowInTaskbar = false, WindowState = FormWindowState.Minimized, FormBorderStyle = FormBorderStyle.None
+                };
+                synchronizationForm.Load += (sender, args) => synchronizationForm.Size = new Size(0, 0);
+                var handle = synchronizationForm.Handle; //force get handle
+                synchronizationForm.Show();
+            }
+        }
+
+        private static void AppDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
+        {
+            appDomainExceptionOccured = true;
+            exception = e.ExceptionObject as Exception;
+
+            if (exception != null)
+            {
+                log.Error("Exception occured: " + exception.Message, exception);
+            }
+            else
+            {
+                log.Error("Unhandled exception occured: " + e.ExceptionObject);
+            }
+        }
+
+        private static void Application_ThreadException(object sender, ThreadExceptionEventArgs e)
+        {
+            unhandledThreadExceptionOccured = true;
+            exception = e.Exception;
+            log.Error("Windows.Forms exception occured: " + e.Exception.Message, e.Exception);
+        }
+
+        /// <summary>
+        /// Defines unhandled exception which provides stack trace of inner exception as its stack trace.
+        /// </summary>
+        public class UnhandledException : Exception
+        {
+            private readonly string stackTrace;
+
+            public UnhandledException(string message, Exception innerException, string stackTrace)
+                : base(message, innerException)
+            {
+                this.stackTrace = stackTrace;
+            }
+
+            public override string StackTrace
+            {
+                get
+                {
+                    return stackTrace;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Core/Common/test/Core.Common.TestUtil/LogHelper.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.TestUtil/LogHelper.cs	(revision 0)
+++ Core/Common/test/Core.Common.TestUtil/LogHelper.cs	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -0,0 +1,56 @@
+using log4net;
+using log4net.Config;
+using log4net.Core;
+using log4net.Repository.Hierarchy;
+
+namespace Core.Common.TestUtil
+{
+    public static class LogHelper
+    {
+        /// <summary>
+        /// Sets logging level for all current loggers to the level provided in arguments.
+        /// Note: use it only when you need more control on logging, e.g. in unit tests. Otherwise use configuration files.
+        /// </summary>
+        /// <param name="level"></param>
+        public static void SetLoggingLevel(Level level)
+        {
+            var repositories = LogManager.GetAllRepositories();
+
+            //Configure all loggers to be at the debug level.
+            foreach (var repository in repositories)
+            {
+                repository.Threshold = repository.LevelMap[level.ToString()];
+                var hierarchy = (Hierarchy) repository;
+                var loggers = hierarchy.GetCurrentLoggers();
+                foreach (var logger in loggers)
+                {
+                    ((Logger) logger).Level = hierarchy.LevelMap[level.ToString()];
+                }
+            }
+
+            //Configure the root logger.
+            var h = (Hierarchy) LogManager.GetRepository();
+            var rootLogger = h.Root;
+            rootLogger.Level = h.LevelMap[level.ToString()];
+        }
+
+        /// <summary>
+        /// Configures logging. In case of log4net reads log4net section from app.config file.
+        /// </summary>
+        public static void ConfigureLogging(Level level = null)
+        {
+            ResetLogging();
+            BasicConfigurator.Configure();
+            SetLoggingLevel(level ?? Level.Error);
+        }
+
+        /// <summary>
+        /// Resets logging configuration, no log messages are sent after that.
+        /// </summary>
+        public static void ResetLogging()
+        {
+            LogManager.ResetConfiguration();
+            SetLoggingLevel(Level.Error);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Common/test/Core.Common.TestUtil/Properties/AssemblyInfo.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.TestUtil/Properties/AssemblyInfo.cs	(revision 0)
+++ Core/Common/test/Core.Common.TestUtil/Properties/AssemblyInfo.cs	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -0,0 +1,13 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Core.Common.TestUtil")]
+[assembly: AssemblyProduct("Core.Common.TestUtil")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("d749c2bb-9e8a-4211-b24b-d3b179e73042")]
\ No newline at end of file
Index: Core/Common/test/Core.Common.TestUtil/Resources.Designer.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.TestUtil/Resources.Designer.cs	(revision 0)
+++ Core/Common/test/Core.Common.TestUtil/Resources.Designer.cs	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -0,0 +1,93 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Core.Common.TestUtil {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Core.Common.TestUtil.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Control {
+            get {
+                object obj = ResourceManager.GetObject("Control", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Data {
+            get {
+                object obj = ResourceManager.GetObject("Data", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Table {
+            get {
+                object obj = ResourceManager.GetObject("Table", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}
Index: Core/Common/test/Core.Common.TestUtil/Resources.resx
===================================================================
diff -u
--- Core/Common/test/Core.Common.TestUtil/Resources.resx	(revision 0)
+++ Core/Common/test/Core.Common.TestUtil/Resources.resx	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="Control" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\application_form.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Data" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\database.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Table" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\table.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>
\ No newline at end of file
Index: Core/Common/test/Core.Common.TestUtil/Resources/application_form.png
===================================================================
diff -u
Binary files differ
Index: Core/Common/test/Core.Common.TestUtil/Resources/database.png
===================================================================
diff -u
Binary files differ
Index: Core/Common/test/Core.Common.TestUtil/Resources/table.png
===================================================================
diff -u
Binary files differ
Index: Core/Common/test/Core.Common.TestUtil/TestDataPath.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.TestUtil/TestDataPath.cs	(revision 0)
+++ Core/Common/test/Core.Common.TestUtil/TestDataPath.cs	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -0,0 +1,40 @@
+namespace Core.Common.TestUtil
+{
+    /// <summary>
+    /// Used to make paths strongly typed, see <see cref="TestHelper.GetTestDataPath(TestDataPath)"/>
+    /// </summary>
+    public class TestDataPath
+    {
+        public string Path { get; private set; }
+
+        public static implicit operator TestDataPath(string path)
+        {
+            return new TestDataPath
+            {
+                Path = path
+            };
+        }
+
+        public static class Common
+        {
+            public static readonly TestDataPath CoreCommonUtilsTests =
+                System.IO.Path.Combine("Core", "Common", "test", "Core.Common.Utils.Test");
+
+            public static class Base
+            {
+                public static readonly TestDataPath CoreCommonBaseTests = @"Core/Common/test/Core.Common.Base.Test";
+            }
+        }
+
+        public static class Ringtoets
+        {
+            public static class Piping
+            {
+                public static readonly TestDataPath IO = System.IO.Path.Combine("Ringtoets", "Piping", "test", "Ringtoets.Piping.IO.Test");
+            }
+
+            public static readonly TestDataPath CorePluginsSharpMapGisTests =
+                @"Core/Plugins/test/Core.Plugins.SharpMapGis.Test/";
+        }
+    }
+}
\ No newline at end of file
Index: Core/Common/test/Core.Common.TestUtil/TestHelper.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.TestUtil/TestHelper.cs	(revision 0)
+++ Core/Common/test/Core.Common.TestUtil/TestHelper.cs	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -0,0 +1,642 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Windows.Forms;
+using Core.Common.Utils.IO;
+using log4net.Appender;
+using log4net.Config;
+using log4net.Core;
+using Newtonsoft.Json;
+using NUnit.Framework;
+
+namespace Core.Common.TestUtil
+{
+    public class TestHelper
+    {
+        private static string solutionRoot;
+        private static int assertInTestMethod;
+        private static string lastTestName;
+        private static Color[] colors;
+
+        public static string SolutionRoot
+        {
+            get
+            {
+                if (solutionRoot == null)
+                {
+                    solutionRoot = GetSolutionRoot();
+                }
+                return solutionRoot;
+            }
+        }
+
+        //TODO: Replace this property
+        public static string TestDataDirectory
+        {
+            get
+            {
+                return Path.GetDirectoryName(SolutionRoot);
+            }
+        }
+
+        public static string GetCurrentMethodName()
+        {
+            MethodBase callingMethod = new StackFrame(1, false).GetMethod();
+            return callingMethod.DeclaringType.Name + "." + callingMethod.Name;
+        }
+
+        /// <summary>
+        /// Returns full path to the file or directory in "test-data"
+        /// </summary>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        public static string GetTestDataPath(TestDataPath path)
+        {
+            return Path.Combine(TestDataDirectory, path.Path);
+        }
+
+        /// <summary>
+        /// Returns full path to the file or directory in "test-data"
+        /// </summary>
+        /// <param name="testDataPath"></param>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        public static string GetTestDataPath(TestDataPath testDataPath, string path)
+        {
+            return Path.Combine(Path.Combine(TestDataDirectory, testDataPath.Path),"test-data", path);
+        }
+
+        public static string GetTestProjectDirectory()
+        {
+            var stackFrames = new StackTrace().GetFrames();
+            if (stackFrames == null)
+            {
+                throw new Exception("Could not get stacktrace.");
+            }
+
+            var testMethod = stackFrames.FirstOrDefault(f => f.GetMethod().GetCustomAttributes(typeof(TestAttribute), true).Any() ||
+                                                             f.GetMethod().GetCustomAttributes(typeof(SetUpAttribute), true).Any() ||
+                                                             f.GetMethod().GetCustomAttributes(typeof(TestFixtureSetUpAttribute), true).Any());
+
+            if (testMethod == null)
+            {
+                throw new Exception("Could not determine the test method.");
+            }
+
+            var testClassType = testMethod.GetMethod().DeclaringType;
+            if (testClassType == null)
+            {
+                throw new Exception("Could not find test class type.");
+            }
+
+            return Path.GetDirectoryName((new Uri(testClassType.Assembly.CodeBase)).AbsolutePath);
+        }
+
+        /// <summary>
+        /// Gets the test-data directory for the current test project.
+        /// </summary>
+        public static string GetDataDir()
+        {
+            var testProjectDirectory = GetTestProjectDirectory();
+            var rootedTestProjectFolderPath = Path.GetFullPath(Path.Combine(testProjectDirectory, "..", ".."));
+
+            return Path.GetFullPath(Path.Combine(rootedTestProjectFolderPath, "test-data") + Path.DirectorySeparatorChar);
+        }
+
+        /// <summary>
+        /// Get's the path in test-data tree section
+        /// </summary>
+        /// <param name="filename"></param>
+        /// <returns></returns>
+        public static string GetTestFilePath(string filename)
+        {
+            var path = Path.Combine(GetDataDir(), filename);
+            var uri = new UriBuilder(path);
+
+            path = Uri.UnescapeDataString(uri.Path);
+            if (File.Exists(path))
+            {
+                return path;
+            }
+
+            // file not found..exception
+            throw new FileNotFoundException(String.Format("File not found: {0}", path), path);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="maxMilliseconds"></param>
+        /// <param name="action"></param>
+        /// <param name="rankHddAccess">Take HDD speed into account, makes sure that test timing is divided by MACHINE_HDD_PERFORMANCE_RANK environmental variable.</param>
+        /// <returns></returns>
+        public static double AssertIsFasterThan(float maxMilliseconds, Action action, bool rankHddAccess = false)
+        {
+            return AssertIsFasterThan(maxMilliseconds, null, action, rankHddAccess);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="maxMilliseconds"></param>
+        /// <param name="message"></param>
+        /// <param name="action"></param>
+        /// <param name="rankHddAccess">Take HDD speed into account, makes sure that test timing is divided by MACHINE_HDD_PERFORMANCE_RANK environmental variable.</param>
+        /// <returns></returns>
+        public static double AssertIsFasterThan(float maxMilliseconds, string message, Action action, bool rankHddAccess)
+        {
+            var stopwatch = new Stopwatch();
+            double actualMillisecond = default(double);
+
+            stopwatch.Start();
+            action();
+            stopwatch.Stop();
+
+            actualMillisecond = Math.Abs(actualMillisecond - default(double)) > 1e-5
+                ? Math.Min(stopwatch.ElapsedMilliseconds, actualMillisecond)
+                : stopwatch.ElapsedMilliseconds;
+
+            stopwatch.Reset();
+
+            string testName = GetCurrentTestClassMethodName();
+
+            if (testName == lastTestName) // check if there are more than one assert in a single test
+            {
+                assertInTestMethod++;
+                testName += assertInTestMethod;
+            }
+            else
+            {
+                lastTestName = testName;
+                assertInTestMethod = 1; // reset
+            }
+
+            float machinePerformanceRank = GetMachinePerformanceRank();
+
+            float machineHddPerformanceRank = GetMachineHddPerformanceRank();
+
+            var reportDirectory = GetSolutionRoot() + Path.DirectorySeparatorChar + "target/";
+            FileUtils.CreateDirectoryIfNotExists(reportDirectory);
+
+            var path = reportDirectory + "performance-times.html";
+            WriteTimesToLogFile(maxMilliseconds, (int) actualMillisecond, machinePerformanceRank,
+                                machineHddPerformanceRank, rankHddAccess, testName, false, path);
+
+            path = reportDirectory + "performance-times-charts.html";
+            WriteTimesToLogFile(maxMilliseconds, (int) actualMillisecond, machinePerformanceRank,
+                                machineHddPerformanceRank, rankHddAccess, testName, true, path);
+
+            float rank = machineHddPerformanceRank;
+
+            if (rankHddAccess) // when test relies a lot on HDD - multiply rank by hdd speed factor
+            {
+                rank *= machineHddPerformanceRank;
+            }
+
+            var userMessage = String.IsNullOrEmpty(message) ? "" : message + ". ";
+            if (rank != 1.0f)
+            {
+                Assert.IsTrue(rank*actualMillisecond < maxMilliseconds, userMessage + "Maximum of {0} milliseconds exceeded. Actual was {1}, machine performance weighted actual was {2}",
+                              maxMilliseconds, actualMillisecond, actualMillisecond*rank);
+                Console.WriteLine(userMessage + String.Format("Test took {1} milliseconds (machine performance weighted {2}). Maximum was {0}",
+                                                              maxMilliseconds, actualMillisecond, actualMillisecond*rank));
+            }
+            else
+            {
+                Assert.IsTrue(actualMillisecond < maxMilliseconds, userMessage + "Maximum of {0} milliseconds exceeded. Actual was {1}", maxMilliseconds,
+                              actualMillisecond);
+                Console.WriteLine(userMessage + String.Format("Test took {1} milliseconds. Maximum was {0}", maxMilliseconds, actualMillisecond));
+            }
+
+            return actualMillisecond;
+        }
+
+        /// <summary>
+        /// Checks if the given messages occurs in the log.
+        /// </summary>
+        /// <param name="action">Action to be performed while recording the log</param>
+        /// <param name="message">The message that should occur in the log</param>
+        /// <param name="expectedLogMessageCount">Optional: assert that log has this number of messages.</param>
+        public static void AssertLogMessageIsGenerated(Action action, string message, int? expectedLogMessageCount = null)
+        {
+            AssertLogMessagesAreGenerated(action, new[]
+            {
+                message
+            }, expectedLogMessageCount);
+        }
+
+        /// <summary>
+        /// Method used to check if a collection of messages have occured in the log.
+        /// This function allowed checking log messages being generated like <see cref="AssertLogMessageIsGenerated"/>
+        /// without having to rerun the action for every single message. Fails the test when any of checks fail.
+        /// </summary>
+        /// <param name="action">Action to be performed while recording the log</param>
+        /// <param name="messages">The collection of messages that should occur in the log</param>
+        /// <param name="expectedLogMessageCount">Optional: assert that log has this number of messages.</param>
+        /// <seealso cref="AssertLogMessageIsGenerated"/>
+        public static void AssertLogMessagesAreGenerated(Action action, IEnumerable<string> messages, int? expectedLogMessageCount = null)
+        {
+            var renderedMessages = GetAllRenderedMessages(action);
+
+            AssertExpectedMessagesInRenderedMessages(messages, renderedMessages);
+            if (expectedLogMessageCount != null)
+            {
+                Assert.AreEqual((int) expectedLogMessageCount, renderedMessages.Count());
+            }
+        }
+
+        /// <summary>
+        /// Method use to perform any type of assertion on the generated log while performing
+        /// a particular action.
+        /// </summary>
+        /// <param name="action">Action to be performed while recording the log.</param>
+        /// <param name="assertLogMessages">The assertion logic performed on the generated log-messages.</param>
+        public static void AssertLogMessages(Action action, Action<IEnumerable<string>> assertLogMessages)
+        {
+            var renderedMessages = GetAllRenderedMessages(action);
+            assertLogMessages(renderedMessages);
+        }
+
+        /// <summary>
+        /// Checks the number of messages in the log.
+        /// </summary>
+        /// <param name="action">Action to be performed while recording the log</param>
+        /// <param name="count">The expected number of messages</param>
+        public static void AssertLogMessagesCount(Action action, int count)
+        {
+            var renderedMessages = GetAllRenderedMessages(action);
+
+            Assert.AreEqual(count, renderedMessages.Count());
+        }
+
+        /// <summary>
+        /// Asserts that two bitmap images are equal.
+        /// </summary>
+        /// <param name="expectedImage">The expected image.</param>
+        /// <param name="actualImage">The actual image.</param>
+        /// <exception cref="AssertionException">When <paramref name="actualImage"/> is not
+        /// equal to <paramref name="expectedImage"/>.</exception>
+        public static void AssertImagesAreEqual(Image expectedImage, Image actualImage)
+        {
+            if (expectedImage == null)
+            {
+                Assert.IsNull(actualImage);
+                return;
+            }
+            Assert.IsNotNull(actualImage);
+            
+            Assert.AreEqual(expectedImage.Size, actualImage.Size);
+            IEnumerable<byte> expectedImageBytes = GetImageAsByteArray(expectedImage);
+            IEnumerable<byte> actualImageBytes = GetImageAsByteArray(actualImage);
+            CollectionAssert.AreEqual(expectedImageBytes, actualImageBytes);
+        }
+
+        /// <summary>
+        /// Asserts that a <see cref="ContextMenuStrip"/> contains an item at the given <see cref="position"/>
+        /// with the correct properties.
+        /// </summary>
+        /// <param name="menu">The <see cref="ContextMenuStrip"/> containing an item at position <paramref name="position"/>.</param>
+        /// <param name="position">The position of the menu item in <paramref name="menu"/>.</param>
+        /// <param name="text">The text expected for the menu item.</param>
+        /// <param name="toolTip">The tooltip expected for the menu item.</param>
+        /// <param name="icon">The image expected for the menu item.</param>
+        /// <param name="enabled">Optional: the expected enabled state of the menu item. Default: <c>true</c>.</param>
+        /// <exception cref="AssertionException">When <paramref name="menu"/> does not contain a menu item at
+        /// position with the right <paramref name="text"/>, <paramref name="toolTip"/> or <paramref name="icon"/>.
+        /// </exception>
+        public static void AssertContextMenuStripContainsItem(ContextMenuStrip menu, int position, string text, string toolTip, Image icon, bool enabled = true)
+        {
+            Assert.IsNotNull(menu);
+            Assert.Less(position, menu.Items.Count);
+
+            var item = menu.Items[position];
+
+            Assert.AreEqual(text, item.Text);
+            Assert.AreEqual(toolTip, item.ToolTipText);
+            Assert.AreEqual(enabled, item.Enabled);
+            AssertImagesAreEqual(icon, item.Image);
+        }
+
+        private static string GetCurrentTestClassMethodName()
+        {
+            var stackTrace = new StackTrace(false);
+
+            for (int i = 1; i < stackTrace.FrameCount; i++)
+            {
+                StackFrame stackFrame = stackTrace.GetFrame(i);
+                if (stackFrame.GetMethod().GetCustomAttributes(true).OfType<TestAttribute>().Count() != 0)
+                {
+                    MethodBase method = stackFrame.GetMethod();
+                    return method.DeclaringType.Name + "." + method.Name;
+                }
+            }
+
+            return "<unknown test method>";
+        }
+
+        private static string GetSolutionRoot()
+        {
+            const string solutionName = "Ringtoets.sln";
+            //get the current directory and scope up
+            //TODO find a faster safer method 
+            string curDir = ".";
+            while (Directory.Exists(curDir) && !File.Exists(curDir + @"\" + solutionName))
+            {
+                curDir += "/../";
+            }
+
+            if (!File.Exists(Path.Combine(curDir, solutionName)))
+            {
+                throw new InvalidOperationException("Solution file not found.");
+            }
+
+            return Path.GetFullPath(curDir);
+        }
+
+        private static float GetMachineHddPerformanceRank()
+        {
+            string rank = Environment.GetEnvironmentVariable("MACHINE_HDD_PERFORMANCE_RANK");
+            if (!String.IsNullOrEmpty(rank))
+            {
+                return Single.Parse(rank);
+            }
+
+            return 1.0f;
+        }
+
+        private static float GetMachinePerformanceRank()
+        {
+            string rank = Environment.GetEnvironmentVariable("MACHINE_PERFORMANCE_RANK");
+            if (!String.IsNullOrEmpty(rank))
+            {
+                return Single.Parse(rank);
+            }
+
+            return 1.0f;
+        }
+
+        private static void WriteTimesToLogFile(float maxMilliseconds, float actualMilliseconds, float machineRank, float machineHddRank, bool useHddAccessRank, string testName, bool includeCharts, string path)
+        {
+            if (!File.Exists(path))
+            {
+                if (!includeCharts)
+                {
+                    File.AppendAllText(path, @"<a href=""performance-times-charts.html"" target=""_blank"">View with charts</a><br />");
+                }
+
+                if (machineRank != 1.0f)
+                {
+                    File.AppendAllText(path, String.Format("Machine performance rank (multiplier):{0}<br />", machineRank));
+                    File.AppendAllText(path, @"Time is in milliseconds<br /><br />");
+                    File.AppendAllText(path, String.Format("<table border=\"1\">\n<tr><th>Time</th><th>Name</th>{0}<th>MaxTime</th><th>ActualTime</th><th>RankedActualTime</th><th>Percentage</th></tr>", includeCharts ? "<th>Chart</th>" : ""));
+                }
+                else
+                {
+                    File.AppendAllText(path, @"Time is in milliseconds<br /><br />");
+                    File.AppendAllText(path, String.Format("<table border=\"1\">\n<tr><th>Time</th><th>Name</th>{0}<th>MaxTime</th><th>ActualTime</th><th>Percentage</th></tr>", includeCharts ? "<th>Chart</th>" : ""));
+                }
+            }
+
+            string contents;
+
+            float rank = machineRank*(useHddAccessRank ? machineHddRank : 1.0f);
+
+            var chartContent = includeCharts ? String.Format("<td><iframe style=\"width:950px;height:350px;border:none\" src=\"performace-test-reports\\{0}.json.html\"></iframe></td>", testName) : "";
+
+            float fraction;
+            if (machineRank != 1.0f)
+            {
+                contents = String.Format(CultureInfo.InvariantCulture,
+                                         "<tr><td>{0}</td><td><a href=\"performace-test-reports/{1}.json.html\">{1}</a></td>{2}<td>{3:G5}</td><td>{4:G5}</td><td>{5:G5}</td>",
+                                         DateTime.Now, testName, chartContent, maxMilliseconds, actualMilliseconds, actualMilliseconds*rank);
+                fraction = (maxMilliseconds - actualMilliseconds*rank)/maxMilliseconds;
+            }
+            else
+            {
+                contents = String.Format(CultureInfo.InvariantCulture,
+                                         "<tr><td>{0}</td><td><a href=\"performace-test-reports/{1}.json.html\">{1}</a></td>{2}<td>{3:G5}</td><td>{4:G5}</td>", DateTime.Now, testName, chartContent,
+                                         maxMilliseconds, actualMilliseconds);
+                fraction = (maxMilliseconds - actualMilliseconds)/maxMilliseconds;
+            }
+
+            string color = ColorTranslator.ToHtml(GetPerformanceColor(fraction));
+            contents += String.Format(CultureInfo.InvariantCulture, "<td bgcolor=\"{0}\">{1:G5}%</td>", color, (100 - fraction*100));
+
+            contents += "</tr>\n";
+            File.AppendAllText(path, contents);
+
+            // update test reports in JSON files on build server (tests statistics)
+            // TODO: find way to write it somewhere so that it will be shared between build agents
+
+            int buildNumber = 0;
+            string s = Environment.GetEnvironmentVariable("BUILD_NUMBER");
+            if (!String.IsNullOrEmpty(s))
+            {
+                buildNumber = Int32.Parse(s); // defined on build server
+            }
+
+            // generate JSON files locally
+            string testHistoryDirectoryPath = GetSolutionRoot() + "/target/performace-test-reports";
+            FileUtils.CreateDirectoryIfNotExists(testHistoryDirectoryPath);
+
+            string testHistoryFilePath = testHistoryDirectoryPath + Path.DirectorySeparatorChar + testName + ".json";
+
+            var testInfos = new List<TestRunInfo>();
+
+            if (File.Exists(testHistoryFilePath))
+            {
+                testInfos = JsonConvert.DeserializeObject<List<TestRunInfo>>(File.ReadAllText(testHistoryFilePath));
+            }
+
+            if (buildNumber == 0)
+            {
+                if (testInfos == null || testInfos.Count == 0)
+                {
+                    testInfos = new List<TestRunInfo>();
+                }
+                else
+                {
+                    var maxBuildNumber = testInfos.Select(i => i.BuildNumber).Max();
+
+                    // reset build numbers if they were not set
+                    foreach (var testInfo in testInfos)
+                    {
+                        if (testInfo.BuildNumber == 0)
+                        {
+                            testInfo.BuildNumber = buildNumber;
+                            buildNumber++;
+                        }
+                    }
+
+                    buildNumber = maxBuildNumber + 1;
+                }
+            }
+
+            int maxTestInfoCount = 100; // max number of tests locally
+
+            while (testInfos.Count >= maxTestInfoCount)
+            {
+                testInfos.RemoveAt(0);
+            }
+
+            testInfos.Add(new TestRunInfo
+            {
+                TestName = testName,
+                Actual = actualMilliseconds,
+                ActualWeighted =
+                    (int) (actualMilliseconds*machineRank*(useHddAccessRank ? machineHddRank : 1.0)),
+                Max = maxMilliseconds,
+                MachineHddRank = machineHddRank,
+                MachineRank = machineRank,
+                Time = DateTime.Now.ToString(CultureInfo.InvariantCulture),
+                BuildNumber = buildNumber,
+                UseMachineHddRank = useHddAccessRank
+            });
+
+            CreateChart(testInfos, testHistoryFilePath + ".html");
+
+            string json = JsonConvert.SerializeObject(testInfos, Formatting.Indented);
+            File.WriteAllText(testHistoryFilePath, json);
+        }
+
+        private static void CreateChart(List<TestRunInfo> testInfos, string filePath)
+        {
+            var content = File.ReadAllText(SolutionRoot + "/Core/Common/test/Core.Common.TestUtil/test-data/chart.template.html");
+
+            var seriesPassed = "";
+            var seriesFailed = "";
+            var seriesThreshold = "";
+            for (var i = 0; i < testInfos.Count; i++)
+            {
+                var info = testInfos[i];
+                if (info.Actual > info.Max)
+                {
+                    seriesFailed += "[" + info.BuildNumber + ", " + info.ActualWeighted + "], ";
+                }
+                else
+                {
+                    seriesPassed += "[" + info.BuildNumber + ", " + info.ActualWeighted + "], ";
+                }
+
+                seriesThreshold += "[" + info.BuildNumber + ", " + info.Max + "], ";
+            }
+
+            content = content.Replace("$$SERIES_PASSED$$", seriesPassed);
+            content = content.Replace("$$SERIES_FAILED$$", seriesFailed);
+            content = content.Replace("$$SERIES_THRESHOLD$$", seriesThreshold);
+
+            File.WriteAllText(filePath, content);
+        }
+
+        private static Color GetPerformanceColor(double fraction)
+        {
+            if (fraction < 0)
+            {
+                return Color.Red;
+            }
+
+            if (colors == null)
+            {
+                var bitmap = new Bitmap(101, 1);
+                Graphics graphics = Graphics.FromImage(bitmap);
+
+                var rectangle = new Rectangle(0, 0, 101, 1);
+
+                var brush = new LinearGradientBrush(rectangle, Color.Green, Color.Yellow, 0.0f);
+
+                graphics.FillRectangle(brush, rectangle);
+
+                colors = new Color[101];
+                for (int i = 0; i < 101; i++)
+                {
+                    colors[i] = bitmap.GetPixel(i, 0);
+                }
+            }
+
+            // 25% is the best result GREEN, less or greater than goes to yellow
+            var localValue = fraction >= 0.25 ? Math.Min(1, (fraction - 0.25)/0.75) : Math.Max(0, (0.25 - fraction)/0.25);
+
+            return colors[(int) (localValue*100.0)];
+        }
+
+        /// <summary>
+        /// Checks if all messages from <paramref name="messages"/> occur in <paramref name="renderedMessages"/>
+        /// </summary>
+        /// <param name="messages">The collection of expected messages</param>
+        /// <param name="renderedMessages">The collection of messages in the log</param>
+        private static void AssertExpectedMessagesInRenderedMessages(IEnumerable<string> messages, IEnumerable<string> renderedMessages)
+        {
+            foreach (string message in messages)
+            {
+                CollectionAssert.Contains(renderedMessages, message);
+            }
+        }
+
+        /// <summary>
+        /// Checks if none of the messages from <paramref name="messages"/> occurs in <paramref name="renderedMessages"/>
+        /// </summary>
+        /// <param name="messages">The collection of unwanted messages</param>
+        /// <param name="renderedMessages">The collection of log messages in the log</param>
+        private static void AssertUnwantedMessagesNotInRenderedMessages(IEnumerable<string> messages, IEnumerable<string> renderedMessages)
+        {
+            foreach (var renderedMessage in renderedMessages)
+            {
+                if (messages.Contains(renderedMessage))
+                {
+                    Assert.Fail("Message \"{0}\" found in messages of log4net", renderedMessage);
+                }
+            }
+        }
+
+        private static IEnumerable<string> GetAllRenderedMessages(Action action)
+        {
+            var memoryAppender = new MemoryAppender();
+            BasicConfigurator.Configure(memoryAppender);
+            LogHelper.SetLoggingLevel(Level.All);
+
+            action();
+
+            var renderedMessages = memoryAppender.GetEvents().Select(le => le.RenderedMessage).ToList();
+
+            memoryAppender.Close();
+            LogHelper.ResetLogging();
+
+            return renderedMessages;
+        }
+
+        #region Nested type: TestRunInfo
+
+        internal class TestRunInfo
+        {
+            public string Time;
+            public string TestName;
+            public float Actual; // millis
+            public float ActualWeighted; // millis
+            public float Max; // millis
+            public int BuildNumber;
+            public float MachineHddRank;
+            public float MachineRank;
+            public bool UseMachineHddRank;
+        }
+
+        #endregion
+
+        private static IEnumerable<byte> GetImageAsByteArray(Image expectedImage)
+        {
+            using (var stream = new MemoryStream())
+            {
+                expectedImage.Save(stream, expectedImage.RawFormat);
+                var length = stream.Length;
+                var imageBytes = new byte[length];
+                stream.Read(imageBytes, 0, (int)length);
+                return imageBytes;
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Core/Common/test/Core.Common.TestUtil/WindowsFormsTestHelper.Designer.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.TestUtil/WindowsFormsTestHelper.Designer.cs	(revision 0)
+++ Core/Common/test/Core.Common.TestUtil/WindowsFormsTestHelper.Designer.cs	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -0,0 +1,118 @@
+using System.Windows.Forms;
+
+namespace Core.Common.TestUtil
+{
+    partial class WindowsFormsTestHelper
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+            this.splitContainer2 = new System.Windows.Forms.SplitContainer();
+            this.PropertyGrid = new System.Windows.Forms.PropertyGrid();
+            this.treeView1 = new System.Windows.Forms.TreeView();
+            this.splitContainer1.Panel1.SuspendLayout();
+            this.splitContainer1.SuspendLayout();
+            this.splitContainer2.Panel1.SuspendLayout();
+            this.splitContainer2.Panel2.SuspendLayout();
+            this.splitContainer2.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // splitContainer1
+            // 
+            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer1.Name = "splitContainer1";
+            // 
+            // splitContainer1.Panel1
+            // 
+            this.splitContainer1.Panel1.Controls.Add(this.splitContainer2);
+            this.splitContainer1.Size = new System.Drawing.Size(728, 490);
+            this.splitContainer1.SplitterDistance = 242;
+            this.splitContainer1.TabIndex = 0;
+            // 
+            // splitContainer2
+            // 
+            this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer2.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer2.Name = "splitContainer2";
+            this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal;
+            // 
+            // splitContainer2.Panel1
+            // 
+            this.splitContainer2.Panel1.Controls.Add(this.treeView1);
+            // 
+            // splitContainer2.Panel2
+            // 
+            this.splitContainer2.Panel2.Controls.Add(this.PropertyGrid);
+            this.splitContainer2.Size = new System.Drawing.Size(242, 490);
+            this.splitContainer2.SplitterDistance = 251;
+            this.splitContainer2.TabIndex = 0;
+            // 
+            // propertyGrid1
+            // 
+            this.PropertyGrid.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.PropertyGrid.Location = new System.Drawing.Point(0, 0);
+            this.PropertyGrid.Name = "PropertyGrid";
+            this.PropertyGrid.Size = new System.Drawing.Size(242, 235);
+            this.PropertyGrid.TabIndex = 2;
+            // 
+            // treeView1
+            // 
+            this.treeView1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.treeView1.ImageIndex = 0;
+            this.treeView1.LabelEdit = true;
+            this.treeView1.Location = new System.Drawing.Point(0, 0);
+            this.treeView1.Name = "treeView1";
+            this.treeView1.SelectedImageIndex = 0;
+            this.treeView1.Size = new System.Drawing.Size(242, 251);
+            this.treeView1.TabIndex = 0;
+            // 
+            // WindowsFormsTestHelper
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(728, 490);
+            this.Controls.Add(this.splitContainer1);
+            this.Name = "WindowsFormsTestHelper";
+            this.Text = "WindowsFormsTestHelper";
+            this.splitContainer1.Panel1.ResumeLayout(false);
+            this.splitContainer1.ResumeLayout(false);
+            this.splitContainer2.Panel1.ResumeLayout(false);
+            this.splitContainer2.Panel2.ResumeLayout(false);
+            this.splitContainer2.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.SplitContainer splitContainer1;
+        private System.Windows.Forms.SplitContainer splitContainer2;
+        private TreeView treeView1;
+    }
+}
\ No newline at end of file
Index: Core/Common/test/Core.Common.TestUtil/WindowsFormsTestHelper.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.TestUtil/WindowsFormsTestHelper.cs	(revision 0)
+++ Core/Common/test/Core.Common.TestUtil/WindowsFormsTestHelper.cs	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -0,0 +1,282 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Windows.Forms;
+using NUnit.Framework;
+
+namespace Core.Common.TestUtil
+{
+    public partial class WindowsFormsTestHelper : Form
+    {
+        private static string nonModalControlsTestName; // current unit test name
+        private static readonly IList<Control> nonModalControls = new List<Control>();
+        private Action<Form> formShown;
+        private readonly GuiTestHelper guiTestHelper;
+        private bool wasShown;
+
+        public WindowsFormsTestHelper()
+        {
+            Application.EnableVisualStyles();
+
+            CheckForIllegalCrossThreadCalls = true;
+            Application.EnableVisualStyles();
+            SetStyle(
+                ControlStyles.AllPaintingInWmPaint | ControlStyles.OptimizedDoubleBuffer | ControlStyles.ResizeRedraw |
+                ControlStyles.UserPaint, true);
+            InitializeComponent();
+
+            guiTestHelper = GuiTestHelper.Instance;
+        }
+
+        public static object[] PropertyObjects { get; set; }
+
+        public PropertyGrid PropertyGrid { get; private set; }
+
+        public static void Show(Control control, Action<Form> formVisibleChangedAction, params object[] propertyObjects)
+        {
+            new WindowsFormsTestHelper().ShowTopLevel(control, propertyObjects, false, formVisibleChangedAction);
+        }
+
+        public static void Show(Control control, params object[] propertyObjects)
+        {
+            new WindowsFormsTestHelper().ShowTopLevel(control, propertyObjects, false, null);
+        }
+
+        public static void ShowModal(Control control, params object[] propertyObjects)
+        {
+            new WindowsFormsTestHelper().ShowTopLevel(control, propertyObjects, true, null);
+        }
+
+        public static void ShowModal(Control control, Action<Form> formVisibleChangedAction,
+                                     params object[] propertyObjects)
+        {
+            new WindowsFormsTestHelper().ShowTopLevel(control, propertyObjects, true, formVisibleChangedAction);
+        }
+
+        public static void CloseAll()
+        {
+            foreach (var control in nonModalControls)
+            {
+                control.Hide();
+                control.Dispose();
+            }
+
+            nonModalControls.Clear();
+
+            nonModalControlsTestName = string.Empty;
+        }
+
+        private void ShowTopLevel(Control control, object[] propertyObjects, bool modal, Action<Form> shownAction)
+        {
+            //if (TestContext.CurrentContext.Test.Properties["_CATEGORIES"])
+
+            ThrowIfPropertyObjectsContainsActionDueToLikelyMisuse(propertyObjects);
+
+            GuiTestHelper.Initialize();
+
+            formShown = shownAction;
+
+            if (control.TopLevelControl == control)
+            {
+                ShowTopLevelControl(control, modal);
+            }
+            else
+            {
+                ShowControlInTestForm(control, modal, propertyObjects);
+            }
+
+            // clear all controls shown as non-modal after modal control closes 
+            if (!modal)
+            {
+                var testName = TestContext.CurrentContext.Test.FullName;
+
+                if (string.IsNullOrEmpty(nonModalControlsTestName))
+                {
+                    nonModalControlsTestName = testName;
+                }
+                else
+                {
+                    if (nonModalControlsTestName != testName)
+                    {
+                        var errorMessage = string.Format("Did you forget to call WindowsFormsTestHelper.CloseAll() at the end of the following test: {0}?", nonModalControlsTestName);
+                        nonModalControlsTestName = testName; // reset for the next test
+                        throw new InvalidOperationException(errorMessage);
+                    }
+                }
+
+                nonModalControls.Add(this);
+            }
+            else
+            {
+                CloseAll();
+
+                Close();
+                Dispose();
+
+                control.Dispose();
+            }
+        }
+
+        private void ThrowIfPropertyObjectsContainsActionDueToLikelyMisuse(object[] propertyObjects)
+        {
+            if (propertyObjects.Length > 0)
+            {
+                var firstAsAction = propertyObjects[0] as Action;
+                if (firstAsAction != null)
+                {
+                    throw new InvalidOperationException(
+                        "Warning, you've given an Action (class) as argument, but it is being treated as a property object. Use Action<Form>");
+                }
+            }
+        }
+
+        private void ShowControlInTestForm(Control control, bool modal, object[] propertyObjects)
+        {
+            PropertyObjects = propertyObjects;
+            PropertyGrid.SelectedObject = control;
+            control.Dock = DockStyle.Fill;
+            splitContainer1.Panel2.Controls.Add(control);
+
+            InitializeTree(control);
+
+            SetStyle(ControlStyles.SupportsTransparentBackColor, true);
+
+            Paint += delegate { wasShown = true; };
+            VisibleChanged += delegate { wasShown = true; };
+
+            Show();
+
+            WaitOrExit(this, modal);
+        }
+
+        private void ShowTopLevelControl(Control control, bool modal)
+        {
+            control.Paint += delegate { wasShown = true; };
+            control.VisibleChanged += delegate { wasShown = true; };
+
+            control.Show();
+
+            WaitOrExit(control, modal);
+        }
+
+        private void WaitOrExit(Control control, bool modal)
+        {
+            // wait until control is shown
+            while (!wasShown && guiTestHelper.Exception == null)
+            {
+                Application.DoEvents();
+            }
+
+            // is shown, not trigger action
+            try
+            {
+                Application.DoEvents();
+
+                if (formShown != null && wasShown)
+                {
+                    formShown(control is Form ? (Form) control : this);
+                }
+            }
+            finally
+            {
+                formShown = null;
+            }
+
+            // if not on build server - wait until control is closed
+            if (!GuiTestHelper.IsBuildServer && modal)
+            {
+                while (control.Visible)
+                {
+                    Application.DoEvents();
+                }
+            }
+
+            if (guiTestHelper.Exception != null)
+            {
+                guiTestHelper.RethrowUnhandledException();
+            }
+        }
+
+        private void InitializeTree(Control control)
+        {
+            IList itemsToShow = new RootNode
+            {
+                control
+            };
+            foreach (object o in PropertyObjects)
+            {
+                itemsToShow.Add(o);
+            }
+
+            treeView1.ImageList = new ImageList
+            {
+                ColorDepth = ColorDepth.Depth32Bit
+            };
+            treeView1.ImageList.Images.Add("Control", Resources.Control);
+            treeView1.ImageList.Images.Add("Data", Resources.Data);
+
+            AddAllNodes(treeView1.Nodes, itemsToShow);
+
+            treeView1.NodeMouseClick += delegate { PropertyGrid.SelectedObject = treeView1.SelectedNode.Tag; };
+        }
+
+        private void AddAllNodes(TreeNodeCollection nodes, IEnumerable itemsToShow)
+        {
+            foreach (object item in itemsToShow.Cast<object>().Where(i => i != null))
+            {
+                int imageIndex = item is Control ? 0 : 1;
+                var node = new TreeNode(item.ToString(), imageIndex, imageIndex)
+                {
+                    Tag = item
+                };
+                nodes.Add(node);
+
+                if (item is Control)
+                {
+                    var control = ((Control) item);
+                    AddAllNodes(node.Nodes, control.Controls);
+
+                    // hack, try to get Data or DataSource property
+                    PropertyInfo dataProperty = null;
+                    try
+                    {
+                        dataProperty = control.GetType().GetProperty("Data");
+                    }
+                    catch (Exception) {}
+
+                    if (dataProperty != null)
+                    {
+                        AddAllNodes(node.Nodes, new[]
+                        {
+                            dataProperty.GetValue(control, null)
+                        });
+                    }
+
+                    PropertyInfo dataSourceProperty = control.GetType().GetProperty("DataSource");
+                    if (dataSourceProperty != null)
+                    {
+                        AddAllNodes(node.Nodes, new[]
+                        {
+                            dataSourceProperty.GetValue(control, null)
+                        });
+                    }
+                }
+
+                if (item is IEnumerable)
+                {
+                    AddAllNodes(node.Nodes, (IEnumerable) item);
+                }
+            }
+        }
+
+        private class RootNode : ArrayList
+        {
+            public override string ToString()
+            {
+                return "RootNode";
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Core/Common/test/Core.Common.TestUtil/WindowsFormsTestHelper.resx
===================================================================
diff -u
--- Core/Common/test/Core.Common.TestUtil/WindowsFormsTestHelper.resx	(revision 0)
+++ Core/Common/test/Core.Common.TestUtil/WindowsFormsTestHelper.resx	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
Index: Core/Common/test/Core.Common.TestUtil/WpfTestHelper.xaml
===================================================================
diff -u
--- Core/Common/test/Core.Common.TestUtil/WpfTestHelper.xaml	(revision 0)
+++ Core/Common/test/Core.Common.TestUtil/WpfTestHelper.xaml	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -0,0 +1,9 @@
+<Window x:Class="Core.Common.TestUtil.WpfTestHelper"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300">
+    <Grid />
+</Window>
Index: Core/Common/test/Core.Common.TestUtil/WpfTestHelper.xaml.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.TestUtil/WpfTestHelper.xaml.cs	(revision 0)
+++ Core/Common/test/Core.Common.TestUtil/WpfTestHelper.xaml.cs	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -0,0 +1,188 @@
+using System;
+using System.Windows;
+using log4net;
+using Application = System.Windows.Forms.Application;
+using Control = System.Windows.Controls.Control;
+
+namespace Core.Common.TestUtil
+{
+    /// <summary>
+    /// Interaction logic for WpfTestHelper.xaml
+    /// </summary>
+    public partial class WpfTestHelper
+    {
+        private static readonly ILog log = LogManager.GetLogger(typeof(WindowsFormsTestHelper));
+
+        private static Window window;
+
+        private Action shownAction;
+
+        private readonly GuiTestHelper guiTestHelper;
+
+        private bool wasShown;
+
+        public WpfTestHelper()
+        {
+            InitializeComponent();
+            guiTestHelper = GuiTestHelper.Instance;
+        }
+
+        public static void ShowModal(Control control, params object[] propertyObjects)
+        {
+            new WpfTestHelper().ShowTopLevel(control, propertyObjects, true, null);
+        }
+
+        public static void ShowModal(Control control, Action formVisibleChangedAction, params object[] propertyObjects)
+        {
+            try
+            {
+                new WpfTestHelper().ShowTopLevel(control, propertyObjects, true, formVisibleChangedAction);
+            }
+            catch (Exception e)
+            {
+                log.Error(e.Message, e);
+                throw;
+            }
+        }
+
+        private void ShowTopLevel(Control control, object[] propertyObjects, bool modal, Action shownAction)
+        {
+            ThrowIfPropertyObjectsContainsActionDueToLikelyMisuse(propertyObjects);
+
+            GuiTestHelper.Initialize();
+
+            this.shownAction = shownAction;
+
+            if (control is Window)
+            {
+                ShowTopLevelControl(control, modal);
+            }
+            else
+            {
+                ShowControlInTestForm(modal);
+            }
+
+            // clear all controls shown as non-modal after modal control closes 
+            if (!modal)
+            {
+                throw new NotImplementedException();
+            }
+            else
+            {
+                WindowsFormsTestHelper.CloseAll(); // just in case, since we have mixed WPF / WF app
+
+                Close();
+
+                if (window != null)
+                {
+                    window.Closed += WindowOnClosed;
+
+                    window.Close();
+                    window.Close();
+
+                    while (window.IsVisible)
+                    {
+                        Application.DoEvents();
+                        Application.DoEvents();
+                        window.Close();
+                    }
+
+                    window.Closed -= WindowOnClosed;
+                    window = null;
+                }
+            }
+        }
+
+        private static void WindowOnClosed(object sender, EventArgs eventArgs)
+        {
+            Console.WriteLine(@"Closed");
+        }
+
+        private void ThrowIfPropertyObjectsContainsActionDueToLikelyMisuse(object[] propertyObjects)
+        {
+            if (propertyObjects.Length > 0)
+            {
+                var firstAsAction = propertyObjects[0] as Action;
+                if (firstAsAction != null)
+                {
+                    throw new InvalidOperationException(
+                        "Warning, you've given an Action (class) as argument, but it is being treated as a property object. Check your arguments");
+                }
+            }
+        }
+
+        private void ShowControlInTestForm(bool modal)
+        {
+            IsVisibleChanged += delegate { wasShown = true; };
+
+            Show();
+
+            WaitOrExit(this, modal);
+        }
+
+        private void ShowTopLevelControl(Control control, bool modal)
+        {
+            if (control is Window)
+            {
+                window = (Window) control;
+            }
+            else
+            {
+                window = new Window
+                {
+                    Content = control
+                };
+            }
+            window.IsVisibleChanged += delegate
+            {
+                if (window.IsVisible)
+                {
+                    wasShown = true;
+                }
+            };
+            window.ContentRendered += delegate { wasShown = true; };
+
+            window.Show();
+
+            WaitOrExit(window, modal);
+        }
+
+        private void WaitOrExit(Control control, bool modal)
+        {
+            // wait until control is shown
+            while (!wasShown && guiTestHelper.Exception == null)
+            {
+                Application.DoEvents();
+            }
+
+            // is shown, not trigger action
+            try
+            {
+                Application.DoEvents();
+
+                if (shownAction != null && wasShown)
+                {
+                    shownAction();
+                }
+            }
+            finally
+            {
+                shownAction = null;
+            }
+
+            // if not on build server - wait until control is closed
+            if (!GuiTestHelper.IsBuildServer && modal)
+            {
+                while (control.IsVisible)
+                {
+                    Application.DoEvents();
+                }
+            }
+
+            if (guiTestHelper.Exception != null)
+            {
+                guiTestHelper.RethrowUnhandledException();
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Core/Common/test/Core.Common.TestUtil/packages.config
===================================================================
diff -u
--- Core/Common/test/Core.Common.TestUtil/packages.config	(revision 0)
+++ Core/Common/test/Core.Common.TestUtil/packages.config	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="log4net" version="2.0.4" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net40" />
+  <package id="NUnit" version="2.6.4" targetFramework="net40" />
+  <package id="RhinoMocks" version="3.6.1" targetFramework="net40" />
+</packages>
\ No newline at end of file
Index: Core/Common/test/Core.Common.TestUtil/test-data/chart.template.html
===================================================================
diff -u
--- Core/Common/test/Core.Common.TestUtil/test-data/chart.template.html	(revision 0)
+++ Core/Common/test/Core.Common.TestUtil/test-data/chart.template.html	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -0,0 +1,89 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+ <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <!--[if IE]><script language="javascript" type="text/javascript" src="../../build/tools/flot/js/excanvas.min.js"></script><![endif]-->
+    <script language="javascript" type="text/javascript" src="../../build/tools/flot/js/jquery.js"></script>
+    <script language="javascript" type="text/javascript" src="../../build/tools/flot/js/jquery.flot.js"></script>
+ </head>
+    <body>
+
+    <div id="placeholder" style="width:850px;height:300px;"></div>
+
+<script id="source" language="javascript" type="text/javascript">
+$(function () {
+    var valuesGreen = [$$SERIES_PASSED$$];
+    var valuesRed = [$$SERIES_FAILED$$];
+    var thresholds = [$$SERIES_THRESHOLD$$];
+
+    $.plot($("#placeholder"), [
+        {
+            label: "threshold",
+            data: thresholds,
+            color: "rgb(250, 10, 10)",
+            lines: { show: true },
+        },
+        {
+            label: "passed",
+            data: valuesGreen,
+            color: "rgb(30, 180, 20)",
+            points: { show: true }
+        },
+        {
+            label: "failed",
+            data: valuesRed,
+            color: "rgb(250, 10, 10)",
+            points: { show: true }
+        }],
+      
+        { 
+            grid: { hoverable: true, autoHighlight: true },
+            legend: { show: false },
+            yaxis: { min: 0 }
+        }
+    );
+
+    function showTooltip(x, y, contents, color) {
+        $('<div id="tooltip">' + contents + '</div>').css( {
+            position: 'absolute',
+            display: 'none',
+            top: y + 5,
+            left: x + 20,
+            border: '1px solid #aaa',
+            padding: '2px',
+            'background-color': '#eee',
+            'color': color,
+            opacity: 0.80
+        }).appendTo("body").fadeIn(200);
+    }
+
+    var previousPoint = null;
+    $("#placeholder").bind("plothover", function (event, pos, item) {
+        if (item) {
+            if (previousPoint != item.datapoint) {
+                previousPoint = item.datapoint;
+                   
+                $("#tooltip").remove();
+                var x = item.datapoint[0].toFixed(2),
+                    y = item.datapoint[1].toFixed(2);
+                    
+                if(item.series.label == "threshold")
+                    showTooltip(item.pageX, item.pageY, (x | 0) + " : " + y + " ms", "#f00");
+
+                if(item.series.label == "passed")
+                    showTooltip(item.pageX, item.pageY, (x | 0) + " : " + y + " ms", "#0000");
+
+                if(item.series.label == "failed")
+                    showTooltip(item.pageX, item.pageY, (x | 0) + " : " + y + " ms (failed)", "#f00");
+            }
+        }
+        else {
+            $("#tooltip").remove();
+            previousPoint = null;            
+        }
+    });
+});
+</script>
+
+ </body>
+</html>
Fisheye: Tag d6e6eadf4a2521df75b6d371bacbb181a43058a3 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtils.Test/Core.Common.TestUtils.Test.csproj'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d6e6eadf4a2521df75b6d371bacbb181a43058a3 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtils.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d6e6eadf4a2521df75b6d371bacbb181a43058a3 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtils.Test/WindowsFormsTestHelperTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d6e6eadf4a2521df75b6d371bacbb181a43058a3 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtils.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d6e6eadf4a2521df75b6d371bacbb181a43058a3 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtils/Core.Common.TestUtils.csproj'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d6e6eadf4a2521df75b6d371bacbb181a43058a3 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtils/GuiTestHelper.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d6e6eadf4a2521df75b6d371bacbb181a43058a3 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtils/LogHelper.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d6e6eadf4a2521df75b6d371bacbb181a43058a3 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtils/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d6e6eadf4a2521df75b6d371bacbb181a43058a3 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtils/Resources.Designer.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d6e6eadf4a2521df75b6d371bacbb181a43058a3 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtils/Resources.resx'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.TestUtils/Resources/application_form.png
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
Binary files differ
Index: Core/Common/test/Core.Common.TestUtils/Resources/database.png
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
Binary files differ
Index: Core/Common/test/Core.Common.TestUtils/Resources/table.png
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
Binary files differ
Fisheye: Tag d6e6eadf4a2521df75b6d371bacbb181a43058a3 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtils/TestDataPath.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d6e6eadf4a2521df75b6d371bacbb181a43058a3 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtils/TestHelper.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d6e6eadf4a2521df75b6d371bacbb181a43058a3 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtils/WindowsFormsTestHelper.Designer.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d6e6eadf4a2521df75b6d371bacbb181a43058a3 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtils/WindowsFormsTestHelper.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d6e6eadf4a2521df75b6d371bacbb181a43058a3 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtils/WindowsFormsTestHelper.resx'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d6e6eadf4a2521df75b6d371bacbb181a43058a3 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtils/WpfTestHelper.xaml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d6e6eadf4a2521df75b6d371bacbb181a43058a3 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtils/WpfTestHelper.xaml.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d6e6eadf4a2521df75b6d371bacbb181a43058a3 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtils/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d6e6eadf4a2521df75b6d371bacbb181a43058a3 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtils/test-data/chart.template.html'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Utils.Test/Collections/Generic/EnumerableListTest.cs
===================================================================
diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/Common/test/Core.Common.Utils.Test/Collections/Generic/EnumerableListTest.cs	(.../EnumerableListTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
+++ Core/Common/test/Core.Common.Utils.Test/Collections/Generic/EnumerableListTest.cs	(.../EnumerableListTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using Core.Common.Utils.Collections.Generic;
 using log4net.Core;
 using NUnit.Framework;
Index: Core/Common/test/Core.Common.Utils.Test/Collections/Generic/EventedListTest.cs
===================================================================
diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/Common/test/Core.Common.Utils.Test/Collections/Generic/EventedListTest.cs	(.../EventedListTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
+++ Core/Common/test/Core.Common.Utils.Test/Collections/Generic/EventedListTest.cs	(.../EventedListTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -1,6 +1,6 @@
 using System.ComponentModel;
 using System.Linq;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using Core.Common.Utils.Collections;
 using Core.Common.Utils.Collections.Generic;
 using NUnit.Framework;
Index: Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Test.csproj
===================================================================
diff -u -r23981d00366f6ee42b7b3c2b776a687c1dc70d07 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Test.csproj	(.../Core.Common.Utils.Test.csproj)	(revision 23981d00366f6ee42b7b3c2b776a687c1dc70d07)
+++ Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Test.csproj	(.../Core.Common.Utils.Test.csproj)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -127,6 +127,10 @@
       <Project>{EFA25023-CF6A-4FF7-8C42-B24D7F9509E1}</Project>
       <Name>Core.Common.TestUtils</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
+      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
+      <Name>Core.Common.TestUtil</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
Index: Core/Common/test/Core.Common.Utils.Test/IO/FileUtilsTest.cs
===================================================================
diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/Common/test/Core.Common.Utils.Test/IO/FileUtilsTest.cs	(.../FileUtilsTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
+++ Core/Common/test/Core.Common.Utils.Test/IO/FileUtilsTest.cs	(.../FileUtilsTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 using System.Threading;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using Core.Common.Utils.IO;
 using NUnit.Framework;
 
Index: Core/Common/test/Core.Common.Utils.Test/Reflection/TypeConverterTest.cs
===================================================================
diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/Common/test/Core.Common.Utils.Test/Reflection/TypeConverterTest.cs	(.../TypeConverterTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
+++ Core/Common/test/Core.Common.Utils.Test/Reflection/TypeConverterTest.cs	(.../TypeConverterTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -1,6 +1,6 @@
 using System.ComponentModel;
 using System.Drawing;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using log4net;
 using NUnit.Framework;
 
Index: Core/Common/test/Core.Common.Utils.Test/TestHelperTests.cs
===================================================================
diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/Common/test/Core.Common.Utils.Test/TestHelperTests.cs	(.../TestHelperTests.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
+++ Core/Common/test/Core.Common.Utils.Test/TestHelperTests.cs	(.../TestHelperTests.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -3,7 +3,7 @@
 using System.IO;
 using System.Reflection;
 using System.Windows.Forms;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using Core.Common.Utils.IO;
 using Core.Common.Utils.Test.Properties;
 using log4net;
Index: Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Test/Core.GIS.NetTopologySuite.Extensions.Test.csproj
===================================================================
diff -u -rb5ea48631445312a26944f9d979c34b9132d16e7 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Test/Core.GIS.NetTopologySuite.Extensions.Test.csproj	(.../Core.GIS.NetTopologySuite.Extensions.Test.csproj)	(revision b5ea48631445312a26944f9d979c34b9132d16e7)
+++ Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Test/Core.GIS.NetTopologySuite.Extensions.Test.csproj	(.../Core.GIS.NetTopologySuite.Extensions.Test.csproj)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -44,7 +44,7 @@
     <DebugType>full</DebugType>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-	<AllowedReferenceRelatedFileExtensions>none</AllowedReferenceRelatedFileExtensions>
+    <AllowedReferenceRelatedFileExtensions>none</AllowedReferenceRelatedFileExtensions>
     <OutputPath>bin\Release\</OutputPath>
     <WarningLevel>0</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -87,6 +87,10 @@
       <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
       <Name>Core.Common.Utils</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
+      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
+      <Name>Core.Common.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Core.GIS.GeoAPI.Extensions\Core.GIS.GeoAPI.Extensions.csproj">
       <Project>{016DBD27-99BF-489A-81B5-50D66964BB90}</Project>
       <Name>Core.GIS.GeoAPI.Extensions</Name>
Index: Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Test/Features/FeatureAttributeAccessorHelperTest.cs
===================================================================
diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Test/Features/FeatureAttributeAccessorHelperTest.cs	(.../FeatureAttributeAccessorHelperTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
+++ Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Test/Features/FeatureAttributeAccessorHelperTest.cs	(.../FeatureAttributeAccessorHelperTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using Core.Gis.NetTopologySuite.Extensions.Test.TestObjects;
 using Core.GIS.NetTopologySuite.Extensions.Features;
 using NUnit.Framework;
Index: Core/GIS/test/Core.GIS.NetTopologySuite.Test/Core.GIS.NetTopologySuite.Test.csproj
===================================================================
diff -u -r13f47cf031a0cb759b4685bcdcde112f039d00d3 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/GIS/test/Core.GIS.NetTopologySuite.Test/Core.GIS.NetTopologySuite.Test.csproj	(.../Core.GIS.NetTopologySuite.Test.csproj)	(revision 13f47cf031a0cb759b4685bcdcde112f039d00d3)
+++ Core/GIS/test/Core.GIS.NetTopologySuite.Test/Core.GIS.NetTopologySuite.Test.csproj	(.../Core.GIS.NetTopologySuite.Test.csproj)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -42,7 +42,7 @@
     <DebugType>full</DebugType>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-	<AllowedReferenceRelatedFileExtensions>none</AllowedReferenceRelatedFileExtensions>
+    <AllowedReferenceRelatedFileExtensions>none</AllowedReferenceRelatedFileExtensions>
     <OutputPath>bin\Release\</OutputPath>
     <WarningLevel>0</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -112,9 +112,9 @@
       <Project>{5770DAA9-84E5-4770-AF43-F6B815894368}</Project>
       <Name>Core.GIS.NetTopologySuite</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Core.GIS.SharpMapTestUtils\Core.GIS.SharpMapTestUtils.csproj">
+    <ProjectReference Include="..\Core.GIS.SharpMapTestUtil\Core.GIS.SharpMapTestUtil.csproj">
       <Project>{0A82E7D2-26F8-4A30-9787-7EEABCD7F470}</Project>
-      <Name>Core.GIS.SharpMapTestUtils</Name>
+      <Name>Core.GIS.SharpMapTestUtil</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Core.GIS.SharpMap.Test.csproj
===================================================================
diff -u -rb5ea48631445312a26944f9d979c34b9132d16e7 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/GIS/test/Core.GIS.SharpMap.Test/Core.GIS.SharpMap.Test.csproj	(.../Core.GIS.SharpMap.Test.csproj)	(revision b5ea48631445312a26944f9d979c34b9132d16e7)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Core.GIS.SharpMap.Test.csproj	(.../Core.GIS.SharpMap.Test.csproj)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -53,7 +53,7 @@
     <DebugType>full</DebugType>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-	<AllowedReferenceRelatedFileExtensions>none</AllowedReferenceRelatedFileExtensions>
+    <AllowedReferenceRelatedFileExtensions>none</AllowedReferenceRelatedFileExtensions>
     <OutputPath>bin\Release\</OutputPath>
     <PlatformTarget>x86</PlatformTarget>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
@@ -152,6 +152,10 @@
       <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
       <Name>Core.Common.Utils</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
+      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
+      <Name>Core.Common.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Core.GIS.GeoAPI.Extensions\Core.GIS.GeoAPI.Extensions.csproj">
       <Project>{016DBD27-99BF-489A-81B5-50D66964BB90}</Project>
       <Name>Core.GIS.GeoAPI.Extensions</Name>
@@ -184,9 +188,9 @@
       <Project>{C83777FC-AABB-47D9-911F-D76255D4D541}</Project>
       <Name>Core.GIS.SharpMap</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Core.GIS.SharpMapTestUtils\Core.GIS.SharpMapTestUtils.csproj">
+    <ProjectReference Include="..\Core.GIS.SharpMapTestUtil\Core.GIS.SharpMapTestUtil.csproj">
       <Project>{0A82E7D2-26F8-4A30-9787-7EEABCD7F470}</Project>
-      <Name>Core.GIS.SharpMapTestUtils</Name>
+      <Name>Core.GIS.SharpMapTestUtil</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
       <Project>{EFA25023-CF6A-4FF7-8C42-B24D7F9509E1}</Project>
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/FeatureProviderTest.cs
===================================================================
diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/FeatureProviderTest.cs	(.../FeatureProviderTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/FeatureProviderTest.cs	(.../FeatureProviderTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -3,7 +3,7 @@
 using Core.GIS.SharpMap.Converters.WellKnownText;
 using Core.GIS.SharpMap.Data.Providers;
 using Core.GIS.SharpMap.Layers;
-using Core.GIS.SharpMapTestUtils.TestClasses;
+using Core.GIS.SharpMapTestUtil.TestClasses;
 using NUnit.Framework;
 
 namespace Core.GIS.SharpMap.Test.Data.Providers
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/QuadTreeTest.cs
===================================================================
diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/QuadTreeTest.cs	(.../QuadTreeTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/QuadTreeTest.cs	(.../QuadTreeTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -1,7 +1,7 @@
 using System;
 using System.Drawing;
 using System.Linq;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using Core.GIS.SharpMap.Data.Providers.EGIS.ShapeFileLib;
 using NUnit.Framework;
 
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/ShapeFileTests.cs
===================================================================
diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/ShapeFileTests.cs	(.../ShapeFileTests.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/ShapeFileTests.cs	(.../ShapeFileTests.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -1,4 +1,4 @@
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using Core.GIS.GeoAPI.Extensions.Feature;
 using Core.GIS.SharpMap.Api;
 using Core.GIS.SharpMap.Data.Providers;
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Editors/FallOff/NoFallOffPolicyTest.cs
===================================================================
diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/GIS/test/Core.GIS.SharpMap.Test/Editors/FallOff/NoFallOffPolicyTest.cs	(.../NoFallOffPolicyTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Editors/FallOff/NoFallOffPolicyTest.cs	(.../NoFallOffPolicyTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using Core.GIS.GeoAPI.Geometries;
 using Core.GIS.NetTopologySuite.Geometries;
 using Core.GIS.NetTopologySuite.Utilities;
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Editors/LineStringInteractorTest.cs
===================================================================
diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/GIS/test/Core.GIS.SharpMap.Test/Editors/LineStringInteractorTest.cs	(.../LineStringInteractorTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Editors/LineStringInteractorTest.cs	(.../LineStringInteractorTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -7,7 +7,7 @@
 using Core.GIS.SharpMap.Layers;
 using Core.GIS.SharpMap.Styles;
 using Core.GIS.SharpMap.UI.Forms;
-using Core.GIS.SharpMapTestUtils.TestClasses;
+using Core.GIS.SharpMapTestUtil.TestClasses;
 using NUnit.Framework;
 
 namespace Core.GIS.SharpMap.Test.Editors
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Editors/PointFeaureEditorTest.cs
===================================================================
diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/GIS/test/Core.GIS.SharpMap.Test/Editors/PointFeaureEditorTest.cs	(.../PointFeaureEditorTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Editors/PointFeaureEditorTest.cs	(.../PointFeaureEditorTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -5,7 +5,7 @@
 using Core.GIS.SharpMap.Layers;
 using Core.GIS.SharpMap.Styles;
 using Core.GIS.SharpMap.UI.Forms;
-using Core.GIS.SharpMapTestUtils.TestClasses;
+using Core.GIS.SharpMapTestUtil.TestClasses;
 using NUnit.Framework;
 using Point = Core.GIS.NetTopologySuite.Geometries.Point;
 
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Layers/VectorLayerTest.cs
===================================================================
diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/GIS/test/Core.GIS.SharpMap.Test/Layers/VectorLayerTest.cs	(.../VectorLayerTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Layers/VectorLayerTest.cs	(.../VectorLayerTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -2,7 +2,7 @@
 using System.Data;
 using System.Drawing;
 using System.IO;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using Core.GIS.GeoAPI.Extensions.Feature;
 using Core.GIS.NetTopologySuite.Extensions.Features;
 using Core.GIS.NetTopologySuite.Geometries;
Index: Core/GIS/test/Core.GIS.SharpMap.Test/MapTest.cs
===================================================================
diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/GIS/test/Core.GIS.SharpMap.Test/MapTest.cs	(.../MapTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/MapTest.cs	(.../MapTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -4,7 +4,7 @@
 using System.ComponentModel;
 using System.Drawing;
 using System.Linq;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using Core.Common.Utils.Collections.Generic;
 using Core.Common.Utils.Reflection;
 using Core.GIS.GeoAPI.Geometries;
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/Thematics/GradientThemeTest.cs
===================================================================
diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/Thematics/GradientThemeTest.cs	(.../GradientThemeTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/Thematics/GradientThemeTest.cs	(.../GradientThemeTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using Core.GIS.SharpMap.Api;
 using Core.GIS.SharpMap.Rendering.Thematics;
 using Core.GIS.SharpMap.Styles;
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/VectorRenderingHelperTest.cs
===================================================================
diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/VectorRenderingHelperTest.cs	(.../VectorRenderingHelperTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/VectorRenderingHelperTest.cs	(.../VectorRenderingHelperTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -1,5 +1,5 @@
 using System.Drawing;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using Core.GIS.NetTopologySuite.Geometries;
 using Core.GIS.SharpMap.Rendering;
 using NUnit.Framework;
Index: Core/GIS/test/Core.GIS.SharpMap.UI.Test/Core.GIS.SharpMap.UI.Test.csproj
===================================================================
diff -u -r13f47cf031a0cb759b4685bcdcde112f039d00d3 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/GIS/test/Core.GIS.SharpMap.UI.Test/Core.GIS.SharpMap.UI.Test.csproj	(.../Core.GIS.SharpMap.UI.Test.csproj)	(revision 13f47cf031a0cb759b4685bcdcde112f039d00d3)
+++ Core/GIS/test/Core.GIS.SharpMap.UI.Test/Core.GIS.SharpMap.UI.Test.csproj	(.../Core.GIS.SharpMap.UI.Test.csproj)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -43,7 +43,7 @@
     <DebugType>full</DebugType>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-	<AllowedReferenceRelatedFileExtensions>none</AllowedReferenceRelatedFileExtensions>
+    <AllowedReferenceRelatedFileExtensions>none</AllowedReferenceRelatedFileExtensions>
     <OutputPath>bin\Release\</OutputPath>
     <PlatformTarget>x86</PlatformTarget>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
@@ -104,6 +104,10 @@
       <Project>{30E4C2AE-719E-4D70-9FA9-668A9767FBFA}</Project>
       <Name>Core.Common.Gui</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
+      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
+      <Name>Core.Common.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Core.GIS.SharpMap.Api\Core.GIS.SharpMap.Api.csproj">
       <Project>{A3C9DF74-978A-44B1-B55D-A72AC4221E3A}</Project>
       <Name>Core.GIS.SharpMap.Api</Name>
Index: Core/GIS/test/Core.GIS.SharpMap.UI.Test/Forms/MapControlTest.cs
===================================================================
diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/GIS/test/Core.GIS.SharpMap.UI.Test/Forms/MapControlTest.cs	(.../MapControlTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
+++ Core/GIS/test/Core.GIS.SharpMap.UI.Test/Forms/MapControlTest.cs	(.../MapControlTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -1,6 +1,6 @@
 using System.Threading;
 using System.Windows.Forms;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using Core.GIS.NetTopologySuite.Geometries;
 using Core.GIS.SharpMap.Data.Providers;
 using Core.GIS.SharpMap.Layers;
Index: Core/GIS/test/Core.GIS.SharpMap.UI.Test/Tools/SelectToolTest.cs
===================================================================
diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/GIS/test/Core.GIS.SharpMap.UI.Test/Tools/SelectToolTest.cs	(.../SelectToolTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
+++ Core/GIS/test/Core.GIS.SharpMap.UI.Test/Tools/SelectToolTest.cs	(.../SelectToolTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using Core.GIS.GeoAPI.Extensions.Feature;
 using Core.GIS.NetTopologySuite.Extensions.Features;
 using Core.GIS.NetTopologySuite.Geometries;
Index: Core/GIS/test/Core.GIS.SharpMapTestUtil/Core.GIS.SharpMapTestUtil.csproj
===================================================================
diff -u
--- Core/GIS/test/Core.GIS.SharpMapTestUtil/Core.GIS.SharpMapTestUtil.csproj	(revision 0)
+++ Core/GIS/test/Core.GIS.SharpMapTestUtil/Core.GIS.SharpMapTestUtil.csproj	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{0A82E7D2-26F8-4A30-9787-7EEABCD7F470}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Core.GIS.SharpMapTestUtil</RootNamespace>
+    <AssemblyName>Core.GIS.SharpMapTestUtil</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <WarningLevel>0</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <AllowedReferenceRelatedFileExtensions>none</AllowedReferenceRelatedFileExtensions>
+    <OutputPath>bin\Release\</OutputPath>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <WarningLevel>0</WarningLevel>
+    <Optimize>true</Optimize>
+    <DefineConstants>TRACE</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseForCodeCoverage|x86'">
+    <OutputPath>bin\ReleaseForCodeCoverage\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <WarningLevel>0</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MapTestHelper.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TestClasses\SampleFeature.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj">
+      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
+      <Name>Core.Common.Base</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
+      <Project>{EFA25023-CF6A-4FF7-8C42-B24D7F9509E1}</Project>
+      <Name>Core.Common.TestUtils</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
+      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
+      <Name>Core.Common.TestUtil</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.SharpMap.Api\Core.GIS.SharpMap.Api.csproj">
+      <Project>{A3C9DF74-978A-44B1-B55D-A72AC4221E3A}</Project>
+      <Name>Core.GIS.SharpMap.Api</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
+      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
+      <Name>Core.Common.Utils</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.GeoAPI.Extensions\Core.GIS.GeoAPI.Extensions.csproj">
+      <Project>{016DBD27-99BF-489A-81B5-50D66964BB90}</Project>
+      <Name>Core.GIS.GeoAPI.Extensions</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.GeoAPI\Core.GIS.GeoAPI.csproj">
+      <Project>{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}</Project>
+      <Name>Core.GIS.GeoAPI</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.SharpMap.UI\Core.GIS.SharpMap.UI.csproj">
+      <Project>{DD1CC1DB-4BF9-4C88-A100-733D84795F3A}</Project>
+      <Name>Core.GIS.SharpMap.UI</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.GIS.SharpMap\Core.GIS.SharpMap.csproj">
+      <Project>{C83777FC-AABB-47D9-911F-D76255D4D541}</Project>
+      <Name>Core.GIS.SharpMap</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{B4F97281-0DBD-4835-9ED8-7DFB966E87FF}" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
Index: Core/GIS/test/Core.GIS.SharpMapTestUtil/MapTestHelper.cs
===================================================================
diff -u
--- Core/GIS/test/Core.GIS.SharpMapTestUtil/MapTestHelper.cs	(revision 0)
+++ Core/GIS/test/Core.GIS.SharpMapTestUtil/MapTestHelper.cs	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -0,0 +1,65 @@
+using System.Drawing;
+using System.Windows.Forms;
+using Core.Common.TestUtil;
+using Core.GIS.SharpMap.Map;
+using Core.GIS.SharpMap.UI.Forms;
+using Core.GIS.SharpMap.UI.Tools.Zooming;
+
+namespace Core.GIS.SharpMapTestUtil
+{
+    /// <summary>
+    /// Provides common GIS testing functionality.
+    /// </summary>
+    public class MapTestHelper : Form // TODO: incapsulate Form as a local variable in ShowMap()
+    {
+        private readonly Label coordinateLabel;
+
+        public MapTestHelper()
+        {
+            MapControl = new MapControl();
+            MapControl.Dock = DockStyle.Fill;
+            // disable dragdrop because it breaks the test runtime
+            MapControl.AllowDrop = false;
+
+            Controls.Add(MapControl);
+
+            coordinateLabel = new Label();
+            coordinateLabel.Width = 500;
+            coordinateLabel.Location = new Point(5, 5);
+
+            MapControl.Controls.Add(coordinateLabel);
+            MapControl.Resize += delegate { MapControl.Refresh(); };
+            MapControl.ActivateTool(MapControl.GetToolByType<PanZoomTool>());
+
+            MapControl.ActivateTool(MapControl.SelectTool);
+        }
+
+        public MapControl MapControl { get; set; }
+
+        /// <summary>
+        /// Method show a new map control.
+        /// </summary>
+        /// <param name="map"></param>
+        public static void ShowModal(Map map)
+        {
+            new MapTestHelper().ShowMap(map);
+        }
+
+        public void ShowMap(Map map)
+        {
+            MapControl.Map = map;
+
+            map.ZoomToExtents();
+
+            MapControl.MouseMove += delegate(object sender, MouseEventArgs e)
+            {
+                var point = map.ImageToWorld(new PointF(e.X, e.Y));
+                coordinateLabel.Text = string.Format("{0}:{1}", point.X, point.Y);
+            };
+
+            WindowsFormsTestHelper.ShowModal(this);
+
+            map.Dispose();
+        }
+    }
+}
\ No newline at end of file
Index: Core/GIS/test/Core.GIS.SharpMapTestUtil/Properties/AssemblyInfo.cs
===================================================================
diff -u
--- Core/GIS/test/Core.GIS.SharpMapTestUtil/Properties/AssemblyInfo.cs	(revision 0)
+++ Core/GIS/test/Core.GIS.SharpMapTestUtil/Properties/AssemblyInfo.cs	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -0,0 +1,39 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+
+[assembly: AssemblyTitle("SharpMapTestUtil")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Deltares")]
+[assembly: AssemblyProduct("SharpMapTestUtil")]
+[assembly: AssemblyCopyright("Copyright © Deltares 2008")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+
+[assembly: Guid("3bd8f159-2fc7-4bc1-ae6f-331a84722747")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
Index: Core/GIS/test/Core.GIS.SharpMapTestUtil/TestClasses/SampleFeature.cs
===================================================================
diff -u
--- Core/GIS/test/Core.GIS.SharpMapTestUtil/TestClasses/SampleFeature.cs	(revision 0)
+++ Core/GIS/test/Core.GIS.SharpMapTestUtil/TestClasses/SampleFeature.cs	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -0,0 +1,38 @@
+using Core.GIS.GeoAPI.Extensions.Feature;
+using Core.GIS.GeoAPI.Geometries;
+
+namespace Core.GIS.SharpMapTestUtil.TestClasses
+{
+    public class SampleFeature : IFeature
+    {
+        [FeatureAttribute]
+        public int IntegerProperty { get; set; }
+
+        [FeatureAttribute]
+        public double DoubleProperty { get; set; }
+
+        [FeatureAttribute]
+        public string StringProperty { get; set; }
+
+        public object Clone()
+        {
+            return new SampleFeature
+            {
+                Geometry = (IGeometry) (Geometry == null ? null : Geometry.Clone()),
+                DoubleProperty = DoubleProperty,
+                IntegerProperty = IntegerProperty,
+                StringProperty = StringProperty
+            };
+        }
+
+        #region IFeature members
+
+        public string Name { get; set; }
+
+        public IGeometry Geometry { get; set; }
+
+        public IFeatureAttributeCollection Attributes { get; set; }
+
+        #endregion IFeature
+    }
+}
\ No newline at end of file
Fisheye: Tag d6e6eadf4a2521df75b6d371bacbb181a43058a3 refers to a dead (removed) revision in file `Core/GIS/test/Core.GIS.SharpMapTestUtils/Core.GIS.SharpMapTestUtils.csproj'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d6e6eadf4a2521df75b6d371bacbb181a43058a3 refers to a dead (removed) revision in file `Core/GIS/test/Core.GIS.SharpMapTestUtils/MapTestHelper.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d6e6eadf4a2521df75b6d371bacbb181a43058a3 refers to a dead (removed) revision in file `Core/GIS/test/Core.GIS.SharpMapTestUtils/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d6e6eadf4a2521df75b6d371bacbb181a43058a3 refers to a dead (removed) revision in file `Core/GIS/test/Core.GIS.SharpMapTestUtils/TestClasses/SampleFeature.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/Core.Plugins.ProjectExplorer.Test.csproj
===================================================================
diff -u -r85af6861f16df8c5d57e3e39d0d2874e7bd16b8e -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/Core.Plugins.ProjectExplorer.Test.csproj	(.../Core.Plugins.ProjectExplorer.Test.csproj)	(revision 85af6861f16df8c5d57e3e39d0d2874e7bd16b8e)
+++ Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/Core.Plugins.ProjectExplorer.Test.csproj	(.../Core.Plugins.ProjectExplorer.Test.csproj)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -112,13 +112,13 @@
       <Project>{30E4C2AE-719E-4D70-9FA9-668A9767FBFA}</Project>
       <Name>Core.Common.Gui</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\test\Core.Common.Gui.TestUtils\Core.Common.Gui.TestUtils.csproj">
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.Gui.TestUtil\Core.Common.Gui.TestUtil.csproj">
       <Project>{26214BD0-DAFB-4CFC-8EB2-80C5D53C859E}</Project>
-      <Name>Core.Common.Gui.TestUtils</Name>
+      <Name>Core.Common.Gui.TestUtil</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
       <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtils</Name>
+      <Name>Core.Common.TestUtil</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Plugins\src\Core.Plugins.CommonTools.Gui\Core.Plugins.CommonTools.Gui.csproj">
       <Project>{93E73FAB-FAE8-49C6-9ABB-27D24DF761F6}</Project>
Index: Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/NodePresenters/ProjectNodePresenterTest.cs
===================================================================
diff -u -r074232b001ecb5ae110c0b95c05264d4372cbfb5 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/NodePresenters/ProjectNodePresenterTest.cs	(.../ProjectNodePresenterTest.cs)	(revision 074232b001ecb5ae110c0b95c05264d4372cbfb5)
+++ Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/NodePresenters/ProjectNodePresenterTest.cs	(.../ProjectNodePresenterTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -4,8 +4,8 @@
 using Core.Common.Controls.Swf.TreeViewControls;
 using Core.Common.Gui;
 using Core.Common.Gui.ContextMenu;
-using Core.Common.Gui.TestUtils.ContextMenu;
-using Core.Common.TestUtils;
+using Core.Common.Gui.TestUtil.ContextMenu;
+using Core.Common.TestUtil;
 using Core.Plugins.ProjectExplorer.NodePresenters;
 using Core.Plugins.ProjectExplorer.Properties;
 using NUnit.Framework;
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Core.Plugins.SharpMapGis.Test.csproj
===================================================================
diff -u -rb5ea48631445312a26944f9d979c34b9132d16e7 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Core.Plugins.SharpMapGis.Test.csproj	(.../Core.Plugins.SharpMapGis.Test.csproj)	(revision b5ea48631445312a26944f9d979c34b9132d16e7)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Core.Plugins.SharpMapGis.Test.csproj	(.../Core.Plugins.SharpMapGis.Test.csproj)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -43,7 +43,7 @@
     <DebugType>full</DebugType>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-	<AllowedReferenceRelatedFileExtensions>none</AllowedReferenceRelatedFileExtensions>
+    <AllowedReferenceRelatedFileExtensions>none</AllowedReferenceRelatedFileExtensions>
     <OutputPath>bin\Release\</OutputPath>
     <PlatformTarget>x86</PlatformTarget>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
@@ -124,6 +124,10 @@
       <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
       <Name>Core.Common.Base</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
+      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
+      <Name>Core.Common.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\GIS\src\Core.GIS.GeoAPI.Extensions\Core.GIS.GeoAPI.Extensions.csproj">
       <Project>{016DBD27-99BF-489A-81B5-50D66964BB90}</Project>
       <Name>Core.GIS.GeoAPI.Extensions</Name>
@@ -188,9 +192,9 @@
       <Project>{5770DAA9-84E5-4770-AF43-F6B815894368}</Project>
       <Name>Core.GIS.NetTopologySuite</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\GIS\test\Core.GIS.SharpMapTestUtils\Core.GIS.SharpMapTestUtils.csproj">
+    <ProjectReference Include="..\..\..\GIS\test\Core.GIS.SharpMapTestUtil\Core.GIS.SharpMapTestUtil.csproj">
       <Project>{0A82E7D2-26F8-4A30-9787-7EEABCD7F470}</Project>
-      <Name>Core.GIS.SharpMapTestUtils</Name>
+      <Name>Core.GIS.SharpMapTestUtil</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
       <Project>{EFA25023-CF6A-4FF7-8C42-B24D7F9509E1}</Project>
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapLayerTreeViewNodePresenterTest.cs
===================================================================
diff -u -r074232b001ecb5ae110c0b95c05264d4372cbfb5 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapLayerTreeViewNodePresenterTest.cs	(.../MapLayerTreeViewNodePresenterTest.cs)	(revision 074232b001ecb5ae110c0b95c05264d4372cbfb5)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapLayerTreeViewNodePresenterTest.cs	(.../MapLayerTreeViewNodePresenterTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -3,7 +3,7 @@
 using Core.Common.Controls;
 using Core.Common.Controls.Swf.TreeViewControls;
 using Core.Common.Gui;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using Core.Common.Utils.Collections.Generic;
 using Core.GIS.SharpMap.Api.Layers;
 using Core.GIS.SharpMap.Data.Providers;
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapLegendViewTest.cs
===================================================================
diff -u -r1f79b34c12554e2b9878f6296168d18232cc9852 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapLegendViewTest.cs	(.../MapLegendViewTest.cs)	(revision 1f79b34c12554e2b9878f6296168d18232cc9852)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapLegendViewTest.cs	(.../MapLegendViewTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -1,11 +1,10 @@
 using System;
 using System.IO;
 using System.Windows.Forms;
-using Core.Common.Base;
 using Core.Common.Base.Data;
 using Core.Common.Base.Plugin;
 using Core.Common.Gui;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using Core.Common.Utils.Reflection;
 using Core.GIS.SharpMap.Data.Providers;
 using Core.GIS.SharpMap.Layers;
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapViewTest.cs
===================================================================
diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapViewTest.cs	(.../MapViewTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapViewTest.cs	(.../MapViewTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -3,15 +3,15 @@
 using System.Linq;
 using Core.Common.Controls;
 using Core.Common.Gui;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using Core.Common.Utils.Collections.Generic;
 using Core.Common.Utils.Reflection;
 using Core.GIS.NetTopologySuite.Geometries;
 using Core.GIS.SharpMap.Data.Providers;
 using Core.GIS.SharpMap.Extensions.CoordinateSystems;
 using Core.GIS.SharpMap.Layers;
 using Core.GIS.SharpMap.Map;
-using Core.GIS.SharpMapTestUtils;
+using Core.GIS.SharpMapTestUtil;
 using Core.Plugins.SharpMapGis.Gui;
 using Core.Plugins.SharpMapGis.Gui.Forms;
 using Core.Plugins.SharpMapGis.Gui.Forms.MapLegendView;
Index: Ringtoets.sln
===================================================================
diff -u -r582af031feb32a00f5d3a04c2d0214f9b65095eb -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets.sln	(.../Ringtoets.sln)	(revision 582af031feb32a00f5d3a04c2d0214f9b65095eb)
+++ Ringtoets.sln	(.../Ringtoets.sln)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -36,7 +36,7 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Utils.Test", "Core\Common\test\Core.Common.Utils.Test\Core.Common.Utils.Test.csproj", "{7F937E31-02CA-41D9-B7D4-1079CF452C72}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.TestUtils", "Core\Common\test\Core.Common.TestUtils\Core.Common.TestUtils.csproj", "{D749EE4C-CE50-4C17-BF01-9A953028C126}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.TestUtil", "Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj", "{D749EE4C-CE50-4C17-BF01-9A953028C126}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C9F89C6E-CEA9-40CA-96A9-2A0368459B9F}"
 EndProject
@@ -92,7 +92,7 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.GIS.SharpMap.UI.Test", "Core\GIS\test\Core.GIS.SharpMap.UI.Test\Core.GIS.SharpMap.UI.Test.csproj", "{93708508-7B00-4A26-80DA-C73A7251BCF6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.GIS.SharpMapTestUtils", "Core\GIS\test\Core.GIS.SharpMapTestUtils\Core.GIS.SharpMapTestUtils.csproj", "{0A82E7D2-26F8-4A30-9787-7EEABCD7F470}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.GIS.SharpMapTestUtil", "Core\GIS\test\Core.GIS.SharpMapTestUtil\Core.GIS.SharpMapTestUtil.csproj", "{0A82E7D2-26F8-4A30-9787-7EEABCD7F470}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Plugins.CommonTools", "Core\Plugins\src\Core.Plugins.CommonTools\Core.Plugins.CommonTools.csproj", "{BEFDCC44-2638-4972-B353-42D14C7DA2C6}"
 EndProject
@@ -211,15 +211,15 @@
 		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Gui.TestUtils", "Core\Common\test\Core.Common.Gui.TestUtils\Core.Common.Gui.TestUtils.csproj", "{26214BD0-DAFB-4CFC-8EB2-80C5D53C859E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Gui.TestUtil", "Core\Common\test\Core.Common.Gui.TestUtil\Core.Common.Gui.TestUtil.csproj", "{26214BD0-DAFB-4CFC-8EB2-80C5D53C859E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Controls.Test", "Core\Common\test\Core.Common.Controls.Test\Core.Common.Controls.Test.csproj", "{A8CE1456-1880-4FC8-84B3-D618EA88F384}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Gui.Swf.Test", "Core\Common\test\Core.Common.Gui.Swf.Test\Core.Common.Gui.Swf.Test.csproj", "{3139CC90-6740-40A1-9FC6-086A02DD113D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Controls.Swf.Test", "Core\Common\test\Core.Common.Controls.Swf.Test\Core.Common.Controls.Swf.Test.csproj", "{C4B8625C-FEDB-4F87-B737-E9BFB23CA1A5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.TestUtils.Test", "Core\Common\test\Core.Common.TestUtils.Test\Core.Common.TestUtils.Test.csproj", "{FAF691DE-EAF5-44E0-A865-5A03FB395ED1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.TestUtil.Test", "Core\Common\test\Core.Common.TestUtil.Test\Core.Common.TestUtil.Test.csproj", "{FAF691DE-EAF5-44E0-A865-5A03FB395ED1}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Piping.Data.TestUtil.Test", "Ringtoets\Piping\test\Ringtoets.Piping.Data.TestUtil.Test\Ringtoets.Piping.Data.TestUtil.Test.csproj", "{35B78215-420B-4D7D-9959-9E9010601200}"
 EndProject
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/NodePresenters/CategoryTreeFolderNodePresenterTest.cs
===================================================================
diff -u -rd37e350b3c62d61768313c57c2d8d8d05d22458a -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/NodePresenters/CategoryTreeFolderNodePresenterTest.cs	(.../CategoryTreeFolderNodePresenterTest.cs)	(revision d37e350b3c62d61768313c57c2d8d8d05d22458a)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/NodePresenters/CategoryTreeFolderNodePresenterTest.cs	(.../CategoryTreeFolderNodePresenterTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -4,8 +4,7 @@
 using Core.Common.Controls.Swf.TreeViewControls;
 using Core.Common.Gui;
 using Core.Common.Gui.ContextMenu;
-using Core.Common.TestUtils;
-
+using Core.Common.TestUtil;
 using NUnit.Framework;
 
 using Rhino.Mocks;
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj
===================================================================
diff -u -re392d6abff8f363ed6fbcef2b7ddd1dd54c77348 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision e392d6abff8f363ed6fbcef2b7ddd1dd54c77348)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -77,13 +77,13 @@
       <Project>{f49bd8b2-332a-4c91-a196-8cce0a2c7d98}</Project>
       <Name>Core.Common.Utils</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.Gui.TestUtils\Core.Common.Gui.TestUtils.csproj">
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.Gui.TestUtil\Core.Common.Gui.TestUtil.csproj">
       <Project>{26214BD0-DAFB-4CFC-8EB2-80C5D53C859E}</Project>
-      <Name>Core.Common.Gui.TestUtils</Name>
+      <Name>Core.Common.Gui.TestUtil</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
       <Project>{d749ee4c-ce50-4c17-bf01-9a953028c126}</Project>
-      <Name>Core.Common.TestUtils</Name>
+      <Name>Core.Common.TestUtil</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.Common.Forms\Ringtoets.Common.Forms.csproj">
       <Project>{4d840673-3812-4338-a352-84854e32b8a0}</Project>
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionBaseNodePresenterTest.cs
===================================================================
diff -u -r528577e7cac9c86626794fafc6c6c147146c5e84 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionBaseNodePresenterTest.cs	(.../AssessmentSectionBaseNodePresenterTest.cs)	(revision 528577e7cac9c86626794fafc6c6c147146c5e84)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionBaseNodePresenterTest.cs	(.../AssessmentSectionBaseNodePresenterTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -8,7 +8,7 @@
 using Core.Common.Controls.Swf.TreeViewControls;
 using Core.Common.Gui;
 using Core.Common.Gui.ContextMenu;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using Core.Common.Utils.Collections;
 
 using NUnit.Framework;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/FailureMechanismNodePresenterTest.cs
===================================================================
diff -u -r074232b001ecb5ae110c0b95c05264d4372cbfb5 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/FailureMechanismNodePresenterTest.cs	(.../FailureMechanismNodePresenterTest.cs)	(revision 074232b001ecb5ae110c0b95c05264d4372cbfb5)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/FailureMechanismNodePresenterTest.cs	(.../FailureMechanismNodePresenterTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -1,16 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using System.Windows.Forms;
-using Core.Common.Base;
-using Core.Common.Controls;
 using Core.Common.Controls.Swf.TreeViewControls;
 using Core.Common.Gui;
 using Core.Common.Gui.ContextMenu;
-using Core.Common.Gui.TestUtils;
-using Core.Common.TestUtils;
-
+using Core.Common.TestUtil;
 using NUnit.Framework;
 
 using Rhino.Mocks;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/PlaceholderWithReadonlyNameNodePresenterTest.cs
===================================================================
diff -u -r074232b001ecb5ae110c0b95c05264d4372cbfb5 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/PlaceholderWithReadonlyNameNodePresenterTest.cs	(.../PlaceholderWithReadonlyNameNodePresenterTest.cs)	(revision 074232b001ecb5ae110c0b95c05264d4372cbfb5)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/PlaceholderWithReadonlyNameNodePresenterTest.cs	(.../PlaceholderWithReadonlyNameNodePresenterTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -7,8 +7,7 @@
 using Core.Common.Controls.Swf.TreeViewControls;
 using Core.Common.Gui;
 using Core.Common.Gui.ContextMenu;
-using Core.Common.TestUtils;
-
+using Core.Common.TestUtil;
 using NUnit.Framework;
 
 using Rhino.Mocks;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj
===================================================================
diff -u -rd52709512f3c9b7c9d4cdfe310cbdc76be72d1c5 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision d52709512f3c9b7c9d4cdfe310cbdc76be72d1c5)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -85,13 +85,13 @@
       <Project>{f49bd8b2-332a-4c91-a196-8cce0a2c7d98}</Project>
       <Name>Core.Common.Utils</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.Gui.TestUtils\Core.Common.Gui.TestUtils.csproj">
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.Gui.TestUtil\Core.Common.Gui.TestUtil.csproj">
       <Project>{26214BD0-DAFB-4CFC-8EB2-80C5D53C859E}</Project>
-      <Name>Core.Common.Gui.TestUtils</Name>
+      <Name>Core.Common.Gui.TestUtil</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
       <Project>{d749ee4c-ce50-4c17-bf01-9a953028c126}</Project>
-      <Name>Core.Common.TestUtils</Name>
+      <Name>Core.Common.TestUtil</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Data\Ringtoets.Common.Data.csproj">
       <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs
===================================================================
diff -u -rffe7599d814964e179f97e33e4c3713b8ea869f8 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs	(.../FailureMechanismContributionViewTest.cs)	(revision ffe7599d814964e179f97e33e4c3713b8ea869f8)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs	(.../FailureMechanismContributionViewTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
 using Core.Common.Base;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
 using Rhino.Mocks;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj
===================================================================
diff -u -re392d6abff8f363ed6fbcef2b7ddd1dd54c77348 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj	(.../Ringtoets.Integration.Plugin.Test.csproj)	(revision e392d6abff8f363ed6fbcef2b7ddd1dd54c77348)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj	(.../Ringtoets.Integration.Plugin.Test.csproj)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -87,9 +87,9 @@
       <Project>{f49bd8b2-332a-4c91-a196-8cce0a2c7d98}</Project>
       <Name>Core.Common.Utils</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
       <Project>{d749ee4c-ce50-4c17-bf01-9a953028c126}</Project>
-      <Name>Core.Common.TestUtils</Name>
+      <Name>Core.Common.TestUtil</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Forms\Ringtoets.Common.Forms.csproj">
       <Project>{4d840673-3812-4338-a352-84854e32b8a0}</Project>
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsApplicationPluginTest.cs
===================================================================
diff -u -rd1e069321cba9d3b92f873fdd18e393a20659542 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsApplicationPluginTest.cs	(.../RingtoetsApplicationPluginTest.cs)	(revision d1e069321cba9d3b92f873fdd18e393a20659542)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsApplicationPluginTest.cs	(.../RingtoetsApplicationPluginTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -3,8 +3,7 @@
 using Core.Common.Base;
 using Core.Common.Base.Data;
 using Core.Common.Base.Plugin;
-using Core.Common.TestUtils;
-
+using Core.Common.TestUtil;
 using NUnit.Framework;
 
 using Ringtoets.Integration.Data;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/EmptyPipingCalculationReportNodePresenterTest.cs
===================================================================
diff -u -r074232b001ecb5ae110c0b95c05264d4372cbfb5 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/EmptyPipingCalculationReportNodePresenterTest.cs	(.../EmptyPipingCalculationReportNodePresenterTest.cs)	(revision 074232b001ecb5ae110c0b95c05264d4372cbfb5)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/EmptyPipingCalculationReportNodePresenterTest.cs	(.../EmptyPipingCalculationReportNodePresenterTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -5,8 +5,7 @@
 using Core.Common.Controls.Swf.TreeViewControls;
 using Core.Common.Gui;
 using Core.Common.Gui.Properties;
-using Core.Common.TestUtils;
-
+using Core.Common.TestUtil;
 using NUnit.Framework;
 
 using Rhino.Mocks;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/EmptyPipingOutputNodePresenterTest.cs
===================================================================
diff -u -r074232b001ecb5ae110c0b95c05264d4372cbfb5 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/EmptyPipingOutputNodePresenterTest.cs	(.../EmptyPipingOutputNodePresenterTest.cs)	(revision 074232b001ecb5ae110c0b95c05264d4372cbfb5)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/EmptyPipingOutputNodePresenterTest.cs	(.../EmptyPipingOutputNodePresenterTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -4,8 +4,7 @@
 using Core.Common.Controls;
 using Core.Common.Controls.Swf.TreeViewControls;
 using Core.Common.Gui;
-using Core.Common.TestUtils;
-
+using Core.Common.TestUtil;
 using NUnit.Framework;
 
 using Rhino.Mocks;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationContextNodePresenterTest.cs
===================================================================
diff -u -r528577e7cac9c86626794fafc6c6c147146c5e84 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationContextNodePresenterTest.cs	(.../PipingCalculationContextNodePresenterTest.cs)	(revision 528577e7cac9c86626794fafc6c6c147146c5e84)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationContextNodePresenterTest.cs	(.../PipingCalculationContextNodePresenterTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -4,12 +4,12 @@
 
 using Core.Common.Controls;
 using Core.Common.Utils.Collections;
-using Core.Common.TestUtils;
 using Core.Common.Base;
 using Core.Common.Controls.Swf.TreeViewControls;
 using Core.Common.Gui;
 using Core.Common.Gui.ContextMenu;
-using Core.Common.Gui.TestUtils.ContextMenu;
+using Core.Common.Gui.TestUtil.ContextMenu;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Forms.NodePresenters;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationGroupContextNodePresenterTest.cs
===================================================================
diff -u -rd1ee84745693898bfd8363c2ed1a8ba27dcf286a -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationGroupContextNodePresenterTest.cs	(.../PipingCalculationGroupContextNodePresenterTest.cs)	(revision d1ee84745693898bfd8363c2ed1a8ba27dcf286a)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationGroupContextNodePresenterTest.cs	(.../PipingCalculationGroupContextNodePresenterTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -10,9 +10,8 @@
 using Core.Common.Controls.Swf.TreeViewControls;
 using Core.Common.Gui;
 using Core.Common.Gui.ContextMenu;
-using Core.Common.Gui.TestUtils.ContextMenu;
-using Core.Common.TestUtils;
-
+using Core.Common.Gui.TestUtil.ContextMenu;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 
 using Rhino.Mocks;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs
===================================================================
diff -u -rd1ee84745693898bfd8363c2ed1a8ba27dcf286a -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs	(.../PipingFailureMechanismNodePresenterTest.cs)	(revision d1ee84745693898bfd8363c2ed1a8ba27dcf286a)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs	(.../PipingFailureMechanismNodePresenterTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -9,8 +9,8 @@
 using Core.Common.Controls.Swf.TreeViewControls;
 using Core.Common.Gui;
 using Core.Common.Gui.ContextMenu;
-using Core.Common.Gui.TestUtils.ContextMenu;
-using Core.Common.TestUtils;
+using Core.Common.Gui.TestUtil.ContextMenu;
+using Core.Common.TestUtil;
 using Core.Common.Utils.Collections;
 using NUnit.Framework;
 using Rhino.Mocks;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingInputContextNodePresenterTest.cs
===================================================================
diff -u -r074232b001ecb5ae110c0b95c05264d4372cbfb5 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingInputContextNodePresenterTest.cs	(.../PipingInputContextNodePresenterTest.cs)	(revision 074232b001ecb5ae110c0b95c05264d4372cbfb5)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingInputContextNodePresenterTest.cs	(.../PipingInputContextNodePresenterTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -4,8 +4,7 @@
 using Core.Common.Controls.Swf.TreeViewControls;
 using Core.Common.Gui;
 using Core.Common.Gui.ContextMenu;
-using Core.Common.TestUtils;
-
+using Core.Common.TestUtil;
 using NUnit.Framework;
 
 using Rhino.Mocks;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingOutputNodePresenterTest.cs
===================================================================
diff -u -r074232b001ecb5ae110c0b95c05264d4372cbfb5 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingOutputNodePresenterTest.cs	(.../PipingOutputNodePresenterTest.cs)	(revision 074232b001ecb5ae110c0b95c05264d4372cbfb5)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingOutputNodePresenterTest.cs	(.../PipingOutputNodePresenterTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -5,9 +5,8 @@
 using Core.Common.Controls.Swf.TreeViewControls;
 using Core.Common.Gui;
 using Core.Common.Gui.ContextMenu;
-using Core.Common.Gui.TestUtils.ContextMenu;
-using Core.Common.TestUtils;
-
+using Core.Common.Gui.TestUtil.ContextMenu;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Piping.Calculation.TestUtil;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSoilProfileCollectionNodePresenterTest.cs
===================================================================
diff -u -r074232b001ecb5ae110c0b95c05264d4372cbfb5 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSoilProfileCollectionNodePresenterTest.cs	(.../PipingSoilProfileCollectionNodePresenterTest.cs)	(revision 074232b001ecb5ae110c0b95c05264d4372cbfb5)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSoilProfileCollectionNodePresenterTest.cs	(.../PipingSoilProfileCollectionNodePresenterTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -5,8 +5,7 @@
 using Core.Common.Controls.Swf.TreeViewControls;
 using Core.Common.Gui;
 using Core.Common.Gui.ContextMenu;
-using Core.Common.TestUtils;
-
+using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Piping.Calculation.TestUtil;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSoilProfileNodePresenterTest.cs
===================================================================
diff -u -r074232b001ecb5ae110c0b95c05264d4372cbfb5 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSoilProfileNodePresenterTest.cs	(.../PipingSoilProfileNodePresenterTest.cs)	(revision 074232b001ecb5ae110c0b95c05264d4372cbfb5)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSoilProfileNodePresenterTest.cs	(.../PipingSoilProfileNodePresenterTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -5,8 +5,7 @@
 using Core.Common.Controls;
 using Core.Common.Controls.Swf.TreeViewControls;
 using Core.Common.Gui;
-using Core.Common.TestUtils;
-
+using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSurfaceLineCollectionNodePresenterTest.cs
===================================================================
diff -u -r528577e7cac9c86626794fafc6c6c147146c5e84 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSurfaceLineCollectionNodePresenterTest.cs	(.../PipingSurfaceLineCollectionNodePresenterTest.cs)	(revision 528577e7cac9c86626794fafc6c6c147146c5e84)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSurfaceLineCollectionNodePresenterTest.cs	(.../PipingSurfaceLineCollectionNodePresenterTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -3,13 +3,11 @@
 using System.ComponentModel;
 using System.Drawing;
 using System.Linq;
-using System.Windows.Forms;
 using Core.Common.Controls;
 using Core.Common.Controls.Swf.TreeViewControls;
 using Core.Common.Gui;
 using Core.Common.Gui.ContextMenu;
-using Core.Common.Gui.TestUtils;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using Core.Common.Utils.Collections;
 using NUnit.Framework;
 using Rhino.Mocks;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSurfaceLineNodePresenterTest.cs
===================================================================
diff -u -r074232b001ecb5ae110c0b95c05264d4372cbfb5 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSurfaceLineNodePresenterTest.cs	(.../PipingSurfaceLineNodePresenterTest.cs)	(revision 074232b001ecb5ae110c0b95c05264d4372cbfb5)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSurfaceLineNodePresenterTest.cs	(.../PipingSurfaceLineNodePresenterTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -4,8 +4,7 @@
 using Core.Common.Controls;
 using Core.Common.Controls.Swf.TreeViewControls;
 using Core.Common.Gui;
-using Core.Common.TestUtils;
-
+using Core.Common.TestUtil;
 using NUnit.Framework;
 
 using Rhino.Mocks;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj
===================================================================
diff -u -re392d6abff8f363ed6fbcef2b7ddd1dd54c77348 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj	(.../Ringtoets.Piping.Forms.Test.csproj)	(revision e392d6abff8f363ed6fbcef2b7ddd1dd54c77348)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj	(.../Ringtoets.Piping.Forms.Test.csproj)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -110,13 +110,13 @@
       <Project>{f49bd8b2-332a-4c91-a196-8cce0a2c7d98}</Project>
       <Name>Core.Common.Utils</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.Gui.TestUtils\Core.Common.Gui.TestUtils.csproj">
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.Gui.TestUtil\Core.Common.Gui.TestUtil.csproj">
       <Project>{26214BD0-DAFB-4CFC-8EB2-80C5D53C859E}</Project>
-      <Name>Core.Common.Gui.TestUtils</Name>
+      <Name>Core.Common.Gui.TestUtil</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
       <Project>{d749ee4c-ce50-4c17-bf01-9a953028c126}</Project>
-      <Name>Core.Common.TestUtils</Name>
+      <Name>Core.Common.TestUtil</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Data\Ringtoets.Common.Data.csproj">
       <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/FileUtilsTest.cs
===================================================================
diff -u -rf45d2d498e0354eb99e75191465d4cd5dc4dca13 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/FileUtilsTest.cs	(.../FileUtilsTest.cs)	(revision f45d2d498e0354eb99e75191465d4cd5dc4dca13)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/FileUtilsTest.cs	(.../FileUtilsTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -1,8 +1,6 @@
 using System;
 using System.IO;
-
-using Core.Common.TestUtils;
-
+using Core.Common.TestUtil;
 using NUnit.Framework;
 
 namespace Ringtoets.Piping.IO.Test
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/PipingSurfaceLinesCsvReaderTest.cs
===================================================================
diff -u -re400eba33d833607af9d78438b3ebaf0487bfd34 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/PipingSurfaceLinesCsvReaderTest.cs	(.../PipingSurfaceLinesCsvReaderTest.cs)	(revision e400eba33d833607af9d78438b3ebaf0487bfd34)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/PipingSurfaceLinesCsvReaderTest.cs	(.../PipingSurfaceLinesCsvReaderTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -1,9 +1,7 @@
 using System;
 using System.IO;
 using System.Linq;
-
-using Core.Common.TestUtils;
-
+using Core.Common.TestUtil;
 using NUnit.Framework;
 
 using Ringtoets.Piping.IO.Builders;
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Ringtoets.Piping.IO.Test.csproj
===================================================================
diff -u -r7a8e3d1718cb12c53c2b0573b056037ed02e9913 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Ringtoets.Piping.IO.Test.csproj	(.../Ringtoets.Piping.IO.Test.csproj)	(revision 7a8e3d1718cb12c53c2b0573b056037ed02e9913)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Ringtoets.Piping.IO.Test.csproj	(.../Ringtoets.Piping.IO.Test.csproj)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -79,9 +79,9 @@
     <Compile Include="TestHelpers\StringGeometryHelper.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
       <Project>{d749ee4c-ce50-4c17-bf01-9a953028c126}</Project>
-      <Name>Core.Common.TestUtils</Name>
+      <Name>Core.Common.TestUtil</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.Piping.Data\Ringtoets.Piping.Data.csproj">
       <Project>{ce994cc9-6f6a-48ac-b4be-02c30a21f4db}</Project>
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/PipingSoilProfileReaderTest.cs
===================================================================
diff -u -rd082f5444ccd9571f4fabb4c47f1082fa5ece21e -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/PipingSoilProfileReaderTest.cs	(.../PipingSoilProfileReaderTest.cs)	(revision d082f5444ccd9571f4fabb4c47f1082fa5ece21e)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/PipingSoilProfileReaderTest.cs	(.../PipingSoilProfileReaderTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -3,7 +3,7 @@
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.IO.Builders;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/ImportSoilProfileFromDatabaseTest.cs
===================================================================
diff -u -r55ad1d69b06d380c225f26750cf93631f5851ada -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/ImportSoilProfileFromDatabaseTest.cs	(.../ImportSoilProfileFromDatabaseTest.cs)	(revision 55ad1d69b06d380c225f26750cf93631f5851ada)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/ImportSoilProfileFromDatabaseTest.cs	(.../ImportSoilProfileFromDatabaseTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -1,6 +1,6 @@
 using System.IO;
 using System.Linq;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using Deltares.WTIPiping;
 using NUnit.Framework;
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/Ringtoets.Piping.Integration.Test.csproj
===================================================================
diff -u -r3346898aade52e3f45cb80b5452129133084e68b -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/Ringtoets.Piping.Integration.Test.csproj	(.../Ringtoets.Piping.Integration.Test.csproj)	(revision 3346898aade52e3f45cb80b5452129133084e68b)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/Ringtoets.Piping.Integration.Test.csproj	(.../Ringtoets.Piping.Integration.Test.csproj)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -61,9 +61,9 @@
       <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
       <Name>Core.Common.Base</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
       <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtils</Name>
+      <Name>Core.Common.TestUtil</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Data\Ringtoets.Common.Data.csproj">
       <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSoilProfilesImporterTest.cs
===================================================================
diff -u -rf7d7a919dec1b7d79672af043f268cde57aab0ba -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSoilProfilesImporterTest.cs	(.../PipingSoilProfilesImporterTest.cs)	(revision f7d7a919dec1b7d79672af043f268cde57aab0ba)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSoilProfilesImporterTest.cs	(.../PipingSoilProfilesImporterTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -4,7 +4,7 @@
 using System.Linq;
 using Core.Common.Base;
 using Core.Common.Base.IO;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 
 using Rhino.Mocks;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineCsvImporterTest.cs
===================================================================
diff -u -rf7d7a919dec1b7d79672af043f268cde57aab0ba -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineCsvImporterTest.cs	(.../PipingSurfaceLineCsvImporterTest.cs)	(revision f7d7a919dec1b7d79672af043f268cde57aab0ba)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineCsvImporterTest.cs	(.../PipingSurfaceLineCsvImporterTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -4,8 +4,7 @@
 using System.Linq;
 using Core.Common.Base;
 using Core.Common.Base.IO;
-using Core.Common.TestUtils;
-
+using Core.Common.TestUtil;
 using NUnit.Framework;
 
 using Rhino.Mocks;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/Ringtoets.Piping.Plugin.Test.csproj
===================================================================
diff -u -re392d6abff8f363ed6fbcef2b7ddd1dd54c77348 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/Ringtoets.Piping.Plugin.Test.csproj	(.../Ringtoets.Piping.Plugin.Test.csproj)	(revision e392d6abff8f363ed6fbcef2b7ddd1dd54c77348)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/Ringtoets.Piping.Plugin.Test.csproj	(.../Ringtoets.Piping.Plugin.Test.csproj)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -84,9 +84,9 @@
       <Project>{30e4c2ae-719e-4d70-9fa9-668a9767fbfa}</Project>
       <Name>Core.Common.Gui</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
       <Project>{d749ee4c-ce50-4c17-bf01-9a953028c126}</Project>
-      <Name>Core.Common.TestUtils</Name>
+      <Name>Core.Common.TestUtil</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Data\Ringtoets.Common.Data.csproj">
       <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs
===================================================================
diff -u -r42caf089349c503f7f5ac23aabb0dc048cb131bf -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs	(.../PipingCalculationActivityTest.cs)	(revision 42caf089349c503f7f5ac23aabb0dc048cb131bf)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs	(.../PipingCalculationActivityTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -2,7 +2,7 @@
 using System.Linq;
 using Core.Common.Base;
 using Core.Common.Base.Service;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 
 using Rhino.Mocks;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs
===================================================================
diff -u -r495647ee1c652fecc15eea7fefeab29ae01347fe -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs	(.../PipingCalculationServiceTest.cs)	(revision 495647ee1c652fecc15eea7fefeab29ae01347fe)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs	(.../PipingCalculationServiceTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using Core.Common.TestUtils;
+using Core.Common.TestUtil;
 using Ringtoets.Piping.Calculation.TestUtil;
 
 using NUnit.Framework;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/Ringtoets.Piping.Service.Test.csproj
===================================================================
diff -u -r7a8e3d1718cb12c53c2b0573b056037ed02e9913 -rd6e6eadf4a2521df75b6d371bacbb181a43058a3
--- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/Ringtoets.Piping.Service.Test.csproj	(.../Ringtoets.Piping.Service.Test.csproj)	(revision 7a8e3d1718cb12c53c2b0573b056037ed02e9913)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/Ringtoets.Piping.Service.Test.csproj	(.../Ringtoets.Piping.Service.Test.csproj)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
@@ -67,9 +67,9 @@
       <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
       <Name>Core.Common.Utils</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
       <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtils</Name>
+      <Name>Core.Common.TestUtil</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.Piping.Service\Ringtoets.Piping.Service.csproj">
       <Project>{10B8D63D-87E8-46DF-ACA9-A8CF22EE8FB5}</Project>