Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/MapFeaturesTestHelper.cs
===================================================================
diff -u -r048b1d235b217310417c6b9367deffe030d30572 -r21fcf8400284f5279ac15a7a18dcffc88e2b7a53
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/MapFeaturesTestHelper.cs	(.../MapFeaturesTestHelper.cs)	(revision 048b1d235b217310417c6b9367deffe030d30572)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/MapFeaturesTestHelper.cs	(.../MapFeaturesTestHelper.cs)	(revision 21fcf8400284f5279ac15a7a18dcffc88e2b7a53)
@@ -26,6 +26,7 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Hydraulics;
+using Ringtoets.Common.Util.TestUtil;
 
 namespace Ringtoets.Common.Forms.TestUtil
 {
@@ -45,55 +46,35 @@
                 HydraulicBoundaryLocation hydraulicBoundaryLocation = hydraulicBoundaryLocationsArray[i];
                 MapFeature mapFeature = features.ElementAt(i);
 
-                AssertHydraulicBoundaryLocationOutputMetaData(
+                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                     GetExpectedResult(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, hydraulicBoundaryLocation),
                     mapFeature, "h(A+->A)");
-                AssertHydraulicBoundaryLocationOutputMetaData(
+                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                     GetExpectedResult(assessmentSection.WaterLevelCalculationsForSignalingNorm, hydraulicBoundaryLocation),
                     mapFeature, "h(A->B)");
-                AssertHydraulicBoundaryLocationOutputMetaData(
+                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                     GetExpectedResult(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, hydraulicBoundaryLocation),
                     mapFeature, "h(B->C)");
-                AssertHydraulicBoundaryLocationOutputMetaData(
+                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                     GetExpectedResult(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, hydraulicBoundaryLocation),
                     mapFeature, "h(C->D)");
 
-                AssertHydraulicBoundaryLocationOutputMetaData(
+                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                     GetExpectedResult(assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm, hydraulicBoundaryLocation),
                     mapFeature, "Hs(A+->A)");
-                AssertHydraulicBoundaryLocationOutputMetaData(
+                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                     GetExpectedResult(assessmentSection.WaveHeightCalculationsForSignalingNorm, hydraulicBoundaryLocation),
                     mapFeature, "Hs(A->B)");
-                AssertHydraulicBoundaryLocationOutputMetaData(
+                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                     GetExpectedResult(assessmentSection.WaveHeightCalculationsForLowerLimitNorm, hydraulicBoundaryLocation),
                     mapFeature, "Hs(B->C)");
-                AssertHydraulicBoundaryLocationOutputMetaData(
+                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                     GetExpectedResult(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm, hydraulicBoundaryLocation),
                     mapFeature, "Hs(C->D)");
             }
         }
 
         /// <summary>
-        /// Asserts whether the meta data for <paramref name="key"/> in <paramref name="feature"/>
-        /// contains the correct output data.
-        /// </summary>
-        /// <param name="expectedValue">The value  to assert against.</param>
-        /// <param name="feature">The <see cref="MapFeature"/> to be asserted.</param>
-        /// <param name="key">The name of the meta data element to retrieve the data from.</param>
-        /// <exception cref="KeyNotFoundException">Thrown when the meta data of <paramref name="feature"/> does not 
-        /// contain a <see cref="KeyValuePair{TKey,TValue}"/> with <paramref name="key"/> as key.</exception>
-        /// <exception cref="AssertionException">Thrown when the wave height or the design water level of a 
-        /// hydraulic boundary location and the  respective meta data value associated with <paramref name="key"/>
-        ///  are not the same.
-        /// </exception>
-        public static void AssertHydraulicBoundaryLocationOutputMetaData(RoundedDouble expectedValue,
-                                                                         MapFeature feature,
-                                                                         string key)
-        {
-            Assert.AreEqual(expectedValue, feature.MetaData[key]);
-        }
-
-        /// <summary>
         /// Gets the expected result of a hydraulic boundary location calculation.
         /// </summary>
         /// <param name="calculationList">The list to get the calculation from.</param>
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/Ringtoets.Common.Forms.TestUtil.csproj
===================================================================
diff -u -r31791943fdbbfdd377f3a6fc29dc8dbd3f9f5d63 -r21fcf8400284f5279ac15a7a18dcffc88e2b7a53
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/Ringtoets.Common.Forms.TestUtil.csproj	(.../Ringtoets.Common.Forms.TestUtil.csproj)	(revision 31791943fdbbfdd377f3a6fc29dc8dbd3f9f5d63)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/Ringtoets.Common.Forms.TestUtil.csproj	(.../Ringtoets.Common.Forms.TestUtil.csproj)	(revision 21fcf8400284f5279ac15a7a18dcffc88e2b7a53)
@@ -74,5 +74,9 @@
       <Project>{4843D6E5-066F-4795-94F5-1D53932DD03C}</Project>
       <Name>Ringtoets.Common.Data.TestUtil</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.Common.Util.TestUtil\Ringtoets.Common.Util.TestUtil.csproj">
