diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 5f82b6f..91ea6af 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -20,7 +20,7 @@ jobs:
       matrix:
         php-version: ['8.3', '8.4', '8.5']
 
-    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.11.1
+    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.11.3
     with:
       php-version: ${{ matrix.php-version }}
 
@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
 
-    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.11.1
+    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.11.3
     with:
       enable_eslinter: false
       enable_jsonlinter: true
@@ -77,7 +77,7 @@ jobs:
       - name: Cache composer dependencies
         uses: actions/cache@v5
         with:
-          path: $COMPOSER_CACHE
+          path: ${{ env.COMPOSER_CACHE }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
@@ -140,7 +140,7 @@ jobs:
       - name: Cache composer dependencies
         uses: actions/cache@v5
         with:
-          path: $COMPOSER_CACHE
+          path: ${{ env.COMPOSER_CACHE }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
@@ -177,7 +177,7 @@ jobs:
       - name: Cache composer dependencies
         uses: actions/cache@v5
         with:
-          path: $COMPOSER_CACHE
+          path: ${{ env.COMPOSER_CACHE }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
@@ -241,7 +241,7 @@ jobs:
       - name: Cache composer dependencies
         uses: actions/cache@v5
         with:
-          path: $COMPOSER_CACHE
+          path: ${{ env.COMPOSER_CACHE }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
diff --git a/.github/workflows/reusable_phplinter.yml b/.github/workflows/reusable_phplinter.yml
index c7ce48c..6fe6418 100644
--- a/.github/workflows/reusable_phplinter.yml
+++ b/.github/workflows/reusable_phplinter.yml
@@ -40,16 +40,14 @@ jobs:
       - name: Setup PHP runtime
         uses: shivammathur/setup-php@v2
         with:
-          tools: phive
+          tools: composer, phive
           php-version: ${{ inputs.php-version }}
           coverage: "none"
+          # A conflict exists between overtrue/phplint and redis
           extensions: :redis
 
       - name: Install overtrue/phplint (v9.7)
-        run: |
-          sleep $((random % 10))
-          phive install overtrue/phplint@~9.7.1 --force-accept-unsigned --target ./bin
+        run: composer require overtrue/phplint --ignore-platform-reqs
 
       - name: Lint PHP files
-        run: |
-          ./bin/phplint --no-cache --no-progress -v
+        run: vendor/bin/phplint --exclude=vendor --no-cache --no-progress -v
diff --git a/.phpunit.cache/test-results b/.phpunit.cache/test-results
new file mode 100644
index 0000000..5ca1938
--- /dev/null
+++ b/.phpunit.cache/test-results
@@ -0,0 +1 @@
+{"version":2,"defects":{"SimpleSAML\\Test\\TestUtils\\InMemoryStoreTest::testState":8,"SimpleSAML\\Test\\TestUtils\\InMemoryStoreTest::testExpiration":8},"times":{"SimpleSAML\\Test\\TestUtils\\InMemoryStoreTest::testState":0.004,"SimpleSAML\\Test\\TestUtils\\InMemoryStoreTest::testExpiration":2.001,"SimpleSAML\\Test\\TestUtils\\ReduceSpillOverTest::testSetState":0.013,"SimpleSAML\\Test\\TestUtils\\ReduceSpillOverTest::testStateRemoved":0.017}}
\ No newline at end of file
diff --git a/1 b/1
deleted file mode 100644
index f13d063..0000000
--- a/1
+++ /dev/null
@@ -1,35 +0,0 @@
-pick a6e6d49 Add support for PHPunit 13
-pick e0061f5 Move contents of lib-dir to src-dir
-pick 61fddec Fix CI
-s 08712a5 Fix CI
-
-# Rebase 720ccf7..08712a5 onto 720ccf7 (4 commands)
-#
-# Commands:
-# p, pick <commit> = use commit
-# r, reword <commit> = use commit, but edit the commit message
-# e, edit <commit> = use commit, but stop for amending
-# s, squash <commit> = use commit, but meld into previous commit
-# f, fixup [-C | -c] <commit> = like "squash" but keep only the previous
-#                    commit's log message, unless -C is used, in which case
-#                    keep only this commit's message; -c is same as -C but
-#                    opens the editor
-# x, exec <command> = run command (the rest of the line) using shell
-# b, break = stop here (continue rebase later with 'git rebase --continue')
-# d, drop <commit> = remove commit
-# l, label <label> = label current HEAD with a name
-# t, reset <label> = reset HEAD to a label
-# m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]
-#         create a merge commit using the original merge commit's
-#         message (or the oneline, if no original merge commit was
-#         specified); use -c <commit> to reword the commit message
-# u, update-ref <ref> = track a placeholder for the <ref> to be updated
-#                       to this position in the new commits. The <ref> is
-#                       updated at the end of the rebase
-#
-# These lines can be re-ordered; they are executed from top to bottom.
-#
-# If you remove a line here THAT COMMIT WILL BE LOST.
-#
-# However, if you remove everything, the rebase will be aborted.
-#
diff --git a/composer.json b/composer.json
index 37eee22..a65d742 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
         "phpstan/phpstan-phpunit": "^2.0",
         "phpunit/phpunit": "^12.3 || ^13.0",
         "psr/log": "^3.0",
-        "simplesamlphp/simplesamlphp": "^2.5@dev",
+        "simplesamlphp/simplesamlphp": "^2.5",
         "slevomat/coding-standard": "^8.25",
         "squizlabs/php_codesniffer": "^4.0",
         "symfony/phpunit-bridge": "^8.0",
diff --git a/src/ArrayLogger.php b/src/ArrayLogger.php
index 421df60..297e65b 100644
--- a/src/ArrayLogger.php
+++ b/src/ArrayLogger.php
@@ -7,8 +7,6 @@
 use SimpleSAML\Configuration;
 use SimpleSAML\Logger\LoggingHandlerInterface;
 
-use function array_merge;
-
 /**
  */
 class ArrayLogger implements LoggingHandlerInterface
@@ -28,7 +26,7 @@ public function __construct(Configuration $config)
 
     public function log(int $level, string $str): void
     {
-        $this->logs[$level] = array_merge($this->logs[$level], [$str]);
+        $this->logs[$level][] = $str;
     }
 
 
diff --git a/src/ReduceSpillOverTest.php b/tests/src/ReduceSpillOverTest.php
similarity index 93%
rename from src/ReduceSpillOverTest.php
rename to tests/src/ReduceSpillOverTest.php
index de0ad44..3dfad99 100644
--- a/src/ReduceSpillOverTest.php
+++ b/tests/src/ReduceSpillOverTest.php
@@ -2,10 +2,11 @@
 
 declare(strict_types=1);
 
-namespace SimpleSAML\TestUtils;
+namespace SimpleSAML\Test\TestUtils;
 
 use SimpleSAML\Configuration;
 use SimpleSAML\Error\ConfigurationError;
+use SimpleSAML\TestUtils\ClearStateTestCase;
 
 /**
  * Test that ensures state doesn't spill over between tests