Index: Core/Components/test/Core.Components.DotSpatial.Forms.Test/MapControlTest.cs
===================================================================
diff -u -r6db74b3e83d3170ca84dac650ba8bbf383409d30 -rc09cca89155759682fcb5f11e1c4bf35051795b0
--- Core/Components/test/Core.Components.DotSpatial.Forms.Test/MapControlTest.cs	(.../MapControlTest.cs)	(revision 6db74b3e83d3170ca84dac650ba8bbf383409d30)
+++ Core/Components/test/Core.Components.DotSpatial.Forms.Test/MapControlTest.cs	(.../MapControlTest.cs)	(revision c09cca89155759682fcb5f11e1c4bf35051795b0)
@@ -113,7 +113,6 @@
         }
 
         [Test]
-        [RequiresSTA]
         public void GivenMapControlWithNestedMapData_WhenNestedMapDataChanged_MapControlUpdated()
         {
             // Given
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs
===================================================================
diff -u -r3197253f8e31d4a305b10a1cdaaa345d7fdd49de -rc09cca89155759682fcb5f11e1c4bf35051795b0
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs	(.../ClosingStructuresFailureMechanismView.cs)	(revision 3197253f8e31d4a305b10a1cdaaa345d7fdd49de)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs	(.../ClosingStructuresFailureMechanismView.cs)	(revision c09cca89155759682fcb5f11e1c4bf35051795b0)
@@ -87,6 +87,7 @@
             mapControl.Data.Add(structuresMapData);
 
             mapControl.Data.Name = ClosingStructuresDataResources.ClosingStructuresFailureMechanism_DisplayName;
+            mapControl.Data.NotifyObservers();
         }
 
         public object Data
@@ -171,8 +172,6 @@
                                       RingtoetsMapDataFeaturesFactory.CreateForeshoreProfilesFeatures(foreshoreProfiles));
             UpdateFeatureBasedMapData(structuresMapData,
                                       RingtoetsMapDataFeaturesFactory.CreateStructuresFeatures(structures));
-
-            mapControl.Data.NotifyObservers();
         }
 
         private static void UpdateFeatureBasedMapData(FeatureBasedMapData mapData, MapFeature[] features)
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.cs
===================================================================
diff -u -rf718135c08ce7b90cc0eaf40bfb83c9af48a1776 -rc09cca89155759682fcb5f11e1c4bf35051795b0
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.cs	(.../GrassCoverErosionInwardsFailureMechanismView.cs)	(revision f718135c08ce7b90cc0eaf40bfb83c9af48a1776)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.cs	(.../GrassCoverErosionInwardsFailureMechanismView.cs)	(revision c09cca89155759682fcb5f11e1c4bf35051795b0)
@@ -86,6 +86,7 @@
             mapControl.Data.Add(foreshoreProfilesMapData);
 
             mapControl.Data.Name = GrassCoverErosionInwardsDataResources.GrassCoverErosionInwardsFailureMechanism_DisplayName;
+            mapControl.Data.NotifyObservers();
         }
 
         public object Data
@@ -166,8 +167,6 @@
                                       RingtoetsMapDataFeaturesFactory.CreateDikeProfilesFeatures(dikeProfiles));
             UpdateFeatureBasedMapData(foreshoreProfilesMapData,
                                       RingtoetsMapDataFeaturesFactory.CreateForeshoreProfilesFeatures(dikeProfiles.Select(dp => dp.ForeshoreProfile)));
-
-            mapControl.Data.NotifyObservers();
         }
 
         private static void UpdateFeatureBasedMapData(FeatureBasedMapData mapData, MapFeature[] features)
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.cs
===================================================================
diff -u -rf718135c08ce7b90cc0eaf40bfb83c9af48a1776 -rc09cca89155759682fcb5f11e1c4bf35051795b0
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.cs	(.../GrassCoverErosionInwardsFailureMechanismView.cs)	(revision f718135c08ce7b90cc0eaf40bfb83c9af48a1776)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.cs	(.../GrassCoverErosionInwardsFailureMechanismView.cs)	(revision c09cca89155759682fcb5f11e1c4bf35051795b0)
@@ -82,6 +82,7 @@
             mapControl.Data.Add(foreshoreProfilesMapData);
 
             mapControl.Data.Name = GrassCoverErosionOutwardsDataResources.GrassCoverErosionOutwardsFailureMechanism_DisplayName;