+      <Project>{54DF6303-BF9A-4AE9-BE09-4AF50EF27412}</Project>
+      <Name>Ringtoets.Common.Util.TestUtil</Name>
+    </ProjectReference>
   </ItemGroup>
 </Project>
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Util.Test/HydraulicBoundaryLocationMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -rb924eda1c47fb3a2ac3409f0a9a95b65fa57edd2 -r21fcf8400284f5279ac15a7a18dcffc88e2b7a53
--- Ringtoets/Common/test/Ringtoets.Common.Util.Test/HydraulicBoundaryLocationMapDataFeaturesFactoryTest.cs	(.../HydraulicBoundaryLocationMapDataFeaturesFactoryTest.cs)	(revision b924eda1c47fb3a2ac3409f0a9a95b65fa57edd2)
+++ Ringtoets/Common/test/Ringtoets.Common.Util.Test/HydraulicBoundaryLocationMapDataFeaturesFactoryTest.cs	(.../HydraulicBoundaryLocationMapDataFeaturesFactoryTest.cs)	(revision 21fcf8400284f5279ac15a7a18dcffc88e2b7a53)
@@ -22,7 +22,6 @@
 using System;
 using Core.Components.Gis.Features;
 using NUnit.Framework;
-using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Common.Util.TestUtil;
 
 namespace Ringtoets.Common.Util.Test
@@ -51,29 +50,29 @@
             MapFeature feature = HydraulicBoundaryLocationMapDataFeaturesFactory.CreateHydraulicBoundaryLocationFeature(location);
 
             // Assert
-            MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+            MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                 location.WaterLevelCalculationForFactorizedSignalingNorm,
                 feature, "h(A+->A)");
-            MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+            MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                 location.WaterLevelCalculationForSignalingNorm,
                 feature, "h(A->B)");
-            MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+            MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                 location.WaterLevelCalculationForLowerLimitNorm,
                 feature, "h(B->C)");
-            MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+            MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                 location.WaterLevelCalculationForFactorizedLowerLimitNorm,
                 feature, "h(C->D)");
 
-            MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+            MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                 location.WaveHeightCalculationForFactorizedSignalingNorm,
                 feature, "Hs(A+->A)");
-            MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+            MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                 location.WaveHeightCalculationForSignalingNorm,
                 feature, "Hs(A->B)");
-            MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+            MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                 location.WaveHeightCalculationForLowerLimitNorm,
                 feature, "Hs(B->C)");
-            MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+            MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                 location.WaveHeightCalculationForFactorizedLowerLimitNorm,
                 feature, "Hs(C->D)");
         }
