diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 996d2fad7..e564e56fd 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -19,10 +19,11 @@ env:
   DRUPAL_TESTING_TEST_PROFILE: thunder
   DRUPAL_TESTING_HTTP_PORT: 8888
   DRUPAL_TESTING_VERBOSE: false
-  DRUPAL_TESTING_VERSION: "^1.0.36"
+  DRUPAL_TESTING_VERSION: "dev-code-coverage"
+  DRUPAL_TESTING_TEST_FILTER: "EntitiesWithTermTest"
   THUNDER_ADMIN_BRANCH: 4.x
   PHPSTAN_MEMORY_LIMIT: 4G
-  DRUPAL_TESTING_PARALLEL_TESTING: true
+  DRUPAL_TESTING_PARALLEL_TESTING: false
   SIMPLETEST_BASE_URL: http://thunder-testing:8888
   SKIP_TEST_CLEANUP: true
 
@@ -121,7 +122,7 @@ jobs:
       fail-fast: false
       matrix:
         PHP_VERSION: [ '7.4', '8.1' ]
-        CHUNK: [ 1, 2, 3 ]
+        #CHUNK: [ 1, 2, 3 ]
 
     steps:
       - uses: actions/checkout@v1
@@ -130,7 +131,7 @@ jobs:
         with:
           coverage: none
           php-version: ${{ matrix.PHP_VERSION }}
-          extensions: :sodium, Imagick, gd, PDO, mysql, pdo_mysql, mbstring, xmlwriter, pdo, date, dom, filter, hash, json, pcre, session, SimpleXML, SPL, tokenizer, xml, curl
+          extensions: :sodium, Imagick, gd, PDO, mysql, pdo_mysql, mbstring, xmlwriter, pdo, date, dom, filter, hash, json, pcre, session, SimpleXML, SPL, tokenizer, xml, curl, pcov
 
       - name: Add host
         run: echo "127.0.0.1 thunder-testing" | sudo tee -a /etc/hosts
@@ -161,9 +162,22 @@ jobs:
       - name: Run tests
         run: test-drupal-project run_tests
         env:
-          THUNDER_TEST_CHUNK: ${{ matrix.CHUNK }}
+          #THUNDER_TEST_CHUNK: ${{ matrix.CHUNK }}
           DRUPAL_TESTING_TEST_PATH: /tmp/test/thunder/install/docroot/profiles/contrib/thunder/tests/src/TestSuites/ThunderTestSuite.php
 
+      #   Start a debug session.
+      - name: Setup tmate session
+        uses: mxschmitt/action-tmate@v3
+
+      - name: Zip code coverage
+        run: cd /tmp; tar cfz coverage-${{ matrix.PHP_VERSION }}.tgz coverage; mv coverage-${{ matrix.PHP_VERSION }}.tgz ${GITHUB_WORKSPACE}
+
+      - name: Upload build
+        uses: actions/upload-artifact@v2
+        with:
+          name: coverage-${{ matrix.PHP_VERSION }}
+          path: coverage-${{ matrix.PHP_VERSION }}.tgz
+
   test-upgrade:
 
     runs-on: ubuntu-20.04
diff --git a/composer.json b/composer.json
index 09f42268f..54b1fee5e 100644
--- a/composer.json
+++ b/composer.json
@@ -73,7 +73,7 @@
         "drupal/config_update": "^1.7",
         "drupal/content_lock": "^2.1",
         "drupal/crop": "^2.2",
-        "drupal/ctools": "^3.4",
+        "drupal/ctools": "^3.6",
         "drupal/default_content": "^1.0-alpha7||^2.0@ALPHA",
         "drupal/diff": "1.0",
         "drupal/dropzonejs": "^2.1",
diff --git a/config/install/editor.editor.basic_html.yml b/config/install/editor.editor.basic_html.yml
index 757613007..903af812a 100644
--- a/config/install/editor.editor.basic_html.yml
+++ b/config/install/editor.editor.basic_html.yml
@@ -39,13 +39,9 @@ settings:
           items:
             - Source
   plugins:
-    stylescombo:
-      styles: ''
     drupallink:
       linkit_enabled: true
       linkit_profile: default
-    language:
-      language_list: un
 image_upload:
   status: true
   scheme: public
diff --git a/config/install/editor.editor.full_html.yml b/config/install/editor.editor.full_html.yml
index 938533f48..d6579dbbe 100644
--- a/config/install/editor.editor.full_html.yml
+++ b/config/install/editor.editor.full_html.yml
@@ -47,13 +47,9 @@ settings:
             - ShowBlocks
             - Source
   plugins:
-    stylescombo:
-      styles: ''
     drupallink:
       linkit_enabled: true
       linkit_profile: default
-    language:
-      language_list: un
 image_upload:
   status: true
   scheme: public
diff --git a/config/optional/pathauto.pattern.article.yml b/config/optional/pathauto.pattern.article.yml
index ab0d223ae..cb9a77f53 100644
--- a/config/optional/pathauto.pattern.article.yml
+++ b/config/optional/pathauto.pattern.article.yml
@@ -9,7 +9,7 @@ type: 'canonical_entities:node'
 pattern: '[node:field_seo_title]'
 selection_criteria:
   3dade791-a55f-4114-9fba-4b38c8f572f7:
-    id: node_type
+    id: 'entity_bundle:node'
     negate: false
     uuid: 3dade791-a55f-4114-9fba-4b38c8f572f7
     context_mapping: