Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/LocationsViewSynchronizationTester.cs
===================================================================
diff -u -r9dc4775788ed190d86a0bc797b4ee2bcc79995c2 -ra722967209e56d9af9e59ef95b28ad91f7fe5b42
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/LocationsViewSynchronizationTester.cs	(.../LocationsViewSynchronizationTester.cs)	(revision 9dc4775788ed190d86a0bc797b4ee2bcc79995c2)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/LocationsViewSynchronizationTester.cs	(.../LocationsViewSynchronizationTester.cs)	(revision a722967209e56d9af9e59ef95b28ad91f7fe5b42)
@@ -190,7 +190,7 @@
             DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
 
             // When
-            locationsDataGridViewControl.SetCurrentCell(locationsDataGridViewControl.GetCell(4, 0));
+            locationsDataGridViewControl.SetCurrentCell(locationsDataGridViewControl.GetCell(3, 0));
 
             // Then
             Assert.AreEqual(2, illustrationPointsControl.Data.Count());
@@ -204,15 +204,14 @@
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             DataGridViewRowCollection locationsDataGridViewRows = locationsDataGridView.Rows;
-            locationsDataGridView.CurrentCell = locationsDataGridViewRows[4].Cells[0];
+            locationsDataGridView.CurrentCell = locationsDataGridViewRows[3].Cells[0];
 
             // Precondition
-            Assert.AreEqual(5, locationsDataGridViewRows.Count);
+            Assert.AreEqual(4, locationsDataGridViewRows.Count);
             Assert.AreEqual("-", locationsDataGridViewRows[0].Cells[OutputColumnIndex].FormattedValue);
             Assert.AreNotEqual("-", locationsDataGridViewRows[1].Cells[OutputColumnIndex].FormattedValue);
             Assert.AreEqual("-", locationsDataGridViewRows[2].Cells[OutputColumnIndex].FormattedValue);
-            Assert.AreEqual("-", locationsDataGridViewRows[3].Cells[OutputColumnIndex].FormattedValue);
-            Assert.AreNotEqual("-", locationsDataGridViewRows[4].Cells[OutputColumnIndex].FormattedValue);
+            Assert.AreNotEqual("-", locationsDataGridViewRows[3].Cells[OutputColumnIndex].FormattedValue);
             Assert.AreEqual(2, GetIllustrationPointsControl().Data.Count());
 
             var refreshed = false;
@@ -223,12 +222,11 @@
 
             // Then
             Assert.IsTrue(refreshed);
-            Assert.AreEqual(5, locationsDataGridViewRows.Count);
+            Assert.AreEqual(4, locationsDataGridViewRows.Count);
             Assert.AreEqual("-", locationsDataGridViewRows[0].Cells[OutputColumnIndex].FormattedValue);
             Assert.AreEqual("-", locationsDataGridViewRows[1].Cells[OutputColumnIndex].FormattedValue);
             Assert.AreEqual("-", locationsDataGridViewRows[2].Cells[OutputColumnIndex].FormattedValue);
             Assert.AreEqual("-", locationsDataGridViewRows[3].Cells[OutputColumnIndex].FormattedValue);
-            Assert.AreEqual("-", locationsDataGridViewRows[4].Cells[OutputColumnIndex].FormattedValue);
             CollectionAssert.IsEmpty(GetIllustrationPointsControl().Data);
         }
 
@@ -245,11 +243,11 @@
             DataGridView locationsDataGridView = GetLocationsDataGridView();
 
             // When
-            locationsDataGridView.CurrentCell = locationsDataGridView.Rows[4].Cells[0];
+            locationsDataGridView.CurrentCell = locationsDataGridView.Rows[3].Cells[0];
 
             // Then
             DataGridViewRow currentLocationRow = GetLocationsDataGridViewControl().CurrentRow;