Index: Ringtoets/Common/test/Ringtoets.Common.Util.TestUtil/MapFeaturesMetaDataTestHelper.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Util.TestUtil/MapFeaturesMetaDataTestHelper.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Util.TestUtil/MapFeaturesMetaDataTestHelper.cs	(revision 21fcf8400284f5279ac15a7a18dcffc88e2b7a53)
@@ -0,0 +1,51 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using Core.Common.Base.Data;
+using Core.Components.Gis.Features;
+using NUnit.Framework;
+
+namespace Ringtoets.Common.Util.TestUtil
+{
+    public static class MapFeaturesMetaDataTestHelper
+    {
+        /// <summary>
+        /// Asserts whether the meta data for <paramref name="key"/> in <paramref name="feature"/>
+        /// contains the correct output data.
+        /// </summary>
+        /// <param name="expectedValue">The value  to assert against.</param>
+        /// <param name="feature">The <see cref="MapFeature"/> to be asserted.</param>
+        /// <param name="key">The name of the meta data element to retrieve the data from.</param>
+        /// <exception cref="KeyNotFoundException">Thrown when the meta data of <paramref name="feature"/> does not 
+        /// contain a <see cref="KeyValuePair{TKey,TValue}"/> with <paramref name="key"/> as key.</exception>
+        /// <exception cref="AssertionException">Thrown when the wave height or the design water level of a 
+        /// hydraulic boundary location and the  respective meta data value associated with <paramref name="key"/>
+        ///  are not the same.
+        /// </exception>
+        public static void AssertHydraulicBoundaryLocationOutputMetaData(RoundedDouble expectedValue,
+                                                                         MapFeature feature,
+                                                                         string key)
+        {
+            Assert.AreEqual(expectedValue, feature.MetaData[key]);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Util.TestUtil/Ringtoets.Common.Util.TestUtil.csproj
===================================================================
diff -u -r294f4292b8b4c5c779af74b35ef7bfccb80feba7 -r21fcf8400284f5279ac15a7a18dcffc88e2b7a53
--- Ringtoets/Common/test/Ringtoets.Common.Util.TestUtil/Ringtoets.Common.Util.TestUtil.csproj	(.../Ringtoets.Common.Util.TestUtil.csproj)	(revision 294f4292b8b4c5c779af74b35ef7bfccb80feba7)
+++ Ringtoets/Common/test/Ringtoets.Common.Util.TestUtil/Ringtoets.Common.Util.TestUtil.csproj	(.../Ringtoets.Common.Util.TestUtil.csproj)	(revision 21fcf8400284f5279ac15a7a18dcffc88e2b7a53)
@@ -7,17 +7,22 @@
   </PropertyGroup>
   <Import Project="$(SolutionDir)\build\Ringtoets_TestUtil.targets" />
   <ItemGroup>
+    <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\NUnit.3.8.1\lib\net40\nunit.framework.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AggregatedHydraulicBoundaryLocationTestHelper.cs" />
+    <Compile Include="MapFeaturesMetaDataTestHelper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
@@ -28,6 +33,10 @@
       <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
       <Name>Core.Common.TestUtil</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis\Core.Components.Gis.csproj">
+      <Project>{318BA582-88C9-4816-A54A-A7E431461DE3}</Project>
+      <Name>Core.Components.Gis</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.Common.Util\Ringtoets.Common.Util.csproj">
       <Project>{6A074D65-A81C-4C1C-8E24-F36C916E4ED7}</Project>
       <Name>Ringtoets.Common.Util</Name>
Index: Ringtoets/Common/test/Ringtoets.Common.Util.TestUtil/packages.config
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Util.TestUtil/packages.config	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Util.TestUtil/packages.config	(revision 21fcf8400284f5279ac15a7a18dcffc88e2b7a53)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright (C) Stichting Deltares 2017. All rights reserved.
+
+This file is part of Ringtoets.
+
+Ringtoets is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+All names, logos, and references to "Deltares" are registered trademarks of
+Stichting Deltares and remain full property of Stichting Deltares at all times.
+All rights reserved.
+-->
+
+<packages>
+  <package id="NUnit" version="3.8.1" targetFramework="net40" />
+</packages>
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Factories/GrassCoverErosionOutwardsMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -r5e14007596b4e9cc7040576c7026a9c0e37bb323 -r21fcf8400284f5279ac15a7a18dcffc88e2b7a53
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Factories/GrassCoverErosionOutwardsMapDataFeaturesFactoryTest.cs	(.../GrassCoverErosionOutwardsMapDataFeaturesFactoryTest.cs)	(revision 5e14007596b4e9cc7040576c7026a9c0e37bb323)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Factories/GrassCoverErosionOutwardsMapDataFeaturesFactoryTest.cs	(.../GrassCoverErosionOutwardsMapDataFeaturesFactoryTest.cs)	(revision 21fcf8400284f5279ac15a7a18dcffc88e2b7a53)
@@ -31,7 +31,7 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
-using Ringtoets.Common.Forms.TestUtil;
+using Ringtoets.Common.Util.TestUtil;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.Factories;
 using Ringtoets.GrassCoverErosionOutwards.Util.TestUtil;
@@ -169,35 +169,35 @@
                 HydraulicBoundaryLocation hydraulicBoundaryLocation = hydraulicBoundaryLocationsArray[i];
                 MapFeature mapFeature = features.ElementAt(i);
 
-                MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                     GetExpectedResult(failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm, hydraulicBoundaryLocation),
                     mapFeature, "h(Iv->IIv)");
-                MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                     GetExpectedResult(failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm, hydraulicBoundaryLocation),
                     mapFeature, "h(IIv->IIIv)");
-                MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                     GetExpectedResult(failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm, hydraulicBoundaryLocation),
                     mapFeature, "h(IIIv->IVv)");
