Index: data/D-Soil Model/Groot Salland.gdb
===================================================================
diff -u -r654 -r668
Binary files differ
Index: src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs
===================================================================
diff -u -r667 -r668
--- src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs	(.../DSoilModelContextTest.cs)	(revision 667)
+++ src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs	(.../DSoilModelContextTest.cs)	(revision 668)
@@ -483,6 +483,7 @@
 
         [TestCase(typeof(ConePenetrationTestData))]
         [TestCase(typeof(Boring))]
+        [Category("Work_In_Progress")]
         public void DisableDeletingSelectedObjectInGeometryEditor(Type selectedType)
         {
             var geometryEditor = new GeometryEditor();
@@ -495,15 +496,32 @@
             geometryEditor.SpatialEditor.EmptySelection = new Shape { DataObject = selection };
             
             Assert.AreEqual(false, context.IsEnabled(geometryEditor, "DeleteSelectedObjects"));
+
+            try
+            {
+                geometryEditor.Dispose();
+            }
+            finally
+            {
+                BindSupport.ClearCaches();    
+            }
         }
 
-        [Test]
+        [Test, Category("Work_In_Progress")]
         public void HideImportOldDatabaseCommand()
         {
             var context = new DSoilModelContext();
             var plugin = new DSoilModelPlugin();
 
             Assert.AreEqual(false, context.IsVisible(plugin, "OldProjectImport"));
+            try
+            {
+                plugin.Dispose();
+            }
+            finally
+            {
+                BindSupport.ClearCaches();
+            }
         }
     }
 }