Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -r6ef4dd653a4a5922e1d7e06e38fbdd4b9971644c -rb993bb9a5d64890358d9b64b9027318f43571238
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs)	(revision 6ef4dd653a4a5922e1d7e06e38fbdd4b9971644c)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs)	(revision b993bb9a5d64890358d9b64b9027318f43571238)
@@ -93,6 +93,42 @@
         }
 
         [Test]
+        public void Constructor_DataGridViewCorrectlyInitialized()
+        {
+            // Setup
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
+            mockRepository.ReplayAll();
+
+            // Call
+            ShowDesignWaterLevelLocationsView(assessmentSection);
+
+            // Assert
+            DataGridView dataGridView = GetDataGridView();
+            Assert.AreEqual(6, dataGridView.ColumnCount);
+
+            var locationCalculateColumn = (DataGridViewCheckBoxColumn)dataGridView.Columns[locationCalculateColumnIndex];
+            Assert.AreEqual("Berekenen", locationCalculateColumn.HeaderText);
+
+            var includeIllustrationPointsColumn = (DataGridViewCheckBoxColumn)dataGridView.Columns[includeIllustrationPointsColumnIndex];
+            Assert.AreEqual("Illustratiepunten inlezen", includeIllustrationPointsColumn.HeaderText);
+
+            var locationNameColumn = (DataGridViewTextBoxColumn)dataGridView.Columns[locationNameColumnIndex];
+            Assert.AreEqual("Naam", locationNameColumn.HeaderText);
+
+            var locationIdColumn = (DataGridViewTextBoxColumn)dataGridView.Columns[locationIdColumnIndex];
+            Assert.AreEqual("ID", locationIdColumn.HeaderText);
+
+            var locationColumn = (DataGridViewTextBoxColumn)dataGridView.Columns[locationColumnIndex];
+            Assert.AreEqual("Coördinaten [m]", locationColumn.HeaderText);
+
+            var locationDesignWaterlevelColumn = (DataGridViewTextBoxColumn)dataGridView.Columns[locationDesignWaterlevelColumnIndex];
+            Assert.AreEqual("Waterstand bij doorsnede-eis [m+NAP]", locationDesignWaterlevelColumn.HeaderText);
+
+            var button = (Button)testForm.Controls.Find("CalculateForSelectedButton", true).First();
+            Assert.IsFalse(button.Enabled);
+        }
+
+        [Test]
         public void GivenFullyConfiguredView_WhenSelectingRowInLocationsTable_ThenReturnSelectedLocation()
         {
             // Given
@@ -186,42 +222,6 @@
         }
 
         [Test]
-        public void Constructor_DataGridViewCorrectlyInitialized()
-        {
-            // Setup
-            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            mockRepository.ReplayAll();
-
-            // Call
-            ShowDesignWaterLevelLocationsView(assessmentSection);
-
-            // Assert
-            DataGridView dataGridView = GetDataGridView();
-            Assert.AreEqual(6, dataGridView.ColumnCount);
-
-            var locationCalculateColumn = (DataGridViewCheckBoxColumn) dataGridView.Columns[locationCalculateColumnIndex];
-            Assert.AreEqual("Berekenen", locationCalculateColumn.HeaderText);
-
-            var includeIllustrationPointsColumn = (DataGridViewCheckBoxColumn) dataGridView.Columns[includeIllustrationPointsColumnIndex];
-            Assert.AreEqual("Illustratiepunten inlezen", includeIllustrationPointsColumn.HeaderText);
-
-            var locationNameColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationNameColumnIndex];
-            Assert.AreEqual("Naam", locationNameColumn.HeaderText);
-
-            var locationIdColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationIdColumnIndex];
-            Assert.AreEqual("ID", locationIdColumn.HeaderText);
-
-            var locationColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationColumnIndex];
-            Assert.AreEqual("Coördinaten [m]", locationColumn.HeaderText);
-
-            var locationDesignWaterlevelColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationDesignWaterlevelColumnIndex];
-            Assert.AreEqual("Waterstand bij doorsnede-eis [m+NAP]", locationDesignWaterlevelColumn.HeaderText);
-
-            var button = (Button) testForm.Controls.Find("CalculateForSelectedButton", true).First();
-            Assert.IsFalse(button.Enabled);
-        }
-
-        [Test]
         public void DesignWaterLevelLocationsView_WithNonIObservableList_ThrowsInvalidCastException()
         {
             // Setup
@@ -353,6 +353,42 @@
         }
 
         [Test]