-                MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                     GetExpectedResult(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, hydraulicBoundaryLocation),
                     mapFeature, "h(IVv->Vv)");
-                MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                     GetExpectedResult(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, hydraulicBoundaryLocation),
                     mapFeature, "h(Vv->VIv)");
 
-                MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                     GetExpectedResult(failureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm, hydraulicBoundaryLocation),
                     mapFeature, "hs(Iv->IIv)");
-                MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                     GetExpectedResult(failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm, hydraulicBoundaryLocation),
                     mapFeature, "hs(IIv->IIIv)");
-                MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                     GetExpectedResult(failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm, hydraulicBoundaryLocation),
                     mapFeature, "hs(IIIv->IVv)");
-                MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                     GetExpectedResult(assessmentSection.WaveHeightCalculationsForLowerLimitNorm, hydraulicBoundaryLocation),
                     mapFeature, "hs(IVv->Vv)");
-                MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                     GetExpectedResult(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm, hydraulicBoundaryLocation),
                     mapFeature, "hs(Vv->VIv)");
             }
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj
===================================================================
diff -u -ra515ad85896ba1e242bacc8f3c6e59cf2bb607b9 -r21fcf8400284f5279ac15a7a18dcffc88e2b7a53
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj)	(revision a515ad85896ba1e242bacc8f3c6e59cf2bb607b9)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj)	(revision 21fcf8400284f5279ac15a7a18dcffc88e2b7a53)
@@ -128,6 +128,10 @@
       <Project>{d24fa2f7-28a7-413b-afd3-ee10e985630b}</Project>
       <Name>Ringtoets.Common.Forms.TestUtil</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\test\Ringtoets.Common.Util.TestUtil\Ringtoets.Common.Util.TestUtil.csproj">
