diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 68b6c102..4ab54624 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -57,7 +57,9 @@ jobs:
       - name: Acceptance Tests
         run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s acceptance -- --fail-fast
         if: matrix.TYPO3 != '14'
-
+      - name: Acceptance Tests 14
+        run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s acceptance -- --fail-fast --skip-group=content_defender
+        if: matrix.TYPO3 == '14'
       - name: Archive acceptance tests results
         uses: actions/upload-artifact@v4
         if: always()
diff --git a/Build/Scripts/runTests.sh b/Build/Scripts/runTests.sh
index d0193604..75e0cf92 100755
--- a/Build/Scripts/runTests.sh
+++ b/Build/Scripts/runTests.sh
@@ -343,6 +343,7 @@ while getopts "a:b:s:d:i:t:p:xy:o:nhug" OPT; do
             fi
             # @todo Remove USE_APACHE option when TF7 has been dropped (along with TYPO3 v11 support).
             [[ "${TYPO3}" -eq 13 ]] && USE_APACHE=1
+            [[ "${TYPO3}" -eq 14 ]] && USE_APACHE=1
           ;;
         p)
             PHP_VERSION=${OPTARG}
@@ -600,7 +601,7 @@ case ${TEST_SUITE} in
               composer require typo3/cms-core:^11.5 ichhabrecht/content-defender --dev -W --no-progress --no-interaction
               composer prepare-tests
             elif [ ${TYPO3} -eq 13 ]; then
-              composer require typo3/cms-core:^13.4 typo3/testing-framework:^8.2 phpunit/phpunit:^10.5 ichhabrecht/content-defender --dev -W --no-progress --no-interaction
+              composer require typo3/cms-core:^13.4 typo3/testing-framework:^9 phpunit/phpunit:^11 ichhabrecht/content-defender --dev -W --no-progress --no-interaction
               composer prepare-tests
             elif [ ${TYPO3} -eq 14 ]; then
               composer require typo3/cms-core:^14.0 --dev -W --no-progress --no-interaction
