diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItem.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItem.java
index 40be6ff6a..d3e2d6c39 100644
--- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItem.java
+++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItem.java
@@ -116,12 +116,12 @@ import static org.librecms.CmsConstants.*;
     @NamedQuery(
         name = "ContentItem.findDraftVersion",
         query = "SELECT i FROM ContentItem i "
-                    + "WHERE i.uuid = ':uuid' "
+                    + "WHERE i.uuid = :uuid "
                     + "AND i.version = 'DRAFT'"),
     @NamedQuery(
         name = "ContentItem.findLiveVersion",
         query = "SELECT i FROM ContentItem i "
-                    + "WHERE i.uuid = ':uuid' "
+                    + "WHERE i.uuid = :uuid "
                     + "AND i.version = 'LIVE'")
 
 })
diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemManager.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemManager.java
index 81414223d..0a87e0438 100644
--- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemManager.java
+++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemManager.java
@@ -180,6 +180,11 @@ public class ContentItemManager {
                 type.getName()));
         }
 
+        if (name == null || name.isEmpty()) {
+            throw new IllegalArgumentException(
+                "The name of a content item can't be blank.");
+        }
+
         final T item;
         try {
             item = type.newInstance();
@@ -232,6 +237,15 @@ public class ContentItemManager {
      */
     @Transactional(Transactional.TxType.REQUIRED)
     public void move(final ContentItem item, final Category targetFolder) {
+        if (item == null) {
+            throw new IllegalArgumentException("The item to move can't be null.");
+        }
+
+        if (targetFolder == null) {
+            throw new IllegalArgumentException(
+                "The target folder can't be null.");
+        }
+
         final ContentItem draftItem = getDraftVersion(item, item.getClass());
         final Optional<Category> currentFolder = getItemFolder(item);
 
@@ -244,7 +258,10 @@ public class ContentItemManager {
             }
         }
 
-        categoryManager.addObjectToCategory(draftItem, targetFolder);
+        categoryManager.addObjectToCategory(
+            draftItem,
+            targetFolder,
+            CmsConstants.CATEGORIZATION_TYPE_FOLDER);
 
     }
 
@@ -260,6 +277,15 @@ public class ContentItemManager {
      */
     @SuppressWarnings("unchecked")
     public void copy(final ContentItem item, final Category targetFolder) {
+        if (item == null) {
+            throw new IllegalArgumentException("The item to copy can't be null.");
+        }
+
+        if (targetFolder == null) {
+            throw new IllegalArgumentException(
+                "The target folder to which the item is copied can't be null");
+        }
+
         final Optional<ContentType> contentType = typeRepo
             .findByContentSectionAndClass(
                 item.getContentType().getContentSection(), item.
@@ -331,6 +357,10 @@ public class ContentItemManager {
             final Method readMethod = propertyDescriptor.getReadMethod();
             final Method writeMethod = propertyDescriptor.getWriteMethod();
 
+            if (writeMethod == null) {
+                continue;
+            }
+            
             if (LocalizedString.class.equals(propType)) {
                 final LocalizedString source;
                 final LocalizedString target;
@@ -424,8 +454,6 @@ public class ContentItemManager {
                 }
             }
         }
-
-        throw new UnsupportedOperationException();
     }
 
     private boolean propertyIsExcluded(final String name) {
@@ -690,13 +718,22 @@ public class ContentItemManager {
      *         something is seriously wrong with the database) this method will
      * <b>never</b> return {@code null}.
      */
+    @SuppressWarnings("unchecked")
     public <T extends ContentItem> T getDraftVersion(final ContentItem item,
                                                      final Class<T> type) {
-        final TypedQuery<T> query = entityManager.createNamedQuery(
-            "ContentItem.findDraftVersion", type);
+        if (!ContentItem.class.isAssignableFrom(type)) {
+            throw new IllegalArgumentException(String.format(
+                "The provided type \"%s\" does match the type of the provided "
+                    + "item (\"%s\").",
+                type.getName(),
+                item.getClass().getName()));
+        }
+
+        final TypedQuery<ContentItem> query = entityManager.createNamedQuery(
+            "ContentItem.findDraftVersion", ContentItem.class);
         query.setParameter("uuid", item.getUuid());
 
-        return query.getSingleResult();
+        return (T) query.getSingleResult();
     }
 
     /**
diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemRepository.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemRepository.java
index 81aca4833..3068903c0 100644
--- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemRepository.java
+++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemRepository.java
@@ -25,7 +25,6 @@ import org.libreccm.core.CcmObjectRepository;
 
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
diff --git a/ccm-cms/src/main/java/org/librecms/contenttypes/Article.java b/ccm-cms/src/main/java/org/librecms/contenttypes/Article.java
index 1273388ff..1258483bf 100644
--- a/ccm-cms/src/main/java/org/librecms/contenttypes/Article.java
+++ b/ccm-cms/src/main/java/org/librecms/contenttypes/Article.java
@@ -56,6 +56,11 @@ public class Article extends ContentItem implements Serializable {
             ))
     private LocalizedString text;
 
+    public Article() {
+        super();
+        text = new LocalizedString();
+    }
+    
     public LocalizedString getText() {
         return text;
     }
diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemManagerTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemManagerTest.java
index 462b7f31f..60c3329ca 100644
--- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemManagerTest.java
+++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemManagerTest.java
@@ -19,6 +19,7 @@
 package org.librecms.contentsection;
 
 import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.ShouldThrowException;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.junit.InSequence;
 import org.jboss.arquillian.persistence.CreateSchema;
@@ -41,16 +42,21 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.libreccm.categorization.Category;
+import org.libreccm.categorization.CategoryRepository;
 import org.libreccm.security.Shiro;
 import org.libreccm.tests.categories.IntegrationTest;
-import org.libreccm.workflow.Workflow;
-import org.libreccm.workflow.WorkflowRepository;
+import org.libreccm.workflow.WorkflowTemplate;
+import org.libreccm.workflow.WorkflowTemplateRepository;
 import org.librecms.contenttypes.Article;
+import org.librecms.contenttypes.Event;
+import org.librecms.lifecycle.LifecycleDefinition;
+import org.librecms.lifecycle.LifecycleDefinitionRepository;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
+import java.util.Optional;
 import java.util.stream.IntStream;
 
 import javax.inject.Inject;
@@ -74,12 +80,24 @@ public class ContentItemManagerTest {
     @Inject
     private ContentSectionRepository sectionRepo;
 
+    @Inject
+    private ContentItemRepository itemRepo;
+
     @Inject
     private ContentItemManager itemManager;
 
+    @Inject
+    private CategoryRepository categoryRepo;
+
     @Inject
     private Shiro shiro;
 
+    @Inject
+    private WorkflowTemplateRepository workflowTemplateRepo;
+
+    @Inject
+    private LifecycleDefinitionRepository lifecycleDefinitionRepo;
+
     @Inject
     private EntityManager entityManager;
 
@@ -206,20 +224,21 @@ public class ContentItemManagerTest {
     }
 
     @Test
-    @InSequence(100)
+    @InSequence(1100)
     @UsingDataSet("datasets/org/librecms/contentsection/"
                       + "ContentItemManagerTest/data.xml")
-    @ShouldMatchDataSet(value = "datasets/org/librecms/contentsection/"
-                                    + "ContentItemManagerTest/after-create-contentitem.xml",
-                        excludeColumns = {"categorization_id",
-                                          "lifecycle_id",
-                                          "object_id",
-                                          "object_order",
-                                          "phase_id",
-                                          "task_id",
-                                          "uuid",
-                                          "workflow_id"
-                        })
+    @ShouldMatchDataSet(
+        value = "datasets/org/librecms/contentsection/"
+                    + "ContentItemManagerTest/after-create-contentitem.xml",
+        excludeColumns = {"categorization_id",
+                          "lifecycle_id",
+                          "object_id",
+                          "object_order",
+                          "phase_id",
+                          "task_id",
+                          "uuid",
+                          "workflow_id"
+        })
     public void createContentItem() {
         final ContentSection section = sectionRepo.findByLabel("info");
         final Category folder = section.getRootDocumentsFolder();
@@ -247,25 +266,375 @@ public class ContentItemManagerTest {
                    workflowCount, is(3L));
     }
 
-    // Create content item type not in content section
-    // Create content item name null
-    // Create content item name empty
-    // Create content item folder null
-    // Create content item folder no a folder
-    // Create content item with lifecycle and workflow
-    // Create content item with lifecycle and workflow type not in content section
-    // Create content item with lifecycle and workflow name null
+    /**
+     * Checks if an {@link IllegalArgumentException} is thrown when the content
+     * type of the item to create is not registered with the provided content
+     * section.
+     */
+    @Test(expected = IllegalArgumentException.class)
+    @InSequence(1200)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "ContentItemManagerTest/data.xml")
+    @ShouldMatchDataSet("datasets/org/librecms/contentsection/"
+                            + "ContentItemManagerTest/data.xml")
+    @ShouldThrowException(IllegalArgumentException.class)
+    public void createItemTypeNotInSection() {
+        final ContentSection section = sectionRepo.findByLabel("info");
+        final Category folder = section.getRootDocumentsFolder();
+
+        itemManager.createContentItem("Test", section, folder, Event.class);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    @InSequence(1300)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "ContentItemManagerTest/data.xml")
+    @ShouldMatchDataSet("datasets/org/librecms/contentsection/"
+                            + "ContentItemManagerTest/data.xml")
+    @ShouldThrowException(IllegalArgumentException.class)
+    public void createItemNameIsNull() {
+        final ContentSection section = sectionRepo.findByLabel("info");
+        final Category folder = section.getRootDocumentsFolder();
+
+        itemManager.createContentItem(null, section, folder, Article.class);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    @InSequence(1400)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "ContentItemManagerTest/data.xml")
+    @ShouldMatchDataSet("datasets/org/librecms/contentsection/"
+                            + "ContentItemManagerTest/data.xml")
+    @ShouldThrowException(IllegalArgumentException.class)
+    public void createItemNameIsEmpty() {
+        final ContentSection section = sectionRepo.findByLabel("info");
+        final Category folder = section.getRootDocumentsFolder();
+
+        itemManager.createContentItem("", section, folder, Article.class);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    @InSequence(1500)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "ContentItemManagerTest/data.xml")
+    @ShouldMatchDataSet("datasets/org/librecms/contentsection/"
+                            + "ContentItemManagerTest/data.xml")
+    @ShouldThrowException(IllegalArgumentException.class)
+    public void createItemFolderIsNull() {
+        final ContentSection section = sectionRepo.findByLabel("info");
+
+        itemManager.createContentItem("Test", section, null, Article.class);
+    }
+
+    @Test
+    @InSequence(2100)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "ContentItemManagerTest/data.xml")
+    @ShouldMatchDataSet(
+        value = "datasets/org/librecms/contentsection/"
+                    + "ContentItemManagerTest/"
+                    + "after-create-contentitem-with-lifecycle-and-workflow.xml",
+        excludeColumns = {"categorization_id",
+                          "lifecycle_id",
+                          "object_id",
+                          "object_order",
+                          "phase_id",
+                          "task_id",
+                          "uuid",
+                          "workflow_id"
+        })
+    public void createContentItemWithLifecycleAndWorkflow() {
+        final ContentSection section = sectionRepo.findByLabel("info");
+        final Category folder = section.getRootDocumentsFolder();
+
+        final WorkflowTemplate workflowTemplate = workflowTemplateRepo
+            .findById(-110L);
+        final LifecycleDefinition lifecycleDefinition = lifecycleDefinitionRepo
+            .findById(-210L);
+
+        final Article article = itemManager.createContentItem(
+            "new-article",
+            section,
+            folder,
+            workflowTemplate,
+            lifecycleDefinition,
+            Article.class);
+
+        assertThat("DisplayName has not the expected value.",
+                   article.getDisplayName(), is(equalTo("new-article")));
+        final Locale locale = new Locale("en");
+        assertThat("Name has not the expected value.",
+                   article.getName().getValue(locale),
+                   is(equalTo("new-article")));
+        assertThat("lifecycle was not added to content item.",
+                   article.getLifecycle(), is(not(nullValue())));
+        assertThat("workflow was not added to content item.",
+                   article.getWorkflow(), is(not(nullValue())));
+
+        final TypedQuery<Long> query = entityManager.createQuery(
+            "SELECT COUNT(w) FROM Workflow w", Long.class);
+        final long workflowCount = query.getSingleResult();
+        assertThat("Expected three workflows in database.",
+                   workflowCount, is(3L));
+    }
+
+    /**
+     * Checks if an {@link IllegalArgumentException} is thrown when the content
+     * type of the item to create is not registered with the provided content
+     * section.
+     */
+    @Test(expected = IllegalArgumentException.class)
+    @InSequence(2200)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "ContentItemManagerTest/data.xml")
+    @ShouldMatchDataSet("datasets/org/librecms/contentsection/"
+                            + "ContentItemManagerTest/data.xml")
+    @ShouldThrowException(IllegalArgumentException.class)
+    public void createItemTypeNotInSectionWithLifecycleAndWorkflow() {
+        final ContentSection section = sectionRepo.findByLabel("info");
+        final Category folder = section.getRootDocumentsFolder();
+
+        final WorkflowTemplate workflowTemplate = workflowTemplateRepo
+            .findById(-110L);
+        final LifecycleDefinition lifecycleDefinition = lifecycleDefinitionRepo
+            .findById(-210L);
+
+        itemManager.createContentItem("Test",
+                                      section,
+                                      folder,
+                                      workflowTemplate,
+                                      lifecycleDefinition,
+                                      Event.class);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    @InSequence(2300)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "ContentItemManagerTest/data.xml")
+    @ShouldMatchDataSet("datasets/org/librecms/contentsection/"
+                            + "ContentItemManagerTest/data.xml")
+    @ShouldThrowException(IllegalArgumentException.class)
+    public void createItemNameIsNullWithLifecycleAndWorkflow() {
+        final ContentSection section = sectionRepo.findByLabel("info");
+        final Category folder = section.getRootDocumentsFolder();
+
+        final WorkflowTemplate workflowTemplate = workflowTemplateRepo
+            .findById(-110L);
+        final LifecycleDefinition lifecycleDefinition = lifecycleDefinitionRepo
+            .findById(-210L);
+
+        itemManager.createContentItem(null,
+                                      section,
+                                      folder,
+                                      workflowTemplate,
+                                      lifecycleDefinition,
+                                      Article.class);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    @InSequence(2400)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "ContentItemManagerTest/data.xml")
+    @ShouldMatchDataSet("datasets/org/librecms/contentsection/"
+                            + "ContentItemManagerTest/data.xml")
+    @ShouldThrowException(IllegalArgumentException.class)
+    public void createItemNameIsNoWorkflow() {
+        final ContentSection section = sectionRepo.findByLabel("info");
+        final Category folder = section.getRootDocumentsFolder();
+
+        final LifecycleDefinition lifecycleDefinition = lifecycleDefinitionRepo
+            .findById(-210L);
+
+        itemManager.createContentItem(null,
+                                      section,
+                                      folder,
+                                      null,
+                                      lifecycleDefinition,
+                                      Article.class);
+    }
+
     // Create content item with lifecycle and workflow name empty
-    // Create content item with lifecycle and workflow folder null
-    // Create content item with lifecycle and workflow folder no a folder
-    // Move item
-    // Move item item null
-    // Move item folder null
-    // Move item folder not a folder
-    // copy item
-    // copy item item null
-    // copy item folder null
-    // copy item folder not a folder
+    @Test(expected = IllegalArgumentException.class)
+    @InSequence(2500)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "ContentItemManagerTest/data.xml")
+    @ShouldMatchDataSet("datasets/org/librecms/contentsection/"
+                            + "ContentItemManagerTest/data.xml")
+    @ShouldThrowException(IllegalArgumentException.class)
+    public void createItemNoLifecycle() {
+        final ContentSection section = sectionRepo.findByLabel("info");
+        final Category folder = section.getRootDocumentsFolder();
+
+        final WorkflowTemplate workflowTemplate = workflowTemplateRepo
+            .findById(-110L);
+
+        itemManager.createContentItem(null,
+                                      section,
+                                      folder,
+                                      workflowTemplate,
+                                      null,
+                                      Article.class);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    @InSequence(2600)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "ContentItemManagerTest/data.xml")
+    @ShouldMatchDataSet("datasets/org/librecms/contentsection/"
+                            + "ContentItemManagerTest/data.xml")
+    @ShouldThrowException(IllegalArgumentException.class)
+    public void createItemFolderIsNullWithLifecycleAndWorkflow() {
+        final ContentSection section = sectionRepo.findByLabel("info");
+
+        final WorkflowTemplate workflowTemplate = workflowTemplateRepo
+            .findById(-110L);
+        final LifecycleDefinition lifecycleDefinition = lifecycleDefinitionRepo
+            .findById(-210L);
+
+        itemManager.createContentItem("Test",
+                                      section,
+                                      null,
+                                      workflowTemplate,
+                                      lifecycleDefinition,
+                                      Article.class);
+    }
+
+    @Test
+    @InSequence(3100)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "ContentItemManagerTest/move-before.xml")
+    @ShouldMatchDataSet(
+        value = "datasets/org/librecms/contentsection/"
+                    + "ContentItemManagerTest/move-after.xml",
+        excludeColumns = {"categorization_id",
+                          "lifecycle_id",
+                          "object_id",
+                          "object_order",
+                          "phase_id",
+                          "task_id",
+                          "uuid",
+                          "workflow_id"
+        })
+    public void moveItem() {
+        final Optional<ContentItem> item = itemRepo.findById(-10100L);
+        assertThat(item.isPresent(), is(true));
+
+        final Category targetFolder = categoryRepo.findById(-2120L);
+        assertThat(targetFolder, is(not(nullValue())));
+
+        itemManager.move(item.get(), targetFolder);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    @InSequence(3200)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "ContentItemManagerTest/move-before.xml")
+    @ShouldMatchDataSet("datasets/org/librecms/contentsection/"
+                            + "ContentItemManagerTest/move-before.xml")
+    @ShouldThrowException(IllegalArgumentException.class)
+    public void moveItemNull() {
+        final Category targetFolder = categoryRepo.findById(-2120L);
+        assertThat(targetFolder, is(not(nullValue())));
+
+        itemManager.move(null, targetFolder);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    @InSequence(3200)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "ContentItemManagerTest/move-before.xml")
+    @ShouldMatchDataSet("datasets/org/librecms/contentsection/"
+                            + "ContentItemManagerTest/move-before.xml")
+    @ShouldThrowException(IllegalArgumentException.class)
+    public void moveItemFolderNull() {
+        final Optional<ContentItem> item = itemRepo.findById(-10100L);
+        assertThat(item.isPresent(), is(true));
+
+        itemManager.move(item.get(), null);
+    }
+
+    @Test
+    @InSequence(4100)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "ContentItemManagerTest/move-before.xml")
+    @ShouldMatchDataSet(
+        value = "datasets/org/librecms/contentsection/"
+                    + "ContentItemManagerTest/copy-to-other-folder-after.xml",
+        excludeColumns = {"categorization_id",
+                          "lifecycle_id",
+                          "object_id",
+                          "object_order",
+                          "phase_id",
+                          "task_id",
+                          "uuid",
+                          "workflow_id"
+        })
+    public void copyToOtherFolder() {
+        final Optional<ContentItem> item = itemRepo.findById(-10100L);
+        assertThat(item.isPresent(), is(true));
+
+        final Category targetFolder = categoryRepo.findById(-2120L);
+        assertThat(targetFolder, is(not(nullValue())));
+        
+        itemManager.copy(item.get(), targetFolder);
+    }
+    
+    @Test
+    @InSequence(4200)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "ContentItemManagerTest/move-before.xml")
+    @ShouldMatchDataSet(
+        value = "datasets/org/librecms/contentsection/"
+                    + "ContentItemManagerTest/copy-to-same-folder-after.xml",
+        excludeColumns = {"categorization_id",
+                          "lifecycle_id",
+                          "object_id",
+                          "object_order",
+                          "phase_id",
+                          "task_id",
+                          "uuid",
+                          "workflow_id"
+        })
+    public void copyToSameFolder() {
+        final Optional<ContentItem> item = itemRepo.findById(-10100L);
+        assertThat(item.isPresent(), is(true));
+
+        final Category targetFolder = categoryRepo.findById(-2110L);
+        assertThat(targetFolder, is(not(nullValue())));
+        
+        itemManager.copy(item.get(), targetFolder);
+    }
+    
+    @Test(expected = IllegalArgumentException.class)
+    @InSequence(4100)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "ContentItemManagerTest/move-before.xml")
+    @ShouldMatchDataSet(
+        value = "datasets/org/librecms/contentsection/"
+                      + "ContentItemManagerTest/move-before.xml")
+    @ShouldThrowException(IllegalArgumentException.class)
+    public void copyItemNull() {
+        final Category targetFolder = categoryRepo.findById(-2120L);
+        assertThat(targetFolder, is(not(nullValue())));
+        
+        itemManager.copy(null, targetFolder);
+    }
+    
+    @Test(expected = IllegalArgumentException.class)
+    @InSequence(4100)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "ContentItemManagerTest/move-before.xml")
+    @ShouldMatchDataSet(
+        value = "datasets/org/librecms/contentsection/"
+                      + "ContentItemManagerTest/move-before.xml")
+    @ShouldThrowException(IllegalArgumentException.class)
+    public void copyItemToFolderNull() {
+        final Optional<ContentItem> item = itemRepo.findById(-10100L);
+        assertThat(item.isPresent(), is(true));
+        
+        itemManager.copy(item.get(), null);
+    }
+    
     // publish item (draft)
     // publish item (live)
     // publish item null
diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/DatasetsTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/DatasetsTest.java
index 41c73ee70..0b00f10a6 100644
--- a/ccm-cms/src/test/java/org/librecms/contentsection/DatasetsTest.java
+++ b/ccm-cms/src/test/java/org/librecms/contentsection/DatasetsTest.java
@@ -50,7 +50,12 @@ public class DatasetsTest extends DatasetsVerifier {
             "/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-rename.xml",
             "/datasets/org/librecms/contentsection/ContentItemRepositoryTest/data.xml",
             "/datasets/org/librecms/contentsection/ContentItemManagerTest/data.xml",
-            "/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem.xml"});
+            "/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem.xml",
+            "/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem-with-lifecycle-and-workflow.xml",
+            "/datasets/org/librecms/contentsection/ContentItemManagerTest/move-before.xml",
+            "/datasets/org/librecms/contentsection/ContentItemManagerTest/move-after.xml",
+            "/datasets/org/librecms/contentsection/ContentItemManagerTest/copy-to-other-folder-after.xml",
+            "/datasets/org/librecms/contentsection/ContentItemManagerTest/copy-to-same-folder-after.xml"});
     }
 
     public DatasetsTest(final String datasetPath) {
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem-with-lifecycle-and-workflow.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem-with-lifecycle-and-workflow.xml
new file mode 100644
index 000000000..593a90164
--- /dev/null
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem-with-lifecycle-and-workflow.xml
@@ -0,0 +1,527 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+    
+    <ccm_core.workflows workflow_id="-100" />
+    <ccm_core.workflows workflow_id="-110" />
+    <ccm_core.workflows workflow_id="-120" />
+
+    <ccm_core.workflow_names workflow_id="-100" 
+                             locale="en"
+                             localized_value="Standard workflow" />
+    <ccm_core.workflow_names workflow_id="-110" 
+                             locale="en"
+                             localized_value="Fast workflow" />
+    <ccm_core.workflow_names workflow_id="-120" 
+                             locale="en"
+                             localized_value="Fast workflow" />
+    
+    <ccm_core.workflow_templates workflow_id="-100" />
+    <ccm_core.workflow_templates workflow_id="-110" />
+    
+    <ccm_core.workflow_tasks task_id="-100100"
+                             active="false" 
+                             task_state="waiting" 
+                             workflow_id="-100" />
+    <ccm_core.workflow_tasks task_id="-100200"
+                             active="false" 
+                             task_state="waiting" 
+                             workflow_id="-100" />
+    <ccm_core.workflow_tasks task_id="-110100"
+                             active="false" 
+                             task_state="waiting" 
+                             workflow_id="-110" />
+    <ccm_core.workflow_tasks task_id="-120100"
+                             active="false" 
+                             task_state="waiting" 
+                             workflow_id="-120" />
+    
+    <ccm_core.workflow_task_labels task_id="-100100" 
+                                   localized_value="Task 1.1" 
+                                   locale="en" />
+    <ccm_core.workflow_task_labels task_id="-100200" 
+                                   localized_value="Task 1.2" 
+                                   locale="en" />
+    <ccm_core.workflow_task_labels task_id="-110100" 
+                                   localized_value="Task 2.1" 
+                                   locale="en" />
+    <ccm_core.workflow_task_labels task_id="-120100" 
+                                   localized_value="Task 2.1" 
+                                   locale="en" />
+    
+    <ccm_core.workflow_user_tasks task_id="-100100" 
+                                  duration_minutes="0" 
+                                  locked="false" />
+    <ccm_core.workflow_user_tasks task_id="-100200" 
+                                  duration_minutes="0"
+                                  locked="false" />
+    <ccm_core.workflow_user_tasks task_id="-110100" 
+                                  duration_minutes="0" 
+                                  locked="false" />
+    <ccm_core.workflow_user_tasks task_id="-120100" 
+                                  duration_minutes="0" 
+                                  locked="false" />
+        
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-200" />
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-210" />
+    
+    <ccm_cms.lifecycle_definition_labels object_id="-200" 
+                                         localized_value="Default lifecycle" 
+                                         locale="en" />
+    <ccm_cms.lifecycle_definition_labels object_id="-210" 
+                                         localized_value="Alternate lifecycle" 
+                                         locale="en" />
+    
+    <ccm_cms.lifecycle_phase_definitions phase_definition_id="-200100" 
+                                         lifecycle_definition_id="-200"
+                                         default_delay="0" 
+                                         default_duration="0" />
+    <ccm_cms.lifecycle_phase_definitions phase_definition_id="-200200" 
+                                         lifecycle_definition_id="-200"
+                                         default_delay="0" 
+                                         default_duration="0" />
+    <ccm_cms.lifecycle_phase_definitions phase_definition_id="-210100" 
+                                         lifecycle_definition_id="-210"
+                                         default_delay="0" 
+                                         default_duration="0" />
+    
+    <ccm_cms.lifecycle_phase_definition_labels object_id="-200100" 
+                                               localized_value="Phase 1" 
+                                               locale="en" />
+    <ccm_cms.lifecycle_phase_definition_labels object_id="-200200" 
+                                               localized_value="Phase 2" 
+                                               locale="en" />
+    <ccm_cms.lifecycle_phase_definition_labels object_id="-210100" 
+                                               localized_value="The only phase" 
+                                               locale="en" />
+    
+    <ccm_cms.lifecycles lifecycle_id="-300" 
+                        started="false"
+                        finished="false"
+                        definition_id="-210" />
+    
+    <ccm_cms.lifecyle_phases phase_id="-300100" 
+                             started="false" 
+                             finished="false" />
+    
+    <ccm_core.ccm_objects object_id="-1100"
+                          display_name="info"
+                          uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
+    <ccm_core.ccm_objects object_id="-2100"
+                          display_name="info_root"
+                          uuid="82014239-9c06-486d-ae8c-4ae47f52a699" />
+    <ccm_core.ccm_objects object_id="-2200"
+                          display_name="info_assets"
+                          uuid="b163f73c-9ac2-44d7-a037-de621f5ca828" />
+    <ccm_core.ccm_objects object_id="-10100"
+                          display_name="article1"
+                          uuid="aed4b402-1180-46c6-b42d-7245f4dca248" />
+    <ccm_core.ccm_objects object_id="-10300"
+                          display_name="article3"
+                          uuid="f4b38abb-234b-4354-bc92-e36c068a1ebd" />
+    <ccm_core.ccm_objects object_id="-10200"
+                          display_name="article2"
+                          uuid="acae860f-2ffa-450d-b486-054292f0dae6" />
+    <ccm_core.ccm_objects object_id="-10400"
+                          display_name="news1"
+                          uuid="d9ea527d-c6e3-4bdd-962d-c0a1a80c6c72" />
+    <ccm_core.ccm_objects object_id="-20100"
+                          display_name="org.librecms.contenttypes.Article"
+                          uuid="2c8ec2fb-319d-4d44-9698-697c08b2b941" />
+    <ccm_core.ccm_objects object_id="-20200"
+                          display_name="org.librecms.contenttypes.News"
+                          uuid="47740f22-f89f-4ec3-90cf-d62859e53c7e" />
+    <ccm_core.ccm_objects object_id="-11100"
+                          display_name="new-article"
+                          uuid="cfa0efb6-7ce2-41e8-be03-4ee8c7f18b05" />
+    
+    <ccm_core.categories object_id="-2100"
+                         unique_id="82014239-9c06-486d-ae8c-4ae47f52a699"
+                         name="info_root" 
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
+    <ccm_core.categories object_id="-2200"
+                         unique_id="b163f73c-9ac2-44d7-a037-de621f5ca828"
+                         name="info_assets" 
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false" 
+                         category_order="1" />
+                             
+    <ccm_core.category_titles object_id="-2100" 
+                              locale="en" 
+                              localized_value="info_root" />
+    <ccm_core.category_titles object_id="-2200" 
+                              locale="en" 
+                              localized_value="info_assets" />
+    
+    <ccm_core.resources object_id="-1100" 
+                        created="2016-07-15" />
+    
+    <ccm_core.resource_titles object_id="-1100" 
+                              locale="en"
+                              localized_value="info" />
+    
+    <ccm_core.applications object_id="-1100"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="info" />
+    
+    <ccm_cms.content_sections object_id="-1100"
+                              label="info"
+                              root_documents_folder_id="-2100"
+                              root_assets_folder_id="-2200" />
+    
+    <ccm_cms.content_section_workflow_templates 
+        content_section_id="-1100" 
+        workflow_template_id="-100" />
+    <ccm_cms.content_section_workflow_templates 
+        content_section_id="-1100" 
+        workflow_template_id="-110" />
+    
+    <ccm_cms.content_section_lifecycle_definitions 
+        content_section_id="-1100"
+        lifecycle_definition_id="-200" />
+    <ccm_cms.content_section_lifecycle_definitions 
+        content_section_id="-1100"
+        lifecycle_definition_id="-210" />
+    
+    <ccm_cms.content_types object_id="-20100" 
+                           content_item_class="org.librecms.contenttypes.Article" 
+                           content_section_id="-1100" 
+                           default_workflow="-100" 
+                           default_lifecycle_id="-200" />
+    <ccm_cms.content_types object_id="-20200" 
+                           content_item_class="org.librecms.contenttypes.News" 
+                           content_section_id="-1100" 
+                           default_workflow="-100" 
+                           default_lifecycle_id="-200" />
+    
+    <ccm_cms.content_items object_id="-10100" 
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-10200" 
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-10300" 
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-10400" 
+                           version="DRAFT"
+                           content_type_id="-20200" />
+    <ccm_cms.content_items object_id="-11100" 
+                           version="DRAFT"
+                           content_type_id="-20100" 
+                           workflow_id="-120" />
+    
+    <ccm_cms.content_item_names object_id="-10100" 
+                                locale="en" 
+                                localized_value="article1" />
+    <ccm_cms.content_item_names object_id="-10200" 
+                                locale="en" 
+                                localized_value="article2" />
+    <ccm_cms.content_item_names object_id="-10300" 
+                                locale="en" 
+                                localized_value="article3" />
+    <ccm_cms.content_item_names object_id="-10400" 
+                                locale="en" 
+                                localized_value="news1" />
+    <ccm_cms.content_item_names object_id="-11100" 
+                                locale="en" 
+                                localized_value="new-article" />
+    
+    <ccm_cms.content_item_titles object_id="-10100" 
+                                 locale="en" 
+                                 localized_value="Article 1" />
+    <ccm_cms.content_item_titles object_id="-10200" 
+                                 locale="en" 
+                                 localized_value="Article 2" />
+    <ccm_cms.content_item_titles object_id="-10300" 
+                                 locale="en" 
+                                 localized_value="Article 3" />
+    <ccm_cms.content_item_titles object_id="-10400" 
+                                 locale="en" 
+                                 localized_value="News 1" />
+    <!--<ccm_cms.content_item_titles object_id="-11100" 
+                                 locale="en" 
+                                 localized_value="new-article" />-->
+    
+    <ccm_cms.content_type_labels object_id="-20100"
+                                 locale="en" 
+                                 localized_value="Article" />
+    <ccm_cms.content_type_labels object_id="-20200"
+                                 locale="en" 
+                                 localized_value="News" />
+    
+    <ccm_cms.articles object_id="-10100" />
+    <ccm_cms.articles object_id="-10200" />
+    <ccm_cms.articles object_id="-10300" />
+    <ccm_cms.articles object_id="-11100" />
+    
+    <ccm_cms.article_texts 
+        object_id="-10100"
+        locale="en" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+    <ccm_cms.article_texts 
+        object_id="-10200"
+        locale="en" 
+        localized_value="Duis quis tincidunt elit. In pharetra justo sit amet ipsum dictum, at." />
+    <ccm_cms.article_texts 
+        object_id="-10300"
+        locale="en" 
+        localized_value="Etiam euismod lacus laoreet sodales ultricies. Pellentesque non elit vitae purus sagittis." />
+    
+    <ccm_cms.news object_id="-10400"
+                  news_date="2016-08-08" 
+                  homepage="false" />
+    
+    <ccm_cms.news_texts 
+        object_id="-10400"
+        locale="en" 
+        localized_value="Curabitur vel sapien eu eros gravida bibendum vitae." />
+    
+    <ccm_core.categorizations categorization_id="-30100" 
+                              category_id="-2100" 
+                              object_id="-10100" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30200" 
+                              category_id="-2100" 
+                              object_id="-10200" 
+                              category_order="1" 
+                              object_order="2" 
+                              category_index="false" 
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30300" 
+                              category_id="-2100" 
+                              object_id="-10300" 
+                              category_order="1" 
+                              object_order="3" 
+                              category_index="false" 
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30400" 
+                              category_id="-2100" 
+                              object_id="-10400" 
+                              category_order="1" 
+                              object_order="4" 
+                              category_index="false" 
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30500" 
+                              category_id="-2100" 
+                              object_id="-11100" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    
+    <ccm_core.ccm_roles role_id="-3100"
+                        name="info_alert_recipient" />
+    <ccm_core.ccm_roles role_id="-3200"
+                        name="info_author" />
+    <ccm_core.ccm_roles role_id="-3300"
+                        name="info_editor" />
+    <ccm_core.ccm_roles role_id="-3400"
+                        name="info_manager" />
+    <ccm_core.ccm_roles role_id="-3500"
+                        name="info_publisher" />
+    <ccm_core.ccm_roles role_id="-3600"
+                        name="info_content_reader" />
+    
+    <ccm_core.task_assignments task_assignment_id="-910"
+                               task_id="-100100" 
+                               role_id="-3200" />
+    <ccm_core.task_assignments task_assignment_id="-920"
+                               task_id="-100100" 
+                               role_id="-3300" />
+    <ccm_core.task_assignments task_assignment_id="-930"
+                               task_id="-110100" 
+                               role_id="-3200" />
+    
+    <ccm_cms.content_section_roles role_id="-3100" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3200" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3300" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3400" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3500" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3600" 
+                                   section_id="-1100" />
+    
+    <ccm_core.permissions permission_id="-4110" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4120" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4130" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4140" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4150" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4210" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4220" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4230" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4240" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4250" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4260" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4270" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4310" 
+                          granted_privilege="administer_roles" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4320" 
+                          granted_privilege="administer_workflow" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4330" 
+                          granted_privilege="administer_lifecyles" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4340" 
+                          granted_privilege="administer_categories" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4350" 
+                          granted_privilege="administer_content_types" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4360" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4370" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4380" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4390" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4400" 
+                          granted_privilege="publish_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4410" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4420" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4430" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4510" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4520" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4530" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4540" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4550" 
+                          granted_privilege="publish_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4560" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4570" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4580" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4610" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"/>
+
+    
+</dataset>
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/copy-to-other-folder-after.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/copy-to-other-folder-after.xml
new file mode 100644
index 000000000..274cdbccd
--- /dev/null
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/copy-to-other-folder-after.xml
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+    
+    <ccm_core.workflows workflow_id="-100" />
+    <ccm_core.workflows workflow_id="-110" />
+
+    <ccm_core.workflow_names workflow_id="-100" 
+                             locale="en"
+                             localized_value="Standard workflow" />
+    <ccm_core.workflow_names workflow_id="-110" 
+                             locale="en"
+                             localized_value="Fast workflow" />
+    
+    <ccm_core.workflow_templates workflow_id="-100" />
+    <ccm_core.workflow_templates workflow_id="-110" />
+    
+    <ccm_core.workflow_tasks task_id="-100100"
+                             active="false" 
+                             task_state="waiting" 
+                             workflow_id="-100" />
+    <ccm_core.workflow_tasks task_id="-100200"
+                             active="false" 
+                             task_state="waiting" 
+                             workflow_id="-100" />
+    <ccm_core.workflow_tasks task_id="-110100"
+                             active="false" 
+                             task_state="waiting" 
+                             workflow_id="-110" />
+    
+    <ccm_core.workflow_task_labels task_id="-100100" 
+                                   localized_value="Task 1.1" 
+                                   locale="en" />
+    <ccm_core.workflow_task_labels task_id="-100200" 
+                                   localized_value="Task 1.2" 
+                                   locale="en" />
+    <ccm_core.workflow_task_labels task_id="-110100" 
+                                   localized_value="Task 2.1" 
+                                   locale="en" />
+    
+    <ccm_core.workflow_user_tasks task_id="-100100" 
+                                  duration_minutes="0" 
+                                  locked="false" />
+    <ccm_core.workflow_user_tasks task_id="-100200" 
+                                  duration_minutes="0" 
+                                  locked="false" />
+    <ccm_core.workflow_user_tasks task_id="-110100" 
+                                  duration_minutes="0" 
+                                  locked="false" />
+        
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-200" />
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-210" />
+    
+    <ccm_cms.lifecycle_definition_labels object_id="-200" 
+                                         localized_value="Default lifecycle" 
+                                         locale="en" />
+    <ccm_cms.lifecycle_definition_labels object_id="-210" 
+                                         localized_value="Alternate lifecycle" 
+                                         locale="en" />
+    
+    <ccm_cms.lifecycle_phase_definitions phase_definition_id="-200100" 
+                                         lifecycle_definition_id="-200"
+                                         default_delay="0" 
+                                         default_duration="0" />
+    <ccm_cms.lifecycle_phase_definitions phase_definition_id="-200200" 
+                                         lifecycle_definition_id="-200"
+                                         default_delay="0" 
+                                         default_duration="0" />
+    <ccm_cms.lifecycle_phase_definitions phase_definition_id="-210100" 
+                                         lifecycle_definition_id="-210"
+                                         default_delay="0" 
+                                         default_duration="0" />
+    
+    <ccm_cms.lifecycle_phase_definition_labels object_id="-200100" 
+                                               localized_value="Phase 1" 
+                                               locale="en" />
+    <ccm_cms.lifecycle_phase_definition_labels object_id="-200200" 
+                                               localized_value="Phase 2" 
+                                               locale="en" />
+    <ccm_cms.lifecycle_phase_definition_labels object_id="-210100" 
+                                               localized_value="The only phase" 
+                                               locale="en" />
+    
+    <ccm_core.ccm_objects object_id="-1100"
+                          display_name="info"
+                          uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
+    <ccm_core.ccm_objects object_id="-2100"
+                          display_name="info_root"
+                          uuid="82014239-9c06-486d-ae8c-4ae47f52a699" />
+    <ccm_core.ccm_objects object_id="-2110" 
+                          display_name="folder1" 
+                          uuid="c634c1c3-41b7-4773-bb2e-5b6cd14492a3" />
+    <ccm_core.ccm_objects object_id="-2120" 
+                          display_name="folder2" 
+                          uuid="3b2a3a92-cdea-4fe3-b364-401eb3fb0ffc" />
+    <ccm_core.ccm_objects object_id="-2200"
+                          display_name="info_assets"
+                          uuid="b163f73c-9ac2-44d7-a037-de621f5ca828" />
+    <ccm_core.ccm_objects object_id="-10100"
+                          display_name="article1"
+                          uuid="aed4b402-1180-46c6-b42d-7245f4dca248" />
+    <ccm_core.ccm_objects object_id="-10300"
+                          display_name="article3"
+                          uuid="f4b38abb-234b-4354-bc92-e36c068a1ebd" />
+    <ccm_core.ccm_objects object_id="-10200"
+                          display_name="article2"
+                          uuid="acae860f-2ffa-450d-b486-054292f0dae6" />
+    <ccm_core.ccm_objects object_id="-10400"
+                          display_name="news1"
+                          uuid="d9ea527d-c6e3-4bdd-962d-c0a1a80c6c72" />
+    <ccm_core.ccm_objects object_id="-20100"
+                          display_name="org.librecms.contenttypes.Article"
+                          uuid="2c8ec2fb-319d-4d44-9698-697c08b2b941" />
+    <ccm_core.ccm_objects object_id="-20200"
+                          display_name="org.librecms.contenttypes.News"
+                          uuid="47740f22-f89f-4ec3-90cf-d62859e53c7e" />
+    <ccm_core.ccm_objects object_id="-10500"
+                          display_name="article1" 
+                          uuid="12b63933-3167-4dc5-9b55-726a727c55b1" />
+    
+    <ccm_core.categories object_id="-2100"
+                         unique_id="82014239-9c06-486d-ae8c-4ae47f52a699"
+                         name="info_root" 
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
+    <ccm_core.categories object_id="-2110" 
+                         unique_id="c634c1c3-41b7-4773-bb2e-5b6cd14492a3"
+                         parent_category_id="-2100"
+                         name="folder1"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
+    <ccm_core.categories object_id="-2120" 
+                         unique_id="3b2a3a92-cdea-4fe3-b364-401eb3fb0ffc"
+                         parent_category_id="-2100"
+                         name="folder2"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="2" />
+    <ccm_core.categories object_id="-2200"
+                         unique_id="b163f73c-9ac2-44d7-a037-de621f5ca828"
+                         name="info_assets" 
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false" 
+                         category_order="1" />
+                             
+    <ccm_core.category_titles object_id="-2100" 
+                              locale="en" 
+                              localized_value="info_root" />
+    <ccm_core.category_titles object_id="-2200" 
+                              locale="en" 
+                              localized_value="info_assets" />
+    
+    <ccm_core.resources object_id="-1100" 
+                        created="2016-07-15" />
+    <ccm_core.resource_titles object_id="-1100" 
+                              locale="en"
+                              localized_value="info" />
+    
+    <ccm_core.applications object_id="-1100"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="info" />
+    
+    <ccm_cms.content_sections object_id="-1100"
+                              label="info"
+                              root_documents_folder_id="-2100"
+                              root_assets_folder_id="-2200" />
+    
+    <ccm_cms.content_section_workflow_templates 
+        content_section_id="-1100" 
+        workflow_template_id="-100" />
+    <ccm_cms.content_section_workflow_templates 
+        content_section_id="-1100" 
+        workflow_template_id="-110" />
+    
+    <ccm_cms.content_section_lifecycle_definitions 
+        content_section_id="-1100"
+        lifecycle_definition_id="-200" />
+    <ccm_cms.content_section_lifecycle_definitions 
+        content_section_id="-1100"
+        lifecycle_definition_id="-210" />
+    
+    <ccm_cms.content_types object_id="-20100" 
+                           content_item_class="org.librecms.contenttypes.Article" 
+                           content_section_id="-1100" 
+                           default_workflow="-100" 
+                           default_lifecycle_id="-200" />
+    <ccm_cms.content_types object_id="-20200" 
+                           content_item_class="org.librecms.contenttypes.News" 
+                           content_section_id="-1100" 
+                           default_workflow="-100" 
+                           default_lifecycle_id="-200" />
+    
+    <ccm_cms.content_items object_id="-10100" 
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-10200" 
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-10300" 
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-10400" 
+                           version="DRAFT"
+                           content_type_id="-20200" />
+    <ccm_cms.content_items object_id="-10500" 
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    
+    <ccm_cms.content_item_names object_id="-10100" 
+                                locale="en" 
+                                localized_value="article1" />
+    <ccm_cms.content_item_names object_id="-10200" 
+                                locale="en" 
+                                localized_value="article2" />
+    <ccm_cms.content_item_names object_id="-10300" 
+                                locale="en" 
+                                localized_value="article3" />
+    <ccm_cms.content_item_names object_id="-10400" 
+                                locale="en" 
+                                localized_value="news1" />
+    <ccm_cms.content_item_names object_id="-10500" 
+                                locale="en" 
+                                localized_value="article1" />
+    
+    <ccm_cms.content_item_titles object_id="-10100" 
+                                 locale="en" 
+                                 localized_value="Article 1" />
+    <ccm_cms.content_item_titles object_id="-10200" 
+                                 locale="en" 
+                                 localized_value="Article 2" />
+    <ccm_cms.content_item_titles object_id="-10300" 
+                                 locale="en" 
+                                 localized_value="Article 3" />
+    <ccm_cms.content_item_titles object_id="-10400" 
+                                 locale="en" 
+                                 localized_value="News 1" />
+    <ccm_cms.content_item_titles object_id="-10500" 
+                                 locale="en" 
+                                 localized_value="Article 1" />
+    
+    <ccm_cms.content_type_labels object_id="-20100"
+                                 locale="en" 
+                                 localized_value="Article" />
+    <ccm_cms.content_type_labels object_id="-20200"
+                                 locale="en" 
+                                 localized_value="News" />
+    
+    <ccm_cms.articles object_id="-10100" />
+    <ccm_cms.articles object_id="-10200" />
+    <ccm_cms.articles object_id="-10300" />
+    <ccm_cms.articles object_id="-10500" />
+    
+    <ccm_cms.article_texts 
+        object_id="-10100"
+        locale="en" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+    <ccm_cms.article_texts 
+        object_id="-10200"
+        locale="en" 
+        localized_value="Duis quis tincidunt elit. In pharetra justo sit amet ipsum dictum, at." />
+    <ccm_cms.article_texts 
+        object_id="-10300"
+        locale="en" 
+        localized_value="Etiam euismod lacus laoreet sodales ultricies. Pellentesque non elit vitae purus sagittis." />
+    <ccm_cms.article_texts 
+        object_id="-10500"
+        locale="en" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+    
+    <ccm_cms.news object_id="-10400"
+                  news_date="2016-08-08" 
+                  homepage="false" />
+    
+    <ccm_cms.news_texts 
+        object_id="-10400"
+        locale="en" 
+        localized_value="Curabitur vel sapien eu eros gravida bibendum vitae." />
+    
+    <ccm_core.categorizations categorization_id="-30100" 
+                              category_id="-2110" 
+                              object_id="-10100" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30200" 
+                              category_id="-2100" 
+                              object_id="-10200" 
+                              category_order="1" 
+                              object_order="2" 
+                              category_index="false" 
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30300" 
+                              category_id="-2100" 
+                              object_id="-10300" 
+                              category_order="1" 
+                              object_order="3" 
+                              category_index="false" 
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30400" 
+                              category_id="-2100" 
+                              object_id="-10400" 
+                              category_order="1" 
+                              object_order="4" 
+                              category_index="false" 
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30500" 
+                              category_id="-2120" 
+                              object_id="-10500" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    
+    <ccm_core.ccm_roles role_id="-3100"
+                        name="info_alert_recipient" />
+    <ccm_core.ccm_roles role_id="-3200"
+                        name="info_author" />
+    <ccm_core.ccm_roles role_id="-3300"
+                        name="info_editor" />
+    <ccm_core.ccm_roles role_id="-3400"
+                        name="info_manager" />
+    <ccm_core.ccm_roles role_id="-3500"
+                        name="info_publisher" />
+    <ccm_core.ccm_roles role_id="-3600"
+                        name="info_content_reader" />
+    
+    <ccm_core.task_assignments task_assignment_id="-910"
+                               task_id="-100100" 
+                               role_id="-3200" />
+    <ccm_core.task_assignments task_assignment_id="-920"
+                               task_id="-100100" 
+                               role_id="-3300" />
+    <ccm_core.task_assignments task_assignment_id="-930"
+                               task_id="-110100" 
+                               role_id="-3200" />
+    
+    <ccm_cms.content_section_roles role_id="-3100" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3200" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3300" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3400" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3500" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3600" 
+                                   section_id="-1100" />
+    
+    <ccm_core.permissions permission_id="-4110" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4120" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4130" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4140" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4150" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4210" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4220" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4230" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4240" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4250" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4260" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4270" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4310" 
+                          granted_privilege="administer_roles" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4320" 
+                          granted_privilege="administer_workflow" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4330" 
+                          granted_privilege="administer_lifecyles" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4340" 
+                          granted_privilege="administer_categories" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4350" 
+                          granted_privilege="administer_content_types" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4360" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4370" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4380" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4390" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4400" 
+                          granted_privilege="publish_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4410" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4420" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4430" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4510" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4520" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4530" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4540" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4550" 
+                          granted_privilege="publish_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4560" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4570" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4580" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4610" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"/>
+
+    
+</dataset>
+
+
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/copy-to-same-folder-after.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/copy-to-same-folder-after.xml
new file mode 100644
index 000000000..829565188
--- /dev/null
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/copy-to-same-folder-after.xml
@@ -0,0 +1,531 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+    
+    <ccm_core.workflows workflow_id="-100" />
+    <ccm_core.workflows workflow_id="-110" />
+
+    <ccm_core.workflow_names workflow_id="-100" 
+                             locale="en"
+                             localized_value="Standard workflow" />
+    <ccm_core.workflow_names workflow_id="-110" 
+                             locale="en"
+                             localized_value="Fast workflow" />
+    
+    <ccm_core.workflow_templates workflow_id="-100" />
+    <ccm_core.workflow_templates workflow_id="-110" />
+    
+    <ccm_core.workflow_tasks task_id="-100100"
+                             active="false" 
+                             task_state="waiting" 
+                             workflow_id="-100" />
+    <ccm_core.workflow_tasks task_id="-100200"
+                             active="false" 
+                             task_state="waiting" 
+                             workflow_id="-100" />
+    <ccm_core.workflow_tasks task_id="-110100"
+                             active="false" 
+                             task_state="waiting" 
+                             workflow_id="-110" />
+    
+    <ccm_core.workflow_task_labels task_id="-100100" 
+                                   localized_value="Task 1.1" 
+                                   locale="en" />
+    <ccm_core.workflow_task_labels task_id="-100200" 
+                                   localized_value="Task 1.2" 
+                                   locale="en" />
+    <ccm_core.workflow_task_labels task_id="-110100" 
+                                   localized_value="Task 2.1" 
+                                   locale="en" />
+    
+    <ccm_core.workflow_user_tasks task_id="-100100" 
+                                  duration_minutes="0" 
+                                  locked="false" />
+    <ccm_core.workflow_user_tasks task_id="-100200" 
+                                  duration_minutes="0" 
+                                  locked="false" />
+    <ccm_core.workflow_user_tasks task_id="-110100" 
+                                  duration_minutes="0" 
+                                  locked="false" />
+        
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-200" />
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-210" />
+    
+    <ccm_cms.lifecycle_definition_labels object_id="-200" 
+                                         localized_value="Default lifecycle" 
+                                         locale="en" />
+    <ccm_cms.lifecycle_definition_labels object_id="-210" 
+                                         localized_value="Alternate lifecycle" 
+                                         locale="en" />
+    
+    <ccm_cms.lifecycle_phase_definitions phase_definition_id="-200100" 
+                                         lifecycle_definition_id="-200"
+                                         default_delay="0" 
+                                         default_duration="0" />
+    <ccm_cms.lifecycle_phase_definitions phase_definition_id="-200200" 
+                                         lifecycle_definition_id="-200"
+                                         default_delay="0" 
+                                         default_duration="0" />
+    <ccm_cms.lifecycle_phase_definitions phase_definition_id="-210100" 
+                                         lifecycle_definition_id="-210"
+                                         default_delay="0" 
+                                         default_duration="0" />
+    
+    <ccm_cms.lifecycle_phase_definition_labels object_id="-200100" 
+                                               localized_value="Phase 1" 
+                                               locale="en" />
+    <ccm_cms.lifecycle_phase_definition_labels object_id="-200200" 
+                                               localized_value="Phase 2" 
+                                               locale="en" />
+    <ccm_cms.lifecycle_phase_definition_labels object_id="-210100" 
+                                               localized_value="The only phase" 
+                                               locale="en" />
+    
+    <ccm_core.ccm_objects object_id="-1100"
+                          display_name="info"
+                          uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
+    <ccm_core.ccm_objects object_id="-2100"
+                          display_name="info_root"
+                          uuid="82014239-9c06-486d-ae8c-4ae47f52a699" />
+    <ccm_core.ccm_objects object_id="-2110" 
+                          display_name="folder1" 
+                          uuid="c634c1c3-41b7-4773-bb2e-5b6cd14492a3" />
+    <ccm_core.ccm_objects object_id="-2120" 
+                          display_name="folder2" 
+                          uuid="3b2a3a92-cdea-4fe3-b364-401eb3fb0ffc" />
+    <ccm_core.ccm_objects object_id="-2200"
+                          display_name="info_assets"
+                          uuid="b163f73c-9ac2-44d7-a037-de621f5ca828" />
+    <ccm_core.ccm_objects object_id="-10100"
+                          display_name="article1"
+                          uuid="aed4b402-1180-46c6-b42d-7245f4dca248" />
+    <ccm_core.ccm_objects object_id="-10300"
+                          display_name="article3"
+                          uuid="f4b38abb-234b-4354-bc92-e36c068a1ebd" />
+    <ccm_core.ccm_objects object_id="-10200"
+                          display_name="article2"
+                          uuid="acae860f-2ffa-450d-b486-054292f0dae6" />
+    <ccm_core.ccm_objects object_id="-10400"
+                          display_name="news1"
+                          uuid="d9ea527d-c6e3-4bdd-962d-c0a1a80c6c72" />
+    <ccm_core.ccm_objects object_id="-20100"
+                          display_name="org.librecms.contenttypes.Article"
+                          uuid="2c8ec2fb-319d-4d44-9698-697c08b2b941" />
+    <ccm_core.ccm_objects object_id="-20200"
+                          display_name="org.librecms.contenttypes.News"
+                          uuid="47740f22-f89f-4ec3-90cf-d62859e53c7e" />
+    <ccm_core.ccm_objects object_id="-10500"
+                          display_name="article1_copy1" 
+                          uuid="12b63933-3167-4dc5-9b55-726a727c55b1" />
+    
+    <ccm_core.categories object_id="-2100"
+                         unique_id="82014239-9c06-486d-ae8c-4ae47f52a699"
+                         name="info_root" 
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
+    <ccm_core.categories object_id="-2110" 
+                         unique_id="c634c1c3-41b7-4773-bb2e-5b6cd14492a3"
+                         parent_category_id="-2100"
+                         name="folder1"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
+    <ccm_core.categories object_id="-2120" 
+                         unique_id="3b2a3a92-cdea-4fe3-b364-401eb3fb0ffc"
+                         parent_category_id="-2100"
+                         name="folder2"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="2" />
+    <ccm_core.categories object_id="-2200"
+                         unique_id="b163f73c-9ac2-44d7-a037-de621f5ca828"
+                         name="info_assets" 
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false" 
+                         category_order="1" />
+                             
+    <ccm_core.category_titles object_id="-2100" 
+                              locale="en" 
+                              localized_value="info_root" />
+    <ccm_core.category_titles object_id="-2200" 
+                              locale="en" 
+                              localized_value="info_assets" />
+    
+    <ccm_core.resources object_id="-1100" 
+                        created="2016-07-15" />
+    <ccm_core.resource_titles object_id="-1100" 
+                              locale="en"
+                              localized_value="info" />
+    
+    <ccm_core.applications object_id="-1100"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="info" />
+    
+    <ccm_cms.content_sections object_id="-1100"
+                              label="info"
+                              root_documents_folder_id="-2100"
+                              root_assets_folder_id="-2200" />
+    
+    <ccm_cms.content_section_workflow_templates 
+        content_section_id="-1100" 
+        workflow_template_id="-100" />
+    <ccm_cms.content_section_workflow_templates 
+        content_section_id="-1100" 
+        workflow_template_id="-110" />
+    
+    <ccm_cms.content_section_lifecycle_definitions 
+        content_section_id="-1100"
+        lifecycle_definition_id="-200" />
+    <ccm_cms.content_section_lifecycle_definitions 
+        content_section_id="-1100"
+        lifecycle_definition_id="-210" />
+    
+    <ccm_cms.content_types object_id="-20100" 
+                           content_item_class="org.librecms.contenttypes.Article" 
+                           content_section_id="-1100" 
+                           default_workflow="-100" 
+                           default_lifecycle_id="-200" />
+    <ccm_cms.content_types object_id="-20200" 
+                           content_item_class="org.librecms.contenttypes.News" 
+                           content_section_id="-1100" 
+                           default_workflow="-100" 
+                           default_lifecycle_id="-200" />
+    
+    <ccm_cms.content_items object_id="-10100" 
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-10200" 
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-10300" 
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-10400" 
+                           version="DRAFT"
+                           content_type_id="-20200" />
+    <ccm_cms.content_items object_id="-10500" 
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    
+    <ccm_cms.content_item_names object_id="-10100" 
+                                locale="en" 
+                                localized_value="article1" />
+    <ccm_cms.content_item_names object_id="-10200" 
+                                locale="en" 
+                                localized_value="article2" />
+    <ccm_cms.content_item_names object_id="-10300" 
+                                locale="en" 
+                                localized_value="article3" />
+    <ccm_cms.content_item_names object_id="-10400" 
+                                locale="en" 
+                                localized_value="news1" />
+    <ccm_cms.content_item_names object_id="-10500" 
+                                locale="en" 
+                                localized_value="article1" />
+    
+    <ccm_cms.content_item_titles object_id="-10100" 
+                                 locale="en" 
+                                 localized_value="Article 1" />
+    <ccm_cms.content_item_titles object_id="-10200" 
+                                 locale="en" 
+                                 localized_value="Article 2" />
+    <ccm_cms.content_item_titles object_id="-10300" 
+                                 locale="en" 
+                                 localized_value="Article 3" />
+    <ccm_cms.content_item_titles object_id="-10400" 
+                                 locale="en" 
+                                 localized_value="News 1" />
+    <ccm_cms.content_item_titles object_id="-10500" 
+                                 locale="en" 
+                                 localized_value="Article 1" />
+    
+    <ccm_cms.content_type_labels object_id="-20100"
+                                 locale="en" 
+                                 localized_value="Article" />
+    <ccm_cms.content_type_labels object_id="-20200"
+                                 locale="en" 
+                                 localized_value="News" />
+    
+    <ccm_cms.articles object_id="-10100" />
+    <ccm_cms.articles object_id="-10200" />
+    <ccm_cms.articles object_id="-10300" />
+    <ccm_cms.articles object_id="-10500" />
+    
+    <ccm_cms.article_texts 
+        object_id="-10100"
+        locale="en" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+    <ccm_cms.article_texts 
+        object_id="-10200"
+        locale="en" 
+        localized_value="Duis quis tincidunt elit. In pharetra justo sit amet ipsum dictum, at." />
+    <ccm_cms.article_texts 
+        object_id="-10300"
+        locale="en" 
+        localized_value="Etiam euismod lacus laoreet sodales ultricies. Pellentesque non elit vitae purus sagittis." />
+    <ccm_cms.article_texts 
+        object_id="-10500"
+        locale="en" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+    
+    <ccm_cms.news object_id="-10400"
+                  news_date="2016-08-08" 
+                  homepage="false" />
+    
+    <ccm_cms.news_texts 
+        object_id="-10400"
+        locale="en" 
+        localized_value="Curabitur vel sapien eu eros gravida bibendum vitae." />
+    
+    <ccm_core.categorizations categorization_id="-30100" 
+                              category_id="-2110" 
+                              object_id="-10100" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30200" 
+                              category_id="-2100" 
+                              object_id="-10200" 
+                              category_order="1" 
+                              object_order="2" 
+                              category_index="false" 
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30300" 
+                              category_id="-2100" 
+                              object_id="-10300" 
+                              category_order="1" 
+                              object_order="3" 
+                              category_index="false" 
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30400" 
+                              category_id="-2100" 
+                              object_id="-10400" 
+                              category_order="1" 
+                              object_order="4" 
+                              category_index="false" 
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30500" 
+                              category_id="-2110" 
+                              object_id="-10500" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    
+    <ccm_core.ccm_roles role_id="-3100"
+                        name="info_alert_recipient" />
+    <ccm_core.ccm_roles role_id="-3200"
+                        name="info_author" />
+    <ccm_core.ccm_roles role_id="-3300"
+                        name="info_editor" />
+    <ccm_core.ccm_roles role_id="-3400"
+                        name="info_manager" />
+    <ccm_core.ccm_roles role_id="-3500"
+                        name="info_publisher" />
+    <ccm_core.ccm_roles role_id="-3600"
+                        name="info_content_reader" />
+    
+    <ccm_core.task_assignments task_assignment_id="-910"
+                               task_id="-100100" 
+                               role_id="-3200" />
+    <ccm_core.task_assignments task_assignment_id="-920"
+                               task_id="-100100" 
+                               role_id="-3300" />
+    <ccm_core.task_assignments task_assignment_id="-930"
+                               task_id="-110100" 
+                               role_id="-3200" />
+    
+    <ccm_cms.content_section_roles role_id="-3100" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3200" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3300" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3400" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3500" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3600" 
+                                   section_id="-1100" />
+    
+    <ccm_core.permissions permission_id="-4110" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4120" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4130" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4140" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4150" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4210" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4220" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4230" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4240" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4250" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4260" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4270" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4310" 
+                          granted_privilege="administer_roles" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4320" 
+                          granted_privilege="administer_workflow" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4330" 
+                          granted_privilege="administer_lifecyles" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4340" 
+                          granted_privilege="administer_categories" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4350" 
+                          granted_privilege="administer_content_types" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4360" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4370" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4380" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4390" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4400" 
+                          granted_privilege="publish_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4410" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4420" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4430" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4510" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4520" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4530" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4540" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4550" 
+                          granted_privilege="publish_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4560" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4570" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4580" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4610" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"/>
+
+    
+</dataset>
+
+
+
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/move-after.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/move-after.xml
new file mode 100644
index 000000000..dda48ec87
--- /dev/null
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/move-after.xml
@@ -0,0 +1,506 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+    
+    <ccm_core.workflows workflow_id="-100" />
+    <ccm_core.workflows workflow_id="-110" />
+
+    <ccm_core.workflow_names workflow_id="-100" 
+                             locale="en"
+                             localized_value="Standard workflow" />
+    <ccm_core.workflow_names workflow_id="-110" 
+                             locale="en"
+                             localized_value="Fast workflow" />
+    
+    <ccm_core.workflow_templates workflow_id="-100" />
+    <ccm_core.workflow_templates workflow_id="-110" />
+    
+    <ccm_core.workflow_tasks task_id="-100100"
+                             active="false" 
+                             task_state="waiting" 
+                             workflow_id="-100" />
+    <ccm_core.workflow_tasks task_id="-100200"
+                             active="false" 
+                             task_state="waiting" 
+                             workflow_id="-100" />
+    <ccm_core.workflow_tasks task_id="-110100"
+                             active="false" 
+                             task_state="waiting" 
+                             workflow_id="-110" />
+    
+    <ccm_core.workflow_task_labels task_id="-100100" 
+                                   localized_value="Task 1.1" 
+                                   locale="en" />
+    <ccm_core.workflow_task_labels task_id="-100200" 
+                                   localized_value="Task 1.2" 
+                                   locale="en" />
+    <ccm_core.workflow_task_labels task_id="-110100" 
+                                   localized_value="Task 2.1" 
+                                   locale="en" />
+    
+    <ccm_core.workflow_user_tasks task_id="-100100" 
+                                  duration_minutes="0" 
+                                  locked="false" />
+    <ccm_core.workflow_user_tasks task_id="-100200" 
+                                  duration_minutes="0" 
+                                  locked="false" />
+    <ccm_core.workflow_user_tasks task_id="-110100" 
+                                  duration_minutes="0" 
+                                  locked="false" />
+        
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-200" />
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-210" />
+    
+    <ccm_cms.lifecycle_definition_labels object_id="-200" 
+                                         localized_value="Default lifecycle" 
+                                         locale="en" />
+    <ccm_cms.lifecycle_definition_labels object_id="-210" 
+                                         localized_value="Alternate lifecycle" 
+                                         locale="en" />
+    
+    <ccm_cms.lifecycle_phase_definitions phase_definition_id="-200100" 
+                                         lifecycle_definition_id="-200"
+                                         default_delay="0" 
+                                         default_duration="0" />
+    <ccm_cms.lifecycle_phase_definitions phase_definition_id="-200200" 
+                                         lifecycle_definition_id="-200"
+                                         default_delay="0" 
+                                         default_duration="0" />
+    <ccm_cms.lifecycle_phase_definitions phase_definition_id="-210100" 
+                                         lifecycle_definition_id="-210"
+                                         default_delay="0" 
+                                         default_duration="0" />
+    
+    <ccm_cms.lifecycle_phase_definition_labels object_id="-200100" 
+                                               localized_value="Phase 1" 
+                                               locale="en" />
+    <ccm_cms.lifecycle_phase_definition_labels object_id="-200200" 
+                                               localized_value="Phase 2" 
+                                               locale="en" />
+    <ccm_cms.lifecycle_phase_definition_labels object_id="-210100" 
+                                               localized_value="The only phase" 
+                                               locale="en" />
+    
+    <ccm_core.ccm_objects object_id="-1100"
+                          display_name="info"
+                          uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
+    <ccm_core.ccm_objects object_id="-2100"
+                          display_name="info_root"
+                          uuid="82014239-9c06-486d-ae8c-4ae47f52a699" />
+    <ccm_core.ccm_objects object_id="-2110" 
+                          display_name="folder1" 
+                          uuid="c634c1c3-41b7-4773-bb2e-5b6cd14492a3" />
+    <ccm_core.ccm_objects object_id="-2120" 
+                          display_name="folder2" 
+                          uuid="3b2a3a92-cdea-4fe3-b364-401eb3fb0ffc" />
+    <ccm_core.ccm_objects object_id="-2200"
+                          display_name="info_assets"
+                          uuid="b163f73c-9ac2-44d7-a037-de621f5ca828" />
+    <ccm_core.ccm_objects object_id="-10100"
+                          display_name="article1"
+                          uuid="aed4b402-1180-46c6-b42d-7245f4dca248" />
+    <ccm_core.ccm_objects object_id="-10300"
+                          display_name="article3"
+                          uuid="f4b38abb-234b-4354-bc92-e36c068a1ebd" />
+    <ccm_core.ccm_objects object_id="-10200"
+                          display_name="article2"
+                          uuid="acae860f-2ffa-450d-b486-054292f0dae6" />
+    <ccm_core.ccm_objects object_id="-10400"
+                          display_name="news1"
+                          uuid="d9ea527d-c6e3-4bdd-962d-c0a1a80c6c72" />
+    <ccm_core.ccm_objects object_id="-20100"
+                          display_name="org.librecms.contenttypes.Article"
+                          uuid="2c8ec2fb-319d-4d44-9698-697c08b2b941" />
+    <ccm_core.ccm_objects object_id="-20200"
+                          display_name="org.librecms.contenttypes.News"
+                          uuid="47740f22-f89f-4ec3-90cf-d62859e53c7e" />
+    
+    <ccm_core.categories object_id="-2100"
+                         unique_id="82014239-9c06-486d-ae8c-4ae47f52a699"
+                         name="info_root" 
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
+    <ccm_core.categories object_id="-2110" 
+                         unique_id="c634c1c3-41b7-4773-bb2e-5b6cd14492a3"
+                         parent_category_id="-2100"
+                         name="folder1"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
+    <ccm_core.categories object_id="-2120" 
+                         unique_id="3b2a3a92-cdea-4fe3-b364-401eb3fb0ffc"
+                         parent_category_id="-2100"
+                         name="folder2"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="2" />
+    <ccm_core.categories object_id="-2200"
+                         unique_id="b163f73c-9ac2-44d7-a037-de621f5ca828"
+                         name="info_assets" 
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false" 
+                         category_order="1" />
+                             
+    <ccm_core.category_titles object_id="-2100" 
+                              locale="en" 
+                              localized_value="info_root" />
+    <ccm_core.category_titles object_id="-2200" 
+                              locale="en" 
+                              localized_value="info_assets" />
+    
+    <ccm_core.resources object_id="-1100" 
+                        created="2016-07-15" />
+    <ccm_core.resource_titles object_id="-1100" 
+                              locale="en"
+                              localized_value="info" />
+    
+    <ccm_core.applications object_id="-1100"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="info" />
+    
+    <ccm_cms.content_sections object_id="-1100"
+                              label="info"
+                              root_documents_folder_id="-2100"
+                              root_assets_folder_id="-2200" />
+    
+    <ccm_cms.content_section_workflow_templates 
+        content_section_id="-1100" 
+        workflow_template_id="-100" />
+    <ccm_cms.content_section_workflow_templates 
+        content_section_id="-1100" 
+        workflow_template_id="-110" />
+    
+    <ccm_cms.content_section_lifecycle_definitions 
+        content_section_id="-1100"
+        lifecycle_definition_id="-200" />
+    <ccm_cms.content_section_lifecycle_definitions 
+        content_section_id="-1100"
+        lifecycle_definition_id="-210" />
+    
+    <ccm_cms.content_types object_id="-20100" 
+                           content_item_class="org.librecms.contenttypes.Article" 
+                           content_section_id="-1100" 
+                           default_workflow="-100" 
+                           default_lifecycle_id="-200" />
+    <ccm_cms.content_types object_id="-20200" 
+                           content_item_class="org.librecms.contenttypes.News" 
+                           content_section_id="-1100" 
+                           default_workflow="-100" 
+                           default_lifecycle_id="-200" />
+    
+    <ccm_cms.content_items object_id="-10100" 
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-10200" 
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-10300" 
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-10400" 
+                           version="DRAFT"
+                           content_type_id="-20200" />
+    
+    <ccm_cms.content_item_names object_id="-10100" 
+                                locale="en" 
+                                localized_value="article1" />
+    <ccm_cms.content_item_names object_id="-10200" 
+                                locale="en" 
+                                localized_value="article2" />
+    <ccm_cms.content_item_names object_id="-10300" 
+                                locale="en" 
+                                localized_value="article3" />
+    <ccm_cms.content_item_names object_id="-10400" 
+                                locale="en" 
+                                localized_value="news1" />
+    
+    <ccm_cms.content_item_titles object_id="-10100" 
+                                 locale="en" 
+                                 localized_value="Article 1" />
+    <ccm_cms.content_item_titles object_id="-10200" 
+                                 locale="en" 
+                                 localized_value="Article 2" />
+    <ccm_cms.content_item_titles object_id="-10300" 
+                                 locale="en" 
+                                 localized_value="Article 3" />
+    <ccm_cms.content_item_titles object_id="-10400" 
+                                 locale="en" 
+                                 localized_value="News 1" />
+    
+    <ccm_cms.content_type_labels object_id="-20100"
+                                 locale="en" 
+                                 localized_value="Article" />
+    <ccm_cms.content_type_labels object_id="-20200"
+                                 locale="en" 
+                                 localized_value="News" />
+    
+    <ccm_cms.articles object_id="-10100" />
+    <ccm_cms.articles object_id="-10200" />
+    <ccm_cms.articles object_id="-10300" />
+    
+    <ccm_cms.article_texts 
+        object_id="-10100"
+        locale="en" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+    <ccm_cms.article_texts 
+        object_id="-10200"
+        locale="en" 
+        localized_value="Duis quis tincidunt elit. In pharetra justo sit amet ipsum dictum, at." />
+    <ccm_cms.article_texts 
+        object_id="-10300"
+        locale="en" 
+        localized_value="Etiam euismod lacus laoreet sodales ultricies. Pellentesque non elit vitae purus sagittis." />
+    
+    <ccm_cms.news object_id="-10400"
+                  news_date="2016-08-08" 
+                  homepage="false" />
+    
+    <ccm_cms.news_texts 
+        object_id="-10400"
+        locale="en" 
+        localized_value="Curabitur vel sapien eu eros gravida bibendum vitae." />
+    
+    <ccm_core.categorizations categorization_id="-30100" 
+                              category_id="-2120" 
+                              object_id="-10100" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30200" 
+                              category_id="-2100" 
+                              object_id="-10200" 
+                              category_order="1" 
+                              object_order="2" 
+                              category_index="false" 
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30300" 
+                              category_id="-2100" 
+                              object_id="-10300" 
+                              category_order="1" 
+                              object_order="3" 
+                              category_index="false" 
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30400" 
+                              category_id="-2100" 
+                              object_id="-10400" 
+                              category_order="1" 
+                              object_order="4" 
+                              category_index="false" 
+                              type="folder" />
+    
+    <ccm_core.ccm_roles role_id="-3100"
+                        name="info_alert_recipient" />
+    <ccm_core.ccm_roles role_id="-3200"
+                        name="info_author" />
+    <ccm_core.ccm_roles role_id="-3300"
+                        name="info_editor" />
+    <ccm_core.ccm_roles role_id="-3400"
+                        name="info_manager" />
+    <ccm_core.ccm_roles role_id="-3500"
+                        name="info_publisher" />
+    <ccm_core.ccm_roles role_id="-3600"
+                        name="info_content_reader" />
+    
+    <ccm_core.task_assignments task_assignment_id="-910"
+                               task_id="-100100" 
+                               role_id="-3200" />
+    <ccm_core.task_assignments task_assignment_id="-920"
+                               task_id="-100100" 
+                               role_id="-3300" />
+    <ccm_core.task_assignments task_assignment_id="-930"
+                               task_id="-110100" 
+                               role_id="-3200" />
+    
+    <ccm_cms.content_section_roles role_id="-3100" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3200" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3300" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3400" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3500" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3600" 
+                                   section_id="-1100" />
+    
+    <ccm_core.permissions permission_id="-4110" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4120" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4130" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4140" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4150" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4210" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4220" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4230" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4240" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4250" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4260" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4270" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4310" 
+                          granted_privilege="administer_roles" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4320" 
+                          granted_privilege="administer_workflow" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4330" 
+                          granted_privilege="administer_lifecyles" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4340" 
+                          granted_privilege="administer_categories" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4350" 
+                          granted_privilege="administer_content_types" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4360" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4370" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4380" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4390" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4400" 
+                          granted_privilege="publish_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4410" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4420" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4430" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4510" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4520" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4530" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4540" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4550" 
+                          granted_privilege="publish_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4560" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4570" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4580" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4610" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"/>
+
+    
+</dataset>
+
+
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/move-before.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/move-before.xml
new file mode 100644
index 000000000..2fb8d30c0
--- /dev/null
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/move-before.xml
@@ -0,0 +1,505 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+    
+    <ccm_core.workflows workflow_id="-100" />
+    <ccm_core.workflows workflow_id="-110" />
+
+    <ccm_core.workflow_names workflow_id="-100" 
+                             locale="en"
+                             localized_value="Standard workflow" />
+    <ccm_core.workflow_names workflow_id="-110" 
+                             locale="en"
+                             localized_value="Fast workflow" />
+    
+    <ccm_core.workflow_templates workflow_id="-100" />
+    <ccm_core.workflow_templates workflow_id="-110" />
+    
+    <ccm_core.workflow_tasks task_id="-100100"
+                             active="false" 
+                             task_state="waiting" 
+                             workflow_id="-100" />
+    <ccm_core.workflow_tasks task_id="-100200"
+                             active="false" 
+                             task_state="waiting" 
+                             workflow_id="-100" />
+    <ccm_core.workflow_tasks task_id="-110100"
+                             active="false" 
+                             task_state="waiting" 
+                             workflow_id="-110" />
+    
+    <ccm_core.workflow_task_labels task_id="-100100" 
+                                   localized_value="Task 1.1" 
+                                   locale="en" />
+    <ccm_core.workflow_task_labels task_id="-100200" 
+                                   localized_value="Task 1.2" 
+                                   locale="en" />
+    <ccm_core.workflow_task_labels task_id="-110100" 
+                                   localized_value="Task 2.1" 
+                                   locale="en" />
+    
+    <ccm_core.workflow_user_tasks task_id="-100100" 
+                                  duration_minutes="0" 
+                                  locked="false" />
+    <ccm_core.workflow_user_tasks task_id="-100200" 
+                                  duration_minutes="0" 
+                                  locked="false" />
+    <ccm_core.workflow_user_tasks task_id="-110100" 
+                                  duration_minutes="0" 
+                                  locked="false" />
+        
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-200" />
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-210" />
+    
+    <ccm_cms.lifecycle_definition_labels object_id="-200" 
+                                         localized_value="Default lifecycle" 
+                                         locale="en" />
+    <ccm_cms.lifecycle_definition_labels object_id="-210" 
+                                         localized_value="Alternate lifecycle" 
+                                         locale="en" />
+    
+    <ccm_cms.lifecycle_phase_definitions phase_definition_id="-200100" 
+                                         lifecycle_definition_id="-200"
+                                         default_delay="0" 
+                                         default_duration="0" />
+    <ccm_cms.lifecycle_phase_definitions phase_definition_id="-200200" 
+                                         lifecycle_definition_id="-200"
+                                         default_delay="0" 
+                                         default_duration="0" />
+    <ccm_cms.lifecycle_phase_definitions phase_definition_id="-210100" 
+                                         lifecycle_definition_id="-210"
+                                         default_delay="0" 
+                                         default_duration="0" />
+    
+    <ccm_cms.lifecycle_phase_definition_labels object_id="-200100" 
+                                               localized_value="Phase 1" 
+                                               locale="en" />
+    <ccm_cms.lifecycle_phase_definition_labels object_id="-200200" 
+                                               localized_value="Phase 2" 
+                                               locale="en" />
+    <ccm_cms.lifecycle_phase_definition_labels object_id="-210100" 
+                                               localized_value="The only phase" 
+                                               locale="en" />
+    
+    <ccm_core.ccm_objects object_id="-1100"
+                          display_name="info"
+                          uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
+    <ccm_core.ccm_objects object_id="-2100"
+                          display_name="info_root"
+                          uuid="82014239-9c06-486d-ae8c-4ae47f52a699" />
+    <ccm_core.ccm_objects object_id="-2110" 
+                          display_name="folder1" 
+                          uuid="c634c1c3-41b7-4773-bb2e-5b6cd14492a3" />
+    <ccm_core.ccm_objects object_id="-2120" 
+                          display_name="folder2" 
+                          uuid="3b2a3a92-cdea-4fe3-b364-401eb3fb0ffc" />
+    <ccm_core.ccm_objects object_id="-2200"
+                          display_name="info_assets"
+                          uuid="b163f73c-9ac2-44d7-a037-de621f5ca828" />
+    <ccm_core.ccm_objects object_id="-10100"
+                          display_name="article1"
+                          uuid="aed4b402-1180-46c6-b42d-7245f4dca248" />
+    <ccm_core.ccm_objects object_id="-10300"
+                          display_name="article3"
+                          uuid="f4b38abb-234b-4354-bc92-e36c068a1ebd" />
+    <ccm_core.ccm_objects object_id="-10200"
+                          display_name="article2"
+                          uuid="acae860f-2ffa-450d-b486-054292f0dae6" />
+    <ccm_core.ccm_objects object_id="-10400"
+                          display_name="news1"
+                          uuid="d9ea527d-c6e3-4bdd-962d-c0a1a80c6c72" />
+    <ccm_core.ccm_objects object_id="-20100"
+                          display_name="org.librecms.contenttypes.Article"
+                          uuid="2c8ec2fb-319d-4d44-9698-697c08b2b941" />
+    <ccm_core.ccm_objects object_id="-20200"
+                          display_name="org.librecms.contenttypes.News"
+                          uuid="47740f22-f89f-4ec3-90cf-d62859e53c7e" />
+    
+    <ccm_core.categories object_id="-2100"
+                         unique_id="82014239-9c06-486d-ae8c-4ae47f52a699"
+                         name="info_root" 
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
+    <ccm_core.categories object_id="-2110" 
+                         unique_id="c634c1c3-41b7-4773-bb2e-5b6cd14492a3"
+                         parent_category_id="-2100"
+                         name="folder1"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
+    <ccm_core.categories object_id="-2120" 
+                         unique_id="3b2a3a92-cdea-4fe3-b364-401eb3fb0ffc"
+                         parent_category_id="-2100"
+                         name="folder2"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="2" />
+    <ccm_core.categories object_id="-2200"
+                         unique_id="b163f73c-9ac2-44d7-a037-de621f5ca828"
+                         name="info_assets" 
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false" 
+                         category_order="1" />
+                             
+    <ccm_core.category_titles object_id="-2100" 
+                              locale="en" 
+                              localized_value="info_root" />
+    <ccm_core.category_titles object_id="-2200" 
+                              locale="en" 
+                              localized_value="info_assets" />
+    
+    <ccm_core.resources object_id="-1100" 
+                        created="2016-07-15" />
+    <ccm_core.resource_titles object_id="-1100" 
+                              locale="en"
+                              localized_value="info" />
+    
+    <ccm_core.applications object_id="-1100"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="info" />
+    
+    <ccm_cms.content_sections object_id="-1100"
+                              label="info"
+                              root_documents_folder_id="-2100"
+                              root_assets_folder_id="-2200" />
+    
+    <ccm_cms.content_section_workflow_templates 
+        content_section_id="-1100" 
+        workflow_template_id="-100" />
+    <ccm_cms.content_section_workflow_templates 
+        content_section_id="-1100" 
+        workflow_template_id="-110" />
+    
+    <ccm_cms.content_section_lifecycle_definitions 
+        content_section_id="-1100"
+        lifecycle_definition_id="-200" />
+    <ccm_cms.content_section_lifecycle_definitions 
+        content_section_id="-1100"
+        lifecycle_definition_id="-210" />
+    
+    <ccm_cms.content_types object_id="-20100" 
+                           content_item_class="org.librecms.contenttypes.Article" 
+                           content_section_id="-1100" 
+                           default_workflow="-100" 
+                           default_lifecycle_id="-200" />
+    <ccm_cms.content_types object_id="-20200" 
+                           content_item_class="org.librecms.contenttypes.News" 
+                           content_section_id="-1100" 
+                           default_workflow="-100" 
+                           default_lifecycle_id="-200" />
+    
+    <ccm_cms.content_items object_id="-10100" 
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-10200" 
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-10300" 
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-10400" 
+                           version="DRAFT"
+                           content_type_id="-20200" />
+    
+    <ccm_cms.content_item_names object_id="-10100" 
+                                locale="en" 
+                                localized_value="article1" />
+    <ccm_cms.content_item_names object_id="-10200" 
+                                locale="en" 
+                                localized_value="article2" />
+    <ccm_cms.content_item_names object_id="-10300" 
+                                locale="en" 
+                                localized_value="article3" />
+    <ccm_cms.content_item_names object_id="-10400" 
+                                locale="en" 
+                                localized_value="news1" />
+    
+    <ccm_cms.content_item_titles object_id="-10100" 
+                                 locale="en" 
+                                 localized_value="Article 1" />
+    <ccm_cms.content_item_titles object_id="-10200" 
+                                 locale="en" 
+                                 localized_value="Article 2" />
+    <ccm_cms.content_item_titles object_id="-10300" 
+                                 locale="en" 
+                                 localized_value="Article 3" />
+    <ccm_cms.content_item_titles object_id="-10400" 
+                                 locale="en" 
+                                 localized_value="News 1" />
+    
+    <ccm_cms.content_type_labels object_id="-20100"
+                                 locale="en" 
+                                 localized_value="Article" />
+    <ccm_cms.content_type_labels object_id="-20200"
+                                 locale="en" 
+                                 localized_value="News" />
+    
+    <ccm_cms.articles object_id="-10100" />
+    <ccm_cms.articles object_id="-10200" />
+    <ccm_cms.articles object_id="-10300" />
+    
+    <ccm_cms.article_texts 
+        object_id="-10100"
+        locale="en" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+    <ccm_cms.article_texts 
+        object_id="-10200"
+        locale="en" 
+        localized_value="Duis quis tincidunt elit. In pharetra justo sit amet ipsum dictum, at." />
+    <ccm_cms.article_texts 
+        object_id="-10300"
+        locale="en" 
+        localized_value="Etiam euismod lacus laoreet sodales ultricies. Pellentesque non elit vitae purus sagittis." />
+    
+    <ccm_cms.news object_id="-10400"
+                  news_date="2016-08-08" 
+                  homepage="false" />
+    
+    <ccm_cms.news_texts 
+        object_id="-10400"
+        locale="en" 
+        localized_value="Curabitur vel sapien eu eros gravida bibendum vitae." />
+    
+    <ccm_core.categorizations categorization_id="-30100" 
+                              category_id="-2110" 
+                              object_id="-10100" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30200" 
+                              category_id="-2100" 
+                              object_id="-10200" 
+                              category_order="1" 
+                              object_order="2" 
+                              category_index="false" 
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30300" 
+                              category_id="-2100" 
+                              object_id="-10300" 
+                              category_order="1" 
+                              object_order="3" 
+                              category_index="false" 
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30400" 
+                              category_id="-2100" 
+                              object_id="-10400" 
+                              category_order="1" 
+                              object_order="4" 
+                              category_index="false" 
+                              type="folder" />
+    
+    <ccm_core.ccm_roles role_id="-3100"
+                        name="info_alert_recipient" />
+    <ccm_core.ccm_roles role_id="-3200"
+                        name="info_author" />
+    <ccm_core.ccm_roles role_id="-3300"
+                        name="info_editor" />
+    <ccm_core.ccm_roles role_id="-3400"
+                        name="info_manager" />
+    <ccm_core.ccm_roles role_id="-3500"
+                        name="info_publisher" />
+    <ccm_core.ccm_roles role_id="-3600"
+                        name="info_content_reader" />
+    
+    <ccm_core.task_assignments task_assignment_id="-910"
+                               task_id="-100100" 
+                               role_id="-3200" />
+    <ccm_core.task_assignments task_assignment_id="-920"
+                               task_id="-100100" 
+                               role_id="-3300" />
+    <ccm_core.task_assignments task_assignment_id="-930"
+                               task_id="-110100" 
+                               role_id="-3200" />
+    
+    <ccm_cms.content_section_roles role_id="-3100" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3200" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3300" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3400" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3500" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3600" 
+                                   section_id="-1100" />
+    
+    <ccm_core.permissions permission_id="-4110" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4120" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4130" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4140" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4150" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4210" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4220" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4230" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4240" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4250" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4260" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4270" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4310" 
+                          granted_privilege="administer_roles" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4320" 
+                          granted_privilege="administer_workflow" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4330" 
+                          granted_privilege="administer_lifecyles" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4340" 
+                          granted_privilege="administer_categories" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4350" 
+                          granted_privilege="administer_content_types" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4360" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4370" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4380" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4390" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4400" 
+                          granted_privilege="publish_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4410" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4420" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4430" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4510" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4520" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4530" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4540" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4550" 
+                          granted_privilege="publish_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4560" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4570" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4580" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4610" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"/>
+
+    
+</dataset>
+