Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/LocationsViewDataSynchronisationTester.cs
===================================================================
diff -u -rb3aa765e58b47a992f468fe46f8eb547ff3faed0 -r0f68d5b3472a122ffda0030d2f78023ae34a6b6f
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/LocationsViewDataSynchronisationTester.cs	(.../LocationsViewDataSynchronisationTester.cs)	(revision b3aa765e58b47a992f468fe46f8eb547ff3faed0)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/LocationsViewDataSynchronisationTester.cs	(.../LocationsViewDataSynchronisationTester.cs)	(revision 0f68d5b3472a122ffda0030d2f78023ae34a6b6f)
@@ -19,8 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Controls.DataGrid;
@@ -53,9 +51,9 @@
         public void GivenFullyConfiguredView_WhenSelectingLocationWithoutOutput_ThenIllustrationPointsControlDataSetToEmptyEnumeration()
         {
             // Given
-            LocationsView<T> locationsView = ShowFullyConfiguredLocationsView(testForm);
-            IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl(locationsView);
-            DataGridViewControl dataGridViewControl = GetDataGridViewControl(locationsView);
+            ShowFullyConfiguredLocationsView(testForm);
+            IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
+            DataGridViewControl dataGridViewControl = GetDataGridViewControl();
 
             // When
             dataGridViewControl.SetCurrentCell(dataGridViewControl.GetCell(0, 1));
@@ -68,9 +66,9 @@
         public void GivenFullyConfiguredView_WhenSelectingLocationWithoutGeneralResult_ThenIllustrationPointsControlDataSetToEmptyEnumeration()
         {
             // Given
-            LocationsView<T> locationsView = ShowFullyConfiguredLocationsView(testForm);
-            IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl(locationsView);
-            DataGridViewControl dataGridViewControl = GetDataGridViewControl(locationsView);
+            ShowFullyConfiguredLocationsView(testForm);
+            IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
+            DataGridViewControl dataGridViewControl = GetDataGridViewControl();
 
             // When
             dataGridViewControl.SetCurrentCell(dataGridViewControl.GetCell(1, 0));
@@ -83,9 +81,9 @@
         public void GivenFullyConfiguredView_WhenSelectingLocationWithGeneralResult_ThenGeneralResultSetOnIllustrationPointsControlData()
         {
             // Given
-            LocationsView<T> locationsView = ShowFullyConfiguredLocationsView(testForm);
-            IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl(locationsView);
-            DataGridViewControl dataGridViewControl = GetDataGridViewControl(locationsView);
+            ShowFullyConfiguredLocationsView(testForm);
+            IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
+            DataGridViewControl dataGridViewControl = GetDataGridViewControl();
 
             // When
             dataGridViewControl.SetCurrentCell(dataGridViewControl.GetCell(4, 0));
@@ -106,30 +104,16 @@
         /// <item>Row 4: location with output containing a general result</item>
         /// </list>
         /// </remarks>
-        /// <returns>The fully configured view.</returns>
-        protected abstract LocationsView<T> ShowFullyConfiguredLocationsView(Form form);
+        protected abstract void ShowFullyConfiguredLocationsView(Form form);
 
-        private static DataGridViewControl GetDataGridViewControl(LocationsView<T> locationsView)
+        private DataGridViewControl GetDataGridViewControl()
         {
-            return GetControls<DataGridViewControl>(locationsView, "DataGridViewControl").Single();
+            return ControlTestHelper.GetDataGridViewControl(testForm, "DataGridViewControl");
         }
 
-        private static IllustrationPointsControl GetIllustrationPointsControl(LocationsView<T> locationsView)
+        private IllustrationPointsControl GetIllustrationPointsControl()
         {
-            return GetControls<IllustrationPointsControl>(locationsView, "IllustrationPointsControl").Single();
+            return ControlTestHelper.GetControls<IllustrationPointsControl>(testForm, "IllustrationPointsControl").Single();
         }
-
-        /// <summary>
-        /// Gets all controls of type <typeparamref name="TControl"/> going by the name <paramref name="controlName"/>.
-        /// </summary>
-        /// <typeparam name="TControl">The type of controls to find.</typeparam>
-        /// <param name="locationsView">The locations view to find the controls in.</param>
-        /// <param name="controlName">The name of the controls to find.</param>
-        /// <returns>The found controls.</returns>
-        /// <exception cref="ArgumentException">Thrown when <paramref name="controlName"/> is <c>null</c> or empty.</exception>
-        private static IEnumerable<TControl> GetControls<TControl>(LocationsView<T> locationsView, string controlName) where TControl : Control
-        {
-            return locationsView.Controls.Find(controlName, true).OfType<TControl>();
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -rb3aa765e58b47a992f468fe46f8eb547ff3faed0 -r0f68d5b3472a122ffda0030d2f78023ae34a6b6f
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs)	(revision b3aa765e58b47a992f468fe46f8eb547ff3faed0)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs)	(revision 0f68d5b3472a122ffda0030d2f78023ae34a6b6f)
@@ -496,6 +496,15 @@
             Assert.AreEqual(expectedErrorMessage, errorProvider.GetError(button));
         }
 
+        [TestFixture]
+        public class DataSynchronisationTester : LocationsViewDataSynchronisationTester<HydraulicBoundaryLocation>
+        {
+            protected override void ShowFullyConfiguredLocationsView(Form form)
+            {
+                ShowFullyConfiguredDesignWaterLevelLocationsView(new ObservableTestAssessmentSectionStub(), form);
+            }
+        }
+
         private static IEnumerable<IllustrationPointControlItem> CreateControlItems(
             GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult)
         {
@@ -513,30 +522,19 @@
 
         private DataGridViewControl GetDataGridViewControl()
         {
-            return GetControls<DataGridViewControl>("DataGridViewControl").Single();
+            return ControlTestHelper.GetDataGridViewControl(testForm, "DataGridViewControl");
         }
 
         private DataGridView GetDataGridView()
         {
-            return GetControls<DataGridView>("DataGridView").First();
+            return ControlTestHelper.GetDataGridView(testForm, "DataGridView");
         }
 
         private IllustrationPointsControl GetIllustrationPointsControl()
         {
-            return GetControls<IllustrationPointsControl>("IllustrationPointsControl").Single();
+            return ControlTestHelper.GetControls<IllustrationPointsControl>(testForm, "IllustrationPointsControl").Single();
         }
 
-        /// <summary>
-        /// Gets the controls by name.
-        /// </summary>
-        /// <param name="controlName">The name of the controls to find.</param>
-        /// <returns>The found control.</returns>
-        /// <exception cref="ArgumentException">Thrown when <paramref name="controlName"/> is <c>null</c> or empty.</exception>
-        private IEnumerable<TView> GetControls<TView>(string controlName) where TView : Control
-        {
-            return testForm.Controls.Find(controlName, true).OfType<TView>();
-        }
-
         private static GrassCoverErosionOutwardsDesignWaterLevelLocationsView ShowDesignWaterLevelLocationsView(IAssessmentSection assessmentSection, Form form)
         {
             var view = new GrassCoverErosionOutwardsDesignWaterLevelLocationsView(assessmentSection);
@@ -602,14 +600,5 @@
             };
             return view;
         }
-
-        [TestFixture]
-        public class DataSynchronisationTester : LocationsViewDataSynchronisationTester<HydraulicBoundaryLocation>
-        {
-            protected override LocationsView<HydraulicBoundaryLocation> ShowFullyConfiguredLocationsView(Form form)
-            {
-                return ShowFullyConfiguredDesignWaterLevelLocationsView(new ObservableTestAssessmentSectionStub(), form);
-            }
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs
===================================================================
diff -u -rb3aa765e58b47a992f468fe46f8eb547ff3faed0 -r0f68d5b3472a122ffda0030d2f78023ae34a6b6f
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs)	(revision b3aa765e58b47a992f468fe46f8eb547ff3faed0)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs)	(revision 0f68d5b3472a122ffda0030d2f78023ae34a6b6f)
@@ -498,9 +498,9 @@
         [TestFixture]
         public class DataSynchronisationTester : LocationsViewDataSynchronisationTester<HydraulicBoundaryLocation>
         {
-            protected override LocationsView<HydraulicBoundaryLocation> ShowFullyConfiguredLocationsView(Form form)
+            protected override void ShowFullyConfiguredLocationsView(Form form)
             {
-                return ShowFullyConfiguredWaveHeightLocationsView(new ObservableTestAssessmentSectionStub(), form);
+                ShowFullyConfiguredWaveHeightLocationsView(new ObservableTestAssessmentSectionStub(), form);
             }
         }
 
