diff --git a/editor/test/org/tangram/editor/test/EditingHandlerTest.java b/editor/test/org/tangram/editor/test/EditingHandlerTest.java
index c600ad18..6881dda3 100644
--- a/editor/test/org/tangram/editor/test/EditingHandlerTest.java
+++ b/editor/test/org/tangram/editor/test/EditingHandlerTest.java
@@ -145,10 +145,10 @@ public void testList() {
 
         Object ormClasses = request.getAttribute("classes");
         Assert.assertNotNull(ormClasses, "There should be some classes list object.");
-        Assert.assertEquals(((Collection<?>) ormClasses).size(), 7, "Fixed number of classes in list expected.");
+        Assert.assertEquals(((Collection<?>) ormClasses).size(), 8, "Fixed number of classes in list expected.");
         Object me = request.getAttribute(Constants.THIS);
         Assert.assertNotNull(me, "There should be some instances list object..");
-        Assert.assertEquals(((Collection<?>) me).size(), 7, "Fixed number of instances in list expected.");
+        Assert.assertEquals(((Collection<?>) me).size(), 6, "Fixed number of instances in list expected.");
     } // testList()
 
 
@@ -246,7 +246,7 @@ public void testDelete() {
         Assert.assertNotNull(target.bean, "Non null result list expected after returning from deletion.");
         Assert.assertEquals(target.action, null, "No action expected.");
         Assert.assertEquals(target.view, "tangramEditorList", "List view expected.");
-        Assert.assertEquals(((Collection<?>) (target.bean)).size(), 7, "Unexpected list of contents to display.");
+        Assert.assertEquals(((Collection<?>) (target.bean)).size(), 6, "Unexpected list of contents to display.");
     } // testDelete()
 
 
diff --git a/guicy/build.gradle b/guicy/build.gradle
index d80cde56..ab68a5ce 100644
--- a/guicy/build.gradle
+++ b/guicy/build.gradle
@@ -40,5 +40,4 @@ dependencies {
   testCompile "org.springframework:spring-web:$versions.springframework"
   testCompile "com.thoughtworks.xstream:xstream:$versions.xstream"
   testCompile project (':tangram-core').sourceSets.test.output
-  testCompile project (':tangram-mutable').sourceSets.test.output
 }
diff --git a/jdo/src/tangram/jdo-defaults.properties b/jdo/src/tangram/jdo-defaults.properties
index e293db4e..84aaa191 100644
--- a/jdo/src/tangram/jdo-defaults.properties
+++ b/jdo/src/tangram/jdo-defaults.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2011-2015 Martin Goellnitz
+# Copyright 2011-2016 Martin Goellnitz
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -14,6 +14,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-bean.factory.application.base.package=org.tangram
+bean.factory.application.base.package=de
 bean.factory.activate.caching=true
 bean.factory.activate.query.caching=false
diff --git a/nucleus/test/org/tangram/nucleus/test/NucleusContentTest.java b/nucleus/test/org/tangram/nucleus/test/NucleusContentTest.java
index d2fb5802..8d3e2f2f 100644
--- a/nucleus/test/org/tangram/nucleus/test/NucleusContentTest.java
+++ b/nucleus/test/org/tangram/nucleus/test/NucleusContentTest.java
@@ -91,13 +91,13 @@ protected void setPeers(BaseInterface base, SubInterface peer) {
 
     @Override
     protected int getNumberOfAllClasses() {
-        return 23;
+        return 6;
     }
 
 
     @Override
     protected int getNumberOfClasses() {
-        return 10;
+        return 4;
     }
 
 
diff --git a/nucleus/test/tangram/nucleus-test.properties b/nucleus/test/tangram/nucleus-test.properties
new file mode 100644
index 00000000..00fd814e
--- /dev/null
+++ b/nucleus/test/tangram/nucleus-test.properties
@@ -0,0 +1,17 @@
+#
+# Copyright 2016 Martin Goellnitz
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+bean.factory.application.base.package=org.tangram.mutable.test