diff --git a/Classes/Hooks/Datahandler/CommandMapPostProcessingHook.php b/Classes/Hooks/Datahandler/CommandMapPostProcessingHook.php
index e316d14f..f100fd7c 100644
--- a/Classes/Hooks/Datahandler/CommandMapPostProcessingHook.php
+++ b/Classes/Hooks/Datahandler/CommandMapPostProcessingHook.php
@@ -27,9 +27,12 @@ class CommandMapPostProcessingHook
      */
     protected $containerFactory;
 
-    public function __construct(ContainerFactory $containerFactory)
+    protected ContainerService $containerService;
+
+    public function __construct(ContainerFactory $containerFactory, ContainerService $containerService)
     {
         $this->containerFactory = $containerFactory;
+        $this->containerService = $containerService;
     }
 
     public function processCmdmap_postProcess(string $command, string $table, $id, $value, DataHandler $dataHandler, $pasteUpdate, $pasteDatamap): void
@@ -54,6 +57,19 @@ protected function localizeOrCopyToLanguage(int $uid, int $language, string $com
             $last = $dataHandler->copyMappingArray['tt_content'][$uid] ?? null;
             if ($command === 'copyToLanguage') {
                 $containerId = $last;
+                $pos = $this->containerService->getAfterContainerElementTarget($container);
+                // move next record after last child
+                $cmd = ['tt_content' => [$last => [
+                    'move' => [
+                        'target' => $pos,
+                        'action' => 'paste',
+                        'update' => [],
+                    ]
+                ]]];
+                $localDataHandler = GeneralUtility::makeInstance(DataHandler::class);
+                $localDataHandler->enableLogging = $dataHandler->enableLogging;
+                $localDataHandler->start([], $cmd, $dataHandler->BE_USER);
+                $localDataHandler->process_cmdmap();
             } else {
                 $containerId = $container->getUid();
             }
@@ -132,6 +148,18 @@ protected function copyOrMoveChildren(int $origUid, int $newId, int $containerId
                 $localDataHandler->enableLogging = $dataHandler->enableLogging;
                 $localDataHandler->start([], $cmd, $dataHandler->BE_USER);
                 $localDataHandler->process_cmdmap();
+                if (!isset($origCmdMap['tt_content'][$origUid][$command]['update']['sys_language_uid'])) {
+                    continue;
+                }
+                if ($origCmdMap['tt_content'][$origUid][$command]['update']['sys_language_uid'] === $record['sys_language_uid']) {
+                    continue;
+                }
+                $target = -$record['uid'];
+                // copy case
+                $newId = $localDataHandler->copyMappingArray['tt_content'][$record['uid']] ?? null;
+                if ($newId !== null) {
+                    $target = -$newId;
+                }
             }
             (GeneralUtility::makeInstance(DatahandlerProcess::class))->endContainerProcess($origUid);
         } catch (Exception $e) {
diff --git a/Classes/Hooks/Datahandler/DatamapPreProcessFieldArrayHook.php b/Classes/Hooks/Datahandler/DatamapPreProcessFieldArrayHook.php
index c0d84669..b060f108 100644
--- a/Classes/Hooks/Datahandler/DatamapPreProcessFieldArrayHook.php
+++ b/Classes/Hooks/Datahandler/DatamapPreProcessFieldArrayHook.php
@@ -56,19 +56,14 @@ public function __construct(
 
     protected function newElementAfterContainer(array $incomingFieldArray): array
     {
+        if (isset($incomingFieldArray['sorting'])) {
+            return $incomingFieldArray;
+        }
         $record = $this->database->fetchOneRecord(-(int)$incomingFieldArray['pid']);
         if ($record === null) {
             // new elements in container have already correct target
             return $incomingFieldArray;
         }
-        if ((int)$record['uid'] === (int)($incomingFieldArray['tx_container_parent'] ?? 0)) {
-            return $incomingFieldArray;
-        }
-        if ((int)($incomingFieldArray['tx_container_parent'] ?? 0) > 0 &&
-            (GeneralUtility::makeInstance(DatahandlerProcess::class))->isContainerInProcess((int)$incomingFieldArray['tx_container_parent'])
-        ) {
-            return $incomingFieldArray;
-        }
         if (!$this->tcaRegistry->isContainerElement($record['CType'])) {
             return $incomingFieldArray;
         }
diff --git a/Tests/Functional/Datahandler/ContentDefender/DefaultLanguageTest.php b/Tests/Functional/Datahandler/ContentDefender/DefaultLanguageTest.php
index acd36183..e48bbd35 100644
--- a/Tests/Functional/Datahandler/ContentDefender/DefaultLanguageTest.php
+++ b/Tests/Functional/Datahandler/ContentDefender/DefaultLanguageTest.php
@@ -209,7 +209,7 @@ public function copyElementIntoContainerAtTopCopyAllowedCTypeElement(): void
      */
     public function copyChildFromOtherContainerIntoColposWhereTargetElementInOtherColposHasRestrictionIsAllowd(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/DefaultLanguage/copy_child_from_other_container_into_colpos_where_target_element_in_other_colpos_has_restriction.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/DefaultLanguage/CopyChildFromOtherContainerIntoColposWhereTargetElementInOtherColposHasRestrictionIsAllowed.csv');
         $cmdmap = [
             'tt_content' => [
                 73 => [
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/CopyContainerAfterElementCopiesChildEvenChildIsNotAllowedByContentDefenderInBackendLayoutResult.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/CopyContainerAfterElementCopiesChildEvenChildIsNotAllowedByContentDefenderInBackendLayoutResult.csv
index 5a4dfe4b..29c759d6 100644
--- a/Tests/Functional/Datahandler/ContentDefender/Fixtures/CopyContainerAfterElementCopiesChildEvenChildIsNotAllowedByContentDefenderInBackendLayoutResult.csv
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/CopyContainerAfterElementCopiesChildEvenChildIsNotAllowedByContentDefenderInBackendLayoutResult.csv
@@ -2,11 +2,11 @@
 ,"uid","pid","title"
 ,1,0,""
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","",0,0,10,0,0,0
-,2,1,"header","",0,0,200,1,0,0
-,3,1,"bullets","",0,0,9,0,0,0
-,4,1,"b13-2cols","",0,0,10,0,0,0
-,5,1,"bullets","",0,0,200,4,0,0
-,6,1,"b13-2cols-with-header-container"," (copy 1)",256,0,9,0,0,0
-,7,1,"header"," (copy 2)",512,0,200,6,0,0
+,"uid","pid","CType","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container",10,0
+,2,1,"header",200,1
+,3,1,"bullets",9,0
+,4,1,"b13-2cols",10,0
+,5,1,"bullets",200,4
+,6,1,"b13-2cols-with-header-container",9,0
+,7,1,"header",200,6
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/CopyContainerIntoOtherContainerWithSameColPosCopiesAlsoChildEvenChildIsDisallowedInTargetContainerResult.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/CopyContainerIntoOtherContainerWithSameColPosCopiesAlsoChildEvenChildIsDisallowedInTargetContainerResult.csv
index 82714d46..62a14562 100644
--- a/Tests/Functional/Datahandler/ContentDefender/Fixtures/CopyContainerIntoOtherContainerWithSameColPosCopiesAlsoChildEvenChildIsDisallowedInTargetContainerResult.csv
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/CopyContainerIntoOtherContainerWithSameColPosCopiesAlsoChildEvenChildIsDisallowedInTargetContainerResult.csv
@@ -2,11 +2,11 @@
 ,"uid","pid","title"
 ,1,0,""
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","",0,0,10,0,0,0
-,2,1,"header","",0,0,200,1,0,0
-,3,1,"bullets","",0,0,9,0,0,0
-,4,1,"b13-2cols","",0,0,10,0,0,0
-,5,1,"bullets","",0,0,200,4,0,0
-,6,1,"b13-2cols"," (copy 1)",256,0,200,1,0,0
-,7,1,"bullets"," (copy 2)",512,0,200,6,0,0
+,"uid","pid","CType","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container",10,0
+,2,1,"header",200,1
+,3,1,"bullets",9,0
+,4,1,"b13-2cols",10,0
+,5,1,"bullets",200,4
+,6,1,"b13-2cols",200,1
+,7,1,"bullets",200,6
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/CopyContainerWithRestrictionsIgnoresContentDefenderResult.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/CopyContainerWithRestrictionsIgnoresContentDefenderResult.csv
index 82733a96..05b6dd15 100644
--- a/Tests/Functional/Datahandler/ContentDefender/Fixtures/CopyContainerWithRestrictionsIgnoresContentDefenderResult.csv
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/CopyContainerWithRestrictionsIgnoresContentDefenderResult.csv
@@ -3,15 +3,15 @@
 ,1,0,""
 ,2,0,""
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","",0,0,10,0,0,0
-,2,1,"header","",0,0,200,1,0,0
-,3,1,"bullets","",0,0,9,0,0,0
-,4,1,"b13-2cols","",0,0,10,0,0,0
-,5,1,"bullets","",0,0,200,4,0,0
-,11,2,"b13-2cols-with-header-container","",128,0,0,0,0,0
-,12,2,"header","",256,0,200,11,0,0
-,13,2,"bullets","",512,0,201,11,0,0
-,14,2,"b13-2cols-with-header-container"," (copy 1)",64,0,0,0,0,0
-,15,2,"header"," (copy 2)",96,0,200,14,0,0
-,16,2,"bullets"," (copy 3)",112,0,201,14,0,0
+,"uid","pid","CType","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container",10,0
+,2,1,"header",200,1
+,3,1,"bullets",9,0
+,4,1,"b13-2cols",10,0
+,5,1,"bullets",200,4
+,11,2,"b13-2cols-with-header-container",0,0
+,12,2,"header",200,11
+,13,2,"bullets",201,11
+,14,2,"b13-2cols-with-header-container",0,0
+,15,2,"header",200,14
+,16,2,"bullets",201,14
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/CopyChildFromOtherContainerIntoColposWhereTargetElementInOtherColposHasRestrictionIsAllowdResult.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/CopyChildFromOtherContainerIntoColposWhereTargetElementInOtherColposHasRestrictionIsAllowdResult.csv
index a43438d3..1150d6d7 100644
--- a/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/CopyChildFromOtherContainerIntoColposWhereTargetElementInOtherColposHasRestrictionIsAllowdResult.csv
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/CopyChildFromOtherContainerIntoColposWhereTargetElementInOtherColposHasRestrictionIsAllowdResult.csv
@@ -2,9 +2,9 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0,0
-,72,1,"b13-2cols-with-header-container","other-container",1256,0,0,0,0,0
-,73,1,"bullets","bullets",2128,0,200,72,0,0
-,74,1,"bullets","bullets (copy 1)",192,0,201,1,0,0
+,"uid","pid","CType","header","sorting","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0
+,2,1,"header","header-default",256,200,1
+,72,1,"b13-2cols-with-header-container","other-container",1256,0,0
+,73,1,"bullets","bullets",2128,200,72
+,74,1,"bullets","bullets (copy 1)",756,201,1
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/CopyChildFromOtherContainerIntoColposWhereTargetElementInOtherColposHasRestrictionIsAllowed.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/CopyChildFromOtherContainerIntoColposWhereTargetElementInOtherColposHasRestrictionIsAllowed.csv
new file mode 100644
index 00000000..bd61f5ff
--- /dev/null
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/CopyChildFromOtherContainerIntoColposWhereTargetElementInOtherColposHasRestrictionIsAllowed.csv
@@ -0,0 +1,4 @@
+"tt_content"
+,"uid","pid","CType","header","sorting","colPos","tx_container_parent"
+,72,1,"b13-2cols-with-header-container","other-container",1256,0,0
+,73,1,"bullets","bullets",2128,200,72
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/CopyElementIntoContainerAtTopCopyAllowedCTypeElementResult.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/CopyElementIntoContainerAtTopCopyAllowedCTypeElementResult.csv
index ca089fcd..9437c7d3 100644
--- a/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/CopyElementIntoContainerAtTopCopyAllowedCTypeElementResult.csv
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/CopyElementIntoContainerAtTopCopyAllowedCTypeElementResult.csv
@@ -2,8 +2,8 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0,0
-,71,1,"header","bullets",1024,0,0,0,0,0
-,72,1,"header","bullets (copy 1)",192,0,200,1,0,0
+,"uid","pid","CType","header","sorting","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0
+,2,1,"header","header-default",256,200,1
+,71,1,"header","bullets",1024,0,0
+,72,1,"header","bullets (copy 1)",192,200,1
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/CopyElementIntoContainerAtTopDoNotCopyDisallowedCTypeElementResult.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/CopyElementIntoContainerAtTopDoNotCopyDisallowedCTypeElementResult.csv
index f9239122..1d5ec923 100644
--- a/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/CopyElementIntoContainerAtTopDoNotCopyDisallowedCTypeElementResult.csv
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/CopyElementIntoContainerAtTopDoNotCopyDisallowedCTypeElementResult.csv
@@ -2,7 +2,7 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0,0
-,71,1,"bullets","bullets",1024,0,0,0,0,0
+,"uid","pid","CType","header","sorting","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0
+,2,1,"header","header-default",256,200,1
+,71,1,"bullets","bullets",1024,0,0
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/MoveElementIntoContainerAfterOtherElemenDoNotMoveDisallowedCTypeElementResult.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/MoveElementIntoContainerAfterOtherElemenDoNotMoveDisallowedCTypeElementResult.csv
index f9239122..1d5ec923 100644
--- a/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/MoveElementIntoContainerAfterOtherElemenDoNotMoveDisallowedCTypeElementResult.csv
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/MoveElementIntoContainerAfterOtherElemenDoNotMoveDisallowedCTypeElementResult.csv
@@ -2,7 +2,7 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0,0
-,71,1,"bullets","bullets",1024,0,0,0,0,0
+,"uid","pid","CType","header","sorting","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0
+,2,1,"header","header-default",256,200,1
+,71,1,"bullets","bullets",1024,0,0
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/MoveElementIntoContainerAfterOtherElemenMoveAllowedCTypeElementResult.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/MoveElementIntoContainerAfterOtherElemenMoveAllowedCTypeElementResult.csv
index 476da730..898c6d4b 100644
--- a/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/MoveElementIntoContainerAfterOtherElemenMoveAllowedCTypeElementResult.csv
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/MoveElementIntoContainerAfterOtherElemenMoveAllowedCTypeElementResult.csv
@@ -2,7 +2,7 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0,0
-,71,1,"header","bullets",192,0,200,1,0,0
+,"uid","pid","CType","header","sorting","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0
+,2,1,"header","header-default",256,200,1
+,71,1,"header","bullets",640,200,1
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/MoveElementIntoContainerAtTopDoNotMoveDisallowedCTypeElementResult.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/MoveElementIntoContainerAtTopDoNotMoveDisallowedCTypeElementResult.csv
index f9239122..1d5ec923 100644
--- a/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/MoveElementIntoContainerAtTopDoNotMoveDisallowedCTypeElementResult.csv
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/MoveElementIntoContainerAtTopDoNotMoveDisallowedCTypeElementResult.csv
@@ -2,7 +2,7 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0,0
-,71,1,"bullets","bullets",1024,0,0,0,0,0
+,"uid","pid","CType","header","sorting","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0
+,2,1,"header","header-default",256,200,1
+,71,1,"bullets","bullets",1024,0,0
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/MoveElementIntoContainerAtTopMoveAisallowedCTypeElementResult.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/MoveElementIntoContainerAtTopMoveAisallowedCTypeElementResult.csv
index 16e04f42..017a18d3 100644
--- a/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/MoveElementIntoContainerAtTopMoveAisallowedCTypeElementResult.csv
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/MoveElementIntoContainerAtTopMoveAisallowedCTypeElementResult.csv
@@ -2,7 +2,7 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0,0
-,71,1,"header","bullets",640,0,200,1,0,0
+,"uid","pid","CType","header","sorting","colPos","tx_container_parent",
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0,
+,2,1,"header","header-default",256,200,1,
+,71,1,"header","bullets",192,200,1,
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/copy_child_from_other_container_into_colpos_where_target_element_in_other_colpos_has_restriction.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/copy_child_from_other_container_into_colpos_where_target_element_in_other_colpos_has_restriction.csv
deleted file mode 100644
index 13617c08..00000000
--- a/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/copy_child_from_other_container_into_colpos_where_target_element_in_other_colpos_has_restriction.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-"tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
-,72,1,"b13-2cols-with-header-container","other-container",1256,0,,
-,73,1,"bullets","bullets",2128,0,200,72
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/setup.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/setup.csv
index 1be3b489..a1e4567a 100644
--- a/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/setup.csv
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/DefaultLanguage/setup.csv
@@ -3,5 +3,5 @@
 ,1,0,"page-1","/"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,,
-,2,1,"header","header-default",128,0,200,1
\ No newline at end of file
+,1,1,"b13-2cols-with-header-container","container-default",128,0,,
+,2,1,"header","header-default",256,0,200,1
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Localization/CopyElementIntoContainerAtTopDoNotCopyTranslationIfDisallowedCTypeResult.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Localization/CopyElementIntoContainerAtTopDoNotCopyTranslationIfDisallowedCTypeResult.csv
index 2b4e7165..64c9edd6 100644
--- a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Localization/CopyElementIntoContainerAtTopDoNotCopyTranslationIfDisallowedCTypeResult.csv
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Localization/CopyElementIntoContainerAtTopDoNotCopyTranslationIfDisallowedCTypeResult.csv
@@ -4,9 +4,9 @@
 ,2,0,"page-1-language-1"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0,0
-,21,1,"b13-2cols-with-header-container","container-language-1",256,1,0,0,1,0
-,22,1,"header","header-language-1",128,1,200,1,2,0
-,71,1,"bullets","bullets",1024,0,0,0,0,0
-,72,1,"bullets","bullets",1024,1,0,0,71,0
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0,0,0,0
+,2,1,"header","header-default",256,0,200,1,0,0
+,21,1,"b13-2cols-with-header-container","container-language-1",128,1,0,0,1,0
+,22,1,"header","header-language-1",256,1,200,1,2,0
+,71,1,"bullets","bullets",512,0,0,0,0,0
+,72,1,"bullets","bullets",512,1,0,0,71,0
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Localization/MoveElementIntoContainerAtTopToNotMoveTranslationIfDisallowedCTypeResult.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Localization/MoveElementIntoContainerAtTopToNotMoveTranslationIfDisallowedCTypeResult.csv
index 2b4e7165..64c9edd6 100644
--- a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Localization/MoveElementIntoContainerAtTopToNotMoveTranslationIfDisallowedCTypeResult.csv
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Localization/MoveElementIntoContainerAtTopToNotMoveTranslationIfDisallowedCTypeResult.csv
@@ -4,9 +4,9 @@
 ,2,0,"page-1-language-1"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0,0
-,21,1,"b13-2cols-with-header-container","container-language-1",256,1,0,0,1,0
-,22,1,"header","header-language-1",128,1,200,1,2,0
-,71,1,"bullets","bullets",1024,0,0,0,0,0
-,72,1,"bullets","bullets",1024,1,0,0,71,0
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0,0,0,0
+,2,1,"header","header-default",256,0,200,1,0,0
+,21,1,"b13-2cols-with-header-container","container-language-1",128,1,0,0,1,0
+,22,1,"header","header-language-1",256,1,200,1,2,0
+,71,1,"bullets","bullets",512,0,0,0,0,0
+,72,1,"bullets","bullets",512,1,0,0,71,0
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Localization/setup.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Localization/setup.csv
index 609a1baa..232718ca 100644
--- a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Localization/setup.csv
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Localization/setup.csv
@@ -4,9 +4,9 @@
 ,2,0,"page-1-language-1","/",1,1,1
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","l18n_parent","colPos","tx_container_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,,,
-,21,1,"b13-2cols-with-header-container","container-language-1",256,1,1,,
-,22,1,"header","header-language-1",128,1,2,200,1
-,2,1,"header","header-default",128,0,,200,1
-,71,1,"bullets","bullets",1024,0,,0,
-,72,1,"bullets","bullets",1024,1,71,0,
\ No newline at end of file
+,1,1,"b13-2cols-with-header-container","container-default",128,0,,,
+,21,1,"b13-2cols-with-header-container","container-language-1",128,1,1,,
+,22,1,"header","header-language-1",256,1,2,200,1
+,2,1,"header","header-default",256,0,,200,1
+,71,1,"bullets","bullets",512,0,,0,
+,72,1,"bullets","bullets",512,1,71,0,
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanCopyContainerWithMaxitemsReachedColumnToOtherPageResult.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanCopyContainerWithMaxitemsReachedColumnToOtherPageResult.csv
deleted file mode 100644
index b611ce03..00000000
--- a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanCopyContainerWithMaxitemsReachedColumnToOtherPageResult.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-"pages"
-,"uid","pid","title"
-,1,0,""
-,2,0,""
-"tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","",0,0,0,0,0,0
-,2,1,"","",0,0,202,1,0,0
-,3,2,"b13-2cols-with-header-container","",256,0,0,0,0,0
-,4,2,"text"," (copy 1)",512,0,202,3,0,0
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/can_copy_element_from_container_maxitems_reached_column_to_other_column.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanCopyElementFromContainerMaxitemsReachedColumnToOtherColumn.csv
similarity index 100%
rename from Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/can_copy_element_from_container_maxitems_reached_column_to_other_column.csv
rename to Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanCopyElementFromContainerMaxitemsReachedColumnToOtherColumn.csv
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanCopyElementFromContainerMaxitemsReachedColumnToOtherColumnResult.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanCopyElementFromContainerMaxitemsReachedColumnToOtherColumnResult.csv
index e6341da6..fdc7387b 100644
--- a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanCopyElementFromContainerMaxitemsReachedColumnToOtherColumnResult.csv
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanCopyElementFromContainerMaxitemsReachedColumnToOtherColumnResult.csv
@@ -2,7 +2,7 @@
 ,"uid","pid","title"
 ,1,0,""
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","",0,0,0,0,0,0
-,2,1,"","",0,0,202,1,0,0
-,3,1,"text"," (copy 1)",256,0,201,1,0,0
+,"uid","pid","CType","header","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","",0,0
+,2,1,"","",202,1
+,3,1,"text"," (copy 1)",201,1
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/can_copy_element_from_container_maxitems_reached_column_to_other_container.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanCopyElementFromContainerMaxitemsReachedColumnToOtherContainer.csv
similarity index 100%
rename from Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/can_copy_element_from_container_maxitems_reached_column_to_other_container.csv
rename to Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanCopyElementFromContainerMaxitemsReachedColumnToOtherContainer.csv
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanCopyElementFromContainerMaxitemsReachedColumnToOtherContainerResult.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanCopyElementFromContainerMaxitemsReachedColumnToOtherContainerResult.csv
index 49638e35..4f848e9e 100644
--- a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanCopyElementFromContainerMaxitemsReachedColumnToOtherContainerResult.csv
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanCopyElementFromContainerMaxitemsReachedColumnToOtherContainerResult.csv
@@ -2,8 +2,8 @@
 ,"uid","pid","title"
 ,1,0,""
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","",0,0,0,0,0,0
-,2,1,"","",0,0,202,1,0,0
-,3,1,"b13-2cols-with-header-container","",0,0,0,0,0,0
-,4,1,"text"," (copy 1)",256,0,201,3,0,0
+,"uid","pid","CType","colPos","tx_container_parent","l18n_parent","l10n_source"
+,1,1,"b13-2cols-with-header-container",0,0,0,0
+,2,1,"",202,1,0,0
+,3,1,"b13-2cols-with-header-container",0,0,0,0
+,4,1,"text",201,3,0,0
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/can_copy_to_language_child_if_container_of_default_language_maxitems_reached.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanCopyToLanguageChildIfContainerOfDefaultLanguageMaxitemsIsReached.csv
similarity index 100%
rename from Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/can_copy_to_language_child_if_container_of_default_language_maxitems_reached.csv
rename to Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanCopyToLanguageChildIfContainerOfDefaultLanguageMaxitemsIsReached.csv
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanCreateElementInContainerIfMaxitemsIsNotReached.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanCreateElementInContainerIfMaxitemsIsNotReached.csv
new file mode 100644
index 00000000..9e78c90e
--- /dev/null
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanCreateElementInContainerIfMaxitemsIsNotReached.csv
@@ -0,0 +1,6 @@
+"pages"
+,"uid","pid"
+,1,0
+"tt_content"
+,"uid","pid","colPos","CType","sorting"
+,1,1,0,"b13-2cols-with-header-container",256
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanCreateElementInContainerIfMaxitemsIsNotReachedResult.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanCreateElementInContainerIfMaxitemsIsNotReachedResult.csv
index a3ba60c3..762a8784 100644
--- a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanCreateElementInContainerIfMaxitemsIsNotReachedResult.csv
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanCreateElementInContainerIfMaxitemsIsNotReachedResult.csv
@@ -2,6 +2,6 @@
 ,"uid","pid","title"
 ,1,0,""
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","",512,0,0,0,0,0
-,2,1,"text","my-new-header",256,0,202,1,0,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","",256,0,0,0
+,2,1,"text","my-new-header",512,0,202,1
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/can_edit_element_in_container_if_maxitems_is_reached.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanEditElementInContainerWhenMaxitemIsReached.csv
similarity index 72%
rename from Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/can_edit_element_in_container_if_maxitems_is_reached.csv
rename to Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanEditElementInContainerWhenMaxitemIsReached.csv
index 4d201eeb..3240b249 100644
--- a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/can_edit_element_in_container_if_maxitems_is_reached.csv
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanEditElementInContainerWhenMaxitemIsReached.csv
@@ -3,5 +3,5 @@
 ,1,0
 "tt_content"
 ,"uid","pid","colPos","CType","header","tx_container_parent"
-,1,1,0,"b13-2cols-with-header-container",,
+,1,1,0,"b13-2cols-with-header-container",,0
 ,3,1,202,,"foo",1
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanEditElementInContainerWhenMaxitemIsReachedResult.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanEditElementInContainerWhenMaxitemIsReachedResult.csv
index 0e1a0be9..97e33b81 100644
--- a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanEditElementInContainerWhenMaxitemIsReachedResult.csv
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanEditElementInContainerWhenMaxitemIsReachedResult.csv
@@ -2,6 +2,6 @@
 ,"uid","pid","title"
 ,1,0,""
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","",0,0,0,0,0,0
-,3,1,"","bar",0,0,202,1,0,0
+,"uid","pid","colPos","CType","header","tx_container_parent"
+,1,1,0,"b13-2cols-with-header-container",,0
+,3,1,202,,"bar",1
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/can_move_container_with_maxitems_reached_column_to_other_page.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanMoveContainerWithMaxitemsReachedColumnToOtherPage.csv
similarity index 100%
rename from Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/can_move_container_with_maxitems_reached_column_to_other_page.csv
rename to Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanMoveContainerWithMaxitemsReachedColumnToOtherPage.csv
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/cannot_move_element_inside_container_column_if_maxitems_is_reached.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanMoveElementFromContainerMaxitemsReachedColumnToOtherContainer.csv
similarity index 71%
rename from Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/cannot_move_element_inside_container_column_if_maxitems_is_reached.csv
rename to Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanMoveElementFromContainerMaxitemsReachedColumnToOtherContainer.csv
index 5e5bb8d9..b6153463 100644
--- a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/cannot_move_element_inside_container_column_if_maxitems_is_reached.csv
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanMoveElementFromContainerMaxitemsReachedColumnToOtherContainer.csv
@@ -4,4 +4,5 @@
 "tt_content"
 ,"uid","pid","colPos","CType","tx_container_parent"
 ,1,1,0,"b13-2cols-with-header-container",
-,2,1,202,,1
\ No newline at end of file
+,2,1,202,,1
+,3,1,0,"b13-2cols-with-header-container",
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/can_move_element_into_container_if_maxitems_is_not_reached.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanMoveElementIntoContainerIfMaxitemsIsNotReached.csv
similarity index 70%
rename from Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/can_move_element_into_container_if_maxitems_is_not_reached.csv
rename to Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanMoveElementIntoContainerIfMaxitemsIsNotReached.csv
index 2f43f645..111ed08d 100644
--- a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/can_move_element_into_container_if_maxitems_is_not_reached.csv
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanMoveElementIntoContainerIfMaxitemsIsNotReached.csv
@@ -3,5 +3,5 @@
 ,1,0
 "tt_content"
 ,"uid","pid","colPos","CType","tx_container_parent"
-,1,1,0,"b13-2cols-with-header-container",
+,1,1,0,"b13-2cols-with-header-container",0
 ,2,1,200,,1
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanMoveElementIntoContainerIfMaxitemsIsNotReachedResult.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanMoveElementIntoContainerIfMaxitemsIsNotReachedResult.csv
index e9754445..50a7ed6e 100644
--- a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanMoveElementIntoContainerIfMaxitemsIsNotReachedResult.csv
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanMoveElementIntoContainerIfMaxitemsIsNotReachedResult.csv
@@ -2,6 +2,6 @@
 ,"uid","pid","title"
 ,1,0,""
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","",0,0,0,0,0,0
-,2,1,"","",0,0,202,1,0,0
+,"uid","pid","CType","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container",0,0
+,2,1,"",202,1
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/can_save_child_in_default_language_when_translated_and_maxitems_is_reached.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanSaveChildInDefaultLanguageWhenTranslatedAndMaxitemsIsReached.csv
similarity index 100%
rename from Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/can_save_child_in_default_language_when_translated_and_maxitems_is_reached.csv
rename to Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanSaveChildInDefaultLanguageWhenTranslatedAndMaxitemsIsReached.csv
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/can_translate_child_if_container_of_default_language_maxitems_reached.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanTranslateChildIfContainerOfDefaultLanguageMaxitemsIsReached.csv
similarity index 100%
rename from Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/can_translate_child_if_container_of_default_language_maxitems_reached.csv
rename to Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CanTranslateChildIfContainerOfDefaultLanguageMaxitemsIsReached.csv
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/cannot_move_element_into_container_if_maxitems_is_reached.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CannotCopyElementIntoContainerIfMaxitemsIsReachedAfterElement.csv
similarity index 59%
rename from Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/cannot_move_element_into_container_if_maxitems_is_reached.csv
rename to Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CannotCopyElementIntoContainerIfMaxitemsIsReachedAfterElement.csv
index 2a0e8605..5812da3c 100644
--- a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/cannot_move_element_into_container_if_maxitems_is_reached.csv
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CannotCopyElementIntoContainerIfMaxitemsIsReachedAfterElement.csv
@@ -3,6 +3,5 @@
 ,1,0
 "tt_content"
 ,"uid","pid","colPos","CType","tx_container_parent"
-,1,1,0,"b13-2cols-with-header-container",
-,2,1,0,,
-,3,1,202,,1
\ No newline at end of file
+,1,1,0,"b13-2cols-with-header-container",0
+,2,1,202,,1
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CannotCopyElementIntoContainerIfMaxitemsIsReachedAfterElementResult.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CannotCopyElementIntoContainerIfMaxitemsIsReachedAfterElementResult.csv
index e9754445..c3cc89d7 100644
--- a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CannotCopyElementIntoContainerIfMaxitemsIsReachedAfterElementResult.csv
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CannotCopyElementIntoContainerIfMaxitemsIsReachedAfterElementResult.csv
@@ -2,6 +2,6 @@
 ,"uid","pid","title"
 ,1,0,""
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","",0,0,0,0,0,0
-,2,1,"","",0,0,202,1,0,0
+,"uid","pid","colPos","CType","tx_container_parent"
+,1,1,0,"b13-2cols-with-header-container",0
+,2,1,202,,1
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CannotCopyElementIntoContainerIfMaxitemsIsReachedAfterIntoContainer.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CannotCopyElementIntoContainerIfMaxitemsIsReachedAfterIntoContainer.csv
new file mode 100644
index 00000000..5812da3c
--- /dev/null
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CannotCopyElementIntoContainerIfMaxitemsIsReachedAfterIntoContainer.csv
@@ -0,0 +1,7 @@
+"pages"
+,"uid","pid"
+,1,0
+"tt_content"
+,"uid","pid","colPos","CType","tx_container_parent"
+,1,1,0,"b13-2cols-with-header-container",0
+,2,1,202,,1
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CannotCopyElementIntoContainerIfMaxitemsIsReachedAfterIntoContainerResult.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CannotCopyElementIntoContainerIfMaxitemsIsReachedAfterIntoContainerResult.csv
index e9754445..c3cc89d7 100644
--- a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CannotCopyElementIntoContainerIfMaxitemsIsReachedAfterIntoContainerResult.csv
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CannotCopyElementIntoContainerIfMaxitemsIsReachedAfterIntoContainerResult.csv
@@ -2,6 +2,6 @@
 ,"uid","pid","title"
 ,1,0,""
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","",0,0,0,0,0,0
-,2,1,"","",0,0,202,1,0,0
+,"uid","pid","colPos","CType","tx_container_parent"
+,1,1,0,"b13-2cols-with-header-container",0
+,2,1,202,,1
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/cannot_create_element_in_container_if_maxitems_is_reached.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CannotCreateElementInContainerIfMaxitemsIsReached.csv
similarity index 100%
rename from Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/cannot_create_element_in_container_if_maxitems_is_reached.csv
rename to Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CannotCreateElementInContainerIfMaxitemsIsReached.csv
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/cannot_copy_element_into_container_if_maxitems_is_reached.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CannotMoveElementInsideContainerColumnIfMaxitemsIsReached.csv
similarity index 100%
rename from Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/cannot_copy_element_into_container_if_maxitems_is_reached.csv
rename to Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CannotMoveElementInsideContainerColumnIfMaxitemsIsReached.csv
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CannotMoveElementIntoContainerIfMaxitemsIsReached.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CannotMoveElementIntoContainerIfMaxitemsIsReached.csv
new file mode 100644
index 00000000..fbcb320c
--- /dev/null
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CannotMoveElementIntoContainerIfMaxitemsIsReached.csv
@@ -0,0 +1,8 @@
+"pages"
+,"uid","pid"
+,1,0
+"tt_content"
+,"uid","pid","colPos","CType","tx_container_parent"
+,1,1,0,"b13-2cols-with-header-container",0
+,2,1,0,"",0
+,3,1,202,"",1
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CannotMoveElementIntoContainerIfMaxitemsIsReachedResult.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CannotMoveElementIntoContainerIfMaxitemsIsReachedResult.csv
index 938025d8..22f79d3f 100644
--- a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CannotMoveElementIntoContainerIfMaxitemsIsReachedResult.csv
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/CannotMoveElementIntoContainerIfMaxitemsIsReachedResult.csv
@@ -2,7 +2,7 @@
 ,"uid","pid","title"
 ,1,0,""
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","",0,0,0,0,0,0
-,2,1,"","",0,0,0,0,0,0
-,3,1,"","",0,0,202,1,0,0
+,"uid","pid","colPos","CType","tx_container_parent"
+,1,1,0,"b13-2cols-with-header-container",0
+,2,1,0,"",0
+,3,1,202,"",1
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/can_create_element_in_container_if_maxitems_is_not_reached.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/can_create_element_in_container_if_maxitems_is_not_reached.csv
deleted file mode 100644
index 5d9136c6..00000000
--- a/Tests/Functional/Datahandler/ContentDefender/Fixtures/Maxitems/can_create_element_in_container_if_maxitems_is_not_reached.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-"pages"
-,"uid","pid"
-,1,0
-"tt_content"
-,"uid","pid","colPos","CType"
-,1,1,0,"b13-2cols-with-header-container"
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/ContentDefender/Fixtures/copy_container.csv b/Tests/Functional/Datahandler/ContentDefender/Fixtures/copy_container.csv
index 9950c45e..4b459835 100644
--- a/Tests/Functional/Datahandler/ContentDefender/Fixtures/copy_container.csv
+++ b/Tests/Functional/Datahandler/ContentDefender/Fixtures/copy_container.csv
@@ -36,8 +36,8 @@
                                        ]]>"
 "tt_content"
 ,"uid","pid","colPos","CType","tx_container_parent"
-,1,1,10,"b13-2cols-with-header-container",
+,1,1,10,"b13-2cols-with-header-container",0
 ,2,1,200,"header",1
-,3,1,9,"bullets",
-,4,1,10,"b13-2cols",
+,3,1,9,"bullets",0
+,4,1,10,"b13-2cols",0
 ,5,1,200,"bullets",4
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/ContentDefender/MaxItemsTest.php b/Tests/Functional/Datahandler/ContentDefender/MaxItemsTest.php
index 3d61fa98..7702755c 100644
--- a/Tests/Functional/Datahandler/ContentDefender/MaxItemsTest.php
+++ b/Tests/Functional/Datahandler/ContentDefender/MaxItemsTest.php
@@ -37,7 +37,7 @@ protected function setUp(): void
      */
     public function canMoveElementIntoContainerIfMaxitemsIsNotReached(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Maxitems/can_move_element_into_container_if_maxitems_is_not_reached.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Maxitems/CanMoveElementIntoContainerIfMaxitemsIsNotReached.csv');
         $cmdmap = [
             'tt_content' => [
                 2 => [
@@ -66,7 +66,7 @@ public function canMoveElementIntoContainerIfMaxitemsIsNotReached(): void
      */
     public function cannotMoveElementIntoContainerIfMaxitemsIsReached(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Maxitems/cannot_move_element_into_container_if_maxitems_is_reached.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Maxitems/CannotMoveElementIntoContainerIfMaxitemsIsReached.csv');
         $cmdmap = [
             'tt_content' => [
                 2 => [
@@ -96,7 +96,7 @@ public function cannotMoveElementIntoContainerIfMaxitemsIsReached(): void
      */
     public function cannotCopyElementIntoContainerIfMaxitemsIsReachedAfterIntoContainer(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Maxitems/cannot_copy_element_into_container_if_maxitems_is_reached.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Maxitems/CannotCopyElementIntoContainerIfMaxitemsIsReachedAfterIntoContainer.csv');
 
         $cmdmap = [
             'tt_content' => [
@@ -128,7 +128,7 @@ public function cannotCopyElementIntoContainerIfMaxitemsIsReachedAfterIntoContai
      */
     public function cannotCopyElementIntoContainerIfMaxitemsIsReachedAfterElement(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Maxitems/cannot_copy_element_into_container_if_maxitems_is_reached.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Maxitems/CannotCopyElementIntoContainerIfMaxitemsIsReachedAfterElement.csv');
         $cmdmap = [
             'tt_content' => [
                 2 => [
@@ -149,14 +149,14 @@ public function cannotCopyElementIntoContainerIfMaxitemsIsReachedAfterElement():
      */
     public function canCreateElementInContainerIfMaxitemsIsNotReached(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Maxitems/can_create_element_in_container_if_maxitems_is_not_reached.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Maxitems/CanCreateElementInContainerIfMaxitemsIsNotReached.csv');
         $newId = StringUtility::getUniqueId('NEW');
         $datamap = [
             'tt_content' => [
                 $newId => [
-                    'colPos' => 202,
+                    'colPos' => '202',
                     'tx_container_parent' => 1,
-                    'pid' => 1,
+                    'pid' => -1,
                     'sys_language_uid' => 0,
                     'header' => 'my-new-header',
                 ],
@@ -175,7 +175,7 @@ public function canCreateElementInContainerIfMaxitemsIsNotReached(): void
      */
     public function cannotCreateElementInContainerIfMaxitemsIsReached(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Maxitems/cannot_create_element_in_container_if_maxitems_is_reached.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Maxitems/CannotCreateElementInContainerIfMaxitemsIsReached.csv');
         $newId = StringUtility::getUniqueId('NEW');
         $datamap = [
             'tt_content' => [
@@ -200,7 +200,7 @@ public function cannotCreateElementInContainerIfMaxitemsIsReached(): void
      */
     public function canEditElementInContainerWhenMaxitemIsReached(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Maxitems/can_edit_element_in_container_if_maxitems_is_reached.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Maxitems/CanEditElementInContainerWhenMaxitemIsReached.csv');
         $datamap = [
             'tt_content' => [
                 3 => [
@@ -225,7 +225,7 @@ public function canEditElementInContainerWhenMaxitemIsReached(): void
      */
     public function canMoveContainerWithMaxitemsReachedColumnToOtherPage(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Maxitems/can_move_container_with_maxitems_reached_column_to_other_page.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Maxitems/CanMoveContainerWithMaxitemsReachedColumnToOtherPage.csv');
         $cmdmap = [
             'tt_content' => [
                 1 => [
@@ -254,7 +254,7 @@ public function canMoveContainerWithMaxitemsReachedColumnToOtherPage(): void
      */
     public function canCopyElementFromContainerMaxitemsReachedColumnToOtherColumn(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Maxitems/can_copy_element_from_container_maxitems_reached_column_to_other_column.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Maxitems/CanCopyElementFromContainerMaxitemsReachedColumnToOtherColumn.csv');
         $cmdmap = [
             'tt_content' => [
                 2 => [
@@ -282,7 +282,7 @@ public function canCopyElementFromContainerMaxitemsReachedColumnToOtherColumn():
      */
     public function canCopyElementFromContainerMaxitemsReachedColumnToOtherContainer(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Maxitems/can_copy_element_from_container_maxitems_reached_column_to_other_container.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Maxitems/CanCopyElementFromContainerMaxitemsReachedColumnToOtherContainer.csv');
         $cmdmap = [
             'tt_content' => [
                 2 => [
@@ -310,7 +310,7 @@ public function canCopyElementFromContainerMaxitemsReachedColumnToOtherContainer
      */
     public function canMoveElementFromContainerMaxitemsReachedColumnToOtherContainer(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Maxitems/can_copy_element_from_container_maxitems_reached_column_to_other_container.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Maxitems/CanMoveElementFromContainerMaxitemsReachedColumnToOtherContainer.csv');
         $cmdmap = [
             'tt_content' => [
                 2 => [
@@ -338,7 +338,7 @@ public function canMoveElementFromContainerMaxitemsReachedColumnToOtherContainer
      */
     public function cannotMoveElementInsideContainerColumnIfMaxitemsIsReached(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Maxitems/cannot_move_element_inside_container_column_if_maxitems_is_reached.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Maxitems/CannotMoveElementInsideContainerColumnIfMaxitemsIsReached.csv');
         $cmdmap = [
             'tt_content' => [
                 2 => [
@@ -365,7 +365,7 @@ public function cannotMoveElementInsideContainerColumnIfMaxitemsIsReached(): voi
      */
     public function canTranslateChildIfContainerOfDefaultLanguageMaxitemsIsReached(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Maxitems/can_translate_child_if_container_of_default_language_maxitems_reached.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Maxitems/CanTranslateChildIfContainerOfDefaultLanguageMaxitemsIsReached.csv');
         $cmdmap = [
             'tt_content' => [
                 3 => ['localize' => 1],
@@ -384,7 +384,7 @@ public function canTranslateChildIfContainerOfDefaultLanguageMaxitemsIsReached()
      */
     public function canCopyToLanguageChildIfContainerOfDefaultLanguageMaxitemsIsReached(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Maxitems/can_copy_to_language_child_if_container_of_default_language_maxitems_reached.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Maxitems/CanCopyToLanguageChildIfContainerOfDefaultLanguageMaxitemsIsReached.csv');
         $cmdmap = [
             'tt_content' => [
                 3 => ['copyToLanguage' => 1],
@@ -403,7 +403,7 @@ public function canCopyToLanguageChildIfContainerOfDefaultLanguageMaxitemsIsReac
      */
     public function canSaveChildInDefaultLanguageWhenTranslatedAndMaxitemsIsReached(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Maxitems/can_save_child_in_default_language_when_translated_and_maxitems_is_reached.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Maxitems/CanSaveChildInDefaultLanguageWhenTranslatedAndMaxitemsIsReached.csv');
         $record = [
            'uid' => 3,
            'pid' => 1,
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/CopyContainerInContainerTest.php b/Tests/Functional/Datahandler/DefaultLanguage/CopyContainerInContainerTest.php
index 42910970..8bd5c180 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/CopyContainerInContainerTest.php
+++ b/Tests/Functional/Datahandler/DefaultLanguage/CopyContainerInContainerTest.php
@@ -21,7 +21,7 @@ class CopyContainerInContainerTest extends AbstractDatahandler
      */
     public function copyContainerWithChildContainersCopiesContentInChildContainersIntoCorrectContainer(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/CopyContainerInContainer/setup.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/CopyContainerInContainer/CopyContainerWithChildContainersCopiesContentInChildContainersIntoCorrectContainer.csv');
         $cmdmap = [
             'tt_content' => [
                 1 => [
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/CopyPageTest.php b/Tests/Functional/Datahandler/DefaultLanguage/CopyPageTest.php
index d4a4c076..9a233f90 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/CopyPageTest.php
+++ b/Tests/Functional/Datahandler/DefaultLanguage/CopyPageTest.php
@@ -21,7 +21,7 @@ class CopyPageTest extends AbstractDatahandler
      */
     public function copyPageCopiesChildrenOfContainer(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/CopyPage/setup.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/CopyPage/CopyPageCopiesChildrenOfContainer.csv');
         $cmdmap = [
             'pages' => [
                 1 => [
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerOtherPageAfterElement.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerOtherPageAfterElement.csv
index 067e340c..836e4d17 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerOtherPageAfterElement.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerOtherPageAfterElement.csv
@@ -4,8 +4,8 @@
 ,3,0,""
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container",256,0,0,0,0
+,1,1,"b13-2cols-with-header-container","container",64,0,0,0,0
 ,2,1,"header","col1-first",128,0,200,1,0
 ,3,1,"header","col1-second",256,0,200,1,0
-,4,1,"header","col2-first",512,0,201,1,0
+,4,1,"header","col2-first",384,0,201,1,0
 ,10,3,"header","outside",512,0,0,0,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerOtherPageAfterElementResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerOtherPageAfterElementResult.csv
index e8bcc0dc..53e96397 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerOtherPageAfterElementResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerOtherPageAfterElementResult.csv
@@ -4,10 +4,10 @@
 ,3,0,""
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container",256,0,0,0,0
+,1,1,"b13-2cols-with-header-container","container",64,0,0,0,0
 ,2,1,"header","col1-first",128,0,200,1,0
 ,3,1,"header","col1-second",256,0,200,1,0
-,4,1,"header","col2-first",512,0,201,1,0
+,4,1,"header","col2-first",384,0,201,1,0
 ,10,3,"header","outside",512,0,0,0,0
 ,11,3,"b13-2cols-with-header-container","container",768,0,0,0,0
 ,12,3,"header","col1-second",1024,0,200,11,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerOtherPageOnTop.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerOtherPageOnTop.csv
index 067e340c..d6861b73 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerOtherPageOnTop.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerOtherPageOnTop.csv
@@ -4,8 +4,8 @@
 ,3,0,""
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container",256,0,0,0,0
+,1,1,"b13-2cols-with-header-container","container",64,0,0,0,0
 ,2,1,"header","col1-first",128,0,200,1,0
 ,3,1,"header","col1-second",256,0,200,1,0
-,4,1,"header","col2-first",512,0,201,1,0
+,4,1,"header","col2-first",386,0,201,1,0
 ,10,3,"header","outside",512,0,0,0,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerOtherPageOnTopResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerOtherPageOnTopResult.csv
index 3ef89165..b437a1a2 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerOtherPageOnTopResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerOtherPageOnTopResult.csv
@@ -4,10 +4,10 @@
 ,3,0,""
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container",256,0,0,0,0
+,1,1,"b13-2cols-with-header-container","container",64,0,0,0,0
 ,2,1,"header","col1-first",128,0,200,1,0
 ,3,1,"header","col1-second",256,0,200,1,0
-,4,1,"header","col2-first",512,0,201,1,0
+,4,1,"header","col2-first",386,0,201,1,0
 ,10,3,"header","outside",512,0,0,0,0
 ,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0
 ,12,3,"header","col1-second",384,0,200,11,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerToOtherPageAfterElementCopiesChildren.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerToOtherPageAfterElementCopiesChildren.csv
index bf18096e..e4e2fb20 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerToOtherPageAfterElementCopiesChildren.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerToOtherPageAfterElementCopiesChildren.csv
@@ -4,6 +4,6 @@
 ,3,0,"page-2"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0,0
 ,2,1,"header","header-default",128,0,200,1,0
 ,14,3,"header","outside",512,0,0,0,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerToOtherPageAfterElementCopiesChildrenResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerToOtherPageAfterElementCopiesChildrenResult.csv
index d19f2978..89e1e636 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerToOtherPageAfterElementCopiesChildrenResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerToOtherPageAfterElementCopiesChildrenResult.csv
@@ -4,7 +4,7 @@
 ,3,0,"page-2"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0,0
 ,2,1,"header","header-default",128,0,200,1,0
 ,14,3,"header","outside",512,0,0,0,0
 ,15,3,"b13-2cols-with-header-container","container-default",768,0,0,0,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerToOtherPageAtTopCopiesChildren.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerToOtherPageAtTopCopiesChildren.csv
index 41f10a68..33614842 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerToOtherPageAtTopCopiesChildren.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerToOtherPageAtTopCopiesChildren.csv
@@ -4,5 +4,5 @@
 ,3,0,"page-2"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0,0
 ,2,1,"header","header-default",128,0,200,1,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerToOtherPageAtTopCopiesChildrenResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerToOtherPageAtTopCopiesChildrenResult.csv
index 0b1bf064..2c6bf6ff 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerToOtherPageAtTopCopiesChildrenResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/CopyContainerToOtherPageAtTopCopiesChildrenResult.csv
@@ -4,7 +4,7 @@
 ,3,0,"page-2"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0,0
 ,2,1,"header","header-default",128,0,200,1,0
 ,3,3,"b13-2cols-with-header-container","container-default",256,0,0,0,0
 ,4,3,"header","header-default",512,0,200,3,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/DeleteContainerDeleteChildren.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/DeleteContainerDeleteChildren.csv
index f9e3138b..d1be3096 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/DeleteContainerDeleteChildren.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/DeleteContainerDeleteChildren.csv
@@ -2,6 +2,6 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","deleted"
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0,0,0
+,2,1,"header","header-default",256,0,200,1,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/DeleteContainerDeleteChildrenResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/DeleteContainerDeleteChildrenResult.csv
index f9e3138b..76f1cc87 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/DeleteContainerDeleteChildrenResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/DeleteContainerDeleteChildrenResult.csv
@@ -2,6 +2,6 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","deleted"
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0,0,1
+,2,1,"header","header-default",256,0,200,1,1
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerAfterElementMovesChildren.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerAfterElementMovesChildren.csv
index 67912709..a151b77b 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerAfterElementMovesChildren.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerAfterElementMovesChildren.csv
@@ -3,6 +3,6 @@
 ,1,0,"page-1"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0,0
 ,2,1,"header","header-default",128,0,200,1,0
 ,4,1,"header","outside",512,0,0,0,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerIntoItSelfsAtTop.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerIntoItSelfsAtTop.csv
index c0064831..6463c6c3 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerIntoItSelfsAtTop.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerIntoItSelfsAtTop.csv
@@ -3,6 +3,6 @@
 ,2,0,"page-1"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,2,"b13-2cols-with-header-container","",0,0,0,0,0
-,2,2,"b13-2cols-with-header-container","",0,0,202,1,0
-,3,2,"header","",0,0,202,2,0
+,1,2,"b13-2cols-with-header-container","",64,0,0,0,0
+,2,2,"b13-2cols-with-header-container","",128,0,202,1,0
+,3,2,"header","",256,0,202,2,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerIntoItSelfsAtTopResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerIntoItSelfsAtTopResult.csv
index c0064831..6463c6c3 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerIntoItSelfsAtTopResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerIntoItSelfsAtTopResult.csv
@@ -3,6 +3,6 @@
 ,2,0,"page-1"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,2,"b13-2cols-with-header-container","",0,0,0,0,0
-,2,2,"b13-2cols-with-header-container","",0,0,202,1,0
-,3,2,"header","",0,0,202,2,0
+,1,2,"b13-2cols-with-header-container","",64,0,0,0,0
+,2,2,"b13-2cols-with-header-container","",128,0,202,1,0
+,3,2,"header","",256,0,202,2,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerIntoItSelfsNestedAfterElement.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerIntoItSelfsNestedAfterElement.csv
index c0064831..6463c6c3 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerIntoItSelfsNestedAfterElement.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerIntoItSelfsNestedAfterElement.csv
@@ -3,6 +3,6 @@
 ,2,0,"page-1"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,2,"b13-2cols-with-header-container","",0,0,0,0,0
-,2,2,"b13-2cols-with-header-container","",0,0,202,1,0
-,3,2,"header","",0,0,202,2,0
+,1,2,"b13-2cols-with-header-container","",64,0,0,0,0
+,2,2,"b13-2cols-with-header-container","",128,0,202,1,0
+,3,2,"header","",256,0,202,2,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerIntoItSelfsNestedAfterElementResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerIntoItSelfsNestedAfterElementResult.csv
index c0064831..6463c6c3 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerIntoItSelfsNestedAfterElementResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerIntoItSelfsNestedAfterElementResult.csv
@@ -3,6 +3,6 @@
 ,2,0,"page-1"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,2,"b13-2cols-with-header-container","",0,0,0,0,0
-,2,2,"b13-2cols-with-header-container","",0,0,202,1,0
-,3,2,"header","",0,0,202,2,0
+,1,2,"b13-2cols-with-header-container","",64,0,0,0,0
+,2,2,"b13-2cols-with-header-container","",128,0,202,1,0
+,3,2,"header","",256,0,202,2,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerIntoItSelfsNestedAtTop.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerIntoItSelfsNestedAtTop.csv
index c0064831..6463c6c3 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerIntoItSelfsNestedAtTop.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerIntoItSelfsNestedAtTop.csv
@@ -3,6 +3,6 @@
 ,2,0,"page-1"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,2,"b13-2cols-with-header-container","",0,0,0,0,0
-,2,2,"b13-2cols-with-header-container","",0,0,202,1,0
-,3,2,"header","",0,0,202,2,0
+,1,2,"b13-2cols-with-header-container","",64,0,0,0,0
+,2,2,"b13-2cols-with-header-container","",128,0,202,1,0
+,3,2,"header","",256,0,202,2,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerIntoItSelfsNestedAtTopResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerIntoItSelfsNestedAtTopResult.csv
index c0064831..6463c6c3 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerIntoItSelfsNestedAtTopResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerIntoItSelfsNestedAtTopResult.csv
@@ -3,6 +3,6 @@
 ,2,0,"page-1"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,2,"b13-2cols-with-header-container","",0,0,0,0,0
-,2,2,"b13-2cols-with-header-container","",0,0,202,1,0
-,3,2,"header","",0,0,202,2,0
+,1,2,"b13-2cols-with-header-container","",64,0,0,0,0
+,2,2,"b13-2cols-with-header-container","",128,0,202,1,0
+,3,2,"header","",256,0,202,2,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerOtherPageAfterElement.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerOtherPageAfterElement.csv
index 067e340c..4fabb61f 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerOtherPageAfterElement.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerOtherPageAfterElement.csv
@@ -4,8 +4,8 @@
 ,3,0,""
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container",256,0,0,0,0
+,1,1,"b13-2cols-with-header-container","container",64,0,0,0,0
 ,2,1,"header","col1-first",128,0,200,1,0
 ,3,1,"header","col1-second",256,0,200,1,0
-,4,1,"header","col2-first",512,0,201,1,0
-,10,3,"header","outside",512,0,0,0,0
+,4,1,"header","col2-first",384,0,201,1,0
+,10,3,"header","outside",512,0,0,0,0
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerOtherPageOnTop.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerOtherPageOnTop.csv
index 067e340c..d6861b73 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerOtherPageOnTop.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerOtherPageOnTop.csv
@@ -4,8 +4,8 @@
 ,3,0,""
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container",256,0,0,0,0
+,1,1,"b13-2cols-with-header-container","container",64,0,0,0,0
 ,2,1,"header","col1-first",128,0,200,1,0
 ,3,1,"header","col1-second",256,0,200,1,0
-,4,1,"header","col2-first",512,0,201,1,0
+,4,1,"header","col2-first",386,0,201,1,0
 ,10,3,"header","outside",512,0,0,0,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerToOtherPageAfterElementMovesChildren.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerToOtherPageAfterElementMovesChildren.csv
index bf18096e..477660ca 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerToOtherPageAfterElementMovesChildren.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerToOtherPageAfterElementMovesChildren.csv
@@ -4,6 +4,6 @@
 ,3,0,"page-2"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0,0,0
+,2,1,"header","header-default",256,0,200,1,0
 ,14,3,"header","outside",512,0,0,0,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerToOtherPageAtTopMovesChildren.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerToOtherPageAtTopMovesChildren.csv
index 41f10a68..33614842 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerToOtherPageAtTopMovesChildren.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/Container/MoveContainerToOtherPageAtTopMovesChildren.csv
@@ -4,5 +4,5 @@
 ,3,0,"page-2"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0,0
 ,2,1,"header","header-default",128,0,200,1,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyContainerInContainer/CopyContainerWithChildContainersCopiesContentInChildContainersIntoCorrectContainer.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyContainerInContainer/CopyContainerWithChildContainersCopiesContentInChildContainersIntoCorrectContainer.csv
new file mode 100644
index 00000000..c52e046a
--- /dev/null
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyContainerInContainer/CopyContainerWithChildContainersCopiesContentInChildContainersIntoCorrectContainer.csv
@@ -0,0 +1,11 @@
+"pages"
+,"uid"
+,1
+,2
+"tt_content"
+,"uid","pid","CType","header","colPos","tx_container_parent",sorting
+,1,1,"b13-2cols-with-header-container","container",0,0,512
+,2,1,"b13-2cols-with-header-container","child-container-1",200,1,576
+,3,1,,"content-in-child-container-1",200,2,640
+,4,1,"b13-2cols-with-header-container","child-container-2",200,1,704
+,5,1,,"content-in-child-container-2",200,4,768
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyContainerInContainer/CopyContainerWithChildContainersCopiesContentInChildContainersIntoCorrectContainerResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyContainerInContainer/CopyContainerWithChildContainersCopiesContentInChildContainersIntoCorrectContainerResult.csv
index e89f41f0..3a7c1c58 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyContainerInContainer/CopyContainerWithChildContainersCopiesContentInChildContainersIntoCorrectContainerResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyContainerInContainer/CopyContainerWithChildContainersCopiesContentInChildContainersIntoCorrectContainerResult.csv
@@ -5,10 +5,10 @@
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
 ,1,1,"b13-2cols-with-header-container","container",512,0,0,0,0
-,2,1,"b13-2cols-with-header-container","child-container-1",512,0,200,1,0
-,3,1,"","content-in-child-container-1",512,0,200,2,0
-,4,1,"b13-2cols-with-header-container","child-container-2",512,0,200,1,0
-,5,1,"","content-in-child-container-2",512,0,200,4,0
+,2,1,"b13-2cols-with-header-container","child-container-1",576,0,200,1,0
+,3,1,"","content-in-child-container-1",640,0,200,2,0
+,4,1,"b13-2cols-with-header-container","child-container-2",704,0,200,1,0
+,5,1,"","content-in-child-container-2",768,0,200,4,0
 ,6,1,"b13-2cols-with-header-container","container (copy 1)",256,0,0,0,0
 ,7,1,"b13-2cols-with-header-container","child-container-2 (copy 1)",384,0,200,6,0
 ,8,1,"text","content-in-child-container-2 (copy 1)",448,0,200,7,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyContainerInContainer/setup.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyContainerInContainer/setup.csv
deleted file mode 100644
index ea7f3a9d..00000000
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyContainerInContainer/setup.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-"pages"
-,"uid"
-,1
-,2
-"tt_content"
-,"uid","pid","CType","header","colPos","tx_container_parent"
-,1,1,"b13-2cols-with-header-container","container",,
-,2,1,"b13-2cols-with-header-container","child-container-1",200,1
-,3,1,,"content-in-child-container-1",200,2
-,4,1,"b13-2cols-with-header-container","child-container-2",200,1
-,5,1,,"content-in-child-container-2",200,4
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyChildElementOutsideContainerAfterElementResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyChildElementOutsideContainerAfterElementResult.csv
index d3ec1472..7cf79e33 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyChildElementOutsideContainerAfterElementResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyChildElementOutsideContainerAfterElementResult.csv
@@ -2,12 +2,12 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",512,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0
-,6,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,7,1,"header","header-default",128,0,201,6,0
-,8,1,"header","header-default (copy 1)",768,0,0,0,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",128,0,200,1
+,5,1,"header","second element",256,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,6,1,"b13-2cols-with-header-container","container-default",512,0,0,0
+,7,1,"header",header-default,768,0,201,6
+,4,1,"header","outside",1024,0,0,0
+,8,1,"header","header-default (copy 1)",1280,0,0,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyChildElementOutsideContainerAtTopResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyChildElementOutsideContainerAtTopResult.csv
index 1db7faed..4f4e0385 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyChildElementOutsideContainerAtTopResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyChildElementOutsideContainerAtTopResult.csv
@@ -2,12 +2,12 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",512,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0
-,6,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,7,1,"header","header-default",128,0,201,6,0
-,8,1,"header","header-default (copy 1)",32,0,0,0,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",128,0,200,1
+,5,1,"header","second element",256,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,6,1,"b13-2cols-with-header-container","container-default",512,0,0,0
+,7,1,"header",header-default,768,0,201,6
+,4,1,"header","outside",1024,0,0,0
+,8,1,"header","header-default (copy 1)",32,0,0,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyChildElementToOtherColumnAfterElementResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyChildElementToOtherColumnAfterElementResult.csv
index c3c59247..1094ee5e 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyChildElementToOtherColumnAfterElementResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyChildElementToOtherColumnAfterElementResult.csv
@@ -2,12 +2,12 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",512,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0
-,6,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,7,1,"header","header-default",128,0,201,6,0
-,8,1,"header","header-default (copy 1)",96,0,201,1,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",128,0,200,1
+,5,1,"header","second element",256,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,6,1,"b13-2cols-with-header-container","container-default",512,0,0,0
+,7,1,"header",header-default,768,0,201,6
+,4,1,"header","outside",1024,0,0,0
+,8,1,"header","header-default (copy 1)",449,0,201,1
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyChildElementToOtherColumnTopResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyChildElementToOtherColumnTopResult.csv
index 985c0dc2..cbf6556f 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyChildElementToOtherColumnTopResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyChildElementToOtherColumnTopResult.csv
@@ -2,12 +2,12 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",1024,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0
-,6,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,7,1,"header","header-default",128,0,201,6,0
-,8,1,"header","header-default (copy 1)",512,0,201,1,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",128,0,200,1
+,5,1,"header","second element",256,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,6,1,"b13-2cols-with-header-container","container-default",512,0,0,0
+,7,1,"header",header-default,768,0,201,6
+,4,1,"header","outside",1024,0,0,0
+,8,1,"header","header-default (copy 1)",321,0,201,1
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyContainerIntoItSelfsResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyContainerIntoItSelfsResult.csv
index e045ca51..8b1047ff 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyContainerIntoItSelfsResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyContainerIntoItSelfsResult.csv
@@ -2,11 +2,11 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",512,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0
-,6,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,7,1,"header","header-default",128,0,201,6,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",128,0,200,1
+,5,1,"header","second element",256,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,6,1,"b13-2cols-with-header-container","container-default",512,0,0,0
+,7,1,"header",header-default,768,0,201,6
+,4,1,"header","outside",1024,0,0,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyElementAfterContainerWithSimpleCommandMapResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyElementAfterContainerWithSimpleCommandMapResult.csv
index 3b777aa0..5c0a9bcb 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyElementAfterContainerWithSimpleCommandMapResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyElementAfterContainerWithSimpleCommandMapResult.csv
@@ -2,12 +2,12 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",1024,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0
-,6,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,7,1,"header","header-default",128,0,201,6,0
-,8,1,"header","header-default (copy 1)",512,0,0,0,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",128,0,200,1
+,5,1,"header","second element",256,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,6,1,"b13-2cols-with-header-container","container-default",512,0,0,0
+,7,1,"header",header-default,768,0,201,6
+,4,1,"header","outside",1024,0,0,0
+,8,1,"header","header-default (copy 1)",449,0,0,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyElementIntoContainerAfterElementResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyElementIntoContainerAfterElementResult.csv
index 463e8808..ce145f36 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyElementIntoContainerAfterElementResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyElementIntoContainerAfterElementResult.csv
@@ -2,12 +2,12 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",512,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0
-,6,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,7,1,"header","header-default",128,0,201,6,0
-,8,1,"header","outside (copy 1)",96,0,201,1,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",128,0,200,1
+,5,1,"header","second element",256,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,6,1,"b13-2cols-with-header-container","container-default",512,0,0,0
+,7,1,"header",header-default,768,0,201,6
+,4,1,"header","outside",1024,0,0,0
+,8,1,"header","outside (copy 1)",449,0,201,1
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyElementIntoContainerAfterElementWithSimpleCommandMapResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyElementIntoContainerAfterElementWithSimpleCommandMapResult.csv
index 463e8808..ce145f36 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyElementIntoContainerAfterElementWithSimpleCommandMapResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyElementIntoContainerAfterElementWithSimpleCommandMapResult.csv
@@ -2,12 +2,12 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",512,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0
-,6,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,7,1,"header","header-default",128,0,201,6,0
-,8,1,"header","outside (copy 1)",96,0,201,1,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",128,0,200,1
+,5,1,"header","second element",256,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,6,1,"b13-2cols-with-header-container","container-default",512,0,0,0
+,7,1,"header",header-default,768,0,201,6
+,4,1,"header","outside",1024,0,0,0
+,8,1,"header","outside (copy 1)",449,0,201,1
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyElementIntoContainerAtTopResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyElementIntoContainerAtTopResult.csv
index 5a1771c2..c82e6e22 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyElementIntoContainerAtTopResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyElementIntoContainerAtTopResult.csv
@@ -2,12 +2,12 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",1024,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0
-,6,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,7,1,"header","header-default",128,0,201,6,0
-,8,1,"header","outside (copy 1)",512,0,201,1,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",128,0,200,1
+,5,1,"header","second element",256,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,6,1,"b13-2cols-with-header-container","container-default",512,0,0,0
+,7,1,"header",header-default,768,0,201,6
+,4,1,"header","outside",1024,0,0,0
+,8,1,"header","outside (copy 1)",321,0,201,1
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyMultipleContainersWithChildRecordsResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyMultipleContainersWithChildRecordsResult.csv
index c6e8afe1..0f51258b 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyMultipleContainersWithChildRecordsResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/CopyMultipleContainersWithChildRecordsResult.csv
@@ -2,17 +2,17 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",512,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0
-,6,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,7,1,"header","header-default",128,0,201,6,0
-,8,1,"b13-2cols-with-header-container","container-default (copy 1)",32,0,0,0,0
-,9,1,"header","left-side-default (copy 1)",48,0,201,8,0
-,10,1,"header","second element (copy 1)",40,0,200,8,0
-,11,1,"header","header-default (copy 1)",36,0,200,8,0
-,12,1,"b13-2cols-with-header-container","container-default (copy 2)",16,0,0,0,0
-,13,1,"header","header-default (copy 2)",24,0,201,12,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",128,0,200,1
+,5,1,"header","second element",256,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,6,1,"b13-2cols-with-header-container","container-default",512,0,0,0
+,7,1,"header",header-default,768,0,201,6
+,4,1,"header","outside",1024,0,0,0
+,8,1,"b13-2cols-with-header-container","container-default (copy 1)",32,0,0,0
+,10,1,"header","header-default (copy 1)",40,0,200,8
+,9,1,"header","second element (copy 1)",48,0,200,8
+,11,1,"header","left-side-default (copy 1)",56,0,201,8
+,12,1,"b13-2cols-with-header-container","container-default (copy 2)",16,0,0,0
+,13,1,"header","header-default (copy 2)",24,0,201,12
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/setup.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/setup.csv
index c840c707..632eaa69 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/setup.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElement/setup.csv
@@ -3,10 +3,10 @@
 ,1,0,"page-1","/"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,,
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
 ,2,1,"header","header-default",128,0,200,1
-,3,1,"header","left-side-default",64,0,201,1
-,4,1,"header","outside",512,0,0,
 ,5,1,"header","second element",256,0,200,1
-,6,1,"b13-2cols-with-header-container","container-default",256,0,,
-,7,1,"header",header-default,128,0,201,6
+,3,1,"header","left-side-default",386,0,201,1
+,6,1,"b13-2cols-with-header-container","container-default",512,0,0,0
+,7,1,"header",header-default,768,0,201,6
+,4,1,"header","outside",1024,0,0,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyChildElementOutsideContainerAfterElementResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyChildElementOutsideContainerAfterElementResult.csv
index c962ffa9..00f78d40 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyChildElementOutsideContainerAfterElementResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyChildElementOutsideContainerAfterElementResult.csv
@@ -3,14 +3,14 @@
 ,1,0,"page-1"
 ,3,0,"page-2"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",512,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0
-,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0
-,12,3,"header","header",257,0,200,11,0
-,13,3,"header","left side",258,0,201,11,0
-,14,3,"header","outside",512,0,0,0,0
-,15,3,"header","header-default",768,0,0,0,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",128,0,200,1
+,5,1,"header","second element",256,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,4,1,"header","outside",512,0,0,0
+,11,3,"b13-2cols-with-header-container","container",256,0,0,0
+,12,3,"header","header",257,0,200,11
+,13,3,"header","left side",258,0,201,11
+,14,3,"header","outside",512,0,0,0
+,15,3,"header","header-default",768,0,0,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyChildElementOutsideContainerAtTopResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyChildElementOutsideContainerAtTopResult.csv
index 5b754bfc..85d303f0 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyChildElementOutsideContainerAtTopResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyChildElementOutsideContainerAtTopResult.csv
@@ -3,14 +3,14 @@
 ,1,0,"page-1"
 ,3,0,"page-2"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",512,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0
-,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0
-,12,3,"header","header",257,0,200,11,0
-,13,3,"header","left side",258,0,201,11,0
-,14,3,"header","outside",512,0,0,0,0
-,15,3,"header","header-default",128,0,0,0,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",128,0,200,1
+,5,1,"header","second element",256,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,4,1,"header","outside",512,0,0,0
+,11,3,"b13-2cols-with-header-container","container",256,0,0,0
+,12,3,"header","header",257,0,200,11
+,13,3,"header","left side",258,0,201,11
+,14,3,"header","outside",512,0,0,0
+,15,3,"header","header-default",128,0,0,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyChildElementToOtherColumnAfterElementResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyChildElementToOtherColumnAfterElementResult.csv
index 896ee457..8d6e75d0 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyChildElementToOtherColumnAfterElementResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyChildElementToOtherColumnAfterElementResult.csv
@@ -3,14 +3,14 @@
 ,1,0,"page-1"
 ,3,0,"page-2"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",512,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0
-,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0
-,12,3,"header","header",257,0,200,11,0
-,13,3,"header","left side",258,0,201,11,0
-,14,3,"header","outside",512,0,0,0,0
-,15,3,"header","header-default",385,0,201,11,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",128,0,200,1
+,5,1,"header","second element",256,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,4,1,"header","outside",512,0,0,0
+,11,3,"b13-2cols-with-header-container","container",256,0,0,0
+,12,3,"header","header",257,0,200,11
+,13,3,"header","left side",258,0,201,11
+,14,3,"header","outside",512,0,0,0
+,15,3,"header","header-default",385,0,201,11
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyChildElementToOtherColumnTopResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyChildElementToOtherColumnTopResult.csv
index 223f6d68..77f2efff 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyChildElementToOtherColumnTopResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyChildElementToOtherColumnTopResult.csv
@@ -3,14 +3,14 @@
 ,1,0,"page-1"
 ,3,0,"page-2"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",512,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0
-,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0
-,12,3,"header","header",257,0,200,11,0
-,13,3,"header","left side",770,0,201,11,0
-,14,3,"header","outside",1024,0,0,0,0
-,15,3,"header","header-default",513,0,201,11,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",128,0,200,1
+,5,1,"header","second element",256,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,4,1,"header","outside",512,0,0,0
+,11,3,"b13-2cols-with-header-container","container",256,0,0,0
+,12,3,"header","header",257,0,200,11
+,13,3,"header","left side",770,0,201,11
+,14,3,"header","outside",1024,0,0,0
+,15,3,"header","header-default",513,0,201,11
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyElementAfterContainerSortElementAfterLastContainerChildResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyElementAfterContainerSortElementAfterLastContainerChildResult.csv
index e308e803..08586f87 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyElementAfterContainerSortElementAfterLastContainerChildResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyElementAfterContainerSortElementAfterLastContainerChildResult.csv
@@ -3,14 +3,14 @@
 ,1,0,"page-1"
 ,3,0,"page-2"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",512,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0
-,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0
-,12,3,"header","header",257,0,200,11,0
-,13,3,"header","left side",258,0,201,11,0
-,14,3,"header","outside",512,0,0,0,0
-,15,3,"header","outside (copy 1)",385,0,0,0,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",128,0,200,1
+,5,1,"header","second element",256,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,4,1,"header","outside",512,0,0,0
+,11,3,"b13-2cols-with-header-container","container",256,0,0,0
+,12,3,"header","header",257,0,200,11
+,13,3,"header","left side",258,0,201,11
+,14,3,"header","outside",512,0,0,0
+,15,3,"header","outside (copy 1)",385,0,0,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyElementAfterContainerSortElementAfterLastContainerChildSimpleCommandResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyElementAfterContainerSortElementAfterLastContainerChildSimpleCommandResult.csv
index e308e803..08586f87 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyElementAfterContainerSortElementAfterLastContainerChildSimpleCommandResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyElementAfterContainerSortElementAfterLastContainerChildSimpleCommandResult.csv
@@ -3,14 +3,14 @@
 ,1,0,"page-1"
 ,3,0,"page-2"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",512,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0
-,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0
-,12,3,"header","header",257,0,200,11,0
-,13,3,"header","left side",258,0,201,11,0
-,14,3,"header","outside",512,0,0,0,0
-,15,3,"header","outside (copy 1)",385,0,0,0,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",128,0,200,1
+,5,1,"header","second element",256,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,4,1,"header","outside",512,0,0,0
+,11,3,"b13-2cols-with-header-container","container",256,0,0,0
+,12,3,"header","header",257,0,200,11
+,13,3,"header","left side",258,0,201,11
+,14,3,"header","outside",512,0,0,0
+,15,3,"header","outside (copy 1)",385,0,0,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyElementIntoContainerAfterElementResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyElementIntoContainerAfterElementResult.csv
index d08bec57..0482ba8a 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyElementIntoContainerAfterElementResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyElementIntoContainerAfterElementResult.csv
@@ -3,14 +3,14 @@
 ,1,0,"page-1"
 ,3,0,"page-2"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",512,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0
-,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0
-,12,3,"header","header",257,0,200,11,0
-,13,3,"header","left side",258,0,201,11,0
-,14,3,"header","outside",512,0,0,0,0
-,15,3,"header","outside (copy 1)",385,0,201,11,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",128,0,200,1
+,5,1,"header","second element",256,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,4,1,"header","outside",512,0,0,0
+,11,3,"b13-2cols-with-header-container","container",256,0,0,0
+,12,3,"header","header",257,0,200,11
+,13,3,"header","left side",258,0,201,11
+,14,3,"header","outside",512,0,0,0
+,15,3,"header","outside (copy 1)",385,0,201,11
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyElementIntoContainerAfterElementWithSimpleCommandMapResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyElementIntoContainerAfterElementWithSimpleCommandMapResult.csv
index d08bec57..0482ba8a 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyElementIntoContainerAfterElementWithSimpleCommandMapResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyElementIntoContainerAfterElementWithSimpleCommandMapResult.csv
@@ -3,14 +3,14 @@
 ,1,0,"page-1"
 ,3,0,"page-2"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",512,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0
-,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0
-,12,3,"header","header",257,0,200,11,0
-,13,3,"header","left side",258,0,201,11,0
-,14,3,"header","outside",512,0,0,0,0
-,15,3,"header","outside (copy 1)",385,0,201,11,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",128,0,200,1
+,5,1,"header","second element",256,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,4,1,"header","outside",512,0,0,0
+,11,3,"b13-2cols-with-header-container","container",256,0,0,0
+,12,3,"header","header",257,0,200,11
+,13,3,"header","left side",258,0,201,11
+,14,3,"header","outside",512,0,0,0
+,15,3,"header","outside (copy 1)",385,0,201,11
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyElementIntoContainerAtTopResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyElementIntoContainerAtTopResult.csv
index c64536ac..e78331e1 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyElementIntoContainerAtTopResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/CopyElementIntoContainerAtTopResult.csv
@@ -3,14 +3,14 @@
 ,1,0,"page-1"
 ,3,0,"page-2"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",512,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0
-,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0
-,12,3,"header","header",257,0,200,11,0
-,13,3,"header","left side",770,0,201,11,0
-,14,3,"header","outside",1024,0,0,0,0
-,15,3,"header","outside (copy 1)",513,0,201,11,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",128,0,200,1
+,5,1,"header","second element",256,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,4,1,"header","outside",512,0,0,0
+,11,3,"b13-2cols-with-header-container","container",256,0,0,0
+,12,3,"header","header",257,0,200,11
+,13,3,"header","left side",770,0,201,11
+,14,3,"header","outside",1024,0,0,0
+,15,3,"header","outside (copy 1)",513,0,201,11
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/setup.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/setup.csv
index 59af868d..8b6ec1f8 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/setup.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyElementOtherPage/setup.csv
@@ -4,12 +4,12 @@
 ,3,0,"page-2","/page-2"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,,
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
 ,2,1,"header","header-default",128,0,200,1
 ,5,1,"header","second element",256,0,200,1
-,3,1,"header","left-side-default",64,0,201,1
-,4,1,"header","outside",512,0,0,
-,11,3,"b13-2cols-with-header-container","container",256,0,,
+,3,1,"header","left-side-default",386,0,201,1
+,4,1,"header","outside",512,0,0,0
+,11,3,"b13-2cols-with-header-container","container",256,0,0,0
 ,12,3,"header","header",257,0,200,11
 ,13,3,"header","left side",258,0,201,11
-,14,3,"header","outside",512,0,0,
\ No newline at end of file
+,14,3,"header","outside",512,0,0,0
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyPage/setup.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyPage/CopyPageCopiesChildrenOfContainer.csv
similarity index 58%
rename from Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyPage/setup.csv
rename to Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyPage/CopyPageCopiesChildrenOfContainer.csv
index 1be3b489..8df00295 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyPage/setup.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyPage/CopyPageCopiesChildrenOfContainer.csv
@@ -3,5 +3,5 @@
 ,1,0,"page-1","/"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,,
-,2,1,"header","header-default",128,0,200,1
\ No newline at end of file
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0,0
+,2,1,"header","header-default",256,0,200,1
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyPage/CopyPageCopiesChildrenOfContainerResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyPage/CopyPageCopiesChildrenOfContainerResult.csv
index 250ebdef..9aa9baee 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyPage/CopyPageCopiesChildrenOfContainerResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/CopyPage/CopyPageCopiesChildrenOfContainerResult.csv
@@ -4,7 +4,7 @@
 ,2,1,"page-1"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
-,3,2,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,4,2,"header","header-default",128,0,200,3,0
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0,0,0
+,2,1,"header","header-default",256,0,200,1,0
+,4,2,"b13-2cols-with-header-container","container-default",128,0,0,0,0
+,3,2,"header","header-default",256,0,200,4,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveChildElementOutsideContainerAfterElementResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveChildElementOutsideContainerAfterElementResult.csv
index f58d8acd..d722bcb8 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveChildElementOutsideContainerAfterElementResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveChildElementOutsideContainerAfterElementResult.csv
@@ -2,9 +2,9 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",768,0,0,0,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",512,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",768,0,0,0
+,5,1,"header","second element",256,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,4,1,"header","outside",512,0,0,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveChildElementOutsideContainerAtTopResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveChildElementOutsideContainerAtTopResult.csv
index 7c876431..1a3a7a43 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveChildElementOutsideContainerAtTopResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveChildElementOutsideContainerAtTopResult.csv
@@ -2,9 +2,9 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",32,0,0,0,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",512,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",32,0,0,0
+,5,1,"header","second element",256,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,4,1,"header","outside",512,0,0,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveChildElementToOtherColumnAfterElementResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveChildElementToOtherColumnAfterElementResult.csv
index 378622d9..473aadcc 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveChildElementToOtherColumnAfterElementResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveChildElementToOtherColumnAfterElementResult.csv
@@ -2,9 +2,9 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",96,0,201,1,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",512,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",449,0,201,1
+,5,1,"header","second element",256,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,4,1,"header","outside",512,0,0,0
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveChildElementToOtherColumnTopResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveChildElementToOtherColumnTopResult.csv
index 548f974c..6caa1cac 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveChildElementToOtherColumnTopResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveChildElementToOtherColumnTopResult.csv
@@ -2,9 +2,9 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",512,0,201,1,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",1024,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",321,0,201,1
+,5,1,"header","second element",256,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,4,1,"header","outside",512,0,0,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveContainerIntoItSelfsResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveContainerIntoItSelfsResult.csv
index 3a5de676..8fa5d2b0 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveContainerIntoItSelfsResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveContainerIntoItSelfsResult.csv
@@ -2,9 +2,9 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",512,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",128,0,200,1
+,5,1,"header","second element",256,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,4,1,"header","outside",512,0,0,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveElementAfterNestedContainerHasCorrectSortingResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveElementAfterNestedContainerHasCorrectSortingResult.csv
index a421f5bf..5e35b832 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveElementAfterNestedContainerHasCorrectSortingResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveElementAfterNestedContainerHasCorrectSortingResult.csv
@@ -2,8 +2,8 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"header","outside",1024,0,201,2,0
-,2,1,"b13-2cols-with-header-container","container",256,0,0,0,0
-,3,1,"b13-2cols-with-header-container","nested-container",512,0,201,2,0
-,4,1,"header","element-in-nested-container",768,0,201,3,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"header","outside",1024,0,201,2
+,2,1,"b13-2cols-with-header-container","container",256,0,0,0
+,3,1,"b13-2cols-with-header-container","nested-container",512,0,201,2
+,4,1,"header","element-in-nested-container",768,0,201,3
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveElementIntoContainerAfterElementResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveElementIntoContainerAfterElementResult.csv
index 697ee127..a71e1aa5 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveElementIntoContainerAfterElementResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveElementIntoContainerAfterElementResult.csv
@@ -2,9 +2,9 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",96,0,201,1,0
-,5,1,"header","second element",256,0,200,1,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",128,0,200,1
+,5,1,"header","second element",256,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,4,1,"header","outside",449,0,201,1
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveElementIntoContainerAfterElementWithSimpleCommandMapResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveElementIntoContainerAfterElementWithSimpleCommandMapResult.csv
index 697ee127..a71e1aa5 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveElementIntoContainerAfterElementWithSimpleCommandMapResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveElementIntoContainerAfterElementWithSimpleCommandMapResult.csv
@@ -2,9 +2,9 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",96,0,201,1,0
-,5,1,"header","second element",256,0,200,1,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",128,0,200,1
+,5,1,"header","second element",256,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,4,1,"header","outside",449,0,201,1
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveElementIntoContainerAtTopResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveElementIntoContainerAtTopResult.csv
index 836d3879..334c00ea 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveElementIntoContainerAtTopResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveElementIntoContainerAtTopResult.csv
@@ -2,9 +2,9 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",512,0,201,1,0
-,5,1,"header","second element",256,0,200,1,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",128,0,200,1
+,5,1,"header","second element",256,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,4,1,"header","outside",321,0,201,1
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveElementWithSimpleCommandWithoutAnyContainerResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveElementWithSimpleCommandWithoutAnyContainerResult.csv
index e77a46b8..bbcda9a9 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveElementWithSimpleCommandWithoutAnyContainerResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/MoveElementWithSimpleCommandWithoutAnyContainerResult.csv
@@ -2,6 +2,6 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"header","element1",1024,0,0,0,0
-,2,1,"header","element2",768,0,0,0,0
+,"uid","pid","CType","header","sorting"
+,1,1,"header","element1",1024
+,2,1,"header","element2",768
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/nested_container.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/nested_container.csv
index 733851d1..73d98f7a 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/nested_container.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/nested_container.csv
@@ -7,4 +7,4 @@
 ,2,1,"b13-2cols-with-header-container","container",256,0,,
 ,3,1,"b13-2cols-with-header-container","nested-container",512,0,201,2
 ,4,1,"header","element-in-nested-container",768,0,201,3
-# move 1 target -3 shoukd sort 1 after 4
\ No newline at end of file
+# move 1 target -3 should sort 1 after 4
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/setup.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/setup.csv
index dc033057..3b707dc9 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/setup.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElement/setup.csv
@@ -3,8 +3,8 @@
 ,1,0,"page-1","/"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,,
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
 ,2,1,"header","header-default",128,0,200,1
 ,5,1,"header","second element",256,0,200,1
-,3,1,"header","left-side-default",64,0,201,1
-,4,1,"header","outside",512,0,0,
\ No newline at end of file
+,3,1,"header","left-side-default",386,0,201,1
+,4,1,"header","outside",512,0,0,0
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveChildElementOutsideContainerAfterElementResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveChildElementOutsideContainerAfterElementResult.csv
index de14c4b2..e04e9d27 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveChildElementOutsideContainerAfterElementResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveChildElementOutsideContainerAfterElementResult.csv
@@ -3,13 +3,13 @@
 ,1,0,"page-1"
 ,3,0,"page-2"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,3,"header","header-default",768,0,0,0,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",512,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0
-,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0
-,12,3,"header","header",257,0,200,11,0
-,13,3,"header","left side",258,0,201,11,0
-,14,3,"header","outside",512,0,0,0,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,3,"header","header-default",768,0,0,0
+,5,1,"header","second element",256,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,4,1,"header","outside",512,0,0,0
+,11,3,"b13-2cols-with-header-container","container",256,0,0,0
+,12,3,"header","header",257,0,200,11
+,13,3,"header","left side",258,0,201,11
+,14,3,"header","outside",512,0,0,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveChildElementOutsideContainerAtTopResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveChildElementOutsideContainerAtTopResult.csv
index cd7171c1..f5e81623 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveChildElementOutsideContainerAtTopResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveChildElementOutsideContainerAtTopResult.csv
@@ -3,13 +3,13 @@
 ,1,0,"page-1"
 ,3,0,"page-2"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,3,"header","header-default",128,0,0,0,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",512,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0
-,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0
-,12,3,"header","header",257,0,200,11,0
-,13,3,"header","left side",258,0,201,11,0
-,14,3,"header","outside",512,0,0,0,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,3,"header","header-default",128,0,0,0
+,5,1,"header","second element",256,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,4,1,"header","outside",512,0,0,0
+,11,3,"b13-2cols-with-header-container","container",256,0,0,0
+,12,3,"header","header",257,0,200,11
+,13,3,"header","left side",258,0,201,11
+,14,3,"header","outside",512,0,0,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveChildElementToOtherColumnAfterElementResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveChildElementToOtherColumnAfterElementResult.csv
index d91f7c28..7218131a 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveChildElementToOtherColumnAfterElementResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveChildElementToOtherColumnAfterElementResult.csv
@@ -3,13 +3,13 @@
 ,1,0,"page-1"
 ,3,0,"page-2"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,3,"header","header-default",385,0,201,11,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",512,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0
-,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0
-,12,3,"header","header",257,0,200,11,0
-,13,3,"header","left side",258,0,201,11,0
-,14,3,"header","outside",512,0,0,0,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,3,"header","header-default",385,0,201,11
+,3,1,"header","left-side-default",386,0,201,1
+,4,1,"header","outside",512,0,0,0
+,5,1,"header","second element",256,0,200,1
+,11,3,"b13-2cols-with-header-container","container",256,0,0,0
+,12,3,"header","header",257,0,200,11
+,13,3,"header","left side",258,0,201,11
+,14,3,"header","outside",512,0,0,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveChildElementToOtherColumnTopResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveChildElementToOtherColumnTopResult.csv
index 5d7e57ba..5b932d7d 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveChildElementToOtherColumnTopResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveChildElementToOtherColumnTopResult.csv
@@ -3,13 +3,13 @@
 ,1,0,"page-1"
 ,3,0,"page-2"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,3,"header","header-default",513,0,201,11,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,1,"header","outside",512,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0
-,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0
-,12,3,"header","header",257,0,200,11,0
-,13,3,"header","left side",770,0,201,11,0
-,14,3,"header","outside",1024,0,0,0,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent",
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,3,"header","header-default",513,0,201,11
+,3,1,"header","left-side-default",386,0,201,1
+,4,1,"header","outside",512,0,0,0
+,5,1,"header","second element",256,0,200,1
+,11,3,"b13-2cols-with-header-container","container",256,0,0,0
+,12,3,"header","header",257,0,200,11
+,13,3,"header","left side",770,0,201,11
+,14,3,"header","outside",1024,0,0,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveElementAfterContainerSortElementAfterLastContainerChildResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveElementAfterContainerSortElementAfterLastContainerChildResult.csv
index 8ea6857a..6ff5d5c9 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveElementAfterContainerSortElementAfterLastContainerChildResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveElementAfterContainerSortElementAfterLastContainerChildResult.csv
@@ -3,13 +3,13 @@
 ,1,0,"page-1"
 ,3,0,"page-2"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,3,"header","outside",385,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0
-,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0
-,12,3,"header","header",257,0,200,11,0
-,13,3,"header","left side",258,0,201,11,0
-,14,3,"header","outside",512,0,0,0,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",128,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,4,3,"header","outside",385,0,0,0
+,5,1,"header","second element",256,0,200,1
+,11,3,"b13-2cols-with-header-container","container",256,0,0,0
+,12,3,"header","header",257,0,200,11
+,13,3,"header","left side",258,0,201,11
+,14,3,"header","outside",512,0,0,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveElementAfterContainerSortElementAfterLastContainerChildSimpleCommandResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveElementAfterContainerSortElementAfterLastContainerChildSimpleCommandResult.csv
index 8ea6857a..6ff5d5c9 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveElementAfterContainerSortElementAfterLastContainerChildSimpleCommandResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveElementAfterContainerSortElementAfterLastContainerChildSimpleCommandResult.csv
@@ -3,13 +3,13 @@
 ,1,0,"page-1"
 ,3,0,"page-2"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,3,"header","outside",385,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0
-,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0
-,12,3,"header","header",257,0,200,11,0
-,13,3,"header","left side",258,0,201,11,0
-,14,3,"header","outside",512,0,0,0,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",128,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,4,3,"header","outside",385,0,0,0
+,5,1,"header","second element",256,0,200,1
+,11,3,"b13-2cols-with-header-container","container",256,0,0,0
+,12,3,"header","header",257,0,200,11
+,13,3,"header","left side",258,0,201,11
+,14,3,"header","outside",512,0,0,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveElementIntoContainerAfterElementResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveElementIntoContainerAfterElementResult.csv
index f8689e91..90141520 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveElementIntoContainerAfterElementResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveElementIntoContainerAfterElementResult.csv
@@ -3,13 +3,13 @@
 ,1,0,"page-1"
 ,3,0,"page-2"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,3,"header","outside",385,0,201,11,0
-,5,1,"header","second element",256,0,200,1,0
-,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0
-,12,3,"header","header",257,0,200,11,0
-,13,3,"header","left side",258,0,201,11,0
-,14,3,"header","outside",512,0,0,0,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",128,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,4,3,"header","outside",385,0,201,11
+,5,1,"header","second element",256,0,200,1
+,11,3,"b13-2cols-with-header-container","container",256,0,0,0
+,12,3,"header","header",257,0,200,11
+,13,3,"header","left side",258,0,201,11
+,14,3,"header","outside",512,0,0,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveElementIntoContainerAfterElementWithSimpleCommandMapResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveElementIntoContainerAfterElementWithSimpleCommandMapResult.csv
index f8689e91..90141520 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveElementIntoContainerAfterElementWithSimpleCommandMapResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveElementIntoContainerAfterElementWithSimpleCommandMapResult.csv
@@ -3,13 +3,13 @@
 ,1,0,"page-1"
 ,3,0,"page-2"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,3,"header","outside",385,0,201,11,0
-,5,1,"header","second element",256,0,200,1,0
-,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0
-,12,3,"header","header",257,0,200,11,0
-,13,3,"header","left side",258,0,201,11,0
-,14,3,"header","outside",512,0,0,0,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",128,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,4,3,"header","outside",385,0,201,11
+,5,1,"header","second element",256,0,200,1
+,11,3,"b13-2cols-with-header-container","container",256,0,0,0
+,12,3,"header","header",257,0,200,11
+,13,3,"header","left side",258,0,201,11
+,14,3,"header","outside",512,0,0,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveElementIntoContainerAtTopResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveElementIntoContainerAtTopResult.csv
index 673a71b3..6a41fa53 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveElementIntoContainerAtTopResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/MoveElementIntoContainerAtTopResult.csv
@@ -3,13 +3,13 @@
 ,1,0,"page-1"
 ,3,0,"page-2"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0
-,3,1,"header","left-side-default",64,0,201,1,0
-,4,3,"header","outside",513,0,201,11,0
-,5,1,"header","second element",256,0,200,1,0
-,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0
-,12,3,"header","header",257,0,200,11,0
-,13,3,"header","left side",770,0,201,11,0
-,14,3,"header","outside",1024,0,0,0,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
+,2,1,"header","header-default",128,0,200,1
+,3,1,"header","left-side-default",386,0,201,1
+,4,3,"header","outside",513,0,201,11
+,5,1,"header","second element",256,0,200,1
+,11,3,"b13-2cols-with-header-container","container",256,0,0,0
+,12,3,"header","header",257,0,200,11
+,13,3,"header","left side",770,0,201,11
+,14,3,"header","outside",1024,0,0,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/setup.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/setup.csv
index 59af868d..8b6ec1f8 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/setup.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/MoveElementOtherPage/setup.csv
@@ -4,12 +4,12 @@
 ,3,0,"page-2","/page-2"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,,
+,1,1,"b13-2cols-with-header-container","container-default",64,0,0,0
 ,2,1,"header","header-default",128,0,200,1
 ,5,1,"header","second element",256,0,200,1
-,3,1,"header","left-side-default",64,0,201,1
-,4,1,"header","outside",512,0,0,
-,11,3,"b13-2cols-with-header-container","container",256,0,,
+,3,1,"header","left-side-default",386,0,201,1
+,4,1,"header","outside",512,0,0,0
+,11,3,"b13-2cols-with-header-container","container",256,0,0,0
 ,12,3,"header","header",257,0,200,11
 ,13,3,"header","left side",258,0,201,11
-,14,3,"header","outside",512,0,0,
\ No newline at end of file
+,14,3,"header","outside",512,0,0,0
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/NewElement/NewElementAfterContainerSortElementAfterLastChildResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/NewElement/NewElementAfterContainerSortElementAfterLastChildResult.csv
index 266dd8ef..541b49c9 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/NewElement/NewElementAfterContainerSortElementAfterLastChildResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/NewElement/NewElementAfterContainerSortElementAfterLastChildResult.csv
@@ -2,7 +2,7 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",128,0,0,0,0
-,2,1,"header","header-default",256,0,200,1,0
-,3,1,"text","",512,0,0,0,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0,0
+,2,1,"header","header-default",256,0,200,1
+,3,1,"text","",512,0,0,0
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/NewElement/NewElementAfterNestedContainerSortElementAfterLastChildResult.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/NewElement/NewElementAfterNestedContainerSortElementAfterLastChildResult.csv
index 3732db52..4c45fde8 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/NewElement/NewElementAfterNestedContainerSortElementAfterLastChildResult.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/NewElement/NewElementAfterNestedContainerSortElementAfterLastChildResult.csv
@@ -2,8 +2,8 @@
 ,"uid","pid","title"
 ,1,0,"page-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,2,1,"b13-2cols-with-header-container","container",256,0,0,0,0
-,3,1,"b13-2cols-with-header-container","nested-container",512,0,201,2,0
-,4,1,"header","element-in-nested-container",768,0,201,3,0
-,5,1,"text","",1024,0,201,2,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,2,1,"b13-2cols-with-header-container","container",256,0,0,0
+,3,1,"b13-2cols-with-header-container","nested-container",512,0,201,2
+,4,1,"header","element-in-nested-container",768,0,201,3
+,5,1,"text","",1024,0,201,2
diff --git a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/NewElement/setup.csv b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/NewElement/setup.csv
index a1e4567a..8df00295 100644
--- a/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/NewElement/setup.csv
+++ b/Tests/Functional/Datahandler/DefaultLanguage/Fixtures/NewElement/setup.csv
@@ -3,5 +3,5 @@
 ,1,0,"page-1","/"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
-,1,1,"b13-2cols-with-header-container","container-default",128,0,,
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0,0
 ,2,1,"header","header-default",256,0,200,1
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/FixturesTest.php b/Tests/Functional/Datahandler/FixturesTest.php
new file mode 100644
index 00000000..5891facc
--- /dev/null
+++ b/Tests/Functional/Datahandler/FixturesTest.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace B13\Container\Tests\Functional\Datahandler;
+
+/*
+ * This file is part of TYPO3 CMS-based extension "container" by b13.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ */
+
+use B13\Container\Domain\Factory\ContainerFactory;
+use B13\Container\Domain\Service\ContainerService;
+use B13\Container\Integrity\Database;
+use B13\Container\Integrity\Sorting;
+use B13\Container\Tca\Registry;
+use Symfony\Component\Finder\Finder;
+use TYPO3\CMS\Core\Context\Context;
+use TYPO3\CMS\Core\Localization\LanguageServiceFactory;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
+
+class FixturesTest extends FunctionalTestCase
+{
+    /**
+     * @var non-empty-string[]
+     */
+    protected array $testExtensionsToLoad = [
+        'typo3conf/ext/container',
+        'typo3conf/ext/container_example',
+    ];
+
+    protected Sorting $sorting;
+
+    /**
+     * @var non-empty-string[]
+     */
+    protected array $coreExtensionsToLoad = ['workspaces'];
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->importCSVDataSet(__DIR__ . '/../Fixtures/be_users.csv');
+        $GLOBALS['BE_USER'] = $this->setUpBackendUser(1);
+        $GLOBALS['LANG'] = GeneralUtility::makeInstance(LanguageServiceFactory::class)->createFromUserPreferences($GLOBALS['BE_USER']);
+        $context = GeneralUtility::makeInstance(Context::class);
+        $containerRegistry = GeneralUtility::makeInstance(Registry::class);
+        $sortingDatabase = GeneralUtility::makeInstance(Database::class);
+        $factoryDatabase = GeneralUtility::makeInstance(\B13\Container\Domain\Factory\Database::class, $context);
+        $containerFactory = GeneralUtility::makeInstance(ContainerFactory::class, $factoryDatabase, $containerRegistry, $context);
+        $containerService = GeneralUtility::makeInstance(ContainerService::class, $containerRegistry, $containerFactory);
+        $this->sorting = GeneralUtility::makeInstance(Sorting::class, $sortingDatabase, $containerRegistry, $containerFactory, $containerService);
+    }
+
+    /**
+     * @return array
+     */
+    public static function csvProvider(): array
+    {
+        $finder = new Finder();
+        $finder->files()->in(__DIR__ . '/')->name('*.csv');
+        $results = [];
+        foreach ($finder as $file) {
+            $content = file_get_contents($file->getRealPath());
+            if (str_contains($content, 'sorting') == false) {
+                continue;
+            }
+            $results[] = ['csv' => str_replace(__DIR__ . '/', '', $file->getRealPath())];
+        }
+        return $results;
+    }
+
+    /**
+     * @test
+     * @dataProvider csvProvider
+     * @group fixtures
+     */
+    public function fixturesSorting(string $csv): void
+    {
+        $this->importCSVDataSet(__DIR__ . '/' . $csv);
+        $errors = $this->sorting->run(true);
+        self::assertTrue(count($errors) === 0, 'got errors for ' . $csv);
+    }
+}
diff --git a/Tests/Functional/Datahandler/Localization/ConnectedMode/ContainerTest.php b/Tests/Functional/Datahandler/Localization/ConnectedMode/ContainerTest.php
index 63933f61..8798a717 100644
--- a/Tests/Functional/Datahandler/Localization/ConnectedMode/ContainerTest.php
+++ b/Tests/Functional/Datahandler/Localization/ConnectedMode/ContainerTest.php
@@ -21,7 +21,7 @@ class ContainerTest extends AbstractDatahandler
      */
     public function deleteContainerDeleteTranslatedChildren(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Container/delete_container.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Container/DeleteContainerDeleteTranslatedChildren.csv');
         $cmdmap = [
             'tt_content' => [
                 1 => [
@@ -39,7 +39,7 @@ public function deleteContainerDeleteTranslatedChildren(): void
      */
     public function moveContainerToOtherPageMovesChildren(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Container/move_container_to_other_page.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Container/MoveContainerToOtherPageMovesChildren.csv');
         $cmdmap = [
             'tt_content' => [
                 1 => [
diff --git a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/Container/delete_container.csv b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/Container/DeleteContainerDeleteTranslatedChildren.csv
similarity index 66%
rename from Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/Container/delete_container.csv
rename to Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/Container/DeleteContainerDeleteTranslatedChildren.csv
index 138bcd5c..2110caec 100644
--- a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/Container/delete_container.csv
+++ b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/Container/DeleteContainerDeleteTranslatedChildren.csv
@@ -5,6 +5,6 @@
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
 ,1,1,"b13-2cols-with-header-container","container-default",256,0,,,
-,2,1,"header","header-default",128,0,200,1,
-,21,1,"b13-2cols-with-header-container","container-language-1",256,1,,,1
-,22,1,"header","header-language-1",128,1,200,1,2
\ No newline at end of file
+,2,1,"header","header-default",512,0,200,1,
+,21,1,"b13-2cols-with-header-container","container-language-1",384,1,,,1
+,22,1,"header","header-language-1",768,1,200,1,2
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/Container/DeleteContainerDeleteTranslatedChildrenResult.csv b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/Container/DeleteContainerDeleteTranslatedChildrenResult.csv
index f77070cd..a15c0df6 100644
--- a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/Container/DeleteContainerDeleteTranslatedChildrenResult.csv
+++ b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/Container/DeleteContainerDeleteTranslatedChildrenResult.csv
@@ -3,8 +3,8 @@
 ,1,0,"page-1"
 ,2,0,"page-1-language-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0,0
-,21,1,"b13-2cols-with-header-container","container-language-1",256,1,0,0,1,0
-,22,1,"header","header-language-1",128,1,200,1,2,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source","deleted"
+,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0,1
+,2,1,"header","header-default",512,0,200,1,0,0,1
+,21,1,"b13-2cols-with-header-container","container-language-1",384,1,0,0,1,0,1
+,22,1,"header","header-language-1",768,1,200,1,2,0,1
diff --git a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/Container/move_container_to_other_page.csv b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/Container/MoveContainerToOtherPageMovesChildren.csv
similarity index 70%
rename from Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/Container/move_container_to_other_page.csv
rename to Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/Container/MoveContainerToOtherPageMovesChildren.csv
index c57d6940..eb00cd8b 100644
--- a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/Container/move_container_to_other_page.csv
+++ b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/Container/MoveContainerToOtherPageMovesChildren.csv
@@ -7,6 +7,6 @@
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
 ,1,1,"b13-2cols-with-header-container","container-default",256,0,,,
-,2,1,"header","header-default",128,0,200,1,
-,21,1,"b13-2cols-with-header-container","container-language-1",256,1,,,1
-,22,1,"header","header-language-1",128,1,200,1,2
\ No newline at end of file
+,2,1,"header","header-default",512,0,200,1,
+,21,1,"b13-2cols-with-header-container","container-language-1",384,1,,,1
+,22,1,"header","header-language-1",768,1,200,1,2
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElement/MoveChildElementOutsideContainerAfterElementResult.csv b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElement/MoveChildElementOutsideContainerAfterElementResult.csv
index 388bd207..306722c6 100644
--- a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElement/MoveChildElementOutsideContainerAfterElementResult.csv
+++ b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElement/MoveChildElementOutsideContainerAfterElementResult.csv
@@ -1,15 +1,11 @@
-"pages"
-,"uid","pid","title"
-,1,0,"page-1"
-,2,0,"page-1-language-1"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
 ,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0
 ,2,1,"header","header-default",1280,0,0,0,0,0
-,3,1,"header","left-side-default",64,0,201,1,0,0
-,4,1,"header","outside",512,0,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0,0
-,21,1,"b13-2cols-with-header-container","container-language-1",256,1,0,0,1,0
-,22,1,"header","header-language-1",768,1,0,0,2,0
-,23,1,"header","left-side-language-1",64,1,201,1,3,0
-,24,1,"header","outside",512,1,0,0,4,0
+,5,1,"header","second element",576,0,200,1,0,0
+,3,1,"header","left-side-default",768,0,201,1,0,0
+,4,1,"header","outside",1024,0,0,0,0,0
+,21,1,"b13-2cols-with-header-container","container-language-1",384,1,0,0,1,0
+,22,1,"header","header-language-1",512,1,0,0,2,0
+,23,1,"header","left-side-language-1",704,1,201,1,3,0
+,24,1,"header","outside",448,1,0,0,4,0
diff --git a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElement/MoveChildElementOutsideContainerAtTopResult.csv b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElement/MoveChildElementOutsideContainerAtTopResult.csv
index 60c76682..8b49f816 100644
--- a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElement/MoveChildElementOutsideContainerAtTopResult.csv
+++ b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElement/MoveChildElementOutsideContainerAtTopResult.csv
@@ -1,15 +1,11 @@
-"pages"
-,"uid","pid","title"
-,1,0,"page-1"
-,2,0,"page-1-language-1"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
 ,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0
-,2,1,"header","header-default",32,0,0,0,0,0
-,3,1,"header","left-side-default",64,0,201,1,0,0
-,4,1,"header","outside",512,0,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0,0
-,21,1,"b13-2cols-with-header-container","container-language-1",256,1,0,0,1,0
-,22,1,"header","header-language-1",16,1,0,0,2,0
-,23,1,"header","left-side-language-1",64,1,201,1,3,0
-,24,1,"header","outside",512,1,0,0,4,0
+,2,1,"header","header-default",128,0,0,0,0,0
+,5,1,"header","second element",576,0,200,1,0,0
+,3,1,"header","left-side-default",768,0,201,1,0,0
+,4,1,"header","outside",1024,0,0,0,0,0
+,21,1,"b13-2cols-with-header-container","container-language-1",384,1,0,0,1,0
+,22,1,"header","header-language-1",64,1,0,0,2,0
+,23,1,"header","left-side-language-1",704,1,201,1,3,0
+,24,1,"header","outside",448,1,0,0,4,0
diff --git a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElement/MoveChildElementToOtherColumnAfterElementResult.csv b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElement/MoveChildElementToOtherColumnAfterElementResult.csv
index e564d95c..75953d24 100644
--- a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElement/MoveChildElementToOtherColumnAfterElementResult.csv
+++ b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElement/MoveChildElementToOtherColumnAfterElementResult.csv
@@ -1,15 +1,11 @@
-"pages"
-,"uid","pid","title"
-,1,0,"page-1"
-,2,0,"page-1-language-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","container-default",1280,0,0,0,0,0
-,2,1,"header","header-default",832,0,201,1,0,0
-,3,1,"header","left-side-default",64,0,201,1,0,0
-,4,1,"header","outside",1536,0,0,0,0,0
-,5,1,"header","second element",1280,0,200,1,0,0
-,21,1,"b13-2cols-with-header-container","container-language-1",1280,1,0,0,1,0
-,22,1,"header","header-language-1",320,1,201,1,2,0
-,23,1,"header","left-side-language-1",64,1,201,1,3,0
-,24,1,"header","outside",1536,1,0,0,4,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
+,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
+,2,1,"header","header-default",896,0,201,1,0
+,5,1,"header","second element",576,0,200,1,0
+,3,1,"header","left-side-default",768,0,201,1,0
+,4,1,"header","outside",1024,0,0,0,0
+,21,1,"b13-2cols-with-header-container","container-language-1",384,1,0,0,1
+,22,1,"header","header-language-1",736,1,201,1,2
+,23,1,"header","left-side-language-1",704,1,201,1,3
+,24,1,"header","outside",448,1,0,0,4
diff --git a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElement/MoveChildElementToOtherColumnTopResult.csv b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElement/MoveChildElementToOtherColumnTopResult.csv
index adb9797a..44352fe7 100644
--- a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElement/MoveChildElementToOtherColumnTopResult.csv
+++ b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElement/MoveChildElementToOtherColumnTopResult.csv
@@ -1,15 +1,11 @@
-"pages"
-,"uid","pid","title"
-,1,0,"page-1"
-,2,0,"page-1-language-1"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
 ,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0
-,2,1,"header","header-default",512,0,201,1,0,0
-,3,1,"header","left-side-default",64,0,201,1,0,0
+,2,1,"header","header-default",608,0,201,1,0,0
+,5,1,"header","second element",576,0,200,1,0,0
+,3,1,"header","left-side-default",768,0,201,1,0,0
 ,4,1,"header","outside",1024,0,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0,0
-,21,1,"b13-2cols-with-header-container","container-language-1",256,1,0,0,1,0
-,22,1,"header","header-language-1",32,1,201,1,2,0
-,23,1,"header","left-side-language-1",64,1,201,1,3,0
-,24,1,"header","outside",1024,1,0,0,4,0
+,21,1,"b13-2cols-with-header-container","container-language-1",384,1,0,0,1,0
+,22,1,"header","header-language-1",128,1,201,1,2,0
+,23,1,"header","left-side-language-1",704,1,201,1,3,0
+,24,1,"header","outside",448,1,0,0,4,0
diff --git a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElement/MoveElementIntoContainerAfterElementResult.csv b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElement/MoveElementIntoContainerAfterElementResult.csv
index b6892eec..0afe1b22 100644
--- a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElement/MoveElementIntoContainerAfterElementResult.csv
+++ b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElement/MoveElementIntoContainerAfterElementResult.csv
@@ -1,15 +1,11 @@
-"pages"
-,"uid","pid","title"
-,1,0,"page-1"
-,2,0,"page-1-language-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","container-default",1280,0,0,0,0,0
-,2,1,"header","header-default",1152,0,200,1,0,0
-,3,1,"header","left-side-default",64,0,201,1,0,0
-,4,1,"header","outside",832,0,201,1,0,0
-,5,1,"header","second element",1280,0,200,1,0,0
-,21,1,"b13-2cols-with-header-container","container-language-1",1280,1,0,0,1,0
-,22,1,"header","header-language-1",1152,1,200,1,2,0
-,23,1,"header","left-side-language-1",64,1,201,1,3,0
-,24,1,"header","outside",320,1,201,1,4,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
+,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
+,2,1,"header","header-default",512,0,200,1,0
+,5,1,"header","second element",576,0,200,1,0
+,3,1,"header","left-side-default",768,0,201,1,0
+,4,1,"header","outside",896,0,201,1,0
+,21,1,"b13-2cols-with-header-container","container-language-1",384,1,0,0,1
+,22,1,"header","header-language-1",640,1,200,1,2
+,23,1,"header","left-side-language-1",704,1,201,1,3
+,24,1,"header","outside",736,1,201,1,4
diff --git a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElement/MoveElementIntoContainerAtTopResult.csv b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElement/MoveElementIntoContainerAtTopResult.csv
index 1a64bf36..ff1afe4f 100644
--- a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElement/MoveElementIntoContainerAtTopResult.csv
+++ b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElement/MoveElementIntoContainerAtTopResult.csv
@@ -1,15 +1,11 @@
-"pages"
-,"uid","pid","title"
-,1,0,"page-1"
-,2,0,"page-1-language-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0,0
-,3,1,"header","left-side-default",64,0,201,1,0,0
-,4,1,"header","outside",512,0,201,1,0,0
-,5,1,"header","second element",256,0,200,1,0,0
-,21,1,"b13-2cols-with-header-container","container-language-1",256,1,0,0,1,0
-,22,1,"header","header-language-1",128,1,200,1,2,0
-,23,1,"header","left-side-language-1",64,1,201,1,3,0
-,24,1,"header","outside",32,1,201,1,4,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
+,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
+,2,1,"header","header-default",512,0,200,1,0
+,5,1,"header","second element",576,0,200,1,0
+,3,1,"header","left-side-default",768,0,201,1,0
+,4,1,"header","outside",608,0,201,1,0
+,21,1,"b13-2cols-with-header-container","container-language-1",384,1,0,0,1
+,22,1,"header","header-language-1",640,1,200,1,2
+,23,1,"header","left-side-language-1",704,1,201,1,3
+,24,1,"header","outside",128,1,201,1,4
diff --git a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElement/setup.csv b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElement/setup.csv
index 2894035b..77d7ea16 100644
--- a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElement/setup.csv
+++ b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElement/setup.csv
@@ -4,12 +4,12 @@
 ,2,0,"page-1-language-1","/",1,1,1
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,,,
-,2,1,"header","header-default",128,0,200,1,
-,5,1,"header","second element",256,0,200,1,
-,3,1,"header","left-side-default",64,0,201,1,
-,4,1,"header","outside",512,0,0,,
-,21,1,"b13-2cols-with-header-container","container-language-1",256,1,,,1
-,22,1,"header","header-language-1",128,1,200,1,2
-,23,1,"header","left-side-language-1",64,1,201,1,3
-,24,1,"header","outside",512,1,0,,4
\ No newline at end of file
+,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
+,2,1,"header","header-default",512,0,200,1,0
+,5,1,"header","second element",576,0,200,1,0
+,3,1,"header","left-side-default",768,0,201,1,0
+,4,1,"header","outside",1024,0,0,0,0
+,21,1,"b13-2cols-with-header-container","container-language-1",384,1,0,0,1
+,22,1,"header","header-language-1",640,1,200,1,2
+,23,1,"header","left-side-language-1",704,1,201,1,3
+,24,1,"header","outside",448,1,0,0,4
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElementOtherPage/MoveChildElementOutsideContainerAfterElementResult.csv b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElementOtherPage/MoveChildElementOutsideContainerAfterElementResult.csv
index d89f721e..b5de7c67 100644
--- a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElementOtherPage/MoveChildElementOutsideContainerAfterElementResult.csv
+++ b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElementOtherPage/MoveChildElementOutsideContainerAfterElementResult.csv
@@ -1,20 +1,14 @@
-"pages"
-,"uid","pid","title"
-,1,0,"page-1"
-,2,0,"page-1-language-1"
-,3,0,"page-2"
-,4,0,"page-2-language-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0
-,2,3,"header","header-default",1280,0,0,0,0,0
-,4,1,"header","outside",512,0,0,0,0,0
-,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0,0
-,13,3,"header","left side",258,0,201,11,0,0
-,14,3,"header","outside",512,0,0,0,0,0
-,21,1,"b13-2cols-with-header-container","container-language-1",256,1,0,0,1,0
-,22,3,"header","header-language-1",768,1,0,0,2,0
-,24,1,"header","outside",512,1,0,0,4,0
-,41,3,"b13-2cols-with-header-container","container",256,1,0,0,11,0
-,43,3,"header","left side",64,1,201,11,13,0
-,44,3,"header","outside",512,1,0,0,14,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
+,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
+,2,3,"header","header-default",1280,0,0,0,0
+,4,1,"header","outside",1024,0,0,0,0
+,21,1,"b13-2cols-with-header-container","container-language-1",384,1,0,0,1
+,22,3,"header","header-language-1",480,1,0,0,2
+,24,1,"header","outside",448,1,0,0,4
+,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0
+,13,3,"header","left side",512,0,201,11,0
+,14,3,"header","outside",1024,0,0,0,0
+,41,3,"b13-2cols-with-header-container","container",384,1,0,0,11
+,43,3,"header","left side",640,1,201,11,13
+,44,3,"header","outside",448,1,0,0,14
diff --git a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElementOtherPage/MoveChildElementOutsideContainerAtTopResult.csv b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElementOtherPage/MoveChildElementOutsideContainerAtTopResult.csv
index d3ca8ab2..e67b2bd1 100644
--- a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElementOtherPage/MoveChildElementOutsideContainerAtTopResult.csv
+++ b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElementOtherPage/MoveChildElementOutsideContainerAtTopResult.csv
@@ -1,20 +1,14 @@
-"pages"
-,"uid","pid","title"
-,1,0,"page-1"
-,2,0,"page-1-language-1"
-,3,0,"page-2"
-,4,0,"page-2-language-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0
-,2,3,"header","header-default",32,0,0,0,0,0
-,4,1,"header","outside",512,0,0,0,0,0
-,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0,0
-,13,3,"header","left side",258,0,201,11,0,0
-,14,3,"header","outside",512,0,0,0,0,0
-,21,1,"b13-2cols-with-header-container","container-language-1",256,1,0,0,1,0
-,22,3,"header","header-language-1",16,1,0,0,2,0
-,24,1,"header","outside",512,1,0,0,4,0
-,41,3,"b13-2cols-with-header-container","container",256,1,0,0,11,0
-,43,3,"header","left side",64,1,201,11,13,0
-,44,3,"header","outside",512,1,0,0,14,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
+,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
+,2,3,"header","header-default",128,0,0,0,0
+,4,1,"header","outside",1024,0,0,0,0
+,21,1,"b13-2cols-with-header-container","container-language-1",384,1,0,0,1
+,22,3,"header","header-language-1",64,1,0,0,2
+,24,1,"header","outside",448,1,0,0,4
+,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0
+,13,3,"header","left side",512,0,201,11,0
+,14,3,"header","outside",1024,0,0,0,0
+,41,3,"b13-2cols-with-header-container","container",384,1,0,0,11
+,43,3,"header","left side",640,1,201,11,13
+,44,3,"header","outside",448,1,0,0,14
diff --git a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElementOtherPage/MoveChildElementToOtherColumnAfterElementResult.csv b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElementOtherPage/MoveChildElementToOtherColumnAfterElementResult.csv
index dae30374..3b7a8e46 100644
--- a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElementOtherPage/MoveChildElementToOtherColumnAfterElementResult.csv
+++ b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElementOtherPage/MoveChildElementToOtherColumnAfterElementResult.csv
@@ -1,20 +1,15 @@
-"pages"
-,"uid","pid","title"
-,1,0,"page-1"
-,2,0,"page-1-language-1"
-,3,0,"page-2"
-,4,0,"page-2-language-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0
-,2,3,"header","header-default",385,0,201,11,0,0
-,4,1,"header","outside",512,0,0,0,0,0
-,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0,0
-,13,3,"header","left side",258,0,201,11,0,0
-,14,3,"header","outside",512,0,0,0,0,0
-,21,1,"b13-2cols-with-header-container","container-language-1",256,1,0,0,1,0
-,22,3,"header","header-language-1",160,1,201,11,2,0
-,24,1,"header","outside",512,1,0,0,4,0
-,41,3,"b13-2cols-with-header-container","container",256,1,0,0,11,0
-,43,3,"header","left side",64,1,201,11,13,0
-,44,3,"header","outside",512,1,0,0,14,0
+"tt_content"
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
+,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
+,2,3,"header","header-default",576,0,201,11,0
+,4,1,"header","outside",1024,0,0,0,0
+,21,1,"b13-2cols-with-header-container","container-language-1",384,1,0,0,1
+,22,3,"header","header-language-1",832,1,201,11,2
+,24,1,"header","outside",448,1,0,0,4
+,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0
+,13,3,"header","left side",512,0,201,11,0
+,14,3,"header","outside",1024,0,0,0,0
+,41,3,"b13-2cols-with-header-container","container",384,1,0,0,11
+,43,3,"header","left side",640,1,201,11,13
+,44,3,"header","outside",448,1,0,0,14
diff --git a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElementOtherPage/MoveChildElementToOtherColumnTopResult.csv b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElementOtherPage/MoveChildElementToOtherColumnTopResult.csv
index 17910ebd..121fa0ba 100644
--- a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElementOtherPage/MoveChildElementToOtherColumnTopResult.csv
+++ b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElementOtherPage/MoveChildElementToOtherColumnTopResult.csv
@@ -1,20 +1,14 @@
-"pages"
-,"uid","pid","title"
-,1,0,"page-1"
-,2,0,"page-1-language-1"
-,3,0,"page-2"
-,4,0,"page-2-language-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0
-,2,3,"header","header-default",1024,0,201,11,0,0
-,4,1,"header","outside",512,0,0,0,0,0
-,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0,0
-,13,3,"header","left side",1282,0,201,11,0,0
-,14,3,"header","outside",1536,0,0,0,0,0
-,21,1,"b13-2cols-with-header-container","container-language-1",256,1,0,0,1,0
-,22,3,"header","header-language-1",512,1,201,11,2,0
-,24,1,"header","outside",512,1,0,0,4,0
-,41,3,"b13-2cols-with-header-container","container",256,1,0,0,11,0
-,43,3,"header","left side",64,1,201,11,13,0
-,44,3,"header","outside",1536,1,0,0,14,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
+,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
+,2,3,"header","header-default",320,0,201,11,0
+,4,1,"header","outside",1024,0,0,0,0
+,21,1,"b13-2cols-with-header-container","container-language-1",384,1,0,0,1
+,22,3,"header","header-language-1",416,1,201,11,2
+,24,1,"header","outside",448,1,0,0,4
+,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0
+,13,3,"header","left side",512,0,201,11,0
+,14,3,"header","outside",1024,0,0,0,0
+,41,3,"b13-2cols-with-header-container","container",384,1,0,0,11
+,43,3,"header","left side",640,1,201,11,13
+,44,3,"header","outside",448,1,0,0,14
diff --git a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElementOtherPage/MoveElementIntoContainerAfterElementResult.csv b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElementOtherPage/MoveElementIntoContainerAfterElementResult.csv
index e0756578..2f07d590 100644
--- a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElementOtherPage/MoveElementIntoContainerAfterElementResult.csv
+++ b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElementOtherPage/MoveElementIntoContainerAfterElementResult.csv
@@ -1,20 +1,14 @@
-"pages"
-,"uid","pid","title"
-,1,0,"page-1"
-,2,0,"page-1-language-1"
-,3,0,"page-2"
-,4,0,"page-2-language-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0,0
-,4,3,"header","outside",385,0,201,11,0,0
-,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0,0
-,13,3,"header","left side",258,0,201,11,0,0
-,14,3,"header","outside",512,0,0,0,0,0
-,21,1,"b13-2cols-with-header-container","container-language-1",256,1,0,0,1,0
-,22,1,"header","header-language-1",128,1,200,1,2,0
-,24,3,"header","outside",160,1,201,11,4,0
-,41,3,"b13-2cols-with-header-container","container",256,1,0,0,11,0
-,43,3,"header","left side",64,1,201,11,13,0
-,44,3,"header","outside",512,1,0,0,14,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
+,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
+,2,1,"header","header-default",512,0,200,1,0
+,4,3,"header","outside",576,0,201,11,0
+,21,1,"b13-2cols-with-header-container","container-language-1",384,1,0,0,1
+,22,1,"header","header-language-1",640,1,200,1,2
+,24,3,"header","outside",832,1,201,11,4
+,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0
+,13,3,"header","left side",512,0,201,11,0
+,14,3,"header","outside",1024,0,0,0,0
+,41,3,"b13-2cols-with-header-container","container",384,1,0,0,11
+,43,3,"header","left side",640,1,201,11,13
+,44,3,"header","outside",448,1,0,0,14
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElementOtherPage/MoveElementIntoContainerAtTopResult.csv b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElementOtherPage/MoveElementIntoContainerAtTopResult.csv
index 1ede1d09..fbc4d287 100644
--- a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElementOtherPage/MoveElementIntoContainerAtTopResult.csv
+++ b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElementOtherPage/MoveElementIntoContainerAtTopResult.csv
@@ -1,20 +1,14 @@
-"pages"
-,"uid","pid","title"
-,1,0,"page-1"
-,2,0,"page-1-language-1"
-,3,0,"page-2"
-,4,0,"page-2-language-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0,0
-,4,3,"header","outside",1024,0,201,11,0,0
-,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0,0
-,13,3,"header","left side",1282,0,201,11,0,0
-,14,3,"header","outside",1536,0,0,0,0,0
-,21,1,"b13-2cols-with-header-container","container-language-1",256,1,0,0,1,0
-,22,1,"header","header-language-1",128,1,200,1,2,0
-,24,3,"header","outside",512,1,201,11,4,0
-,41,3,"b13-2cols-with-header-container","container",256,1,0,0,11,0
-,43,3,"header","left side",64,1,201,11,13,0
-,44,3,"header","outside",1536,1,0,0,14,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
+,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
+,2,1,"header","header-default",512,0,200,1,0
+,4,3,"header","outside",320,0,201,11,0
+,21,1,"b13-2cols-with-header-container","container-language-1",384,1,0,0,1
+,22,1,"header","header-language-1",640,1,200,1,2
+,24,3,"header","outside",416,1,201,11,4
+,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0
+,13,3,"header","left side",512,0,201,11,0
+,14,3,"header","outside",1024,0,0,0,0
+,41,3,"b13-2cols-with-header-container","container",384,1,0,0,11
+,43,3,"header","left side",640,1,201,11,13
+,44,3,"header","outside",448,1,0,0,14
diff --git a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElementOtherPage/setup.csv b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElementOtherPage/setup.csv
index 31deb45d..40c57e3a 100644
--- a/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElementOtherPage/setup.csv
+++ b/Tests/Functional/Datahandler/Localization/ConnectedMode/Fixtures/MoveElementOtherPage/setup.csv
@@ -6,15 +6,15 @@
 ,4,0,"page-2-language-1","/page-2",1,3,3
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,,,
-,2,1,"header","header-default",128,0,200,1,
-,4,1,"header","outside",512,0,0,,
-,21,1,"b13-2cols-with-header-container","container-language-1",256,1,,,1
-,22,1,"header","header-language-1",128,1,200,1,2
-,24,1,"header","outside",512,1,0,,4
-,11,3,"b13-2cols-with-header-container","container",256,0,,,
-,13,3,"header","left side",258,0,201,11,
-,14,3,"header","outside",512,0,0,,
-,41,3,"b13-2cols-with-header-container","container",256,1,,,11
-,43,3,"header","left side",64,1,201,11,13
-,44,3,"header","outside",512,1,0,,14
\ No newline at end of file
+,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0
+,2,1,"header","header-default",512,0,200,1,0
+,4,1,"header","outside",1024,0,0,0,0
+,21,1,"b13-2cols-with-header-container","container-language-1",384,1,0,0,1
+,22,1,"header","header-language-1",640,1,200,1,2
+,24,1,"header","outside",448,1,0,0,4
+,11,3,"b13-2cols-with-header-container","container",256,0,0,0,0
+,13,3,"header","left side",512,0,201,11,0
+,14,3,"header","outside",1024,0,0,0,0
+,41,3,"b13-2cols-with-header-container","container",384,1,0,0,11
+,43,3,"header","left side",640,1,201,11,13
+,44,3,"header","outside",448,1,0,0,14
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Localization/CopyToLanguageSortingTest.php b/Tests/Functional/Datahandler/Localization/CopyToLanguageSortingTest.php
index 275c0c7d..193dc60b 100644
--- a/Tests/Functional/Datahandler/Localization/CopyToLanguageSortingTest.php
+++ b/Tests/Functional/Datahandler/Localization/CopyToLanguageSortingTest.php
@@ -43,7 +43,7 @@ public static function localizeKeepsSortingDataProvider(): array
      */
     public function localizeKeepsSorting(array $cmdmap, string $dataset): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/CopyToLanguageSorting/localize_containers.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/CopyToLanguageSorting/LocalizeKeepsSorting.csv');
         $this->dataHandler->start([], $cmdmap, $this->backendUser);
         $this->dataHandler->process_cmdmap();
         self::assertCSVDataSet(__DIR__ . '/Fixtures/CopyToLanguageSorting/LocalizeKeepsSorting' . $dataset . 'Result.csv');
@@ -54,7 +54,7 @@ public function localizeKeepsSorting(array $cmdmap, string $dataset): void
      */
     public function localizeChildAtTopOfContainer(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/CopyToLanguageSorting/localize_child_at_top.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/CopyToLanguageSorting/LocalizeChildAtTopOfContainer.csv');
         $cmdmap = [
             'tt_content' => [
                 2 => [
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/CopyToLanguageSorting/localize_child_at_top.csv b/Tests/Functional/Datahandler/Localization/Fixtures/CopyToLanguageSorting/LocalizeChildAtTopOfContainer.csv
similarity index 100%
rename from Tests/Functional/Datahandler/Localization/Fixtures/CopyToLanguageSorting/localize_child_at_top.csv
rename to Tests/Functional/Datahandler/Localization/Fixtures/CopyToLanguageSorting/LocalizeChildAtTopOfContainer.csv
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/CopyToLanguageSorting/localize_containers.csv b/Tests/Functional/Datahandler/Localization/Fixtures/CopyToLanguageSorting/LocalizeKeepsSorting.csv
similarity index 73%
rename from Tests/Functional/Datahandler/Localization/Fixtures/CopyToLanguageSorting/localize_containers.csv
rename to Tests/Functional/Datahandler/Localization/Fixtures/CopyToLanguageSorting/LocalizeKeepsSorting.csv
index da607bc2..0bb1ce78 100644
--- a/Tests/Functional/Datahandler/Localization/Fixtures/CopyToLanguageSorting/localize_containers.csv
+++ b/Tests/Functional/Datahandler/Localization/Fixtures/CopyToLanguageSorting/LocalizeKeepsSorting.csv
@@ -4,8 +4,8 @@
 ,2,0,"page-1-language-1","/",1,1,1
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
-,1,1,"b13-2cols-with-header-container","container-1",128,0,,
+,1,1,"b13-2cols-with-header-container","container-1",128,0,0,0
 ,2,1,"header","child-1-1",256,0,200,1
 ,3,1,"header","child-1-2",512,0,200,1
-,4,1,"b13-2cols-with-header-container","container-2",1024,0,,
+,4,1,"b13-2cols-with-header-container","container-2",1024,0,0,0
 ,5,1,"header","child-2-1",2048,0,200,4
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/CopyToLanguageSorting/LocalizeKeepsSortingDataset1Result.csv b/Tests/Functional/Datahandler/Localization/Fixtures/CopyToLanguageSorting/LocalizeKeepsSortingDataset1Result.csv
index 8d8bb9a6..4266040a 100644
--- a/Tests/Functional/Datahandler/Localization/Fixtures/CopyToLanguageSorting/LocalizeKeepsSortingDataset1Result.csv
+++ b/Tests/Functional/Datahandler/Localization/Fixtures/CopyToLanguageSorting/LocalizeKeepsSortingDataset1Result.csv
@@ -9,8 +9,8 @@
 ,3,1,"header","child-1-2",512,0,200,1,0
 ,4,1,"b13-2cols-with-header-container","container-2",1024,0,0,0,0
 ,5,1,"header","child-2-1",2048,0,200,4,0
-,6,1,"b13-2cols-with-header-container","[Translate to german:] container-2",2304,1,0,0,0
-,7,1,"header","[Translate to german:] child-2-1",2432,1,200,6,0
 ,8,1,"b13-2cols-with-header-container","[Translate to german:] container-1",768,1,0,0,0
 ,10,1,"header","[Translate to german:] child-1-2",880,1,200,8,0
-,9,1,"header","[Translate to german:] child-1-1",832,1,200,8,0
\ No newline at end of file
+,9,1,"header","[Translate to german:] child-1-1",832,1,200,8,0
+,6,1,"b13-2cols-with-header-container","[Translate to german:] container-2",2304,1,0,0,0
+,7,1,"header","[Translate to german:] child-2-1",2432,1,200,6,0
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/CopyToLanguageSorting/LocalizeKeepsSortingDataset2Result.csv b/Tests/Functional/Datahandler/Localization/Fixtures/CopyToLanguageSorting/LocalizeKeepsSortingDataset2Result.csv
index 43268284..8371e103 100644
--- a/Tests/Functional/Datahandler/Localization/Fixtures/CopyToLanguageSorting/LocalizeKeepsSortingDataset2Result.csv
+++ b/Tests/Functional/Datahandler/Localization/Fixtures/CopyToLanguageSorting/LocalizeKeepsSortingDataset2Result.csv
@@ -10,7 +10,7 @@
 ,4,1,"b13-2cols-with-header-container","container-2",1024,0,0,0,0
 ,5,1,"header","child-2-1",2048,0,200,4,0
 ,6,1,"b13-2cols-with-header-container","[Translate to german:] container-1",768,1,0,0,0
-,8,1,"header","[Translate to german:] child-1-2",880,1,200,6,0
 ,7,1,"header","[Translate to german:] child-1-1",832,1,200,6,0
-,9,1,"b13-2cols-with-header-container","[Translate to german:] container-2",952,1,0,0,0
-,10,1,"header","[Translate to german:] child-2-1",970,1,200,9,0
\ No newline at end of file
+,8,1,"header","[Translate to german:] child-1-2",880,1,200,6,0
+,9,1,"b13-2cols-with-header-container","[Translate to german:] container-2",2304,1,0,0,0
+,10,1,"header","[Translate to german:] child-2-1",2432,1,200,9,0
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/CopyToLanguageSorting/LocalizeWithMultipleNestedElements.csv b/Tests/Functional/Datahandler/Localization/Fixtures/CopyToLanguageSorting/LocalizeWithMultipleNestedElements.csv
index 58f3e526..8abea6ad 100644
--- a/Tests/Functional/Datahandler/Localization/Fixtures/CopyToLanguageSorting/LocalizeWithMultipleNestedElements.csv
+++ b/Tests/Functional/Datahandler/Localization/Fixtures/CopyToLanguageSorting/LocalizeWithMultipleNestedElements.csv
@@ -8,7 +8,7 @@
 ,"2","1","b13-2cols-with-header-container","2","512","0","200","1","0"
 ,"3","1","b13-2cols-with-header-container","3","768","0","201","2","0"
 ,"4","1","b13-2cols-with-header-container","4","1024","0","200","3","0"
-,"5","1","b13-2cols-with-header-container","7","1280","0","200","3","0"
-,"6","1","b13-2cols-with-header-container","5","1152","0","200","4","0"
-,"7","1","header","6","1216","0","200","6","0"
+,"5","1","b13-2cols-with-header-container","5","1280","0","200","3","0"
+,"6","1","b13-2cols-with-header-container","6","1152","0","200","4","0"
+,"7","1","header","7","1216","0","200","6","0"
 
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/CopyToLanguageSorting/LocalizeWithMultipleNestedElementsResult.csv b/Tests/Functional/Datahandler/Localization/Fixtures/CopyToLanguageSorting/LocalizeWithMultipleNestedElementsResult.csv
index bb123287..ce89ae6d 100644
--- a/Tests/Functional/Datahandler/Localization/Fixtures/CopyToLanguageSorting/LocalizeWithMultipleNestedElementsResult.csv
+++ b/Tests/Functional/Datahandler/Localization/Fixtures/CopyToLanguageSorting/LocalizeWithMultipleNestedElementsResult.csv
@@ -8,14 +8,14 @@
 ,"2","1","b13-2cols-with-header-container","2","512","0","200","1","0"
 ,"3","1","b13-2cols-with-header-container","3","768","0","201","2","0"
 ,"4","1","b13-2cols-with-header-container","4","1024","0","200","3","0"
-,"5","1","b13-2cols-with-header-container","7","1280","0","200","3","0"
-,"6","1","b13-2cols-with-header-container","5","1152","0","200","4","0"
-,"7","1","header","6","1216","0","200","6","0"
+,"5","1","b13-2cols-with-header-container","5","1280","0","200","3","0"
+,"6","1","b13-2cols-with-header-container","6","1152","0","200","4","0"
+,"7","1","header","7","1216","0","200","6","0"
 ,"8","1","b13-2cols-with-header-container","[Translate to English-Free:] 1","1536","4","0","0","1"
-,"9","1","b13-2cols-with-header-container","[Translate to English-Free:] 2","1664","4","200","8","2"
-,"10","1","b13-2cols-with-header-container","[Translate to English-Free:] 3","1792","4","201","9","3"
-,"11","1","b13-2cols-with-header-container","[Translate to English-Free:] 4","1840","4","200","10","4"
-,"12","1","b13-2cols-with-header-container","[Translate to English-Free:] 5","1864","4","200","11","6"
-,"13","1","header","[Translate to English-Free:] 6","1876","4","200","12","7"
-,"14","1","b13-2cols-with-header-container","[Translate to English-Free:] 7","1888","4","200","10","5"
+,"9","1","b13-2cols-with-header-container","[Translate to English-Free:] 2","1792","4","200","8","2"
+,"10","1","b13-2cols-with-header-container","[Translate to English-Free:] 3","2048","4","201","9","3"
+,"11","1","b13-2cols-with-header-container","[Translate to English-Free:] 4","2176","4","200","10","4"
+,"12","1","b13-2cols-with-header-container","[Translate to English-Free:] 6","2240","4","200","11","6"
+,"13","1","header","[Translate to English-Free:] 7","2272","4","200","12","7"
+,"14","1","b13-2cols-with-header-container","[Translate to English-Free:] 5","2304","4","200","10","5"
 
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/CopyToLanguageSorting/LocalizeWithNestedElementsResult.csv b/Tests/Functional/Datahandler/Localization/Fixtures/CopyToLanguageSorting/LocalizeWithNestedElementsResult.csv
index 04f2f512..d39dd787 100644
--- a/Tests/Functional/Datahandler/Localization/Fixtures/CopyToLanguageSorting/LocalizeWithNestedElementsResult.csv
+++ b/Tests/Functional/Datahandler/Localization/Fixtures/CopyToLanguageSorting/LocalizeWithNestedElementsResult.csv
@@ -5,6 +5,6 @@
 ,"3","1","header","child-2-1","768","0","201","2","0","0"
 ,"4","1","header","child-2-2","1024","0","201","2","0","0"
 ,"5","1","b13-2cols-with-header-container","[Translate to English-Free:] container-1","1280","4","0","0","0","1"
-,"6","1","b13-2cols-with-header-container","[Translate to English-Free:] container-2","1408","4","201","5","0","2"
-,"7","1","header","[Translate to English-Free:] child-2-1","1472","4","201","6","0","3"
-,"8","1","header","[Translate to English-Free:] child-2-2","1536","4","201","6","0","4"
\ No newline at end of file
+,"6","1","b13-2cols-with-header-container","[Translate to English-Free:] container-2","1536","4","201","5","0","2"
+,"7","1","header","[Translate to English-Free:] child-2-1","1664","4","201","6","0","3"
+,"8","1","header","[Translate to English-Free:] child-2-2","1792","4","201","6","0","4"
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/copy_child_to_language.csv b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/CopyChildToLanguageFixContainerParent.csv
similarity index 58%
rename from Tests/Functional/Datahandler/Localization/Fixtures/Localize/copy_child_to_language.csv
rename to Tests/Functional/Datahandler/Localization/Fixtures/Localize/CopyChildToLanguageFixContainerParent.csv
index a557c1a0..be4ccafe 100644
--- a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/copy_child_to_language.csv
+++ b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/CopyChildToLanguageFixContainerParent.csv
@@ -4,6 +4,6 @@
 ,2,0,"page-1-language-1","/",1,1,1
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l10n_source"
-,71,1,"b13-2cols-with-header-container","container-language-1",256,0,,,
-,72,1,"header","header-language-1",128,0,200,71,
-,73,1,"b13-2cols-with-header-container","container-language-1",256,1,,,71
\ No newline at end of file
+,71,1,"b13-2cols-with-header-container","container-language-0",256,0,,,
+,72,1,"header","header-language-0",320,0,200,71,
+,73,1,"b13-2cols-with-header-container","container-language-1",384,1,,,71
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/CopyChildToLanguageFixContainerParentResult.csv b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/CopyChildToLanguageFixContainerParentResult.csv
index 5e222be5..3cd2d1ba 100644
--- a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/CopyChildToLanguageFixContainerParentResult.csv
+++ b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/CopyChildToLanguageFixContainerParentResult.csv
@@ -4,7 +4,7 @@
 ,2,0,"page-1-language-1"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,71,1,"b13-2cols-with-header-container","container-language-1",256,0,0,0,0,0
-,72,1,"header","header-language-1",128,0,200,71,0,0
-,73,1,"b13-2cols-with-header-container","container-language-1",256,1,0,0,0,71
-,74,1,"header","[Translate to german:] header-language-1",512,1,200,73,0,72
+,71,1,"b13-2cols-with-header-container","container-language-0",256,0,0,0,0,0
+,72,1,"header","header-language-0",320,0,200,71,0,0
+,73,1,"b13-2cols-with-header-container","container-language-1",384,1,0,0,0,71
+,74,1,"header","[Translate to german:] header-language-0",640,1,200,73,0,72
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/localize_container.csv b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/CopyContainerToLanguageCopiesChildren.csv
similarity index 67%
rename from Tests/Functional/Datahandler/Localization/Fixtures/Localize/localize_container.csv
rename to Tests/Functional/Datahandler/Localization/Fixtures/Localize/CopyContainerToLanguageCopiesChildren.csv
index db76849e..496ff2ed 100644
--- a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/localize_container.csv
+++ b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/CopyContainerToLanguageCopiesChildren.csv
@@ -4,5 +4,5 @@
 ,2,0,"page-1-language-1","/",1,1,1
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
-,1,1,"b13-2cols-with-header-container","container-language-1",256,0,,
-,2,1,"header","header-language-1",128,0,200,1
\ No newline at end of file
+,1,1,"b13-2cols-with-header-container","container-language-1",128,0,0,0
+,2,1,"header","header-language-1",256,0,200,1
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/CopyContainerToLanguageCopiesChildrenResult.csv b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/CopyContainerToLanguageCopiesChildrenResult.csv
index 4082a351..f34f9f74 100644
--- a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/CopyContainerToLanguageCopiesChildrenResult.csv
+++ b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/CopyContainerToLanguageCopiesChildrenResult.csv
@@ -4,7 +4,7 @@
 ,2,0,"page-1-language-1"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","container-language-1",256,0,0,0,0,0
-,2,1,"header","header-language-1",128,0,200,1,0,0
-,3,1,"b13-2cols-with-header-container","[Translate to german:] container-language-1",192,1,0,0,0,1
-,4,1,"header","[Translate to german:] header-language-1",208,1,200,3,0,2
\ No newline at end of file
+,1,1,"b13-2cols-with-header-container","container-language-1",128,0,0,0,0,0
+,2,1,"header","header-language-1",256,0,200,1,0,0
+,3,1,"b13-2cols-with-header-container","[Translate to german:] container-language-1",512,1,0,0,0,1
+,4,1,"header","[Translate to german:] header-language-1",640,1,200,3,0,2
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/copy_to_language_container_from_non_default_language.csv b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/CopyToLanguageContainerFromNonDefaultLanguageLocalizeChildren.csv
similarity index 54%
rename from Tests/Functional/Datahandler/Localization/Fixtures/Localize/copy_to_language_container_from_non_default_language.csv
rename to Tests/Functional/Datahandler/Localization/Fixtures/Localize/CopyToLanguageContainerFromNonDefaultLanguageLocalizeChildren.csv
index c837aef3..89560a2f 100644
--- a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/copy_to_language_container_from_non_default_language.csv
+++ b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/CopyToLanguageContainerFromNonDefaultLanguageLocalizeChildren.csv
@@ -5,7 +5,7 @@
 ,3,0,"page-1-language-2","/",2,1,1
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-language-1",256,0,,,
-,2,1,"header","header-language-1",128,0,200,1,
-,21,1,"b13-2cols-with-header-container","container-language-1",256,1,,,1
-,22,1,"header","header-language-1",128,1,200,1,2
\ No newline at end of file
+,1,1,"b13-2cols-with-header-container","container-language-1",128,0,,,
+,2,1,"header","header-language-1",256,0,200,1,
+,21,1,"b13-2cols-with-header-container","container-language-1",512,1,,,1
+,22,1,"header","header-language-1",1024,1,200,1,2
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/CopyToLanguageContainerFromNonDefaultLanguageLocalizeChildrenResult.csv b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/CopyToLanguageContainerFromNonDefaultLanguageLocalizeChildrenResult.csv
index b4e28018..e74ec51e 100644
--- a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/CopyToLanguageContainerFromNonDefaultLanguageLocalizeChildrenResult.csv
+++ b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/CopyToLanguageContainerFromNonDefaultLanguageLocalizeChildrenResult.csv
@@ -5,9 +5,9 @@
 ,3,0,"page-1-language-2"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","container-language-1",768,0,0,0,0,0
-,2,1,"header","header-language-1",128,0,200,1,0,0
-,21,1,"b13-2cols-with-header-container","container-language-1",768,1,0,0,1,0
-,22,1,"header","header-language-1",128,1,200,1,2,0
-,23,1,"b13-2cols-with-header-container","[Translate to france:] container-language-1",1024,2,0,0,0,21
-,24,1,"header","[Translate to france:] header-language-1",1280,2,200,23,0,22
\ No newline at end of file
+,1,1,"b13-2cols-with-header-container","container-language-1",128,0,0,0,0,0
+,2,1,"header","header-language-1",256,0,200,1,0,0
+,21,1,"b13-2cols-with-header-container","container-language-1",512,1,0,0,1,0
+,22,1,"header","header-language-1",1024,1,200,1,2,0
+,23,1,"b13-2cols-with-header-container","[Translate to france:] container-language-1",1280,2,0,0,0,21
+,24,1,"header","[Translate to france:] header-language-1",1536,2,200,23,0,22
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/copy_to_language_container_from_non_default_language_free_mode.csv b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/CopyToLanguageContainerFromNonDefaultLanguageLocalizeChildrenWhenCopiedFromFreeMode.csv
similarity index 87%
rename from Tests/Functional/Datahandler/Localization/Fixtures/Localize/copy_to_language_container_from_non_default_language_free_mode.csv
rename to Tests/Functional/Datahandler/Localization/Fixtures/Localize/CopyToLanguageContainerFromNonDefaultLanguageLocalizeChildrenWhenCopiedFromFreeMode.csv
index 18ad1662..e076af83 100644
--- a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/copy_to_language_container_from_non_default_language_free_mode.csv
+++ b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/CopyToLanguageContainerFromNonDefaultLanguageLocalizeChildrenWhenCopiedFromFreeMode.csv
@@ -6,4 +6,4 @@
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
 ,51,1,"b13-2cols-with-header-container","container-language-1",256,1,,
-,52,1,"header","header-language-1",257,1,200,51
\ No newline at end of file
+,52,1,"header","header-language-1",769,1,200,51
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/CopyToLanguageContainerFromNonDefaultLanguageLocalizeChildrenWhenCopiedFromFreeModeResult.csv b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/CopyToLanguageContainerFromNonDefaultLanguageLocalizeChildrenWhenCopiedFromFreeModeResult.csv
index bfbcba22..90fe40fd 100644
--- a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/CopyToLanguageContainerFromNonDefaultLanguageLocalizeChildrenWhenCopiedFromFreeModeResult.csv
+++ b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/CopyToLanguageContainerFromNonDefaultLanguageLocalizeChildrenWhenCopiedFromFreeModeResult.csv
@@ -6,6 +6,6 @@
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
 ,51,1,"b13-2cols-with-header-container","container-language-1",256,1,0,0,0,0
-,52,1,"header","header-language-1",257,1,200,51,0,0
-,53,1,"b13-2cols-with-header-container","[Translate to france:] container-language-1",513,2,0,0,0,51
-,54,1,"header","[Translate to france:] header-language-1",641,2,200,53,0,52
\ No newline at end of file
+,52,1,"header","header-language-1",769,1,200,51,0,0
+,53,1,"b13-2cols-with-header-container","[Translate to france:] container-language-1",1025,2,0,0,0,51
+,54,1,"header","[Translate to france:] header-language-1",1153,2,200,53,0,52
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/localize_child_failed_if_container_is_in_free_mode.csv b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeChildFailedIfContainerIsInFreeMode.csv
similarity index 84%
rename from Tests/Functional/Datahandler/Localization/Fixtures/Localize/localize_child_failed_if_container_is_in_free_mode.csv
rename to Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeChildFailedIfContainerIsInFreeMode.csv
index a557c1a0..ef5c1bf7 100644
--- a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/localize_child_failed_if_container_is_in_free_mode.csv
+++ b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeChildFailedIfContainerIsInFreeMode.csv
@@ -4,6 +4,6 @@
 ,2,0,"page-1-language-1","/",1,1,1
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l10n_source"
-,71,1,"b13-2cols-with-header-container","container-language-1",256,0,,,
+,71,1,"b13-2cols-with-header-container","container-language-1",64,0,,,
 ,72,1,"header","header-language-1",128,0,200,71,
 ,73,1,"b13-2cols-with-header-container","container-language-1",256,1,,,71
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeChildFailedIfContainerIsInFreeModeResult.csv b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeChildFailedIfContainerIsInFreeModeResult.csv
index d08d324f..f8721869 100644
--- a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeChildFailedIfContainerIsInFreeModeResult.csv
+++ b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeChildFailedIfContainerIsInFreeModeResult.csv
@@ -4,6 +4,6 @@
 ,2,0,"page-1-language-1"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,71,1,"b13-2cols-with-header-container","container-language-1",256,0,0,0,0,0
+,71,1,"b13-2cols-with-header-container","container-language-1",64,0,0,0,0,0
 ,72,1,"header","header-language-1",128,0,200,71,0,0
 ,73,1,"b13-2cols-with-header-container","container-language-1",256,1,0,0,0,71
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/localize_child_failed_if_container_is_not_translated.csv b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeChildFailedIfContainerIsNotTranslated.csv
similarity index 80%
rename from Tests/Functional/Datahandler/Localization/Fixtures/Localize/localize_child_failed_if_container_is_not_translated.csv
rename to Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeChildFailedIfContainerIsNotTranslated.csv
index 21154eac..1dd9a10a 100644
--- a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/localize_child_failed_if_container_is_not_translated.csv
+++ b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeChildFailedIfContainerIsNotTranslated.csv
@@ -4,5 +4,5 @@
 ,2,0,"page-1-language-1","/",1,1,1
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
-,71,1,"b13-2cols-with-header-container","container-language-1",256,0,,
+,71,1,"b13-2cols-with-header-container","container-language-1",64,0,,
 ,72,1,"header","header-language-1",128,0,200,71
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeChildFailedIfContainerIsNotTranslatedResult.csv b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeChildFailedIfContainerIsNotTranslatedResult.csv
index aa85bf04..5f6e6f47 100644
--- a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeChildFailedIfContainerIsNotTranslatedResult.csv
+++ b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeChildFailedIfContainerIsNotTranslatedResult.csv
@@ -4,5 +4,5 @@
 ,2,0,"page-1-language-1"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,71,1,"b13-2cols-with-header-container","container-language-1",256,0,0,0,0,0
+,71,1,"b13-2cols-with-header-container","container-language-1",64,0,0,0,0,0
 ,72,1,"header","header-language-1",128,0,200,71,0,0
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/localize_child_keeps_relation_if_container_is_in_connected_mode.csv b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeChildKeepsRelationsIfContainerIsInConnectedMode.csv
similarity index 70%
rename from Tests/Functional/Datahandler/Localization/Fixtures/Localize/localize_child_keeps_relation_if_container_is_in_connected_mode.csv
rename to Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeChildKeepsRelationsIfContainerIsInConnectedMode.csv
index 1d221354..20253cb7 100644
--- a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/localize_child_keeps_relation_if_container_is_in_connected_mode.csv
+++ b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeChildKeepsRelationsIfContainerIsInConnectedMode.csv
@@ -4,6 +4,6 @@
 ,2,0,"page-1-language-1","/",1,1,1
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l10n_source","l18n_parent"
-,81,1,"b13-2cols-with-header-container","container-language-1",256,0,,,,
-,82,1,"header","header-language-1",128,0,200,81,,
-,83,1,"b13-2cols-with-header-container","container-language-1",256,1,,,81,81
\ No newline at end of file
+,81,1,"b13-2cols-with-header-container","container-language-1",256,0,0,0,0,0
+,82,1,"header","header-language-1",384,0,200,81,0,0
+,83,1,"b13-2cols-with-header-container","container-language-1",512,1,,,81,81
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeChildKeepsRelationsIfContainerIsInConnectedModeResult.csv b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeChildKeepsRelationsIfContainerIsInConnectedModeResult.csv
index f41c251d..0e7fa471 100644
--- a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeChildKeepsRelationsIfContainerIsInConnectedModeResult.csv
+++ b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeChildKeepsRelationsIfContainerIsInConnectedModeResult.csv
@@ -5,6 +5,7 @@
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
 ,81,1,"b13-2cols-with-header-container","container-language-1",256,0,0,0,0,0
-,82,1,"header","header-language-1",128,0,200,81,0,0
-,83,1,"b13-2cols-with-header-container","container-language-1",256,1,0,0,81,81
-,84,1,"header","[Translate to german:] header-language-1",192,1,200,81,82,82
+,82,1,"header","header-language-1",384,0,200,81,0,0
+,83,1,"b13-2cols-with-header-container","container-language-1",512,1,0,0,81,81
+,84,1,"header","[Translate to german:] header-language-1",448,1,200,81,82,82
+# NOTE localized container childrens sorting is after localized container
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/localize_container_from_non_default_language.csv b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeContainerFromNonDefaultLanguageLocalizeChildren.csv
similarity index 67%
rename from Tests/Functional/Datahandler/Localization/Fixtures/Localize/localize_container_from_non_default_language.csv
rename to Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeContainerFromNonDefaultLanguageLocalizeChildren.csv
index 1bbd5f73..adb2d386 100644
--- a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/localize_container_from_non_default_language.csv
+++ b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeContainerFromNonDefaultLanguageLocalizeChildren.csv
@@ -5,7 +5,7 @@
 ,3,0,"page-1-language-2","/",2,1,1
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent"
-,1,1,"b13-2cols-with-header-container","container-language-1",256,0,,,
-,2,1,"header","header",128,0,200,1,
-,21,1,"b13-2cols-with-header-container","container-language-1",256,1,,,1
-,22,1,"header","header-language-1",128,1,200,1,2
\ No newline at end of file
+,1,1,"b13-2cols-with-header-container","container-language-1",256,0,0,0,0
+,2,1,"header","header",384,0,200,1,0
+,21,1,"b13-2cols-with-header-container","container-language-1",512,1,,,1
+,22,1,"header","header-language-1",448,1,200,1,2
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeContainerFromNonDefaultLanguageLocalizeChildrenResult.csv b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeContainerFromNonDefaultLanguageLocalizeChildrenResult.csv
index 53de0055..c5be5949 100644
--- a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeContainerFromNonDefaultLanguageLocalizeChildrenResult.csv
+++ b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeContainerFromNonDefaultLanguageLocalizeChildrenResult.csv
@@ -5,9 +5,10 @@
 ,3,0,"page-1-language-2"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","container-language-1",768,0,0,0,0,0
-,2,1,"header","header",128,0,200,1,0,0
-,21,1,"b13-2cols-with-header-container","container-language-1",768,1,0,0,1,0
-,22,1,"header","header-language-1",128,1,200,1,2,0
-,23,1,"b13-2cols-with-header-container","[Translate to france:] container-language-1",1024,2,0,0,1,21
-,24,1,"header","[Translate to france:] header-language-1",384,2,200,1,2,22
+,1,1,"b13-2cols-with-header-container","container-language-1",256,0,0,0,0,0
+,2,1,"header","header",384,0,200,1,0,0
+,21,1,"b13-2cols-with-header-container","container-language-1",512,1,0,0,1,0
+,22,1,"header","header-language-1",448,1,200,1,2,0
+,23,1,"b13-2cols-with-header-container","[Translate to france:] container-language-1",768,2,0,0,1,21
+,24,1,"header","[Translate to france:] header-language-1",480,2,200,1,2,22
+# same LocalizeChildKeepsRelationsIfContainerIsInConnectedMode
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/copy_container_to_language.csv b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeContainerLocalizeChildren.csv
similarity index 67%
rename from Tests/Functional/Datahandler/Localization/Fixtures/Localize/copy_container_to_language.csv
rename to Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeContainerLocalizeChildren.csv
index db76849e..496ff2ed 100644
--- a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/copy_container_to_language.csv
+++ b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeContainerLocalizeChildren.csv
@@ -4,5 +4,5 @@
 ,2,0,"page-1-language-1","/",1,1,1
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
-,1,1,"b13-2cols-with-header-container","container-language-1",256,0,,
-,2,1,"header","header-language-1",128,0,200,1
\ No newline at end of file
+,1,1,"b13-2cols-with-header-container","container-language-1",128,0,0,0
+,2,1,"header","header-language-1",256,0,200,1
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeContainerLocalizeChildrenResult.csv b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeContainerLocalizeChildrenResult.csv
index b57c1206..c45cee14 100644
--- a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeContainerLocalizeChildrenResult.csv
+++ b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeContainerLocalizeChildrenResult.csv
@@ -4,7 +4,7 @@
 ,2,0,"page-1-language-1"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,1,1,"b13-2cols-with-header-container","container-language-1",256,0,0,0,0,0
-,2,1,"header","header-language-1",128,0,200,1,0,0
+,1,1,"b13-2cols-with-header-container","container-language-1",128,0,0,0,0,0
+,2,1,"header","header-language-1",256,0,200,1,0,0
 ,3,1,"b13-2cols-with-header-container","[Translate to german:] container-language-1",192,1,0,0,1,1
-,4,1,"header","[Translate to german:] header-language-1",160,1,200,1,2,2
+,4,1,"header","[Translate to german:] header-language-1",512,1,200,1,2,2
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/localize_container_keeps_parent_indepented_on_order.csv b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeTwoContainerKeepsParentIndependedOnOrder.csv
similarity index 54%
rename from Tests/Functional/Datahandler/Localization/Fixtures/Localize/localize_container_keeps_parent_indepented_on_order.csv
rename to Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeTwoContainerKeepsParentIndependedOnOrder.csv
index f006fa9d..b83b20a0 100644
--- a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/localize_container_keeps_parent_indepented_on_order.csv
+++ b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeTwoContainerKeepsParentIndependedOnOrder.csv
@@ -4,7 +4,7 @@
 ,2,0,"page-1-language-1","/",1,1,1
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
-,1,1,"b13-2cols-with-header-container","container-language-1",256,0,,
+,1,1,"b13-2cols-with-header-container","container-language-1",64,0,0,0
 ,2,1,"header","header-language-1",128,0,200,1
-,91,1,"b13-2cols-with-header-container","second-container",1028,,,
-,92,1,"header","child-in-second-container-with-sorting-before-children-in-first-container",1,0,200,91
\ No newline at end of file
+,91,1,"b13-2cols-with-header-container","second-container",256,0,0,0
+,92,1,"header","child-in-second-container",512,0,200,91
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeTwoContainerKeepsParentIndependedOnOrderDataset1Result.csv b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeTwoContainerKeepsParentIndependedOnOrderDataset1Result.csv
index 8d63c75f..fa31437c 100644
--- a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeTwoContainerKeepsParentIndependedOnOrderDataset1Result.csv
+++ b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeTwoContainerKeepsParentIndependedOnOrderDataset1Result.csv
@@ -7,8 +7,9 @@
 ,1,1,"b13-2cols-with-header-container","container-language-1",0,0,0,0,0
 ,2,1,"header","header-language-1",0,200,1,0,0
 ,91,1,"b13-2cols-with-header-container","second-container",0,0,0,0,0
-,92,1,"header","child-in-second-container-with-sorting-before-children-in-first-container",0,200,91,0,0
+,92,1,"header","child-in-second-container",0,200,91,0,0
 ,93,1,"b13-2cols-with-header-container","[Translate to german:] second-container",1,0,0,91,91
-,94,1,"header","[Translate to german:] child-in-second-container-with-sorting-before-children-in-first-container",1,200,91,92,92
+,94,1,"header","[Translate to german:] child-in-second-container",1,200,91,92,92
 ,95,1,"b13-2cols-with-header-container","[Translate to german:] container-language-1",1,0,0,1,1
 ,96,1,"header","[Translate to german:] header-language-1",1,200,1,2,2
+# NOTE no sort tests here
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeTwoContainerKeepsParentIndependedOnOrderDataset2Result.csv b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeTwoContainerKeepsParentIndependedOnOrderDataset2Result.csv
index b098a7a1..7c4b1209 100644
--- a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeTwoContainerKeepsParentIndependedOnOrderDataset2Result.csv
+++ b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeTwoContainerKeepsParentIndependedOnOrderDataset2Result.csv
@@ -7,8 +7,8 @@
 ,1,1,"b13-2cols-with-header-container","container-language-1",0,0,0,0,0
 ,2,1,"header","header-language-1",0,200,1,0,0
 ,91,1,"b13-2cols-with-header-container","second-container",0,0,0,0,0
-,92,1,"header","child-in-second-container-with-sorting-before-children-in-first-container",0,200,91,0,0
+,92,1,"header","child-in-second-container",0,200,91,0,0
 ,93,1,"b13-2cols-with-header-container","[Translate to german:] container-language-1",1,0,0,1,1
 ,94,1,"header","[Translate to german:] header-language-1",1,200,1,2,2
 ,95,1,"b13-2cols-with-header-container","[Translate to german:] second-container",1,0,0,91,91
-,96,1,"header","[Translate to german:] child-in-second-container-with-sorting-before-children-in-first-container",1,200,91,92,92
+,96,1,"header","[Translate to german:] child-in-second-container",1,200,91,92,92
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeWithCopyTwoContainerChangeParentIndependedOnOrder.csv b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeWithCopyTwoContainerChangeParentIndependedOnOrder.csv
new file mode 100644
index 00000000..b83b20a0
--- /dev/null
+++ b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeWithCopyTwoContainerChangeParentIndependedOnOrder.csv
@@ -0,0 +1,10 @@
+"pages"
+,"uid","pid","title","slug","sys_language_uid","l10n_parent","l10n_source"
+,1,0,"page-1","/",,,
+,2,0,"page-1-language-1","/",1,1,1
+"tt_content"
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-language-1",64,0,0,0
+,2,1,"header","header-language-1",128,0,200,1
+,91,1,"b13-2cols-with-header-container","second-container",256,0,0,0
+,92,1,"header","child-in-second-container",512,0,200,91
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeWithCopyTwoContainerChangeParentIndependedOnOrderDataset1Result.csv b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeWithCopyTwoContainerChangeParentIndependedOnOrderDataset1Result.csv
index 086b6aef..713bd5bd 100644
--- a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeWithCopyTwoContainerChangeParentIndependedOnOrderDataset1Result.csv
+++ b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeWithCopyTwoContainerChangeParentIndependedOnOrderDataset1Result.csv
@@ -7,8 +7,9 @@
 ,1,1,"b13-2cols-with-header-container","container-language-1",0,0,0,0,0
 ,2,1,"header","header-language-1",0,200,1,0,0
 ,91,1,"b13-2cols-with-header-container","second-container",0,0,0,0,0
-,92,1,"header","child-in-second-container-with-sorting-before-children-in-first-container",0,200,91,0,0
+,92,1,"header","child-in-second-container",0,200,91,0,0
 ,93,1,"b13-2cols-with-header-container","[Translate to german:] second-container",1,0,0,0,91
-,94,1,"header","[Translate to german:] child-in-second-container-with-sorting-before-children-in-first-container",1,200,93,0,92
+,94,1,"header","[Translate to german:] child-in-second-container",1,200,93,0,92
 ,95,1,"b13-2cols-with-header-container","[Translate to german:] container-language-1",1,0,0,0,1
 ,96,1,"header","[Translate to german:] header-language-1",1,200,95,0,2
+# NOTE: no sort test here
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeWithCopyTwoContainerChangeParentIndependedOnOrderDataset2Result.csv b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeWithCopyTwoContainerChangeParentIndependedOnOrderDataset2Result.csv
index 5f83a57f..f0786a54 100644
--- a/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeWithCopyTwoContainerChangeParentIndependedOnOrderDataset2Result.csv
+++ b/Tests/Functional/Datahandler/Localization/Fixtures/Localize/LocalizeWithCopyTwoContainerChangeParentIndependedOnOrderDataset2Result.csv
@@ -7,8 +7,8 @@
 ,1,1,"b13-2cols-with-header-container","container-language-1",0,0,0,0,0
 ,2,1,"header","header-language-1",0,200,1,0,0
 ,91,1,"b13-2cols-with-header-container","second-container",0,0,0,0,0
-,92,1,"header","child-in-second-container-with-sorting-before-children-in-first-container",0,200,91,0,0
+,92,1,"header","child-in-second-container",0,200,91,0,0
 ,93,1,"b13-2cols-with-header-container","[Translate to german:] container-language-1",1,0,0,0,1
 ,94,1,"header","[Translate to german:] header-language-1",1,200,93,0,2
 ,95,1,"b13-2cols-with-header-container","[Translate to german:] second-container",1,0,0,0,91
-,96,1,"header","[Translate to german:] child-in-second-container-with-sorting-before-children-in-first-container",1,200,95,0,92
+,96,1,"header","[Translate to german:] child-in-second-container",1,200,95,0,92
diff --git a/Tests/Functional/Datahandler/Localization/FreeMode/ContainerTest.php b/Tests/Functional/Datahandler/Localization/FreeMode/ContainerTest.php
index 7185507a..5a7f5314 100644
--- a/Tests/Functional/Datahandler/Localization/FreeMode/ContainerTest.php
+++ b/Tests/Functional/Datahandler/Localization/FreeMode/ContainerTest.php
@@ -21,7 +21,7 @@ class ContainerTest extends AbstractDatahandler
      */
     public function deleteContainerDeleteChildren(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Container/setup.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Container/DeleteContainerDeleteChildren.csv');
         $cmdmap = [
             'tt_content' => [
                 51 => [
@@ -39,7 +39,7 @@ public function deleteContainerDeleteChildren(): void
      */
     public function moveContainerToOtherPageMovesChildren(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Container/setup.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Container/MoveContainerToOtherPageMovesChildren.csv');
         $cmdmap = [
             'tt_content' => [
                 51 => [
@@ -65,7 +65,7 @@ public function moveContainerToOtherPageMovesChildren(): void
      */
     public function copyContainerCopiesChildren(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Container/setup.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Container/CopyContainerCopiesChildren.csv');
         $cmdmap = [
             'tt_content' => [
                 51 => [
@@ -89,7 +89,7 @@ public function copyContainerCopiesChildren(): void
      */
     public function copyContainerToOtherLanguageCopiesChildren(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Container/setup.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Container/CopyContainerToOtherLanguageCopiesChildren.csv');
         $cmdmap = [
             'tt_content' => [
                 51 => [
@@ -98,7 +98,7 @@ public function copyContainerToOtherLanguageCopiesChildren(): void
                         'target' => 3,
                         'update' => [
                             'colPos' => 0,
-                            'sys_language_uid' => 0,
+                            'sys_language_uid' => 1,
                         ],
                     ],
                 ],
@@ -109,12 +109,37 @@ public function copyContainerToOtherLanguageCopiesChildren(): void
         self::assertCSVDataSet(__DIR__ . '/Fixtures/Container/CopyContainerToOtherLanguageCopiesChildrenResult.csv');
     }
 
+    /**
+     * @test
+     */
+    public function copyContainerToDefaultLanguage(): void
+    {
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Container/CopyContainerToDefaultLanguage.csv');
+        $cmdmap = [
+            'tt_content' => [
+                51 => [
+                    'copy' => [
+                        'action' => 'paste',
+                        'target' => 3,
+                        'update' => [
+                            'colPos' => 0,
+                            'sys_language_uid' => 0,
+                        ],
+                    ],
+                ],
+            ],
+        ];
+        $this->dataHandler->start([], $cmdmap, $this->backendUser);
+        $this->dataHandler->process_cmdmap();
+        self::assertCSVDataSet(__DIR__ . '/Fixtures/Container/CopyContainerToDefaultLanguageResult.csv');
+    }
+
     /**
      * @test
      */
     public function copyContainerToOtherLanguageCopiesNestedChildren(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Container/setup.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Container/CopyContainerToOtherLanguageCopiesNestedChildren.csv');
         $cmdmap = [
             'tt_content' => [
                 55 => [
@@ -139,7 +164,7 @@ public function copyContainerToOtherLanguageCopiesNestedChildren(): void
      */
     public function moveContainerToOtherLanguageMovesChildren(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Container/setup.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Container/MoveContainerToOtherLanguageMovesChildren.csv');
         $cmdmap = [
             'tt_content' => [
                 51 => [
@@ -148,7 +173,7 @@ public function moveContainerToOtherLanguageMovesChildren(): void
                         'target' => 3,
                         'update' => [
                             'colPos' => 0,
-                            'sys_language_uid' => 0,
+                            'sys_language_uid' => 1,
 
                         ],
                     ],
@@ -159,4 +184,30 @@ public function moveContainerToOtherLanguageMovesChildren(): void
         $this->dataHandler->process_cmdmap();
         self::assertCSVDataSet(__DIR__ . '/Fixtures/Container/MoveContainerToOtherLanguageMovesChildrenResult.csv');
     }
+
+    /**
+     * @test
+     */
+    public function moveContainerToDefaultLanguage(): void
+    {
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Container/MoveContainerToDefaultLanguage.csv');
+        $cmdmap = [
+            'tt_content' => [
+                51 => [
+                    'move' => [
+                        'action' => 'paste',
+                        'target' => 3,
+                        'update' => [
+                            'colPos' => 0,
+                            'sys_language_uid' => 0,
+
+                        ],
+                    ],
+                ],
+            ],
+        ];
+        $this->dataHandler->start([], $cmdmap, $this->backendUser);
+        $this->dataHandler->process_cmdmap();
+        self::assertCSVDataSet(__DIR__ . '/Fixtures/Container/MoveContainerToDefaultLanguageResult.csv');
+    }
 }
diff --git a/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/CopyContainerCopiesChildren.csv b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/CopyContainerCopiesChildren.csv
new file mode 100644
index 00000000..beea1aca
--- /dev/null
+++ b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/CopyContainerCopiesChildren.csv
@@ -0,0 +1,12 @@
+"pages"
+,"uid","pid","title","slug","sys_language_uid","l10n_parent","l10n_source",is_siteroot
+,1,0,"page-1","/",0,0,0,1
+,2,0,"page-1-language-1","/",1,1,1,0
+,3,1,"page-2","/page-2",0,0,0,0
+,4,1,"page-2-language-1","/page-2",1,3,3,0
+"tt_content"
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,51,1,"b13-2cols-with-header-container","container-3",1024,1,0,0
+,52,1,"header","container-3-child-header",1280,1,200,51
+,53,1,"header","container-3-child-left",1536,1,201,51
+,54,1,"header","outside",1792,1,0,0
diff --git a/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/CopyContainerCopiesChildrenResult.csv b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/CopyContainerCopiesChildrenResult.csv
index af32dfc7..7532caa7 100644
--- a/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/CopyContainerCopiesChildrenResult.csv
+++ b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/CopyContainerCopiesChildrenResult.csv
@@ -1,18 +1,9 @@
-"pages"
-,"uid","pid","title"
-,1,0,"page-1"
-,2,0,"page-1-language-1"
-,3,0,"page-2"
-,4,0,"page-2-language-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,51,1,"b13-2cols-with-header-container","container-language-1",256,1,0,0,0,0
-,52,1,"header-language-1","header",257,1,200,51,0,0
-,53,1,"header","left-side-language-1",258,1,201,51,0,0
-,54,1,"header","outside",512,1,0,0,0,0
-,55,1,"b13-2cols-with-header-container","",64,1,0,0,0,0
-,56,1,"b13-2cols-with-header-container","header",128,1,201,55,0,0
-,57,1,"header","",256,1,200,56,0,0
-,58,3,"b13-2cols-with-header-container","container-language-1",256,1,0,0,0,0
-,59,3,"header-language-1","header",512,1,200,58,0,0
-,60,3,"header","left-side-language-1",768,1,201,58,0,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,51,1,"b13-2cols-with-header-container","container-3",1024,1,0,0
+,52,1,"header","container-3-child-header",1280,1,200,51
+,53,1,"header","container-3-child-left",1536,1,201,51
+,54,1,"header","outside",1792,1,0,0
+,55,3,"b13-2cols-with-header-container","container-3",256,1,0,0
+,56,3,"header","container-3-child-header",512,1,200,55
+,57,3,"header","container-3-child-left",768,1,201,55
diff --git a/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/CopyContainerToDefaultLanguage.csv b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/CopyContainerToDefaultLanguage.csv
new file mode 100644
index 00000000..beea1aca
--- /dev/null
+++ b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/CopyContainerToDefaultLanguage.csv
@@ -0,0 +1,12 @@
+"pages"
+,"uid","pid","title","slug","sys_language_uid","l10n_parent","l10n_source",is_siteroot
+,1,0,"page-1","/",0,0,0,1
+,2,0,"page-1-language-1","/",1,1,1,0
+,3,1,"page-2","/page-2",0,0,0,0
+,4,1,"page-2-language-1","/page-2",1,3,3,0
+"tt_content"
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,51,1,"b13-2cols-with-header-container","container-3",1024,1,0,0
+,52,1,"header","container-3-child-header",1280,1,200,51
+,53,1,"header","container-3-child-left",1536,1,201,51
+,54,1,"header","outside",1792,1,0,0
diff --git a/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/CopyContainerToDefaultLanguageResult.csv b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/CopyContainerToDefaultLanguageResult.csv
new file mode 100644
index 00000000..641bcbae
--- /dev/null
+++ b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/CopyContainerToDefaultLanguageResult.csv
@@ -0,0 +1,9 @@
+"tt_content"
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,51,1,"b13-2cols-with-header-container","container-3",1024,1,0,0
+,52,1,"header","container-3-child-header",1280,1,200,51
+,53,1,"header","container-3-child-left",1536,1,201,51
+,54,1,"header","outside",1792,1,0,0
+,55,3,"b13-2cols-with-header-container","container-3",256,0,0,0
+,56,3,"header","container-3-child-header",512,0,200,55
+,57,3,"header","container-3-child-left",768,0,201,55
diff --git a/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/CopyContainerToOtherLanguageCopiesChildren.csv b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/CopyContainerToOtherLanguageCopiesChildren.csv
new file mode 100644
index 00000000..6493902e
--- /dev/null
+++ b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/CopyContainerToOtherLanguageCopiesChildren.csv
@@ -0,0 +1,12 @@
+"pages"
+,"uid","pid","title","slug","sys_language_uid","l10n_parent","l10n_source",is_siteroot
+,1,0,"page-1","/",0,0,0,1
+,2,0,"page-1-language-1","/",1,1,1,0
+,3,1,"page-2","/page-2",0,0,0,0
+,4,1,"page-2-language-1","/page-2",1,3,3,0
+"tt_content"
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,51,1,"b13-2cols-with-header-container","container-3",1024,0,0,0
+,52,1,"header","container-3-child-header",1280,0,200,51
+,53,1,"header","container-3-child-left",1536,0,201,51
+,54,1,"header","outside",1792,0,0,0
diff --git a/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/CopyContainerToOtherLanguageCopiesChildrenResult.csv b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/CopyContainerToOtherLanguageCopiesChildrenResult.csv
index 0e935724..7d175bfc 100644
--- a/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/CopyContainerToOtherLanguageCopiesChildrenResult.csv
+++ b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/CopyContainerToOtherLanguageCopiesChildrenResult.csv
@@ -1,18 +1,9 @@
-"pages"
-,"uid","pid","title"
-,1,0,"page-1"
-,2,0,"page-1-language-1"
-,3,0,"page-2"
-,4,0,"page-2-language-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,51,1,"b13-2cols-with-header-container","container-language-1",256,1,0,0,0,0
-,52,1,"header-language-1","header",257,1,200,51,0,0
-,53,1,"header","left-side-language-1",258,1,201,51,0,0
-,54,1,"header","outside",512,1,0,0,0,0
-,55,1,"b13-2cols-with-header-container","",64,1,0,0,0,0
-,56,1,"b13-2cols-with-header-container","header",128,1,201,55,0,0
-,57,1,"header","",256,1,200,56,0,0
-,58,3,"b13-2cols-with-header-container","container-language-1",256,0,0,0,0,0
-,59,3,"header-language-1","header",512,0,200,58,0,0
-,60,3,"header","left-side-language-1",384,0,201,58,0,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,51,1,"b13-2cols-with-header-container","container-3",1024,0,0,0
+,52,1,"header","container-3-child-header",1280,0,200,51
+,53,1,"header","container-3-child-left",1536,0,201,51
+,54,1,"header","outside",1792,0,0,0
+,55,3,"b13-2cols-with-header-container","container-3",256,1,0,0
+,56,3,"header","container-3-child-header",512,1,200,55
+,57,3,"header","container-3-child-left",768,1,201,55
diff --git a/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/CopyContainerToOtherLanguageCopiesNestedChildren.csv b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/CopyContainerToOtherLanguageCopiesNestedChildren.csv
new file mode 100644
index 00000000..065641e1
--- /dev/null
+++ b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/CopyContainerToOtherLanguageCopiesNestedChildren.csv
@@ -0,0 +1,12 @@
+"pages"
+,"uid","pid","title","slug","sys_language_uid","l10n_parent","l10n_source",is_siteroot
+,1,0,"page-1","/",0,0,0,1
+,2,0,"page-1-language-1","/",1,1,1,0
+,3,1,"page-2","/page-2",0,0,0,0
+,4,1,"page-2-language-1","/page-2",1,3,3,0
+"tt_content"
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,55,1,"b13-2cols-with-header-container",container-1,256,1,0,0
+,56,1,"b13-2cols-with-header-container","container-1-child-left-container-2",512,1,201,55
+,57,1,"header","container-2-child-header",768,1,200,56
+,54,1,"header","outside",1792,1,0,0
diff --git a/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/CopyContainerToOtherLanguageCopiesNestedChildrenResult.csv b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/CopyContainerToOtherLanguageCopiesNestedChildrenResult.csv
index a677f8e0..bb1f55f5 100644
--- a/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/CopyContainerToOtherLanguageCopiesNestedChildrenResult.csv
+++ b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/CopyContainerToOtherLanguageCopiesNestedChildrenResult.csv
@@ -1,18 +1,9 @@
-"pages"
-,"uid","pid","title"
-,1,0,"page-1"
-,2,0,"page-1-language-1"
-,3,0,"page-2"
-,4,0,"page-2-language-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,51,1,"b13-2cols-with-header-container","container-language-1",256,1,0,0,0,0
-,52,1,"header-language-1","header",257,1,200,51,0,0
-,53,1,"header","left-side-language-1",258,1,201,51,0,0
-,54,1,"header","outside",512,1,0,0,0,0
-,55,1,"b13-2cols-with-header-container","",64,1,0,0,0,0
-,56,1,"b13-2cols-with-header-container","header",128,1,201,55,0,0
-,57,1,"header","",256,1,200,56,0,0
-,58,3,"b13-2cols-with-header-container","",256,0,0,0,0,0
-,59,3,"b13-2cols-with-header-container","header",512,0,201,58,0,0
-,60,3,"header"," (copy 1)",768,0,200,59,0,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,55,1,"b13-2cols-with-header-container",container-1,256,1,0,0
+,56,1,"b13-2cols-with-header-container","container-1-child-left-container-2",512,1,201,55
+,57,1,"header","container-2-child-header",768,1,200,56
+,54,1,"header","outside",1792,1,0,0
+,58,3,"b13-2cols-with-header-container","container-1",256,0,0,0
+,59,3,"b13-2cols-with-header-container","container-1-child-left-container-2",512,0,201,58
+,60,3,"header","container-2-child-header",768,0,200,59
diff --git a/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/DeleteContainerDeleteChildren.csv b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/DeleteContainerDeleteChildren.csv
new file mode 100644
index 00000000..80f3f0a5
--- /dev/null
+++ b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/DeleteContainerDeleteChildren.csv
@@ -0,0 +1,10 @@
+"pages"
+,"uid","pid","title","slug","sys_language_uid","l10n_parent","l10n_source",is_siteroot
+,1,0,"page-1","/",0,0,0,1
+,2,0,"page-1-language-1","/",1,1,1,0
+"tt_content"
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","deleted"
+,51,1,"b13-2cols-with-header-container","container-3",1024,1,0,0,0
+,52,1,"header","container-3-child-header",1280,1,200,51,0
+,53,1,"header","container-3-child-left",1536,1,201,51,0
+,54,1,"header","outside",1792,1,0,0,0
diff --git a/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/DeleteContainerDeleteChildrenResult.csv b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/DeleteContainerDeleteChildrenResult.csv
index 90d67484..9ba01391 100644
--- a/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/DeleteContainerDeleteChildrenResult.csv
+++ b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/DeleteContainerDeleteChildrenResult.csv
@@ -1,15 +1,6 @@
-"pages"
-,"uid","pid","title"
-,1,0,"page-1"
-,2,0,"page-1-language-1"
-,3,0,"page-2"
-,4,0,"page-2-language-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,51,1,"b13-2cols-with-header-container","container-language-1",256,1,0,0,0,0
-,52,1,"header-language-1","header",257,1,200,51,0,0
-,53,1,"header","left-side-language-1",258,1,201,51,0,0
-,54,1,"header","outside",512,1,0,0,0,0
-,55,1,"b13-2cols-with-header-container","",64,1,0,0,0,0
-,56,1,"b13-2cols-with-header-container","header",128,1,201,55,0,0
-,57,1,"header","",256,1,200,56,0,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","deleted"
+,51,1,"b13-2cols-with-header-container","container-3",1024,1,0,0,1
+,52,1,"header","container-3-child-header",1280,1,200,51,1
+,53,1,"header","container-3-child-left",1536,1,201,51,1
+,54,1,"header","outside",1792,1,0,0,0
diff --git a/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/MoveContainerToDefaultLanguage.csv b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/MoveContainerToDefaultLanguage.csv
new file mode 100644
index 00000000..beea1aca
--- /dev/null
+++ b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/MoveContainerToDefaultLanguage.csv
@@ -0,0 +1,12 @@
+"pages"
+,"uid","pid","title","slug","sys_language_uid","l10n_parent","l10n_source",is_siteroot
+,1,0,"page-1","/",0,0,0,1
+,2,0,"page-1-language-1","/",1,1,1,0
+,3,1,"page-2","/page-2",0,0,0,0
+,4,1,"page-2-language-1","/page-2",1,3,3,0
+"tt_content"
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,51,1,"b13-2cols-with-header-container","container-3",1024,1,0,0
+,52,1,"header","container-3-child-header",1280,1,200,51
+,53,1,"header","container-3-child-left",1536,1,201,51
+,54,1,"header","outside",1792,1,0,0
diff --git a/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/MoveContainerToDefaultLanguageResult.csv b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/MoveContainerToDefaultLanguageResult.csv
new file mode 100644
index 00000000..d524b0fc
--- /dev/null
+++ b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/MoveContainerToDefaultLanguageResult.csv
@@ -0,0 +1,6 @@
+"tt_content"
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,51,3,"b13-2cols-with-header-container","container-3",256,0,0,0
+,52,3,"header","container-3-child-header",512,0,200,51
+,53,3,"header","container-3-child-left",768,0,201,51
+,54,1,"header","outside",1792,1,0,0
diff --git a/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/MoveContainerToOtherLanguageMovesChildren.csv b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/MoveContainerToOtherLanguageMovesChildren.csv
new file mode 100644
index 00000000..6493902e
--- /dev/null
+++ b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/MoveContainerToOtherLanguageMovesChildren.csv
@@ -0,0 +1,12 @@
+"pages"
+,"uid","pid","title","slug","sys_language_uid","l10n_parent","l10n_source",is_siteroot
+,1,0,"page-1","/",0,0,0,1
+,2,0,"page-1-language-1","/",1,1,1,0
+,3,1,"page-2","/page-2",0,0,0,0
+,4,1,"page-2-language-1","/page-2",1,3,3,0
+"tt_content"
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,51,1,"b13-2cols-with-header-container","container-3",1024,0,0,0
+,52,1,"header","container-3-child-header",1280,0,200,51
+,53,1,"header","container-3-child-left",1536,0,201,51
+,54,1,"header","outside",1792,0,0,0
diff --git a/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/MoveContainerToOtherLanguageMovesChildrenResult.csv b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/MoveContainerToOtherLanguageMovesChildrenResult.csv
index e15a13d5..7b201086 100644
--- a/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/MoveContainerToOtherLanguageMovesChildrenResult.csv
+++ b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/MoveContainerToOtherLanguageMovesChildrenResult.csv
@@ -1,15 +1,6 @@
-"pages"
-,"uid","pid","title"
-,1,0,"page-1"
-,2,0,"page-1-language-1"
-,3,0,"page-2"
-,4,0,"page-2-language-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,51,3,"b13-2cols-with-header-container","container-language-1",256,0,0,0,0,0
-,52,3,"header-language-1","header",512,0,200,51,0,0
-,53,3,"header","left-side-language-1",384,0,201,51,0,0
-,54,1,"header","outside",512,1,0,0,0,0
-,55,1,"b13-2cols-with-header-container","",64,1,0,0,0,0
-,56,1,"b13-2cols-with-header-container","header",128,1,201,55,0,0
-,57,1,"header","",256,1,200,56,0,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,51,3,"b13-2cols-with-header-container","container-3",256,1,0,0
+,52,3,"header","container-3-child-header",512,1,200,51
+,53,3,"header","container-3-child-left",768,1,201,51
+,54,1,"header","outside",1792,0,0,0
diff --git a/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/MoveContainerToOtherPageMovesChildren.csv b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/MoveContainerToOtherPageMovesChildren.csv
new file mode 100644
index 00000000..beea1aca
--- /dev/null
+++ b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/MoveContainerToOtherPageMovesChildren.csv
@@ -0,0 +1,12 @@
+"pages"
+,"uid","pid","title","slug","sys_language_uid","l10n_parent","l10n_source",is_siteroot
+,1,0,"page-1","/",0,0,0,1
+,2,0,"page-1-language-1","/",1,1,1,0
+,3,1,"page-2","/page-2",0,0,0,0
+,4,1,"page-2-language-1","/page-2",1,3,3,0
+"tt_content"
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,51,1,"b13-2cols-with-header-container","container-3",1024,1,0,0
+,52,1,"header","container-3-child-header",1280,1,200,51
+,53,1,"header","container-3-child-left",1536,1,201,51
+,54,1,"header","outside",1792,1,0,0
diff --git a/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/MoveContainerToOtherPageMovesChildrenResult.csv b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/MoveContainerToOtherPageMovesChildrenResult.csv
index 19a7405d..e1823529 100644
--- a/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/MoveContainerToOtherPageMovesChildrenResult.csv
+++ b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/MoveContainerToOtherPageMovesChildrenResult.csv
@@ -1,15 +1,6 @@
-"pages"
-,"uid","pid","title"
-,1,0,"page-1"
-,2,0,"page-1-language-1"
-,3,0,"page-2"
-,4,0,"page-2-language-1"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source"
-,51,3,"b13-2cols-with-header-container","container-language-1",256,1,0,0,0,0
-,52,3,"header-language-1","header",512,1,200,51,0,0
-,53,3,"header","left-side-language-1",768,1,201,51,0,0
-,54,1,"header","outside",512,1,0,0,0,0
-,55,1,"b13-2cols-with-header-container","",64,1,0,0,0,0
-,56,1,"b13-2cols-with-header-container","header",128,1,201,55,0,0
-,57,1,"header","",256,1,200,56,0,0
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,51,3,"b13-2cols-with-header-container","container-3",256,1,0,0
+,52,3,"header","container-3-child-header",512,1,200,51
+,53,3,"header","container-3-child-left",768,1,201,51
+,54,1,"header","outside",1792,1,0,0
diff --git a/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/setup.csv b/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/setup.csv
deleted file mode 100644
index 8ca54ddf..00000000
--- a/Tests/Functional/Datahandler/Localization/FreeMode/Fixtures/Container/setup.csv
+++ /dev/null
@@ -1,15 +0,0 @@
-"pages"
-,"uid","pid","title","slug","sys_language_uid","l10n_parent","l10n_source"
-,1,0,"page-1","/",,,
-,2,0,"page-1-language-1","/",1,1,1
-,3,0,"page-2","/page-2",,,
-,4,0,"page-2-language-1","/page-2",1,3,3
-"tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
-,51,1,"b13-2cols-with-header-container","container-language-1",256,1,,
-,52,1,"header-language-1","header",257,1,200,51
-,53,1,"header","left-side-language-1",258,1,201,51
-,54,1,"header","outside",512,1,0,
-,55,1,"b13-2cols-with-header-container",,64,1,,
-,56,1,"b13-2cols-with-header-container","header",128,1,201,55
-,57,1,"header",,256,1,200,56
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Localization/LocalizeTest.php b/Tests/Functional/Datahandler/Localization/LocalizeTest.php
index a11eefb4..877a6425 100644
--- a/Tests/Functional/Datahandler/Localization/LocalizeTest.php
+++ b/Tests/Functional/Datahandler/Localization/LocalizeTest.php
@@ -27,7 +27,7 @@ protected function setUp(): void
      */
     public function copyChildToLanguageFixContainerParent(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Localize/copy_child_to_language.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Localize/CopyChildToLanguageFixContainerParent.csv');
         $cmdmap = [
             'tt_content' => [
                 72 => [
@@ -46,7 +46,7 @@ public function copyChildToLanguageFixContainerParent(): void
      */
     public function copyContainerToLanguageCopiesChildren(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Localize/copy_container_to_language.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Localize/CopyContainerToLanguageCopiesChildren.csv');
         $cmdmap = [
             'tt_content' => [
                 1 => [
@@ -65,7 +65,7 @@ public function copyContainerToLanguageCopiesChildren(): void
      */
     public function localizeContainerLocalizeChildren(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Localize/localize_container.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Localize/LocalizeContainerLocalizeChildren.csv');
         $cmdmap = [
             'tt_content' => [
                 1 => [
@@ -83,7 +83,7 @@ public function localizeContainerLocalizeChildren(): void
      */
     public function localizeContainerFromNonDefaultLanguageLocalizeChildren(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Localize/localize_container_from_non_default_language.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Localize/LocalizeContainerFromNonDefaultLanguageLocalizeChildren.csv');
         $cmdmap = [
             'tt_content' => [
                 21 => [
@@ -101,7 +101,7 @@ public function localizeContainerFromNonDefaultLanguageLocalizeChildren(): void
      */
     public function copyToLanguageContainerFromNonDefaultLanguageLocalizeChildren(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Localize/copy_to_language_container_from_non_default_language.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Localize/CopyToLanguageContainerFromNonDefaultLanguageLocalizeChildren.csv');
         $cmdmap = [
             'tt_content' => [
                 21 => [
@@ -119,7 +119,7 @@ public function copyToLanguageContainerFromNonDefaultLanguageLocalizeChildren():
      */
     public function copyToLanguageContainerFromNonDefaultLanguageLocalizeChildrenWhenCopiedFromFreeMode(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Localize/copy_to_language_container_from_non_default_language_free_mode.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Localize/CopyToLanguageContainerFromNonDefaultLanguageLocalizeChildrenWhenCopiedFromFreeMode.csv');
         $cmdmap = [
             'tt_content' => [
                 51 => [
@@ -137,7 +137,7 @@ public function copyToLanguageContainerFromNonDefaultLanguageLocalizeChildrenWhe
      */
     public function localizeChildFailedIfContainerIsInFreeMode(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Localize/localize_child_failed_if_container_is_in_free_mode.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Localize/LocalizeChildFailedIfContainerIsInFreeMode.csv');
         $cmdmap = [
             'tt_content' => [
                 72 => [
@@ -156,7 +156,7 @@ public function localizeChildFailedIfContainerIsInFreeMode(): void
      */
     public function localizeChildFailedIfContainerIsNotTranslated(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Localize/localize_child_failed_if_container_is_not_translated.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Localize/LocalizeChildFailedIfContainerIsNotTranslated.csv');
         $cmdmap = [
             'tt_content' => [
                 72 => [
@@ -175,7 +175,7 @@ public function localizeChildFailedIfContainerIsNotTranslated(): void
      */
     public function localizeChildKeepsRelationsIfContainerIsInConnectedMode(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Localize/localize_child_keeps_relation_if_container_is_in_connected_mode.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Localize/LocalizeChildKeepsRelationsIfContainerIsInConnectedMode.csv');
         $cmdmap = [
             'tt_content' => [
                 82 => [
@@ -215,7 +215,7 @@ public static function localizeTwoContainerKeepsParentIndependedOnOrderDataProvi
      */
     public function localizeTwoContainerKeepsParentIndependedOnOrder(array $cmdmap, string $dataset): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Localize/localize_container_keeps_parent_indepented_on_order.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Localize/LocalizeTwoContainerKeepsParentIndependedOnOrder.csv');
         $this->dataHandler->start([], $cmdmap, $this->backendUser);
         $this->dataHandler->process_cmdmap();
         self::assertCSVDataSet(__DIR__ . '/Fixtures/Localize/LocalizeTwoContainerKeepsParentIndependedOnOrder' . $dataset . 'Result.csv');
@@ -248,7 +248,7 @@ public static function localizeWithCopyTwoContainerChangeParentIndependedOnOrder
      */
     public function localizeWithCopyTwoContainerChangeParentIndependedOnOrder(array $cmdmap, string $dataset): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/Localize/localize_container_keeps_parent_indepented_on_order.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Localize/LocalizeWithCopyTwoContainerChangeParentIndependedOnOrder.csv');
         $this->dataHandler->start([], $cmdmap, $this->backendUser);
         $this->dataHandler->process_cmdmap();
         self::assertCSVDataSet(__DIR__ . '/Fixtures/Localize/LocalizeWithCopyTwoContainerChangeParentIndependedOnOrder' . $dataset . 'Result.csv');
diff --git a/Tests/Functional/Datahandler/Workspace/ContainerTest.php b/Tests/Functional/Datahandler/Workspace/ContainerTest.php
index 2c1950ad..14b8e223 100644
--- a/Tests/Functional/Datahandler/Workspace/ContainerTest.php
+++ b/Tests/Functional/Datahandler/Workspace/ContainerTest.php
@@ -23,7 +23,6 @@ protected function setUp(): void
     {
         parent::setUp();
         $this->importCSVDataSet(__DIR__ . '/Fixtures/pages.csv');
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/tt_content.csv');
         $this->importCSVDataSet(__DIR__ . '/Fixtures/sys_workspace.csv');
         $this->backendUser->setWorkspace(1);
         $context = GeneralUtility::makeInstance(Context::class);
@@ -36,10 +35,10 @@ protected function setUp(): void
      */
     public function deleteContainerDeleteChildren(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/tt_content_container_with_child_in_workspace.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/DeleteContainerDeleteChildren.csv');
         $cmdmap = [
             'tt_content' => [
-                11 => [
+                1 => [
                     'delete' => 1,
                 ],
             ],
@@ -54,6 +53,8 @@ public function deleteContainerDeleteChildren(): void
      */
     public function newVersionDoesNotCreateNewVersionsOfChildren(): void
     {
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/NewVersionDoesNotCreateNewVersionsOfChildren.csv');
+        self::assertCSVDataSet(__DIR__ . '/Fixtures/NewVersionDoesNotCreateNewVersionsOfChildren.csv');
         $datamap = [
             'tt_content' => [
                 1 => [
@@ -72,6 +73,7 @@ public function newVersionDoesNotCreateNewVersionsOfChildren(): void
      */
     public function moveChildsColPosInContainer(): void
     {
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/MoveChildsColPosInContainer.csv');
         $cmdmap = [
             'tt_content' => [
                 2 => [
@@ -96,6 +98,7 @@ public function moveChildsColPosInContainer(): void
      */
     public function moveChildOutsideContainer(): void
     {
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/MoveChildOutsideContainer.csv');
         $cmdmap = [
             'tt_content' => [
                 2 => [
@@ -121,6 +124,7 @@ public function moveChildOutsideContainer(): void
      */
     public function moveChildsColPosInOtherContainer(): void
     {
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/MoveChildsColPosInOtherContainer.csv');
         $cmdmap = [
             'tt_content' => [
                 2 => [
@@ -146,6 +150,7 @@ public function moveChildsColPosInOtherContainer(): void
      */
     public function copyChildsColPosInContainer(): void
     {
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/CopyChildsColPosInContainer.csv');
         $cmdmap = [
             'tt_content' => [
                 2 => [
@@ -171,6 +176,7 @@ public function copyChildsColPosInContainer(): void
      */
     public function copyChildOutsideContainer(): void
     {
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/CopyChildOutsideContainer.csv');
         $cmdmap = [
             'tt_content' => [
                 2 => [
@@ -197,6 +203,7 @@ public function copyChildOutsideContainer(): void
      */
     public function copyChildsColPosInOtherContainer(): void
     {
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/CopyChildsColPosInOtherContainer.csv');
         $cmdmap = [
             'tt_content' => [
                 2 => [
@@ -222,6 +229,7 @@ public function copyChildsColPosInOtherContainer(): void
      */
     public function copyContainer(): void
     {
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/CopyContainer.csv');
         $cmdmap = [
             'tt_content' => [
                 1 => [
@@ -245,6 +253,7 @@ public function copyContainer(): void
      */
     public function moveRecordInColPosCreatesWorkspaceElementInContainer()
     {
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/MoveRecordInColPosCreatesWorkspaceElementInContainer.csv');
         $cmdmap = [
             'tt_content' => [
                 5 => [
@@ -270,7 +279,7 @@ public function moveRecordInColPosCreatesWorkspaceElementInContainer()
      */
     public function copyContainerWithChildHasDeletedPlaceholderInWorkspaceDoNotCopyThisChild(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/tt_content_deleted_placeholder.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/CopyContainerWithChildHasDeletedPlaceholderInWorkspaceDoNotCopyThisChild.csv');
         $cmdmap = [
             'tt_content' => [
                 10 => [
@@ -294,7 +303,7 @@ public function copyContainerWithChildHasDeletedPlaceholderInWorkspaceDoNotCopyT
      */
     public function deleteContainerWithChildHasDeletedPlaceholderInWorkspaceDoNotDiscardThisChild(): void
     {
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/tt_content_deleted_placeholder.csv');
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/DeleteContainerWithChildHasDeletedPlaceholderInWorkspaceDoNotDiscardThisChild.csv');
         $cmdmap = [
             'tt_content' => [
                 10 => [
diff --git a/Tests/Functional/Datahandler/Workspace/Fixtures/CopyChildOutsideContainer.csv b/Tests/Functional/Datahandler/Workspace/Fixtures/CopyChildOutsideContainer.csv
new file mode 100644
index 00000000..99858364
--- /dev/null
+++ b/Tests/Functional/Datahandler/Workspace/Fixtures/CopyChildOutsideContainer.csv
@@ -0,0 +1,7 @@
+"tt_content"
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0,0
+,2,1,"header","header-default",256,0,200,1
+,5,1,"header","second element",512,0,200,1
+,3,1,"header","left-side-default",786,0,201,1
+,4,1,"header","outside",1024,0,0,0
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Workspace/Fixtures/CopyChildOutsideContainerResult.csv b/Tests/Functional/Datahandler/Workspace/Fixtures/CopyChildOutsideContainerResult.csv
index b83dd15d..82c7a6c2 100644
--- a/Tests/Functional/Datahandler/Workspace/Fixtures/CopyChildOutsideContainerResult.csv
+++ b/Tests/Functional/Datahandler/Workspace/Fixtures/CopyChildOutsideContainerResult.csv
@@ -1,14 +1,8 @@
-"pages"
-,"uid","pid","title"
-,1,0,"page-1"
-,3,0,"page-2"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source","t3ver_oid","t3ver_wsid","t3ver_state","t3ver_stage"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0,0,0,0,0,0
-,3,1,"header","left-side-default",64,0,201,1,0,0,0,0,0,0
-,4,1,"header","outside",512,0,0,0,0,0,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0,0,0,0,0,0
-,91,1,"b13-2cols-with-header-container","second-container",1028,0,0,0,0,0,0,0,0,0
-,92,1,"header","child-in-second-container-with-sorting-before-children-in-first-container",1,0,200,91,0,0,0,0,0,0
-,93,3,"header","header-default",256,0,0,0,0,0,0,1,1,0
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0,0,0,0,0,0,0,0
+,2,1,"header","header-default",256,0,200,1,0,0,0,0,0,0
+,5,1,"header","second element",512,0,200,1,0,0,0,0,0,0
+,3,1,"header","left-side-default",786,0,201,1,0,0,0,0,0,0
+,4,1,"header","outside",1024,0,0,0,0,0,0,0,0,0
+,6,3,"header","header-default",256,0,0,0,0,0,0,1,1,0
diff --git a/Tests/Functional/Datahandler/Workspace/Fixtures/CopyChildsColPosInContainer.csv b/Tests/Functional/Datahandler/Workspace/Fixtures/CopyChildsColPosInContainer.csv
new file mode 100644
index 00000000..0fd85349
--- /dev/null
+++ b/Tests/Functional/Datahandler/Workspace/Fixtures/CopyChildsColPosInContainer.csv
@@ -0,0 +1,7 @@
+"tt_content"
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0,0
+,2,1,"header","header-default",256,0,200,1
+,5,1,"header","second element",386,0,200,1
+,3,1,"header","left-side-default",512,0,201,1
+,4,1,"header","outside",1024,0,0,0
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Workspace/Fixtures/CopyChildsColPosInContainerResult.csv b/Tests/Functional/Datahandler/Workspace/Fixtures/CopyChildsColPosInContainerResult.csv
index ba2478b4..faa3b67a 100644
--- a/Tests/Functional/Datahandler/Workspace/Fixtures/CopyChildsColPosInContainerResult.csv
+++ b/Tests/Functional/Datahandler/Workspace/Fixtures/CopyChildsColPosInContainerResult.csv
@@ -1,14 +1,8 @@
-"pages"
-,"uid","pid","title"
-,1,0,"page-1"
-,3,0,"page-2"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source","t3ver_oid","t3ver_wsid","t3ver_state","t3ver_stage"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0,0,0,0,0,0
-,3,1,"header","left-side-default",64,0,201,1,0,0,0,0,0,0
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0,0,0,0,0,0,0,0
+,2,1,"header","header-default",256,0,200,1,0,0,0,0,0,0
+,5,1,"header","second element",386,0,200,1,0,0,0,0,0,0
+,3,1,"header","left-side-default",512,0,201,1,0,0,0,0,0,0
 ,4,1,"header","outside",1024,0,0,0,0,0,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0,0,0,0,0,0
-,91,1,"b13-2cols-with-header-container","second-container",1540,0,0,0,0,0,0,0,0,0
-,92,1,"header","child-in-second-container-with-sorting-before-children-in-first-container",1,0,200,91,0,0,0,0,0,0
-,93,1,"header","header-default (copy 1)",512,0,201,1,0,0,0,1,1,0
+,6,1,"header","header-default (copy 1)",449,0,201,1,0,0,0,1,1,0
diff --git a/Tests/Functional/Datahandler/Workspace/Fixtures/CopyChildsColPosInOtherContainer.csv b/Tests/Functional/Datahandler/Workspace/Fixtures/CopyChildsColPosInOtherContainer.csv
new file mode 100644
index 00000000..2eb87a31
--- /dev/null
+++ b/Tests/Functional/Datahandler/Workspace/Fixtures/CopyChildsColPosInOtherContainer.csv
@@ -0,0 +1,9 @@
+"tt_content"
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0,0
+,2,1,"header","header-default",256,0,200,1
+,5,1,"header","second element",512,0,200,1
+,3,1,"header","left-side-default",786,0,201,1
+,4,1,"header","outside",1024,0,0,0
+,91,1,"b13-2cols-with-header-container","second-container",2048,0,0,0
+,92,1,"header","child-in-second-container",4096,0,200,91
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Workspace/Fixtures/CopyChildsColPosInOtherContainerResult.csv b/Tests/Functional/Datahandler/Workspace/Fixtures/CopyChildsColPosInOtherContainerResult.csv
index df3c4b8a..3bbcb050 100644
--- a/Tests/Functional/Datahandler/Workspace/Fixtures/CopyChildsColPosInOtherContainerResult.csv
+++ b/Tests/Functional/Datahandler/Workspace/Fixtures/CopyChildsColPosInOtherContainerResult.csv
@@ -4,11 +4,11 @@
 ,3,0,"page-2"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source","t3ver_oid","t3ver_wsid","t3ver_state","t3ver_stage"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0,0,0,0,0,0
-,3,1,"header","left-side-default",64,0,201,1,0,0,0,0,0,0
-,4,1,"header","outside",512,0,0,0,0,0,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0,0,0,0,0,0
-,91,1,"b13-2cols-with-header-container","second-container",1028,0,0,0,0,0,0,0,0,0
-,92,1,"header","child-in-second-container-with-sorting-before-children-in-first-container",1,0,200,91,0,0,0,0,0,0
-,93,1,"header","header-default (copy 1)",32,0,201,91,0,0,0,1,1,0
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0,0,0,0,0,0,0,0
+,2,1,"header","header-default",256,0,200,1,0,0,0,0,0,0
+,5,1,"header","second element",512,0,200,1,0,0,0,0,0,0
+,3,1,"header","left-side-default",786,0,201,1,0,0,0,0,0,0
+,4,1,"header","outside",1024,0,0,0,0,0,0,0,0,0
+,91,1,"b13-2cols-with-header-container","second-container",2048,0,0,0,0,0,0,0,0,0
+,92,1,"header","child-in-second-container",4096,0,200,91,0,0,0,0,0,0
+,93,1,"header","header-default (copy 1)",4352,0,201,91,0,0,0,1,1,0
diff --git a/Tests/Functional/Datahandler/Workspace/Fixtures/CopyContainer.csv b/Tests/Functional/Datahandler/Workspace/Fixtures/CopyContainer.csv
new file mode 100644
index 00000000..fe15e0c2
--- /dev/null
+++ b/Tests/Functional/Datahandler/Workspace/Fixtures/CopyContainer.csv
@@ -0,0 +1,7 @@
+"tt_content"
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",128,0,,
+,2,1,"header","header-default",256,0,200,1
+,5,1,"header","second element",386,0,200,1
+,3,1,"header","left-side-default",512,0,201,1
+,4,1,"header","outside",1024,0,0,
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Workspace/Fixtures/CopyContainerResult.csv b/Tests/Functional/Datahandler/Workspace/Fixtures/CopyContainerResult.csv
index 788d43ff..11b6eb1c 100644
--- a/Tests/Functional/Datahandler/Workspace/Fixtures/CopyContainerResult.csv
+++ b/Tests/Functional/Datahandler/Workspace/Fixtures/CopyContainerResult.csv
@@ -1,17 +1,11 @@
-"pages"
-,"uid","pid","title"
-,1,0,"page-1"
-,3,0,"page-2"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source","t3ver_oid","t3ver_wsid","t3ver_state","t3ver_stage"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0,0,0,0,0,0
-,3,1,"header","left-side-default",64,0,201,1,0,0,0,0,0,0
-,4,1,"header","outside",512,0,0,0,0,0,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0,0,0,0,0,0
-,91,1,"b13-2cols-with-header-container","second-container",1028,0,0,0,0,0,0,0,0,0
-,92,1,"header","child-in-second-container-with-sorting-before-children-in-first-container",1,0,200,91,0,0,0,0,0,0
-,93,3,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0,0,1,1,0
-,94,3,"header","left-side-default",512,0,201,93,0,0,0,1,1,0
-,95,3,"header","second element",384,0,200,93,0,0,0,1,1,0
-,96,3,"header","header-default",320,0,200,93,0,0,0,1,1,0
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0,0,0,0,0,0,0,0
+,2,1,"header","header-default",256,0,200,1,0,0,0,0,0,0
+,5,1,"header","second element",386,0,200,1,0,0,0,0,0,0
+,3,1,"header","left-side-default",512,0,201,1,0,0,0,0,0,0
+,4,1,"header","outside",1024,0,0,0,0,0,0,0,0,0
+,6,3,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0,0,1,1,0
+,7,3,"header","second element",512,0,200,6,0,0,0,1,1,0
+,8,3,"header","header-default",384,0,200,6,0,0,0,1,1,0
+,9,3,"header","left-side-default",768,0,201,6,0,0,0,1,1,0
diff --git a/Tests/Functional/Datahandler/Workspace/Fixtures/CopyContainerWithChildHasDeletedPlaceholderInWorkspaceDoNotCopyThisChild.csv b/Tests/Functional/Datahandler/Workspace/Fixtures/CopyContainerWithChildHasDeletedPlaceholderInWorkspaceDoNotCopyThisChild.csv
new file mode 100644
index 00000000..b3fffdae
--- /dev/null
+++ b/Tests/Functional/Datahandler/Workspace/Fixtures/CopyContainerWithChildHasDeletedPlaceholderInWorkspaceDoNotCopyThisChild.csv
@@ -0,0 +1,5 @@
+"tt_content"
+,"uid","pid","CType","header","sorting","t3ver_state","t3ver_wsid","colPos","tx_container_parent","t3ver_oid"
+,10,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0
+,11,1,"header","header",512,0,0,200,10,0
+,12,1,"header","header-deleted-in-ws",512,2,1,200,10,11
diff --git a/Tests/Functional/Datahandler/Workspace/Fixtures/CopyContainerWithChildHasDeletedPlaceholderInWorkspaceDoNotCopyThisChildResult.csv b/Tests/Functional/Datahandler/Workspace/Fixtures/CopyContainerWithChildHasDeletedPlaceholderInWorkspaceDoNotCopyThisChildResult.csv
index 738a562b..11cd4989 100644
--- a/Tests/Functional/Datahandler/Workspace/Fixtures/CopyContainerWithChildHasDeletedPlaceholderInWorkspaceDoNotCopyThisChildResult.csv
+++ b/Tests/Functional/Datahandler/Workspace/Fixtures/CopyContainerWithChildHasDeletedPlaceholderInWorkspaceDoNotCopyThisChildResult.csv
@@ -1,17 +1,6 @@
-"pages"
-,"uid","pid","title"
-,1,0,"page-1"
-,3,0,"page-2"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source","t3ver_oid","t3ver_wsid","t3ver_state","t3ver_stage"
-,1,1,"b13-2cols-with-header-container","container-default",768,0,0,0,0,0,0,0,0,0
-,2,1,"header","header-default",640,0,200,1,0,0,0,0,0,0
-,3,1,"header","left-side-default",576,0,201,1,0,0,0,0,0,0
-,4,1,"header","outside",1024,0,0,0,0,0,0,0,0,0
-,5,1,"header","second element",768,0,200,1,0,0,0,0,0,0
-,10,1,"b13-2cols-with-header-container","container-default",512,0,0,0,0,0,0,0,0,0
+,10,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0,0,0,0,0
 ,11,1,"header","header",512,0,200,10,0,0,0,0,0,0
-,12,1,"header","header-deleted-in-ws",0,0,200,10,0,0,11,1,2,0
-,91,1,"b13-2cols-with-header-container","second-container",1540,0,0,0,0,0,0,0,0,0
-,92,1,"header","child-in-second-container-with-sorting-before-children-in-first-container",513,0,200,91,0,0,0,0,0,0
-,93,1,"b13-2cols-with-header-container","container-default (copy 1)",256,0,0,0,0,0,0,1,1,0
+,12,1,"header","header-deleted-in-ws",512,0,200,10,0,0,11,1,2,0
+,13,1,"b13-2cols-with-header-container","container-default (copy 1)",128,0,0,0,0,0,0,1,1,0
diff --git a/Tests/Functional/Datahandler/Workspace/Fixtures/tt_content_container_with_child_in_workspace.csv b/Tests/Functional/Datahandler/Workspace/Fixtures/DeleteContainerDeleteChildren.csv
similarity index 56%
rename from Tests/Functional/Datahandler/Workspace/Fixtures/tt_content_container_with_child_in_workspace.csv
rename to Tests/Functional/Datahandler/Workspace/Fixtures/DeleteContainerDeleteChildren.csv
index dc46d516..f15d664c 100644
--- a/Tests/Functional/Datahandler/Workspace/Fixtures/tt_content_container_with_child_in_workspace.csv
+++ b/Tests/Functional/Datahandler/Workspace/Fixtures/DeleteContainerDeleteChildren.csv
@@ -1,4 +1,4 @@
 "tt_content"
 ,"uid","pid","CType","t3ver_wsid","t3ver_state","colPos","tx_container_parent"
-,11,1,"b13-2cols-with-header-container",1,1,,
-,12,1,"header",1,1,200,11
+,1,1,"b13-2cols-with-header-container",1,1,,
+,2,1,"header",1,1,200,1
diff --git a/Tests/Functional/Datahandler/Workspace/Fixtures/DeleteContainerDeleteChildrenResult.csv b/Tests/Functional/Datahandler/Workspace/Fixtures/DeleteContainerDeleteChildrenResult.csv
index 213a0e9e..55fe8b13 100644
--- a/Tests/Functional/Datahandler/Workspace/Fixtures/DeleteContainerDeleteChildrenResult.csv
+++ b/Tests/Functional/Datahandler/Workspace/Fixtures/DeleteContainerDeleteChildrenResult.csv
@@ -1,13 +1,3 @@
-"pages"
-,"uid","pid","title"
-,1,0,"page-1"
-,3,0,"page-2"
 "tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source","t3ver_oid","t3ver_wsid","t3ver_state","t3ver_stage"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0,0,0,0,0,0
-,3,1,"header","left-side-default",64,0,201,1,0,0,0,0,0,0
-,4,1,"header","outside",512,0,0,0,0,0,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0,0,0,0,0,0
-,91,1,"b13-2cols-with-header-container","second-container",1028,0,0,0,0,0,0,0,0,0
-,92,1,"header","child-in-second-container-with-sorting-before-children-in-first-container",1,0,200,91,0,0,0,0,0,0
+,"uid","pid","CType","t3ver_wsid","t3ver_state","colPos","tx_container_parent"
+# delete in WS deletes hard
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Workspace/Fixtures/DeleteContainerWithChildHasDeletedPlaceholderInWorkspaceDoNotDiscardThisChild.csv b/Tests/Functional/Datahandler/Workspace/Fixtures/DeleteContainerWithChildHasDeletedPlaceholderInWorkspaceDoNotDiscardThisChild.csv
new file mode 100644
index 00000000..0580db40
--- /dev/null
+++ b/Tests/Functional/Datahandler/Workspace/Fixtures/DeleteContainerWithChildHasDeletedPlaceholderInWorkspaceDoNotDiscardThisChild.csv
@@ -0,0 +1,5 @@
+"tt_content"
+,"uid","pid","CType","header","sorting","t3ver_state","t3ver_wsid","colPos","tx_container_parent","t3ver_oid"
+,10,1,"b13-2cols-with-header-container","container-default",128,0,0,0,0,0
+,11,1,"header","header",256,0,0,200,10,0
+,12,1,"header","header-deleted-in-ws",256,2,1,200,10,11
diff --git a/Tests/Functional/Datahandler/Workspace/Fixtures/DeleteContainerWithChildHasDeletedPlaceholderInWorkspaceDoNotDiscardThisChildResult.csv b/Tests/Functional/Datahandler/Workspace/Fixtures/DeleteContainerWithChildHasDeletedPlaceholderInWorkspaceDoNotDiscardThisChildResult.csv
index e03add06..7b47487c 100644
--- a/Tests/Functional/Datahandler/Workspace/Fixtures/DeleteContainerWithChildHasDeletedPlaceholderInWorkspaceDoNotDiscardThisChildResult.csv
+++ b/Tests/Functional/Datahandler/Workspace/Fixtures/DeleteContainerWithChildHasDeletedPlaceholderInWorkspaceDoNotDiscardThisChildResult.csv
@@ -1,17 +1,6 @@
-"pages"
-,"uid","pid","title"
-,1,0,"page-1"
-,3,0,"page-2"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source","t3ver_oid","t3ver_wsid","t3ver_state","t3ver_stage"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0,0,0,0,0,0
-,3,1,"header","left-side-default",64,0,201,1,0,0,0,0,0,0
-,4,1,"header","outside",512,0,0,0,0,0,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0,0,0,0,0,0
-,10,1,"b13-2cols-with-header-container","container-default",0,0,0,0,0,0,0,0,0,0
-,11,1,"header","header",0,0,200,10,0,0,0,0,0,0
-,12,1,"header","header-deleted-in-ws",0,0,200,10,0,0,11,1,2,0
-,91,1,"b13-2cols-with-header-container","second-container",1028,0,0,0,0,0,0,0,0,0
-,92,1,"header","child-in-second-container-with-sorting-before-children-in-first-container",1,0,200,91,0,0,0,0,0,0
-,93,1,"b13-2cols-with-header-container","container-default",0,0,0,0,0,0,10,1,2,0
+,10,1,"b13-2cols-with-header-container","container-default",128,0,0,0,0,0,0,0,0,0
+,11,1,"header","header",256,0,200,10,0,0,0,0,0,0
+,12,1,"header","header-deleted-in-ws",256,0,200,10,0,0,11,1,2,0
+,13,1,"b13-2cols-with-header-container","container-default",128,0,0,0,0,0,10,1,2,0
diff --git a/Tests/Functional/Datahandler/Workspace/Fixtures/MoveChildOutsideContainer.csv b/Tests/Functional/Datahandler/Workspace/Fixtures/MoveChildOutsideContainer.csv
new file mode 100644
index 00000000..35ba5711
--- /dev/null
+++ b/Tests/Functional/Datahandler/Workspace/Fixtures/MoveChildOutsideContainer.csv
@@ -0,0 +1,7 @@
+"tt_content"
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",128,0,,
+,2,1,"header","header-default",256,0,200,1
+,5,1,"header","second element",512,0,200,1
+,3,1,"header","left-side-default",786,0,201,1
+,4,1,"header","outside",1024,0,0,
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Workspace/Fixtures/MoveChildOutsideContainerResult.csv b/Tests/Functional/Datahandler/Workspace/Fixtures/MoveChildOutsideContainerResult.csv
index f4c1e7c2..72d4c0db 100644
--- a/Tests/Functional/Datahandler/Workspace/Fixtures/MoveChildOutsideContainerResult.csv
+++ b/Tests/Functional/Datahandler/Workspace/Fixtures/MoveChildOutsideContainerResult.csv
@@ -1,14 +1,8 @@
-"pages"
-,"uid","pid","title"
-,1,0,"page-1"
-,3,0,"page-2"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source","t3ver_oid","t3ver_wsid","t3ver_state","t3ver_stage"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0,0,0,0,0,0
-,3,1,"header","left-side-default",64,0,201,1,0,0,0,0,0,0
-,4,1,"header","outside",512,0,0,0,0,0,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0,0,0,0,0,0
-,91,1,"b13-2cols-with-header-container","second-container",1028,0,0,0,0,0,0,0,0,0
-,92,1,"header","child-in-second-container-with-sorting-before-children-in-first-container",1,0,200,91,0,0,0,0,0,0
-,93,3,"header","header-default",256,0,0,0,0,0,2,1,4,0
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0,0,0,0,0,0,0,0
+,2,1,"header","header-default",256,0,200,1,0,0,0,0,0,0
+,5,1,"header","second element",512,0,200,1,0,0,0,0,0,0
+,3,1,"header","left-side-default",786,0,201,1,0,0,0,0,0,0
+,4,1,"header","outside",1024,0,0,0,0,0,0,0,0,0
+,6,3,"header","header-default",256,0,0,0,0,0,2,1,4,0
diff --git a/Tests/Functional/Datahandler/Workspace/Fixtures/MoveChildsColPosInContainer.csv b/Tests/Functional/Datahandler/Workspace/Fixtures/MoveChildsColPosInContainer.csv
new file mode 100644
index 00000000..cc7dfa1f
--- /dev/null
+++ b/Tests/Functional/Datahandler/Workspace/Fixtures/MoveChildsColPosInContainer.csv
@@ -0,0 +1,6 @@
+"tt_content"
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",128,0,,
+,2,1,"header","header-default",256,0,200,1
+,3,1,"header","second element",512,0,200,1
+,4,1,"header","left-side-default",786,0,201,1
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Workspace/Fixtures/MoveChildsColPosInContainerResult.csv b/Tests/Functional/Datahandler/Workspace/Fixtures/MoveChildsColPosInContainerResult.csv
index 3ba27669..49d04614 100644
--- a/Tests/Functional/Datahandler/Workspace/Fixtures/MoveChildsColPosInContainerResult.csv
+++ b/Tests/Functional/Datahandler/Workspace/Fixtures/MoveChildsColPosInContainerResult.csv
@@ -1,14 +1,7 @@
-"pages"
-,"uid","pid","title"
-,1,0,"page-1"
-,3,0,"page-2"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source","t3ver_oid","t3ver_wsid","t3ver_state","t3ver_stage"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0,0,0,0,0,0
-,3,1,"header","left-side-default",64,0,201,1,0,0,0,0,0,0
-,4,1,"header","outside",1024,0,0,0,0,0,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0,0,0,0,0,0
-,91,1,"b13-2cols-with-header-container","second-container",1540,0,0,0,0,0,0,0,0,0
-,92,1,"header","child-in-second-container-with-sorting-before-children-in-first-container",1,0,200,91,0,0,0,0,0,0
-,93,1,"header","header-default",512,0,201,1,0,0,2,1,4,0
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0,0,0,0,0,0,0,0
+,2,1,"header","header-default",256,0,200,1,0,0,0,0,0,0
+,3,1,"header","second element",512,0,200,1,0,0,0,0,0,0
+,4,1,"header","left-side-default",786,0,201,1,0,0,0,0,0,0
+,5,1,"header","header-default",649,0,201,1,0,0,2,1,4,0
diff --git a/Tests/Functional/Datahandler/Workspace/Fixtures/MoveChildsColPosInOtherContainer.csv b/Tests/Functional/Datahandler/Workspace/Fixtures/MoveChildsColPosInOtherContainer.csv
new file mode 100644
index 00000000..2eb87a31
--- /dev/null
+++ b/Tests/Functional/Datahandler/Workspace/Fixtures/MoveChildsColPosInOtherContainer.csv
@@ -0,0 +1,9 @@
+"tt_content"
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0,0
+,2,1,"header","header-default",256,0,200,1
+,5,1,"header","second element",512,0,200,1
+,3,1,"header","left-side-default",786,0,201,1
+,4,1,"header","outside",1024,0,0,0
+,91,1,"b13-2cols-with-header-container","second-container",2048,0,0,0
+,92,1,"header","child-in-second-container",4096,0,200,91
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Workspace/Fixtures/MoveChildsColPosInOtherContainerResult.csv b/Tests/Functional/Datahandler/Workspace/Fixtures/MoveChildsColPosInOtherContainerResult.csv
index c89ffb1f..bbb23c23 100644
--- a/Tests/Functional/Datahandler/Workspace/Fixtures/MoveChildsColPosInOtherContainerResult.csv
+++ b/Tests/Functional/Datahandler/Workspace/Fixtures/MoveChildsColPosInOtherContainerResult.csv
@@ -1,14 +1,10 @@
-"pages"
-,"uid","pid","title"
-,1,0,"page-1"
-,3,0,"page-2"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source","t3ver_oid","t3ver_wsid","t3ver_state","t3ver_stage"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0,0,0,0,0,0
-,3,1,"header","left-side-default",64,0,201,1,0,0,0,0,0,0
-,4,1,"header","outside",512,0,0,0,0,0,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0,0,0,0,0,0
-,91,1,"b13-2cols-with-header-container","second-container",1028,0,0,0,0,0,0,0,0,0
-,92,1,"header","child-in-second-container-with-sorting-before-children-in-first-container",1,0,200,91,0,0,0,0,0,0
-,93,1,"header","header-default",32,0,201,91,0,0,2,1,4,0
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0,0,0,0,0,0,0,0
+,2,1,"header","header-default",256,0,200,1,0,0,0,0,0,0
+,5,1,"header","second element",512,0,200,1,0,0,0,0,0,0
+,3,1,"header","left-side-default",786,0,201,1,0,0,0,0,0,0
+,4,1,"header","outside",1024,0,0,0,0,0,0,0,0,0
+,91,1,"b13-2cols-with-header-container","second-container",2048,0,0,0,0,0,0,0,0,0
+,92,1,"header","child-in-second-container",4096,0,200,91,0,0,0,0,0,0
+,93,1,"header","header-default",4352,0,201,91,0,0,2,1,4,0
diff --git a/Tests/Functional/Datahandler/Workspace/Fixtures/MoveRecordInColPosCreatesWorkspaceElementInContainer.csv b/Tests/Functional/Datahandler/Workspace/Fixtures/MoveRecordInColPosCreatesWorkspaceElementInContainer.csv
new file mode 100644
index 00000000..bc9492b9
--- /dev/null
+++ b/Tests/Functional/Datahandler/Workspace/Fixtures/MoveRecordInColPosCreatesWorkspaceElementInContainer.csv
@@ -0,0 +1,7 @@
+"tt_content"
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0,0
+,2,1,"header","header-default",256,0,200,1
+,5,1,"header","second element",384,0,200,1
+,3,1,"header","left-side-default",512,0,201,1
+,4,1,"header","outside",1024,0,0,
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Workspace/Fixtures/MoveRecordInColPosCreatesWorkspaceElementInContainerResult.csv b/Tests/Functional/Datahandler/Workspace/Fixtures/MoveRecordInColPosCreatesWorkspaceElementInContainerResult.csv
index a504d6b2..a104867f 100644
--- a/Tests/Functional/Datahandler/Workspace/Fixtures/MoveRecordInColPosCreatesWorkspaceElementInContainerResult.csv
+++ b/Tests/Functional/Datahandler/Workspace/Fixtures/MoveRecordInColPosCreatesWorkspaceElementInContainerResult.csv
@@ -4,11 +4,9 @@
 ,3,0,"page-2"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source","t3ver_oid","t3ver_wsid","t3ver_state","t3ver_stage"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0,0,0,0,0,0
-,3,1,"header","left-side-default",64,0,201,1,0,0,0,0,0,0
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0,0,0,0,0,0,0,0
+,2,1,"header","header-default",256,0,200,1,0,0,0,0,0,0
+,5,1,"header","second element",384,0,200,1,0,0,0,0,0,0
+,3,1,"header","left-side-default",512,0,201,1,0,0,0,0,0,0
 ,4,1,"header","outside",1024,0,0,0,0,0,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0,0,0,0,0,0
-,91,1,"b13-2cols-with-header-container","second-container",1540,0,0,0,0,0,0,0,0,0
-,92,1,"header","child-in-second-container-with-sorting-before-children-in-first-container",1,0,200,91,0,0,0,0,0,0
-,93,1,"header","second element",512,0,200,1,0,0,5,1,4,0
+,6,1,"header","second element",192,0,200,1,0,0,5,1,4,0
diff --git a/Tests/Functional/Datahandler/Workspace/Fixtures/NewVersionDoesNotCreateNewVersionsOfChildren.csv b/Tests/Functional/Datahandler/Workspace/Fixtures/NewVersionDoesNotCreateNewVersionsOfChildren.csv
new file mode 100644
index 00000000..6141293b
--- /dev/null
+++ b/Tests/Functional/Datahandler/Workspace/Fixtures/NewVersionDoesNotCreateNewVersionsOfChildren.csv
@@ -0,0 +1,5 @@
+"tt_content"
+,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0,0
+,2,1,"header","header-default",256,0,200,1
+,3,1,"header","second element",512,0,200,1
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Workspace/Fixtures/NewVersionDoesNotCreateNewVersionsOfChildrenResult.csv b/Tests/Functional/Datahandler/Workspace/Fixtures/NewVersionDoesNotCreateNewVersionsOfChildrenResult.csv
index d0301ac6..8566313d 100644
--- a/Tests/Functional/Datahandler/Workspace/Fixtures/NewVersionDoesNotCreateNewVersionsOfChildrenResult.csv
+++ b/Tests/Functional/Datahandler/Workspace/Fixtures/NewVersionDoesNotCreateNewVersionsOfChildrenResult.csv
@@ -1,14 +1,6 @@
-"pages"
-,"uid","pid","title"
-,1,0,"page-1"
-,3,0,"page-2"
 "tt_content"
 ,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","l10n_source","t3ver_oid","t3ver_wsid","t3ver_state","t3ver_stage"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,0,0,0,0,0,0,0,0
-,2,1,"header","header-default",128,0,200,1,0,0,0,0,0,0
-,3,1,"header","left-side-default",64,0,201,1,0,0,0,0,0,0
-,4,1,"header","outside",512,0,0,0,0,0,0,0,0,0
-,5,1,"header","second element",256,0,200,1,0,0,0,0,0,0
-,91,1,"b13-2cols-with-header-container","second-container",1028,0,0,0,0,0,0,0,0,0
-,92,1,"header","child-in-second-container-with-sorting-before-children-in-first-container",1,0,200,91,0,0,0,0,0,0
-,93,1,"b13-2cols-with-header-container","container-ws",256,0,0,0,0,0,1,1,0,0
+,1,1,"b13-2cols-with-header-container","container-default",128,0,0,0,0,0,0,0,0,0
+,2,1,"header","header-default",256,0,200,1,0,0,0,0,0,0
+,3,1,"header","second element",512,0,200,1,0,0,0,0,0,0
+,4,1,"b13-2cols-with-header-container","container-ws",128,0,0,0,0,0,1,1,0,0
diff --git a/Tests/Functional/Datahandler/Workspace/Fixtures/tt_content.csv b/Tests/Functional/Datahandler/Workspace/Fixtures/tt_content.csv
deleted file mode 100644
index ce36df9d..00000000
--- a/Tests/Functional/Datahandler/Workspace/Fixtures/tt_content.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-"tt_content"
-,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent"
-,1,1,"b13-2cols-with-header-container","container-default",256,0,,
-,2,1,"header","header-default",128,0,200,1
-,5,1,"header","second element",256,0,200,1
-,3,1,"header","left-side-default",64,0,201,1
-,4,1,"header","outside",512,0,0,
-,91,1,"b13-2cols-with-header-container","second-container",1028,,,
-,92,1,"header","child-in-second-container-with-sorting-before-children-in-first-container",1,0,200,91
\ No newline at end of file
diff --git a/Tests/Functional/Datahandler/Workspace/Fixtures/tt_content_deleted_placeholder.csv b/Tests/Functional/Datahandler/Workspace/Fixtures/tt_content_deleted_placeholder.csv
deleted file mode 100644
index 7a74c495..00000000
--- a/Tests/Functional/Datahandler/Workspace/Fixtures/tt_content_deleted_placeholder.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-"tt_content"
-,"uid","pid","CType","header","t3ver_state","t3ver_wsid","colPos","tx_container_parent","t3ver_oid"
-,10,1,"b13-2cols-with-header-container","container-default",0,0,,,
-,11,1,"header","header",0,0,200,10,0
-,12,1,"header","header-deleted-in-ws",2,1,200,10,11