+      <Project>{54DF6303-BF9A-4AE9-BE09-4AF50EF27412}</Project>
+      <Name>Ringtoets.Common.Util.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Revetment\src\Ringtoets.Revetment.Data\Ringtoets.Revetment.Data.csproj">
       <Project>{87C2C553-C0BC-40BF-B1EA-B83BFF357F27}</Project>
       <Name>Ringtoets.Revetment.Data</Name>
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs
===================================================================
diff -u -r5e14007596b4e9cc7040576c7026a9c0e37bb323 -r21fcf8400284f5279ac15a7a18dcffc88e2b7a53
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismViewTest.cs)	(revision 5e14007596b4e9cc7040576c7026a9c0e37bb323)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismViewTest.cs)	(revision 21fcf8400284f5279ac15a7a18dcffc88e2b7a53)
@@ -38,6 +38,7 @@
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Common.Forms.Views;
+using Ringtoets.Common.Util.TestUtil;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.Views;
 using Ringtoets.GrassCoverErosionOutwards.Util.TestUtil;
@@ -722,35 +723,35 @@
                 HydraulicBoundaryLocation hydraulicBoundaryLocation = hydraulicBoundaryLocationsArray[i];
                 MapFeature mapFeature = features[i];
 
-                MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                     MapFeaturesTestHelper.GetExpectedResult(failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm, hydraulicBoundaryLocation),
                     mapFeature, "h(Iv->IIv)");
-                MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                     MapFeaturesTestHelper.GetExpectedResult(failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm, hydraulicBoundaryLocation),
                     mapFeature, "h(IIv->IIIv)");
-                MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                     MapFeaturesTestHelper.GetExpectedResult(failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm, hydraulicBoundaryLocation),
                     mapFeature, "h(IIIv->IVv)");
-                MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                     MapFeaturesTestHelper.GetExpectedResult(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, hydraulicBoundaryLocation),
                     mapFeature, "h(IVv->Vv)");
-                MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                     MapFeaturesTestHelper.GetExpectedResult(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, hydraulicBoundaryLocation),
                     mapFeature, "h(Vv->VIv)");
 
-                MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                     MapFeaturesTestHelper.GetExpectedResult(failureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm, hydraulicBoundaryLocation),
                     mapFeature, "hs(Iv->IIv)");
-                MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                     MapFeaturesTestHelper.GetExpectedResult(failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm, hydraulicBoundaryLocation),
                     mapFeature, "hs(IIv->IIIv)");
-                MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                     MapFeaturesTestHelper.GetExpectedResult(failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm, hydraulicBoundaryLocation),
                     mapFeature, "hs(IIIv->IVv)");
-                MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                     MapFeaturesTestHelper.GetExpectedResult(assessmentSection.WaveHeightCalculationsForLowerLimitNorm, hydraulicBoundaryLocation),
                     mapFeature, "hs(IVv->Vv)");
-                MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                     MapFeaturesTestHelper.GetExpectedResult(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm, hydraulicBoundaryLocation),
                     mapFeature, "hs(Vv->VIv)");
             }
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.Test/GrassCoverErosionOutwardsHydraulicBoundaryLocationMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -r6453240983659fd2a612062d886e13e48b093ce3 -r21fcf8400284f5279ac15a7a18dcffc88e2b7a53
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.Test/GrassCoverErosionOutwardsHydraulicBoundaryLocationMapDataFeaturesFactoryTest.cs	(.../GrassCoverErosionOutwardsHydraulicBoundaryLocationMapDataFeaturesFactoryTest.cs)	(revision 6453240983659fd2a612062d886e13e48b093ce3)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.Test/GrassCoverErosionOutwardsHydraulicBoundaryLocationMapDataFeaturesFactoryTest.cs	(.../GrassCoverErosionOutwardsHydraulicBoundaryLocationMapDataFeaturesFactoryTest.cs)	(revision 21fcf8400284f5279ac15a7a18dcffc88e2b7a53)
@@ -24,7 +24,7 @@
 using Core.Components.Gis.Features;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Ringtoets.Common.Forms.TestUtil;
+using Ringtoets.Common.Util.TestUtil;
 using Ringtoets.GrassCoverErosionOutwards.Util.TestUtil;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Util.Test
