diff --git a/README.txt b/README.txt
index b3b5cec16..7e3de9342 100644
--- a/README.txt
+++ b/README.txt
@@ -16,6 +16,15 @@ To include integration tests into the reports
 
     mvn clean package test site site:stage -P$profile-name
 
+Note: If there are test failures the package goal fails and the site is not
+build. The build the site anywhy use
+
+    mvn clean package site site:stage -Dmaven.test.failure.ignore=true
+
+or with a profile
+
+    mvn clean package site site:stage -Dmaven.test.failure.ignore=true -Pwildfly-remote-h2-mem
+
 The available profiles are listed in the documentation. All modules should 
 provide a profile called wildfly-remote-h2-mem. This profile uses a remote
 Wildfly application server and its integrated H2 in-memory database for
diff --git a/ccm-bundle-devel-wildfly-web/pom.xml b/ccm-bundle-devel-wildfly-web/pom.xml
index d61bfb295..3c5e35032 100644
--- a/ccm-bundle-devel-wildfly-web/pom.xml
+++ b/ccm-bundle-devel-wildfly-web/pom.xml
@@ -93,18 +93,18 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
-                    <webResources>
+                    <!--<webResources>
                         <resource>
                             <directory>../ccm-theme-foundry/src/main/resources/themes</directory>
                         </resource>
-                    </webResources>
-                    <!--<overlays>
+                    </webResources>-->
+                    <overlays>
                         <overlay>
                             <groupId>org.libreccm</groupId>
                             <artifactId>ccm-theme-foundry</artifactId>
                             <type>jar</type>
                         </overlay>
-                    </overlays>-->
+                    </overlays>
                 </configuration>
             </plugin>
             
diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemL10NManager.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemL10NManager.java
index db75240a8..0d1ef7f5d 100644
--- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemL10NManager.java
+++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemL10NManager.java
@@ -19,15 +19,30 @@
 package org.librecms.contentsection;
 
 import com.arsdigita.kernel.KernelConfig;
+import com.arsdigita.util.UncheckedWrapperException;
 
+import org.libreccm.configuration.ConfigurationManager;
 import org.libreccm.l10n.LocalizedString;
 import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.RequiresPrivilege;
 import org.librecms.CmsConstants;
 
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
 import java.util.Locale;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
 
+import javax.annotation.PostConstruct;
 import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
 import javax.transaction.Transactional;
 
 /**
@@ -38,6 +53,64 @@ import javax.transaction.Transactional;
 @RequestScoped
 public class ContentItemL10NManager {
 
+    @Inject
+    private ConfigurationManager confManager;
+
+    @Inject
+    private ContentItemRepository itemRepo;
+    
+    private Locale defaultLocale;
+    private List<Locale> supportedLocales;
+
+    @PostConstruct
+    private void init() {
+        final KernelConfig kernelConfig = confManager.findConfiguration(
+            KernelConfig.class);
+        defaultLocale = kernelConfig.getDefaultLocale();
+        supportedLocales = kernelConfig.getSupportedLanguages()
+            .stream()
+            .map(language -> new Locale(language))
+            .collect(Collectors.toList());
+    }
+
+    private List<PropertyDescriptor> findLocalizedStringProperties(
+        final ContentItem item) {
+
+        try {
+            return Arrays.stream(
+                Introspector.getBeanInfo(item.getClass())
+                    .getPropertyDescriptors())
+                .filter(property -> property.getPropertyType().isAssignableFrom(
+                LocalizedString.class))
+                .collect(Collectors.toList());
+        } catch (IntrospectionException ex) {
+            throw new UncheckedWrapperException(ex);
+        }
+    }
+
+    private LocalizedString readLocalizedString(final ContentItem item,
+                                                final Method readMethod) {
+        try {
+            return (LocalizedString) readMethod.invoke(item);
+        } catch (IllegalAccessException
+                 | IllegalArgumentException
+                 | InvocationTargetException ex) {
+            throw new UncheckedWrapperException(ex);
+        }
+    }
+
+    private Set<Locale> collectLanguages(final ContentItem item) {
+        final Set<Locale> locales = new HashSet<>();
+
+        findLocalizedStringProperties(item)
+            .stream()
+            .map(property -> property.getReadMethod())
+            .map(readMethod -> readLocalizedString(item, readMethod))
+            .forEach(str -> locales.addAll(str.getAvailableLocales()));
+
+        return locales;
+    }
+
     /**
      * Checks if an content item has data for particular language.
      *
@@ -49,8 +122,16 @@ public class ContentItemL10NManager {
      */
     @Transactional(Transactional.TxType.REQUIRED)
     public boolean hasLanguage(final ContentItem item, final Locale locale) {
+        if (item == null) {
+            throw new IllegalArgumentException("Can't check if item null has a"
+                                                   + "specific locale.");
+        }
 
-        throw new UnsupportedOperationException();
+        if (locale == null) {
+            throw new IllegalArgumentException("Can't check for locale null.");
+        }
+
+        return collectLanguages(item).contains(locale);
     }
 
     /**
@@ -70,7 +151,50 @@ public class ContentItemL10NManager {
         final ContentItem item,
         final Locale locale) {
 
-        throw new UnsupportedOperationException();
+        findLocalizedStringProperties(item)
+            .forEach(property -> addLanguage(item, locale, property));
+        
+        itemRepo.save(item);
+    }
+
+    private void addLanguage(final ContentItem item,
+                             final Locale locale,
+                             final PropertyDescriptor property) {
+
+        final Method readMethod = property.getReadMethod();        
+        final LocalizedString localizedStr = readLocalizedString(item,
+                                                                 readMethod);
+        addLanguage(localizedStr, locale);
+    }
+    
+    private void addLanguage(final LocalizedString localizedString,
+                             final Locale locale) {
+        if (localizedString.hasValue(locale)) {
+            //Nothing to do
+            return;
+        }
+
+        final String value;
+        if (localizedString.hasValue(defaultLocale)) {
+            value = localizedString.getValue(defaultLocale);
+        } else {
+            value = findValue(localizedString);
+        }
+
+        localizedString.addValue(locale, value);
+    }
+
+    private String findValue(final LocalizedString localizedStr) {
+        final Optional<Locale> locale = supportedLocales
+            .stream()
+            .filter(current -> localizedStr.hasValue(current))
+            .findAny();
+
+        if (locale.isPresent()) {
+            return localizedStr.getValue(locale.get());
+        } else {
+            return "Lorem ipsum";
+        }
     }
 
     /**
@@ -86,10 +210,26 @@ public class ContentItemL10NManager {
     @Transactional(Transactional.TxType.REQUIRED)
     public void removeLangauge(
         @RequiresPrivilege(CmsConstants.PRIVILEGE_ITEMS_EDIT)
-        final ContentItem item, 
+        final ContentItem item,
         final Locale locale) {
-        
-        throw new UnsupportedOperationException();
+
+        findLocalizedStringProperties(item)
+            .forEach(property -> removeLanguage(item, locale, property));
+
+        itemRepo.save(item);
+    }
+
+    private void removeLanguage(final ContentItem item,
+                                final Locale locale,
+                                final PropertyDescriptor property) {
+
+        final Method readMethod = property.getReadMethod();
+
+        final LocalizedString localizedStr = readLocalizedString(item,
+                                                                 readMethod);
+        if (localizedStr.hasValue(locale)) {
+            localizedStr.removeValue(locale);
+        }
     }
 
     /**
@@ -108,8 +248,29 @@ public class ContentItemL10NManager {
     public void normalizedLanguages(
         @RequiresPrivilege(CmsConstants.PRIVILEGE_ITEMS_EDIT)
         final ContentItem item) {
+
+        final Set<Locale> languages = collectLanguages(item);
+
+        findLocalizedStringProperties(item)
+            .stream()
+            .map(property -> property.getReadMethod())
+            .map(readMethod -> readLocalizedString(item, readMethod))
+            .forEach(str -> normalize(str, languages));
         
-        throw new UnsupportedOperationException();
+        itemRepo.save(item);
+    }
+
+    private void normalize(final LocalizedString localizedString,
+                           final Set<Locale> languages) {
+
+        final List<Locale> missingLangs = languages.stream()
+            .filter(lang -> !localizedString.hasValue(lang))
+            .collect(Collectors.toList());
+        
+        if (!missingLangs.isEmpty()) {
+            missingLangs.stream()
+                .forEach(lang -> addLanguage(localizedString, lang));
+        }
     }
 
 }
diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemL10NManagerTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemL10NManagerTest.java
index 0e148c205..087e28422 100644
--- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemL10NManagerTest.java
+++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemL10NManagerTest.java
@@ -42,6 +42,7 @@ import org.junit.runner.RunWith;
 import org.libreccm.tests.categories.IntegrationTest;
 
 import java.util.Locale;
+import java.util.Optional;
 
 import javax.inject.Inject;
 
@@ -164,9 +165,17 @@ public class ContentItemL10NManagerTest {
     @Test
     @InSequence(10)
     @UsingDataSet("datasets/org/librecms/contentsection/"
-                      + "ContentItemL10NManager/data.xml")
+                      + "ContentItemL10NManagerTest/data.xml")
     public void verifyHasLanguage() {
-        fail();
+        final Optional<ContentItem> item = itemRepo.findById(-10100L);
+        assertThat(item.isPresent(), is(true));
+
+        assertThat(l10nManager.hasLanguage(item.get(), Locale.ENGLISH),
+                   is(true));
+        assertThat(l10nManager.hasLanguage(item.get(), Locale.FRENCH),
+                   is(true));
+        assertThat(l10nManager.hasLanguage(item.get(), Locale.GERMAN),
+                   is(false));
     }
 
     /**
@@ -176,12 +185,14 @@ public class ContentItemL10NManagerTest {
      * for the item.
      */
     @Test(expected = IllegalArgumentException.class)
