Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/MapFeaturesTestHelper.cs
===================================================================
diff -u -rf6e74516582b0e5c854526d50a90db1216417d9d -r16f9859775bbc8cb7af04dbd2a30ac8be9e93cdd
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/MapFeaturesTestHelper.cs	(.../MapFeaturesTestHelper.cs)	(revision f6e74516582b0e5c854526d50a90db1216417d9d)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/MapFeaturesTestHelper.cs	(.../MapFeaturesTestHelper.cs)	(revision 16f9859775bbc8cb7af04dbd2a30ac8be9e93cdd)
@@ -93,14 +93,8 @@
             }
         }
 
-        /// <summary>
-        /// Gets the expected result of a hydraulic boundary location calculation.
-        /// </summary>
-        /// <param name="calculations">The enumeration to get the calculation from.</param>
-        /// <param name="hydraulicBoundaryLocation">The location to get the calculation for.</param>
-        /// <returns>The result when there is output; <see cref="RoundedDouble.NaN"/> otherwise.</returns>
-        public static RoundedDouble GetExpectedResult(IEnumerable<HydraulicBoundaryLocationCalculation> calculations,
-                                                      HydraulicBoundaryLocation hydraulicBoundaryLocation)
+        private static RoundedDouble GetExpectedResult(IEnumerable<HydraulicBoundaryLocationCalculation> calculations,
+                                                       HydraulicBoundaryLocation hydraulicBoundaryLocation)
         {
             return calculations
                    .Single(calculation => calculation.HydraulicBoundaryLocation.Equals(hydraulicBoundaryLocation))
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj
===================================================================
diff -u -r64f4e09afafa0f3cf367f00be5cae318ff973be6 -r16f9859775bbc8cb7af04dbd2a30ac8be9e93cdd
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj)	(revision 64f4e09afafa0f3cf367f00be5cae318ff973be6)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj)	(revision 16f9859775bbc8cb7af04dbd2a30ac8be9e93cdd)
@@ -162,6 +162,10 @@
       <Project>{033ED27D-E806-42B4-9689-8150CFAE1906}</Project>
       <Name>Ringtoets.GrassCoverErosionOutwards.Util</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.GrassCoverErosionOutwards.Forms.TestUtil\Ringtoets.GrassCoverErosionOutwards.Forms.TestUtil.csproj">
+      <Project>{F20FCF45-A545-4ED9-9634-02DD4CDFB181}</Project>
+      <Name>Ringtoets.GrassCoverErosionOutwards.Forms.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Ringtoets.GrassCoverErosionOutwards.Util.TestUtil\Ringtoets.GrassCoverErosionOutwards.Util.TestUtil.csproj">
       <Project>{C700ED66-8565-48B2-9A4E-B0D33FB2B26D}</Project>
       <Name>Ringtoets.GrassCoverErosionOutwards.Util.TestUtil</Name>
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs
===================================================================
diff -u -r6f33b44599df032ecae3342b0aacd606a9e87c1f -r16f9859775bbc8cb7af04dbd2a30ac8be9e93cdd
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismViewTest.cs)	(revision 6f33b44599df032ecae3342b0aacd606a9e87c1f)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismViewTest.cs)	(revision 16f9859775bbc8cb7af04dbd2a30ac8be9e93cdd)
@@ -24,7 +24,6 @@
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base;
-using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
 using Core.Components.Gis.Data;
 using Core.Components.Gis.Features;
@@ -38,8 +37,8 @@
 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.TestUtil;
 using Ringtoets.GrassCoverErosionOutwards.Forms.Views;
 using Ringtoets.GrassCoverErosionOutwards.Util.TestUtil;
 
@@ -305,15 +304,15 @@
                 MapData hydraulicBoundaryLocationsMapData = map.Data.Collection.ElementAt(hydraulicBoundaryLocationsIndex);
 
                 // Precondition
-                AssertHydraulicBoundaryLocationOutputsMapData(assessmentSection, failureMechanism, hydraulicBoundaryLocationsMapData);
+                GrassCoverErosionOutwardsMapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(failureMechanism, assessmentSection, hydraulicBoundaryLocationsMapData);
 
                 // When
                 HydraulicBoundaryLocationCalculation calculation = getCalculationFunc(assessmentSection, failureMechanism);
                 calculation.Output = new TestHydraulicBoundaryLocationOutput(new Random(21).NextDouble());
                 calculation.NotifyObservers();
 
                 // Then
