Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/LocationsViewSynchronizationTester.cs
===================================================================
diff -u -r4c8ed944e7dc94678840b6f7b1ff87f6110871f2 -rc4b2afb79467775209b1be1de2b2cc91a9fa2abb
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/LocationsViewSynchronizationTester.cs	(.../LocationsViewSynchronizationTester.cs)	(revision 4c8ed944e7dc94678840b6f7b1ff87f6110871f2)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/LocationsViewSynchronizationTester.cs	(.../LocationsViewSynchronizationTester.cs)	(revision c4b2afb79467775209b1be1de2b2cc91a9fa2abb)
@@ -35,21 +35,28 @@
     /// <typeparam name="T">The type of the locations contained by the view.</typeparam>
     public abstract class LocationsViewSynchronizationTester<T> where T : class
     {
-        protected Form testForm;
-        protected MockRepository mockRepository;
+        /// <summary>
+        /// The test form.
+        /// </summary>
+        protected Form TestForm;
 
+        /// <summary>
+        /// The mock repository.
+        /// </summary>
+        protected MockRepository MockRepository;
+
         [SetUp]
         public void Setup()
         {
-            testForm = new Form();
-            mockRepository = new MockRepository();
+            TestForm = new Form();
+            MockRepository = new MockRepository();
         }
 
         [TearDown]
         public void TearDown()
         {
-            testForm.Dispose();
-            mockRepository.VerifyAll();
+            TestForm.Dispose();
+            MockRepository.VerifyAll();
         }
 
         /// <summary>
@@ -100,19 +107,31 @@
         /// <param name="view">The locations view involved.</param>
         protected abstract void AddLocationOutputAndNotifyObservers(LocationsView<T> view);
 
-        private DataGridView GetLocationsDataGridView()
+        /// <summary>
+        /// Gets the locations data grid view.
+        /// </summary>
+        /// <returns>The locations data grid view.</returns>
+        protected DataGridView GetLocationsDataGridView()
         {
-            return ControlTestHelper.GetDataGridView(testForm, "DataGridView");
+            return ControlTestHelper.GetDataGridView(TestForm, "DataGridView");
         }
 
-        private DataGridViewControl GetLocationsDataGridViewControl()
+        /// <summary>
+        /// Gets the locations data grid view control.
+        /// </summary>
+        /// <returns>The locations data grid view control.</returns>
+        protected DataGridViewControl GetLocationsDataGridViewControl()
         {
-            return ControlTestHelper.GetDataGridViewControl(testForm, "DataGridViewControl");
+            return ControlTestHelper.GetDataGridViewControl(TestForm, "DataGridViewControl");
         }
 
-        private IllustrationPointsControl GetIllustrationPointsControl()
+        /// <summary>
+        /// Gets the illustration points control.
+        /// </summary>
+        /// <returns>The illustration points control.</returns>
+        protected IllustrationPointsControl GetIllustrationPointsControl()
         {
-            return ControlTestHelper.GetControls<IllustrationPointsControl>(testForm, "IllustrationPointsControl").Single();
+            return ControlTestHelper.GetControls<IllustrationPointsControl>(TestForm, "IllustrationPointsControl").Single();
         }
 
         private DataGridView GetIllustrationPointsDataGridView()
@@ -126,7 +145,7 @@
         public void GivenFullyConfiguredView_WhenSelectingLocationWithoutOutput_ThenIllustrationPointsControlDataSetToEmptyEnumeration()
         {
             // Given
-            ShowFullyConfiguredLocationsView(testForm);
+            ShowFullyConfiguredLocationsView(TestForm);
             IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
             DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
 
@@ -141,7 +160,7 @@
         public void GivenFullyConfiguredView_WhenSelectingLocationWithoutGeneralResult_ThenIllustrationPointsControlDataSetToEmptyEnumeration()
         {
             // Given
-            ShowFullyConfiguredLocationsView(testForm);
+            ShowFullyConfiguredLocationsView(TestForm);
             IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
             DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
 
@@ -156,7 +175,7 @@
         public void GivenFullyConfiguredView_WhenSelectingLocationWithGeneralResult_ThenGeneralResultSetOnIllustrationPointsControlData()
         {
             // Given
-            ShowFullyConfiguredLocationsView(testForm);
+            ShowFullyConfiguredLocationsView(TestForm);
             IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
             DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
 
@@ -171,7 +190,7 @@
         public void GivenFullyConfiguredViewWithFilledIllustrationPointsControl_WhenOutputCleared_ThenDataGridViewsUpdated()
         {
             // Given
-            LocationsView<T> view = ShowFullyConfiguredLocationsView(testForm);
+            LocationsView<T> view = ShowFullyConfiguredLocationsView(TestForm);
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             DataGridViewRowCollection locationsDataGridViewRows = locationsDataGridView.Rows;
             locationsDataGridView.CurrentCell = locationsDataGridViewRows[4].Cells[0];
@@ -210,7 +229,7 @@
         public void GivenFullyConfiguredView_WhenSelectingLocation_ThenSelectionUpdated()
         {
             // Given
-            LocationsView<T> view = ShowFullyConfiguredLocationsView(testForm);
+            LocationsView<T> view = ShowFullyConfiguredLocationsView(TestForm);
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
 
@@ -227,7 +246,7 @@
         public void GivenFullyConfiguredViewWithLocationSelection_WhenDatabaseReplaced_ThenSelectionUpdated()
         {
             // Given
-            LocationsView<T> view = ShowFullyConfiguredLocationsView(testForm);
+            LocationsView<T> view = ShowFullyConfiguredLocationsView(TestForm);
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             locationsDataGridView.CurrentCell = locationsDataGridView.Rows[4].Cells[0];
@@ -250,7 +269,7 @@
         public void GivenFullyConfiguredViewWithLocationSelection_WhenOutputCleared_ThenSelectionPreserved()
         {
             // Given
-            LocationsView<T> view = ShowFullyConfiguredLocationsView(testForm);
+            LocationsView<T> view = ShowFullyConfiguredLocationsView(TestForm);
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             locationsDataGridView.CurrentCell = locationsDataGridView.Rows[4].Cells[0];
@@ -273,7 +292,7 @@
         public void GivenFullyConfiguredViewWithLocationSelection_WhenOutputUpdated_ThenSelectionPreserved()
         {
             // Given
-            LocationsView<T> view = ShowFullyConfiguredLocationsView(testForm);
+            LocationsView<T> view = ShowFullyConfiguredLocationsView(TestForm);
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             locationsDataGridView.CurrentCell = locationsDataGridView.Rows[4].Cells[0];
@@ -296,7 +315,7 @@
         public void GivenFullyConfiguredView_WhenSelectingIllustrationPoint_ThenSelectionUpdated()
         {
             // Given
-            LocationsView<T> view = ShowFullyConfiguredLocationsView(testForm);
+            LocationsView<T> view = ShowFullyConfiguredLocationsView(TestForm);
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             locationsDataGridView.CurrentCell = locationsDataGridView.Rows[4].Cells[0];
@@ -315,7 +334,7 @@
         public void GivenFullyConfiguredViewWithIllustrationPointSelection_WhenDatabaseReplaced_ThenSelectionSetToLocation()
         {
             // Given
-            LocationsView<T> view = ShowFullyConfiguredLocationsView(testForm);
+            LocationsView<T> view = ShowFullyConfiguredLocationsView(TestForm);
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             locationsDataGridView.CurrentCell = locationsDataGridView.Rows[4].Cells[0];
@@ -341,7 +360,7 @@
         public void GivenFullyConfiguredViewWithIllustrationPointSelection_WhenOutputCleared_ThenSelectionSetToLocation()
         {
             // Given
-            LocationsView<T> view = ShowFullyConfiguredLocationsView(testForm);
+            LocationsView<T> view = ShowFullyConfiguredLocationsView(TestForm);
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             locationsDataGridView.CurrentCell = locationsDataGridView.Rows[4].Cells[0];
@@ -367,7 +386,7 @@
         public void GivenFullyConfiguredViewWithIllustrationPointSelection_WhenOutputUpdated_ThenSelectionPreserved()
         {
             // Given
-            LocationsView<T> view = ShowFullyConfiguredLocationsView(testForm);
+            LocationsView<T> view = ShowFullyConfiguredLocationsView(TestForm);
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             locationsDataGridView.CurrentCell = locationsDataGridView.Rows[4].Cells[0];
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -r4c8ed944e7dc94678840b6f7b1ff87f6110871f2 -rc4b2afb79467775209b1be1de2b2cc91a9fa2abb
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs)	(revision 4c8ed944e7dc94678840b6f7b1ff87f6110871f2)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs)	(revision c4b2afb79467775209b1be1de2b2cc91a9fa2abb)
@@ -63,8 +63,8 @@
         public void DefaultConstructor_DefaultValues()
         {
             // Setup
-            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            mockRepository.ReplayAll();
+            var assessmentSection = MockRepository.Stub<IAssessmentSection>();
+            MockRepository.ReplayAll();
 
             // Call
             using (var view = new GrassCoverErosionOutwardsDesignWaterLevelLocationsView(assessmentSection))
@@ -79,46 +79,46 @@
         public void Constructor_DataGridViewCorrectlyInitialized()
         {
             // Setup
-            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            mockRepository.ReplayAll();
+            var assessmentSection = MockRepository.Stub<IAssessmentSection>();
+            MockRepository.ReplayAll();
 
             // Call
-            ShowDesignWaterLevelLocationsView(assessmentSection, testForm);
+            ShowDesignWaterLevelLocationsView(assessmentSection, TestForm);
 
             // Assert
-            DataGridView dataGridView = GetDataGridView();
-            Assert.AreEqual(6, dataGridView.ColumnCount);
+            DataGridView locationsDataGridView = GetLocationsDataGridView();
+            Assert.AreEqual(6, locationsDataGridView.ColumnCount);
 
-            var locationCalculateColumn = (DataGridViewCheckBoxColumn) dataGridView.Columns[locationCalculateColumnIndex];
+            var locationCalculateColumn = (DataGridViewCheckBoxColumn) locationsDataGridView.Columns[locationCalculateColumnIndex];
             Assert.AreEqual("Berekenen", locationCalculateColumn.HeaderText);
 
-            var includeIllustrationPointsColumn = (DataGridViewCheckBoxColumn) dataGridView.Columns[includeIllustrationPointsColumnIndex];
+            var includeIllustrationPointsColumn = (DataGridViewCheckBoxColumn) locationsDataGridView.Columns[includeIllustrationPointsColumnIndex];
             Assert.AreEqual("Illustratiepunten inlezen", includeIllustrationPointsColumn.HeaderText);
 
-            var locationNameColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationNameColumnIndex];
+            var locationNameColumn = (DataGridViewTextBoxColumn) locationsDataGridView.Columns[locationNameColumnIndex];
             Assert.AreEqual("Naam", locationNameColumn.HeaderText);
 
-            var locationIdColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationIdColumnIndex];
+            var locationIdColumn = (DataGridViewTextBoxColumn) locationsDataGridView.Columns[locationIdColumnIndex];
             Assert.AreEqual("ID", locationIdColumn.HeaderText);
 
-            var locationColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationColumnIndex];
+            var locationColumn = (DataGridViewTextBoxColumn) locationsDataGridView.Columns[locationColumnIndex];
             Assert.AreEqual("Coördinaten [m]", locationColumn.HeaderText);
 
-            var locationDesignWaterlevelColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationDesignWaterlevelColumnIndex];
+            var locationDesignWaterlevelColumn = (DataGridViewTextBoxColumn) locationsDataGridView.Columns[locationDesignWaterlevelColumnIndex];
             Assert.AreEqual("Waterstand bij doorsnede-eis [m+NAP]", locationDesignWaterlevelColumn.HeaderText);
 
-            var button = (Button) testForm.Controls.Find("CalculateForSelectedButton", true).First();
+            var button = (Button) TestForm.Controls.Find("CalculateForSelectedButton", true).First();
             Assert.IsFalse(button.Enabled);
         }
 
         [Test]
         public void DesignWaterLevelLocationsView_WithNonIObservableList_ThrowsInvalidCastException()
         {
             // Setup
-            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            mockRepository.ReplayAll();
+            var assessmentSection = MockRepository.Stub<IAssessmentSection>();
+            MockRepository.ReplayAll();
 
-            GrassCoverErosionOutwardsDesignWaterLevelLocationsView view = ShowDesignWaterLevelLocationsView(assessmentSection, testForm);
+            GrassCoverErosionOutwardsDesignWaterLevelLocationsView view = ShowDesignWaterLevelLocationsView(assessmentSection, TestForm);
 
             var locations = new List<HydraulicBoundaryLocation>
             {
@@ -136,15 +136,15 @@
         public void DesignWaterLevelLocationsView_AssessmentSectionWithData_DataGridViewCorrectlyInitialized()
         {
             // Setup
-            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            mockRepository.ReplayAll();
+            var assessmentSection = MockRepository.Stub<IAssessmentSection>();
+            MockRepository.ReplayAll();
 
             // Call
-            ShowFullyConfiguredDesignWaterLevelLocationsView(assessmentSection, testForm);
+            ShowFullyConfiguredDesignWaterLevelLocationsView(assessmentSection, TestForm);
 
             // Assert
-            DataGridViewControl dataGridView = GetDataGridViewControl();
-            DataGridViewRowCollection rows = dataGridView.Rows;
+            DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
+            DataGridViewRowCollection rows = locationsDataGridViewControl.Rows;
             Assert.AreEqual(5, rows.Count);
 
             DataGridViewCellCollection cells = rows[0].Cells;
@@ -197,16 +197,16 @@
         public void DesignWaterLevelLocationsView_HydraulicBoundaryDatabaseUpdated_DataGridViewCorrectlyUpdated()
         {
             // Setup
-            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            mockRepository.ReplayAll();
+            var assessmentSection = MockRepository.Stub<IAssessmentSection>();
+            MockRepository.ReplayAll();
 
-            GrassCoverErosionOutwardsDesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView(assessmentSection, testForm);
+            GrassCoverErosionOutwardsDesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView(assessmentSection, TestForm);
             var locations = (ObservableList<HydraulicBoundaryLocation>) view.Data;
 
             // Precondition
-            DataGridView dataGridView = GetDataGridView();
-            object dataGridViewSource = dataGridView.DataSource;
-            DataGridViewRowCollection rows = dataGridView.Rows;
+            DataGridView locationsDataGridView = GetLocationsDataGridView();
+            object dataGridViewSource = locationsDataGridView.DataSource;
+            DataGridViewRowCollection rows = locationsDataGridView.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
             Assert.AreEqual(5, rows.Count);
 
@@ -238,22 +238,22 @@
             Assert.AreEqual("10", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(10, 10).ToString(), cells[locationColumnIndex].FormattedValue);
             Assert.AreEqual(hydraulicBoundaryLocation.DesignWaterLevel, cells[locationDesignWaterlevelColumnIndex].Value);
-            Assert.AreNotSame(dataGridViewSource, dataGridView.DataSource);
+            Assert.AreNotSame(dataGridViewSource, locationsDataGridView.DataSource);
             Assert.IsFalse((bool) rows[0].Cells[locationCalculateColumnIndex].Value);
         }
 
         [Test]
         public void DesignWaterLevelLocationsView_HydraulicBoundaryDatabaseUpdated_IllustrationPointsControlCorrectlyUpdated()
         {
             // Setup
-            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            mockRepository.ReplayAll();
+            var assessmentSection = MockRepository.Stub<IAssessmentSection>();
+            MockRepository.ReplayAll();
 
-            GrassCoverErosionOutwardsDesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView(assessmentSection, testForm);
+            GrassCoverErosionOutwardsDesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView(assessmentSection, TestForm);
             IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
-            DataGridViewControl dataGridView = GetDataGridViewControl();
+            DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
 
-            dataGridView.SetCurrentCell(dataGridView.GetCell(3, 0));
+            locationsDataGridViewControl.SetCurrentCell(locationsDataGridViewControl.GetCell(3, 0));
 
             // Precondition
             CollectionAssert.IsEmpty(illustrationPointsControl.Data);
@@ -284,16 +284,16 @@
         public void CalculateForSelectedButton_OneSelected_CallsCalculateDesignWaterLevelsSelectionNotChanged(bool isSuccessful)
         {
             // Setup
-            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
+            var assessmentSection = MockRepository.Stub<IAssessmentSection>();
             assessmentSection.Stub(ass => ass.Id).Return(string.Empty);
             assessmentSection.Stub(ass => ass.FailureMechanismContribution)
                              .Return(new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 1));
             assessmentSection.Stub(a => a.Attach(null)).IgnoreArguments();
             assessmentSection.Stub(a => a.Detach(null)).IgnoreArguments();
 
-            var guiService = mockRepository.StrictMock<IHydraulicBoundaryLocationCalculationGuiService>();
+            var guiService = MockRepository.StrictMock<IHydraulicBoundaryLocationCalculationGuiService>();
 
-            var observer = mockRepository.StrictMock<IObserver>();
+            var observer = MockRepository.StrictMock<IObserver>();
 
             if (isSuccessful)
             {
@@ -309,15 +309,15 @@
                     messageProvider = (ICalculationMessageProvider) invocation.Arguments[3];
                 }).Return(isSuccessful);
 
-            mockRepository.ReplayAll();
+            MockRepository.ReplayAll();
 
             assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
 
-            GrassCoverErosionOutwardsDesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView(assessmentSection, testForm);
+            GrassCoverErosionOutwardsDesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView(assessmentSection, TestForm);
             var locations = (ObservableList<HydraulicBoundaryLocation>) view.Data;
-            DataGridView dataGridView = GetDataGridView();
-            object dataGridViewSource = dataGridView.DataSource;
-            DataGridViewRowCollection rows = dataGridView.Rows;
+            DataGridView locationsDataGridView = GetLocationsDataGridView();
+            object dataGridViewSource = locationsDataGridView.DataSource;
+            DataGridViewRowCollection rows = locationsDataGridView.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
 
             locations.Attach(observer);
@@ -327,7 +327,7 @@
                 Contribution = 10
             };
             view.CalculationGuiService = guiService;
-            var buttonTester = new ButtonTester("CalculateForSelectedButton", testForm);
+            var buttonTester = new ButtonTester("CalculateForSelectedButton", TestForm);
 
             // Call
             buttonTester.Click();
@@ -337,7 +337,7 @@
             Assert.AreEqual(1, calculatedLocations.Length);
             HydraulicBoundaryLocation expectedLocation = locations.First();
             Assert.AreEqual(expectedLocation, calculatedLocations.First());
-            Assert.AreSame(dataGridViewSource, dataGridView.DataSource);
+            Assert.AreSame(dataGridViewSource, locationsDataGridView.DataSource);
             Assert.IsTrue((bool) rows[0].Cells[locationCalculateColumnIndex].Value);
             Assert.IsFalse((bool) rows[1].Cells[locationCalculateColumnIndex].Value);
             Assert.IsFalse((bool) rows[2].Cells[locationCalculateColumnIndex].Value);
@@ -347,16 +347,16 @@
         public void CalculateForSelectedButton_OneSelectedButCalculationGuiServiceNotSet_DoesNotThrowException()
         {
             // Setup
-            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            mockRepository.ReplayAll();
+            var assessmentSection = MockRepository.Stub<IAssessmentSection>();
+            MockRepository.ReplayAll();
 
-            ShowFullyConfiguredDesignWaterLevelLocationsView(assessmentSection, testForm);
+            ShowFullyConfiguredDesignWaterLevelLocationsView(assessmentSection, TestForm);
 
-            DataGridViewControl dataGridView = GetDataGridViewControl();
-            DataGridViewRowCollection rows = dataGridView.Rows;
+            DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
+            DataGridViewRowCollection rows = locationsDataGridViewControl.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
 
-            var button = new ButtonTester("CalculateForSelectedButton", testForm);
+            var button = new ButtonTester("CalculateForSelectedButton", TestForm);
 
             // Call
             TestDelegate test = () => button.Click();
@@ -375,16 +375,16 @@
                                                                                                                                                                           string expectedErrorMessage)
         {
             // Given
-            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            mockRepository.ReplayAll();
+            var assessmentSection = MockRepository.Stub<IAssessmentSection>();
+            MockRepository.ReplayAll();
 
-            GrassCoverErosionOutwardsDesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView(assessmentSection, testForm);
+            GrassCoverErosionOutwardsDesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView(assessmentSection, TestForm);
 
             // When
             if (rowSelected)
             {
-                DataGridViewControl dataGridView = GetDataGridViewControl();
-                DataGridViewRowCollection rows = dataGridView.Rows;
+                DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
+                DataGridViewRowCollection rows = locationsDataGridViewControl.Rows;
                 rows[0].Cells[locationCalculateColumnIndex].Value = true;
             }
 
@@ -417,21 +417,6 @@
                                 });
         }
 
-        private DataGridViewControl GetDataGridViewControl()
-        {
-            return ControlTestHelper.GetDataGridViewControl(testForm, "DataGridViewControl");
-        }
-
-        private DataGridView GetDataGridView()
-        {
-            return ControlTestHelper.GetDataGridView(testForm, "DataGridView");
-        }
-
-        private IllustrationPointsControl GetIllustrationPointsControl()
-        {
-            return ControlTestHelper.GetControls<IllustrationPointsControl>(testForm, "IllustrationPointsControl").Single();
-        }
-
         private static GrassCoverErosionOutwardsDesignWaterLevelLocationsView ShowDesignWaterLevelLocationsView(IAssessmentSection assessmentSection, Form form)
         {
             var view = new GrassCoverErosionOutwardsDesignWaterLevelLocationsView(assessmentSection);
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs
===================================================================
diff -u -r4c8ed944e7dc94678840b6f7b1ff87f6110871f2 -rc4b2afb79467775209b1be1de2b2cc91a9fa2abb
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs)	(revision 4c8ed944e7dc94678840b6f7b1ff87f6110871f2)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs)	(revision c4b2afb79467775209b1be1de2b2cc91a9fa2abb)
@@ -63,8 +63,8 @@
         public void DefaultConstructor_DefaultValues()
         {
             // Setup
-            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            mockRepository.ReplayAll();
+            var assessmentSection = MockRepository.Stub<IAssessmentSection>();
+            MockRepository.ReplayAll();
 
             // Call
             using (var view = new GrassCoverErosionOutwardsWaveHeightLocationsView(assessmentSection))
@@ -79,46 +79,46 @@
         public void Constructor_DataGridViewCorrectlyInitialized()
         {
             // Setup
-            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            mockRepository.ReplayAll();
+            var assessmentSection = MockRepository.Stub<IAssessmentSection>();
+            MockRepository.ReplayAll();
 
             // Call
-            ShowWaveHeightLocationsView(assessmentSection, testForm);
+            ShowWaveHeightLocationsView(assessmentSection, TestForm);
 
             // Assert
-            DataGridView dataGridView = GetDataGridView();
-            Assert.AreEqual(6, dataGridView.ColumnCount);
+            DataGridView locationsDataGridView = GetLocationsDataGridView();
+            Assert.AreEqual(6, locationsDataGridView.ColumnCount);
 
-            var locationCalculateColumn = (DataGridViewCheckBoxColumn) dataGridView.Columns[locationCalculateColumnIndex];
+            var locationCalculateColumn = (DataGridViewCheckBoxColumn) locationsDataGridView.Columns[locationCalculateColumnIndex];
             Assert.AreEqual("Berekenen", locationCalculateColumn.HeaderText);
 
-            var includeIllustrationPointsColumn = (DataGridViewCheckBoxColumn) dataGridView.Columns[includeIllustrationPointsColumnIndex];
+            var includeIllustrationPointsColumn = (DataGridViewCheckBoxColumn) locationsDataGridView.Columns[includeIllustrationPointsColumnIndex];
             Assert.AreEqual("Illustratiepunten inlezen", includeIllustrationPointsColumn.HeaderText);
 
-            var locationNameColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationNameColumnIndex];
+            var locationNameColumn = (DataGridViewTextBoxColumn) locationsDataGridView.Columns[locationNameColumnIndex];
             Assert.AreEqual("Naam", locationNameColumn.HeaderText);
 
-            var locationIdColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationIdColumnIndex];
+            var locationIdColumn = (DataGridViewTextBoxColumn) locationsDataGridView.Columns[locationIdColumnIndex];
             Assert.AreEqual("ID", locationIdColumn.HeaderText);
 
-            var locationColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationColumnIndex];
+            var locationColumn = (DataGridViewTextBoxColumn) locationsDataGridView.Columns[locationColumnIndex];
             Assert.AreEqual("Coördinaten [m]", locationColumn.HeaderText);
 
-            var locationWaveHeightColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationWaveHeightColumnIndex];
+            var locationWaveHeightColumn = (DataGridViewTextBoxColumn) locationsDataGridView.Columns[locationWaveHeightColumnIndex];
             Assert.AreEqual("Golfhoogte bij doorsnede-eis [m]", locationWaveHeightColumn.HeaderText);
 
-            var button = (Button) testForm.Controls.Find("CalculateForSelectedButton", true).First();
+            var button = (Button) TestForm.Controls.Find("CalculateForSelectedButton", true).First();
             Assert.IsFalse(button.Enabled);
         }
 
         [Test]
         public void WaveHeightLocationsView_WithNonIObservableList_ThrowsInvalidCastException()
         {
             // Setup
-            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            mockRepository.ReplayAll();
+            var assessmentSection = MockRepository.Stub<IAssessmentSection>();
+            MockRepository.ReplayAll();
 
-            GrassCoverErosionOutwardsWaveHeightLocationsView view = ShowWaveHeightLocationsView(assessmentSection, testForm);
+            GrassCoverErosionOutwardsWaveHeightLocationsView view = ShowWaveHeightLocationsView(assessmentSection, TestForm);
 
             var locations = new List<HydraulicBoundaryLocation>
             {
@@ -136,15 +136,15 @@
         public void WaveHeightLocationsView_AssessmentSectionWithData_DataGridViewCorrectlyInitialized()
         {
             // Setup
-            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            mockRepository.ReplayAll();
+            var assessmentSection = MockRepository.Stub<IAssessmentSection>();
+            MockRepository.ReplayAll();
 
             // Call
-            ShowFullyConfiguredWaveHeightLocationsView(assessmentSection, testForm);
+            ShowFullyConfiguredWaveHeightLocationsView(assessmentSection, TestForm);
 
             // Assert
-            DataGridViewControl dataGridView = GetDataGridViewControl();
-            DataGridViewRowCollection rows = dataGridView.Rows;
+            DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
+            DataGridViewRowCollection rows = locationsDataGridViewControl.Rows;
             Assert.AreEqual(5, rows.Count);
 
             DataGridViewCellCollection cells = rows[0].Cells;
@@ -197,16 +197,16 @@
         public void WaveHeightLocationsView_HydraulicBoundaryLocationsUpdated_DataGridViewCorrectlyUpdated()
         {
             // Setup
-            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            mockRepository.ReplayAll();
+            var assessmentSection = MockRepository.Stub<IAssessmentSection>();
+            MockRepository.ReplayAll();
 
-            GrassCoverErosionOutwardsWaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView(assessmentSection, testForm);
+            GrassCoverErosionOutwardsWaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView(assessmentSection, TestForm);
             var locations = (ObservableList<HydraulicBoundaryLocation>) view.Data;
 
             // Precondition
-            DataGridView dataGridView = GetDataGridView();
-            object dataGridViewSource = dataGridView.DataSource;
-            DataGridViewRowCollection rows = dataGridView.Rows;
+            DataGridView locationsDataGridView = GetLocationsDataGridView();
+            object dataGridViewSource = locationsDataGridView.DataSource;
+            DataGridViewRowCollection rows = locationsDataGridView.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
             Assert.AreEqual(5, rows.Count);
 
@@ -238,22 +238,22 @@
             Assert.AreEqual("10", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(10, 10).ToString(), cells[locationColumnIndex].FormattedValue);
             Assert.AreEqual(hydraulicBoundaryLocation.WaveHeight, cells[locationWaveHeightColumnIndex].Value);
-            Assert.AreNotSame(dataGridViewSource, dataGridView.DataSource);
+            Assert.AreNotSame(dataGridViewSource, locationsDataGridView.DataSource);
             Assert.IsFalse((bool) rows[0].Cells[locationCalculateColumnIndex].Value);
         }
 
         [Test]
         public void WaveHeightLocationsView_HydraulicBoundaryLocationsUpdated_IllustrationPointsControlCorrectlyUpdated()
         {
             // Setup
-            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            mockRepository.ReplayAll();
+            var assessmentSection = MockRepository.Stub<IAssessmentSection>();
+            MockRepository.ReplayAll();
 
-            GrassCoverErosionOutwardsWaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView(assessmentSection, testForm);
+            GrassCoverErosionOutwardsWaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView(assessmentSection, TestForm);
             IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
-            DataGridViewControl dataGridView = GetDataGridViewControl();
+            DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
 
-            dataGridView.SetCurrentCell(dataGridView.GetCell(3, 0));
+            locationsDataGridViewControl.SetCurrentCell(locationsDataGridViewControl.GetCell(3, 0));
 
             // Precondition
             CollectionAssert.IsEmpty(illustrationPointsControl.Data);
@@ -284,17 +284,17 @@
         public void CalculateForSelectedButton_OneSelected_CallsCalculateWaveHeightsSelectionNotChanged(bool isSuccessful)
         {
             // Setup
-            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
+            var assessmentSection = MockRepository.Stub<IAssessmentSection>();
             assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
             assessmentSection.Stub(ass => ass.Id).Return(string.Empty);
             assessmentSection.Stub(ass => ass.FailureMechanismContribution)
                              .Return(new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 1));
             assessmentSection.Stub(a => a.Attach(null)).IgnoreArguments();
             assessmentSection.Stub(a => a.Detach(null)).IgnoreArguments();
 
-            var guiService = mockRepository.StrictMock<IHydraulicBoundaryLocationCalculationGuiService>();
+            var guiService = MockRepository.StrictMock<IHydraulicBoundaryLocationCalculationGuiService>();
 
-            var observer = mockRepository.StrictMock<IObserver>();
+            var observer = MockRepository.StrictMock<IObserver>();
 
             if (isSuccessful)
             {
@@ -310,13 +310,13 @@
                     messageProvider = (ICalculationMessageProvider) invocation.Arguments[3];
                 }).Return(isSuccessful);
 
-            mockRepository.ReplayAll();
+            MockRepository.ReplayAll();
 
-            GrassCoverErosionOutwardsWaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView(assessmentSection, testForm);
+            GrassCoverErosionOutwardsWaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView(assessmentSection, TestForm);
             var locations = (ObservableList<HydraulicBoundaryLocation>) view.Data;
-            DataGridView dataGridView = GetDataGridView();
-            object dataGridViewSource = dataGridView.DataSource;
-            DataGridViewRowCollection rows = dataGridView.Rows;
+            DataGridView locationsDataGridView = GetLocationsDataGridView();
+            object dataGridViewSource = locationsDataGridView.DataSource;
+            DataGridViewRowCollection rows = locationsDataGridView.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
 
             locations.Attach(observer);
@@ -326,7 +326,7 @@
             {
                 Contribution = 10
             };
-            var button = new ButtonTester("CalculateForSelectedButton", testForm);
+            var button = new ButtonTester("CalculateForSelectedButton", TestForm);
 
             // Call
             button.Click();
@@ -336,7 +336,7 @@
             Assert.AreEqual(1, calculatedLocations.Length);
             HydraulicBoundaryLocation expectedLocation = locations.First();
             Assert.AreEqual(expectedLocation, calculatedLocations.First());
-            Assert.AreSame(dataGridViewSource, dataGridView.DataSource);
+            Assert.AreSame(dataGridViewSource, locationsDataGridView.DataSource);
             Assert.IsTrue((bool) rows[0].Cells[locationCalculateColumnIndex].Value);
             Assert.IsFalse((bool) rows[1].Cells[locationCalculateColumnIndex].Value);
             Assert.IsFalse((bool) rows[2].Cells[locationCalculateColumnIndex].Value);
@@ -346,16 +346,16 @@
         public void CalculateForSelectedButton_OneSelectedButCalculationGuiServiceNotSet_DoesNotThrowException()
         {
             // Setup
-            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            mockRepository.ReplayAll();
+            var assessmentSection = MockRepository.Stub<IAssessmentSection>();
+            MockRepository.ReplayAll();
 
-            ShowFullyConfiguredWaveHeightLocationsView(assessmentSection, testForm);
+            ShowFullyConfiguredWaveHeightLocationsView(assessmentSection, TestForm);
 
-            DataGridViewControl dataGridView = GetDataGridViewControl();
-            DataGridViewRowCollection rows = dataGridView.Rows;
+            DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
+            DataGridViewRowCollection rows = locationsDataGridViewControl.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
 
-            var button = new ButtonTester("CalculateForSelectedButton", testForm);
+            var button = new ButtonTester("CalculateForSelectedButton", TestForm);
 
             // Call
             TestDelegate test = () => button.Click();
@@ -374,16 +374,16 @@
                                                                                                                                                                     string expectedErrorMessage)
         {
             // Given
-            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            mockRepository.ReplayAll();
+            var assessmentSection = MockRepository.Stub<IAssessmentSection>();
+            MockRepository.ReplayAll();
 
-            GrassCoverErosionOutwardsWaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView(assessmentSection, testForm);
+            GrassCoverErosionOutwardsWaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView(assessmentSection, TestForm);
 
             // When
             if (rowSelected)
             {
-                DataGridViewControl dataGridView = GetDataGridViewControl();
-                DataGridViewRowCollection rows = dataGridView.Rows;
+                DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
+                DataGridViewRowCollection rows = locationsDataGridViewControl.Rows;
                 rows[0].Cells[locationCalculateColumnIndex].Value = true;
             }
 
@@ -416,21 +416,6 @@
                                 });
         }
 
-        private DataGridViewControl GetDataGridViewControl()
-        {
-            return ControlTestHelper.GetDataGridViewControl(testForm, "DataGridViewControl");
-        }
-
-        private DataGridView GetDataGridView()
-        {
-            return ControlTestHelper.GetDataGridView(testForm, "DataGridView");
-        }
-
-        private IllustrationPointsControl GetIllustrationPointsControl()
-        {
-            return ControlTestHelper.GetControls<IllustrationPointsControl>(testForm, "IllustrationPointsControl").Single();
-        }
-
         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 -r4c8ed944e7dc94678840b6f7b1ff87f6110871f2 -rc4b2afb79467775209b1be1de2b2cc91a9fa2abb
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision 4c8ed944e7dc94678840b6f7b1ff87f6110871f2)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision c4b2afb79467775209b1be1de2b2cc91a9fa2abb)
@@ -70,43 +70,43 @@
         public void Constructor_DataGridViewCorrectlyInitialized()
         {
             // Setup & Call
-            ShowDesignWaterLevelLocationsView(new ObservableTestAssessmentSectionStub(), testForm);
+            ShowDesignWaterLevelLocationsView(new ObservableTestAssessmentSectionStub(), TestForm);
 
             // Assert
-            DataGridView dataGridView = GetDataGridView();
-            Assert.AreEqual(6, dataGridView.ColumnCount);
+            DataGridView locationsDataGridView = GetLocationsDataGridView();
+            Assert.AreEqual(6, locationsDataGridView.ColumnCount);
 
-            var locationCalculateColumn = (DataGridViewCheckBoxColumn) dataGridView.Columns[locationCalculateColumnIndex];
+            var locationCalculateColumn = (DataGridViewCheckBoxColumn) locationsDataGridView.Columns[locationCalculateColumnIndex];
             Assert.AreEqual("Berekenen", locationCalculateColumn.HeaderText);
 
-            var includeIllustrationPointsColumn = (DataGridViewCheckBoxColumn) dataGridView.Columns[includeIllustrationPointsColumnIndex];
+            var includeIllustrationPointsColumn = (DataGridViewCheckBoxColumn) locationsDataGridView.Columns[includeIllustrationPointsColumnIndex];
             Assert.AreEqual("Illustratiepunten inlezen", includeIllustrationPointsColumn.HeaderText);
 
-            var locationNameColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationNameColumnIndex];
+            var locationNameColumn = (DataGridViewTextBoxColumn) locationsDataGridView.Columns[locationNameColumnIndex];
             Assert.AreEqual("Naam", locationNameColumn.HeaderText);
 
-            var locationIdColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationIdColumnIndex];
+            var locationIdColumn = (DataGridViewTextBoxColumn) locationsDataGridView.Columns[locationIdColumnIndex];
             Assert.AreEqual("ID", locationIdColumn.HeaderText);
 
-            var locationColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationColumnIndex];
+            var locationColumn = (DataGridViewTextBoxColumn) locationsDataGridView.Columns[locationColumnIndex];
             Assert.AreEqual("Coördinaten [m]", locationColumn.HeaderText);
 
-            var locationDesignWaterlevelColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationDesignWaterlevelColumnIndex];
+            var locationDesignWaterlevelColumn = (DataGridViewTextBoxColumn) locationsDataGridView.Columns[locationDesignWaterlevelColumnIndex];
             Assert.AreEqual("Toetspeil [m+NAP]", locationDesignWaterlevelColumn.HeaderText);
 