-    @InSequence(10)
+    @InSequence(20)
     @UsingDataSet("datasets/org/librecms/contentsection/"
-                      + "ContentItemL10NManager/data.xml")
+                      + "ContentItemL10NManagerTest/data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void hasLanguageItemIsNull() {
-        fail();
+        final ContentItem item = null;
+
+        l10nManager.hasLanguage(item, Locale.ENGLISH);
     }
 
     /**
@@ -191,12 +202,17 @@ public class ContentItemL10NManagerTest {
      * for the language.
      */
     @Test(expected = IllegalArgumentException.class)
-    @InSequence(10)
+    @InSequence(30)
     @UsingDataSet("datasets/org/librecms/contentsection/"
-                      + "ContentItemL10NManager/data.xml")
+                      + "ContentItemL10NManagerTest/data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void hasLanguageLanguageIsNull() {
-        fail();
+        final Optional<ContentItem> item = itemRepo.findById(-10100L);
+        assertThat(item.isPresent(), is(true));
+
+        assertThat(l10nManager.hasLanguage(item.get(), null),
+                   is(true));
+
     }
 
     /**
@@ -204,14 +220,18 @@ public class ContentItemL10NManagerTest {
      * {@link ContentItemL10NManager#addLanguage(org.librecms.contentsection.ContentItem, java.util.Locale)}.
      */
     @Test
-    @InSequence(20)
+    @InSequence(40)
     @UsingDataSet("datasets/org/librecms/contentsection/"
-                      + "ContentItemL10NManager/data.xml")
+                      + "ContentItemL10NManagerTest/data.xml")
     @ShouldMatchDataSet(
         value = "datasets/org/librecms/contentsection/"
-                    + "ContentItemL10NManager/after-add-language.xml")
+                    + "ContentItemL10NManagerTest/after-add-language.xml",
+        excludeColumns = {"timestamp"})
     public void addLanguage() {
-        fail();
+        final Optional<ContentItem> item = itemRepo.findById(-10100L);
+        assertThat(item.isPresent(), is(true));
+
+        l10nManager.addLanguage(item.get(), Locale.GERMAN);
     }
 
     /**
@@ -220,14 +240,18 @@ public class ContentItemL10NManagerTest {
      * with an existing language has not effect.
      */
     @Test