diff --git a/README.md b/README.md
index 13d9117c..d6909477 100644
--- a/README.md
+++ b/README.md
@@ -226,8 +226,8 @@ See Tests/README.md on how to run the tests locally (like how github-actions run
 
 To assure coding guidelines are fullfilled:
 
-- run ``.Build/bin/phpstan analyse -c Build/phpstan10.neon``
-- run ``.Build/bin/php-cs-fixer fix --config=Build/php-cs-fixer.php --dry-run --stop-on-violation --using-cache=no``
+- run ``php -d memory_limit=2G .Build/bin/phpstan analyse -c Build/phpstan14.neon``
+- run ``php -d memory_limit=2G .Build/bin/php-cs-fixer fix --config=Build/php-cs-fixer.php --dry-run --stop-on-violation --using-cache=no``
 
 ## Credits
 
diff --git a/Tests/Acceptance/Backend/ContentDefenderCest.php b/Tests/Acceptance/Backend/ContentDefenderCest.php
index fa31f489..1eafa7ff 100644
--- a/Tests/Acceptance/Backend/ContentDefenderCest.php
+++ b/Tests/Acceptance/Backend/ContentDefenderCest.php
@@ -33,7 +33,7 @@ public function _before(BackendTester $I)
      */
     public function canCreateChildIn2ColsContainerWithNoContentDefenderRestrictionsDefined(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13): void
     {
-        $I->click('Page');
+        $I->clickLayoutModuleButton();
         if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
             $I->waitForElement('#typo3-pagetree-tree .nodes .node');
             $pageTree->openPath(['home', 'pageWithDifferentContainers']);
@@ -46,7 +46,7 @@ public function canCreateChildIn2ColsContainerWithNoContentDefenderRestrictionsD
         $colPosSelector = '#element-tt_content-300 [data-colpos="' . $dataColPos . '"]';
         $I->clickNewContentElement($colPosSelector);
         $I->switchToIFrame();
-        $I->waitForElement('.modal-dialog');
+        $I->waitForModal();
         if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() > 12) {
             $I->executeJS("document.querySelector('" . $I->getNewRecordWizardSelector() . "').shadowRoot.querySelector('button[data-identifier=\"default\"]').click()");
         }
@@ -60,7 +60,7 @@ public function canCreateChildIn2ColsContainerWithNoContentDefenderRestrictionsD
      */
     public function doNotSeeNotAllowedContentElementsInNewContentElementWizard(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13): void
     {
-        $I->click('Page');
+        $I->clickLayoutModuleButton();
         if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
             $I->waitForElement('#typo3-pagetree-tree .nodes .node');
             $pageTree->openPath(['home', 'pageWithContainer-3']);
@@ -73,7 +73,7 @@ public function doNotSeeNotAllowedContentElementsInNewContentElementWizard(Backe
         $colPosSelector = '#element-tt_content-800 [data-colpos="' . $dataColPos . '"]';
         $I->clickNewContentElement($colPosSelector);
         $I->switchToIFrame();
-        $I->waitForElement('.modal-dialog');
+        $I->waitForModal();
         if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() > 12) {
             $I->executeJS("document.querySelector('" . $I->getNewRecordWizardSelector() . "').shadowRoot.querySelector('button[data-identifier=\"default\"]').click()");
         }
@@ -86,7 +86,7 @@ public function doNotSeeNotAllowedContentElementsInNewContentElementWizard(Backe
      */
     public function doNotSeeNotAllowedContentElementsInNewContentElementWizardTriggeredByContextMenu(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13): void
     {
-        $I->click('Page');
+        $I->clickLayoutModuleButton();
         if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
             $I->waitForElement('#typo3-pagetree-tree .nodes .node');
             $pageTree->openPath(['home', 'pageWithContainer-3']);
@@ -127,7 +127,7 @@ public function doNotSeeNotAllowedContentElementsInNewContentElementWizardTrigge
         }
 
         $I->switchToIFrame();
-        $I->waitForElement('.modal-dialog');
+        $I->waitForModal();
         if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() > 12) {
             $I->executeJS("document.querySelector('" . $I->getNewRecordWizardSelector() . "').shadowRoot.querySelector('button[data-identifier=\"default\"]').click()");
         }
@@ -140,7 +140,7 @@ public function doNotSeeNotAllowedContentElementsInNewContentElementWizardTrigge
      */
     public function doNotSeeNotAllowedContentElementsInCTypeSelectBoxWhenCreateNewElement(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13)
     {
-        $I->click('Page');
+        $I->clickLayoutModuleButton();
         if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
             $I->waitForElement('#typo3-pagetree-tree .nodes .node');
             $pageTree->openPath(['home', 'pageWithContainer-4']);
@@ -153,7 +153,7 @@ public function doNotSeeNotAllowedContentElementsInCTypeSelectBoxWhenCreateNewEl
         $colPosSelector = '#element-tt_content-801 [data-colpos="' . $dataColPos . '"]';
         $I->clickNewContentElement($colPosSelector);
         $I->switchToIFrame();
-        $I->waitForElement('.modal-dialog');
+        $I->waitForModal();
         if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() > 12) {
             $I->executeJS("document.querySelector('" . $I->getNewRecordWizardSelector() . "').shadowRoot.querySelector('button[data-identifier=\"default\"]').click()");
         }
@@ -179,7 +179,7 @@ public function doNotSeeNotAllowedContentElementsInCTypeSelectBoxWhenCreateNewEl
      */
     public function doNotSeeNotAllowedContentElementsInCTypeSelectBoxWhenEditAnElement(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13)
     {
-        $I->click('Page');
+        $I->clickLayoutModuleButton();
         if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
             $I->waitForElement('#typo3-pagetree-tree .nodes .node');
             $pageTree->openPath(['home', 'contentTCASelectCtype']);
@@ -200,7 +200,7 @@ public function doNotSeeNotAllowedContentElementsInCTypeSelectBoxWhenEditAnEleme
      */
     public function canSeeNewContentButtonIfMaxitemsIsNotReached(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13)
     {
-        $I->click('Page');
+        $I->clickLayoutModuleButton();
         if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
             $I->waitForElement('#typo3-pagetree-tree .nodes .node');
             $pageTree->openPath(['home', 'contentDefenderMaxitems']);
@@ -219,7 +219,7 @@ public function canSeeNewContentButtonIfMaxitemsIsNotReached(BackendTester $I, P
      */
     public function canNotSeeNewContentButtonIfMaxitemsIsReached(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13)
     {
-        $I->click('Page');
+        $I->clickLayoutModuleButton();
         if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
             $I->waitForElement('#typo3-pagetree-tree .nodes .node');
             $pageTree->openPath(['home', 'contentDefenderMaxitems']);
@@ -239,7 +239,7 @@ public function canNotSeeNewContentButtonIfMaxitemsIsReached(BackendTester $I, P
      */
     public function canCreateNewChildInContainerIfMaxitemsIsReachedInOtherContainer(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13)
     {
-        $I->click('Page');
+        $I->clickLayoutModuleButton();
         if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
             $I->waitForElement('#typo3-pagetree-tree .nodes .node');
             $pageTree->openPath(['home', 'contentDefenderMaxitems']);
@@ -252,7 +252,7 @@ public function canCreateNewChildInContainerIfMaxitemsIsReachedInOtherContainer(
         $colPosSelector = '#element-tt_content-402 [data-colpos="' . $dataColPos . '"]';
         $I->clickNewContentElement($colPosSelector);
         $I->switchToIFrame();
-        $I->waitForElement('.modal-dialog');
+        $I->waitForModal();
         if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() > 12) {
             $I->executeJS("document.querySelector('" . $I->getNewRecordWizardSelector() . "').shadowRoot.querySelector('button[data-identifier=\"default\"]').click()");
         }
@@ -277,7 +277,7 @@ public function canCreateNewChildInContainerIfMaxitemsIsReachedInOtherContainer(
      */
     public function seeEditDocumentWhenAddingChildrenToColposWhereOnlyHeaderIsAllowed(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13)
     {
-        $I->click('Page');
+        $I->clickLayoutModuleButton();
         if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
             $I->waitForElement('#typo3-pagetree-tree .nodes .node');
             $pageTree->openPath(['home', 'pageWithDifferentContainers']);
diff --git a/Tests/Acceptance/Backend/EditorLayoutCest.php b/Tests/Acceptance/Backend/EditorLayoutCest.php
index 172ac9c9..17556c31 100644
--- a/Tests/Acceptance/Backend/EditorLayoutCest.php
+++ b/Tests/Acceptance/Backend/EditorLayoutCest.php
@@ -15,8 +15,6 @@
 use B13\Container\Tests\Acceptance\Support\BackendTester;
 use B13\Container\Tests\Acceptance\Support\PageTree;
 use B13\Container\Tests\Acceptance\Support\PageTreeV13;
-use TYPO3\CMS\Core\Information\Typo3Version;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 class EditorLayoutCest
 {
@@ -30,8 +28,8 @@ public function _before(BackendTester $I)
 
     public function canSeeNewContentButton(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13)
     {
-        $I->click('Page');
-        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
+        $I->clickLayoutModuleButton();
+        if ($I->getTypo3MajorVersion() < 13) {
             $I->waitForElement('#typo3-pagetree-tree .nodes .node');
             $pageTree->openPath(['home', 'pageWithContainer-5']);
         } else {
diff --git a/Tests/Acceptance/Backend/InfoModuleCest.php b/Tests/Acceptance/Backend/InfoModuleCest.php
index 5dcc028e..1046b868 100644
--- a/Tests/Acceptance/Backend/InfoModuleCest.php
+++ b/Tests/Acceptance/Backend/InfoModuleCest.php
@@ -15,7 +15,6 @@
 use B13\Container\Tests\Acceptance\Support\BackendTester;
 use B13\Container\Tests\Acceptance\Support\PageTree;
 use Codeception\Scenario;
-use TYPO3\CMS\Core\Information\Typo3Version;
 
 class InfoModuleCest
 {
@@ -29,8 +28,7 @@ public function _before(BackendTester $I)
 
     public function canSeeContainerPageTsConfig(BackendTester $I, PageTree $pageTree, Scenario $scenario)
     {
-        $typo3Version = new Typo3Version();
-        if ($typo3Version->getMajorVersion() >= 12) {
+        if ($I->getTypo3MajorVersion() >= 12) {
             $scenario->skip('PageTsConfigModuleCest is used');
         }
         $I->click('Info');
diff --git a/Tests/Acceptance/Backend/LayoutCest.php b/Tests/Acceptance/Backend/LayoutCest.php
index 0531e977..b6baabeb 100644
--- a/Tests/Acceptance/Backend/LayoutCest.php
+++ b/Tests/Acceptance/Backend/LayoutCest.php
@@ -16,8 +16,6 @@
 use B13\Container\Tests\Acceptance\Support\PageTree;
 use B13\Container\Tests\Acceptance\Support\PageTreeV13;
 use Codeception\Scenario;
-use TYPO3\CMS\Core\Information\Typo3Version;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 class LayoutCest
 {
@@ -35,8 +33,8 @@ public function _before(BackendTester $I)
      */
     public function connectedModeShowCorrectContentElements(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13)
     {
-        $I->click('Page');
-        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
+        $I->clickLayoutModuleButton();
+        if ($I->getTypo3MajorVersion() < 13) {
             $I->waitForElement('#typo3-pagetree-tree .nodes .node');
             $pageTree->openPath(['home', 'pageWithLocalization']);
         } else {
@@ -48,27 +46,14 @@ public function connectedModeShowCorrectContentElements(BackendTester $I, PageTr
         $I->see('header-header-0');
         $I->dontSee('2cols-header-1');
         $I->dontSee('header-header-1');
-        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() < 12) {
-            $I->waitForElement('select[name="languageMenu"]');
-            $I->selectOption('select[name="languageMenu"]', 'german');
-        } else {
-            $I->waitForText('Language');
-            $I->click('Language');
-            $I->waitForText('german');
-            $I->click('german');
-        }
-
+        $I->selectGermanInLanguageMenu();
         $I->waitForElementNotVisible('#t3js-ui-block');
         $I->see('2cols-header-1');
         $I->see('header-header-1');
         $I->dontSee('2cols-header-0');
         $I->dontSee('header-header-0');
 
-        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() < 12) {
-            $I->selectOption('select[name="actionMenu"]', 'Languages');
-        } else {
-            $I->selectOption('select[name="actionMenu"]', 'Language Comparison');
-        }
+        $I->selectLanguageComparisonMode();
         $I->waitForElementNotVisible('#t3js-ui-block');
 
         // td.t3-grid-cell:nth-child(1)
@@ -93,8 +78,8 @@ public function connectedModeShowCorrectContentElements(BackendTester $I, PageTr
      */
     public function connectedModeShowNoAddContentButton(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13)
     {
-        $I->click('Page');
-        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
+        $I->clickLayoutModuleButton();
+        if ($I->getTypo3MajorVersion() < 13) {
             $I->waitForElement('#typo3-pagetree-tree .nodes .node');
             $pageTree->openPath(['home', 'pageWithLocalization']);
         } else {
@@ -102,23 +87,20 @@ public function connectedModeShowNoAddContentButton(BackendTester $I, PageTree $
         }
         $I->wait(0.2);
         $I->switchToContentFrame();
-        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() < 12) {
-            $I->waitForElement('select[name="languageMenu"]');
-            $I->selectOption('select[name="languageMenu"]', 'german');
-        } else {
-            $I->waitForText('Language');
-            $I->click('Language');
-            $I->waitForText('german');
-            $I->click('german');
-        }
+        $I->selectGermanInLanguageMenu();
         $I->waitForElementNotVisible('#t3js-ui-block');
         // we have a "Content" Button for new elements with Fluid based page module
         $newContentElementLabel = $I->getNewContentElementLabel();
         $I->dontSee($newContentElementLabel, '#element-tt_content-102 .t3-page-ce-body');
-        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() < 12) {
+        if ($I->getTypo3MajorVersion() < 12) {
             $I->selectOption('select[name="actionMenu"]', 'Languages');
-        } else {
+        } elseif ($I->getTypo3MajorVersion() < 14) {
             $I->selectOption('select[name="actionMenu"]', 'Language Comparison');
+        } else {
+            $I->waitForElementVisible('.module-docheader-buttons .btn-group button.dropdown-toggle');
+            $I->click('.module-docheader-buttons .btn-group button.dropdown-toggle');
+            $I->waitForElementVisible('.module-docheader-buttons .dropdown-menu');
+            $I->click('Language Comparison', '.module-docheader-buttons .dropdown-menu');
         }
         $I->waitForElementNotVisible('#t3js-ui-block');
         // but not in Language View
@@ -132,8 +114,8 @@ public function connectedModeShowNoAddContentButton(BackendTester $I, PageTree $
      */
     public function canCreateContainerContentElement(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13)
     {
-        $I->click('Page');
-        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
+        $I->clickLayoutModuleButton();
+        if ($I->getTypo3MajorVersion() < 13) {
             $I->waitForElement('#typo3-pagetree-tree .nodes .node');
             $pageTree->openPath(['home', 'emptyPage']);
         } else {
@@ -143,19 +125,23 @@ public function canCreateContainerContentElement(BackendTester $I, PageTree $pag
         $I->wait(0.2);
         $I->switchToContentFrame();
         $I->waitForText($newContentElementLabel);
-        $typo3Version = GeneralUtility::makeInstance(Typo3Version::class);
-        if ($typo3Version->getMajorVersion() < 12) {
+        if ($I->getTypo3MajorVersion() < 12) {
             $I->click($newContentElementLabel);
         } else {
             $I->executeJS("document.querySelector('typo3-backend-new-content-element-wizard-button').click()");
         }
         $I->switchToIFrame();
-        $I->waitForElement('.modal-dialog');
-        if ($typo3Version->getMajorVersion() < 12) {
+        $I->waitForModal();
+        if ($I->getTypo3MajorVersion() < 12) {
             $I->click('Container');
             $I->click('2 Column Container With Header');
         } else {
-            $I->executeJS("document.querySelector('" . $I->getNewRecordWizardSelector() . "').filter('container')");
+            $I->wait(0.5);
+            if ($I->getTypo3MajorVersion() > 13) {
+                $I->executeJS("document.querySelector('" . $I->getNewRecordWizardSelector() . "').shadowRoot.querySelector('button[data-identifier=\"container\"]').click()");
+            } else {
+                $I->executeJS("document.querySelector('" . $I->getNewRecordWizardSelector() . "').filter('container')");
+            }
             $I->wait(0.5);
             $I->executeJS("document.querySelector('" . $I->getNewRecordWizardSelector() . "').shadowRoot.querySelector('button[data-identifier=\"container_b13-2cols-with-header-container\"]').click()");
         }
@@ -177,8 +163,8 @@ public function canCreateContainerContentElement(BackendTester $I, PageTree $pag
      */
     public function canCreateContainerContentElementSaveAndClose(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13)
     {
-        $I->click('Page');
-        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
+        $I->clickLayoutModuleButton();
+        if ($I->getTypo3MajorVersion() < 13) {
             $I->waitForElement('#typo3-pagetree-tree .nodes .node');
             $pageTree->openPath(['home', 'emptyPage']);
         } else {
@@ -188,25 +174,28 @@ public function canCreateContainerContentElementSaveAndClose(BackendTester $I, P
         $I->switchToContentFrame();
         $newContentElementLabel = $I->getNewContentElementLabel();
         $I->waitForText($newContentElementLabel);
-        $typo3Version = GeneralUtility::makeInstance(Typo3Version::class);
-        if ($typo3Version->getMajorVersion() < 12) {
+        if ($I->getTypo3MajorVersion() < 12) {
             $I->click($newContentElementLabel);
         } else {
             $I->executeJS("document.querySelector('typo3-backend-new-content-element-wizard-button').click()");
         }
         $I->switchToIFrame();
-        $I->waitForElement('.modal-dialog');
-        if ($typo3Version->getMajorVersion() < 12) {
+        $I->waitForModal();
+        if ($I->getTypo3MajorVersion() < 12) {
             $I->click('Container');
             // b13-2cols
             // this also tests container-example eventListener
             // https://github.com/b13/container-example/commit/df2560e75966a73754b5d4ea091d14727c16f024
             $I->click('2 Column mod -- Some Description of the Container');
         } else {
-            $I->executeJS("document.querySelector('" . $I->getNewRecordWizardSelector() . "').filter('container')");
+            if ($I->getTypo3MajorVersion() > 13) {
+                $I->executeJS("document.querySelector('" . $I->getNewRecordWizardSelector() . "').shadowRoot.querySelector('button[data-identifier=\"container\"]').click()");
+            } else {
+                $I->executeJS("document.querySelector('" . $I->getNewRecordWizardSelector() . "').filter('container')");
+            }
             $I->wait(0.5);
             // test event listener
-            $I->see('mod -- Some Description of the Container');
+            $I->waitForText('mod -- Some Description of the Container');
             $I->executeJS("document.querySelector('" . $I->getNewRecordWizardSelector() . "').shadowRoot.querySelector('button[data-identifier=\"container_b13-2cols\"]').click()");
         }
         $I->switchToContentFrame();
@@ -221,8 +210,8 @@ public function canCreateContainerContentElementSaveAndClose(BackendTester $I, P
      */
     public function canDragAndDropElementOutsideIntoContainer(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13, Scenario $scenario)
     {
-        $I->click('Page');
-        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
+        $I->clickLayoutModuleButton();
+        if ($I->getTypo3MajorVersion() < 13) {
             $I->waitForElement('#typo3-pagetree-tree .nodes .node');
             $pageTree->openPath(['home', 'pageWithContainerAndElementOutsice']);
         } else {
@@ -237,7 +226,7 @@ public function canDragAndDropElementOutsideIntoContainer(BackendTester $I, Page
         $I->waitForElement('#element-tt_content-900 [data-colpos="' . $dataColPos . '"] .t3js-page-ce-dropzone-available');
         $I->dontSeeElement('#element-tt_content-900 #element-tt_content-901');
         $I->dragAndDrop('#element-tt_content-901 .t3js-page-ce-draghandle', '#element-tt_content-900 [data-colpos="' . $dataColPos . '"] .t3js-page-ce-dropzone-available');
-        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
+        if ($I->getTypo3MajorVersion() < 13) {
             $pageTree->openPath(['home', 'pageWithContainerAndElementOutsice']);
         } else {
             $pageTreeV13->openPath(['home', 'pageWithContainerAndElementOutsice']);
@@ -254,8 +243,8 @@ public function canDragAndDropElementOutsideIntoContainer(BackendTester $I, Page
      */
     public function newElementInHeaderColumnHasExpectedColPosAndParentSelected(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13): void
     {
-        $I->click('Page');
-        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
+        $I->clickLayoutModuleButton();
+        if ($I->getTypo3MajorVersion() < 13) {
             $I->waitForElement('#typo3-pagetree-tree .nodes .node');
             $pageTree->openPath(['home', 'pageWithContainer-2']);
         } else {
@@ -269,15 +258,14 @@ public function newElementInHeaderColumnHasExpectedColPosAndParentSelected(Backe
         $I->clickNewContentElement($colPosSelector);
         // "[data-colpos="700-200"]" can be attribute of "td" or "div" tag, depends if Fluid based page module is enabled
         $I->switchToIFrame();
-        $I->waitForElement('.modal-dialog');
-        $typo3Version = GeneralUtility::makeInstance(Typo3Version::class);
-        if ($typo3Version->getMajorVersion() < 12) {
+        $I->waitForModal();
+        if ($I->getTypo3MajorVersion() < 12) {
             $I->waitForText('Header Only');
             $I->click('Header Only');
         } else {
             $I->executeJS("document.querySelector('" . $I->getNewRecordWizardSelector() . "').filter('header ')");
             $I->waitForText('Header Only');
-            if ($typo3Version->getMajorVersion() < 13) {
+            if ($I->getTypo3MajorVersion() < 13) {
                 $I->executeJS("document.querySelector('" . $I->getNewRecordWizardSelector() . "').shadowRoot.querySelector('button[data-identifier=\"common_header\"]').click()");
             } else {
                 $I->executeJS("document.querySelector('" . $I->getNewRecordWizardSelector() . "').shadowRoot.querySelector('button[data-identifier=\"default_header\"]').click()");
@@ -296,8 +284,8 @@ public function newElementInHeaderColumnHasExpectedColPosAndParentSelected(Backe
     public function canCreateContentElementInContainer(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13)
     {
         //@depends canCreateContainer
-        $I->click('Page');
-        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
+        $I->clickLayoutModuleButton();
+        if ($I->getTypo3MajorVersion() < 13) {
             $I->waitForElement('#typo3-pagetree-tree .nodes .node');
             $pageTree->openPath(['home', 'pageWithContainer']);
         } else {
@@ -309,18 +297,17 @@ public function canCreateContentElementInContainer(BackendTester $I, PageTree $p
         $containerColumn = '#element-tt_content-1 [data-colpos="' . $dataColPos . '"]';
         $contentInContainerColumn = '#element-tt_content-1 div[data-colpos="' . $dataColPos . '"] .t3-page-ce';
         $I->waitForElement($containerColumn);
-        $typo3Version = GeneralUtility::makeInstance(Typo3Version::class);
         $I->dontSeeElement($contentInContainerColumn);
         $I->clickNewContentElement($containerColumn);
         $I->switchToIFrame();
-        $I->waitForElement('.modal-dialog');
-        if ($typo3Version->getMajorVersion() < 12) {
+        $I->waitForModal();
+        if ($I->getTypo3MajorVersion() < 12) {
             $I->waitForText('Header Only');
             $I->click('Header Only');
         } else {
             $I->executeJS("document.querySelector('" . $I->getNewRecordWizardSelector() . "').filter('header ')");
             $I->waitForText('Header Only');
-            if ($typo3Version->getMajorVersion() < 13) {
+            if ($I->getTypo3MajorVersion() < 13) {
                 $I->executeJS("document.querySelector('" . $I->getNewRecordWizardSelector() . "').shadowRoot.querySelector('button[data-identifier=\"common_header\"]').click()");
             } else {
                 $I->executeJS("document.querySelector('" . $I->getNewRecordWizardSelector() . "').shadowRoot.querySelector('button[data-identifier=\"default_header\"]').click()");
@@ -342,8 +329,8 @@ public function canCreateContentElementInContainer(BackendTester $I, PageTree $p
     public function canCreateContentElementInTranslatedContainerInFreeMode(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13)
     {
         //@depends canCreateContainer
-        $I->click('Page');
-        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
+        $I->clickLayoutModuleButton();
+        if ($I->getTypo3MajorVersion() < 13) {
             $I->waitForElement('#typo3-pagetree-tree .nodes .node');
             $pageTree->openPath(['home', 'pageWithLocalizationFreeModeWithContainer']);
         } else {
@@ -351,16 +338,7 @@ public function canCreateContentElementInTranslatedContainerInFreeMode(BackendTe
         }
         $I->wait(0.2);
         $I->switchToContentFrame();
-
-        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() < 12) {
-            $I->waitForElement('select[name="languageMenu"]');
-            $I->selectOption('select[name="languageMenu"]', 'german');
-        } else {
-            $I->waitForText('Language');
-            $I->click('Language');
-            $I->waitForText('german');
-            $I->click('german');
-        }
+        $I->selectGermanInLanguageMenu();
         $I->waitForElementNotVisible('#t3js-ui-block');
 
         $uid = 104;
@@ -371,15 +349,14 @@ public function canCreateContentElementInTranslatedContainerInFreeMode(BackendTe
         $colPosSelector = '#element-tt_content-' . $uid . ' [data-colpos="' . $dataColPos . '"]';
         $I->clickNewContentElement($colPosSelector);
         $I->switchToIFrame();
-        $I->waitForElement('.modal-dialog');
-        $typo3Version = GeneralUtility::makeInstance(Typo3Version::class);
-        if ($typo3Version->getMajorVersion() < 12) {
+        $I->waitForModal();
+        if ($I->getTypo3MajorVersion() < 12) {
             $I->waitForText('Header Only');
             $I->click('Header Only');
         } else {
             $I->executeJS("document.querySelector('" . $I->getNewRecordWizardSelector() . "').filter('header ')");
             $I->waitForText('Header Only');
-            if ($typo3Version->getMajorVersion() < 13) {
+            if ($I->getTypo3MajorVersion() < 13) {
                 $I->executeJS("document.querySelector('" . $I->getNewRecordWizardSelector() . "').shadowRoot.querySelector('button[data-identifier=\"common_header\"]').click()");
             } else {
                 $I->executeJS("document.querySelector('" . $I->getNewRecordWizardSelector() . "').shadowRoot.querySelector('button[data-identifier=\"default_header\"]').click()");
@@ -398,11 +375,11 @@ public function canCreateContentElementInTranslatedContainerInFreeMode(BackendTe
      * @param PageTree $pageTree
      * @throws \Exception
      */
-    public function canTranslateChildWithTranslationModule(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13): void
+    public function canTranslateChildWithTranslationModule(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13, Scenario $scenario): void
     {
         // test must be before canTranslateChild
-        $I->click('Page');
-        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
+        $I->clickLayoutModuleButton();
+        if ($I->getTypo3MajorVersion() < 13) {
             $I->waitForElement('#typo3-pagetree-tree .nodes .node');
             $pageTree->openPath(['home', 'pageWithTranslatedContainer']);
         } else {
@@ -411,26 +388,20 @@ public function canTranslateChildWithTranslationModule(BackendTester $I, PageTre
         $I->wait(0.2);
         $I->switchToContentFrame();
 
-        $I->waitForElement('select[name="actionMenu"]');
-        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() < 12) {
-            $I->selectOption('select[name="actionMenu"]', 'Languages');
-        } else {
-            $I->selectOption('select[name="actionMenu"]', 'Language Comparison');
-        }
-        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() < 12) {
-            $I->waitForElement('select[name="languageMenu"]');
-            $I->selectOption('select[name="languageMenu"]', 'All languages');
+        $I->selectLanguageComparisonMode();
+        $I->selectGermanInLanguageMenu();
+        if ($I->getTypo3MajorVersion() < 14) {
+            $I->waitForElementVisible('a.t3js-localize');
+            $I->click('a.t3js-localize');
         } else {
-            $I->waitForText('Language');
-            $I->click('Language');
-            $I->waitForText('All languages');
-            $I->click('All languages');
+            $I->waitForText('Translate');
+            $I->executeJS("document.querySelector('typo3-backend-localization-button').click()");
+            // AfterRecordSummaryForLocalizationEvent
+            $scenario->skip('need more work, AfterRecordSummaryForLocalizationEvent needs refactoring');
         }
-        $I->waitForElementVisible('a.t3js-localize');
-        $I->click('a.t3js-localize');
 
         $I->switchToIFrame();
-        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
+        if ($I->getTypo3MajorVersion() < 13) {
             $I->waitForElement('.t3js-localization-option');
             $I->waitForElement('div[data-bs-slide="localize-summary"]');
         }
@@ -444,8 +415,8 @@ public function canTranslateChildWithTranslationModule(BackendTester $I, PageTre
      */
     public function canTranslateChild(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13): void
     {
-        $I->click('Page');
-        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
+        $I->clickLayoutModuleButton();
+        if ($I->getTypo3MajorVersion() < 13) {
             $I->waitForElement('#typo3-pagetree-tree .nodes .node');
             $pageTree->openPath(['home', 'pageWithTranslatedContainer-2']);
         } else {
@@ -457,8 +428,21 @@ public function canTranslateChild(BackendTester $I, PageTree $pageTree, PageTree
 
         $I->click('headerOfChild', '#element-tt_content-712');
 
-        $I->waitForElement('select[name="_langSelector"]');
-        $I->selectOption('select[name="_langSelector"]', 'german [NEW]');
+        if ($I->getTypo3MajorVersion() > 13) {
+            $I->waitForText('english');
+            $I->click('.module-docheader-bar-column button');
+            $I->waitForText('german');
+            $I->executeJS("document.querySelector('typo3-backend-localization-button').click()");
+            $I->switchToIFrame();
+            $I->waitForText('Localize');
+            $I->executeJS("document.querySelector('typo3-backend-localization-wizard button.btn-primary').click()");
+            $I->waitForText('Finish');
+            $I->executeJS("document.querySelector('typo3-backend-localization-wizard').querySelector('button.btn-primary').click()");
+            $I->switchToContentFrame();
+        } else {
+            $I->waitForElement('select[name="_langSelector"]');
+            $I->selectOption('select[name="_langSelector"]', 'german [NEW]');
+        }
         $I->see('[Translate to german:] headerOfChild');
     }
 
@@ -468,8 +452,8 @@ public function canTranslateChild(BackendTester $I, PageTree $pageTree, PageTree
      */
     public function canSeeContainerColumnTitleForDifferentContainers(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13): void
     {
-        $I->click('Page');
-        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
+        $I->clickLayoutModuleButton();
+        if ($I->getTypo3MajorVersion() < 13) {
             $I->waitForElement('#typo3-pagetree-tree .nodes .node');
             $pageTree->openPath(['home', 'pageWithDifferentContainers']);
         } else {
@@ -487,10 +471,10 @@ public function canSeeContainerColumnTitleForDifferentContainers(BackendTester $
         $I->see('2-cols-right');
     }
 
-    public function canSeeCustomBackendTemplate(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13): void
+    public function canSeeCustomBackendTemplate(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13, Scenario $scenario): void
     {
-        $I->click('Page');
-        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
+        $I->clickLayoutModuleButton();
+        if ($I->getTypo3MajorVersion() < 13) {
             $I->waitForElement('#typo3-pagetree-tree .nodes .node');
             $pageTree->openPath(['home', 'pageWithDifferentContainers']);
         } else {
@@ -498,6 +482,9 @@ public function canSeeCustomBackendTemplate(BackendTester $I, PageTree $pageTree
         }
         $I->wait(0.2);
         $I->switchToContentFrame();
+        if ($I->getTypo3MajorVersion() > 13) {
+            $scenario->skip('need more work, PageContentPreviewRendering');
+        }
         $I->waitForElement('#tx-container-example-custom-backend-template');
         $I->see('custom backend template');
     }
@@ -509,8 +496,8 @@ public function canSeeCustomBackendTemplate(BackendTester $I, PageTree $pageTree
      */
     public function canSeeDescriptionOfContainerInNewContentElementWizard(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13)
     {
-        $I->click('Page');
-        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
+        $I->clickLayoutModuleButton();
+        if ($I->getTypo3MajorVersion() < 13) {
             $I->waitForElement('#typo3-pagetree-tree .nodes .node');
             $pageTree->openPath(['home', 'emptyPage']);
         } else {
@@ -520,16 +507,15 @@ public function canSeeDescriptionOfContainerInNewContentElementWizard(BackendTes
         $I->switchToContentFrame();
         $newContentElementLabel = $I->getNewContentElementLabel();
         $I->waitForText($newContentElementLabel);
-        $typo3Version = GeneralUtility::makeInstance(Typo3Version::class);
-        if ($typo3Version->getMajorVersion() < 12) {
+        if ($I->getTypo3MajorVersion() < 12) {
             $I->click($newContentElementLabel);
         } else {
             $I->executeJS("document.querySelector('typo3-backend-new-content-element-wizard-button').click()");
         }
         $I->switchToIFrame();
-        $I->waitForElement('.modal-dialog');
+        $I->waitForModal();
 
-        if ($typo3Version->getMajorVersion() < 12) {
+        if ($I->getTypo3MajorVersion() < 12) {
             $I->click('Container');
         } else {
             $I->executeJS("document.querySelector('" . $I->getNewRecordWizardSelector() . "').filter('container')");
@@ -545,8 +531,8 @@ public function canSeeDescriptionOfContainerInNewContentElementWizard(BackendTes
      */
     public function canDisableContainerContentElementInNewContentElementWizard(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13)
     {
-        $I->click('Page');
-        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
+        $I->clickLayoutModuleButton();
+        if ($I->getTypo3MajorVersion() < 13) {
             $I->waitForElement('#typo3-pagetree-tree .nodes .node');
             $pageTree->openPath(['home', 'emptyPage']);
         } else {
@@ -558,7 +544,7 @@ public function canDisableContainerContentElementInNewContentElementWizard(Backe
         $I->waitForText($newContentElementLabel);
         $I->executeJS("document.querySelector('typo3-backend-new-content-element-wizard-button').click()");
         $I->switchToIFrame();
-        $I->waitForElement('.modal-dialog');
+        $I->waitForModal();
         $I->executeJS("document.querySelector('" . $I->getNewRecordWizardSelector() . "').filter('container')");
         $I->wait(0.5);
         $I->see('2 Column Container With Header');
diff --git a/Tests/Acceptance/Backend/PageTsConfigModuleCest.php b/Tests/Acceptance/Backend/PageTsConfigModuleCest.php
index f787f510..1b8bafaa 100644
--- a/Tests/Acceptance/Backend/PageTsConfigModuleCest.php
+++ b/Tests/Acceptance/Backend/PageTsConfigModuleCest.php
@@ -16,7 +16,6 @@
 use B13\Container\Tests\Acceptance\Support\PageTree;
 use B13\Container\Tests\Acceptance\Support\PageTreeV13;
 use Codeception\Scenario;
-use TYPO3\CMS\Core\Information\Typo3Version;
 
 class PageTsConfigModuleCest
 {
@@ -30,12 +29,11 @@ public function _before(BackendTester $I)
 
     public function canSeeContainerPageTsConfig(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13, Scenario $scenario)
     {
-        $typo3Version = new Typo3Version();
-        if ($typo3Version->getMajorVersion() < 12) {
+        if ($I->getTypo3MajorVersion() < 12) {
             $scenario->skip('InfoModuleCest is used');
         }
         $I->click('Page TSconfig');
-        if ($typo3Version->getMajorVersion() < 13) {
+        if ($I->getTypo3MajorVersion() < 13) {
             $I->waitForElement('#typo3-pagetree-tree .nodes .node');
             $pageTree->openPath(['home', 'pageWithContainer-6']);
         } else {
@@ -44,17 +42,24 @@ public function canSeeContainerPageTsConfig(BackendTester $I, PageTree $pageTree
         $I->wait(0.2);
         $I->switchToContentFrame();
 
-        $I->waitForElement('select[name="moduleMenu"]');
-        $I->selectOption('select[name="moduleMenu"]', 'Active page TSconfig');
-        $I->waitForElement('input[name="searchValue"]');
-        if ($typo3Version->getMajorVersion() < 13) {
+        if ($I->getTypo3MajorVersion() < 14) {
+            $I->waitForElement('select[name="moduleMenu"]');
+            $I->selectOption('select[name="moduleMenu"]', 'Active page TSconfig');
+            $I->waitForElement('input[name="searchValue"]');
+        } else {
+            $I->waitForElementVisible('.module-docheader-buttons .btn-group button.dropdown-toggle');
+            $I->click('.module-docheader-buttons .btn-group button.dropdown-toggle');
+            $I->waitForElementVisible('.module-docheader-buttons .dropdown-menu');
+            $I->click('Active page TSconfig', '.module-docheader-buttons .dropdown-menu');
+        }
+        if ($I->getTypo3MajorVersion() < 13) {
             $I->fillField('searchValue', 'b13-2cols-with-header-container');
         } else {
             $I->fillField('searchValue', 'b13-1col');
         }
         $I->waitForText('Configuration');
         $I->click('Configuration');
-        if ($typo3Version->getMajorVersion() > 12) {
+        if ($I->getTypo3MajorVersion() > 12) {
             $I->waitForText('b13-1col');
             $I->dontSee('show = b13-2cols-with-header-container');
             $I->see('removeItems = b13-1col');
diff --git a/Tests/Acceptance/Backend/WorkspaceCest.php b/Tests/Acceptance/Backend/WorkspaceCest.php
index c8a093a8..13c7776f 100644
--- a/Tests/Acceptance/Backend/WorkspaceCest.php
+++ b/Tests/Acceptance/Backend/WorkspaceCest.php
@@ -15,8 +15,6 @@
 use B13\Container\Tests\Acceptance\Support\BackendTester;
 use B13\Container\Tests\Acceptance\Support\PageTree;
 use B13\Container\Tests\Acceptance\Support\PageTreeV13;
-use TYPO3\CMS\Core\Information\Typo3Version;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\TestingFramework\Core\Acceptance\Helper\Topbar;
 
 class WorkspaceCest
@@ -43,8 +41,8 @@ public function _before(BackendTester $I)
      */
     public function liveWorkspaceShowsLiveElements(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13)
     {
-        $I->click('Page');
-        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
+        $I->clickLayoutModuleButton();
+        if ($I->getTypo3MajorVersion() < 13) {
             $I->waitForElement('#typo3-pagetree-tree .nodes .node');
             $pageTree->openPath(['home', 'pageWithWorkspace']);
         } else {
@@ -65,9 +63,9 @@ public function liveWorkspaceShowsLiveElements(BackendTester $I, PageTree $pageT
      */
     public function testWorkspaceShowsWorkspaceElements(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13)
     {
-        $I->click('Page');
+        $I->clickLayoutModuleButton();
         $this->switchToTestWs($I);
-        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
+        if ($I->getTypo3MajorVersion() < 13) {
             $I->waitForElement('#typo3-pagetree-tree .nodes .node');
             $pageTree->openPath(['home', 'pageWithWorkspace']);
         } else {
@@ -89,8 +87,8 @@ public function testWorkspaceShowsWorkspaceElements(BackendTester $I, PageTree $
      */
     public function liveWorkspaceShowsLiveElementsForTranslations(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13): void
     {
-        $I->click('Page');
-        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
+        $I->clickLayoutModuleButton();
+        if ($I->getTypo3MajorVersion() < 13) {
             $I->waitForElement('#typo3-pagetree-tree .nodes .node');
             $pageTree->openPath(['home', 'pageWithWorkspace']);
         } else {
@@ -98,16 +96,9 @@ public function liveWorkspaceShowsLiveElementsForTranslations(BackendTester $I,
         }
         $I->wait(0.2);
         $I->switchToContentFrame();
-        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() < 12) {
-            $I->waitForElement('select[name="languageMenu"]');
-            $I->selectOption('select[name="languageMenu"]', 'german');
-        } else {
-            $I->waitForText('Language');
-            $I->click('Language');
-            $I->waitForText('german');
-            $I->click('german');
-        }
+        $I->selectGermanInLanguageMenu();
         $I->waitForElementNotVisible('#t3js-ui-block');
+        $I->waitForText('translation-live');
         $I->see('translation-live');
         $I->dontSee('translation-ws');
     }
@@ -119,9 +110,9 @@ public function liveWorkspaceShowsLiveElementsForTranslations(BackendTester $I,
      */
     public function testWorkspaceShowsLiveElementsForTranslations(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13): void
     {
-        $I->click('Page');
+        $I->clickLayoutModuleButton();
         $this->switchToTestWs($I);
-        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
+        if ($I->getTypo3MajorVersion() < 13) {
             $I->waitForElement('#typo3-pagetree-tree .nodes .node');
             $pageTree->openPath(['home', 'pageWithWorkspace']);
         } else {
@@ -129,17 +120,8 @@ public function testWorkspaceShowsLiveElementsForTranslations(BackendTester $I,
         }
         $I->wait(0.2);
         $I->switchToContentFrame();
-        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() < 12) {
-            $I->waitForElement('select[name="languageMenu"]');
-            $I->selectOption('select[name="languageMenu"]', 'german');
-        } else {
-            $I->waitForText('Language');
-            $I->click('Language');
-            $I->waitForText('german');
-            $I->click('german');
-        }
+        $I->selectGermanInLanguageMenu();
         $I->waitForElementNotVisible('#t3js-ui-block');
-
         $I->dontSee('translation-live');
         $I->see('translation-ws');
         $this->switchToLiveWs($I);
@@ -150,9 +132,9 @@ public function testWorkspaceShowsLiveElementsForTranslations(BackendTester $I,
      */
     public function testWorkspaceShowsLiveContainerUidForContainerParentFieldWhenContainerIsAlreadyMoved(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13)
     {
-        $I->click('Page');
+        $I->clickLayoutModuleButton();
         $this->switchToTestWs($I);
-        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
+        if ($I->getTypo3MajorVersion() < 13) {
             $I->waitForElement('#typo3-pagetree-tree .nodes .node');
             $pageTree->openPath(['home', 'pageWithWorkspace-movedContainer']);
         } else {
diff --git a/Tests/Acceptance/Support/BackendTester.php b/Tests/Acceptance/Support/BackendTester.php
index 2853eae6..d1e86c81 100644
--- a/Tests/Acceptance/Support/BackendTester.php
+++ b/Tests/Acceptance/Support/BackendTester.php
@@ -15,7 +15,6 @@
 use B13\Container\Tests\Acceptance\Support\_generated\BackendTesterActions;
 use Codeception\Util\Locator;
 use TYPO3\CMS\Core\Information\Typo3Version;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\TestingFramework\Core\Acceptance\Step\FrameSteps;
 
 class BackendTester extends \Codeception\Actor
@@ -23,6 +22,11 @@ class BackendTester extends \Codeception\Actor
     use BackendTesterActions;
     use FrameSteps;
 
+    public function getTypo3MajorVersion(): int
+    {
+        return (new Typo3Version())->getMajorVersion();
+    }
+
     public function loginAs(string $username): void
     {
         $I = $this;
@@ -47,16 +51,25 @@ public function loginAs(string $username): void
 
     public function getDataColPos(int $containerId, int $colPos): string
     {
-        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() > 11) {
+        if ($this->getTypo3MajorVersion() > 11) {
             return (string)$colPos;
         }
         return (string)($containerId . '-' . $colPos);
     }
 
+    public function clickLayoutModuleButton(): void
+    {
+        if ($this->getTypo3MajorVersion() < 14) {
+            $this->click('Page');
+        } else {
+            $this->click('Layout');
+        }
+    }
+
     public function clickNewContentElement(string $colPosSelector): void
     {
         $this->waitForElement($colPosSelector);
-        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 12) {
+        if ($this->getTypo3MajorVersion() < 12) {
             $this->click('Content', $colPosSelector);
             return;
         }
@@ -65,7 +78,7 @@ public function clickNewContentElement(string $colPosSelector): void
 
     public function getNewContentElementLabel(): string
     {
-        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 12) {
+        if ($this->getTypo3MajorVersion() < 12) {
             return 'Content';
         }
         return 'Create new content';
@@ -73,9 +86,53 @@ public function getNewContentElementLabel(): string
 
     public function getNewRecordWizardSelector(): string
     {
-        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
+        if ($this->getTypo3MajorVersion() < 13) {
             return 'typo3-backend-new-content-element-wizard';
         }
         return 'typo3-backend-new-record-wizard';
     }
+
+    public function waitForModal(): void
+    {
+        if ($this->getTypo3MajorVersion() < 14) {
+            $this->waitForElement('.modal-dialog');
+        } else {
+            $this->waitForElement('dialog.t3js-modal');
+        }
+    }
+
+    public function selectGermanInLanguageMenu(): void
+    {
+        if ($this->getTypo3MajorVersion() < 12) {
+            $this->waitForElement('select[name="languageMenu"]');
+            $this->selectOption('select[name="languageMenu"]', 'german');
+        } elseif ($this->getTypo3MajorVersion() < 14) {
+            $this->waitForText('Language');
+            $this->click('Language');
+            $this->waitForText('german');
+            $this->click('german');
+        } else {
+            $this->waitForText('english');
+            //$this->click('english');
+            $this->click('.module-docheader-bar-column button');
+            $this->waitForText('german');
+            $this->click('german');
+        }
+    }
+
+    public function selectLanguageComparisonMode(): void
+    {
+        if ($this->getTypo3MajorVersion() < 12) {
+            $this->waitForElement('select[name="actionMenu"]');
+            $this->selectOption('select[name="actionMenu"]', 'Languages');
+        } elseif ($this->getTypo3MajorVersion() < 14) {
+            $this->waitForElement('select[name="actionMenu"]');
+            $this->selectOption('select[name="actionMenu"]', 'Language Comparison');
+        } else {
+            $this->waitForElementVisible('.module-docheader-buttons .btn-group button.dropdown-toggle');
+            $this->click('.module-docheader-buttons .btn-group button.dropdown-toggle');
+            $this->waitForElementVisible('.module-docheader-buttons .dropdown-menu');
+            $this->click('Language Comparison', '.module-docheader-buttons .dropdown-menu');
+        }
+    }
 }
diff --git a/Tests/Acceptance/Support/Extension/BackendContainerEnvironment.php b/Tests/Acceptance/Support/Extension/BackendContainerEnvironment.php
index a9daaf97..e61f2b1c 100644
--- a/Tests/Acceptance/Support/Extension/BackendContainerEnvironment.php
+++ b/Tests/Acceptance/Support/Extension/BackendContainerEnvironment.php
@@ -12,6 +12,9 @@
  * of the License, or any later version.
  */
 
+use Codeception\Event\SuiteEvent;
+use TYPO3\CMS\Core\Information\Typo3Version;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\TestingFramework\Core\Acceptance\Extension\BackendEnvironment;
 
 class BackendContainerEnvironment extends BackendEnvironment
@@ -63,4 +66,15 @@ class BackendContainerEnvironment extends BackendEnvironment
             __DIR__ . '/../../Fixtures/be_groups.csv',
         ],
     ];
+
+    public function bootstrapTypo3Environment(SuiteEvent $suiteEvent)
+    {
+        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() >= 14) {
+            $this->config['testExtensionsToLoad'] = [
+                'b13/container',
+                'b13/container-example',
+            ];
+        }
+        parent::bootstrapTypo3Environment($suiteEvent);
+    }
 }
diff --git a/Tests/README.md b/Tests/README.md
index 40582d8d..a1d188a9 100644
--- a/Tests/README.md
+++ b/Tests/README.md
@@ -11,13 +11,9 @@
     composer install
     # prepare functional tests
     # prepare acceptance tests
-    composer require helhum/dotenv-connector
-    cp Build/envs/.env.local .env
     mkdir -p config/system
     cd config && ln -s ../Build/sites && cd -
     cp Build/settings.php config/system
-    # 11
-    cp Build/LocalConfiguration.php .Build/Web/typo3conf/
     .Build/bin/typo3 extension:setup
     # run php webserver and chromedriver
     php -S 0.0.0.0:8080 -t .Build/Web/ &