-            Assert.AreEqual(4, currentLocationRow.Index);
+            Assert.AreEqual(3, currentLocationRow.Index);
             Assert.AreEqual(GetLocationSelection(view, currentLocationRow.DataBoundItem), view.Selection);
         }
 
@@ -260,11 +258,11 @@
             LocationsView<T> view = ShowFullyConfiguredLocationsView(testForm);
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
-            locationsDataGridView.CurrentCell = locationsDataGridView.Rows[4].Cells[0];
+            locationsDataGridView.CurrentCell = locationsDataGridView.Rows[3].Cells[0];
 
             // Precondition
             DataGridViewRow currentLocationRow = GetLocationsDataGridViewControl().CurrentRow;
-            Assert.AreEqual(4, currentLocationRow.Index);
+            Assert.AreEqual(3, currentLocationRow.Index);
             Assert.AreEqual(GetLocationSelection(view, currentLocationRow.DataBoundItem), view.Selection);
 
             // When
@@ -283,19 +281,19 @@
             LocationsView<T> view = ShowFullyConfiguredLocationsView(testForm);
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
-            locationsDataGridView.CurrentCell = locationsDataGridView.Rows[4].Cells[0];
+            locationsDataGridView.CurrentCell = locationsDataGridView.Rows[3].Cells[0];
 
             // Precondition
             DataGridViewRow currentLocationRow = GetLocationsDataGridViewControl().CurrentRow;
-            Assert.AreEqual(4, currentLocationRow.Index);
+            Assert.AreEqual(3, currentLocationRow.Index);
             Assert.AreEqual(GetLocationSelection(view, currentLocationRow.DataBoundItem), view.Selection);
 
             // When
             ClearLocationOutputAndNotifyObservers(view);
 
             // Then
             currentLocationRow = GetLocationsDataGridViewControl().CurrentRow;
-            Assert.AreEqual(4, currentLocationRow.Index);
+            Assert.AreEqual(3, currentLocationRow.Index);
             Assert.AreEqual(GetLocationSelection(view, currentLocationRow.DataBoundItem), view.Selection);
         }
 
@@ -306,19 +304,19 @@
             LocationsView<T> view = ShowFullyConfiguredLocationsView(testForm);
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
-            locationsDataGridView.CurrentCell = locationsDataGridView.Rows[4].Cells[0];
+            locationsDataGridView.CurrentCell = locationsDataGridView.Rows[3].Cells[0];
 
             // Precondition
             DataGridViewRow currentLocationRow = GetLocationsDataGridViewControl().CurrentRow;
-            Assert.AreEqual(4, currentLocationRow.Index);
+            Assert.AreEqual(3, currentLocationRow.Index);
             Assert.AreEqual(GetLocationSelection(view, currentLocationRow.DataBoundItem), view.Selection);
 
             // When
             AddLocationOutputAndNotifyObservers(view);
 
             // Then
             currentLocationRow = GetLocationsDataGridViewControl().CurrentRow;
-            Assert.AreEqual(4, currentLocationRow.Index);
+            Assert.AreEqual(3, currentLocationRow.Index);
             Assert.AreEqual(GetLocationSelection(view, currentLocationRow.DataBoundItem), view.Selection);
         }
 
@@ -329,7 +327,7 @@
             LocationsView<T> view = ShowFullyConfiguredLocationsView(testForm);
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
-            locationsDataGridView.CurrentCell = locationsDataGridView.Rows[4].Cells[0];
+            locationsDataGridView.CurrentCell = locationsDataGridView.Rows[3].Cells[0];
             DataGridView illustrationPointsDataGridView = GetIllustrationPointsDataGridView();
 
             // When
@@ -346,12 +344,12 @@
             LocationsView<T> view = ShowFullyConfiguredLocationsView(testForm);
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
-            locationsDataGridView.CurrentCell = locationsDataGridView.Rows[4].Cells[0];
+            locationsDataGridView.CurrentCell = locationsDataGridView.Rows[3].Cells[0];
             DataGridView illustrationPointsDataGridView = GetIllustrationPointsDataGridView();
             illustrationPointsDataGridView.CurrentCell = illustrationPointsDataGridView.Rows[1].Cells[0];
 
             // Precondition
