Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationContextRow.cs
===================================================================
diff -u -red0ac171987ec828fb4aebf32493a41d43c7599c -rd3c64e3a7d673dc14562864a12b475db9f4c27ff
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationContextRow.cs	(.../DesignWaterLevelLocationContextRow.cs)	(revision ed0ac171987ec828fb4aebf32493a41d43c7599c)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationContextRow.cs	(.../DesignWaterLevelLocationContextRow.cs)	(revision d3c64e3a7d673dc14562864a12b475db9f4c27ff)
@@ -51,7 +51,7 @@
         }
 
         /// <summary>
-        /// Gets whether the <see cref="DesignWaterLevelLocationContextRow"/> is set to be calculated.
+        /// Gets or sets whether the <see cref="DesignWaterLevelLocationContextRow"/> is set to be calculated.
         /// </summary>
         public bool ToCalculate { get; set; }
 
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs
===================================================================
diff -u -red0ac171987ec828fb4aebf32493a41d43c7599c -rd3c64e3a7d673dc14562864a12b475db9f4c27ff
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs	(.../DesignWaterLevelLocationsView.cs)	(revision ed0ac171987ec828fb4aebf32493a41d43c7599c)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs	(.../DesignWaterLevelLocationsView.cs)	(revision d3c64e3a7d673dc14562864a12b475db9f4c27ff)
@@ -55,7 +55,7 @@
             InitializeDataGridView();
 
             assessmentSectionObserver = new Observer(UpdateDataGridViewDataSource);
-            hydraulicBoundaryDatabaseObserver = new Observer(RefreshDataGridView);
+            hydraulicBoundaryDatabaseObserver = new Observer(() => dataGridViewControl.RefreshDataGridView());
         }
 
         /// <summary>
@@ -84,11 +84,6 @@
             }
         }
 
-        private void SetHydraulicBoundaryDatabaseObserver()
-        {
-            hydraulicBoundaryDatabaseObserver.Observable = assessmentSection != null ? assessmentSection.HydraulicBoundaryDatabase : null;
-        }
-
         public object Selection
         {
             get
@@ -110,9 +105,9 @@
             base.Dispose(disposing);
         }
 
-        private void RefreshDataGridView()
+        private void SetHydraulicBoundaryDatabaseObserver()
         {
-            dataGridViewControl.RefreshDataGridView();
+            hydraulicBoundaryDatabaseObserver.Observable = assessmentSection != null ? assessmentSection.HydraulicBoundaryDatabase : null;
         }
 
         private void InitializeDataGridView()
@@ -138,10 +133,9 @@
             updatingDataSource = true;
             dataGridViewControl.SetDataSource(assessmentSection != null && assessmentSection.HydraulicBoundaryDatabase != null
                                                   ? assessmentSection.HydraulicBoundaryDatabase.Locations.Select(
-                                                  hl => new DesignWaterLevelLocationContextRow(
-                                                      new DesignWaterLevelLocationContext(assessmentSection.HydraulicBoundaryDatabase, hl))).ToArray()
+                                                      hl => new DesignWaterLevelLocationContextRow(
+                                                                new DesignWaterLevelLocationContext(assessmentSection.HydraulicBoundaryDatabase, hl))).ToArray()
                                                   : null);
-            RefreshDataGridView();
             updatingDataSource = false;
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Commands/CalculateDesignWaterLevelCommandHandlerTest.cs
===================================================================
diff -u -r6f741425dc85f3d9d868d76002a92aa9bd3cb6cb -rd3c64e3a7d673dc14562864a12b475db9f4c27ff
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Commands/CalculateDesignWaterLevelCommandHandlerTest.cs	(.../CalculateDesignWaterLevelCommandHandlerTest.cs)	(revision 6f741425dc85f3d9d868d76002a92aa9bd3cb6cb)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Commands/CalculateDesignWaterLevelCommandHandlerTest.cs	(.../CalculateDesignWaterLevelCommandHandlerTest.cs)	(revision d3c64e3a7d673dc14562864a12b475db9f4c27ff)
@@ -41,9 +41,15 @@
     [TestFixture]
     public class CalculateDesignWaterLevelCommandHandlerTest : NUnitFormTest
     {
-        private readonly MockRepository mockRepository = new MockRepository();
+        private MockRepository mockRepository;
         private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
 
+        [SetUp]
+        public void SetUp()
+        {
+            mockRepository = new MockRepository();
+        }
+
         [Test]
         public void Constructor_NullMainWindow_ThrowsArgumentNullException()
         {