-    @InSequence(20)
+    @InSequence(50)
     @UsingDataSet("datasets/org/librecms/contentsection/"
-                      + "ContentItemL10NManager/data.xml")
+                      + "ContentItemL10NManagerTest/data.xml")
     @ShouldMatchDataSet(
         value = "datasets/org/librecms/contentsection/"
-                    + "ContentItemL10NManager/data.xml")
+                    + "ContentItemL10NManagerTest/data.xml")
     public void addLanguageAlreadyPresent() {
-        fail();
+        final Optional<ContentItem> item = itemRepo.findById(-10100L);
+        assertThat(item.isPresent(), is(true));
+
+        l10nManager.addLanguage(item.get(), Locale.FRENCH);
+
     }
 
     /**
@@ -236,15 +260,17 @@ public class ContentItemL10NManagerTest {
      * {@code null} for the item.
      */
     @Test(expected = IllegalArgumentException.class)
-    @InSequence(20)
+    @InSequence(60)
     @UsingDataSet("datasets/org/librecms/contentsection/"
-                      + "ContentItemL10NManager/data.xml")
+                      + "ContentItemL10NManagerTest/data.xml")
     @ShouldMatchDataSet(
         value = "datasets/org/librecms/contentsection/"
-                    + "ContentItemL10NManager/data.xml")
+                    + "ContentItemL10NManagerTest/data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void addLanguageItemIsNull() {
-        fail();
+        final ContentItem item = null;
+
+        l10nManager.addLanguage(item, Locale.GERMAN);
     }
 
     /**
@@ -255,27 +281,35 @@ public class ContentItemL10NManagerTest {
     @Test(expected = IllegalArgumentException.class)
     @InSequence(20)
     @UsingDataSet("datasets/org/librecms/contentsection/"
-                      + "ContentItemL10NManager/data.xml")
+                      + "ContentItemL10NManagerTest/data.xml")
     @ShouldMatchDataSet(
         value = "datasets/org/librecms/contentsection/"
-                    + "ContentItemL10NManager/data.xml")
+                    + "ContentItemL10NManagerTest/data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void addLanguageLanguageIsNull() {
-        fail();
+        final Optional<ContentItem> item = itemRepo.findById(-10100L);
+        assertThat(item.isPresent(), is(true));
+
+        l10nManager.addLanguage(item.get(), null);
     }
 
     /**
-     * Tries to remove language from a content item by using null     {@link ContentItemL10NManager#removeLangauge(org.librecms.contentsection.ContentItem, java.util.Locale) 
+     * Tries to remove language from a content item by using
+     * {@link ContentItemL10NManager#removeLangauge(org.librecms.contentsection.ContentItem, java.util.Locale)}.
      */
     @Test
-    @InSequence(20)
+    @InSequence(70)
     @UsingDataSet("datasets/org/librecms/contentsection/"
-                      + "ContentItemL10NManager/data.xml")
+                      + "ContentItemL10NManagerTest/data.xml")
     @ShouldMatchDataSet(
         value = "datasets/org/librecms/contentsection/"
-                    + "ContentItemL10NManager/after-remove-language.xml")
+                    + "ContentItemL10NManagerTest/after-remove-language.xml",
+        excludeColumns = {"timestamp"})
     public void removeLanguage() {
-        fail();
+        final Optional<ContentItem> item = itemRepo.findById(-10100L);
+        assertThat(item.isPresent(), is(true));
+
+        l10nManager.removeLangauge(item.get(), Locale.FRENCH);
     }
 
     /**
@@ -284,14 +318,17 @@ public class ContentItemL10NManagerTest {
      * has not effect if called for not present language.
      */
     @Test
-    @InSequence(20)
+    @InSequence(80)
     @UsingDataSet("datasets/org/librecms/contentsection/"
-                      + "ContentItemL10NManager/data.xml")
+                      + "ContentItemL10NManagerTest/data.xml")
     @ShouldMatchDataSet(
         value = "datasets/org/librecms/contentsection/"
-                    + "ContentItemL10NManager/data.xml")
+                    + "ContentItemL10NManagerTest/data.xml")
     public void removeNotPresentLanguage() {
-        fail();
+        final Optional<ContentItem> item = itemRepo.findById(-10100L);
+        assertThat(item.isPresent(), is(true));
+
+        l10nManager.removeLangauge(item.get(), Locale.GERMAN);
     }
 
     /**
@@ -301,15 +338,17 @@ public class ContentItemL10NManagerTest {
      * for the item.
      */
     @Test(expected = IllegalArgumentException.class)
-    @InSequence(20)
+    @InSequence(90)
     @UsingDataSet("datasets/org/librecms/contentsection/"
-                      + "ContentItemL10NManager/data.xml")
+                      + "ContentItemL10NManagerTest/data.xml")
     @ShouldMatchDataSet(
         value = "datasets/org/librecms/contentsection/"
-                    + "ContentItemL10NManager/data.xml")
+                    + "ContentItemL10NManagerTest/data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void removeLanguageItemIsNull() {
-        fail();
+        final ContentItem item = null;
+
+        l10nManager.removeLangauge(item, Locale.GERMAN);
     }
 
     /**
@@ -319,29 +358,38 @@ public class ContentItemL10NManagerTest {
      * for the language.
      */
     @Test(expected = IllegalArgumentException.class)
-    @InSequence(20)
+    @InSequence(100)
     @UsingDataSet("datasets/org/librecms/contentsection/"
-                      + "ContentItemL10NManager/data.xml")
+                      + "ContentItemL10NManagerTest/data.xml")
     @ShouldMatchDataSet(
         value = "datasets/org/librecms/contentsection/"
-                    + "ContentItemL10NManager/data.xml")
+                    + "ContentItemL10NManagerTest/data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void removeLanguageLanguageIsNull() {
-        fail();
+        final Optional<ContentItem> item = itemRepo.findById(-10100L);
+        assertThat(item.isPresent(), is(true));
+
+        l10nManager.removeLangauge(item.get(), null);
+
     }
 
     /**
-     * Tries to normalise the languages of a content item by using null     {@link ContentItemL10NManager#normalizedLanguages(org.librecms.contentsection.ContentItem) 
+     * Tries to normalise the languages of a content item by using null null
+     * null null null null null null null null null null     {@link ContentItemL10NManager#normalizedLanguages(org.librecms.contentsection.ContentItem) 
      */
     @Test
