diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 5caa82fddd4f..98aa948b795e 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,6 +2,8 @@
 
 Each pull request should address a single issue and have a meaningful title.
 
+- Pull requests must be in English.
+- If a pull request fixes an issue, reference the issue with a suitable keyword (e.g., Fixes <issue number>).
 - All bug fixes should be sent to the __"develop"__ branch, this is where the next bug fix version will be developed.
 - PRs with any enhancement should be sent to the next minor version branch, e.g. __"4.3"__
 
@@ -15,15 +17,3 @@ Explain what you have changed, and why.
 - [ ] Unit testing, with >80% coverage
 - [ ] User guide updated
 - [ ] Conforms to style guide
-
-<!--
-
-**Notes**
-- Pull requests must be in English
-- If the PR solves an issue, reference it with a suitable verb and the issue number
-(e.g. fixes <hash>12345)
-- Unsolicited pull requests will be considered, but there is no guarantee of acceptance
-- Pull requests should be from a feature branch in the contributor's fork of the repository
-  to the develop branch of the project repository
-
--->
diff --git a/.github/scripts/validate-version b/.github/scripts/validate-version
new file mode 100644
index 000000000000..d8fa85cdf959
--- /dev/null
+++ b/.github/scripts/validate-version
@@ -0,0 +1,21 @@
+#!/bin/bash
+set -o pipefail
+
+if [[ -z $1 ]]; then
+    echo "validate-version requires a version identifier"
+    exit 1
+fi
+
+FILES=("system/CodeIgniter.php" "user_guide_src/source/conf.py")
+LENGTH="${#FILES[@]}"
+
+for FILE in "${FILES[@]}"; do
+    COUNT="$((COUNT + $(grep -c "$FILE" -e "$1")))"
+done
+
+if [[ $COUNT -ne $LENGTH ]]; then
+    echo "CodeIgniter version is not updated to v"$1""
+    exit 1
+fi
+
+echo "CodeIgniter version is updated to v"$1""
diff --git a/.github/workflows/deploy-framework.yml b/.github/workflows/deploy-distributables.yml
similarity index 53%
rename from .github/workflows/deploy-framework.yml
rename to .github/workflows/deploy-distributables.yml
index 9fdbc8f08127..d00ebc5a9f36 100644
--- a/.github/workflows/deploy-framework.yml
+++ b/.github/workflows/deploy-distributables.yml
@@ -1,16 +1,40 @@
-# When a new Release is created, deploy relevant
+# When a new release is created, deploy relevant
 # files to each of the generated repos.
-name: Deploy Framework
+name: Deploy Distributable Repos
 
 on:
   release:
     types: [published]
 
 jobs:
+  check-version:
+    name: Check for updated version
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0 # fetch all tags
+
+      - name: Get latest version
+        run: |
+          echo 'LATEST_VERSION<<EOF' >> $GITHUB_ENV
+          echo $(git describe --tags --abbrev=0) | sed "s/v//" >> $GITHUB_ENV
+          echo 'EOF' >> $GITHUB_ENV
+
+      - name: Search for updated version
+        if: ${{ env.LATEST_VERSION }}
+        run: |
+          chmod +x ${GITHUB_WORKSPACE}/.github/scripts/validate-version
+          ${GITHUB_WORKSPACE}/.github/scripts/validate-version ${{ env.LATEST_VERSION }}
+
   framework:
     name: Deploy to framework
     if: github.repository == 'codeigniter4/CodeIgniter4'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
+    needs: check-version
+
     steps:
       - name: Identify
         run: |
@@ -55,7 +79,9 @@ jobs:
   appstarter:
     name: Deploy to appstarter
     if: github.repository == 'codeigniter4/CodeIgniter4'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
+    needs: check-version
+
     steps:
       - name: Identify
         run: |
@@ -96,3 +122,56 @@ jobs:
               name: release.data.name,
               body: release.data.body
             })
