Index: Core/Common/test/Core.Common.Base.Test/Core.Common.Base.Test.csproj
===================================================================
diff -u -rdc06f24147cb5d1f94cec6f3705d07dc3142d175 -rdc301486d2fe82ff782a737de1656cb6d838affe
--- Core/Common/test/Core.Common.Base.Test/Core.Common.Base.Test.csproj	(.../Core.Common.Base.Test.csproj)	(revision dc06f24147cb5d1f94cec6f3705d07dc3142d175)
+++ Core/Common/test/Core.Common.Base.Test/Core.Common.Base.Test.csproj	(.../Core.Common.Base.Test.csproj)	(revision dc301486d2fe82ff782a737de1656cb6d838affe)
@@ -104,14 +104,8 @@
     <Compile Include="Plugin\ApplicationPluginTest.cs" />
     <Compile Include="Plugin\DataItemInfoTest.cs" />
     <Compile Include="ObservableListTest.cs" />
-    <Compile Include="Shell\Gui\ExpandableArrayConverterTest.cs" />
-    <Compile Include="Shell\Gui\MapLayerProviderHelperTest.cs" />
     <Compile Include="Data\ProjectTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Shell\Gui\Swf\ControlExtensionTest.cs" />
-    <Compile Include="TestObjects\Child.cs" />
-    <Compile Include="TestObjects\Parent.cs" />
-    <Compile Include="TestUtils\WindowsFormsTestHelperTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Application\Application.Ringtoets\Application.Ringtoets.csproj">
Fisheye: Tag dc301486d2fe82ff782a737de1656cb6d838affe refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Base.Test/Shell/Gui/ExpandableArrayConverterTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag dc301486d2fe82ff782a737de1656cb6d838affe refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Base.Test/Shell/Gui/MapLayerProviderHelperTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag dc301486d2fe82ff782a737de1656cb6d838affe refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Base.Test/Shell/Gui/Swf/ControlExtensionTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag dc301486d2fe82ff782a737de1656cb6d838affe refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Base.Test/TestObjects/Child.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag dc301486d2fe82ff782a737de1656cb6d838affe refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Base.Test/TestObjects/Parent.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag dc301486d2fe82ff782a737de1656cb6d838affe refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Base.Test/TestUtils/WindowsFormsTestHelperTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Gui.Swf.Test/ControlExtensionTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Gui.Swf.Test/ControlExtensionTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.Gui.Swf.Test/ControlExtensionTest.cs	(revision dc301486d2fe82ff782a737de1656cb6d838affe)
@@ -0,0 +1,56 @@
+using System.Linq;
+using System.Windows.Forms;
+using Core.Common.Controls.Swf;
+using NUnit.Framework;
+
+namespace Core.Common.Gui.Swf.Test
+{
+    [TestFixture]
+    public class ControlExtensionsTest
+    {
+        private Form form;
+        private Control userControl;
+
+        [Test]
+        public void GetAllControlsRecursiveReturnsCorrectList()
+        {
+            Assert.AreEqual(1, userControl.GetAllControlsRecursive<TextBox>().Count());
+            Assert.AreEqual(1, form.GetAllControlsRecursive<TextBox>().Count());
+            Assert.AreEqual(2, form.GetAllControlsRecursive().Count());
+            Assert.AreEqual(1, form.GetAllControlsRecursive<UserControl>().Count());
+            Assert.AreEqual(2, form.Controls.GetAllControlsRecursive().Count());
+        }
+
+        [Test]
+        public void GetFirstControlOfTypeReturnsControlAsExptected()
+        {
+            Assert.IsNotNull(form.GetFirstControlOfType<UserControl>());
+            Assert.IsNull(form.GetFirstControlOfType<CheckBox>());
+        }
+
+        #region Setup
+
+        [TestFixtureSetUp]
+        public void FixtureSetup() {}
+
+        [TestFixtureTearDown]
+        public void FixtureTearDown() {}
+
+        [SetUp]
+        public void TestTearDown()
+        {
+            form = new Form();
+            userControl = new UserControl();
+            userControl.Controls.Add(new TextBox());
+            form.Controls.Add(userControl);
+        }
+
+        [TearDown]
+        public void TestSetup()
+        {
+            form.Dispose();
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
Index: Core/Common/test/Core.Common.Gui.Swf.Test/Core.Common.Gui.Swf.Test.csproj
===================================================================
diff -u -rdc06f24147cb5d1f94cec6f3705d07dc3142d175 -rdc301486d2fe82ff782a737de1656cb6d838affe
--- Core/Common/test/Core.Common.Gui.Swf.Test/Core.Common.Gui.Swf.Test.csproj	(.../Core.Common.Gui.Swf.Test.csproj)	(revision dc06f24147cb5d1f94cec6f3705d07dc3142d175)
+++ Core/Common/test/Core.Common.Gui.Swf.Test/Core.Common.Gui.Swf.Test.csproj	(.../Core.Common.Gui.Swf.Test.csproj)	(revision dc301486d2fe82ff782a737de1656cb6d838affe)
@@ -43,18 +43,26 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ControlExtensionTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Core.Common.Controls.Swf\Core.Common.Controls.Swf.csproj">
+      <Project>{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}</Project>
+      <Name>Core.Common.Controls.Swf</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Core/Common/test/Core.Common.TestUtils/Core.Common.TestUtils.csproj
===================================================================
diff -u -r7a8e3d1718cb12c53c2b0573b056037ed02e9913 -rdc301486d2fe82ff782a737de1656cb6d838affe
--- Core/Common/test/Core.Common.TestUtils/Core.Common.TestUtils.csproj	(.../Core.Common.TestUtils.csproj)	(revision 7a8e3d1718cb12c53c2b0573b056037ed02e9913)
+++ Core/Common/test/Core.Common.TestUtils/Core.Common.TestUtils.csproj	(.../Core.Common.TestUtils.csproj)	(revision dc301486d2fe82ff782a737de1656cb6d838affe)
@@ -109,6 +109,7 @@
     <Compile Include="WindowsFormsTestHelper.Designer.cs">
       <DependentUpon>WindowsFormsTestHelper.cs</DependentUpon>
     </Compile>
+    <Compile Include="WindowsFormsTestHelperTest.cs" />
     <Compile Include="WpfTestHelper.xaml.cs">
       <DependentUpon>WpfTestHelper.xaml</DependentUpon>
     </Compile>
Index: Core/Common/test/Core.Common.TestUtils/WindowsFormsTestHelperTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.TestUtils/WindowsFormsTestHelperTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.TestUtils/WindowsFormsTestHelperTest.cs	(revision dc301486d2fe82ff782a737de1656cb6d838affe)
@@ -0,0 +1,135 @@
+using System;
+using System.Threading;
+using System.Windows.Forms;
+using NUnit.Framework;
+
+namespace Core.Common.TestUtils
+{
+    [TestFixture]
+    public class WindowsFormsTestHelperTest
+    {
+        [Test]
+        public void ShowActionIsRunForAFormUsingShow()
+        {
+            var form = new Form();
+            int callCount = 0;
+
+            WindowsFormsTestHelper.Show(form, delegate { callCount++; });
+
+            Assert.AreEqual(1, callCount);
+
+            WindowsFormsTestHelper.CloseAll();
+        }
+
+        [Test]
+        public void ShowActionIsRunForUserControl()
+        {
+            var uc = new UserControl();
+            int callCount = 0;
+
+            WindowsFormsTestHelper.Show(uc, delegate { callCount++; });
+
+            Assert.AreEqual(1, callCount);
+
+            WindowsFormsTestHelper.CloseAll();
+        }
+
+        [Test]
+        public void ShowActionIsRunForForm()
+        {
+            var form = new Form();
+            int callCount = 0;
+
+            WindowsFormsTestHelper.Show(form, delegate { callCount++; });
+
+            Assert.AreEqual(1, callCount);
+
+            WindowsFormsTestHelper.CloseAll();
+        }
+
+        [Test]
+        public void ExceptionsInActionLogsStackTraceCorrectlyCorrectly()
+        {
+            try
+            {
+                WindowsFormsTestHelper.Show(new Label(), MethodWithException);
+            }
+            catch (Exception e)
+            {
+                Assert.AreEqual(typeof(InvalidOperationException), e.GetType());
+                Assert.AreEqual("my message", e.Message);
+                Assert.IsTrue(e.StackTrace.Contains("MethodWithException"));
+            }
+
+            WindowsFormsTestHelper.CloseAll();
+        }
+
+        [Test]
+        public void UnhandledThreadExceptionsInActionLogsStackTraceCorrectlyCorrectly()
+        {
+            var thread = new Thread(MethodWithExceptionInSeparateThread);
+
+            try
+            {
+                WindowsFormsTestHelper.Show(new Label(),
+                                            delegate
+                                            {
+                                                thread.Start();
+                                                thread.Join();
+                                            });
+            }
+            catch (Exception e)
+            {
+                Assert.AreEqual(typeof(GuiTestHelper.UnhandledException), e.GetType());
+                Assert.IsTrue(e.Message.Contains("my message from thread"));
+                Assert.IsTrue(e.StackTrace.Contains("MethodWithExceptionInSeparateThread"));
+            }
+
+            WindowsFormsTestHelper.CloseAll();
+        }
+
+        [Test]
+        public void CallActionOnShowModal()
+        {
+            var callCount = 0;
+
+            WindowsFormsTestHelper.ShowModal(new Form(), delegate { callCount++; });
+
+            Assert.AreEqual(1, callCount);
+        }
+
+        [Test]
+        public void ShownCalledOnShowModal()
+        {
+            var callCount = 0;
+            var form = new Form();
+
+            form.Shown += delegate { callCount++; };
+
+            WindowsFormsTestHelper.ShowModal(form);
+
+            Assert.AreEqual(1, callCount);
+        }
+
+        [Test]
+        [ExpectedException(typeof(GuiTestHelper.UnhandledException))]
+        public void ExceptionIsCatchedWhenFromShownEvent()
+        {
+            var form = new Form();
+
+            form.Shown += delegate { Assert.Fail(); };
+
+            WindowsFormsTestHelper.ShowModal(form);
+        }
+
+        private void MethodWithException(Form obj)
+        {
+            throw new InvalidOperationException("my message");
+        }
+
+        private void MethodWithExceptionInSeparateThread()
+        {
+            throw new InvalidOperationException("my message from thread");
+        }
+    }
+}
\ No newline at end of file
Index: Core/GIS/test/Core.GIS.SharpMap.UI.Test/Core.GIS.SharpMap.UI.Test.csproj
===================================================================
diff -u -r7a8e3d1718cb12c53c2b0573b056037ed02e9913 -rdc301486d2fe82ff782a737de1656cb6d838affe
--- Core/GIS/test/Core.GIS.SharpMap.UI.Test/Core.GIS.SharpMap.UI.Test.csproj	(.../Core.GIS.SharpMap.UI.Test.csproj)	(revision 7a8e3d1718cb12c53c2b0573b056037ed02e9913)
+++ Core/GIS/test/Core.GIS.SharpMap.UI.Test/Core.GIS.SharpMap.UI.Test.csproj	(.../Core.GIS.SharpMap.UI.Test.csproj)	(revision dc301486d2fe82ff782a737de1656cb6d838affe)
@@ -87,6 +87,7 @@
     </Compile>
     <Compile Include="Forms\MapControlTest.cs" />
     <Compile Include="Helpers\MapCursorsTest.cs" />
+    <Compile Include="MapLayerProviderHelperTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Tools\CurvePointToolTest.cs" />
     <Compile Include="Tools\DeleteToolTest.cs" />
@@ -98,6 +99,10 @@
       <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
       <Name>Core.Common.Base</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Gui\Core.Common.Gui.csproj">
+      <Project>{30E4C2AE-719E-4D70-9FA9-668A9767FBFA}</Project>
+      <Name>Core.Common.Gui</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Core.GIS.SharpMap.Api\Core.GIS.SharpMap.Api.csproj">
       <Project>{A3C9DF74-978A-44B1-B55D-A72AC4221E3A}</Project>
       <Name>Core.GIS.SharpMap.Api</Name>
Index: Core/GIS/test/Core.GIS.SharpMap.UI.Test/MapLayerProviderHelperTest.cs
===================================================================
diff -u
--- Core/GIS/test/Core.GIS.SharpMap.UI.Test/MapLayerProviderHelperTest.cs	(revision 0)
+++ Core/GIS/test/Core.GIS.SharpMap.UI.Test/MapLayerProviderHelperTest.cs	(revision dc301486d2fe82ff782a737de1656cb6d838affe)
@@ -0,0 +1,273 @@
+using System.Collections.Generic;
+using Core.Common.Gui;
+using Core.Common.Utils.Collections;
+using Core.Common.Utils.Collections.Generic;
+using Core.GIS.SharpMap.Api;
+using Core.GIS.SharpMap.Api.Layers;
+using Core.GIS.SharpMap.Layers;
+using NUnit.Framework;
+using Rhino.Mocks;
+
+namespace Core.GIS.SharpMap.UI.Test
+{
+    [TestFixture]
+    public class MapLayerProviderHelperTest
+    {
+        [Test]
+        public void CreateLayerRecursive()
+        {
+            var mocks = new MockRepository();
+
+            var layerProvider = mocks.StrictMock<IMapLayerProvider>();
+            var dummyItemGroupLayer = mocks.Stub<IGroupLayer>();
+            var dummyItemLayer = mocks.Stub<ILayer>();
+            var dummyItem = mocks.StrictMock<IDummyItem>();
+            var dummyItemName = "Dummy item";
+
+            dummyItemGroupLayer.Layers = new EventedList<ILayer>();
+
+            layerProvider.Expect(lp => lp.CanCreateLayerFor(dummyItem, null)).Return(true);
+            layerProvider.Expect(lp => lp.CanCreateLayerFor(dummyItemName, dummyItem)).Return(true);
+            layerProvider.Expect(lp => lp.CreateLayer(dummyItem, null)).Return(dummyItemGroupLayer);
+            layerProvider.Expect(lp => lp.CreateLayer(dummyItemName, dummyItem)).Return(dummyItemLayer);
+            layerProvider.Expect(lp => lp.ChildLayerObjects(dummyItem)).Return(new[]
+            {
+                dummyItemName
+            });
+
+            mocks.ReplayAll();
+
+            var layerDataDictionary = new Dictionary<ILayer, object>();
+
+            var layer = MapLayerProviderHelper.CreateLayersRecursive(dummyItem, null, new[]
+            {
+                layerProvider
+            }, layerDataDictionary);
+
+            Assert.AreEqual(layer, dummyItemGroupLayer);
+            Assert.AreEqual(1, dummyItemGroupLayer.Layers.Count);
+            Assert.AreEqual(dummyItemLayer, dummyItemGroupLayer.Layers[0]);
+
+            Assert.AreEqual(dummyItemName, layerDataDictionary[dummyItemLayer]);
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void ProviderGivingChildObjectGetsFirstChanceAtProvidingLayer()
+        {
+            var mocks = new MockRepository();
+
+            var firstChanceProvider = mocks.StrictMock<IMapLayerProvider>();
+            var otherProvider = mocks.StrictMock<IMapLayerProvider>();
+
+            var dummyItem = mocks.StrictMock<IDummyItem>();
+            var dummyItemName = "Dummy item";
+
+            var objLayer = new GroupLayer();
+            var subLayer = new VectorLayer();
+
+            otherProvider.Expect(lp => lp.CanCreateLayerFor(dummyItem, null)).Return(false);
+            firstChanceProvider.Expect(lp => lp.CanCreateLayerFor(dummyItem, null)).Return(true);
+            firstChanceProvider.Expect(lp => lp.CreateLayer(dummyItem, null)).Return(objLayer);
+            firstChanceProvider.Expect(lp => lp.ChildLayerObjects(dummyItem)).Return(new[]
+            {
+                dummyItemName
+            });
+            // this is the important part; we don't want 'otherProvider' to be called here:
+            firstChanceProvider.Expect(lp => lp.CanCreateLayerFor(dummyItemName, dummyItem)).Return(true);
+            firstChanceProvider.Expect(lp => lp.CreateLayer(dummyItemName, dummyItem)).Return(subLayer);
+
+            mocks.ReplayAll();
+
+            MapLayerProviderHelper.CreateLayersRecursive(dummyItem, null, new[]
+            {
+                otherProvider,
+                firstChanceProvider
+            });
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void RefreshLayersRecursive()
+        {
+            var mocks = new MockRepository();
+
+            var layerProvider = mocks.StrictMock<IMapLayerProvider>();
+            var dummyItemGroupLayer = new GroupLayer();
+            var dummyItemLayer = mocks.Stub<ILayer>();
+
+            var dummyItem = mocks.StrictMock<IDummyItem>();
+            var dummyItemName = "Dummy item";
+
+            layerProvider.Expect(lp => lp.CanCreateLayerFor(dummyItem, null)).Return(true);
+            layerProvider.Expect(lp => lp.CanCreateLayerFor(dummyItemName, dummyItem)).Return(true);
+            layerProvider.Expect(lp => lp.CreateLayer(dummyItemName, dummyItem)).Return(dummyItemLayer);
+            layerProvider.Expect(lp => lp.ChildLayerObjects(dummyItem)).Return(new[]
+            {
+                dummyItemName
+            });
+
+            mocks.ReplayAll();
+
+            // Start with only a group layer
+            var layerDataDictionary = new Dictionary<ILayer, object>
+            {
+                {
+                    dummyItemGroupLayer, dummyItem
+                }
+            };
+
+            // RefreshLayersRecursive should detect that the layer is out of sync, and add the dummy item mlayer
+            MapLayerProviderHelper.RefreshLayersRecursive(dummyItemGroupLayer, layerDataDictionary, new[]
+            {
+                layerProvider
+            }, null);
+
+            Assert.AreEqual(1, dummyItemGroupLayer.Layers.Count);
+            Assert.AreEqual(dummyItemLayer, dummyItemGroupLayer.Layers[0]);
+
+            Assert.AreEqual(dummyItemName, layerDataDictionary[dummyItemLayer]);
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void RefreshLayersRecursiveDoesNotNeedlesslyRemoveLayer()
+        {
+            var mocks = new MockRepository();
+
+            var layerProvider = mocks.StrictMock<IMapLayerProvider>();
+            var dummyItemGroupLayer = new GroupLayer();
+            var dummyItemLayer1 = mocks.Stub<ILayer>();
+            var dummyItemLayer2 = mocks.Stub<ILayer>();
+
+            var dummyItem = mocks.StrictMock<IDummyItem>();
+            var dummyItemName1 = "Dummy item 1";
+            var dummyItemName2 = "Dummy item 2";
+
+            // first time (create)
+            layerProvider.Expect(lp => lp.CanCreateLayerFor(dummyItem, null)).Return(true).Repeat.Twice();
+            layerProvider.Expect(lp => lp.CanCreateLayerFor(dummyItemName1, dummyItem)).Return(true);
+            layerProvider.Expect(lp => lp.CreateLayer(dummyItem, null)).Return(dummyItemGroupLayer);
+            layerProvider.Expect(lp => lp.CreateLayer(dummyItemName1, dummyItem)).Return(dummyItemLayer1);
+            layerProvider.Expect(lp => lp.ChildLayerObjects(dummyItem)).Return(new[]
+            {
+                dummyItemName1
+            });
+
+            // second time (refresh)
+            layerProvider.Expect(lp => lp.ChildLayerObjects(dummyItem)).Return(new[]
+            {
+                dummyItemName1,
+                dummyItemName2
+            });
+            layerProvider.Expect(lp => lp.CanCreateLayerFor(dummyItemName2, dummyItem)).Return(true);
+            layerProvider.Expect(lp => lp.CreateLayer(dummyItemName2, dummyItem)).Return(dummyItemLayer2);
+
+            mocks.ReplayAll();
+
+            var layerDataDictionary = new Dictionary<ILayer, object>();
+            var mapLayerProviders = new[]
+            {
+                layerProvider
+            };
+
+            // create
+            MapLayerProviderHelper.CreateLayersRecursive(dummyItem, null, mapLayerProviders, layerDataDictionary);
+
+            var layerAdded = 0;
+            dummyItemGroupLayer.Layers.CollectionChanged += (s, e) =>
+            {
+                if (e.Action == NotifyCollectionChangeAction.Remove)
+                {
+                    Assert.Fail("No remove should occur");
+                }
+                else if (e.Action == NotifyCollectionChangeAction.Add)
+                {
+                    layerAdded++;
+                }
+            };
+
+            // refresh (but it should not remove layer for dummy item 1)
+            MapLayerProviderHelper.RefreshLayersRecursive(dummyItemGroupLayer, layerDataDictionary, mapLayerProviders, null);
+
+            Assert.AreEqual(1, layerAdded);
+            Assert.AreEqual(2, dummyItemGroupLayer.Layers.Count);
+
+            Assert.AreEqual(dummyItemName1, layerDataDictionary[dummyItemLayer1]);
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void RefreshLayersRecursiveShouldDisposeLayersOnRemove()
+        {
+            var mocks = new MockRepository();
+
+            var layerProvider = mocks.StrictMock<IMapLayerProvider>();
+            var modelLayer = new GroupLayer();
+
+            var oldDataSource = mocks.StrictMock<IFeatureProvider>();
+            var oldModelItemLayer = new VectorLayer();
+            var newModelItemLayer = mocks.Stub<ILayer>();
+
+            var dummyItem = mocks.StrictMock<IDummyItem>();
+            var dummyItemNameOld = "Dummy item old";
+            var dummyItemNameNew = "Dummy item new";
+
+            // verify the datasource is disposed (this happens through Layer.Dispose right now):
+            oldDataSource.Expect(fp => fp.Dispose());
+            oldDataSource.Expect(fp => fp.AddNewFeatureFromGeometryDelegate);
+            oldDataSource.Expect(fp => fp.FeaturesChanged += null).IgnoreArguments().Repeat.Once();
+            oldDataSource.Expect(fp => fp.FeaturesChanged -= null).IgnoreArguments().Repeat.Twice();
+            oldDataSource.Expect(fp => fp.CoordinateSystemChanged += null).IgnoreArguments().Repeat.Once();
+            oldDataSource.Expect(fp => fp.CoordinateSystemChanged -= null).IgnoreArguments().Repeat.Twice();
+
+            // make sure the layerprovider does the right stuff:
+            layerProvider.Expect(lp => lp.CanCreateLayerFor(null, dummyItem)).IgnoreArguments().Repeat.Any().Return(true);
+            layerProvider.Expect(lp => lp.CreateLayer(dummyItemNameOld, dummyItem)).Return(oldModelItemLayer);
+            layerProvider.Expect(lp => lp.CreateLayer(dummyItemNameNew, dummyItem)).Return(newModelItemLayer);
+            layerProvider.Expect(lp => lp.ChildLayerObjects(dummyItem)).Return(new[]
+            {
+                dummyItemNameOld
+            });
+            layerProvider.Expect(lp => lp.ChildLayerObjects(dummyItem)).Return(new[]
+            {
+                dummyItemNameNew
+            });
+
+            mocks.ReplayAll();
+
+            oldModelItemLayer.DataSource = oldDataSource;
+
+            // Start with only a modelLayer
+            var layerDataDictionary = new Dictionary<ILayer, object>
+            {
+                {
+                    modelLayer, dummyItem
+                }
+            };
+
+            // RefreshLayersRecursive should detect that the layer is out of sync, and add the old layer
+            MapLayerProviderHelper.RefreshLayersRecursive(modelLayer, layerDataDictionary, new[]
+            {
+                layerProvider
+            }, null);
+
+            // expect the old layer to be removed (and thus diposed), and a new layer added:
+            MapLayerProviderHelper.RefreshLayersRecursive(modelLayer, layerDataDictionary, new[]
+            {
+                layerProvider
+            }, null);
+
+            Assert.AreEqual(1, modelLayer.Layers.Count);
+            Assert.AreEqual(newModelItemLayer, modelLayer.Layers[0]);
+
+            mocks.VerifyAll();
+        }
+
+        public interface IDummyItem {}
+    }
+}
\ No newline at end of file