Index: Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindowLogAppender.cs
===================================================================
diff -u -r9063c3c60f936760953c52185b72f0cb2dce9bf8 -r1d33f6502f5ef2d4775c0afb39359e8108acd7d2
--- Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindowLogAppender.cs	(.../MessageWindowLogAppender.cs)	(revision 9063c3c60f936760953c52185b72f0cb2dce9bf8)
+++ Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindowLogAppender.cs	(.../MessageWindowLogAppender.cs)	(revision 1d33f6502f5ef2d4775c0afb39359e8108acd7d2)
@@ -116,8 +116,8 @@
             var stringFormat = loggingEvent.MessageObject as SystemStringFormat;
             if (stringFormat != null)
             {
-                string format = TypeUtils.GetField<string>(stringFormat, "m_format");
-                object[] args = TypeUtils.GetField<object[]>(stringFormat, "m_args");
+                var format = TypeUtils.GetField<string>(stringFormat, "m_format");
+                var args = TypeUtils.GetField<object[]>(stringFormat, "m_args");
                 message = GetLocalizedMessage(format, args);
             }
 
Index: Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataCollectionTreeNodeInfoTest.cs
===================================================================
diff -u -rf2f7d22ee59276f5df1f83fd409899bd895ea163 -r1d33f6502f5ef2d4775c0afb39359e8108acd7d2
--- Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataCollectionTreeNodeInfoTest.cs	(.../ChartDataCollectionTreeNodeInfoTest.cs)	(revision f2f7d22ee59276f5df1f83fd409899bd895ea163)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataCollectionTreeNodeInfoTest.cs	(.../ChartDataCollectionTreeNodeInfoTest.cs)	(revision 1d33f6502f5ef2d4775c0afb39359e8108acd7d2)
@@ -47,8 +47,8 @@
         {
             chartLegendView = new ChartLegendView();
 
-            TreeViewControl treeViewControl = TypeUtils.GetField<TreeViewControl>(chartLegendView, "treeViewControl");
-            Dictionary<Type, TreeNodeInfo> treeNodeInfoLookup = TypeUtils.GetField<Dictionary<Type, TreeNodeInfo>>(treeViewControl, "tagTypeTreeNodeInfoLookup");
+            var treeViewControl = TypeUtils.GetField<TreeViewControl>(chartLegendView, "treeViewControl");
+            var treeNodeInfoLookup = TypeUtils.GetField<Dictionary<Type, TreeNodeInfo>>(treeViewControl, "tagTypeTreeNodeInfoLookup");
 
             info = treeNodeInfoLookup[typeof(ChartDataCollection)];
         }
Index: Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataContextTreeNodeInfoTest.cs
===================================================================
diff -u -rf2f7d22ee59276f5df1f83fd409899bd895ea163 -r1d33f6502f5ef2d4775c0afb39359e8108acd7d2
--- Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataContextTreeNodeInfoTest.cs	(.../ChartDataContextTreeNodeInfoTest.cs)	(revision f2f7d22ee59276f5df1f83fd409899bd895ea163)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataContextTreeNodeInfoTest.cs	(.../ChartDataContextTreeNodeInfoTest.cs)	(revision 1d33f6502f5ef2d4775c0afb39359e8108acd7d2)
@@ -104,8 +104,8 @@
         {
             chartLegendView = new ChartLegendView();
 
-            TreeViewControl treeViewControl = TypeUtils.GetField<TreeViewControl>(chartLegendView, "treeViewControl");
-            Dictionary<Type, TreeNodeInfo> treeNodeInfoLookup = TypeUtils.GetField<Dictionary<Type, TreeNodeInfo>>(treeViewControl, "tagTypeTreeNodeInfoLookup");
+            var treeViewControl = TypeUtils.GetField<TreeViewControl>(chartLegendView, "treeViewControl");
+            var treeNodeInfoLookup = TypeUtils.GetField<Dictionary<Type, TreeNodeInfo>>(treeViewControl, "tagTypeTreeNodeInfoLookup");
 
             info = treeNodeInfoLookup[typeof(ChartDataContext)];
         }
