Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsControlTest.cs
===================================================================
diff -u -rf0267c59b04d7626cc634fd0a1c14d9b02c061ea -r566265eddf560e1a0cde3805907760745cb4b830
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsControlTest.cs	(.../IllustrationPointsControlTest.cs)	(revision f0267c59b04d7626cc634fd0a1c14d9b02c061ea)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsControlTest.cs	(.../IllustrationPointsControlTest.cs)	(revision 566265eddf560e1a0cde3805907760745cb4b830)
@@ -127,6 +127,9 @@
 
                 var initialControlSelection = control.Selection as IllustrationPointControlItem;
 
+                // Precondition
+                Assert.IsNotNull(initialControlSelection);
+
                 // Call
                 dataGridView.SetCurrentCell(dataGridView.Rows[1].Cells[0]);
 
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsTableControlTest.cs
===================================================================
diff -u -rf0267c59b04d7626cc634fd0a1c14d9b02c061ea -r566265eddf560e1a0cde3805907760745cb4b830
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsTableControlTest.cs	(.../IllustrationPointsTableControlTest.cs)	(revision f0267c59b04d7626cc634fd0a1c14d9b02c061ea)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsTableControlTest.cs	(.../IllustrationPointsTableControlTest.cs)	(revision 566265eddf560e1a0cde3805907760745cb4b830)
@@ -244,8 +244,9 @@
             var selection = control.Selection as IllustrationPointControlItem;
 
             // Assert
-            var dataBoundItem = dataGridView.Rows[0].DataBoundItem as IllustrationPointRow;
             Assert.NotNull(selection);
+
+            var dataBoundItem = dataGridView.Rows[0].DataBoundItem as IllustrationPointRow;
             Assert.NotNull(dataBoundItem);
             Assert.AreSame(dataBoundItem.IllustrationPointControlItem, selection);
         }
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/LocationsViewSynchronizationTester.cs
===================================================================
diff -u -rf0267c59b04d7626cc634fd0a1c14d9b02c061ea -r566265eddf560e1a0cde3805907760745cb4b830
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/LocationsViewSynchronizationTester.cs	(.../LocationsViewSynchronizationTester.cs)	(revision f0267c59b04d7626cc634fd0a1c14d9b02c061ea)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/LocationsViewSynchronizationTester.cs	(.../LocationsViewSynchronizationTester.cs)	(revision 566265eddf560e1a0cde3805907760745cb4b830)
@@ -23,7 +23,6 @@
 using System.Windows.Forms;
 using Core.Common.Controls.DataGrid;
 using NUnit.Framework;
-using Rhino.Mocks;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Common.Forms.Views;
 
@@ -33,31 +32,29 @@
     /// Class for testing data and selection synchronization in <see cref="LocationsView{T}"/> derivatives.
     /// </summary>
     /// <typeparam name="T">The type of the locations contained by the view.</typeparam>