-            Assert.AreEqual(4, locationsDataGridView.CurrentRow?.Index);
+            Assert.AreEqual(3, locationsDataGridView.CurrentRow?.Index);
             Assert.AreEqual(1, illustrationPointsDataGridView.CurrentRow?.Index);
             AssertIllustrationPointControlSelection(view.Selection);
 
@@ -370,20 +368,20 @@
             LocationsView<T> view = ShowFullyConfiguredLocationsView(testForm);
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
-            locationsDataGridView.CurrentCell = locationsDataGridView.Rows[4].Cells[0];
+            locationsDataGridView.CurrentCell = locationsDataGridView.Rows[3].Cells[0];
             DataGridView illustrationPointsDataGridView = GetIllustrationPointsDataGridView();
             illustrationPointsDataGridView.CurrentCell = illustrationPointsDataGridView.Rows[1].Cells[0];
 
             // Precondition
-            Assert.AreEqual(4, locationsDataGridView.CurrentRow?.Index);
+            Assert.AreEqual(3, locationsDataGridView.CurrentRow?.Index);
             Assert.AreEqual(1, illustrationPointsDataGridView.CurrentRow?.Index);
             AssertIllustrationPointControlSelection(view.Selection);
 
             // When
             ClearLocationOutputAndNotifyObservers(view);
 
             // Then
-            Assert.AreEqual(4, locationsDataGridView.CurrentRow?.Index);
+            Assert.AreEqual(3, locationsDataGridView.CurrentRow?.Index);
             Assert.AreEqual(GetLocationSelection(view, locationsDataGridView.CurrentRow?.DataBoundItem), view.Selection);
         }
 
@@ -394,20 +392,20 @@
             LocationsView<T> view = ShowFullyConfiguredLocationsView(testForm);
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
-            locationsDataGridView.CurrentCell = locationsDataGridView.Rows[4].Cells[0];
+            locationsDataGridView.CurrentCell = locationsDataGridView.Rows[3].Cells[0];
             DataGridView illustrationPointsDataGridView = GetIllustrationPointsDataGridView();
             illustrationPointsDataGridView.CurrentCell = illustrationPointsDataGridView.Rows[1].Cells[0];
 
             // Precondition
-            Assert.AreEqual(4, locationsDataGridView.CurrentRow?.Index);
+            Assert.AreEqual(3, locationsDataGridView.CurrentRow?.Index);
             Assert.AreEqual(1, illustrationPointsDataGridView.CurrentRow?.Index);
             AssertIllustrationPointControlSelection(view.Selection);
 
             // When
             AddLocationOutputAndNotifyObservers(view);
 
             // Then
-            Assert.AreEqual(4, locationsDataGridView.CurrentRow?.Index);
+            Assert.AreEqual(3, locationsDataGridView.CurrentRow?.Index);
             Assert.AreEqual(1, illustrationPointsDataGridView.CurrentRow?.Index);
             AssertIllustrationPointControlSelection(view.Selection);
         }
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -r9dc4775788ed190d86a0bc797b4ee2bcc79995c2 -ra722967209e56d9af9e59ef95b28ad91f7fe5b42
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs)	(revision 9dc4775788ed190d86a0bc797b4ee2bcc79995c2)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs)	(revision a722967209e56d9af9e59ef95b28ad91f7fe5b42)
@@ -180,7 +180,7 @@
             // Assert
             DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
             DataGridViewRowCollection rows = locationsDataGridViewControl.Rows;
-            Assert.AreEqual(5, rows.Count);
+            Assert.AreEqual(4, rows.Count);
 
             DataGridViewCellCollection cells = rows[0].Cells;
             Assert.AreEqual(6, cells.Count);
