diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/FolderManagerTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/FolderManagerTest.java
index be8199e45..42be7feb1 100644
--- a/ccm-cms/src/test/java/org/librecms/contentsection/FolderManagerTest.java
+++ b/ccm-cms/src/test/java/org/librecms/contentsection/FolderManagerTest.java
@@ -138,6 +138,7 @@ public class FolderManagerTest {
                 com.arsdigita.ui.admin.applications.DefaultApplicationInstanceForm.class)
             .addClass(
                 com.arsdigita.ui.admin.applications.DefaultApplicationSettingsPane.class)
+            .addClass(org.libreccm.imexport.Exportable.class)
             .addPackage(org.librecms.dispatcher.ItemResolver.class.getPackage())
             .addPackage(com.arsdigita.util.Lockable.class.getPackage())
             .addPackage(com.arsdigita.web.BaseServlet.class.getPackage())
@@ -179,14 +180,14 @@ public class FolderManagerTest {
                           "content_section_id"})
     @InSequence(1000)
     public void createDocumentsFolder() {
-        final Optional<Folder> parent = folderRepo.findById(-2005L);
+        final Optional<Folder> parent = folderRepo.findById(2005L);
         assertThat(parent.isPresent(), is(true));
 
         final Folder test = folderManager.createFolder("test", parent.get());
 
         assertThat(test, is(not(nullValue())));
         assertThat(test.getName(), is(equalTo("test")));
-        assertThat(test.getSection().getObjectId(), is(-1100L));
+        assertThat(test.getSection().getObjectId(), is(1100L));
     }
 
     @Test
