diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/ContentSectionManagerTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/ContentSectionManagerTest.java
index 7ee524528..3d001206f 100644
--- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentSectionManagerTest.java
+++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentSectionManagerTest.java
@@ -122,7 +122,7 @@ public class ContentSectionManagerTest {
         excludeColumns = {"section_id"})
     @InSequence(200)
     public void renameSection() {
-
+        //Rename main to content
     }
 
     @Test
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 3c710c858..09da57710 100644
--- a/ccm-cms/src/test/java/org/librecms/contentsection/DatasetsTest.java
+++ b/ccm-cms/src/test/java/org/librecms/contentsection/DatasetsTest.java
@@ -43,8 +43,11 @@ public class DatasetsTest extends DatasetsVerifier {
     @Parameterized.Parameters(name = "Dataset {0}")
     public static Collection<String> data() {
         return Arrays.asList(new String[]{
-            "/datasets/org/librecms/contentsection/ContentSectionManagerTest/data.xml"
-        });
+            "/datasets/org/librecms/contentsection/ContentSectionManagerTest/data.xml",
+            "/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-role.xml",
+            "/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-create.xml",
+            "/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-role.xml",
+            "/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-rename.xml" });
     }
 
     public DatasetsTest(final String datasetPath) {
@@ -55,7 +58,7 @@ public class DatasetsTest extends DatasetsVerifier {
     public DatasetType getDatasetType() {
         return DatasetType.FLAT_XML;
     }
-    
+
     @Override
     public String[] getSchemas() {
         return new String[]{"ccm_core", "ccm_cms"};
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-role.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-role.xml
new file mode 100644
index 000000000..4b4220b59
--- /dev/null
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-role.xml
@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+    
+    <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.categories object_id="-2100"
+                         unique_id="82014239-9c06-486d-ae8c-4ae47f52a699"
+                         name="info_root" 
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false" />
+    <ccm_core.categories object_id="-2200"
+                         unique_id="b163f73c-9ac2-44d7-a037-de621f5ca828"
+                         name="info_assets" 
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"/>
+                             
+    <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.resource_descriptions object_id="-1100" 
+                                    locale="en"
+                                    localized_value="Initial content section" />
+    
+    <ccm_core.applications object_id="-1100"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="info" />
+    
+    <ccm_cms.content_sections object_id="-1100"
+                              label="info"
+                              root_documents_folder_id="-2100"
+                              root_assets_folder_id="-2200" />
+    
+    <ccm_core.ccm_roles role_id="-3100"
+                        name="info_alert_recipient" />
+    <ccm_core.ccm_roles role_id="-3200"
+                        name="info_author" />
+    <ccm_core.ccm_roles role_id="-3300"
+                        name="info_editor" />
+    <ccm_core.ccm_roles role_id="-3400"
+                        name="info_manager" />
+    <ccm_core.ccm_roles role_id="-3500"
+                        name="info_publisher" />
+    <ccm_core.ccm_roles role_id="-3600"
+                        name="info_content_reader" />
+    <ccm_core.ccm_roles role_id="-3700"
+                        name="info_reviewer" />
+    
+    <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_cms.content_section_roles role_id="-3700" 
+                                   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_item" 
+                          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_items" 
+                          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_item" 
+                          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_item" 
+                          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"/>
+    <ccm_core.permissions permission_id="-40000" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3700" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-41000" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3700" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-42000" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3700" 
+                          creation_date="2016-07-15"/>
+    
+</dataset>
\ No newline at end of file
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-create.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-create.xml
new file mode 100644
index 000000000..b8807e46e
--- /dev/null
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-create.xml
@@ -0,0 +1,489 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+    
+    <ccm_core.ccm_objects object_id="-1100"
+                          display_name="info"
+                          uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
+    <ccm_core.ccm_objects object_id="-1200"
+                          display_name="test"
+                          uuid="53faca8a-c719-4f2f-ade4-ce0ab9b3f07a" />
+    <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="-2300"
+                          display_name="test_root"
+                          uuid="1c423126-1e45-4fd9-9690-35d85d535e75" />
+    <ccm_core.ccm_objects object_id="-2400"
+                          display_name="test_assets"
+                          uuid="b393da77-df18-4eef-aa58-1f11599d82d0" />
+
+    <ccm_core.categories object_id="-2100"
+                         unique_id="82014239-9c06-486d-ae8c-4ae47f52a699"
+                         name="info_root" 
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false" />
+    <ccm_core.categories object_id="-2200"
+                         unique_id="b163f73c-9ac2-44d7-a037-de621f5ca828"
+                         name="info_assets" 
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"/>
+    <ccm_core.categories object_id="-2300"
+                         unique_id="1c423126-1e45-4fd9-9690-35d85d535e75"
+                         name="info_root" 
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false" />
+    <ccm_core.categories object_id="-2400"
+                         unique_id="b393da77-df18-4eef-aa58-1f11599d82d0"
+                         name="info_assets" 
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"/>
+                             
+    <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.category_titles object_id="-2300" 
+                              locale="en" 
+                              localized_value="test_root" />
+    <ccm_core.category_titles object_id="-2400" 
+                              locale="en" 
+                              localized_value="test_assets" />
+    
+    <ccm_core.resources object_id="-1100" 
+                        created="2016-07-15" />
+    <ccm_core.resources object_id="-1200" 
+                        created="2016-07-16" />
+    
+    <ccm_core.resource_titles object_id="-1100" 
+                              locale="en"
+                              localized_value="info" />
+    <ccm_core.resource_titles object_id="-1200" 
+                              locale="en"
+                              localized_value="test" />
+    
+    <ccm_core.resource_descriptions object_id="-1100" 
+                                    locale="en"
+                                    localized_value="Initial content section" />
+    <ccm_core.resource_descriptions object_id="-1200" 
+                                    locale="en"
+                                    localized_value="Test content section" />
+        
+    <ccm_core.applications object_id="-1100"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="info" />
+    <ccm_core.applications object_id="-1200"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="test" />
+    
+    <ccm_cms.content_sections object_id="-1100"
+                              label="info"
+                              root_documents_folder_id="-2100"
+                              root_assets_folder_id="-2200" />
+    <ccm_cms.content_sections object_id="-1200"
+                              label="test"
+                              root_documents_folder_id="-2300"
+                              root_assets_folder_id="-2400" />
+    
+    <ccm_core.ccm_roles role_id="-3100"
+                        name="info_alert_recipient" />
+    <ccm_core.ccm_roles role_id="-3200"
+                        name="info_author" />
+    <ccm_core.ccm_roles role_id="-3300"
+                        name="info_editor" />
+    <ccm_core.ccm_roles role_id="-3400"
+                        name="info_manager" />
+    <ccm_core.ccm_roles role_id="-3500"
+                        name="info_publisher" />
+    <ccm_core.ccm_roles role_id="-3600"
+                        name="info_content_reader" />
+    <ccm_core.ccm_roles role_id="-31000"
+                        name="test_alert_recipient" />
+    <ccm_core.ccm_roles role_id="-32000"
+                        name="test_author" />
+    <ccm_core.ccm_roles role_id="-33000"
+                        name="test_editor" />
+    <ccm_core.ccm_roles role_id="-34000"
+                        name="test_manager" />
+    <ccm_core.ccm_roles role_id="-35000"
+                        name="test_publisher" />
+    <ccm_core.ccm_roles role_id="-36000"
+                        name="test_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_cms.content_section_roles role_id="-31000" 
+                                   section_id="-1200" />
+    <ccm_cms.content_section_roles role_id="-32000" 
+                                   section_id="-1200" />
+    <ccm_cms.content_section_roles role_id="-33000" 
+                                   section_id="-1200" />
+    <ccm_cms.content_section_roles role_id="-34000" 
+                                   section_id="-1200" />
+    <ccm_cms.content_section_roles role_id="-35000" 
+                                   section_id="-1200" />
+    <ccm_cms.content_section_roles role_id="-36000" 
+                                   section_id="-1200" />
+    
+    <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_item" 
+                          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="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4320" 
+                          granted_privilege="administer_workflow" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4330" 
+                          granted_privilege="administer_lifecyles" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4340" 
+                          granted_privilege="administer_categories" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4350" 
+                          granted_privilege="administer_content_items" 
+                          object_id="-2100" 
+                          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_item" 
+                          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_item" 
+                          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"/>
+    <ccm_core.permissions permission_id="-41100" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2300" 
+                          grantee_id="-32000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-41200" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2300" 
+                          grantee_id="-32000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-41300" 
+                          granted_privilege="edit_items" 
+                          object_id="-2300" 
+                          grantee_id="-32000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-41400" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2300" 
+                          grantee_id="-32000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-41500" 
+                          granted_privilege="preview_items" 
+                          object_id="-2300" 
+                          grantee_id="-32000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-42100" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2300" 
+                          grantee_id="-33000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-42200" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2300" 
+                          grantee_id="-33000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-42300" 
+                          granted_privilege="edit_items" 
+                          object_id="-2300" 
+                          grantee_id="-33000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-42400" 
+                          granted_privilege="approve_items" 
+                          object_id="-2300" 
+                          grantee_id="-33000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-42500" 
+                          granted_privilege="delete_item" 
+                          object_id="-2300" 
+                          grantee_id="-33000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-42600" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2300" 
+                          grantee_id="-33000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-42700" 
+                          granted_privilege="preview_items" 
+                          object_id="-2300" 
+                          grantee_id="-33000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-43100" 
+                          granted_privilege="administer_roles" 
+                          object_id="-1200" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-43200" 
+                          granted_privilege="administer_workflow" 
+                          object_id="-1200" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-43300" 
+                          granted_privilege="administer_lifecyles" 
+                          object_id="-1200" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-43400" 
+                          granted_privilege="administer_categories" 
+                          object_id="-1200" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-43500" 
+                          granted_privilege="administer_content_items" 
+                          object_id="-1200" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-43600" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2300" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-43700" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2200" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-43800" 
+                          granted_privilege="edit_items" 
+                          object_id="-2300" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-43900" 
+                          granted_privilege="approve_items" 
+                          object_id="-2300" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-44000" 
+                          granted_privilege="publish_items" 
+                          object_id="-2300" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-44100" 
+                          granted_privilege="delete_item" 
+                          object_id="-2300" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-44200" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2300" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-44300" 
+                          granted_privilege="preview_items" 
+                          object_id="-2300" 
+                          grantee_id="-34000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-45100" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2300" 
+                          grantee_id="-35000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-45200" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2300" 
+                          grantee_id="-35000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-45300" 
+                          granted_privilege="edit_items" 
+                          object_id="-2300" 
+                          grantee_id="-35000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-45400" 
+                          granted_privilege="approve_items" 
+                          object_id="-2300" 
+                          grantee_id="-35000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-45500" 
+                          granted_privilege="publish_items" 
+                          object_id="-2300" 
+                          grantee_id="-35000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-45600" 
+                          granted_privilege="delete_item" 
+                          object_id="-2300" 
+                          grantee_id="-35000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-45700" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2300" 
+                          grantee_id="-35000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-45800" 
+                          granted_privilege="preview_items" 
+                          object_id="-2300" 
+                          grantee_id="-35000" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-46100" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2300" 
+                          grantee_id="-36000" 
+                          creation_date="2016-07-15"/>
+
+    
+</dataset>
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-role.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-role.xml
new file mode 100644
index 000000000..effe43ae9
--- /dev/null
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-role.xml
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+    
+    <!--
+    
+    Content Section info,
+    CcmApplication
+    Resource
+    CcmObject
+    
+    Root document folder category
+    
+    Root assets folder category
+    
+    Rollen:
+    
+    info_alert_recipient
+    
+    info_author: categorize_items, create_new_items, edit_items, 
+                 view_published_items, preview_items
+    
+    info_editor: categorize_items, create_new_items,, edit_items, approve_items, 
+                 delete_items, view_published_items, preview_items
+                     
+    info_manager: administer_roles, administer_workflow, administer_lifecyles, 
+                  administer_categories, administer_content_items, 
+                  categorize_items, create_new_items, edit_items, 
+                  approve_items, publish_items, delete-items, 
+                  view_published_items, preview_items
+    
+    info_publisher: categorize_items, create_new_items, edit_items,
+                    approve_items, publish_items, delete-items, 
+                    view_published_items, preview_items
+    
+    info_content_reader: view_published_items
+    
+    -->
+    
+    <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.categories object_id="-2100"
+                         unique_id="82014239-9c06-486d-ae8c-4ae47f52a699"
+                         name="info_root" 
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false" />
+    <ccm_core.categories object_id="-2200"
+                         unique_id="b163f73c-9ac2-44d7-a037-de621f5ca828"
+                         name="info_assets" 
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"/>
+                             
+    <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.resource_descriptions object_id="-1100" 
+                                    locale="en"
+                                    localized_value="Initial content section" />
+    
+    <ccm_core.applications object_id="-1100"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="info" />
+    
+    <ccm_cms.content_sections object_id="-1100"
+                              label="info"
+                              root_documents_folder_id="-2100"
+                              root_assets_folder_id="-2200" />
+    
+    <ccm_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="-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="-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_item" 
+                          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_items" 
+                          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_item" 
+                          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="-4610" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"/>
+    
+</dataset>
\ No newline at end of file
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-rename.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-rename.xml
new file mode 100644
index 000000000..72301f5a3
--- /dev/null
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-rename.xml
@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+
+    <ccm_core.ccm_objects object_id="-1100"
+                          display_name="content"
+                          uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
+    <ccm_core.ccm_objects object_id="-2100"
+                          display_name="content_root"
+                          uuid="82014239-9c06-486d-ae8c-4ae47f52a699" />
+    <ccm_core.ccm_objects object_id="-2200"
+                          display_name="content_assets"
+                          uuid="b163f73c-9ac2-44d7-a037-de621f5ca828" />
+    
+    <ccm_core.categories object_id="-2100"
+                         unique_id="82014239-9c06-486d-ae8c-4ae47f52a699"
+                         name="content_root" 
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false" />
+    <ccm_core.categories object_id="-2200"
+                         unique_id="b163f73c-9ac2-44d7-a037-de621f5ca828"
+                         name="content_assets" 
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"/>
+                             
+    <ccm_core.category_titles object_id="-2100" 
+                              locale="en" 
+                              localized_value="content_root" />
+    <ccm_core.category_titles object_id="-2200" 
+                              locale="en" 
+                              localized_value="content_assets" />
+    
+    <ccm_core.resources object_id="-1100" 
+                        created="2016-07-15" />
+    <ccm_core.resource_titles object_id="-1100" 
+                              locale="en"
+                              localized_value="content" />
+    
+    <ccm_core.resource_descriptions object_id="-1100" 
+                                    locale="en"
+                                    localized_value="Initial content section" />
+    
+    <ccm_core.applications object_id="-1100"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="content" />
+    
+    <ccm_cms.content_sections object_id="-1100"
+                              label="content"
+                              root_documents_folder_id="-2100"
+                              root_assets_folder_id="-2200" />
+    
+    <ccm_core.ccm_roles role_id="-3100"
+                        name="content_alert_recipient" />
+    <ccm_core.ccm_roles role_id="-3200"
+                        name="content_author" />
+    <ccm_core.ccm_roles role_id="-3300"
+                        name="content_editor" />
+    <ccm_core.ccm_roles role_id="-3400"
+                        name="content_manager" />
+    <ccm_core.ccm_roles role_id="-3500"
+                        name="content_publisher" />
+    <ccm_core.ccm_roles role_id="-3600"
+                        name="content_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_item" 
+                          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_items" 
+                          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_item" 
+                          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_item" 
+                          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>
\ No newline at end of file
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/data.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/data.xml
index 50cf0ce91..ec0f9b3c7 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/data.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/data.xml
@@ -39,11 +39,9 @@
     <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" />
@@ -54,7 +52,6 @@
                          enabled="true"
                          visible="true"
                          abstract_category="false" />
-
     <ccm_core.categories object_id="-2200"
                          unique_id="b163f73c-9ac2-44d7-a037-de621f5ca828"
                          name="info_assets" 
@@ -65,14 +62,12 @@
     <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" />
@@ -92,220 +87,195 @@
     
     <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_item" 
                           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="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
-    
     <ccm_core.permissions permission_id="-4320" 
                           granted_privilege="administer_workflow" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
-    
     <ccm_core.permissions permission_id="-4330" 
                           granted_privilege="administer_lifecyles" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
-    
     <ccm_core.permissions permission_id="-4340" 
                           granted_privilege="administer_categories" 
-                          object_id="-2100" 
+                          object_id="-1100" 
                           grantee_id="-3400" 
                           creation_date="2016-07-15"/>
-    
     <ccm_core.permissions permission_id="-4350" 
                           granted_privilege="administer_content_items" 
-                          object_id="-2100" 
+                          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_item" 
                           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_item" 
                           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"