+    [TestFixture]
     public abstract class LocationsViewSynchronizationTester<T> where T : class
     {
         private Form testForm;
-        private MockRepository mockRepository;
 
+        /// <summary>
+        /// Gets the index of the column containing the locations output.
+        /// </summary>
+        protected abstract int OutputColumnIndex { get; }
+
         [SetUp]
         public void Setup()
         {
             testForm = new Form();
-            mockRepository = new MockRepository();
         }
 
         [TearDown]
         public void TearDown()
         {
             testForm.Dispose();
-            mockRepository.VerifyAll();
         }
 
         /// <summary>
-        /// Gets the index of the column containing the locations output.
-        /// </summary>
-        protected abstract int OutputColumnIndex { get; }
-
-        /// <summary>
         /// Method for obtaining the view selection object related to the selected location row.
         /// </summary>
         /// <param name="view">The locations view involved.</param>
@@ -127,7 +124,6 @@
         {
             // Given
             ShowFullyConfiguredLocationsView(testForm);
-            mockRepository.ReplayAll();
 
             IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
             DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
@@ -144,7 +140,6 @@
         {
             // Given
             ShowFullyConfiguredLocationsView(testForm);
-            mockRepository.ReplayAll();
 
             IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
             DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
@@ -161,7 +156,6 @@
         {
             // Given
             ShowFullyConfiguredLocationsView(testForm);
-            mockRepository.ReplayAll();
 
             IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
             DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
@@ -178,7 +172,6 @@
         {
             // Given
             LocationsView<T> view = ShowFullyConfiguredLocationsView(testForm);
-            mockRepository.ReplayAll();
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             DataGridViewRowCollection locationsDataGridViewRows = locationsDataGridView.Rows;
@@ -219,7 +212,6 @@
         {
             // Given
             LocationsView<T> view = ShowFullyConfiguredLocationsView(testForm);
-            mockRepository.ReplayAll();
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
 
@@ -237,7 +229,6 @@
         {
             // Given
             LocationsView<T> view = ShowFullyConfiguredLocationsView(testForm);
-            mockRepository.ReplayAll();
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             locationsDataGridView.CurrentCell = locationsDataGridView.Rows[4].Cells[0];
@@ -261,7 +252,6 @@
         {
             // Given
             LocationsView<T> view = ShowFullyConfiguredLocationsView(testForm);
-            mockRepository.ReplayAll();
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             locationsDataGridView.CurrentCell = locationsDataGridView.Rows[4].Cells[0];
@@ -285,7 +275,6 @@
         {
             // Given
             LocationsView<T> view = ShowFullyConfiguredLocationsView(testForm);
-            mockRepository.ReplayAll();
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             locationsDataGridView.CurrentCell = locationsDataGridView.Rows[4].Cells[0];
@@ -309,7 +298,6 @@
         {
             // Given
             LocationsView<T> view = ShowFullyConfiguredLocationsView(testForm);
-            mockRepository.ReplayAll();
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             locationsDataGridView.CurrentCell = locationsDataGridView.Rows[4].Cells[0];
@@ -327,7 +315,6 @@
         {
             // Given
             LocationsView<T> view = ShowFullyConfiguredLocationsView(testForm);
-            mockRepository.ReplayAll();
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             locationsDataGridView.CurrentCell = locationsDataGridView.Rows[4].Cells[0];
@@ -352,7 +339,6 @@
         {
             // Given
             LocationsView<T> view = ShowFullyConfiguredLocationsView(testForm);
-            mockRepository.ReplayAll();
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             locationsDataGridView.CurrentCell = locationsDataGridView.Rows[4].Cells[0];
@@ -377,7 +363,6 @@
         {
             // Given
             LocationsView<T> view = ShowFullyConfiguredLocationsView(testForm);
-            mockRepository.ReplayAll();
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             locationsDataGridView.CurrentCell = locationsDataGridView.Rows[4].Cells[0];
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -rf0267c59b04d7626cc634fd0a1c14d9b02c061ea -r566265eddf560e1a0cde3805907760745cb4b830
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs)	(revision f0267c59b04d7626cc634fd0a1c14d9b02c061ea)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs)	(revision 566265eddf560e1a0cde3805907760745cb4b830)
@@ -520,7 +520,7 @@
         }
 
         [TestFixture]
-        private class DesignWaterLevelLocationsViewSynchronizationTest : LocationsViewSynchronizationTester<HydraulicBoundaryLocation>
+        private class ViewSynchronizationTest : LocationsViewSynchronizationTester<HydraulicBoundaryLocation>
         {
             protected override int OutputColumnIndex
             {
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs
===================================================================
diff -u -rf0267c59b04d7626cc634fd0a1c14d9b02c061ea -r566265eddf560e1a0cde3805907760745cb4b830
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs)	(revision f0267c59b04d7626cc634fd0a1c14d9b02c061ea)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs)	(revision 566265eddf560e1a0cde3805907760745cb4b830)
@@ -519,7 +519,7 @@
         }
 
         [TestFixture]
-        private class WaveHeightLocationsViewSynchronizationTest : LocationsViewSynchronizationTester<HydraulicBoundaryLocation>
+        private class ViewSynchronizationTest : LocationsViewSynchronizationTester<HydraulicBoundaryLocation>
         {
             protected override int OutputColumnIndex
             {
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -rf0267c59b04d7626cc634fd0a1c14d9b02c061ea -r566265eddf560e1a0cde3805907760745cb4b830
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision f0267c59b04d7626cc634fd0a1c14d9b02c061ea)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision 566265eddf560e1a0cde3805907760745cb4b830)
@@ -429,7 +429,7 @@
         }
 
         [TestFixture]
-        private class DesignWaterLevelLocationsViewSynchronizationTest : LocationsViewSynchronizationTester<HydraulicBoundaryLocation>
+        private class ViewSynchronizationTest : LocationsViewSynchronizationTester<HydraulicBoundaryLocation>
         {
             protected override int OutputColumnIndex
             {
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs
===================================================================
diff -u -rf0267c59b04d7626cc634fd0a1c14d9b02c061ea -r566265eddf560e1a0cde3805907760745cb4b830
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision f0267c59b04d7626cc634fd0a1c14d9b02c061ea)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision 566265eddf560e1a0cde3805907760745cb4b830)
@@ -421,7 +421,7 @@
         }
 
         [TestFixture]
-        public class WaveHeightLocationsViewSynchronizationTest : LocationsViewSynchronizationTester<HydraulicBoundaryLocation>
+        public class ViewSynchronizationTest : LocationsViewSynchronizationTester<HydraulicBoundaryLocation>
         {
             protected override int OutputColumnIndex
             {