@@ -203,14 +204,14 @@ public class FolderManagerTest {
                           "content_section_id"})
     @InSequence(1100)
     public void createAssetsFolder() {
-        final Optional<Folder> parent = folderRepo.findById(-2013L);
+        final Optional<Folder> parent = folderRepo.findById(2013L);
         assertThat(parent.isPresent(), is(true));
 
         final Folder test = folderManager.createFolder("test", parent.get());
 
         assertThat(test, is(not(nullValue())));
         assertThat(test.getName(), is(equalTo("test")));
-        assertThat(test.getSection().getObjectId(), is(-1100L));
+        assertThat(test.getSection().getObjectId(), is(1100L));
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -234,7 +235,7 @@ public class FolderManagerTest {
     @ShouldThrowException(IllegalArgumentException.class)
     @InSequence(1500)
     public void createFolderNullName() {
-        final Optional<Folder> parent = folderRepo.findById(-2005L);
+        final Optional<Folder> parent = folderRepo.findById(2005L);
         assertThat(parent.isPresent(), is(true));
 
         final Folder test = folderManager.createFolder(null, parent.get());
@@ -250,7 +251,7 @@ public class FolderManagerTest {
     @ShouldThrowException(IllegalArgumentException.class)
     @InSequence(1500)
     public void createFolderEmptyName() {
-        final Optional<Folder> parent = folderRepo.findById(-2005L);
+        final Optional<Folder> parent = folderRepo.findById(2005L);
         assertThat(parent.isPresent(), is(true));
 
         final Folder test = folderManager.createFolder(" ", parent.get());
@@ -267,7 +268,7 @@ public class FolderManagerTest {
     @InSequence(2000)
     public void deleteFolder() {
         //docs-1-1-1
-        final Folder folder = folderRepo.findById(-2007L).get();
+        final Folder folder = folderRepo.findById(2007L).get();
         folderManager.deleteFolder(folder);
     }
 
@@ -280,7 +281,7 @@ public class FolderManagerTest {
     @ShouldThrowException(IllegalArgumentException.class)
     @InSequence(2100)
     public void deleteNonEmptyFolder() {
-        final Folder folder = folderRepo.findById(-2008L).get();
+        final Folder folder = folderRepo.findById(2008L).get();
         folderManager.deleteFolder(folder);
     }
 
@@ -293,7 +294,7 @@ public class FolderManagerTest {
     @ShouldThrowException(IllegalArgumentException.class)
     @InSequence(2100)
     public void deleteNonEmptySubFolder() {
-        final Folder folder = folderRepo.findById(-2006L).get();
+        final Folder folder = folderRepo.findById(2006L).get();
         folderManager.deleteFolder(folder);
     }
 
@@ -306,7 +307,7 @@ public class FolderManagerTest {
     @ShouldThrowException(IllegalArgumentException.class)
     @InSequence(2210)
     public void deleteRootFolder() {
-        final Folder folder = folderRepo.findById(-2003L).get();
+        final Folder folder = folderRepo.findById(2003L).get();
         folderManager.deleteFolder(folder);
     }
 
@@ -332,8 +333,8 @@ public class FolderManagerTest {
     @InSequence(3000)
     public void moveFolder() {
         //docs-1-1-2 to docs-2
-        final Folder folder = folderRepo.findById(-2008L).get();
-        final Folder target = folderRepo.findById(-2010L).get();
+        final Folder folder = folderRepo.findById(2008L).get();
+        final Folder target = folderRepo.findById(2010L).get();
 
         folderManager.moveFolder(folder, target);
     }
@@ -349,8 +350,8 @@ public class FolderManagerTest {
     public void moveFolderTargetFolderSameName() {
         //docs-1/downloads to /docs-2/
 
-        final Folder folder = folderRepo.findById(-2009L).get();
-        final Folder target = folderRepo.findById(-2010L).get();
+        final Folder folder = folderRepo.findById(2009L).get();
+        final Folder target = folderRepo.findById(2010L).get();
 
         folderManager.moveFolder(folder, target);
     }
@@ -364,8 +365,8 @@ public class FolderManagerTest {
     @ShouldThrowException(IllegalArgumentException.class)
     @InSequence(3100)
     public void moveDocumentsFolderToAssetsFolder() {
-        final Folder folder = folderRepo.findById(-2009L).get();
-        final Folder target = folderRepo.findById(-2014L).get();
+        final Folder folder = folderRepo.findById(2009L).get();
+        final Folder target = folderRepo.findById(2014L).get();
 
         folderManager.moveFolder(folder, target);
     }
@@ -379,8 +380,8 @@ public class FolderManagerTest {
     @ShouldThrowException(IllegalArgumentException.class)
     @InSequence(3110)
     public void moveAssetsFolderToDocumentsFolder() {
-        final Folder folder = folderRepo.findById(-2014L).get();
-        final Folder target = folderRepo.findById(-2010L).get();
+        final Folder folder = folderRepo.findById(2014L).get();
+        final Folder target = folderRepo.findById(2010L).get();
 
         folderManager.moveFolder(folder, target);
     }
@@ -394,7 +395,7 @@ public class FolderManagerTest {
     @ShouldThrowException(IllegalArgumentException.class)
     @InSequence(3110)
     public void moveFolderToItself() {
-        final Folder folder = folderRepo.findById(-2008L).get();
+        final Folder folder = folderRepo.findById(2008L).get();
         
         folderManager.moveFolder(folder, folder);
     }
@@ -408,7 +409,7 @@ public class FolderManagerTest {
     @ShouldThrowException(NullPointerException.class)
     @InSequence(3200)
     public void moveFolderNull() {
-        final Folder target = folderRepo.findById(-2010L).get();
+        final Folder target = folderRepo.findById(2010L).get();
         folderManager.moveFolder(null, target);
     }
 
@@ -421,7 +422,7 @@ public class FolderManagerTest {
     @ShouldThrowException(NullPointerException.class)
     @InSequence(3210)
     public void moveFolderTargetNull() {
-        final Folder folder = folderRepo.findById(-2008L).get();
+        final Folder folder = folderRepo.findById(2008L).get();
         
         folderManager.moveFolder(folder, null);
     }
@@ -435,8 +436,8 @@ public class FolderManagerTest {
     @ShouldThrowException(IllegalArgumentException.class)
     @InSequence(3300)
     public void moveFolderWithLiveItems() {
-        final Folder folder = folderRepo.findById(-2011L).get();
-        final Folder target = folderRepo.findById(-2010L).get();
+        final Folder folder = folderRepo.findById(2011L).get();
+        final Folder target = folderRepo.findById(2010L).get();
 
         folderManager.moveFolder(folder, target);
     }
@@ -450,8 +451,8 @@ public class FolderManagerTest {
     @ShouldThrowException(IllegalArgumentException.class)
     @InSequence(3310)
     public void moveFolderWithLiveItemsInSubFolder() {
-        final Folder folder = folderRepo.findById(-2010L).get();
-        final Folder target = folderRepo.findById(-2005L).get();
+        final Folder folder = folderRepo.findById(2010L).get();
+        final Folder target = folderRepo.findById(2005L).get();
 
         folderManager.moveFolder(folder, target);
     }
@@ -465,8 +466,8 @@ public class FolderManagerTest {
     @ShouldThrowException(IllegalArgumentException.class)
     @InSequence(3320)
     public void moveFolderToOtherSection() {
-        final Folder folder = folderRepo.findById(-2008L).get();
-        final Folder target = folderRepo.findById(-2003L).get();
+        final Folder folder = folderRepo.findById(2008L).get();
+        final Folder target = folderRepo.findById(2003L).get();
 
         folderManager.moveFolder(folder, target);
     }
@@ -476,21 +477,21 @@ public class FolderManagerTest {
                       + "FolderManagerTest/data.xml")
     @InSequence(3400)
     public void getFolderPath() {
-        final Folder infoRoot = folderRepo.findById(-2001L).get();
-        final Folder infoAssets = folderRepo.findById(-2002L).get();
-        final Folder projectsRoot = folderRepo.findById(-2003L).get();
-        final Folder projectsAssets = folderRepo.findById(-2004L).get();
-        final Folder docs1 = folderRepo.findById(-2005L).get();
-        final Folder docs11 = folderRepo.findById(-2006L).get();
-        final Folder docs111 = folderRepo.findById(-2007L).get();
-        final Folder docs112 = folderRepo.findById(-2008L).get();
-        final Folder downloads1 = folderRepo.findById(-2009L).get();
-        final Folder docs2 = folderRepo.findById(-2010L).get();
-        final Folder docs21 = folderRepo.findById(-2011L).get();
-        final Folder downloads2 = folderRepo.findById(-2012L).get();
-        final Folder assets1 = folderRepo.findById(-2013L).get();
-        final Folder assets11 = folderRepo.findById(-2014L).get();
-        final Folder assets12 = folderRepo.findById(-2015L).get();
+        final Folder infoRoot = folderRepo.findById(2001L).get();
+        final Folder infoAssets = folderRepo.findById(2002L).get();
+        final Folder projectsRoot = folderRepo.findById(2003L).get();
+        final Folder projectsAssets = folderRepo.findById(2004L).get();
+        final Folder docs1 = folderRepo.findById(2005L).get();
+        final Folder docs11 = folderRepo.findById(2006L).get();
+        final Folder docs111 = folderRepo.findById(2007L).get();
+        final Folder docs112 = folderRepo.findById(2008L).get();
+        final Folder downloads1 = folderRepo.findById(2009L).get();
+        final Folder docs2 = folderRepo.findById(2010L).get();
+        final Folder docs21 = folderRepo.findById(2011L).get();
+        final Folder downloads2 = folderRepo.findById(2012L).get();
+        final Folder assets1 = folderRepo.findById(2013L).get();
+        final Folder assets11 = folderRepo.findById(2014L).get();
+        final Folder assets12 = folderRepo.findById(2015L).get();
         
         assertThat(folderManager.getFolderPath(infoRoot), 
                    is(equalTo("/info_root/")));
@@ -529,21 +530,21 @@ public class FolderManagerTest {
                       + "FolderManagerTest/data.xml")
     @InSequence(3410)
     public void getFolderPathWithContentSection() {
-        final Folder infoRoot = folderRepo.findById(-2001L).get();
-        final Folder infoAssets = folderRepo.findById(-2002L).get();
-        final Folder projectsRoot = folderRepo.findById(-2003L).get();
-        final Folder projectsAssets = folderRepo.findById(-2004L).get();
-        final Folder docs1 = folderRepo.findById(-2005L).get();
-        final Folder docs11 = folderRepo.findById(-2006L).get();
-        final Folder docs111 = folderRepo.findById(-2007L).get();
-        final Folder docs112 = folderRepo.findById(-2008L).get();
-        final Folder downloads1 = folderRepo.findById(-2009L).get();
-        final Folder docs2 = folderRepo.findById(-2010L).get();
-        final Folder docs21 = folderRepo.findById(-2011L).get();
-        final Folder downloads2 = folderRepo.findById(-2012L).get();
-        final Folder assets1 = folderRepo.findById(-2013L).get();
-        final Folder assets11 = folderRepo.findById(-2014L).get();
-        final Folder assets12 = folderRepo.findById(-2015L).get();
+        final Folder infoRoot = folderRepo.findById(2001L).get();
+        final Folder infoAssets = folderRepo.findById(2002L).get();
+        final Folder projectsRoot = folderRepo.findById(2003L).get();
+        final Folder projectsAssets = folderRepo.findById(2004L).get();
+        final Folder docs1 = folderRepo.findById(2005L).get();
+        final Folder docs11 = folderRepo.findById(2006L).get();
+        final Folder docs111 = folderRepo.findById(2007L).get();
+        final Folder docs112 = folderRepo.findById(2008L).get();
+        final Folder downloads1 = folderRepo.findById(2009L).get();
+        final Folder docs2 = folderRepo.findById(2010L).get();
+        final Folder docs21 = folderRepo.findById(2011L).get();
+        final Folder downloads2 = folderRepo.findById(2012L).get();
+        final Folder assets1 = folderRepo.findById(2013L).get();
+        final Folder assets11 = folderRepo.findById(2014L).get();
+        final Folder assets12 = folderRepo.findById(2015L).get();
         
         assertThat(folderManager.getFolderPath(infoRoot, true), 
                    is(equalTo("info:/info_root/")));