+
+  userguide:
+    name: Deploy to userguide
+    if: github.repository == 'codeigniter4/CodeIgniter4'
+    runs-on: ubuntu-22.04
+    needs: check-version
+
+    steps:
+      - name: Identify
+        run: |
+          git config --global user.email "action@github.com"
+          git config --global user.name "${GITHUB_ACTOR}"
+
+      - name: Checkout source
+        uses: actions/checkout@v3
+        with:
+          path: source
+
+      - name: Checkout target
+        uses: actions/checkout@v3
+        with:
+          repository: codeigniter4/userguide
+          token: ${{ secrets.ACCESS_TOKEN }}
+          path: userguide
+
+      - name: Install Sphinx
+        run: |
+          sudo apt install python3-sphinx
+          sudo pip3 install sphinxcontrib-phpdomain
+          sudo pip3 install sphinx_rtd_theme
+
+      - name: Chmod
+        run: chmod +x ./source/.github/scripts/deploy-userguide
+
+      - name: Deploy
+        run: ./source/.github/scripts/deploy-userguide ${GITHUB_WORKSPACE}/source ${GITHUB_WORKSPACE}/userguide ${GITHUB_REF##*/}
+
+      - name: Release
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{secrets.ACCESS_TOKEN}}
+          script: |
+            const release = await github.rest.repos.getLatestRelease({
+              owner: context.repo.owner,
+              repo: context.repo.repo
+            })
+            github.rest.repos.createRelease({
+              owner: context.repo.owner,
+              repo: 'userguide',
+              tag_name: release.data.tag_name,
+              name: release.data.name,
+              body: release.data.body
+            })
diff --git a/.github/workflows/deploy-userguide.yml b/.github/workflows/deploy-userguide.yml
deleted file mode 100644
index 384eeef5186f..000000000000
--- a/.github/workflows/deploy-userguide.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-# When a new Release is created, deploy relevant
-# files to each of the generated repos.
-name: Deploy User Guide
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  framework:
-    name: Deploy to userguide
-    if: (github.repository == 'codeigniter4/CodeIgniter4')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Identify
-        run: |
-          git config --global user.email "action@github.com"
-          git config --global user.name "${GITHUB_ACTOR}"
-
-      - name: Checkout source
-        uses: actions/checkout@v3
-        with:
-          path: source
-
-      - name: Checkout target
-        uses: actions/checkout@v3
-        with:
-          repository: codeigniter4/userguide
-          token: ${{ secrets.ACCESS_TOKEN }}
-          path: userguide
-
-      - name: Install Sphinx
-        run: |
-          sudo apt install python3-sphinx
-          sudo pip3 install sphinxcontrib-phpdomain
-          sudo pip3 install sphinx_rtd_theme
-
-      - name: Chmod
-        run: chmod +x ./source/.github/scripts/deploy-userguide
-
-      - name: Deploy
-        run: ./source/.github/scripts/deploy-userguide ${GITHUB_WORKSPACE}/source ${GITHUB_WORKSPACE}/userguide ${GITHUB_REF##*/}
-
-      - name: Release
-        uses: actions/github-script@v6
-        with:
-          github-token: ${{secrets.ACCESS_TOKEN}}
-          script: |
-            const release = await github.rest.repos.getLatestRelease({
-              owner: context.repo.owner,
-              repo: context.repo.repo
-            })
-            github.rest.repos.createRelease({
-              owner: context.repo.owner,
-              repo: 'userguide',
-              tag_name: release.data.tag_name,
-              name: release.data.name,
-              body: release.data.body
-            })
diff --git a/.github/workflows/test-deptrac.yml b/.github/workflows/test-deptrac.yml
index 8b9a598885de..e756f83ebcd7 100644
--- a/.github/workflows/test-deptrac.yml
+++ b/.github/workflows/test-deptrac.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: '8.1'
           tools: composer, phive
           extensions: intl, json, mbstring, gd, mysqlnd, xdebug, xml, sqlite3
 
diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
index 253263e78884..bd8ed58fd579 100644
--- a/.github/workflows/test-phpunit.yml
+++ b/.github/workflows/test-phpunit.yml
@@ -47,13 +47,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.4', '8.0', '8.1']
+        php-versions: ['7.4', '8.0', '8.1', '8.2']
         db-platforms: ['MySQLi', 'Postgre', 'SQLite3', 'SQLSRV', 'OCI8']
         mysql-versions: ['5.7']
         include:
           - php-versions: '7.4'
             db-platforms: MySQLi
             mysql-versions: '8.0'
+          - php-versions: '8.2'
+            composer-option: '--ignore-platform-req=php'
 
     services:
       mysql:
@@ -148,8 +150,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer update --ansi --no-interaction
-          composer remove --ansi --dev --unused -W -- rector/rector phpstan/phpstan friendsofphp/php-cs-fixer nexusphp/cs-config codeigniter/coding-standard
+          composer update --ansi --no-interaction ${{ matrix.composer-option }}
+          composer remove --ansi --dev --unused ${{ matrix.composer-option }} -W -- rector/rector phpstan/phpstan friendsofphp/php-cs-fixer nexusphp/cs-config codeigniter/coding-standard
 
       - name: Profile slow tests in PHP ${{ env.COVERAGE_PHP_VERSION }}
         if: matrix.php-versions == env.COVERAGE_PHP_VERSION
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65692f144275..f3364aa3d2bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog
 
+## [v4.2.10](https://github.com/codeigniter4/CodeIgniter4/tree/v4.2.10) (2022-11-05)
+[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.2.9...v4.2.10)
+
+### Fixed Bugs
+* docs: fix PHPDoc types in Session by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6796
+* fix: output "0" at the end of toolbar js when Kint::$enabled_mode is false by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6809
+
+### Refactoring
+* Refactor assertHeaderEmitted and assertHeaderNotEmitted by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/6806
+* fix: variable types for PHPStan 1.9.0 by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6810
+
+## [v4.2.9](https://github.com/codeigniter4/CodeIgniter4/tree/v4.2.9) (2022-10-30)
+[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.2.8...v4.2.9)
+
+**Hotfix release to fix PHPUnit errors (see https://github.com/codeigniter4/CodeIgniter4/pull/6794)**
+
 ## [v4.2.8](https://github.com/codeigniter4/CodeIgniter4/tree/v4.2.8) (2022-10-30)
 [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.2.7...v4.2.8)
 
diff --git a/admin/RELEASE.md b/admin/RELEASE.md
index 174147ac5733..d37868bf1d5b 100644
--- a/admin/RELEASE.md
+++ b/admin/RELEASE.md
@@ -60,15 +60,15 @@ CodeIgniter 4.x.x release.
 
 See the changelog: https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md
 ```
-* Watch for the "Deploy Framework" Action to make sure **framework** and **appstarter** get updated
-* Run the following commands to install and test AppStarter and verify the new version:
+* Watch for the "Deploy Distributable Repos" action to make sure **framework**, **appstarter**, and **userguide** get updated
+* Run the following commands to install and test `appstarter` and verify the new version:
 ```console
 composer create-project codeigniter4/appstarter release-test
 cd release-test
 composer test && composer info codeigniter4/framework
 ```
-* Verify that the User Guide Actions succeeded:
-    * "Deploy User Guide", framework repo
+* Verify that the user guide actions succeeded:
+    * "Deploy Distributable Repos", framework repo
     * "Deploy Production", UG repo
     * "pages-build-deployment", both repos
 * Fast-forward `develop` branch to catch the merge commit from `master`
diff --git a/admin/framework/composer.json b/admin/framework/composer.json
index 486cdf6787ab..fe66bb2934e4 100644
--- a/admin/framework/composer.json
+++ b/admin/framework/composer.json
@@ -17,7 +17,7 @@
     "require-dev": {
         "codeigniter/coding-standard": "^1.5",
         "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "~3.12.0",
+        "friendsofphp/php-cs-fixer": "~3.13.0",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.6",
         "phpunit/phpunit": "^9.1",
@@ -38,6 +38,7 @@
         "ext-redis": "If you use Cache class RedisHandler",
         "ext-dom": "If you use TestResponse",
         "ext-libxml": "If you use TestResponse",
+        "ext-xdebug": "If you use CIUnitTestCase::assertHeaderEmitted()",
         "ext-fileinfo": "Improves mime type detection for files",
         "ext-readline": "Improves CLI::input() usability"
     },
diff --git a/composer.json b/composer.json
index da3d66ccda58..dccc0379924f 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     "require-dev": {
         "codeigniter/coding-standard": "^1.5",
         "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "~3.12.0",
+        "friendsofphp/php-cs-fixer": "~3.13.0",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.6",
         "nexusphp/tachycardia": "^1.0",
@@ -43,6 +43,7 @@
         "ext-redis": "If you use Cache class RedisHandler",
         "ext-dom": "If you use TestResponse",
         "ext-libxml": "If you use TestResponse",
+        "ext-xdebug": "If you use CIUnitTestCase::assertHeaderEmitted()",
         "ext-fileinfo": "Improves mime type detection for files",
         "ext-readline": "Improves CLI::input() usability"
     },
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 0f5303c7ea2f..4d738aed462f 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -47,7 +47,7 @@ class CodeIgniter
     /**
      * The current version of CodeIgniter Framework
      */
-    public const CI_VERSION = '4.2.8';
+    public const CI_VERSION = '4.2.10';
 
     /**
      * App startup time.
diff --git a/system/Config/Factories.php b/system/Config/Factories.php
index 9e02fc43e3f5..c6bb25de0794 100644
--- a/system/Config/Factories.php
+++ b/system/Config/Factories.php
@@ -31,7 +31,7 @@ class Factories
      * Store of component-specific options, usually
      * from CodeIgniter\Config\Factory.
      *
-     * @var array<string, array>
+     * @var array<string, array<string, bool|string|null>>
      */
     protected static $options = [];
 
@@ -39,7 +39,7 @@ class Factories
      * Explicit options for the Config
      * component to prevent logic loops.
      *
-     * @var array<string, mixed>
+     * @var array<string, bool|string|null>
      */
     private static array $configOptions = [
         'component'  => 'config',
@@ -53,7 +53,8 @@ class Factories
      * Mapping of class basenames (no namespace) to
      * their instances.
      *
-     * @var array<string, string[]>
+     * @var array<string, array<string, string>>
+     * @phpstan-var array<string, array<string, class-string>>
      */
     protected static $basenames = [];
 
@@ -63,7 +64,8 @@ class Factories
      * A multi-dimensional array with components as
      * keys to the array of name-indexed instances.
      *
-     * @var array<string, array>
+     * @var array<string, array<string, object>>
+     * @phpstan-var  array<string, array<class-string, object>>
      */
     protected static $instances = [];
 
@@ -74,9 +76,10 @@ class Factories
      *
      * @template T of Model
      *
-     * @param class-string<T> $name
+     * @phpstan-param class-string<T> $name
      *
-     * @return T
+     * @return Model
+     * @phpstan-return T
      */
     public static function models(string $name, array $options = [], ?ConnectionInterface &$conn = null)
     {
@@ -228,7 +231,7 @@ protected static function verifyInstanceOf(array $options, string $name): bool
      *
      * @param string $component Lowercase, plural component name
      *
-     * @return array<string, mixed>
+     * @return array<string, bool|string|null>
      */
     public static function getOptions(string $component): array
     {
@@ -253,7 +256,7 @@ public static function getOptions(string $component): array
      *
      * @param string $component Lowercase, plural component name
      *
-     * @return array<string, mixed> The result after applying defaults and normalization
+     * @return array<string, bool|string|null> The result after applying defaults and normalization
      */
     public static function setOptions(string $component, array $values): array
     {
diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php
index a10fefd2e3c6..f980e3923e48 100755
--- a/system/Database/SQLSRV/Connection.php
+++ b/system/Database/SQLSRV/Connection.php
@@ -141,7 +141,7 @@ public function connect(bool $persistent = false)
         $errors = [];
 
         foreach (sqlsrv_errors(SQLSRV_ERR_ERRORS) as $error) {
-            $errors[] = preg_replace('/(\[.+\]\[.+\](?:\[.+\])?)(.+)/', '$2', $error['message']);
+            $errors[] = (string) preg_replace('/(\[.+\]\[.+\](?:\[.+\])?)(.+)/', '$2', $error['message']);
         }
 
         throw new DatabaseException(implode("\n", $errors));
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index f93bfa0a0f31..5e70dbc437ff 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -405,6 +405,7 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r
             $kintScript         = @Kint::dump('');
             Kint::$mode_default = $oldKintMode;
             $kintScript         = substr($kintScript, 0, strpos($kintScript, '</style>') + 8);
+            $kintScript         = ($kintScript === '0') ? '' : $kintScript;
 
             $script = PHP_EOL
                 . '<script type="text/javascript" ' . csp_script_nonce() . ' id="debugbar_loader" '
diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index 2ecf69cc0242..1e8a1aedbaad 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -474,7 +474,7 @@ protected function setResponseHeaders(array $headers = [])
                 }
 
                 if (isset($matches[2])) {
-                    $this->response->setStatusCode($matches[2], $matches[3] ?? null);
+                    $this->response->setStatusCode((int) $matches[2], $matches[3] ?? null);
                 }
             }
         }
diff --git a/system/Helpers/text_helper.php b/system/Helpers/text_helper.php
index 8ad9797d1ee9..51b2c7dbafa7 100755
--- a/system/Helpers/text_helper.php
+++ b/system/Helpers/text_helper.php
@@ -598,7 +598,7 @@ function increment_string(string $str, string $separator = '_', int $first = 1):
     {
         preg_match('/(.+)' . preg_quote($separator, '/') . '([0-9]+)$/', $str, $match);
 
-        return isset($match[2]) ? $match[1] . $separator . ($match[2] + 1) : $str . $separator . $first;
+        return isset($match[2]) ? $match[1] . $separator . ((int) $match[2] + 1) : $str . $separator . $first;
     }
 }
 
diff --git a/system/Model.php b/system/Model.php
index 04628bbb2c1a..ae540bb50213 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -157,8 +157,8 @@ public function setTable(string $table)
 
     /**
      * Fetches the row of database from $this->table with a primary key
-     * matching $id. This methods works only with dbCalls
-     * This methods works only with dbCalls
+     * matching $id.
+     * This method works only with dbCalls.
      *
      * @param bool                  $singleton Single or multiple results
      * @param array|int|string|null $id        One primary key or an array of primary keys
@@ -189,8 +189,8 @@ protected function doFind(bool $singleton, $id = null)
     }
 
     /**
-     * Fetches the column of database from $this->table
-     * This methods works only with dbCalls
+     * Fetches the column of database from $this->table.
+     * This method works only with dbCalls.
      *
      * @param string $columnName Column Name
      *
@@ -204,7 +204,7 @@ protected function doFindColumn(string $columnName)
     /**
      * Works with the current Query Builder instance to return
      * all results, while optionally limiting them.
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @param int $limit  Limit
      * @param int $offset Offset
@@ -227,7 +227,7 @@ protected function doFindAll(int $limit = 0, int $offset = 0)
     /**
      * Returns the first row of the result set. Will take any previous
      * Query Builder calls into account when determining the result set.
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @return array|object|null
      */
@@ -252,7 +252,7 @@ protected function doFirst()
 
     /**
      * Inserts data into the current table.
-     * This method works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @param array $data Data
      *
@@ -288,7 +288,7 @@ protected function doInsert(array $data)
 
     /**
      * Compiles batch insert strings and runs the queries, validating each row prior.
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @param array|null $set       An associative array of insert values
      * @param bool|null  $escape    Whether to escape values
@@ -314,7 +314,7 @@ protected function doInsertBatch(?array $set = null, ?bool $escape = null, int $
 
     /**
      * Updates a single record in $this->table.
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @param array|int|string|null $id
      * @param array|null            $data
@@ -340,7 +340,7 @@ protected function doUpdate($id = null, $data = null): bool
 
     /**
      * Compiles an update string and runs the query
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @param array|null  $set       An associative array of update values
      * @param string|null $index     The where key
@@ -359,7 +359,7 @@ protected function doUpdateBatch(?array $set = null, ?string $index = null, int
     /**
      * Deletes a single record from $this->table where $id matches
      * the table's primaryKey
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @param array|int|string|null $id    The rows primary key(s)
      * @param bool                  $purge Allows overriding the soft deletes setting.
@@ -404,7 +404,7 @@ protected function doDelete($id = null, bool $purge = false)
     /**
      * Permanently deletes all rows that have been marked as deleted
      * through soft deletes (deleted = 1)
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @return bool|string Returns a string if in test mode.
      */
@@ -418,7 +418,7 @@ protected function doPurgeDeleted()
     /**
      * Works with the find* methods to return only the rows that
      * have been deleted.
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      */
     protected function doOnlyDeleted()
     {
@@ -427,7 +427,7 @@ protected function doOnlyDeleted()
 
     /**
      * Compiles a replace into string and runs the query
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @param array|null $data      Data
      * @param bool       $returnSQL Set to true to return Query String
@@ -443,7 +443,7 @@ protected function doReplace(?array $data = null, bool $returnSQL = false)
      * Grabs the last error(s) that occurred from the Database connection.
      * The return array should be in the following format:
      *  ['source' => 'message']
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @return array<string,string>
      */
@@ -497,7 +497,7 @@ public function getIdValue($data)
      * Loops over records in batches, allowing you to operate on them.
      * Works with $this->builder to get the Compiled select to
      * determine the rows to operate on.
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @throws DataException
      */
diff --git a/system/Session/Handlers/MemcachedHandler.php b/system/Session/Handlers/MemcachedHandler.php
index 5e963bf5048a..cc6365264e79 100644
--- a/system/Session/Handlers/MemcachedHandler.php
+++ b/system/Session/Handlers/MemcachedHandler.php
@@ -103,7 +103,7 @@ public function open($path, $name): bool
                 continue;
             }
 
-            if (! $this->memcached->addServer($match[1], $match[2], $match[3] ?? 0)) {
+            if (! $this->memcached->addServer($match[1], (int) $match[2], $match[3] ?? 0)) {
                 $this->logger->error('Could not add ' . $match[1] . ':' . $match[2] . ' to Memcached server pool.');
             } else {
                 $serverList[] = $match[1] . ':' . $match[2];
diff --git a/system/Session/Session.php b/system/Session/Session.php
index a0d9f4902584..fa44b8267e7b 100644
--- a/system/Session/Session.php
+++ b/system/Session/Session.php
@@ -197,7 +197,7 @@ public function __construct(SessionHandlerInterface $driver, App $config)
     /**
      * Initialize the session container and starts up the session.
      *
-     * @return mixed
+     * @return $this|void
      */
     public function start()
     {
@@ -450,8 +450,8 @@ public function destroy()
      * If $data is an array, it is expected to be an array of key/value pairs
      * to be set as session properties.
      *
-     * @param array|string $data  Property name or associative array of properties
-     * @param mixed        $value Property value if single key provided
+     * @param array|string                            $data  Property name or associative array of properties
+     * @param array|bool|float|int|object|string|null $value Property value if single key provided
      */
     public function set($data, $value = null)
     {
@@ -612,8 +612,8 @@ public function __isset(string $key): bool
      * Otherwise, it is interpreted as the identifier of a specific
      * flashdata property, with $value containing the property value.
      *
-     * @param array|string $data  Property identifier or associative array of properties
-     * @param array|string $value Property value if $data is a scalar
+     * @param array|string                            $data  Property identifier or associative array of properties
+     * @param array|bool|float|int|object|string|null $value Property value if $data is a scalar
      */
     public function setFlashdata($data, $value = null)
     {
@@ -695,7 +695,7 @@ public function markAsFlashdata($key): bool
     /**
      * Unmark data in the session as flashdata.
      *
-     * @param mixed $key Property identifier or array of them
+     * @param array|string $key Property identifier or array of them
      */
     public function unmarkFlashdata($key)
     {
@@ -744,9 +744,9 @@ public function getFlashKeys(): array
      * Sets new data into the session, and marks it as temporary data
      * with a set lifespan.
      *
-     * @param array|string $data  Session data key or associative array of items
-     * @param null         $value Value to store
-     * @param int          $ttl   Time-to-live in seconds
+     * @param array|string                            $data  Session data key or associative array of items
+     * @param array|bool|float|int|object|string|null $value Value to store
+     * @param int                                     $ttl   Time-to-live in seconds
      */
     public function setTempdata($data, $value = null, int $ttl = 300)
     {
@@ -760,7 +760,7 @@ public function setTempdata($data, $value = null, int $ttl = 300)
      *
      * @param string $key Session data key
      *
-     * @return mixed Session data value or null if not found.
+     * @return array|bool|float|int|object|string|null Session data value or null if not found.
      */
     public function getTempdata(?string $key = null)
     {
diff --git a/system/Test/CIUnitTestCase.php b/system/Test/CIUnitTestCase.php
index e7a72db457f9..0fecac3ecca1 100644
--- a/system/Test/CIUnitTestCase.php
+++ b/system/Test/CIUnitTestCase.php
@@ -392,60 +392,31 @@ public function assertEventTriggered(string $eventName): bool
     }
 
     /**
-     * Hooks into xdebug's headers capture, looking for a specific header
-     * emitted
+     * Hooks into xdebug's headers capture, looking for presence of
+     * a specific header emitted.
      *
      * @param string $header The leading portion of the header we are looking for
-     *
-     * @throws Exception
      */
     public function assertHeaderEmitted(string $header, bool $ignoreCase = false): void
     {
-        $found = false;
-
-        if (! function_exists('xdebug_get_headers')) {
-            $this->markTestSkipped('XDebug not found.');
-        }
-
-        foreach (xdebug_get_headers() as $emitted) {
-            $found = $ignoreCase ?
-                    (stripos($emitted, $header) === 0) :
-                    (strpos($emitted, $header) === 0);
-            if ($found) {
-                break;
-            }
-        }
-
-        $this->assertTrue($found, "Didn't find header for {$header}");
+        $this->assertNotNull(
+            $this->getHeaderEmitted($header, $ignoreCase, __METHOD__),
+            "Didn't find header for {$header}"
+        );
     }
 
     /**
-     * Hooks into xdebug's headers capture, looking for a specific header
-     * emitted
+     * Hooks into xdebug's headers capture, looking for absence of
+     * a specific header emitted.
      *
      * @param string $header The leading portion of the header we don't want to find
-     *
-     * @throws Exception
      */
     public function assertHeaderNotEmitted(string $header, bool $ignoreCase = false): void
     {
-        $found = false;
-
-        if (! function_exists('xdebug_get_headers')) {
-            $this->markTestSkipped('XDebug not found.');
-        }
-
-        foreach (xdebug_get_headers() as $emitted) {
-            $found = $ignoreCase ?
-                    (stripos($emitted, $header) === 0) :
-                    (strpos($emitted, $header) === 0);
-            if ($found) {
-                break;
-            }
-        }
-
-        $success = ! $found;
-        $this->assertTrue($success, "Found header for {$header}");
+        $this->assertNull(
+            $this->getHeaderEmitted($header, $ignoreCase, __METHOD__),
+            "Found header for {$header}"
+        );
     }
 
     /**
@@ -520,23 +491,20 @@ protected function createApplication()
 
     /**
      * Return first matching emitted header.
-     *
-     * @param string $header Identifier of the header of interest
-     *
-     * @return string|null The value of the header found, null if not found
      */
-    protected function getHeaderEmitted(string $header, bool $ignoreCase = false): ?string
+    protected function getHeaderEmitted(string $header, bool $ignoreCase = false, string $method = __METHOD__): ?string
     {
         if (! function_exists('xdebug_get_headers')) {
-            $this->markTestSkipped('XDebug not found.');
+            $this->markTestSkipped($method . '() requires xdebug.');
         }
 
-        foreach (xdebug_get_headers() as $emitted) {
-            $found = $ignoreCase ?
-                    (stripos($emitted, $header) === 0) :
-                    (strpos($emitted, $header) === 0);
+        foreach (xdebug_get_headers() as $emittedHeader) {
+            $found = $ignoreCase
+                ? (stripos($emittedHeader, $header) === 0)
+                : (strpos($emittedHeader, $header) === 0);
+
             if ($found) {
-                return $emitted;
+                return $emittedHeader;
             }
         }
 
diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php
index 0222fd0c0058..befb0184d781 100644
--- a/tests/system/API/ResponseTraitTest.php
+++ b/tests/system/API/ResponseTraitTest.php
@@ -24,6 +24,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ResponseTraitTest extends CIUnitTestCase
 {
diff --git a/tests/system/Autoloader/AutoloaderTest.php b/tests/system/Autoloader/AutoloaderTest.php
index bcf91b90b679..372365561f7c 100644
--- a/tests/system/Autoloader/AutoloaderTest.php
+++ b/tests/system/Autoloader/AutoloaderTest.php
@@ -20,6 +20,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class AutoloaderTest extends CIUnitTestCase
 {
diff --git a/tests/system/Autoloader/FileLocatorTest.php b/tests/system/Autoloader/FileLocatorTest.php
index 2c236836fa11..da2ec74eaed0 100644
--- a/tests/system/Autoloader/FileLocatorTest.php
+++ b/tests/system/Autoloader/FileLocatorTest.php
@@ -18,6 +18,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class FileLocatorTest extends CIUnitTestCase
 {
diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php
index a8452cdfa7a6..3da2cc1ec1b9 100644
--- a/tests/system/CLI/CLITest.php
+++ b/tests/system/CLI/CLITest.php
@@ -18,6 +18,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class CLITest extends CIUnitTestCase
 {
diff --git a/tests/system/CLI/CommandRunnerTest.php b/tests/system/CLI/CommandRunnerTest.php
index 7bddb0f89549..b8fe7b19f896 100644
--- a/tests/system/CLI/CommandRunnerTest.php
+++ b/tests/system/CLI/CommandRunnerTest.php
@@ -18,6 +18,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class CommandRunnerTest extends CIUnitTestCase
 {
diff --git a/tests/system/CLI/ConsoleTest.php b/tests/system/CLI/ConsoleTest.php
index 1d24e1dd778c..44610177189a 100644
--- a/tests/system/CLI/ConsoleTest.php
+++ b/tests/system/CLI/ConsoleTest.php
@@ -21,6 +21,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ConsoleTest extends CIUnitTestCase
 {
diff --git a/tests/system/Cache/CacheFactoryTest.php b/tests/system/Cache/CacheFactoryTest.php
index 45bc16df58e8..169623e5feba 100644
--- a/tests/system/Cache/CacheFactoryTest.php
+++ b/tests/system/Cache/CacheFactoryTest.php
@@ -18,6 +18,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class CacheFactoryTest extends CIUnitTestCase
 {
diff --git a/tests/system/Cache/CacheMockTest.php b/tests/system/Cache/CacheMockTest.php
index 860623478693..492bef9264b8 100644
--- a/tests/system/Cache/CacheMockTest.php
+++ b/tests/system/Cache/CacheMockTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class CacheMockTest extends CIUnitTestCase
 {
diff --git a/tests/system/Cache/Handlers/BaseHandlerTest.php b/tests/system/Cache/Handlers/BaseHandlerTest.php
index b2ebb61e01ef..9ece2ba2ddaf 100644
--- a/tests/system/Cache/Handlers/BaseHandlerTest.php
+++ b/tests/system/Cache/Handlers/BaseHandlerTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class BaseHandlerTest extends CIUnitTestCase
 {
diff --git a/tests/system/Cache/Handlers/DummyHandlerTest.php b/tests/system/Cache/Handlers/DummyHandlerTest.php
index 236200d55352..71ca66a907d0 100644
--- a/tests/system/Cache/Handlers/DummyHandlerTest.php
+++ b/tests/system/Cache/Handlers/DummyHandlerTest.php
@@ -15,6 +15,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class DummyHandlerTest extends CIUnitTestCase
 {
diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php
index 23573dee3314..abba309ff516 100644
--- a/tests/system/Cache/Handlers/FileHandlerTest.php
+++ b/tests/system/Cache/Handlers/FileHandlerTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class FileHandlerTest extends AbstractHandlerTest
 {
diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
index fee7759bb264..31b5e4435ad3 100644
--- a/tests/system/CodeIgniterTest.php
+++ b/tests/system/CodeIgniterTest.php
@@ -27,6 +27,8 @@
  * @backupGlobals enabled
  *
  * @internal
+ *
+ * @group Others
  */
 final class CodeIgniterTest extends CIUnitTestCase
 {
diff --git a/tests/system/Commands/BaseCommandTest.php b/tests/system/Commands/BaseCommandTest.php
index 6c518573f8e9..a399f84f00d4 100644
--- a/tests/system/Commands/BaseCommandTest.php
+++ b/tests/system/Commands/BaseCommandTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class BaseCommandTest extends CIUnitTestCase
 {
diff --git a/tests/system/Commands/ClearCacheTest.php b/tests/system/Commands/ClearCacheTest.php
index 9f988a9d864e..49c844a42292 100644
--- a/tests/system/Commands/ClearCacheTest.php
+++ b/tests/system/Commands/ClearCacheTest.php
@@ -18,6 +18,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ClearCacheTest extends CIUnitTestCase
 {
diff --git a/tests/system/Commands/ClearDebugbarTest.php b/tests/system/Commands/ClearDebugbarTest.php
index 2a5490a68390..ab068a41a530 100644
--- a/tests/system/Commands/ClearDebugbarTest.php
+++ b/tests/system/Commands/ClearDebugbarTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ClearDebugbarTest extends CIUnitTestCase
 {
diff --git a/tests/system/Commands/ClearLogsTest.php b/tests/system/Commands/ClearLogsTest.php
index 4fb1badba8cf..e8ca7d1a7443 100644
--- a/tests/system/Commands/ClearLogsTest.php
+++ b/tests/system/Commands/ClearLogsTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ClearLogsTest extends CIUnitTestCase
 {
diff --git a/tests/system/Commands/CommandGeneratorTest.php b/tests/system/Commands/CommandGeneratorTest.php
index 211bc373abf9..f674b1fcf6b3 100644
--- a/tests/system/Commands/CommandGeneratorTest.php
+++ b/tests/system/Commands/CommandGeneratorTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class CommandGeneratorTest extends CIUnitTestCase
 {
diff --git a/tests/system/Commands/CommandTest.php b/tests/system/Commands/CommandTest.php
index 9dbe62c3427c..3e4b64a50d3a 100644
--- a/tests/system/Commands/CommandTest.php
+++ b/tests/system/Commands/CommandTest.php
@@ -18,6 +18,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class CommandTest extends CIUnitTestCase
 {
diff --git a/tests/system/Commands/ConfigGeneratorTest.php b/tests/system/Commands/ConfigGeneratorTest.php
index 30e4130c014e..9c043013fe4d 100644
--- a/tests/system/Commands/ConfigGeneratorTest.php
+++ b/tests/system/Commands/ConfigGeneratorTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ConfigGeneratorTest extends CIUnitTestCase
 {
diff --git a/tests/system/Commands/ConfigurableSortImportsTest.php b/tests/system/Commands/ConfigurableSortImportsTest.php
index f5f8dd947e4b..1888b8fb06f1 100644
--- a/tests/system/Commands/ConfigurableSortImportsTest.php
+++ b/tests/system/Commands/ConfigurableSortImportsTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ConfigurableSortImportsTest extends CIUnitTestCase
 {
diff --git a/tests/system/Commands/ControllerGeneratorTest.php b/tests/system/Commands/ControllerGeneratorTest.php
index 6065e687560d..24d72c5f5bf1 100644
--- a/tests/system/Commands/ControllerGeneratorTest.php
+++ b/tests/system/Commands/ControllerGeneratorTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ControllerGeneratorTest extends CIUnitTestCase
 {
diff --git a/tests/system/Commands/EntityGeneratorTest.php b/tests/system/Commands/EntityGeneratorTest.php
index 724d3145db15..bd4c60e49969 100644
--- a/tests/system/Commands/EntityGeneratorTest.php
+++ b/tests/system/Commands/EntityGeneratorTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class EntityGeneratorTest extends CIUnitTestCase
 {
diff --git a/tests/system/Commands/EnvironmentCommandTest.php b/tests/system/Commands/EnvironmentCommandTest.php
index e877c1144ae6..0cff8ec1e8ab 100644
--- a/tests/system/Commands/EnvironmentCommandTest.php
+++ b/tests/system/Commands/EnvironmentCommandTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class EnvironmentCommandTest extends CIUnitTestCase
 {
diff --git a/tests/system/Commands/FilterGeneratorTest.php b/tests/system/Commands/FilterGeneratorTest.php
index 40f90fc3b046..388e44ab8aff 100644
--- a/tests/system/Commands/FilterGeneratorTest.php
+++ b/tests/system/Commands/FilterGeneratorTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class FilterGeneratorTest extends CIUnitTestCase
 {
diff --git a/tests/system/Commands/GeneratorsTest.php b/tests/system/Commands/GeneratorsTest.php
index 29df4ee924c5..7b19bf1a97fe 100644
--- a/tests/system/Commands/GeneratorsTest.php
+++ b/tests/system/Commands/GeneratorsTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class GeneratorsTest extends CIUnitTestCase
 {
diff --git a/tests/system/Commands/HelpCommandTest.php b/tests/system/Commands/HelpCommandTest.php
index 13ce4b14e62c..ea9d512e28d4 100644
--- a/tests/system/Commands/HelpCommandTest.php
+++ b/tests/system/Commands/HelpCommandTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class HelpCommandTest extends CIUnitTestCase
 {
diff --git a/tests/system/Commands/InfoCacheTest.php b/tests/system/Commands/InfoCacheTest.php
index 8ea6ddbcb7ef..a11eff9c372e 100644
--- a/tests/system/Commands/InfoCacheTest.php
+++ b/tests/system/Commands/InfoCacheTest.php
@@ -18,6 +18,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class InfoCacheTest extends CIUnitTestCase
 {
diff --git a/tests/system/Commands/MigrationGeneratorTest.php b/tests/system/Commands/MigrationGeneratorTest.php
index e1d895779bb1..05d7cd0a5b19 100644
--- a/tests/system/Commands/MigrationGeneratorTest.php
+++ b/tests/system/Commands/MigrationGeneratorTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class MigrationGeneratorTest extends CIUnitTestCase
 {
diff --git a/tests/system/Commands/ModelGeneratorTest.php b/tests/system/Commands/ModelGeneratorTest.php
index 2d00460c53ee..69c61e8be163 100644
--- a/tests/system/Commands/ModelGeneratorTest.php
+++ b/tests/system/Commands/ModelGeneratorTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ModelGeneratorTest extends CIUnitTestCase
 {
diff --git a/tests/system/Commands/PublishCommandTest.php b/tests/system/Commands/PublishCommandTest.php
index ea7b09e73511..4f798ef922c9 100644
--- a/tests/system/Commands/PublishCommandTest.php
+++ b/tests/system/Commands/PublishCommandTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class PublishCommandTest extends CIUnitTestCase
 {
diff --git a/tests/system/Commands/RoutesTest.php b/tests/system/Commands/RoutesTest.php
index 744914770019..70b5cfdc34ba 100644
--- a/tests/system/Commands/RoutesTest.php
+++ b/tests/system/Commands/RoutesTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class RoutesTest extends CIUnitTestCase
 {
diff --git a/tests/system/Commands/ScaffoldGeneratorTest.php b/tests/system/Commands/ScaffoldGeneratorTest.php
index 0bea3539d7b6..4dc298c32524 100644
--- a/tests/system/Commands/ScaffoldGeneratorTest.php
+++ b/tests/system/Commands/ScaffoldGeneratorTest.php
@@ -19,6 +19,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ScaffoldGeneratorTest extends CIUnitTestCase
 {
diff --git a/tests/system/Commands/SeederGeneratorTest.php b/tests/system/Commands/SeederGeneratorTest.php
index 92ad9548b7ab..bbb261183e02 100644
--- a/tests/system/Commands/SeederGeneratorTest.php
+++ b/tests/system/Commands/SeederGeneratorTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class SeederGeneratorTest extends CIUnitTestCase
 {
diff --git a/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php b/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php
index 12e82eef93af..7379248ddb9f 100644
--- a/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php
+++ b/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php
@@ -15,6 +15,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class AutoRouteCollectorTest extends CIUnitTestCase
 {
diff --git a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php
index 0f368925d57f..7c4e70e659f8 100644
--- a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php
+++ b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class AutoRouteCollectorTest extends CIUnitTestCase
 {
diff --git a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php
index 3536117a6343..6a77f0173ab5 100644
--- a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php
+++ b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ControllerMethodReaderTest extends CIUnitTestCase
 {
diff --git a/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php b/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php
index ad5caf7c9e52..32a2bd54ab1c 100644
--- a/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php
+++ b/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ControllerFinderTest extends CIUnitTestCase
 {
diff --git a/tests/system/Commands/Utilities/Routes/ControllerMethodReaderTest.php b/tests/system/Commands/Utilities/Routes/ControllerMethodReaderTest.php
index a899b9c44b73..ee315135304d 100644
--- a/tests/system/Commands/Utilities/Routes/ControllerMethodReaderTest.php
+++ b/tests/system/Commands/Utilities/Routes/ControllerMethodReaderTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ControllerMethodReaderTest extends CIUnitTestCase
 {
diff --git a/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php b/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php
index 5037c148b704..ff4df4090c4c 100644
--- a/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php
+++ b/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class FilterCollectorTest extends CIUnitTestCase
 {
diff --git a/tests/system/Commands/Utilities/Routes/FilterFinderTest.php b/tests/system/Commands/Utilities/Routes/FilterFinderTest.php
index 1b5e23c772f5..ace71d9d7e2d 100644
--- a/tests/system/Commands/Utilities/Routes/FilterFinderTest.php
+++ b/tests/system/Commands/Utilities/Routes/FilterFinderTest.php
@@ -28,6 +28,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class FilterFinderTest extends CIUnitTestCase
 {
diff --git a/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php b/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php
index 6a3160d20622..4b7b8fa3e814 100644
--- a/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php
+++ b/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class SampleURIGeneratorTest extends CIUnitTestCase
 {
diff --git a/tests/system/Commands/ValidationGeneratorTest.php b/tests/system/Commands/ValidationGeneratorTest.php
index 0b2f7de6d500..316562751cf0 100644
--- a/tests/system/Commands/ValidationGeneratorTest.php
+++ b/tests/system/Commands/ValidationGeneratorTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ValidationGeneratorTest extends CIUnitTestCase
 {
diff --git a/tests/system/CommonHelperTest.php b/tests/system/CommonHelperTest.php
index f8af2b5868cf..e39ee9504594 100644
--- a/tests/system/CommonHelperTest.php
+++ b/tests/system/CommonHelperTest.php
@@ -21,6 +21,8 @@
 /**
  * @internal
  *
+ * @group Others
+ *
  * @covers ::helper
  */
 final class CommonHelperTest extends CIUnitTestCase
diff --git a/tests/system/CommonSingleServiceTest.php b/tests/system/CommonSingleServiceTest.php
index 1d96305c35c1..b94bcf4cb27b 100644
--- a/tests/system/CommonSingleServiceTest.php
+++ b/tests/system/CommonSingleServiceTest.php
@@ -21,6 +21,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class CommonSingleServiceTest extends CIUnitTestCase
 {
diff --git a/tests/system/Config/FactoriesTest.php b/tests/system/Config/FactoriesTest.php
index 10c9b3d0da60..655329ad95de 100644
--- a/tests/system/Config/FactoriesTest.php
+++ b/tests/system/Config/FactoriesTest.php
@@ -20,6 +20,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class FactoriesTest extends CIUnitTestCase
 {
diff --git a/tests/system/Config/MimesTest.php b/tests/system/Config/MimesTest.php
index 35d9c9819100..4cbd09958238 100644
--- a/tests/system/Config/MimesTest.php
+++ b/tests/system/Config/MimesTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class MimesTest extends CIUnitTestCase
 {
diff --git a/tests/system/ControllerTest.php b/tests/system/ControllerTest.php
index 703c315953ba..3c4095044099 100644
--- a/tests/system/ControllerTest.php
+++ b/tests/system/ControllerTest.php
@@ -33,6 +33,8 @@
  * @backupGlobals enabled
  *
  * @internal
+ *
+ * @group Others
  */
 final class ControllerTest extends CIUnitTestCase
 {
diff --git a/tests/system/Cookie/CookieStoreTest.php b/tests/system/Cookie/CookieStoreTest.php
index b89529e59988..b5fc09153754 100644
--- a/tests/system/Cookie/CookieStoreTest.php
+++ b/tests/system/Cookie/CookieStoreTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class CookieStoreTest extends CIUnitTestCase
 {
diff --git a/tests/system/Cookie/CookieTest.php b/tests/system/Cookie/CookieTest.php
index a442933dfe05..3e9ecca3fed5 100644
--- a/tests/system/Cookie/CookieTest.php
+++ b/tests/system/Cookie/CookieTest.php
@@ -21,6 +21,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class CookieTest extends CIUnitTestCase
 {
diff --git a/tests/system/Database/BaseConnectionTest.php b/tests/system/Database/BaseConnectionTest.php
index 477a1a02749c..adf2fd35db97 100644
--- a/tests/system/Database/BaseConnectionTest.php
+++ b/tests/system/Database/BaseConnectionTest.php
@@ -19,6 +19,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class BaseConnectionTest extends CIUnitTestCase
 {
diff --git a/tests/system/Database/BaseQueryTest.php b/tests/system/Database/BaseQueryTest.php
index d3de455c8964..c7eca5f2b9a3 100644
--- a/tests/system/Database/BaseQueryTest.php
+++ b/tests/system/Database/BaseQueryTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class BaseQueryTest extends CIUnitTestCase
 {
diff --git a/tests/system/Database/Builder/AliasTest.php b/tests/system/Database/Builder/AliasTest.php
index d6d2c8618741..02c27aeca8e7 100644
--- a/tests/system/Database/Builder/AliasTest.php
+++ b/tests/system/Database/Builder/AliasTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class AliasTest extends CIUnitTestCase
 {
diff --git a/tests/system/Database/Builder/BaseTest.php b/tests/system/Database/Builder/BaseTest.php
index c7386066aa74..4acf7f702ff0 100644
--- a/tests/system/Database/Builder/BaseTest.php
+++ b/tests/system/Database/Builder/BaseTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class BaseTest extends CIUnitTestCase
 {
diff --git a/tests/system/Database/Builder/CountTest.php b/tests/system/Database/Builder/CountTest.php
index d0d9000279f6..f6f4ead5d3b9 100644
--- a/tests/system/Database/Builder/CountTest.php
+++ b/tests/system/Database/Builder/CountTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class CountTest extends CIUnitTestCase
 {
diff --git a/tests/system/Database/Builder/DeleteTest.php b/tests/system/Database/Builder/DeleteTest.php
index ab27a2ec9266..f2452f9eb28d 100644
--- a/tests/system/Database/Builder/DeleteTest.php
+++ b/tests/system/Database/Builder/DeleteTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class DeleteTest extends CIUnitTestCase
 {
diff --git a/tests/system/Database/Builder/DistinctTest.php b/tests/system/Database/Builder/DistinctTest.php
index d47edc1e85a9..de574c795df4 100644
--- a/tests/system/Database/Builder/DistinctTest.php
+++ b/tests/system/Database/Builder/DistinctTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class DistinctTest extends CIUnitTestCase
 {
diff --git a/tests/system/Database/Builder/EmptyTest.php b/tests/system/Database/Builder/EmptyTest.php
index 25ce07ca0aaf..008b26bf1676 100644
--- a/tests/system/Database/Builder/EmptyTest.php
+++ b/tests/system/Database/Builder/EmptyTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class EmptyTest extends CIUnitTestCase
 {
diff --git a/tests/system/Database/Builder/FromTest.php b/tests/system/Database/Builder/FromTest.php
index 05e24b05b3ff..7908346e9bee 100644
--- a/tests/system/Database/Builder/FromTest.php
+++ b/tests/system/Database/Builder/FromTest.php
@@ -18,6 +18,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class FromTest extends CIUnitTestCase
 {
diff --git a/tests/system/Database/Builder/GetTest.php b/tests/system/Database/Builder/GetTest.php
index 36aacb7b794b..e4e641a57875 100644
--- a/tests/system/Database/Builder/GetTest.php
+++ b/tests/system/Database/Builder/GetTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class GetTest extends CIUnitTestCase
 {
diff --git a/tests/system/Database/Builder/GroupTest.php b/tests/system/Database/Builder/GroupTest.php
index f5e6da0cbcfe..fab69aa0e554 100644
--- a/tests/system/Database/Builder/GroupTest.php
+++ b/tests/system/Database/Builder/GroupTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class GroupTest extends CIUnitTestCase
 {
diff --git a/tests/system/Database/Builder/InsertTest.php b/tests/system/Database/Builder/InsertTest.php
index 774dd1082ed0..5618493dc8a9 100644
--- a/tests/system/Database/Builder/InsertTest.php
+++ b/tests/system/Database/Builder/InsertTest.php
@@ -18,6 +18,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class InsertTest extends CIUnitTestCase
 {
diff --git a/tests/system/Database/Builder/JoinTest.php b/tests/system/Database/Builder/JoinTest.php
index 59857c25ab98..b981b8216dc2 100644
--- a/tests/system/Database/Builder/JoinTest.php
+++ b/tests/system/Database/Builder/JoinTest.php
@@ -20,6 +20,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class JoinTest extends CIUnitTestCase
 {
diff --git a/tests/system/Database/Builder/LikeTest.php b/tests/system/Database/Builder/LikeTest.php
index 22afc5c7549c..03ba724646bb 100644
--- a/tests/system/Database/Builder/LikeTest.php
+++ b/tests/system/Database/Builder/LikeTest.php
@@ -18,6 +18,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class LikeTest extends CIUnitTestCase
 {
diff --git a/tests/system/Database/Builder/LimitTest.php b/tests/system/Database/Builder/LimitTest.php
index ab6c2e41e222..8e552a3442ca 100644
--- a/tests/system/Database/Builder/LimitTest.php
+++ b/tests/system/Database/Builder/LimitTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class LimitTest extends CIUnitTestCase
 {
diff --git a/tests/system/Database/Builder/OrderTest.php b/tests/system/Database/Builder/OrderTest.php
index 64649822eb6d..a848c3f84063 100644
--- a/tests/system/Database/Builder/OrderTest.php
+++ b/tests/system/Database/Builder/OrderTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class OrderTest extends CIUnitTestCase
 {
diff --git a/tests/system/Database/Builder/PrefixTest.php b/tests/system/Database/Builder/PrefixTest.php
index 082d316a54b4..ed914eb62a49 100644
--- a/tests/system/Database/Builder/PrefixTest.php
+++ b/tests/system/Database/Builder/PrefixTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class PrefixTest extends CIUnitTestCase
 {
diff --git a/tests/system/Database/Builder/ReplaceTest.php b/tests/system/Database/Builder/ReplaceTest.php
index e7a1262cb107..a37159f66f16 100644
--- a/tests/system/Database/Builder/ReplaceTest.php
+++ b/tests/system/Database/Builder/ReplaceTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ReplaceTest extends CIUnitTestCase
 {
diff --git a/tests/system/Database/Builder/SelectTest.php b/tests/system/Database/Builder/SelectTest.php
index 19dff466cf03..23db670f9cd6 100644
--- a/tests/system/Database/Builder/SelectTest.php
+++ b/tests/system/Database/Builder/SelectTest.php
@@ -20,6 +20,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class SelectTest extends CIUnitTestCase
 {
diff --git a/tests/system/Database/Builder/TruncateTest.php b/tests/system/Database/Builder/TruncateTest.php
index 82bf5ad4d9aa..433feb089836 100644
--- a/tests/system/Database/Builder/TruncateTest.php
+++ b/tests/system/Database/Builder/TruncateTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class TruncateTest extends CIUnitTestCase
 {
diff --git a/tests/system/Database/Builder/UnionTest.php b/tests/system/Database/Builder/UnionTest.php
index 10ff971acf7b..b4564e5c0ac9 100644
--- a/tests/system/Database/Builder/UnionTest.php
+++ b/tests/system/Database/Builder/UnionTest.php
@@ -18,6 +18,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class UnionTest extends CIUnitTestCase
 {
diff --git a/tests/system/Database/Builder/UpdateTest.php b/tests/system/Database/Builder/UpdateTest.php
index 55eec68b8f2a..a9cae5af32fd 100644
--- a/tests/system/Database/Builder/UpdateTest.php
+++ b/tests/system/Database/Builder/UpdateTest.php
@@ -19,6 +19,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class UpdateTest extends CIUnitTestCase
 {
diff --git a/tests/system/Database/Builder/WhereTest.php b/tests/system/Database/Builder/WhereTest.php
index b98e470ffb17..7698fd69ce77 100644
--- a/tests/system/Database/Builder/WhereTest.php
+++ b/tests/system/Database/Builder/WhereTest.php
@@ -22,6 +22,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class WhereTest extends CIUnitTestCase
 {
diff --git a/tests/system/Database/ConfigTest.php b/tests/system/Database/ConfigTest.php
index a9e074565da7..4c0cc78ce9a4 100644
--- a/tests/system/Database/ConfigTest.php
+++ b/tests/system/Database/ConfigTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ConfigTest extends CIUnitTestCase
 {
diff --git a/tests/system/Database/DatabaseSeederTest.php b/tests/system/Database/DatabaseSeederTest.php
index 7e08d6648508..adf16b82cd02 100644
--- a/tests/system/Database/DatabaseSeederTest.php
+++ b/tests/system/Database/DatabaseSeederTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class DatabaseSeederTest extends CIUnitTestCase
 {
diff --git a/tests/system/Database/Forge/CreateTableTest.php b/tests/system/Database/Forge/CreateTableTest.php
index a390e03c3cd7..f982358b5f69 100644
--- a/tests/system/Database/Forge/CreateTableTest.php
+++ b/tests/system/Database/Forge/CreateTableTest.php
@@ -18,6 +18,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class CreateTableTest extends CIUnitTestCase
 {
diff --git a/tests/system/Database/Forge/DropForeignKeyTest.php b/tests/system/Database/Forge/DropForeignKeyTest.php
index 96c2d2790425..c65eed7ac10c 100644
--- a/tests/system/Database/Forge/DropForeignKeyTest.php
+++ b/tests/system/Database/Forge/DropForeignKeyTest.php
@@ -18,6 +18,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class DropForeignKeyTest extends CIUnitTestCase
 {
diff --git a/tests/system/Database/RawSqlTest.php b/tests/system/Database/RawSqlTest.php
index a271486141a7..695a63980e89 100644
--- a/tests/system/Database/RawSqlTest.php
+++ b/tests/system/Database/RawSqlTest.php
@@ -15,6 +15,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class RawSqlTest extends CIUnitTestCase
 {
diff --git a/tests/system/Debug/ExceptionsTest.php b/tests/system/Debug/ExceptionsTest.php
index 3ef643c831e3..5d18dba8b555 100644
--- a/tests/system/Debug/ExceptionsTest.php
+++ b/tests/system/Debug/ExceptionsTest.php
@@ -23,6 +23,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ExceptionsTest extends CIUnitTestCase
 {
diff --git a/tests/system/Debug/TimerTest.php b/tests/system/Debug/TimerTest.php
index fdd09829d9ff..122b446a05a2 100644
--- a/tests/system/Debug/TimerTest.php
+++ b/tests/system/Debug/TimerTest.php
@@ -15,6 +15,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class TimerTest extends CIUnitTestCase
 {
diff --git a/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php b/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php
index a55686a18aec..f7dd3d6ce8ee 100644
--- a/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php
+++ b/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class DatabaseTest extends CIUnitTestCase
 {
@@ -37,7 +39,7 @@ public function testDisplay(): void
 
         $this->assertSame('1234.56 ms', $queries[0]['duration']);
         $this->assertSame('<strong>SHOW</strong> TABLES;', $queries[0]['sql']);
-        $this->assertSame(clean_path(__FILE__) . ':33', $queries[0]['trace-file']);
+        $this->assertSame(clean_path(__FILE__) . ':' . (__LINE__ - 7), $queries[0]['trace-file']);
 
         foreach ($queries[0]['trace'] as $i => $trace) {
             // since we added the index numbering
diff --git a/tests/system/Debug/Toolbar/Collectors/HistoryTest.php b/tests/system/Debug/Toolbar/Collectors/HistoryTest.php
index ac1b4907a2f7..fc65d096e19d 100644
--- a/tests/system/Debug/Toolbar/Collectors/HistoryTest.php
+++ b/tests/system/Debug/Toolbar/Collectors/HistoryTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class HistoryTest extends CIUnitTestCase
 {
diff --git a/tests/system/DebugTraceableTraitTest.php b/tests/system/DebugTraceableTraitTest.php
index c0a787bb5ef0..c50b496facff 100644
--- a/tests/system/DebugTraceableTraitTest.php
+++ b/tests/system/DebugTraceableTraitTest.php
@@ -18,19 +18,21 @@
 /**
  * @internal
  *
+ * @group Others
+ *
  * @covers \CodeIgniter\Exceptions\DebugTraceableTrait
  */
 final class DebugTraceableTraitTest extends CIUnitTestCase
 {
     public function testFactoryInstanceReturnsWhereItIsRaised(): void
     {
-        $e1 = new FrameworkException('I am on line 27.');
+        $e1 = new FrameworkException('Hello.');
         $e2 = FrameworkException::forEnabledZlibOutputCompression();
 
         $this->assertContainsEquals(DebugTraceableTrait::class, class_uses(FrameworkException::class));
-        $this->assertSame(27, $e1->getLine());
+        $this->assertSame(__LINE__ - 4, $e1->getLine());
         $this->assertSame(__FILE__, $e1->getFile());
-        $this->assertSame(28, $e2->getLine());
+        $this->assertSame(__LINE__ - 5, $e2->getLine());
         $this->assertSame(__FILE__, $e2->getFile());
     }
 }
diff --git a/tests/system/Email/EmailTest.php b/tests/system/Email/EmailTest.php
index da428519071d..1a30b4551a41 100644
--- a/tests/system/Email/EmailTest.php
+++ b/tests/system/Email/EmailTest.php
@@ -18,6 +18,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class EmailTest extends CIUnitTestCase
 {
diff --git a/tests/system/Encryption/EncryptionTest.php b/tests/system/Encryption/EncryptionTest.php
index 95a69d35f0b9..490ef8376522 100644
--- a/tests/system/Encryption/EncryptionTest.php
+++ b/tests/system/Encryption/EncryptionTest.php
@@ -18,6 +18,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class EncryptionTest extends CIUnitTestCase
 {
diff --git a/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php b/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php
index 8956650506c8..233221da2af3 100644
--- a/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php
+++ b/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php
@@ -18,6 +18,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class OpenSSLHandlerTest extends CIUnitTestCase
 {
diff --git a/tests/system/Encryption/Handlers/SodiumHandlerTest.php b/tests/system/Encryption/Handlers/SodiumHandlerTest.php
index c54cb346ed80..9801625c1524 100644
--- a/tests/system/Encryption/Handlers/SodiumHandlerTest.php
+++ b/tests/system/Encryption/Handlers/SodiumHandlerTest.php
@@ -18,6 +18,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class SodiumHandlerTest extends CIUnitTestCase
 {
diff --git a/tests/system/Entity/EntityTest.php b/tests/system/Entity/EntityTest.php
index dabd24af73d5..5b0b3427e978 100644
--- a/tests/system/Entity/EntityTest.php
+++ b/tests/system/Entity/EntityTest.php
@@ -26,6 +26,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class EntityTest extends CIUnitTestCase
 {
diff --git a/tests/system/Files/FileCollectionTest.php b/tests/system/Files/FileCollectionTest.php
index 4b4fd9d3f63a..cf810ba7be1d 100644
--- a/tests/system/Files/FileCollectionTest.php
+++ b/tests/system/Files/FileCollectionTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class FileCollectionTest extends CIUnitTestCase
 {
diff --git a/tests/system/Files/FileTest.php b/tests/system/Files/FileTest.php
index 1176bd2e2622..0019e7decbb3 100644
--- a/tests/system/Files/FileTest.php
+++ b/tests/system/Files/FileTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class FileTest extends CIUnitTestCase
 {
diff --git a/tests/system/Files/FileWithVfsTest.php b/tests/system/Files/FileWithVfsTest.php
index e1daca27f55e..e965ed1ef375 100644
--- a/tests/system/Files/FileWithVfsTest.php
+++ b/tests/system/Files/FileWithVfsTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class FileWithVfsTest extends CIUnitTestCase
 {
diff --git a/tests/system/Filters/CSRFTest.php b/tests/system/Filters/CSRFTest.php
index 395eb8ee9bb4..e704167d86fa 100644
--- a/tests/system/Filters/CSRFTest.php
+++ b/tests/system/Filters/CSRFTest.php
@@ -18,6 +18,8 @@
  * @backupGlobals enabled
  *
  * @internal
+ *
+ * @group Others
  */
 final class CSRFTest extends CIUnitTestCase
 {
diff --git a/tests/system/Filters/DebugToolbarTest.php b/tests/system/Filters/DebugToolbarTest.php
index bc411767d643..2144cf856ebd 100644
--- a/tests/system/Filters/DebugToolbarTest.php
+++ b/tests/system/Filters/DebugToolbarTest.php
@@ -19,6 +19,8 @@
  * @backupGlobals enabled
  *
  * @internal
+ *
+ * @group Others
  */
 final class DebugToolbarTest extends CIUnitTestCase
 {
diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php
index 2303eb4158b0..d7de8e84f06c 100644
--- a/tests/system/Filters/FiltersTest.php
+++ b/tests/system/Filters/FiltersTest.php
@@ -41,6 +41,8 @@
  * @backupGlobals enabled
  *
  * @internal
+ *
+ * @group Others
  */
 final class FiltersTest extends CIUnitTestCase
 {
diff --git a/tests/system/Filters/InvalidCharsTest.php b/tests/system/Filters/InvalidCharsTest.php
index 893108294d74..becc601d816a 100644
--- a/tests/system/Filters/InvalidCharsTest.php
+++ b/tests/system/Filters/InvalidCharsTest.php
@@ -21,6 +21,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class InvalidCharsTest extends CIUnitTestCase
 {
diff --git a/tests/system/Filters/SecureHeadersTest.php b/tests/system/Filters/SecureHeadersTest.php
index 86cb2fbd2297..c1014d491622 100644
--- a/tests/system/Filters/SecureHeadersTest.php
+++ b/tests/system/Filters/SecureHeadersTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class SecureHeadersTest extends CIUnitTestCase
 {
diff --git a/tests/system/Format/FormatTest.php b/tests/system/Format/FormatTest.php
index 1f62b0df526c..3ffd23c900af 100644
--- a/tests/system/Format/FormatTest.php
+++ b/tests/system/Format/FormatTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class FormatTest extends CIUnitTestCase
 {
diff --git a/tests/system/Format/JSONFormatterTest.php b/tests/system/Format/JSONFormatterTest.php
index 09205dc29c47..6c54df5fb66b 100644
--- a/tests/system/Format/JSONFormatterTest.php
+++ b/tests/system/Format/JSONFormatterTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class JSONFormatterTest extends CIUnitTestCase
 {
diff --git a/tests/system/Format/XMLFormatterTest.php b/tests/system/Format/XMLFormatterTest.php
index 1011f39295d5..b934747561e4 100644
--- a/tests/system/Format/XMLFormatterTest.php
+++ b/tests/system/Format/XMLFormatterTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class XMLFormatterTest extends CIUnitTestCase
 {
diff --git a/tests/system/HTTP/CLIRequestTest.php b/tests/system/HTTP/CLIRequestTest.php
index cbec9b22a33e..bd585380d6ab 100644
--- a/tests/system/HTTP/CLIRequestTest.php
+++ b/tests/system/HTTP/CLIRequestTest.php
@@ -21,6 +21,8 @@
  * @backupGlobals enabled
  *
  * @internal
+ *
+ * @group Others
  */
 final class CLIRequestTest extends CIUnitTestCase
 {
diff --git a/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
index 7a79ca3e354c..40864bb0a8f8 100644
--- a/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
+++ b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
@@ -22,6 +22,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class CURLRequestDoNotShareOptionsTest extends CIUnitTestCase
 {
diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
index e6d7072c09a0..36ee88863534 100644
--- a/tests/system/HTTP/CURLRequestTest.php
+++ b/tests/system/HTTP/CURLRequestTest.php
@@ -22,6 +22,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class CURLRequestTest extends CIUnitTestCase
 {
diff --git a/tests/system/HTTP/Files/FileCollectionTest.php b/tests/system/HTTP/Files/FileCollectionTest.php
index c870099108cc..77b7a6c2ac8c 100644
--- a/tests/system/HTTP/Files/FileCollectionTest.php
+++ b/tests/system/HTTP/Files/FileCollectionTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class FileCollectionTest extends CIUnitTestCase
 {
diff --git a/tests/system/HTTP/Files/FileMovingTest.php b/tests/system/HTTP/Files/FileMovingTest.php
index 204579dd3da0..2362d64296b7 100644
--- a/tests/system/HTTP/Files/FileMovingTest.php
+++ b/tests/system/HTTP/Files/FileMovingTest.php
@@ -18,6 +18,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class FileMovingTest extends CIUnitTestCase
 {
diff --git a/tests/system/HTTP/HeaderTest.php b/tests/system/HTTP/HeaderTest.php
index 3b02009235e4..1e986fa48933 100644
--- a/tests/system/HTTP/HeaderTest.php
+++ b/tests/system/HTTP/HeaderTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class HeaderTest extends CIUnitTestCase
 {
diff --git a/tests/system/HTTP/IncomingRequestDetectingTest.php b/tests/system/HTTP/IncomingRequestDetectingTest.php
index 47db74d1bbcf..ab0bfb5c6092 100644
--- a/tests/system/HTTP/IncomingRequestDetectingTest.php
+++ b/tests/system/HTTP/IncomingRequestDetectingTest.php
@@ -18,6 +18,8 @@
  * @backupGlobals enabled
  *
  * @internal
+ *
+ * @group Others
  */
 final class IncomingRequestDetectingTest extends CIUnitTestCase
 {
diff --git a/tests/system/HTTP/MessageTest.php b/tests/system/HTTP/MessageTest.php
index 245668071c69..770b21209a26 100644
--- a/tests/system/HTTP/MessageTest.php
+++ b/tests/system/HTTP/MessageTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class MessageTest extends CIUnitTestCase
 {
diff --git a/tests/system/HTTP/NegotiateTest.php b/tests/system/HTTP/NegotiateTest.php
index 2f1eaba11a35..a9c6b16bbe64 100644
--- a/tests/system/HTTP/NegotiateTest.php
+++ b/tests/system/HTTP/NegotiateTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class NegotiateTest extends CIUnitTestCase
 {
diff --git a/tests/system/HTTP/RequestTest.php b/tests/system/HTTP/RequestTest.php
index 1ca021074db3..376e4f82ef16 100644
--- a/tests/system/HTTP/RequestTest.php
+++ b/tests/system/HTTP/RequestTest.php
@@ -18,6 +18,8 @@
  * @backupGlobals enabled
  *
  * @internal
+ *
+ * @group Others
  */
 final class RequestTest extends CIUnitTestCase
 {
diff --git a/tests/system/HTTP/ResponseCookieTest.php b/tests/system/HTTP/ResponseCookieTest.php
index df5862352479..0c9283f0c88e 100644
--- a/tests/system/HTTP/ResponseCookieTest.php
+++ b/tests/system/HTTP/ResponseCookieTest.php
@@ -21,6 +21,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ResponseCookieTest extends CIUnitTestCase
 {
diff --git a/tests/system/HTTP/ResponseTest.php b/tests/system/HTTP/ResponseTest.php
index 67821ff3a5c1..0b40abda5605 100644
--- a/tests/system/HTTP/ResponseTest.php
+++ b/tests/system/HTTP/ResponseTest.php
@@ -23,6 +23,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ResponseTest extends CIUnitTestCase
 {
diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php
index 44ebb67e5e85..802e6f80bf09 100644
--- a/tests/system/HTTP/URITest.php
+++ b/tests/system/HTTP/URITest.php
@@ -21,6 +21,8 @@
  * @backupGlobals enabled
  *
  * @internal
+ *
+ * @group Others
  */
 final class URITest extends CIUnitTestCase
 {
diff --git a/tests/system/HTTP/UserAgentTest.php b/tests/system/HTTP/UserAgentTest.php
index 8314b43e9ce9..4c5898c204fd 100644
--- a/tests/system/HTTP/UserAgentTest.php
+++ b/tests/system/HTTP/UserAgentTest.php
@@ -15,6 +15,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class UserAgentTest extends CIUnitTestCase
 {
diff --git a/tests/system/Helpers/ArrayHelperTest.php b/tests/system/Helpers/ArrayHelperTest.php
index 7e1f1af21d71..a2db5b06e7d7 100644
--- a/tests/system/Helpers/ArrayHelperTest.php
+++ b/tests/system/Helpers/ArrayHelperTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ArrayHelperTest extends CIUnitTestCase
 {
diff --git a/tests/system/Helpers/CookieHelperTest.php b/tests/system/Helpers/CookieHelperTest.php
index ea3d29ac7282..13d900456c6b 100755
--- a/tests/system/Helpers/CookieHelperTest.php
+++ b/tests/system/Helpers/CookieHelperTest.php
@@ -26,6 +26,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class CookieHelperTest extends CIUnitTestCase
 {
diff --git a/tests/system/Helpers/DateHelperTest.php b/tests/system/Helpers/DateHelperTest.php
index ddc07a37ad70..70e46d624ffc 100644
--- a/tests/system/Helpers/DateHelperTest.php
+++ b/tests/system/Helpers/DateHelperTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class DateHelperTest extends CIUnitTestCase
 {
diff --git a/tests/system/Helpers/FilesystemHelperTest.php b/tests/system/Helpers/FilesystemHelperTest.php
index 00acb804394d..5f35a7e40d07 100644
--- a/tests/system/Helpers/FilesystemHelperTest.php
+++ b/tests/system/Helpers/FilesystemHelperTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class FilesystemHelperTest extends CIUnitTestCase
 {
diff --git a/tests/system/Helpers/HTMLHelperTest.php b/tests/system/Helpers/HTMLHelperTest.php
index f631785a465b..6c59b8ad1522 100755
--- a/tests/system/Helpers/HTMLHelperTest.php
+++ b/tests/system/Helpers/HTMLHelperTest.php
@@ -18,6 +18,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class HTMLHelperTest extends CIUnitTestCase
 {
diff --git a/tests/system/Helpers/InflectorHelperTest.php b/tests/system/Helpers/InflectorHelperTest.php
index 86ff1e2e9f58..10e20702d17a 100755
--- a/tests/system/Helpers/InflectorHelperTest.php
+++ b/tests/system/Helpers/InflectorHelperTest.php
@@ -15,6 +15,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class InflectorHelperTest extends CIUnitTestCase
 {
diff --git a/tests/system/Helpers/NumberHelperTest.php b/tests/system/Helpers/NumberHelperTest.php
index 772fd3292246..818bf014e8f4 100755
--- a/tests/system/Helpers/NumberHelperTest.php
+++ b/tests/system/Helpers/NumberHelperTest.php
@@ -15,6 +15,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class NumberHelperTest extends CIUnitTestCase
 {
diff --git a/tests/system/Helpers/SecurityHelperTest.php b/tests/system/Helpers/SecurityHelperTest.php
index 08e276e62be6..c7523e3b0081 100644
--- a/tests/system/Helpers/SecurityHelperTest.php
+++ b/tests/system/Helpers/SecurityHelperTest.php
@@ -18,6 +18,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class SecurityHelperTest extends CIUnitTestCase
 {
diff --git a/tests/system/Helpers/TextHelperTest.php b/tests/system/Helpers/TextHelperTest.php
index 3bcdd094fdbb..27f878979282 100755
--- a/tests/system/Helpers/TextHelperTest.php
+++ b/tests/system/Helpers/TextHelperTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class TextHelperTest extends CIUnitTestCase
 {
diff --git a/tests/system/Helpers/URLHelper/CurrentUrlTest.php b/tests/system/Helpers/URLHelper/CurrentUrlTest.php
index 0182ac9fbad0..5f04d36bd4e2 100644
--- a/tests/system/Helpers/URLHelper/CurrentUrlTest.php
+++ b/tests/system/Helpers/URLHelper/CurrentUrlTest.php
@@ -25,6 +25,8 @@
  * @backupGlobals enabled
  *
  * @internal
+ *
+ * @group Others
  */
 final class CurrentUrlTest extends CIUnitTestCase
 {
diff --git a/tests/system/Helpers/URLHelper/MiscUrlTest.php b/tests/system/Helpers/URLHelper/MiscUrlTest.php
index b213f6413e97..9508aca02006 100644
--- a/tests/system/Helpers/URLHelper/MiscUrlTest.php
+++ b/tests/system/Helpers/URLHelper/MiscUrlTest.php
@@ -22,6 +22,8 @@
  * @backupGlobals enabled
  *
  * @internal
+ *
+ * @group Others
  */
 final class MiscUrlTest extends CIUnitTestCase
 {
diff --git a/tests/system/Helpers/URLHelper/SiteUrlTest.php b/tests/system/Helpers/URLHelper/SiteUrlTest.php
index 1c4b5fc6a75e..68e53e52bc10 100644
--- a/tests/system/Helpers/URLHelper/SiteUrlTest.php
+++ b/tests/system/Helpers/URLHelper/SiteUrlTest.php
@@ -25,6 +25,8 @@
  * @backupGlobals enabled
  *
  * @internal
+ *
+ * @group Others
  */
 final class SiteUrlTest extends CIUnitTestCase
 {
diff --git a/tests/system/Helpers/XMLHelperTest.php b/tests/system/Helpers/XMLHelperTest.php
index 539383286146..975415a0ec2f 100644
--- a/tests/system/Helpers/XMLHelperTest.php
+++ b/tests/system/Helpers/XMLHelperTest.php
@@ -15,6 +15,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class XMLHelperTest extends CIUnitTestCase
 {
diff --git a/tests/system/HomeTest.php b/tests/system/HomeTest.php
index 382e6c4ee522..2e0323fd631e 100644
--- a/tests/system/HomeTest.php
+++ b/tests/system/HomeTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class HomeTest extends CIUnitTestCase
 {
diff --git a/tests/system/Honeypot/HoneypotTest.php b/tests/system/Honeypot/HoneypotTest.php
index ca0cbbfce852..024e167e2905 100644
--- a/tests/system/Honeypot/HoneypotTest.php
+++ b/tests/system/Honeypot/HoneypotTest.php
@@ -20,6 +20,8 @@
  * @backupGlobals enabled
  *
  * @internal
+ *
+ * @group Others
  */
 final class HoneypotTest extends CIUnitTestCase
 {
diff --git a/tests/system/I18n/TimeDifferenceTest.php b/tests/system/I18n/TimeDifferenceTest.php
index 4f8a02f038af..eb54d398c485 100644
--- a/tests/system/I18n/TimeDifferenceTest.php
+++ b/tests/system/I18n/TimeDifferenceTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class TimeDifferenceTest extends CIUnitTestCase
 {
diff --git a/tests/system/I18n/TimeTest.php b/tests/system/I18n/TimeTest.php
index 06ce766c5850..0be7d4931490 100644
--- a/tests/system/I18n/TimeTest.php
+++ b/tests/system/I18n/TimeTest.php
@@ -23,6 +23,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class TimeTest extends CIUnitTestCase
 {
diff --git a/tests/system/Images/BaseHandlerTest.php b/tests/system/Images/BaseHandlerTest.php
index a2cce0634e0a..a73accd940a8 100644
--- a/tests/system/Images/BaseHandlerTest.php
+++ b/tests/system/Images/BaseHandlerTest.php
@@ -28,6 +28,8 @@
  * testing saving only.
  *
  * @internal
+ *
+ * @group Others
  */
 final class BaseHandlerTest extends CIUnitTestCase
 {
diff --git a/tests/system/Images/GDHandlerTest.php b/tests/system/Images/GDHandlerTest.php
index 0cedd83d1c19..a2f9a99d4e6b 100644
--- a/tests/system/Images/GDHandlerTest.php
+++ b/tests/system/Images/GDHandlerTest.php
@@ -28,6 +28,8 @@
  * Was unable to test fontPath & related logic.
  *
  * @internal
+ *
+ * @group Others
  */
 final class GDHandlerTest extends CIUnitTestCase
 {
diff --git a/tests/system/Images/ImageMagickHandlerTest.php b/tests/system/Images/ImageMagickHandlerTest.php
index 76fb15fe3f7e..0e62c01220fe 100644
--- a/tests/system/Images/ImageMagickHandlerTest.php
+++ b/tests/system/Images/ImageMagickHandlerTest.php
@@ -28,6 +28,8 @@
  * Was unable to test fontPath & related logic.
  *
  * @internal
+ *
+ * @group Others
  */
 final class ImageMagickHandlerTest extends CIUnitTestCase
 {
diff --git a/tests/system/Images/ImageTest.php b/tests/system/Images/ImageTest.php
index a85ed30c83fd..e04ea6417518 100644
--- a/tests/system/Images/ImageTest.php
+++ b/tests/system/Images/ImageTest.php
@@ -18,6 +18,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ImageTest extends CIUnitTestCase
 {
diff --git a/tests/system/Language/LanguageTest.php b/tests/system/Language/LanguageTest.php
index b2dbe07ec831..98072905c8cc 100644
--- a/tests/system/Language/LanguageTest.php
+++ b/tests/system/Language/LanguageTest.php
@@ -19,6 +19,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class LanguageTest extends CIUnitTestCase
 {
diff --git a/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php b/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php
index f6f49e1ef53c..0587763bec09 100644
--- a/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php
+++ b/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php
@@ -20,6 +20,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ChromeLoggerHandlerTest extends CIUnitTestCase
 {
diff --git a/tests/system/Log/Handlers/ErrorlogHandlerTest.php b/tests/system/Log/Handlers/ErrorlogHandlerTest.php
index f184f5a2db57..0f12e70c124c 100644
--- a/tests/system/Log/Handlers/ErrorlogHandlerTest.php
+++ b/tests/system/Log/Handlers/ErrorlogHandlerTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ErrorlogHandlerTest extends CIUnitTestCase
 {
diff --git a/tests/system/Log/Handlers/FileHandlerTest.php b/tests/system/Log/Handlers/FileHandlerTest.php
index 050511a63465..2056561c999b 100644
--- a/tests/system/Log/Handlers/FileHandlerTest.php
+++ b/tests/system/Log/Handlers/FileHandlerTest.php
@@ -20,6 +20,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class FileHandlerTest extends CIUnitTestCase
 {
diff --git a/tests/system/Log/LoggerTest.php b/tests/system/Log/LoggerTest.php
index d9f3cbebeaf3..c171812ace3c 100644
--- a/tests/system/Log/LoggerTest.php
+++ b/tests/system/Log/LoggerTest.php
@@ -20,6 +20,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class LoggerTest extends CIUnitTestCase
 {
diff --git a/tests/system/Models/GeneralModelTest.php b/tests/system/Models/GeneralModelTest.php
index a574f5c37967..e3966ba5f8e5 100644
--- a/tests/system/Models/GeneralModelTest.php
+++ b/tests/system/Models/GeneralModelTest.php
@@ -23,6 +23,8 @@
  * features without requiring a database connection.
  *
  * @internal
+ *
+ * @group Others
  */
 final class GeneralModelTest extends CIUnitTestCase
 {
diff --git a/tests/system/Pager/PagerRendererTest.php b/tests/system/Pager/PagerRendererTest.php
index 54f8019b4424..1df7f7c8c4ea 100644
--- a/tests/system/Pager/PagerRendererTest.php
+++ b/tests/system/Pager/PagerRendererTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class PagerRendererTest extends CIUnitTestCase
 {
diff --git a/tests/system/Pager/PagerTest.php b/tests/system/Pager/PagerTest.php
index 554df08ec5d0..47476e56001f 100644
--- a/tests/system/Pager/PagerTest.php
+++ b/tests/system/Pager/PagerTest.php
@@ -25,6 +25,8 @@
  * @backupGlobals enabled
  *
  * @internal
+ *
+ * @group Others
  */
 final class PagerTest extends CIUnitTestCase
 {
diff --git a/tests/system/Publisher/PublisherInputTest.php b/tests/system/Publisher/PublisherInputTest.php
index 071d387031c6..1d9908fda041 100644
--- a/tests/system/Publisher/PublisherInputTest.php
+++ b/tests/system/Publisher/PublisherInputTest.php
@@ -15,6 +15,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class PublisherInputTest extends CIUnitTestCase
 {
diff --git a/tests/system/Publisher/PublisherOutputTest.php b/tests/system/Publisher/PublisherOutputTest.php
index fe66467f35f7..0bf746ce9373 100644
--- a/tests/system/Publisher/PublisherOutputTest.php
+++ b/tests/system/Publisher/PublisherOutputTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class PublisherOutputTest extends CIUnitTestCase
 {
diff --git a/tests/system/Publisher/PublisherRestrictionsTest.php b/tests/system/Publisher/PublisherRestrictionsTest.php
index 620a74dcf224..7c6c9788768b 100644
--- a/tests/system/Publisher/PublisherRestrictionsTest.php
+++ b/tests/system/Publisher/PublisherRestrictionsTest.php
@@ -21,6 +21,8 @@
  * file properly prevent disallowed actions.
  *
  * @internal
+ *
+ * @group Others
  */
 final class PublisherRestrictionsTest extends CIUnitTestCase
 {
diff --git a/tests/system/Publisher/PublisherSupportTest.php b/tests/system/Publisher/PublisherSupportTest.php
index 5fb5f4b2a15b..5ef05e274bb7 100644
--- a/tests/system/Publisher/PublisherSupportTest.php
+++ b/tests/system/Publisher/PublisherSupportTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class PublisherSupportTest extends CIUnitTestCase
 {
diff --git a/tests/system/Router/AutoRouterImprovedTest.php b/tests/system/Router/AutoRouterImprovedTest.php
index 4298a59c5b3b..ec94676be121 100644
--- a/tests/system/Router/AutoRouterImprovedTest.php
+++ b/tests/system/Router/AutoRouterImprovedTest.php
@@ -22,6 +22,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class AutoRouterImprovedTest extends CIUnitTestCase
 {
diff --git a/tests/system/Router/RouteCollectionReverseRouteTest.php b/tests/system/Router/RouteCollectionReverseRouteTest.php
index c9a32c096574..8f5bea1996bf 100644
--- a/tests/system/Router/RouteCollectionReverseRouteTest.php
+++ b/tests/system/Router/RouteCollectionReverseRouteTest.php
@@ -19,6 +19,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class RouteCollectionReverseRouteTest extends CIUnitTestCase
 {
diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
index c41ae4ec64ba..b98d5d4c3b10 100644
--- a/tests/system/Router/RouteCollectionTest.php
+++ b/tests/system/Router/RouteCollectionTest.php
@@ -18,6 +18,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class RouteCollectionTest extends CIUnitTestCase
 {
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index 95418fbb233c..6436c34af47f 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -22,6 +22,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class RouterTest extends CIUnitTestCase
 {
diff --git a/tests/system/Security/SecurityCSRFCookieRandomizeTokenTest.php b/tests/system/Security/SecurityCSRFCookieRandomizeTokenTest.php
index e4345ebec15c..93f749ffc604 100644
--- a/tests/system/Security/SecurityCSRFCookieRandomizeTokenTest.php
+++ b/tests/system/Security/SecurityCSRFCookieRandomizeTokenTest.php
@@ -23,6 +23,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class SecurityCSRFCookieRandomizeTokenTest extends CIUnitTestCase
 {
diff --git a/tests/system/Security/SecurityTest.php b/tests/system/Security/SecurityTest.php
index aaea7072d5f2..f610add149f0 100644
--- a/tests/system/Security/SecurityTest.php
+++ b/tests/system/Security/SecurityTest.php
@@ -27,6 +27,8 @@
  * @backupGlobals enabled
  *
  * @internal
+ *
+ * @group Others
  */
 final class SecurityTest extends CIUnitTestCase
 {
diff --git a/tests/system/SparkTest.php b/tests/system/SparkTest.php
index 0cd76453c02a..a391689c2719 100644
--- a/tests/system/SparkTest.php
+++ b/tests/system/SparkTest.php
@@ -15,6 +15,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class SparkTest extends CIUnitTestCase
 {
diff --git a/tests/system/Test/BootstrapFCPATHTest.php b/tests/system/Test/BootstrapFCPATHTest.php
index b7cb54ed517c..8ae25a0e3145 100644
--- a/tests/system/Test/BootstrapFCPATHTest.php
+++ b/tests/system/Test/BootstrapFCPATHTest.php
@@ -22,6 +22,8 @@
  * from correctFCPATH();
  *
  * @internal
+ *
+ * @group Others
  */
 final class BootstrapFCPATHTest extends CIUnitTestCase
 {
diff --git a/tests/system/Test/DOMParserTest.php b/tests/system/Test/DOMParserTest.php
index cc03fe0b9a02..c1ca8194f4b7 100644
--- a/tests/system/Test/DOMParserTest.php
+++ b/tests/system/Test/DOMParserTest.php
@@ -13,6 +13,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class DOMParserTest extends CIUnitTestCase
 {
diff --git a/tests/system/Test/FabricatorTest.php b/tests/system/Test/FabricatorTest.php
index 22530090742f..7cadb350e047 100644
--- a/tests/system/Test/FabricatorTest.php
+++ b/tests/system/Test/FabricatorTest.php
@@ -20,6 +20,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class FabricatorTest extends CIUnitTestCase
 {
diff --git a/tests/system/Test/FilterTestTraitTest.php b/tests/system/Test/FilterTestTraitTest.php
index 22d35c6e7d89..b50e2d18affe 100644
--- a/tests/system/Test/FilterTestTraitTest.php
+++ b/tests/system/Test/FilterTestTraitTest.php
@@ -25,6 +25,8 @@
  *  - class: \Tests\Support\Filters\Customfilter::class
  *
  * @internal
+ *
+ * @group Others
  */
 final class FilterTestTraitTest extends CIUnitTestCase
 {
diff --git a/tests/system/Test/ReflectionHelperTest.php b/tests/system/Test/ReflectionHelperTest.php
index 8a9f297fb561..8a8978f84eb5 100644
--- a/tests/system/Test/ReflectionHelperTest.php
+++ b/tests/system/Test/ReflectionHelperTest.php
@@ -13,6 +13,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ReflectionHelperTest extends CIUnitTestCase
 {
diff --git a/tests/system/Test/TestCaseTest.php b/tests/system/Test/TestCaseTest.php
index f8253964a528..219102e33b8c 100644
--- a/tests/system/Test/TestCaseTest.php
+++ b/tests/system/Test/TestCaseTest.php
@@ -19,6 +19,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class TestCaseTest extends CIUnitTestCase
 {
diff --git a/tests/system/Test/TestResponseTest.php b/tests/system/Test/TestResponseTest.php
index 4a68b389f255..371e21942908 100644
--- a/tests/system/Test/TestResponseTest.php
+++ b/tests/system/Test/TestResponseTest.php
@@ -20,6 +20,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class TestResponseTest extends CIUnitTestCase
 {
diff --git a/tests/system/Throttle/ThrottleTest.php b/tests/system/Throttle/ThrottleTest.php
index a26723925e1f..93049f0edf32 100644
--- a/tests/system/Throttle/ThrottleTest.php
+++ b/tests/system/Throttle/ThrottleTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ThrottleTest extends CIUnitTestCase
 {
diff --git a/tests/system/Typography/TypographyTest.php b/tests/system/Typography/TypographyTest.php
index c56aa858267b..ef920760126c 100644
--- a/tests/system/Typography/TypographyTest.php
+++ b/tests/system/Typography/TypographyTest.php
@@ -15,6 +15,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class TypographyTest extends CIUnitTestCase
 {
diff --git a/tests/system/Validation/CreditCardRulesTest.php b/tests/system/Validation/CreditCardRulesTest.php
index 031eddb1490c..13168eed2f5b 100644
--- a/tests/system/Validation/CreditCardRulesTest.php
+++ b/tests/system/Validation/CreditCardRulesTest.php
@@ -18,6 +18,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class CreditCardRulesTest extends CIUnitTestCase
 {
diff --git a/tests/system/Validation/FileRulesTest.php b/tests/system/Validation/FileRulesTest.php
index 574e1d4ec50f..71d1011d75b1 100644
--- a/tests/system/Validation/FileRulesTest.php
+++ b/tests/system/Validation/FileRulesTest.php
@@ -18,6 +18,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class FileRulesTest extends CIUnitTestCase
 {
diff --git a/tests/system/Validation/FormatRulesTest.php b/tests/system/Validation/FormatRulesTest.php
index fda3670344f7..8e78750e494e 100644
--- a/tests/system/Validation/FormatRulesTest.php
+++ b/tests/system/Validation/FormatRulesTest.php
@@ -19,6 +19,8 @@
 /**
  * @internal
  *
+ * @group Others
+ *
  * @no-final
  */
 class FormatRulesTest extends CIUnitTestCase
diff --git a/tests/system/Validation/RulesTest.php b/tests/system/Validation/RulesTest.php
index 924d8d3d334c..19e6bde1f18c 100644
--- a/tests/system/Validation/RulesTest.php
+++ b/tests/system/Validation/RulesTest.php
@@ -20,6 +20,8 @@
 /**
  * @internal
  *
+ * @group Others
+ *
  * @no-final
  */
 class RulesTest extends CIUnitTestCase
diff --git a/tests/system/Validation/StrictRules/CreditCardRulesTest.php b/tests/system/Validation/StrictRules/CreditCardRulesTest.php
index d5846194d6ac..a0619df06cc0 100644
--- a/tests/system/Validation/StrictRules/CreditCardRulesTest.php
+++ b/tests/system/Validation/StrictRules/CreditCardRulesTest.php
@@ -19,6 +19,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class CreditCardRulesTest extends CIUnitTestCase
 {
diff --git a/tests/system/Validation/StrictRules/FileRulesTest.php b/tests/system/Validation/StrictRules/FileRulesTest.php
index 949339755761..d39fd4740257 100644
--- a/tests/system/Validation/StrictRules/FileRulesTest.php
+++ b/tests/system/Validation/StrictRules/FileRulesTest.php
@@ -19,6 +19,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class FileRulesTest extends CIUnitTestCase
 {
diff --git a/tests/system/Validation/StrictRules/FormatRulesTest.php b/tests/system/Validation/StrictRules/FormatRulesTest.php
index cf1ad6c67d99..f5dd2e71609a 100644
--- a/tests/system/Validation/StrictRules/FormatRulesTest.php
+++ b/tests/system/Validation/StrictRules/FormatRulesTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class FormatRulesTest extends TraditionalFormatRulesTest
 {
diff --git a/tests/system/Validation/StrictRules/RulesTest.php b/tests/system/Validation/StrictRules/RulesTest.php
index e6d2e034d12c..d153367b8220 100644
--- a/tests/system/Validation/StrictRules/RulesTest.php
+++ b/tests/system/Validation/StrictRules/RulesTest.php
@@ -18,6 +18,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class RulesTest extends TraditionalRulesTest
 {
diff --git a/tests/system/Validation/StrictRules/ValidationTest.php b/tests/system/Validation/StrictRules/ValidationTest.php
index 464aab495fec..e6b8f770640c 100644
--- a/tests/system/Validation/StrictRules/ValidationTest.php
+++ b/tests/system/Validation/StrictRules/ValidationTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ValidationTest extends TraditionalValidationTest
 {
diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index bd191204449a..8edcd3b99a08 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -26,6 +26,8 @@
 /**
  * @internal
  *
+ * @group Others
+ *
  * @no-final
  */
 class ValidationTest extends CIUnitTestCase
diff --git a/tests/system/View/CellTest.php b/tests/system/View/CellTest.php
index 0697b8258eaf..c72dec491597 100644
--- a/tests/system/View/CellTest.php
+++ b/tests/system/View/CellTest.php
@@ -18,6 +18,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class CellTest extends CIUnitTestCase
 {
diff --git a/tests/system/View/DecoratorsTest.php b/tests/system/View/DecoratorsTest.php
index e6678c04e6fd..51f74e78e99d 100644
--- a/tests/system/View/DecoratorsTest.php
+++ b/tests/system/View/DecoratorsTest.php
@@ -20,6 +20,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class DecoratorsTest extends CIUnitTestCase
 {
diff --git a/tests/system/View/ParserFilterTest.php b/tests/system/View/ParserFilterTest.php
index 0e5a7b414af5..153569bc6d63 100644
--- a/tests/system/View/ParserFilterTest.php
+++ b/tests/system/View/ParserFilterTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ParserFilterTest extends CIUnitTestCase
 {
diff --git a/tests/system/View/ParserPluginTest.php b/tests/system/View/ParserPluginTest.php
index 4f5d199e7374..9495ee90dec5 100644
--- a/tests/system/View/ParserPluginTest.php
+++ b/tests/system/View/ParserPluginTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ParserPluginTest extends CIUnitTestCase
 {
diff --git a/tests/system/View/ParserTest.php b/tests/system/View/ParserTest.php
index 54d8a4b0df35..ab3bb8e65bc1 100644
--- a/tests/system/View/ParserTest.php
+++ b/tests/system/View/ParserTest.php
@@ -21,6 +21,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ParserTest extends CIUnitTestCase
 {
diff --git a/tests/system/View/TableTest.php b/tests/system/View/TableTest.php
index 3ecfbeb72c5d..6e56d2a3fe22 100644
--- a/tests/system/View/TableTest.php
+++ b/tests/system/View/TableTest.php
@@ -18,6 +18,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class TableTest extends CIUnitTestCase
 {
diff --git a/tests/system/View/ViewTest.php b/tests/system/View/ViewTest.php
index 8e63fa9a8675..96f695acc92f 100644
--- a/tests/system/View/ViewTest.php
+++ b/tests/system/View/ViewTest.php
@@ -19,6 +19,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class ViewTest extends CIUnitTestCase
 {
diff --git a/user_guide_src/source/changelogs/index.rst b/user_guide_src/source/changelogs/index.rst
index f764a929bff5..7ed43a6d970a 100644
--- a/user_guide_src/source/changelogs/index.rst
+++ b/user_guide_src/source/changelogs/index.rst
@@ -12,6 +12,8 @@ See all the changes.
 .. toctree::
     :titlesonly:
 
+    v4.2.10
+    v4.2.9
     v4.2.8
     v4.2.7
     v4.2.6
diff --git a/user_guide_src/source/changelogs/v4.2.10.rst b/user_guide_src/source/changelogs/v4.2.10.rst
new file mode 100644
index 000000000000..de0d0c231a75
--- /dev/null
+++ b/user_guide_src/source/changelogs/v4.2.10.rst
@@ -0,0 +1,17 @@
+Version 4.2.10
+##############
+
+Release Date: November 5, 2022
+
+**4.2.10 release of CodeIgniter4**
+
+.. contents::
+    :local:
+    :depth: 2
+
+Bugs Fixed
+**********
+
+- Fixed incorrect PHPDoc types in Session.
+
+See the repo's `CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_ for a complete list of bugs fixed.
diff --git a/user_guide_src/source/changelogs/v4.2.9.rst b/user_guide_src/source/changelogs/v4.2.9.rst
new file mode 100644
index 000000000000..b5d6ecaea143
--- /dev/null
+++ b/user_guide_src/source/changelogs/v4.2.9.rst
@@ -0,0 +1,19 @@
+Version 4.2.9
+#############
+
+Release Date: October 30, 2022
+
+**4.2.9 release of CodeIgniter4**
+
+.. contents::
+    :local:
+    :depth: 2
+
+**Hotfix release to fix PHPUnit errors in 4.2.8; no other content changes.**
+
+Bugs Fixed
+**********
+
+- Fixed a bug that causes `PHP Fatal error:  Trait "Nexus\PHPUnit\Extension\Expeditable" not found` when running PHPUnit.
+
+See the repo's `CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_ for a complete list of bugs fixed.
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index f102538dd09b..ee30ae01eb29 100644
--- a/user_guide_src/source/conf.py
+++ b/user_guide_src/source/conf.py
@@ -24,7 +24,7 @@
 version = '4.2'
 
 # The full version, including alpha/beta/rc tags.
-release = '4.2.8'
+release = '4.2.10'
 
 # -- General configuration ---------------------------------------------------
 
diff --git a/user_guide_src/source/installation/upgrade_4210.rst b/user_guide_src/source/installation/upgrade_4210.rst
new file mode 100644
index 000000000000..d6f7b18f6b19
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_4210.rst
@@ -0,0 +1,26 @@
+##############################
+Upgrading from 4.2.9 to 4.2.10
+##############################
+
+Please refer to the upgrade instructions corresponding to your installation method.
+
+- :ref:`Composer Installation App Starter Upgrading <app-starter-upgrading>`
+- :ref:`Composer Installation Adding CodeIgniter4 to an Existing Project Upgrading <adding-codeigniter4-upgrading>`
+- :ref:`Manual Installation Upgrading <installing-manual-upgrading>`
+
+.. contents::
+    :local:
+    :depth: 2
+
+Project Files
+*************
+
+Version ``4.2.10`` did not alter any executable code in project files.
+
+All Changes
+===========
+
+This is a list of all files in the **project space** that received changes;
+many will be simple comments or formatting that have no effect on the runtime:
+
+* composer.json
diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst
index e3160f04fc10..6b031b7e1a3d 100644
--- a/user_guide_src/source/installation/upgrading.rst
+++ b/user_guide_src/source/installation/upgrading.rst
@@ -16,6 +16,7 @@ See also :doc:`./backward_compatibility_notes`.
 
     backward_compatibility_notes
 
+    upgrade_4210
     upgrade_428
     upgrade_427
     upgrade_426
diff --git a/user_guide_src/source/libraries/images/002.php b/user_guide_src/source/libraries/images/002.php
index b0f698c3d768..9215a57e9e23 100644
--- a/user_guide_src/source/libraries/images/002.php
+++ b/user_guide_src/source/libraries/images/002.php
@@ -1,3 +1,3 @@
 <?php
 
-$image = Config\Services::image('imagick');
+$image = \Config\Services::image('imagick');
diff --git a/user_guide_src/source/testing/controllers/005.php b/user_guide_src/source/testing/controllers/005.php
index 7d2864f5fcbf..11717bc79e7a 100644
--- a/user_guide_src/source/testing/controllers/005.php
+++ b/user_guide_src/source/testing/controllers/005.php
@@ -1,6 +1,6 @@
 <?php
 
-$config              = new Config\App();
+$config              = new \Config\App();
 $config->appTimezone = 'America/Chicago';
 
 $results = $this->withConfig($config)