+            mapControl.Data.NotifyObservers();
         }
 
         public object Data
@@ -160,8 +161,6 @@
                                       RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeatures(hydraulicBoundaryDatabase));
             UpdateFeatureBasedMapData(foreshoreProfilesMapData,
                                       RingtoetsMapDataFeaturesFactory.CreateForeshoreProfilesFeatures(foreshoreProfiles));
-
-            mapControl.Data.NotifyObservers();
         }
 
         private static void UpdateFeatureBasedMapData(FeatureBasedMapData mapData, MapFeature[] features)
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.cs
===================================================================
diff -u -r3197253f8e31d4a305b10a1cdaaa345d7fdd49de -rc09cca89155759682fcb5f11e1c4bf35051795b0
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.cs	(.../HeightStructuresFailureMechanismView.cs)	(revision 3197253f8e31d4a305b10a1cdaaa345d7fdd49de)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.cs	(.../HeightStructuresFailureMechanismView.cs)	(revision c09cca89155759682fcb5f11e1c4bf35051795b0)
@@ -87,6 +87,7 @@
             mapControl.Data.Add(structuresMapData);
 
             mapControl.Data.Name = HeightStructuresDataResources.HeightStructuresFailureMechanism_DisplayName;
+            mapControl.Data.NotifyObservers();
         }
 
         public object Data
@@ -171,8 +172,6 @@
                                       RingtoetsMapDataFeaturesFactory.CreateForeshoreProfilesFeatures(foreshoreProfiles));
             UpdateFeatureBasedMapData(structuresMapData,
                                       RingtoetsMapDataFeaturesFactory.CreateStructuresFeatures(structures));
-
-            mapControl.Data.NotifyObservers();
         }
 
         private static void UpdateFeatureBasedMapData(FeatureBasedMapData mapData, MapFeature[] features)
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs
===================================================================
diff -u -r71144e484518b806157fb6613779981342542462 -rc09cca89155759682fcb5f11e1c4bf35051795b0
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs	(.../AssessmentSectionView.cs)	(revision 71144e484518b806157fb6613779981342542462)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs	(.../AssessmentSectionView.cs)	(revision c09cca89155759682fcb5f11e1c4bf35051795b0)
@@ -67,8 +67,9 @@
 
             mapControl.Data.Add(referenceLineMapData);
             mapControl.Data.Add(hydraulicBoundaryDatabaseMapData);
-
             mapControl.Data.Name = Resources.AssessmentSectionMap_DisplayName;
+
+            mapControl.Data.NotifyObservers();
         }
 
         public object Data
@@ -122,8 +123,6 @@
                                       RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeatures(data != null
                                                                                                                   ? data.HydraulicBoundaryDatabase
                                                                                                                   : null));
-
-            mapControl.Data.NotifyObservers();
         }
 
         private static void UpdateFeatureBasedMapData(FeatureBasedMapData mapData, MapFeature[] features)
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs
===================================================================
diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -rc09cca89155759682fcb5f11e1c4bf35051795b0
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs	(.../AssessmentSectionViewTest.cs)	(revision 11f0867b39150ae5fac83dc178a89fee46d27611)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs	(.../AssessmentSectionViewTest.cs)	(revision c09cca89155759682fcb5f11e1c4bf35051795b0)
@@ -109,10 +109,11 @@
         public void Data_SetToNull_MapDataCleared()
         {
             // Setup
-            using (var view = new AssessmentSectionView())
+            using (var view = new AssessmentSectionView
             {
-                view.Data = new TestAssessmentSection();
-
+                Data = new TestAssessmentSection()
+            })
+            {
                 // Precondition
                 Assert.AreEqual(2, view.Map.Data.Collection.Count());
 
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs
===================================================================
diff -u -r2aeb951ddc6e2137897569a2de4c55c9fb7e2420 -rc09cca89155759682fcb5f11e1c4bf35051795b0
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs	(.../PipingFailureMechanismView.cs)	(revision 2aeb951ddc6e2137897569a2de4c55c9fb7e2420)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs	(.../PipingFailureMechanismView.cs)	(revision c09cca89155759682fcb5f11e1c4bf35051795b0)
@@ -88,6 +88,7 @@
             mapControl.Data.Add(hydraulicBoundaryDatabaseMapData);
 
             mapControl.Data.Name = PipingDataResources.PipingFailureMechanism_DisplayName;
+            mapControl.Data.NotifyObservers();
         }
 
         public object Data
@@ -173,8 +174,6 @@
                                       RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionEndPointFeatures(failureMechanismSections));
             UpdateFeatureBasedMapData(hydraulicBoundaryDatabaseMapData,
                                       RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeatures(hydraulicBoundaryDatabase));