Index: Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartLegendViewTest.cs
===================================================================
diff -u -r848c3a050bda5fb0dd74232deb7f1d5eba8ecbf6 -r1d33f6502f5ef2d4775c0afb39359e8108acd7d2
--- Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartLegendViewTest.cs	(.../ChartLegendViewTest.cs)	(revision 848c3a050bda5fb0dd74232deb7f1d5eba8ecbf6)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartLegendViewTest.cs	(.../ChartLegendViewTest.cs)	(revision 1d33f6502f5ef2d4775c0afb39359e8108acd7d2)
@@ -114,8 +114,8 @@
                 Data = rootCollection
             })
             {
-                TreeViewControl treeViewControl = TypeUtils.GetField<TreeViewControl>(chartLegendView, "treeViewControl");
-                Dictionary<Type, TreeNodeInfo> treeNodeInfoLookup = TypeUtils.GetField<Dictionary<Type, TreeNodeInfo>>(treeViewControl, "tagTypeTreeNodeInfoLookup");
+                var treeViewControl = TypeUtils.GetField<TreeViewControl>(chartLegendView, "treeViewControl");
+                var treeNodeInfoLookup = TypeUtils.GetField<Dictionary<Type, TreeNodeInfo>>(treeViewControl, "tagTypeTreeNodeInfoLookup");
                 var info = treeNodeInfoLookup[typeof(ChartDataCollection)];
 
                 var context = new ChartDataContext(chartLineData, rootCollection);
Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs
===================================================================
diff -u -r11eb517ba7a480b4a415855798a7fadefc0cfe54 -r1d33f6502f5ef2d4775c0afb39359e8108acd7d2
--- Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs	(.../MapDataCollectionTreeNodeInfoTest.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
+++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs	(.../MapDataCollectionTreeNodeInfoTest.cs)	(revision 1d33f6502f5ef2d4775c0afb39359e8108acd7d2)
@@ -64,7 +64,7 @@
             mapLegendView = new MapLegendView(contextMenuBuilderProvider);
 
             var treeViewControl = TypeUtils.GetField<TreeViewControl>(mapLegendView, "treeViewControl");
-            Dictionary<Type, TreeNodeInfo> treeNodeInfoLookup = TypeUtils.GetField<Dictionary<Type, TreeNodeInfo>>(treeViewControl, "tagTypeTreeNodeInfoLookup");
+            var treeNodeInfoLookup = TypeUtils.GetField<Dictionary<Type, TreeNodeInfo>>(treeViewControl, "tagTypeTreeNodeInfoLookup");
 
             info = treeNodeInfoLookup[typeof(MapDataCollection)];
         }
Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLineDataTreeNodeInfoTest.cs
===================================================================
diff -u -r11eb517ba7a480b4a415855798a7fadefc0cfe54 -r1d33f6502f5ef2d4775c0afb39359e8108acd7d2
--- Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLineDataTreeNodeInfoTest.cs	(.../MapLineDataTreeNodeInfoTest.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
+++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLineDataTreeNodeInfoTest.cs	(.../MapLineDataTreeNodeInfoTest.cs)	(revision 1d33f6502f5ef2d4775c0afb39359e8108acd7d2)
@@ -59,7 +59,7 @@
             mapLegendView = new MapLegendView(contextMenuBuilderProvider);
 
             var treeViewControl = TypeUtils.GetField<TreeViewControl>(mapLegendView, "treeViewControl");
-            Dictionary<Type, TreeNodeInfo> treeNodeInfoLookup = TypeUtils.GetField<Dictionary<Type, TreeNodeInfo>>(treeViewControl, "tagTypeTreeNodeInfoLookup");
+            var treeNodeInfoLookup = TypeUtils.GetField<Dictionary<Type, TreeNodeInfo>>(treeViewControl, "tagTypeTreeNodeInfoLookup");
 
             info = treeNodeInfoLookup[typeof(MapLineData)];
         }
Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapPointDataTreeNodeInfoTest.cs
===================================================================
diff -u -r11eb517ba7a480b4a415855798a7fadefc0cfe54 -r1d33f6502f5ef2d4775c0afb39359e8108acd7d2
--- Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapPointDataTreeNodeInfoTest.cs	(.../MapPointDataTreeNodeInfoTest.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
+++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapPointDataTreeNodeInfoTest.cs	(.../MapPointDataTreeNodeInfoTest.cs)	(revision 1d33f6502f5ef2d4775c0afb39359e8108acd7d2)
@@ -59,7 +59,7 @@
             mapLegendView = new MapLegendView(contextMenuBuilderProvider);
 
             var treeViewControl = TypeUtils.GetField<TreeViewControl>(mapLegendView, "treeViewControl");
-            Dictionary<Type, TreeNodeInfo> treeNodeInfoLookup = TypeUtils.GetField<Dictionary<Type, TreeNodeInfo>>(treeViewControl, "tagTypeTreeNodeInfoLookup");
+            var treeNodeInfoLookup = TypeUtils.GetField<Dictionary<Type, TreeNodeInfo>>(treeViewControl, "tagTypeTreeNodeInfoLookup");
 
             info = treeNodeInfoLookup[typeof(MapPointData)];
         }
Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapPolygonDataTreeNodeInfoTest.cs
===================================================================
diff -u -r11eb517ba7a480b4a415855798a7fadefc0cfe54 -r1d33f6502f5ef2d4775c0afb39359e8108acd7d2
--- Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapPolygonDataTreeNodeInfoTest.cs	(.../MapPolygonDataTreeNodeInfoTest.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
+++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapPolygonDataTreeNodeInfoTest.cs	(.../MapPolygonDataTreeNodeInfoTest.cs)	(revision 1d33f6502f5ef2d4775c0afb39359e8108acd7d2)
@@ -59,7 +59,7 @@
             mapLegendView = new MapLegendView(contextMenuBuilderProvider);
 
             var treeViewControl = TypeUtils.GetField<TreeViewControl>(mapLegendView, "treeViewControl");
-            Dictionary<Type, TreeNodeInfo> treeNodeInfoLookup = TypeUtils.GetField<Dictionary<Type, TreeNodeInfo>>(treeViewControl, "tagTypeTreeNodeInfoLookup");
+            var treeNodeInfoLookup = TypeUtils.GetField<Dictionary<Type, TreeNodeInfo>>(treeViewControl, "tagTypeTreeNodeInfoLookup");
 
             info = treeNodeInfoLookup[typeof(MapPolygonData)];
         }
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapControlTest.cs
===================================================================
diff -u -r7fc071aa21ada037052184432c734ce79adf5c8c -r1d33f6502f5ef2d4775c0afb39359e8108acd7d2
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapControlTest.cs	(.../RingtoetsMapControlTest.cs)	(revision 7fc071aa21ada037052184432c734ce79adf5c8c)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapControlTest.cs	(.../RingtoetsMapControlTest.cs)	(revision 1d33f6502f5ef2d4775c0afb39359e8108acd7d2)
@@ -81,9 +81,10 @@
         {
             // Setup
             var ringtoetsMapControl = new RingtoetsMapControl();
+            var backgroundData = new BackgroundData(new TestBackgroundDataConfiguration());
 
             // Call
-            TestDelegate test = () => ringtoetsMapControl.SetAllData(null, new BackgroundData(new TestBackgroundDataConfiguration()));
+            TestDelegate test = () => { ringtoetsMapControl.SetAllData(null, backgroundData); };
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
@@ -95,9 +96,10 @@
         {
             // Setup
             var ringtoetsMapControl = new RingtoetsMapControl();
+            var mapDataCollection = new MapDataCollection("Collection");
 
             // Call
-            TestDelegate test = () => ringtoetsMapControl.SetAllData(new MapDataCollection("Collection"), null);
+            TestDelegate test = () => { ringtoetsMapControl.SetAllData(mapDataCollection, null); };
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
@@ -179,7 +181,9 @@
             using (new UseCustomTileSourceFactoryConfig(tileSourceFactory))
             {
                 var ringtoetsMapControl = new RingtoetsMapControl();
-                ringtoetsMapControl.SetAllData(new MapDataCollection("Collection"), originalBackgroundData);
+                var mapDataCollection = new MapDataCollection("Collection");
+
+                ringtoetsMapControl.SetAllData(mapDataCollection, originalBackgroundData);
                 ringtoetsMapControl.MapControl.BackgroundMapData.Attach(observer);
 
                 ImageBasedMapData oldMapData = ringtoetsMapControl.MapControl.BackgroundMapData;
@@ -210,12 +214,13 @@
 
             WmtsMapData mapData = WmtsMapDataTestHelper.CreateDefaultPdokMapData();
             BackgroundData backgroundData = BackgroundDataConverter.ConvertTo(mapData);
+            var mapDataCollection = new MapDataCollection("Collection");
 
             using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(mapData))
             {
                 var ringtoetsMapControl = new RingtoetsMapControl();
-                ringtoetsMapControl.SetAllData(new MapDataCollection("Collection"), backgroundData);
+                ringtoetsMapControl.SetAllData(mapDataCollection, backgroundData);
                 ringtoetsMapControl.MapControl.BackgroundMapData.Attach(observer);
 
                 ImageBasedMapData oldBackgroundMapData = ringtoetsMapControl.MapControl.BackgroundMapData;
@@ -242,12 +247,13 @@
 
             WmtsMapData mapData = WmtsMapDataTestHelper.CreateDefaultPdokMapData();
             BackgroundData backgroundData = BackgroundDataConverter.ConvertTo(mapData);
+            var mapDataCollection = new MapDataCollection("Collection");
 
             using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(mapData))
             {
                 var ringtoetsMapControl = new RingtoetsMapControl();
-                ringtoetsMapControl.SetAllData(new MapDataCollection("Collection"), backgroundData);
+                ringtoetsMapControl.SetAllData(mapDataCollection, backgroundData);
                 ringtoetsMapControl.MapControl.BackgroundMapData.Attach(observer);
 
                 ImageBasedMapData oldBackgroundMapData = ringtoetsMapControl.MapControl.BackgroundMapData;
@@ -278,12 +284,13 @@
 
             var mapData = new WellKnownTileSourceMapData(WellKnownTileSource.BingAerial);
             BackgroundData backgroundData = BackgroundDataConverter.ConvertTo(mapData);
+            var mapDataCollection = new MapDataCollection("Collection");
 
             using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(mapData))
             {
                 var ringtoetsMapControl = new RingtoetsMapControl();
-                ringtoetsMapControl.SetAllData(new MapDataCollection("Collection"), backgroundData);
+                ringtoetsMapControl.SetAllData(mapDataCollection, backgroundData);
                 ringtoetsMapControl.MapControl.BackgroundMapData.Attach(observer);
 
                 ImageBasedMapData oldBackgroundMapData = ringtoetsMapControl.MapControl.BackgroundMapData;