-                AssertHydraulicBoundaryLocationOutputsMapData(assessmentSection, failureMechanism, hydraulicBoundaryLocationsMapData);
+                GrassCoverErosionOutwardsMapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(failureMechanism, assessmentSection, hydraulicBoundaryLocationsMapData);
                 mocks.VerifyAll();
             }
         }
@@ -696,67 +695,6 @@
             }
         }
 
-        private static void AssertHydraulicBoundaryLocationOutputsMapData(IEnumerable<HydraulicBoundaryLocation> hydraulicBoundaryLocations,
-                                                                          MapData mapData)
-        {
-            var hydraulicLocationsMapData = (MapPointData) mapData;
-            IEnumerable<HydraulicBoundaryLocation> hydraulicBoundaryLocationsArray = hydraulicBoundaryLocations.ToArray();
-            CollectionAssert.AreEqual(hydraulicBoundaryLocationsArray.Select(hbl => hbl.DesignWaterLevelCalculation1.Output?.Result ?? RoundedDouble.NaN),
-                                      hydraulicLocationsMapData.Features.Select(ft => (RoundedDouble) ft.MetaData["Waterstand bij doorsnede-eis"]));
-            CollectionAssert.AreEqual(hydraulicBoundaryLocationsArray.Select(hbl => hbl.WaveHeightCalculation1.Output?.Result ?? RoundedDouble.NaN),
-                                      hydraulicLocationsMapData.Features.Select(ft => (RoundedDouble) ft.MetaData["Golfhoogte bij doorsnede-eis"]));
-        }
-
-        private static void AssertHydraulicBoundaryLocationOutputsMapData(IAssessmentSection assessmentSection,
-                                                                          GrassCoverErosionOutwardsFailureMechanism failureMechanism,
-                                                                          MapData mapData)
-        {
-            var hydraulicLocationsMapData = (MapPointData) mapData;
-
-            HydraulicBoundaryLocation[] hydraulicBoundaryLocationsArray = assessmentSection.HydraulicBoundaryDatabase.Locations.ToArray();
-            int expectedNrOfFeatures = hydraulicBoundaryLocationsArray.Length;
-            MapFeature[] features = hydraulicLocationsMapData.Features.ToArray();
-            Assert.AreEqual(expectedNrOfFeatures, features.Length);
-
-            for (var i = 0; i < expectedNrOfFeatures; i++)
-            {
-                HydraulicBoundaryLocation hydraulicBoundaryLocation = hydraulicBoundaryLocationsArray[i];
-                MapFeature mapFeature = features[i];
-
-                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
-                    MapFeaturesTestHelper.GetExpectedResult(failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm, hydraulicBoundaryLocation),
-                    mapFeature, "h(Iv->IIv)");
-                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
-                    MapFeaturesTestHelper.GetExpectedResult(failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm, hydraulicBoundaryLocation),
-                    mapFeature, "h(IIv->IIIv)");
-                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
-                    MapFeaturesTestHelper.GetExpectedResult(failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm, hydraulicBoundaryLocation),
-                    mapFeature, "h(IIIv->IVv)");
-                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
-                    MapFeaturesTestHelper.GetExpectedResult(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, hydraulicBoundaryLocation),
-                    mapFeature, "h(IVv->Vv)");
-                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
-                    MapFeaturesTestHelper.GetExpectedResult(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, hydraulicBoundaryLocation),
-                    mapFeature, "h(Vv->VIv)");
-
-                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
-                    MapFeaturesTestHelper.GetExpectedResult(failureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm, hydraulicBoundaryLocation),
-                    mapFeature, "hs(Iv->IIv)");
-                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
-                    MapFeaturesTestHelper.GetExpectedResult(failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm, hydraulicBoundaryLocation),
-                    mapFeature, "hs(IIv->IIIv)");
-                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
-                    MapFeaturesTestHelper.GetExpectedResult(failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm, hydraulicBoundaryLocation),
-                    mapFeature, "hs(IIIv->IVv)");
-                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
-                    MapFeaturesTestHelper.GetExpectedResult(assessmentSection.WaveHeightCalculationsForLowerLimitNorm, hydraulicBoundaryLocation),
-                    mapFeature, "hs(IVv->Vv)");
-                MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
-                    MapFeaturesTestHelper.GetExpectedResult(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm, hydraulicBoundaryLocation),
-                    mapFeature, "hs(Vv->VIv)");
-            }
-        }
-
         private static void AssertCalculationsMapData(IEnumerable<GrassCoverErosionOutwardsWaveConditionsCalculation> calculations, MapData mapData)
         {
             Assert.IsInstanceOf<MapLineData>(mapData);
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.TestUtil/GrassCoverErosionOutwardsMapFeaturesTestHelper.cs
===================================================================
diff -u -r241612718dfdba36a2292828f72acc3bcf96e927 -r16f9859775bbc8cb7af04dbd2a30ac8be9e93cdd
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.TestUtil/GrassCoverErosionOutwardsMapFeaturesTestHelper.cs	(.../GrassCoverErosionOutwardsMapFeaturesTestHelper.cs)	(revision 241612718dfdba36a2292828f72acc3bcf96e927)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.TestUtil/GrassCoverErosionOutwardsMapFeaturesTestHelper.cs	(.../GrassCoverErosionOutwardsMapFeaturesTestHelper.cs)	(revision 16f9859775bbc8cb7af04dbd2a30ac8be9e93cdd)
@@ -21,11 +21,11 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using Core.Common.Base.Data;
 using Core.Components.Gis.Features;
 using NUnit.Framework;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Hydraulics;
-using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Common.Util.TestUtil;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 
@@ -71,37 +71,45 @@
                 Assert.AreEqual(hydraulicBoundaryLocation.Location, mapFeature.MapGeometries.First().PointCollections.First().First());
 
                 MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
-                    MapFeaturesTestHelper.GetExpectedResult(failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm, hydraulicBoundaryLocation),
+                    GetExpectedResult(failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm, hydraulicBoundaryLocation),
                     mapFeature, "h(Iv->IIv)");
                 MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