@@ -203,7 +203,7 @@
             cells = rows[2].Cells;
             Assert.AreEqual(6, cells.Count);
             Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
-            Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue);
+            Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue);
             Assert.AreEqual("3", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("3", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(3, 3).ToString(), cells[locationColumnIndex].FormattedValue);
@@ -216,15 +216,6 @@
             Assert.AreEqual("4", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("4", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(4, 4).ToString(), cells[locationColumnIndex].FormattedValue);
-            Assert.AreEqual("-", cells[locationDesignWaterlevelColumnIndex].FormattedValue);
-
-            cells = rows[4].Cells;
-            Assert.AreEqual(6, cells.Count);
-            Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
-            Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue);
-            Assert.AreEqual("5", cells[locationNameColumnIndex].FormattedValue);
-            Assert.AreEqual("5", cells[locationIdColumnIndex].FormattedValue);
-            Assert.AreEqual(new Point2D(5, 5).ToString(), cells[locationColumnIndex].FormattedValue);
             Assert.AreEqual(1.01.ToString(CultureInfo.CurrentCulture), cells[locationDesignWaterlevelColumnIndex].FormattedValue);
         }
 
@@ -243,7 +234,7 @@
             object dataGridViewSource = locationsDataGridView.DataSource;
             DataGridViewRowCollection rows = locationsDataGridView.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
-            Assert.AreEqual(5, rows.Count);
+            Assert.AreEqual(4, rows.Count);
 
             const double designWaterLevel = 10.23;
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(10, "10", 10.0, 10.0)
@@ -289,7 +280,7 @@
             IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
             DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
 
-            locationsDataGridViewControl.SetCurrentCell(locationsDataGridViewControl.GetCell(3, 0));
+            locationsDataGridViewControl.SetCurrentCell(locationsDataGridViewControl.GetCell(2, 0));
 
             // Precondition
             CollectionAssert.IsEmpty(illustrationPointsControl.Data);
@@ -306,8 +297,8 @@
             ObservableList<HydraulicBoundaryLocation> locations = view.FailureMechanism.HydraulicBoundaryLocations;
 
             // Call
-            locations[3].DesignWaterLevelCalculation1.Output = output;
-            locations[3].NotifyObservers();
+            locations[2].DesignWaterLevelCalculation1.Output = output;
+            locations[2].NotifyObservers();
 
             // Assert
             IEnumerable<IllustrationPointControlItem> expectedControlItems = CreateControlItems(generalResult);
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs
===================================================================
diff -u -r9dc4775788ed190d86a0bc797b4ee2bcc79995c2 -ra722967209e56d9af9e59ef95b28ad91f7fe5b42
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs)	(revision 9dc4775788ed190d86a0bc797b4ee2bcc79995c2)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs)	(revision a722967209e56d9af9e59ef95b28ad91f7fe5b42)
@@ -180,7 +180,7 @@
             // Assert
             DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
             DataGridViewRowCollection rows = locationsDataGridViewControl.Rows;
-            Assert.AreEqual(5, rows.Count);
+            Assert.AreEqual(4, rows.Count);
 
             DataGridViewCellCollection cells = rows[0].Cells;
             Assert.AreEqual(6, cells.Count);
@@ -203,7 +203,7 @@
             cells = rows[2].Cells;
             Assert.AreEqual(6, cells.Count);
             Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
-            Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue);
+            Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue);
             Assert.AreEqual("3", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("3", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(3, 3).ToString(), cells[locationColumnIndex].FormattedValue);
@@ -216,15 +216,6 @@
             Assert.AreEqual("4", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("4", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(4, 4).ToString(), cells[locationColumnIndex].FormattedValue);
-            Assert.AreEqual("-", cells[locationWaveHeightColumnIndex].FormattedValue);
-
-            cells = rows[4].Cells;
-            Assert.AreEqual(6, cells.Count);
-            Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
-            Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue);
-            Assert.AreEqual("5", cells[locationNameColumnIndex].FormattedValue);
-            Assert.AreEqual("5", cells[locationIdColumnIndex].FormattedValue);
-            Assert.AreEqual(new Point2D(5, 5).ToString(), cells[locationColumnIndex].FormattedValue);
             Assert.AreEqual(1.01.ToString(CultureInfo.CurrentCulture), cells[locationWaveHeightColumnIndex].FormattedValue);
         }
 
