Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/ObservableTestAssessmentSectionStubTest.cs
===================================================================
diff -u -rb696329ea2268bfb69b2f7f6956774538dd5a2f3 -r5f7fda459bb6f4972d47c8432088d481c50e2d09
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/ObservableTestAssessmentSectionStubTest.cs	(.../ObservableTestAssessmentSectionStubTest.cs)	(revision b696329ea2268bfb69b2f7f6956774538dd5a2f3)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/ObservableTestAssessmentSectionStubTest.cs	(.../ObservableTestAssessmentSectionStubTest.cs)	(revision 5f7fda459bb6f4972d47c8432088d481c50e2d09)
@@ -142,7 +142,7 @@
         }
 
         [Test]
-        public void SetHydraulicBoundaryLocations_LocationsAlreadyAdded_ClearOldLocations()
+        public void SetHydraulicBoundaryLocations_LocationsAlreadyAdded_ClearOldLocationsAndCalculations()
         {
             // Setup
             var assessmentSection = new ObservableTestAssessmentSectionStub();
@@ -169,6 +169,14 @@
             foreach (TestHydraulicBoundaryLocation location in originalLocations)
             {
                 CollectionAssert.DoesNotContain(assessmentSection.HydraulicBoundaryDatabase.Locations, location);
+                CollectionAssert.DoesNotContain(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm.Select(calculation => calculation.HydraulicBoundaryLocation), location);
+                CollectionAssert.DoesNotContain(assessmentSection.WaterLevelCalculationsForSignalingNorm.Select(calculation => calculation.HydraulicBoundaryLocation), location);
+                CollectionAssert.DoesNotContain(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.Select(calculation => calculation.HydraulicBoundaryLocation), location);
+                CollectionAssert.DoesNotContain(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm.Select(calculation => calculation.HydraulicBoundaryLocation), location);
+                CollectionAssert.DoesNotContain(assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm.Select(calculation => calculation.HydraulicBoundaryLocation), location);
+                CollectionAssert.DoesNotContain(assessmentSection.WaveHeightCalculationsForSignalingNorm.Select(calculation => calculation.HydraulicBoundaryLocation), location);
+                CollectionAssert.DoesNotContain(assessmentSection.WaveHeightCalculationsForLowerLimitNorm.Select(calculation => calculation.HydraulicBoundaryLocation), location);
+                CollectionAssert.DoesNotContain(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm.Select(calculation => calculation.HydraulicBoundaryLocation), location);
             }
         }
 
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/ObservableTestAssessmentSectionStub.cs
===================================================================
diff -u -rb696329ea2268bfb69b2f7f6956774538dd5a2f3 -r5f7fda459bb6f4972d47c8432088d481c50e2d09
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/ObservableTestAssessmentSectionStub.cs	(.../ObservableTestAssessmentSectionStub.cs)	(revision b696329ea2268bfb69b2f7f6956774538dd5a2f3)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/ObservableTestAssessmentSectionStub.cs	(.../ObservableTestAssessmentSectionStub.cs)	(revision 5f7fda459bb6f4972d47c8432088d481c50e2d09)
@@ -157,6 +157,14 @@
         public void SetHydraulicBoundaryLocationCalculations(IEnumerable<HydraulicBoundaryLocation> hydraulicBoundaryLocations, bool setCalculationOutput = false)
         {
             HydraulicBoundaryDatabase.Locations.Clear();
+            waterLevelCalculationsForFactorizedSignalingNorm.Clear();
+            waterLevelCalculationsForSignalingNorm.Clear();
+            waterLevelCalculationsForLowerLimitNorm.Clear();
+            waterLevelCalculationsForFactorizedLowerLimitNorm.Clear();
+            waveHeightCalculationsForFactorizedSignalingNorm.Clear();
+            waveHeightCalculationsForSignalingNorm.Clear();
+            waveHeightCalculationsForLowerLimitNorm.Clear();
+            waveHeightCalculationsForFactorizedLowerLimitNorm.Clear();
 
             foreach (HydraulicBoundaryLocation hydraulicBoundaryLocation in hydraulicBoundaryLocations)
             {