+        public void DesignWaterLevelLocationsView_HydraulicBoundaryDatabaseUpdated_IllustrationPointsControlCorrectlyUpdated()
+        {
+            // Setup
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
+            mockRepository.ReplayAll();
+
+            GrassCoverErosionOutwardsDesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView(assessmentSection);
+            IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
+            DataGridViewControl dataGridView = GetDataGridViewControl();
+
+            dataGridView.SetCurrentCell(dataGridView.GetCell(3, 0));
+
+            // Precondition
+            CollectionAssert.IsEmpty(illustrationPointsControl.Data);
+
+            var topLevelIllustrationPoints = new[]
+            {
+                new TopLevelSubMechanismIllustrationPoint(WindDirectionTestFactory.CreateTestWindDirection(),
+                                                          "Regular",
+                                                          new TestSubMechanismIllustrationPoint())
+            };
+            var generalResult = new TestGeneralResultSubMechanismIllustrationPoint(topLevelIllustrationPoints);
+            var output = new TestHydraulicBoundaryLocationOutput(generalResult);
+
+            var locations = (ObservableList<HydraulicBoundaryLocation>)view.Data;
+
+            // Call
+            locations[3].DesignWaterLevelCalculation.Output = output;
+            locations.NotifyObservers();
+
+            // Assert
+            IEnumerable<IllustrationPointControlItem> expectedControlItems = CreateControlItems(generalResult);
+            CollectionAssert.AreEqual(expectedControlItems, illustrationPointsControl.Data, new IllustrationPointControlItemComparer());
+        }
+
+        [Test]
         public void DesignWaterLevelLocationsView_EachHydraulicBoundaryLocationUpdated_DataGridViewRefreshedWithNewValues()
         {
             // Setup
@@ -514,42 +550,6 @@
             Assert.AreEqual(expectedErrorMessage, errorProvider.GetError(button));
         }
 
-        [Test]
-        public void DesignWaterLevelLocationsView_HydraulicBoundaryDatabaseNotifyObservers_UpdateIllustrationPointsControlData()
-        {
-            // Setup
-            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            mockRepository.ReplayAll();
-
-            GrassCoverErosionOutwardsDesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView(assessmentSection);
-            IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
-            DataGridViewControl dataGridView = GetDataGridViewControl();
-
-            dataGridView.SetCurrentCell(dataGridView.GetCell(3, 0));
-
-            // Precondition
-            CollectionAssert.IsEmpty(illustrationPointsControl.Data);
-
-            var topLevelIllustrationPoints = new[]
-            {
-                new TopLevelSubMechanismIllustrationPoint(WindDirectionTestFactory.CreateTestWindDirection(),
-                                                          "Regular",
-                                                          new TestSubMechanismIllustrationPoint())
-            };
-            var generalResult = new TestGeneralResultSubMechanismIllustrationPoint(topLevelIllustrationPoints);
-            var output = new TestHydraulicBoundaryLocationOutput(generalResult);
-
-            var locations = (ObservableList<HydraulicBoundaryLocation>) view.Data;
-
-            // Call
-            locations[3].DesignWaterLevelCalculation.Output = output;
-            locations.NotifyObservers();
-
-            // Assert
-            IEnumerable<IllustrationPointControlItem> expectedControlItems = CreateControlItems(generalResult);
-            CollectionAssert.AreEqual(expectedControlItems, illustrationPointsControl.Data, new IllustrationPointControlItemComparer());
-        }
-
         private static IEnumerable<IllustrationPointControlItem> CreateControlItems(
             GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult)
         {