@@ -243,7 +234,7 @@
             object dataGridViewSource = locationsDataGridView.DataSource;
             DataGridViewRowCollection rows = locationsDataGridView.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
-            Assert.AreEqual(5, rows.Count);
+            Assert.AreEqual(4, rows.Count);
 
             const double waveHeight = 1.1;
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(10, "10", 10, 10)
@@ -289,7 +280,7 @@
             IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
             DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
 
-            locationsDataGridViewControl.SetCurrentCell(locationsDataGridViewControl.GetCell(3, 0));
+            locationsDataGridViewControl.SetCurrentCell(locationsDataGridViewControl.GetCell(2, 0));
 
             // Precondition
             CollectionAssert.IsEmpty(illustrationPointsControl.Data);
@@ -306,8 +297,8 @@
             ObservableList<HydraulicBoundaryLocation> locations = view.FailureMechanism.HydraulicBoundaryLocations;
 
             // Call
-            locations[3].WaveHeightCalculation1.Output = output;
-            locations[3].NotifyObservers();
+            locations[2].WaveHeightCalculation1.Output = output;
+            locations[2].NotifyObservers();
 
             // Assert
             IEnumerable<IllustrationPointControlItem> expectedControlItems = CreateControlItems(generalResult);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -r9dc4775788ed190d86a0bc797b4ee2bcc79995c2 -ra722967209e56d9af9e59ef95b28ad91f7fe5b42
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision 9dc4775788ed190d86a0bc797b4ee2bcc79995c2)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision a722967209e56d9af9e59ef95b28ad91f7fe5b42)
@@ -157,7 +157,7 @@
             // Assert
             DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
             DataGridViewRowCollection rows = locationsDataGridViewControl.Rows;
-            Assert.AreEqual(5, rows.Count);
+            Assert.AreEqual(4, rows.Count);
 
             DataGridViewCellCollection cells = rows[0].Cells;
             Assert.AreEqual(6, cells.Count);
@@ -180,7 +180,7 @@
             cells = rows[2].Cells;
             Assert.AreEqual(6, cells.Count);
             Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
-            Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue);
+            Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue);
             Assert.AreEqual("3", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("3", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(3, 3).ToString(), cells[locationColumnIndex].FormattedValue);
@@ -193,15 +193,6 @@
             Assert.AreEqual("4", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("4", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(4, 4).ToString(), cells[locationColumnIndex].FormattedValue);
-            Assert.AreEqual("-", cells[locationDesignWaterlevelColumnIndex].FormattedValue);
-
-            cells = rows[4].Cells;
-            Assert.AreEqual(6, cells.Count);
-            Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
-            Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue);
-            Assert.AreEqual("5", cells[locationNameColumnIndex].FormattedValue);
-            Assert.AreEqual("5", cells[locationIdColumnIndex].FormattedValue);
-            Assert.AreEqual(new Point2D(5, 5).ToString(), cells[locationColumnIndex].FormattedValue);
             Assert.AreEqual(1.01.ToString(CultureInfo.CurrentCulture), cells[locationDesignWaterlevelColumnIndex].FormattedValue);
         }
 
@@ -229,7 +220,7 @@
             // Precondition
             DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
             DataGridViewRowCollection rows = locationsDataGridViewControl.Rows;
-            Assert.AreEqual(5, rows.Count);
+            Assert.AreEqual(4, rows.Count);
 
             locations.Clear();
             locations.Add(hydraulicBoundaryLocation);
