Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/BackgroundMapDataContextTreeNodeInfoTest.cs
===================================================================
diff -u -ra489d29ed1bf6bf0521644b809320b4b6407ec56 -r7f4d776a1f55062d6147ad6f36cd66fe896d2e6e
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/BackgroundMapDataContextTreeNodeInfoTest.cs	(.../BackgroundMapDataContextTreeNodeInfoTest.cs)	(revision a489d29ed1bf6bf0521644b809320b4b6407ec56)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/BackgroundMapDataContextTreeNodeInfoTest.cs	(.../BackgroundMapDataContextTreeNodeInfoTest.cs)	(revision 7f4d776a1f55062d6147ad6f36cd66fe896d2e6e)
@@ -30,6 +30,7 @@
 using Core.Common.Gui.Forms.MainWindow;
 using Core.Common.Gui.TestUtil.ContextMenu;
 using Core.Common.TestUtil;
+using Core.Components.Gis;
 using Core.Components.Gis.Data;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
@@ -83,7 +84,8 @@
         {
             // Setup
             WmtsMapData mapData = WmtsMapData.CreateUnconnectedMapData();
-            var context = new BackgroundMapDataContext(mapData);
+            var container = new BackgroundMapDataContainer();
+            var context = new BackgroundMapDataContext(mapData, container);
 
             using (var plugin = new RingtoetsPlugin())
             {
@@ -102,7 +104,8 @@
         {
             // Setup
             WmtsMapData mapData = WmtsMapData.CreateUnconnectedMapData();
-            var context = new BackgroundMapDataContext(mapData);
+            var container = new BackgroundMapDataContainer();
+            var context = new BackgroundMapDataContext(mapData, container);
 
             using (var plugin = new RingtoetsPlugin())
             {
@@ -120,7 +123,8 @@
         public void ForeColor_ConnectedMapData_ReturnControlText()
         {
             WmtsMapData mapData = WmtsMapData.CreateDefaultPdokMapData();
-            var context = new BackgroundMapDataContext(mapData);
+            var container = new BackgroundMapDataContainer();
+            var context = new BackgroundMapDataContext(mapData, container);
 
             using (var plugin = new RingtoetsPlugin())
             {
@@ -138,7 +142,8 @@
         public void ForeColor_UnconnectedMapData_ReturnControlText()
         {
             WmtsMapData mapData = WmtsMapData.CreateUnconnectedMapData();
-            var context = new BackgroundMapDataContext(mapData);
+            var container = new BackgroundMapDataContainer();
+            var context = new BackgroundMapDataContext(mapData, container);
 
             using (var plugin = new RingtoetsPlugin())
             {
@@ -193,7 +198,8 @@
             // Setup
             var mockRepository = new MockRepository();
             WmtsMapData mapData = WmtsMapData.CreateUnconnectedMapData();
-            var context = new BackgroundMapDataContext(mapData);
+            var container = new BackgroundMapDataContainer();
+            var context = new BackgroundMapDataContext(mapData, container);
 
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             using (var treeViewControl = new TreeViewControl())
@@ -236,7 +242,8 @@
             backgroundMapDataObserver.Expect(o => o.UpdateObserver());
 
             WmtsMapData mapData = WmtsMapData.CreateUnconnectedMapData();
-            var backgroundMapDataContext = new BackgroundMapDataContext(mapData);
+            var container = new BackgroundMapDataContainer();
+            var backgroundMapDataContext = new BackgroundMapDataContext(mapData, container);
 
             using (var treeViewControl = new TreeViewControl())
             using (var plugin = new RingtoetsPlugin())
@@ -287,7 +294,8 @@
             var backgroundMapDataObserver = mockRepository.StrictMock<IObserver>();
 
             WmtsMapData mapData = WmtsMapData.CreateUnconnectedMapData();
-            var backgroundMapDataContext = new BackgroundMapDataContext(mapData);
+            var container = new BackgroundMapDataContainer();
+            var backgroundMapDataContext = new BackgroundMapDataContext(mapData, container);
 
             using (var treeViewControl = new TreeViewControl())
             using (var plugin = new RingtoetsPlugin())
@@ -341,7 +349,8 @@
             backgroundMapDataObserver.Expect(o => o.UpdateObserver());
 
             WmtsMapData mapData = WmtsMapData.CreateUnconnectedMapData();
-            var backgroundMapDataContext = new BackgroundMapDataContext(mapData);
+            var container = new BackgroundMapDataContainer();
+            var backgroundMapDataContext = new BackgroundMapDataContext(mapData, container);
 
             using (var treeViewControl = new TreeViewControl())
             using (var plugin = new RingtoetsPlugin())
@@ -394,7 +403,8 @@
             var backgroundMapDataObserver = mockRepository.StrictMock<IObserver>();
 
             WmtsMapData mapData = WmtsMapData.CreateUnconnectedMapData();
-            var backgroundMapDataContext = new BackgroundMapDataContext(mapData);
+            var container = new BackgroundMapDataContainer();
+            var backgroundMapDataContext = new BackgroundMapDataContext(mapData, container);
 
             using (var treeViewControl = new TreeViewControl())
             using (var plugin = new RingtoetsPlugin())