@@ -114,34 +114,34 @@
             }, feature.MapGeometries.First().PointCollections.First());
             Assert.AreEqual(location.Id, feature.MetaData["ID"]);
             Assert.AreEqual(location.Name, feature.MetaData["Naam"]);
-            MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+            MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                 location.WaterLevelCalculationForMechanismSpecificFactorizedSignalingNorm,
                 feature, waterLevelCalculationForMechanismSpecificFactorizedSignalingNormAttributeName);
-            MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+            MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                 location.WaterLevelCalculationForMechanismSpecificSignalingNorm,
                 feature, waterLevelCalculationForMechanismSpecificSignalingNormAttributeName);
-            MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+            MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                 location.WaterLevelCalculationForMechanismSpecificLowerLimitNorm,
                 feature, waterLevelCalculationForMechanismSpecificLowerLimitNormAttributeName);
-            MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+            MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                 location.WaterLevelCalculationForLowerLimitNorm,
                 feature, waterLevelCalculationForLowerLimitNormAttributeName);
-            MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+            MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                 location.WaterLevelCalculationForFactorizedLowerLimitNorm,
                 feature, waterLevelCalculationForFactorizedLowerLimitNormAttributeName);
-            MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+            MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                 location.WaveHeightCalculationForMechanismSpecificFactorizedSignalingNorm,
                 feature, waveHeightCalculationForMechanismSpecificFactorizedSignalingNormAttributeName);
-            MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+            MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                 location.WaveHeightCalculationForMechanismSpecificSignalingNorm,
                 feature, waveHeightCalculationForMechanismSpecificSignalingNormAttributeName);
-            MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+            MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                 location.WaveHeightCalculationForMechanismSpecificLowerLimitNorm,
                 feature, waveHeightCalculationForMechanismSpecificLowerLimitNormAttributeName);
-            MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+            MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                 location.WaveHeightCalculationForLowerLimitNorm,
                 feature, waveHeightCalculationForLowerLimitNormAttributeName);
-            MapFeaturesTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
+            MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
                 location.WaveHeightCalculationForFactorizedLowerLimitNorm,
                 feature, waveHeightCalculationForFactorizedLowerLimitNormAttributeName);
             mocks.VerifyAll();
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.Test/Ringtoets.GrassCoverErosionOutwards.Util.Test.csproj
===================================================================
diff -u -r6453240983659fd2a612062d886e13e48b093ce3 -r21fcf8400284f5279ac15a7a18dcffc88e2b7a53
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.Test/Ringtoets.GrassCoverErosionOutwards.Util.Test.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Util.Test.csproj)	(revision 6453240983659fd2a612062d886e13e48b093ce3)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.Test/Ringtoets.GrassCoverErosionOutwards.Util.Test.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Util.Test.csproj)	(revision 21fcf8400284f5279ac15a7a18dcffc88e2b7a53)
@@ -49,9 +49,9 @@
       <Project>{4843D6E5-066F-4795-94F5-1D53932DD03C}</Project>
       <Name>Ringtoets.Common.Data.TestUtil</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\test\Ringtoets.Common.Forms.TestUtil\Ringtoets.Common.Forms.TestUtil.csproj">
-      <Project>{D24FA2F7-28A7-413B-AFD3-EE10E985630B}</Project>
-      <Name>Ringtoets.Common.Forms.TestUtil</Name>
+    <ProjectReference Include="..\..\..\Common\test\Ringtoets.Common.Util.TestUtil\Ringtoets.Common.Util.TestUtil.csproj">
+      <Project>{54DF6303-BF9A-4AE9-BE09-4AF50EF27412}</Project>
+      <Name>Ringtoets.Common.Util.TestUtil</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.GrassCoverErosionOutwards.Data\Ringtoets.GrassCoverErosionOutwards.Data.csproj">
       <Project>{E7225477-577F-4A17-B7EC-6721158E1543}</Project>