-
-            mapControl.Data.NotifyObservers();
         }
 
         private static void UpdateFeatureBasedMapData(FeatureBasedMapData mapData, MapFeature[] features)
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.cs
===================================================================
diff -u -r3197253f8e31d4a305b10a1cdaaa345d7fdd49de -rc09cca89155759682fcb5f11e1c4bf35051795b0
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.cs	(.../StabilityPointStructuresFailureMechanismView.cs)	(revision 3197253f8e31d4a305b10a1cdaaa345d7fdd49de)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.cs	(.../StabilityPointStructuresFailureMechanismView.cs)	(revision c09cca89155759682fcb5f11e1c4bf35051795b0)
@@ -87,6 +87,7 @@
             mapControl.Data.Add(structuresMapData);
 
             mapControl.Data.Name = StabilityPointStructuresDataResources.StabilityPointStructuresFailureMechanism_DisplayName;
+            mapControl.Data.NotifyObservers();
         }
 
         public object Data
@@ -171,8 +172,6 @@
                                       RingtoetsMapDataFeaturesFactory.CreateForeshoreProfilesFeatures(foreshoreProfiles));
             UpdateFeatureBasedMapData(structuresMapData,
                                       RingtoetsMapDataFeaturesFactory.CreateStructuresFeatures(structures));
-
-            mapControl.Data.NotifyObservers();
         }
 
         private static void UpdateFeatureBasedMapData(FeatureBasedMapData mapData, MapFeature[] features)
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverFailureMechanismView.cs
===================================================================
diff -u -rf718135c08ce7b90cc0eaf40bfb83c9af48a1776 -rc09cca89155759682fcb5f11e1c4bf35051795b0
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverFailureMechanismView.cs	(.../StabilityStoneCoverFailureMechanismView.cs)	(revision f718135c08ce7b90cc0eaf40bfb83c9af48a1776)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverFailureMechanismView.cs	(.../StabilityStoneCoverFailureMechanismView.cs)	(revision c09cca89155759682fcb5f11e1c4bf35051795b0)
@@ -82,6 +82,7 @@
             mapControl.Data.Add(foreshoreProfilesMapData);
 
             mapControl.Data.Name = StabilityStoneCoverDataResources.StabilityStoneCoverFailureMechanism_DisplayName;
+            mapControl.Data.NotifyObservers();
         }
 
         public object Data
@@ -160,8 +161,6 @@
                                       RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeatures(hydraulicBoundaryDatabase));
             UpdateFeatureBasedMapData(foreshoreProfilesMapData,
                                       RingtoetsMapDataFeaturesFactory.CreateForeshoreProfilesFeatures(foreshoreProfiles));
-
-            mapControl.Data.NotifyObservers();
         }
 
         private static void UpdateFeatureBasedMapData(FeatureBasedMapData mapData, MapFeature[] features)
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.cs
===================================================================
diff -u -rf718135c08ce7b90cc0eaf40bfb83c9af48a1776 -rc09cca89155759682fcb5f11e1c4bf35051795b0
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.cs	(.../WaveImpactAsphaltCoverFailureMechanismView.cs)	(revision f718135c08ce7b90cc0eaf40bfb83c9af48a1776)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.cs	(.../WaveImpactAsphaltCoverFailureMechanismView.cs)	(revision c09cca89155759682fcb5f11e1c4bf35051795b0)
@@ -82,6 +82,7 @@
             mapControl.Data.Add(foreshoreProfilesMapData);
 
             mapControl.Data.Name = WaveImpactAsphaltCoverDataResources.WaveImpactAsphaltCoverFailureMechanism_DisplayName;
+            mapControl.Data.NotifyObservers();
         }
 
         public object Data
@@ -160,8 +161,6 @@
                                       RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeatures(hydraulicBoundaryDatabase));
             UpdateFeatureBasedMapData(foreshoreProfilesMapData,
                                       RingtoetsMapDataFeaturesFactory.CreateForeshoreProfilesFeatures(foreshoreProfiles));
-
-            mapControl.Data.NotifyObservers();
         }
 
         private static void UpdateFeatureBasedMapData(FeatureBasedMapData mapData, MapFeature[] features)