@@ -521,30 +521,19 @@
 
         private DataGridViewControl GetDataGridViewControl()
         {
-            return GetControls<DataGridViewControl>("DataGridViewControl").Single();
+            return ControlTestHelper.GetDataGridViewControl(testForm, "DataGridViewControl");
         }
 
         private DataGridView GetDataGridView()
         {
-            return GetControls<DataGridView>("DataGridView").First();
+            return ControlTestHelper.GetDataGridView(testForm, "DataGridView");
         }
 
         private IllustrationPointsControl GetIllustrationPointsControl()
         {
-            return GetControls<IllustrationPointsControl>("IllustrationPointsControl").Single();
+            return ControlTestHelper.GetControls<IllustrationPointsControl>(testForm, "IllustrationPointsControl").Single();
         }
 
-        /// <summary>
-        /// Gets the controls by name.
-        /// </summary>
-        /// <param name="controlName">The name of the controls to find.</param>
-        /// <returns>The found control.</returns>
-        /// <exception cref="ArgumentException">Thrown when <paramref name="controlName"/> is <c>null</c> or empty.</exception>
-        private IEnumerable<TView> GetControls<TView>(string controlName) where TView : Control
-        {
-            return testForm.Controls.Find(controlName, true).OfType<TView>();
-        }
-
         private static GrassCoverErosionOutwardsWaveHeightLocationsView ShowWaveHeightLocationsView(IAssessmentSection assessmentSection, Form form)
         {
             var view = new GrassCoverErosionOutwardsWaveHeightLocationsView(assessmentSection);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -rb3aa765e58b47a992f468fe46f8eb547ff3faed0 -r0f68d5b3472a122ffda0030d2f78023ae34a6b6f
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision b3aa765e58b47a992f468fe46f8eb547ff3faed0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision 0f68d5b3472a122ffda0030d2f78023ae34a6b6f)
@@ -379,9 +379,9 @@
         [TestFixture]
         public class DataSynchronisationTester : LocationsViewDataSynchronisationTester<HydraulicBoundaryLocation>
         {
-            protected override LocationsView<HydraulicBoundaryLocation> ShowFullyConfiguredLocationsView(Form form)
+            protected override void ShowFullyConfiguredLocationsView(Form form)
             {
-                return ShowFullyConfiguredDesignWaterLevelLocationsView(form);
+                ShowFullyConfiguredDesignWaterLevelLocationsView(form);
             }
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs
===================================================================
diff -u -rb3aa765e58b47a992f468fe46f8eb547ff3faed0 -r0f68d5b3472a122ffda0030d2f78023ae34a6b6f
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision b3aa765e58b47a992f468fe46f8eb547ff3faed0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision 0f68d5b3472a122ffda0030d2f78023ae34a6b6f)
@@ -371,9 +371,9 @@
         [TestFixture]
         public class DataSynchronisationTester : LocationsViewDataSynchronisationTester<HydraulicBoundaryLocation>
         {
-            protected override LocationsView<HydraulicBoundaryLocation> ShowFullyConfiguredLocationsView(Form form)
+            protected override void ShowFullyConfiguredLocationsView(Form form)
             {
-                return ShowFullyConfiguredWaveHeightLocationsView(form);
+                ShowFullyConfiguredWaveHeightLocationsView(form);
             }
         }