@@ -285,7 +276,7 @@
             IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
             DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
 
-            locationsDataGridViewControl.SetCurrentCell(locationsDataGridViewControl.GetCell(3, 0));
+            locationsDataGridViewControl.SetCurrentCell(locationsDataGridViewControl.GetCell(2, 0));
 
             // Precondition
             CollectionAssert.IsEmpty(illustrationPointsControl.Data);
@@ -300,7 +291,7 @@
             var output = new TestHydraulicBoundaryLocationOutput(generalResult);
 
             // Call
-            HydraulicBoundaryLocation hydraulicBoundaryLocation = locations[3];
+            HydraulicBoundaryLocation hydraulicBoundaryLocation = locations[2];
             hydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output = output;
             hydraulicBoundaryLocation.NotifyObservers();
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs
===================================================================
diff -u -r9dc4775788ed190d86a0bc797b4ee2bcc79995c2 -ra722967209e56d9af9e59ef95b28ad91f7fe5b42
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision 9dc4775788ed190d86a0bc797b4ee2bcc79995c2)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision a722967209e56d9af9e59ef95b28ad91f7fe5b42)
@@ -157,7 +157,7 @@
             // Assert
             DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
             DataGridViewRowCollection rows = locationsDataGridViewControl.Rows;
-            Assert.AreEqual(5, rows.Count);
+            Assert.AreEqual(4, rows.Count);
 
             DataGridViewCellCollection cells = rows[0].Cells;
             Assert.AreEqual(6, cells.Count);
@@ -180,7 +180,7 @@
             cells = rows[2].Cells;
             Assert.AreEqual(6, cells.Count);
             Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
-            Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue);
+            Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue);
             Assert.AreEqual("3", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("3", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(3, 3).ToString(), cells[locationColumnIndex].FormattedValue);
@@ -193,15 +193,6 @@
             Assert.AreEqual("4", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("4", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(4, 4).ToString(), cells[locationColumnIndex].FormattedValue);
-            Assert.AreEqual("-", cells[locationWaveHeightColumnIndex].FormattedValue);
-
-            cells = rows[4].Cells;
-            Assert.AreEqual(6, cells.Count);
-            Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
-            Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue);
-            Assert.AreEqual("5", cells[locationNameColumnIndex].FormattedValue);
-            Assert.AreEqual("5", cells[locationIdColumnIndex].FormattedValue);
-            Assert.AreEqual(new Point2D(5, 5).ToString(), cells[locationColumnIndex].FormattedValue);
             Assert.AreEqual(1.01.ToString(CultureInfo.CurrentCulture), cells[locationWaveHeightColumnIndex].FormattedValue);
         }
 
@@ -229,7 +220,7 @@
             // Precondition
             DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
             DataGridViewRowCollection rows = locationsDataGridViewControl.Rows;
-            Assert.AreEqual(5, rows.Count);
+            Assert.AreEqual(4, rows.Count);
 
             locations.Clear();
             locations.Add(hydraulicBoundaryLocation);
@@ -285,7 +276,7 @@
 
             DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
 
-            locationsDataGridViewControl.SetCurrentCell(locationsDataGridViewControl.GetCell(3, 0));
+            locationsDataGridViewControl.SetCurrentCell(locationsDataGridViewControl.GetCell(2, 0));
 
             // Precondition
             CollectionAssert.IsEmpty(illustrationPointsControl.Data);
@@ -300,7 +291,7 @@
             var output = new TestHydraulicBoundaryLocationOutput(generalResult);
 
             // Call
-            HydraulicBoundaryLocation hydraulicBoundaryLocation = locations[3];
+            HydraulicBoundaryLocation hydraulicBoundaryLocation = locations[2];
             hydraulicBoundaryLocation.WaveHeightCalculation1.Output = output;
             hydraulicBoundaryLocation.NotifyObservers();