-            var button = (Button) testForm.Controls.Find("CalculateForSelectedButton", true).First();
+            var button = (Button) TestForm.Controls.Find("CalculateForSelectedButton", true).First();
             Assert.IsFalse(button.Enabled);
         }
 
         [Test]
         public void DesignWaterLevelLocationsView_AssessmentSectionWithData_DataGridViewCorrectlyInitialized()
         {
             // Setup & Call
-            ShowFullyConfiguredDesignWaterLevelLocationsView(testForm);
+            ShowFullyConfiguredDesignWaterLevelLocationsView(TestForm);
 
             // Assert
-            DataGridViewControl dataGridViewControl = GetDataGridViewControl();
-            DataGridViewRowCollection rows = dataGridViewControl.Rows;
+            DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
+            DataGridViewRowCollection rows = locationsDataGridViewControl.Rows;
             Assert.AreEqual(5, rows.Count);
 
             DataGridViewCellCollection cells = rows[0].Cells;
@@ -159,7 +159,7 @@
         public void DesignWaterLevelLocationsView_HydraulicBoundaryDatabaseUpdated_DataGridViewCorrectlyUpdated()
         {
             // Setup
-            DesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView(testForm);
+            DesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView(TestForm);
             IAssessmentSection assessmentSection = view.AssessmentSection;
             var newHydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(10, "10", 10.0, 10.0)
@@ -176,8 +176,8 @@
             newHydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation);
 
             // Precondition
-            DataGridViewControl dataGridViewControl = GetDataGridViewControl();
-            DataGridViewRowCollection rows = dataGridViewControl.Rows;
+            DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
+            DataGridViewRowCollection rows = locationsDataGridViewControl.Rows;
             Assert.AreEqual(5, rows.Count);
 
             assessmentSection.HydraulicBoundaryDatabase = newHydraulicBoundaryDatabase;
@@ -201,11 +201,11 @@
         public void DesignWaterLevelLocationsView_HydraulicBoundaryDatabaseUpdated_IllustrationPointsControlCorrectlyUpdated()
         {
             // Setup
-            DesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView(testForm);
+            DesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView(TestForm);
             IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
-            DataGridViewControl dataGridViewControl = GetDataGridViewControl();
+            DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
 
-            dataGridViewControl.SetCurrentCell(dataGridViewControl.GetCell(3, 0));
+            locationsDataGridViewControl.SetCurrentCell(locationsDataGridViewControl.GetCell(3, 0));
 
             // Precondition
             CollectionAssert.IsEmpty(illustrationPointsControl.Data);
@@ -234,15 +234,15 @@
         public void CalculateForSelectedButton_OneSelected_CallsCalculateDesignWaterLevels(bool isSuccessful)
         {
             // Setup
-            DesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView(testForm);
+            DesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView(TestForm);
             IAssessmentSection assessmentSection = view.AssessmentSection;
-            DataGridViewControl dataGridViewControl = GetDataGridViewControl();
-            DataGridViewRowCollection rows = dataGridViewControl.Rows;
+            DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
+            DataGridViewRowCollection rows = locationsDataGridViewControl.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
 
-            var guiService = mockRepository.StrictMock<IHydraulicBoundaryLocationCalculationGuiService>();
+            var guiService = MockRepository.StrictMock<IHydraulicBoundaryLocationCalculationGuiService>();
 
-            var observer = mockRepository.StrictMock<IObserver>();
+            var observer = MockRepository.StrictMock<IObserver>();
             assessmentSection.HydraulicBoundaryDatabase.Attach(observer);
 
             if (isSuccessful)
@@ -258,10 +258,10 @@
                     locations = (IEnumerable<HydraulicBoundaryLocation>) invocation.Arguments[1];
                     messageProvider = (ICalculationMessageProvider) invocation.Arguments[3];
                 }).Return(isSuccessful);
-            mockRepository.ReplayAll();
+            MockRepository.ReplayAll();
 
             view.CalculationGuiService = guiService;
-            var buttonTester = new ButtonTester("CalculateForSelectedButton", testForm);
+            var buttonTester = new ButtonTester("CalculateForSelectedButton", TestForm);
 
             // Call
             buttonTester.Click();
@@ -278,13 +278,13 @@
         public void CalculateForSelectedButton_OneSelectedButCalculationGuiServiceNotSet_DoesNotThrowException()
         {
             // Setup
-            ShowFullyConfiguredDesignWaterLevelLocationsView(testForm);
+            ShowFullyConfiguredDesignWaterLevelLocationsView(TestForm);
 
-            DataGridViewControl dataGridViewControl = GetDataGridViewControl();
-            DataGridViewRowCollection rows = dataGridViewControl.Rows;
+            DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
+            DataGridViewRowCollection rows = locationsDataGridViewControl.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
 
-            var button = new ButtonTester("CalculateForSelectedButton", testForm);
+            var button = new ButtonTester("CalculateForSelectedButton", TestForm);
 
             // Call
             TestDelegate test = () => button.Click();
@@ -293,21 +293,6 @@
             Assert.DoesNotThrow(test);
         }
 
-        private DataGridViewControl GetDataGridViewControl()
-        {
-            return ControlTestHelper.GetDataGridViewControl(testForm, "DataGridViewControl");
-        }
-
-        private DataGridView GetDataGridView()
-        {
-            return ControlTestHelper.GetDataGridView(testForm, "DataGridView");
-        }
-
-        private IllustrationPointsControl GetIllustrationPointsControl()
-        {
-            return ControlTestHelper.GetControls<IllustrationPointsControl>(testForm, "IllustrationPointsControl").First();
-        }
-
         private static IEnumerable<IllustrationPointControlItem> CreateControlItems(
             GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult)
         {
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs
===================================================================
diff -u -r4c8ed944e7dc94678840b6f7b1ff87f6110871f2 -rc4b2afb79467775209b1be1de2b2cc91a9fa2abb
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision 4c8ed944e7dc94678840b6f7b1ff87f6110871f2)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision c4b2afb79467775209b1be1de2b2cc91a9fa2abb)
@@ -68,43 +68,43 @@
         public void Constructor_DataGridViewCorrectlyInitialized()
         {
             // Setup & Call
-            ShowWaveHeightLocationsView(new ObservableTestAssessmentSectionStub(), testForm);
+            ShowWaveHeightLocationsView(new ObservableTestAssessmentSectionStub(), TestForm);
 
             // Assert
-            DataGridView dataGridView = GetDataGridView();
-            Assert.AreEqual(6, dataGridView.ColumnCount);
+            DataGridView locationsDataGridView = GetLocationsDataGridView();
+            Assert.AreEqual(6, locationsDataGridView.ColumnCount);
 
-            var locationCalculateColumn = (DataGridViewCheckBoxColumn) dataGridView.Columns[locationCalculateColumnIndex];
+            var locationCalculateColumn = (DataGridViewCheckBoxColumn) locationsDataGridView.Columns[locationCalculateColumnIndex];
             Assert.AreEqual("Berekenen", locationCalculateColumn.HeaderText);
 
-            var includeIllustrationPointsColumn = (DataGridViewCheckBoxColumn) dataGridView.Columns[includeIllustrationPointsColumnIndex];
+            var includeIllustrationPointsColumn = (DataGridViewCheckBoxColumn) locationsDataGridView.Columns[includeIllustrationPointsColumnIndex];
             Assert.AreEqual("Illustratiepunten inlezen", includeIllustrationPointsColumn.HeaderText);
 
-            var locationNameColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationNameColumnIndex];
+            var locationNameColumn = (DataGridViewTextBoxColumn) locationsDataGridView.Columns[locationNameColumnIndex];
             Assert.AreEqual("Naam", locationNameColumn.HeaderText);
 