-                    MapFeaturesTestHelper.GetExpectedResult(failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm, hydraulicBoundaryLocation),
+                    GetExpectedResult(failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm, hydraulicBoundaryLocation),
                     mapFeature, "h(IIv->IIIv)");
                 MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
-                    MapFeaturesTestHelper.GetExpectedResult(failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm, hydraulicBoundaryLocation),
+                    GetExpectedResult(failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm, hydraulicBoundaryLocation),
                     mapFeature, "h(IIIv->IVv)");
                 MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
-                    MapFeaturesTestHelper.GetExpectedResult(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, hydraulicBoundaryLocation),
+                    GetExpectedResult(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, hydraulicBoundaryLocation),
                     mapFeature, "h(IVv->Vv)");
                 MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
-                    MapFeaturesTestHelper.GetExpectedResult(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, hydraulicBoundaryLocation),
+                    GetExpectedResult(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, hydraulicBoundaryLocation),
                     mapFeature, "h(Vv->VIv)");
 
                 MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
-                    MapFeaturesTestHelper.GetExpectedResult(failureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm, hydraulicBoundaryLocation),
+                    GetExpectedResult(failureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm, hydraulicBoundaryLocation),
                     mapFeature, "hs(Iv->IIv)");
                 MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
-                    MapFeaturesTestHelper.GetExpectedResult(failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm, hydraulicBoundaryLocation),
+                    GetExpectedResult(failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm, hydraulicBoundaryLocation),
                     mapFeature, "hs(IIv->IIIv)");
                 MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
-                    MapFeaturesTestHelper.GetExpectedResult(failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm, hydraulicBoundaryLocation),
+                    GetExpectedResult(failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm, hydraulicBoundaryLocation),
                     mapFeature, "hs(IIIv->IVv)");
                 MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
-                    MapFeaturesTestHelper.GetExpectedResult(assessmentSection.WaveHeightCalculationsForLowerLimitNorm, hydraulicBoundaryLocation),
+                    GetExpectedResult(assessmentSection.WaveHeightCalculationsForLowerLimitNorm, hydraulicBoundaryLocation),
                     mapFeature, "hs(IVv->Vv)");
                 MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData(
-                    MapFeaturesTestHelper.GetExpectedResult(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm, hydraulicBoundaryLocation),
+                    GetExpectedResult(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm, hydraulicBoundaryLocation),
                     mapFeature, "hs(Vv->VIv)");
             }
         }
+
+        private static RoundedDouble GetExpectedResult(IEnumerable<HydraulicBoundaryLocationCalculation> calculations,
+                                                       HydraulicBoundaryLocation hydraulicBoundaryLocation)
+        {
+            return calculations
+                   .Single(calculation => calculation.HydraulicBoundaryLocation.Equals(hydraulicBoundaryLocation))
+                   .Output?.Result ?? RoundedDouble.NaN;
+        }
     }
 }
\ No newline at end of file