-    @InSequence(20)
+    @InSequence(120)
     @UsingDataSet("datasets/org/librecms/contentsection/"
-                      + "ContentItemL10NManager/data.xml")
+                      + "ContentItemL10NManagerTest/data.xml")
     @ShouldMatchDataSet(
         value = "datasets/org/librecms/contentsection/"
-                    + "ContentItemL10NManager/after-normalize.xml")
+                    + "ContentItemL10NManagerTest/after-normalize.xml",
+        excludeColumns = {"timestamp"})
     public void normalizeItem() {
-        fail();
+        final Optional<ContentItem> item = itemRepo.findById(-10200L);
+        assertThat(item.isPresent(), is(true));
+
+        l10nManager.normalizedLanguages(item.get());
     }
 
     /**
@@ -350,14 +398,18 @@ public class ContentItemL10NManagerTest {
      * for already normalised item has not effect.
      */
     @Test
-    @InSequence(20)
+    @InSequence(130)
     @UsingDataSet("datasets/org/librecms/contentsection/"
-                      + "ContentItemL10NManager/data.xml")
+                      + "ContentItemL10NManagerTest/data.xml")
     @ShouldMatchDataSet(
         value = "datasets/org/librecms/contentsection/"
-                    + "ContentItemL10NManager/data.xml")
+                    + "ContentItemL10NManagerTest/data.xml")
     public void normalizeItemAlreadyNormalized() {
-        fail();
+        final Optional<ContentItem> item = itemRepo.findById(-10100L);
+        assertThat(item.isPresent(), is(true));
+
+        l10nManager.normalizedLanguages(item.get());
+
     }
 
     /**
@@ -367,15 +419,17 @@ public class ContentItemL10NManagerTest {
      * for the item.
      */
     @Test(expected = IllegalArgumentException.class)