-            var locationIdColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationIdColumnIndex];
+            var locationIdColumn = (DataGridViewTextBoxColumn) locationsDataGridView.Columns[locationIdColumnIndex];
             Assert.AreEqual("ID", locationIdColumn.HeaderText);
 
-            var locationColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationColumnIndex];
+            var locationColumn = (DataGridViewTextBoxColumn) locationsDataGridView.Columns[locationColumnIndex];
             Assert.AreEqual("Coördinaten [m]", locationColumn.HeaderText);
 
-            var locationWaveHeightColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationWaveHeightColumnIndex];
+            var locationWaveHeightColumn = (DataGridViewTextBoxColumn) locationsDataGridView.Columns[locationWaveHeightColumnIndex];
             Assert.AreEqual("Hs [m]", locationWaveHeightColumn.HeaderText);
 
-            var button = (Button) testForm.Controls.Find("CalculateForSelectedButton", true).First();
+            var button = (Button) TestForm.Controls.Find("CalculateForSelectedButton", true).First();
             Assert.IsFalse(button.Enabled);
         }
 
         [Test]
         public void WaveHeightLocationsView_AssessmentSectionWithData_DataGridViewCorrectlyInitialized()
         {
             // Setup & Call
-            ShowFullyConfiguredWaveHeightLocationsView(testForm);
+            ShowFullyConfiguredWaveHeightLocationsView(TestForm);
 
             // Assert
-            DataGridViewControl dataGridViewControl = GetDataGridViewControl();
-            DataGridViewRowCollection rows = dataGridViewControl.Rows;
+            DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
+            DataGridViewRowCollection rows = locationsDataGridViewControl.Rows;
             Assert.AreEqual(5, rows.Count);
 
             DataGridViewCellCollection cells = rows[0].Cells;
@@ -157,7 +157,7 @@
         public void WaveHeightLocationsView_HydraulicBoundaryDatabaseUpdated_DataGridViewCorrectlyUpdated()
         {
             // Setup
-            WaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView(testForm);
+            WaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView(TestForm);
             IAssessmentSection assessmentSection = view.AssessmentSection;
             var newHydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(10, "10", 10.0, 10.0)
@@ -174,8 +174,8 @@
             newHydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation);
 
             // Precondition
-            DataGridViewControl dataGridViewControl = GetDataGridViewControl();
-            DataGridViewRowCollection rows = dataGridViewControl.Rows;
+            DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
+            DataGridViewRowCollection rows = locationsDataGridViewControl.Rows;
             Assert.AreEqual(5, rows.Count);
 
             // Call
@@ -198,12 +198,12 @@
         public void WaveHeightLocationsView_HydraulicBoundaryDatabaseUpdated_IllustrationPointsControlCorrectlyUpdated()
         {
             // Setup
-            WaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView(testForm);
+            WaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView(TestForm);
             IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
 
-            DataGridViewControl dataGridViewControl = GetDataGridViewControl();
+            DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
 
-            dataGridViewControl.SetCurrentCell(dataGridViewControl.GetCell(3, 0));
+            locationsDataGridViewControl.SetCurrentCell(locationsDataGridViewControl.GetCell(3, 0));
 
             // Precondition
             CollectionAssert.IsEmpty(illustrationPointsControl.Data);
@@ -232,15 +232,15 @@
         public void CalculateForSelectedButton_OneSelected_CallsCalculateWaveHeights(bool isSuccessful)
         {
             // Setup
-            WaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView(testForm);
+            WaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView(TestForm);
             IAssessmentSection assessmentSection = view.AssessmentSection;
-            DataGridViewControl dataGridViewControl = GetDataGridViewControl();
-            DataGridViewRowCollection rows = dataGridViewControl.Rows;
+            DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
+            DataGridViewRowCollection rows = locationsDataGridViewControl.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
 
-            var guiService = mockRepository.StrictMock<IHydraulicBoundaryLocationCalculationGuiService>();
+            var guiService = MockRepository.StrictMock<IHydraulicBoundaryLocationCalculationGuiService>();
 
-            var observer = mockRepository.StrictMock<IObserver>();
+            var observer = MockRepository.StrictMock<IObserver>();
             assessmentSection.HydraulicBoundaryDatabase.Attach(observer);
 
             if (isSuccessful)
@@ -251,10 +251,10 @@
             IEnumerable<HydraulicBoundaryLocation> locations = null;
             guiService.Expect(ch => ch.CalculateWaveHeights(null, null, 1, null)).IgnoreArguments().WhenCalled(
                 invocation => { locations = (IEnumerable<HydraulicBoundaryLocation>) invocation.Arguments[1]; }).Return(isSuccessful);
-            mockRepository.ReplayAll();
+            MockRepository.ReplayAll();
 
             view.CalculationGuiService = guiService;
-            var button = new ButtonTester("CalculateForSelectedButton", testForm);
+            var button = new ButtonTester("CalculateForSelectedButton", TestForm);
 
             // Call
             button.Click();
@@ -270,13 +270,13 @@
         public void CalculateForSelectedButton_OneSelectedButCalculationGuiServiceNotSet_DoesNotThrowException()
         {
             // Setup
-            ShowFullyConfiguredWaveHeightLocationsView(testForm);
+            ShowFullyConfiguredWaveHeightLocationsView(TestForm);
 
-            DataGridViewControl dataGridViewControl = GetDataGridViewControl();
-            DataGridViewRowCollection rows = dataGridViewControl.Rows;
+            DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
+            DataGridViewRowCollection rows = locationsDataGridViewControl.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
 
-            var button = new ButtonTester("CalculateForSelectedButton", testForm);
+            var button = new ButtonTester("CalculateForSelectedButton", TestForm);
 
             // Call
             TestDelegate test = () => button.Click();
@@ -285,21 +285,6 @@
             Assert.DoesNotThrow(test);
         }
 
-        private DataGridViewControl GetDataGridViewControl()
-        {
-            return ControlTestHelper.GetDataGridViewControl(testForm, "DataGridViewControl");
-        }
-
-        private DataGridView GetDataGridView()
-        {
-            return ControlTestHelper.GetDataGridView(testForm, "DataGridView");
-        }
-
-        private IllustrationPointsControl GetIllustrationPointsControl()
-        {
-            return ControlTestHelper.GetControls<IllustrationPointsControl>(testForm, "IllustrationPointsControl").First();
-        }
-
         private static IEnumerable<IllustrationPointControlItem> CreateControlItems(
             GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult)
         {