-    @InSequence(20)
+    @InSequence(140)
     @UsingDataSet("datasets/org/librecms/contentsection/"
-                      + "ContentItemL10NManager/data.xml")
+                      + "ContentItemL10NManagerTest/data.xml")
     @ShouldMatchDataSet(
         value = "datasets/org/librecms/contentsection/"
-                    + "ContentItemL10NManager/data.xml")
+                    + "ContentItemL10NManagerTest/data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void normalizeItemNull() {
-        fail();
+        final ContentItem item = null;
+
+        l10nManager.normalizedLanguages(item);
     }
 
 }
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 2b5146ac8..2a683fd12 100644
--- a/ccm-cms/src/test/java/org/librecms/contentsection/DatasetsTest.java
+++ b/ccm-cms/src/test/java/org/librecms/contentsection/DatasetsTest.java
@@ -54,6 +54,11 @@ public class DatasetsTest extends DatasetsVerifier {
             "/datasets/org/librecms/contentsection/ContentItemRepositoryTest/data.xml",
             "/datasets/org/librecms/contentsection/ContentItemRepositoryTest/after-save.xml",
 
+            "/datasets/org/librecms/contentsection/ContentItemL10NManagerTest/data.xml",
+            "/datasets/org/librecms/contentsection/ContentItemL10NManagerTest/after-add-language.xml",
+            "/datasets/org/librecms/contentsection/ContentItemL10NManagerTest/after-normalize.xml",
+            "/datasets/org/librecms/contentsection/ContentItemL10NManagerTest/after-remove-language.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-with-workflow.xml",
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemL10NManagerTest/after-add-language.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemL10NManagerTest/after-add-language.xml
new file mode 100644
index 000000000..3d29a08c2
--- /dev/null
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemL10NManagerTest/after-add-language.xml
@@ -0,0 +1,572 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+    
+    <ccm_core.ccm_revisions id="0" 
+                            timestamp="1451602800" />
+    <ccm_core.ccm_revisions id="1" 
+                            timestamp="1451602800" />
+    
+    <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_aud object_id="-10100" 
+                              rev="0"
+                              revtype="0"
+                              display_name="article1" />
+    <ccm_core.ccm_objects_aud object_id="-10200" 
+                              rev="0"
+                              revtype="0"
+                              display_name="article2" />
+    <ccm_core.ccm_objects_aud object_id="-10300" 
+                              rev="0"
+                              revtype="0"
+                              display_name="article3" />
+    <ccm_core.ccm_objects_aud object_id="-10400" 
+                              rev="0"
+                              revtype="0"
+                              display_name="news1" />
+    <ccm_core.ccm_objects_aud object_id="-10100" 
+                              rev="1"
+                              revtype="1"
+                              display_name="article1" />
+    
+    <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.folders object_id="-2100"
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2200"
+                     type="ASSETS_FOLDER" />
+    
+    <ccm_cms.content_sections object_id="-1100"
+                              label="info"
+                              root_documents_folder_id="-2100"
+                              root_assets_folder_id="-2200" />
+    
+    <ccm_cms.folder_content_section_map folder_id="-2100"
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2200"
+                                        content_section_id="-1100" />
+    
+    <ccm_cms.content_types object_id="-20100" 
+                           content_item_class="org.librecms.contenttypes.Article" 
+                           content_section_id="-1100" />
+    <ccm_cms.content_types object_id="-20200" 
+                           content_item_class="org.librecms.contenttypes.News" 
+                           content_section_id="-1100" />
+    
+    <ccm_cms.content_items object_id="-10100" 
+                           item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248"
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-10200" 
+                           item_uuid="acae860f-2ffa-450d-b486-054292f0dae6"
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-10300" 
+                           item_uuid="f4b38abb-234b-4354-bc92-e36c068a1ebd"
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-10400" 
+                           item_uuid="d9ea527d-c6e3-4bdd-962d-c0a1a80c6c72"
+                           version="DRAFT"
+                           content_type_id="-20200" />
+    
+    <ccm_cms.content_items_aud object_id="-10100" 
+                               rev="0"
+                               item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248" 
+                               version="DRAFT" 
+                               content_type_id="-20100" />
+    <ccm_cms.content_items_aud object_id="-10100" 
+                               rev="1"
+                               item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248" 
+                               version="DRAFT" 
+                               content_type_id="-20100" />
+    <ccm_cms.content_items_aud object_id="-10200" 
+                               rev="0"
+                               item_uuid="acae860f-2ffa-450d-b486-054292f0dae6" 
+                               version="DRAFT" 
+                               content_type_id="-20100"/>
+    <ccm_cms.content_items_aud object_id="-10300" 
+                               rev="0"
+                               item_uuid="f4b38abb-234b-4354-bc92-e36c068a1ebd" 
+                               version="DRAFT" 
+                               content_type_id="-20100"/>
+    <ccm_cms.content_items_aud object_id="-10400" 
+                               rev="0"
+                               item_uuid="d9ea527d-c6e3-4bdd-962d-c0a1a80c6c72" 
+                               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="-10100" 
+                                locale="fr" 
+                                localized_value="article1" />
+    <ccm_cms.content_item_names object_id="-10100" 
+                                locale="de" 
+                                localized_value="article1" />
+    <ccm_cms.content_item_names object_id="-10200" 
+                                locale="en" 
+                                localized_value="article2" />
+    <ccm_cms.content_item_names object_id="-10200" 
+                                locale="de" 
+                                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_aud rev="0" 
+                                    object_id="-10100"
+                                    localized_value="article1"
+                                    locale="en"
+                                    revtype="0" />
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-10100"
+                                    localized_value="article1"
+                                    locale="fr"
+                                    revtype="0" />
+    <ccm_cms.content_item_names_aud rev="1" 
+                                    object_id="-10100"
+                                    localized_value="article1"
+                                    locale="de"
+                                    revtype="0" />
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-10200"
+                                    localized_value="article2"
+                                    locale="en"
+                                    revtype="0" />
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-10200"
+                                    localized_value="article2"
+                                    locale="de"
+                                    revtype="0" />
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-10300"
+                                    localized_value="article3"
+                                    locale="en"
+                                    revtype="0" />
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-10400"
+                                    localized_value="news1"
+                                    locale="en"
+                                    revtype="0" />
+    
+    <ccm_cms.content_item_titles object_id="-10100" 
+                                 locale="en" 
+                                 localized_value="Article 1" />
+    <ccm_cms.content_item_titles object_id="-10100" 
+                                 locale="fr" 
+                                 localized_value="Article 1" />
+    <ccm_cms.content_item_titles object_id="-10100" 
+                                 locale="de" 
+                                 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_aud rev="0" 
+                                     object_id="-10100"
+                                     localized_value="Article 1"
+                                     locale="en"
+                                     revtype="0" />
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-10100"
+                                     localized_value="Article 1"
+                                     locale="fr"
+                                     revtype="0" />
+    <ccm_cms.content_item_titles_aud rev="1" 
+                                     object_id="-10100"
+                                     localized_value="Article 1"
+                                     locale="de"
+                                     revtype="0" />
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-10200"
+                                     localized_value="Article 2"
+                                     locale="en"
+                                     revtype="0" />
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-10300"
+                                     localized_value="Article 3"
+                                     locale="en"
+                                     revtype="0" />
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-10400"
+                                     localized_value="News 1"
+                                     locale="en"
+                                     revtype="0" />
+    
+    <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_aud object_id="-10100" 
+                          rev="0" />
+    <ccm_cms.articles_aud object_id="-10100" 
+                          rev="1" />
+    <ccm_cms.articles_aud object_id="-10200" 
+                          rev="0" />
+    <ccm_cms.articles_aud object_id="-10300" 
+                          rev="0" />
+    
+    <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="-10100"
+        locale="fr" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+    <ccm_cms.article_texts 
+        object_id="-10100"
+        locale="de" 
+        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_aud 
+        rev="0" 
+        object_id="-10100" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." 
+        locale="en" 
+        revtype="0" />
+    <ccm_cms.article_texts_aud 
+        rev="0" 
+        object_id="-10100" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." 
+        locale="fr" 
+        revtype="0" />
+    <ccm_cms.article_texts_aud 
+        rev="1" 
+        object_id="-10100" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." 
+        locale="de" 
+        revtype="0" />
+    <ccm_cms.article_texts_aud 
+        rev="0" 
+        object_id="-10200" 
+        localized_value="Duis quis tincidunt elit. In pharetra justo sit amet ipsum dictum, at." 
+        locale="en" 
+        revtype="0" />
+    <ccm_cms.article_texts_aud 
+        rev="0" 
+        object_id="-10300" 
+        localized_value="Etiam euismod lacus laoreet sodales ultricies. Pellentesque non elit vitae purus sagittis." 
+        locale="en" 
+        revtype="0" />
+    
+    <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.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_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/ContentItemL10NManagerTest/after-normalize.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemL10NManagerTest/after-normalize.xml
new file mode 100644
index 000000000..152c62580
--- /dev/null
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemL10NManagerTest/after-normalize.xml
@@ -0,0 +1,565 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+    
+    <ccm_core.ccm_revisions id="0" 
+                            timestamp="1451602800" />
+    <ccm_core.ccm_revisions id="1" 
+                            timestamp="1451602800" />
+        
+    <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_aud object_id="-10100" 
+                              rev="0"
+                              revtype="0"
+                              display_name="article1" />
+    <ccm_core.ccm_objects_aud object_id="-10200" 
+                              rev="0"
+                              revtype="0"
+                              display_name="article2" />
+    <ccm_core.ccm_objects_aud object_id="-10300" 
+                              rev="0"
+                              revtype="0"
+                              display_name="article3" />
+    <ccm_core.ccm_objects_aud object_id="-10400" 
+                              rev="0"
+                              revtype="0"
+                              display_name="news1" />
+    <ccm_core.ccm_objects_aud object_id="-10200" 
+                              rev="1"
+                              revtype="1"
+                              display_name="article2" />
+    
+    <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.folders object_id="-2100"
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2200"
+                     type="ASSETS_FOLDER" />
+    
+    <ccm_cms.content_sections object_id="-1100"
+                              label="info"
+                              root_documents_folder_id="-2100"
+                              root_assets_folder_id="-2200" />
+    
+    <ccm_cms.folder_content_section_map folder_id="-2100"
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2200"
+                                        content_section_id="-1100" />
+    
+    <ccm_cms.content_types object_id="-20100" 
+                           content_item_class="org.librecms.contenttypes.Article" 
+                           content_section_id="-1100" />
+    <ccm_cms.content_types object_id="-20200" 
+                           content_item_class="org.librecms.contenttypes.News" 
+                           content_section_id="-1100" />
+    
+    <ccm_cms.content_items object_id="-10100" 
+                           item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248"
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-10200" 
+                           item_uuid="acae860f-2ffa-450d-b486-054292f0dae6"
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-10300" 
+                           item_uuid="f4b38abb-234b-4354-bc92-e36c068a1ebd"
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-10400" 
+                           item_uuid="d9ea527d-c6e3-4bdd-962d-c0a1a80c6c72"
+                           version="DRAFT"
+                           content_type_id="-20200" />
+    
+    <ccm_cms.content_items_aud object_id="-10100" 
+                               rev="0"
+                               item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248" 
+                               version="DRAFT" 
+                               content_type_id="-20100" />
+    <ccm_cms.content_items_aud object_id="-10200" 
+                               rev="0"
+                               item_uuid="acae860f-2ffa-450d-b486-054292f0dae6" 
+                               version="DRAFT" 
+                               content_type_id="-20100"/>
+    <ccm_cms.content_items_aud object_id="-10300" 
+                               rev="0"
+                               item_uuid="f4b38abb-234b-4354-bc92-e36c068a1ebd" 
+                               version="DRAFT" 
+                               content_type_id="-20100"/>
+    <ccm_cms.content_items_aud object_id="-10400" 
+                               rev="0"
+                               item_uuid="d9ea527d-c6e3-4bdd-962d-c0a1a80c6c72" 
+                               version="DRAFT" 
+                               content_type_id="-20200"/>
+    <ccm_cms.content_items_aud object_id="-10200" 
+                               rev="1"
+                               item_uuid="acae860f-2ffa-450d-b486-054292f0dae6" 
+                               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="-10100" 
+                                locale="fr" 
+                                localized_value="article1" />
+    <ccm_cms.content_item_names object_id="-10200" 
+                                locale="en" 
+                                localized_value="article2" />
+    <ccm_cms.content_item_names object_id="-10200" 
+                                locale="de" 
+                                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_aud rev="0" 
+                                    object_id="-10100"
+                                    localized_value="article1"
+                                    locale="en"
+                                    revtype="0" />
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-10100"
+                                    localized_value="article1"
+                                    locale="fr"
+                                    revtype="0" />
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-10200"
+                                    localized_value="article2"
+                                    locale="en"
+                                    revtype="0" />
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-10200"
+                                    localized_value="article2"
+                                    locale="de"
+                                    revtype="0" />
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-10300"
+                                    localized_value="article3"
+                                    locale="en"
+                                    revtype="0" />
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-10400"
+                                    localized_value="news1"
+                                    locale="en"
+                                    revtype="0" />
+    
+    <ccm_cms.content_item_titles object_id="-10100" 
+                                 locale="en" 
+                                 localized_value="Article 1" />
+    <ccm_cms.content_item_titles object_id="-10100" 
+                                 locale="fr" 
+                                 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="-10200" 
+                                 locale="de" 
+                                 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_aud rev="0" 
+                                     object_id="-10100"
+                                     localized_value="Article 1"
+                                     locale="en"
+                                     revtype="0" />
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-10100"
+                                     localized_value="Article 1"
+                                     locale="fr"
+                                     revtype="0" />
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-10200"
+                                     localized_value="Article 2"
+                                     locale="en"
+                                     revtype="0" />
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-10300"
+                                     localized_value="Article 3"
+                                     locale="en"
+                                     revtype="0" />
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-10400"
+                                     localized_value="News 1"
+                                     locale="en"
+                                     revtype="0" />
+    <ccm_cms.content_item_titles_aud rev="1" 
+                                     object_id="-10200"
+                                     localized_value="Article 2"
+                                     locale="de"
+                                     revtype="0" />
+    
+    <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_aud object_id="-10100" 
+                          rev="0" />
+    <ccm_cms.articles_aud object_id="-10200" 
+                          rev="0" />
+    <ccm_cms.articles_aud object_id="-10300" 
+                          rev="0" />
+    <ccm_cms.articles_aud object_id="-10200" 
+                          rev="1" />
+    
+    <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="-10100"
+        locale="fr" 
+        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="-10200"
+        locale="de" 
+        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_aud 
+        rev="0" 
+        object_id="-10100" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." 
+        locale="en" 
+        revtype="0" />
+    <ccm_cms.article_texts_aud 
+        rev="0" 
+        object_id="-10100" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." 
+        locale="fr" 
+        revtype="0" />
+    <ccm_cms.article_texts_aud 
+        rev="0" 
+        object_id="-10200" 
+        localized_value="Duis quis tincidunt elit. In pharetra justo sit amet ipsum dictum, at." 
+        locale="en" 
+        revtype="0" />
+    <ccm_cms.article_texts_aud 
+        rev="0" 
+        object_id="-10300" 
+        localized_value="Etiam euismod lacus laoreet sodales ultricies. Pellentesque non elit vitae purus sagittis." 
+        locale="en" 
+        revtype="0" />
+    <ccm_cms.article_texts_aud 
+        rev="1" 
+        object_id="-10200" 
+        localized_value="Duis quis tincidunt elit. In pharetra justo sit amet ipsum dictum, at." 
+        locale="de" 
+        revtype="0" />
+    
+    <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.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_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/ContentItemL10NManagerTest/after-remove-language.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemL10NManagerTest/after-remove-language.xml
new file mode 100644
index 000000000..9a05b3f4f
--- /dev/null
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemL10NManagerTest/after-remove-language.xml
@@ -0,0 +1,554 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+    
+    <ccm_core.ccm_revisions id="0" 
+                            timestamp="1451602800" />
+    <ccm_core.ccm_revisions id="1" 
+                            timestamp="1451602800" />
+    
+    <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_aud object_id="-10100" 
+                              rev="0"
+                              revtype="0"
+                              display_name="article1" />
+    <ccm_core.ccm_objects_aud object_id="-10200" 
+                              rev="0"
+                              revtype="0"
+                              display_name="article2" />
+    <ccm_core.ccm_objects_aud object_id="-10300" 
+                              rev="0"
+                              revtype="0"
+                              display_name="article3" />
+    <ccm_core.ccm_objects_aud object_id="-10400" 
+                              rev="0"
+                              revtype="0"
+                              display_name="news1" />
+    <ccm_core.ccm_objects_aud object_id="-10100" 
+                              rev="1"
+                              revtype="1"
+                              display_name="article1" />
+    
+    <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.folders object_id="-2100"
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2200"
+                     type="ASSETS_FOLDER" />
+    
+    <ccm_cms.content_sections object_id="-1100"
+                              label="info"
+                              root_documents_folder_id="-2100"
+                              root_assets_folder_id="-2200" />
+    
+    <ccm_cms.folder_content_section_map folder_id="-2100"
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2200"
+                                        content_section_id="-1100" />
+    
+    <ccm_cms.content_types object_id="-20100" 
+                           content_item_class="org.librecms.contenttypes.Article" 
+                           content_section_id="-1100" />
+    <ccm_cms.content_types object_id="-20200" 
+                           content_item_class="org.librecms.contenttypes.News" 
+                           content_section_id="-1100" />
+    
+    <ccm_cms.content_items object_id="-10100" 
+                           item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248"
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-10200" 
+                           item_uuid="acae860f-2ffa-450d-b486-054292f0dae6"
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-10300" 
+                           item_uuid="f4b38abb-234b-4354-bc92-e36c068a1ebd"
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-10400" 
+                           item_uuid="d9ea527d-c6e3-4bdd-962d-c0a1a80c6c72"
+                           version="DRAFT"
+                           content_type_id="-20200" />
+    
+    <ccm_cms.content_items_aud object_id="-10100" 
+                               rev="0"
+                               item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248" 
+                               version="DRAFT" 
+                               content_type_id="-20100" />
+    <ccm_cms.content_items_aud object_id="-10100" 
+                               rev="1"
+                               item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248" 
+                               version="DRAFT" 
+                               content_type_id="-20100" />
+    <ccm_cms.content_items_aud object_id="-10200" 
+                               rev="0"
+                               item_uuid="acae860f-2ffa-450d-b486-054292f0dae6" 
+                               version="DRAFT" 
+                               content_type_id="-20100"/>
+    <ccm_cms.content_items_aud object_id="-10300" 
+                               rev="0"
+                               item_uuid="f4b38abb-234b-4354-bc92-e36c068a1ebd" 
+                               version="DRAFT" 
+                               content_type_id="-20100"/>
+    <ccm_cms.content_items_aud object_id="-10400" 
+                               rev="0"
+                               item_uuid="d9ea527d-c6e3-4bdd-962d-c0a1a80c6c72" 
+                               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="-10200" 
+                                locale="de" 
+                                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_aud rev="0" 
+                                    object_id="-10100"
+                                    localized_value="article1"
+                                    locale="en"
+                                    revtype="0" />
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-10100"
+                                    localized_value="article1"
+                                    locale="fr"
+                                    revtype="0" />
+    <ccm_cms.content_item_names_aud rev="1" 
+                                    object_id="-10100"
+                                    localized_value="article1"
+                                    locale="fr"
+                                    revtype="2" />
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-10200"
+                                    localized_value="article2"
+                                    locale="en"
+                                    revtype="0" />
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-10200"
+                                    localized_value="article2"
+                                    locale="de"
+                                    revtype="0" />
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-10300"
+                                    localized_value="article3"
+                                    locale="en"
+                                    revtype="0" />
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-10400"
+                                    localized_value="news1"
+                                    locale="en"
+                                    revtype="0" />
+    
+    <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_aud rev="0" 
+                                     object_id="-10100"
+                                     localized_value="Article 1"
+                                     locale="en"
+                                     revtype="0" />
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-10100"
+                                     localized_value="Article 1"
+                                     locale="fr"
+                                     revtype="0" />
+    <ccm_cms.content_item_titles_aud rev="1" 
+                                     object_id="-10100"
+                                     localized_value="Article 1"
+                                     locale="fr"
+                                     revtype="2" />
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-10200"
+                                     localized_value="Article 2"
+                                     locale="en"
+                                     revtype="0" />
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-10300"
+                                     localized_value="Article 3"
+                                     locale="en"
+                                     revtype="0" />
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-10400"
+                                     localized_value="News 1"
+                                     locale="en"
+                                     revtype="0" />
+    
+    <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_aud object_id="-10100" 
+                          rev="0" />
+    <ccm_cms.articles_aud object_id="-10200" 
+                          rev="0" />
+    <ccm_cms.articles_aud object_id="-10300" 
+                          rev="0" />
+    <ccm_cms.articles_aud object_id="-10100" 
+                          rev="1" />
+
+    
+    <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_aud 
+        rev="0" 
+        object_id="-10100" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." 
+        locale="en" 
+        revtype="0" />
+    <ccm_cms.article_texts_aud 
+        rev="0" 
+        object_id="-10100" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." 
+        locale="fr" 
+        revtype="0" />
+    <ccm_cms.article_texts_aud 
+        rev="1" 
+        object_id="-10100" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." 
+        locale="fr" 
+        revtype="2" />
+    <ccm_cms.article_texts_aud 
+        rev="0" 
+        object_id="-10200" 
+        localized_value="Duis quis tincidunt elit. In pharetra justo sit amet ipsum dictum, at." 
+        locale="en" 
+        revtype="0" />
+    <ccm_cms.article_texts_aud 
+        rev="0" 
+        object_id="-10300" 
+        localized_value="Etiam euismod lacus laoreet sodales ultricies. Pellentesque non elit vitae purus sagittis." 
+        locale="en" 
+        revtype="0" />
+    
+    <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.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_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/ContentItemL10NManagerTest/data.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemL10NManagerTest/data.xml
new file mode 100644
index 000000000..53e9ce7da
--- /dev/null
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemL10NManagerTest/data.xml
@@ -0,0 +1,533 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+    
+    <ccm_core.ccm_revisions id="0" 
+                            timestamp="1451602800" />
+    
+    <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_aud object_id="-10100" 
+                              rev="0"
+                              revtype="0"
+                              display_name="article1" />
+    <ccm_core.ccm_objects_aud object_id="-10200" 
+                              rev="0"
+                              revtype="0"
+                              display_name="article2" />
+    <ccm_core.ccm_objects_aud object_id="-10300" 
+                              rev="0"
+                              revtype="0"
+                              display_name="article3" />
+    <ccm_core.ccm_objects_aud object_id="-10400" 
+                              rev="0"
+                              revtype="0"
+                              display_name="news1" />
+    
+    <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.folders object_id="-2100"
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2200"
+                     type="ASSETS_FOLDER" />
+    
+    <ccm_cms.content_sections object_id="-1100"
+                              label="info"
+                              root_documents_folder_id="-2100"
+                              root_assets_folder_id="-2200" />
+    
+    <ccm_cms.folder_content_section_map folder_id="-2100"
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2200"
+                                        content_section_id="-1100" />
+    
+    <ccm_cms.content_types object_id="-20100" 
+                           content_item_class="org.librecms.contenttypes.Article" 
+                           content_section_id="-1100" />
+    <ccm_cms.content_types object_id="-20200" 
+                           content_item_class="org.librecms.contenttypes.News" 
+                           content_section_id="-1100" />
+    
+    <ccm_cms.content_items object_id="-10100" 
+                           item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248"
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-10200" 
+                           item_uuid="acae860f-2ffa-450d-b486-054292f0dae6"
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-10300" 
+                           item_uuid="f4b38abb-234b-4354-bc92-e36c068a1ebd"
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-10400" 
+                           item_uuid="d9ea527d-c6e3-4bdd-962d-c0a1a80c6c72"
+                           version="DRAFT"
+                           content_type_id="-20200" />
+    
+    <ccm_cms.content_items_aud object_id="-10100" 
+                               rev="0"
+                               item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248" 
+                               version="DRAFT" 
+                               content_type_id="-20100" />
+    <ccm_cms.content_items_aud object_id="-10200" 
+                               rev="0"
+                               item_uuid="acae860f-2ffa-450d-b486-054292f0dae6" 
+                               version="DRAFT" 
+                               content_type_id="-20100"/>
+    <ccm_cms.content_items_aud object_id="-10300" 
+                               rev="0"
+                               item_uuid="f4b38abb-234b-4354-bc92-e36c068a1ebd" 
+                               version="DRAFT" 
+                               content_type_id="-20100"/>
+    <ccm_cms.content_items_aud object_id="-10400" 
+                               rev="0"
+                               item_uuid="d9ea527d-c6e3-4bdd-962d-c0a1a80c6c72" 
+                               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="-10100" 
+                                locale="fr" 
+                                localized_value="article1" />
+    <ccm_cms.content_item_names object_id="-10200" 
+                                locale="en" 
+                                localized_value="article2" />
+    <ccm_cms.content_item_names object_id="-10200" 
+                                locale="de" 
+                                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_aud rev="0" 
+                                    object_id="-10100"
+                                    localized_value="article1"
+                                    locale="en"
+                                    revtype="0" />
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-10100"
+                                    localized_value="article1"
+                                    locale="fr"
+                                    revtype="0" />
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-10200"
+                                    localized_value="article2"
+                                    locale="en"
+                                    revtype="0" />
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-10200"
+                                    localized_value="article2"
+                                    locale="de"
+                                    revtype="0" />
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-10300"
+                                    localized_value="article3"
+                                    locale="en"
+                                    revtype="0" />
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-10400"
+                                    localized_value="news1"
+                                    locale="en"
+                                    revtype="0" />
+    
+    <ccm_cms.content_item_titles object_id="-10100" 
+                                 locale="en" 
+                                 localized_value="Article 1" />
+    <ccm_cms.content_item_titles object_id="-10100" 
+                                 locale="fr" 
+                                 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_aud rev="0" 
+                                     object_id="-10100"
+                                     localized_value="Article 1"
+                                     locale="en"
+                                     revtype="0" />
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-10100"
+                                     localized_value="Article 1"
+                                     locale="fr"
+                                     revtype="0" />
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-10200"
+                                     localized_value="Article 2"
+                                     locale="en"
+                                     revtype="0" />
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-10300"
+                                     localized_value="Article 3"
+                                     locale="en"
+                                     revtype="0" />
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-10400"
+                                     localized_value="News 1"
+                                     locale="en"
+                                     revtype="0" />
+    
+    <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_aud object_id="-10100" 
+                          rev="0" />
+    <ccm_cms.articles_aud object_id="-10200" 
+                          rev="0" />
+    <ccm_cms.articles_aud object_id="-10300" 
+                          rev="0" />
+    
+    <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="-10100"
+        locale="fr" 
+        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_aud 
+        rev="0" 
+        object_id="-10100" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." 
+        locale="en" 
+        revtype="0" />
+    <ccm_cms.article_texts_aud 
+        rev="0" 
+        object_id="-10100" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." 
+        locale="fr" 
+        revtype="0" />
+    <ccm_cms.article_texts_aud 
+        rev="0" 
+        object_id="-10200" 
+        localized_value="Duis quis tincidunt elit. In pharetra justo sit amet ipsum dictum, at." 
+        locale="en" 
+        revtype="0" />
+    <ccm_cms.article_texts_aud 
+        rev="0" 
+        object_id="-10300" 
+        localized_value="Etiam euismod lacus laoreet sodales ultricies. Pellentesque non elit vitae purus sagittis." 
+        locale="en" 
+        revtype="0" />
+    
+    <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.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_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/scripts/h2-cleanup.sql b/ccm-cms/src/test/resources/scripts/h2-cleanup.sql
index 10ead7235..c362037da 100644
--- a/ccm-cms/src/test/resources/scripts/h2-cleanup.sql
+++ b/ccm-cms/src/test/resources/scripts/h2-cleanup.sql
@@ -10,6 +10,10 @@ DELETE FROM ccm_cms.articles;
 
 DELETE FROM ccm_cms.articles_aud;
 
+DELETE FROM ccm_cms.content_item_descriptions;
+
+DELETE FROM ccm_cms.content_item_descriptions_aud;
+
 DELETE FROM ccm_cms.content_item_names;
 
 DELETE FROM ccm_cms.content_item_names_aud;