Working on routing

53 files changed, 511 insertions, 419 deletions

diff --git a/tests/TestCase.php b/tests/TestCase.php
index 0874469d05..7dca0b5700 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -19,7 +19,6 @@ namespace Fisharebest\Webtrees;
 
 use Aura\Router\RouterContainer;
 use Fig\Http\Message\RequestMethodInterface;
-use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Localization\Locale\LocaleEnUs;
 use Fisharebest\Localization\Locale\LocaleInterface;
 use Fisharebest\Webtrees\Contracts\UserInterface;
@@ -27,6 +26,7 @@ use Fisharebest\Webtrees\Http\Controllers\GedcomFileController;
 use Fisharebest\Webtrees\Module\ModuleThemeInterface;
 use Fisharebest\Webtrees\Module\WebtreesTheme;
 use Fisharebest\Webtrees\Services\MigrationService;
+use Fisharebest\Webtrees\Services\ModuleService;
 use Fisharebest\Webtrees\Services\TimeoutService;
 use Fisharebest\Webtrees\Services\UserService;
 use Illuminate\Cache\ArrayStore;
@@ -44,6 +44,7 @@ use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Message\UploadedFileFactoryInterface;
 use Psr\Http\Message\UploadedFileInterface;
 use Psr\Http\Message\UriFactoryInterface;
+
 use function app;
 use function basename;
 use function define;
@@ -51,12 +52,13 @@ use function defined;
 use function filesize;
 use function http_build_query;
 use function microtime;
+
 use const UPLOAD_ERR_OK;
 
 /**
  * Base class for unit tests
  */
-class TestCase extends \PHPUnit\Framework\TestCase implements StatusCodeInterface, RequestMethodInterface
+class TestCase extends \PHPUnit\Framework\TestCase
 {
     /** @var object */
     public static $mock_functions;
@@ -95,10 +97,26 @@ class TestCase extends \PHPUnit\Framework\TestCase implements StatusCodeInterfac
 
         if (static::$uses_database) {
             static::createTestDatabase();
+
+            // Boot modules
+            (new ModuleService())->bootModules(new WebtreesTheme());
         }
     }
 
     /**
+     * Things to run once, AFTER all the tests.
+     */
+    public static function tearDownAfterClass()
+    {
+        if (static::$uses_database) {
+            $pdo = DB::connection()->getPdo();
+            unset($pdo);
+        }
+
+        parent::tearDownAfterClass();
+    }
+
+    /**
      * Create an SQLite in-memory database for testing
      */
     protected static function createTestDatabase(): void
@@ -137,7 +155,7 @@ class TestCase extends \PHPUnit\Framework\TestCase implements StatusCodeInterfac
      *
      * @return ServerRequestInterface
      */
-    protected static function createRequest(string $method = self::METHOD_GET, array $query = [], array $params = [], array $files = []): ServerRequestInterface
+    protected static function createRequest(string $method = RequestMethodInterface::METHOD_GET, array $query = [], array $params = [], array $files = []): ServerRequestInterface
     {
         /** @var ServerRequestFactoryInterface */
         $server_request_factory = app(ServerRequestFactoryInterface::class);
@@ -160,19 +178,6 @@ class TestCase extends \PHPUnit\Framework\TestCase implements StatusCodeInterfac
     }
 
     /**
-     * Things to run once, AFTER all the tests.
-     */
-    public static function tearDownAfterClass()
-    {
-        if (static::$uses_database) {
-            $pdo = DB::connection()->getPdo();
-            unset($pdo);
-        }
-
-        parent::tearDownAfterClass();
-    }
-
-    /**
      * Things to run before every test.
      */
     protected function setUp(): void
diff --git a/tests/app/Census/CensusOfCzechRepublic1880Test.php b/tests/app/Census/CensusOfCzechRepublic1880Test.php
index 9fd1b26733..4b94e9f68b 100644
--- a/tests/app/Census/CensusOfCzechRepublic1880Test.php
+++ b/tests/app/Census/CensusOfCzechRepublic1880Test.php
@@ -52,19 +52,19 @@ class CensusOfCzechRepublic1880Test extends \Fisharebest\Webtrees\TestCase
         $columns = $census->columns();
 
         $this->assertCount(13, $columns);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSexMZ::class, $columns[2]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthDaySlashMonthYear::class, $columns[3]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[4]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[5]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnReligion::class, $columns[6]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[8]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[9]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]);
+        $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
+        $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
+        $this->assertInstanceOf(CensusColumnSexMZ::class, $columns[2]);
+        $this->assertInstanceOf(CensusColumnBirthDaySlashMonthYear::class, $columns[3]);
+        $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[4]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[5]);
+        $this->assertInstanceOf(CensusColumnReligion::class, $columns[6]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
+        $this->assertInstanceOf(CensusColumnOccupation::class, $columns[9]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[12]);
 
         $this->assertSame('Jméno', $columns[0]->abbreviation());
         $this->assertSame('Vztah', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfCzechRepublic1890Test.php b/tests/app/Census/CensusOfCzechRepublic1890Test.php
index f01e157d49..22c5079351 100644
--- a/tests/app/Census/CensusOfCzechRepublic1890Test.php
+++ b/tests/app/Census/CensusOfCzechRepublic1890Test.php
@@ -52,19 +52,19 @@ class CensusOfCzechRepublic1890Test extends \Fisharebest\Webtrees\TestCase
         $columns = $census->columns();
 
         $this->assertCount(13, $columns);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSexMZ::class, $columns[2]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthDaySlashMonthYear::class, $columns[3]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[4]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[5]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnReligion::class, $columns[6]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[8]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[9]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]);
+        $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
+        $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
+        $this->assertInstanceOf(CensusColumnSexMZ::class, $columns[2]);
+        $this->assertInstanceOf(CensusColumnBirthDaySlashMonthYear::class, $columns[3]);
+        $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[4]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[5]);
+        $this->assertInstanceOf(CensusColumnReligion::class, $columns[6]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
+        $this->assertInstanceOf(CensusColumnOccupation::class, $columns[9]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[12]);
 
         $this->assertSame('Jméno', $columns[0]->abbreviation());
         $this->assertSame('Vztah', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfCzechRepublic1900Test.php b/tests/app/Census/CensusOfCzechRepublic1900Test.php
index 4bf10c517f..b554d65b45 100644
--- a/tests/app/Census/CensusOfCzechRepublic1900Test.php
+++ b/tests/app/Census/CensusOfCzechRepublic1900Test.php
@@ -52,20 +52,20 @@ class CensusOfCzechRepublic1900Test extends \Fisharebest\Webtrees\TestCase
         $columns = $census->columns();
 
         $this->assertCount(14, $columns);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSexMZ::class, $columns[2]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthDaySlashMonthYear::class, $columns[3]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[4]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[5]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnReligion::class, $columns[6]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[8]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[9]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[13]);
+        $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
+        $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
+        $this->assertInstanceOf(CensusColumnSexMZ::class, $columns[2]);
+        $this->assertInstanceOf(CensusColumnBirthDaySlashMonthYear::class, $columns[3]);
+        $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[4]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[5]);
+        $this->assertInstanceOf(CensusColumnReligion::class, $columns[6]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
+        $this->assertInstanceOf(CensusColumnOccupation::class, $columns[9]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[12]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[13]);
 
         $this->assertSame('Jméno', $columns[0]->abbreviation());
         $this->assertSame('Vztah', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfCzechRepublic1910Test.php b/tests/app/Census/CensusOfCzechRepublic1910Test.php
index 06e38fdc4b..ffee07435d 100644
--- a/tests/app/Census/CensusOfCzechRepublic1910Test.php
+++ b/tests/app/Census/CensusOfCzechRepublic1910Test.php
@@ -52,20 +52,20 @@ class CensusOfCzechRepublic1910Test extends \Fisharebest\Webtrees\TestCase
         $columns = $census->columns();
 
         $this->assertCount(14, $columns);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSexMZ::class, $columns[2]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthDaySlashMonthYear::class, $columns[3]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[4]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[5]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnReligion::class, $columns[6]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[8]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[9]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[10]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[13]);
+        $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
+        $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
+        $this->assertInstanceOf(CensusColumnSexMZ::class, $columns[2]);
+        $this->assertInstanceOf(CensusColumnBirthDaySlashMonthYear::class, $columns[3]);
+        $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[4]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[5]);
+        $this->assertInstanceOf(CensusColumnReligion::class, $columns[6]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
+        $this->assertInstanceOf(CensusColumnOccupation::class, $columns[10]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[12]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[13]);
 
         $this->assertSame('Jméno', $columns[0]->abbreviation());
         $this->assertSame('Vztah', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfCzechRepublic1921Test.php b/tests/app/Census/CensusOfCzechRepublic1921Test.php
index 9ed38cf8d4..d38ec95815 100644
--- a/tests/app/Census/CensusOfCzechRepublic1921Test.php
+++ b/tests/app/Census/CensusOfCzechRepublic1921Test.php
@@ -52,20 +52,20 @@ class CensusOfCzechRepublic1921Test extends \Fisharebest\Webtrees\TestCase
         $columns = $census->columns();
 
         $this->assertCount(14, $columns);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSexMZ::class, $columns[2]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[3]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthDaySlashMonthYear::class, $columns[4]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[5]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[6]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnReligion::class, $columns[8]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[9]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[10]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[13]);
+        $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
+        $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
+        $this->assertInstanceOf(CensusColumnSexMZ::class, $columns[2]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[3]);
+        $this->assertInstanceOf(CensusColumnBirthDaySlashMonthYear::class, $columns[4]);
+        $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[5]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[6]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
+        $this->assertInstanceOf(CensusColumnReligion::class, $columns[8]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
+        $this->assertInstanceOf(CensusColumnOccupation::class, $columns[10]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[12]);
+        $this->assertInstanceOf(CensusColumnNull::class, $columns[13]);
 
         $this->assertSame('Jméno', $columns[0]->abbreviation());
         $this->assertSame('Vztah', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfCzechRepublicTest.php b/tests/app/Census/CensusOfCzechRepublicTest.php
index ddfba41dba..f568c00ae6 100644
--- a/tests/app/Census/CensusOfCzechRepublicTest.php
+++ b/tests/app/Census/CensusOfCzechRepublicTest.php
@@ -51,10 +51,10 @@ class CensusOfCzechRepublicTest extends \Fisharebest\Webtrees\TestCase
         $census_dates = $census->allCensusDates();
 
         $this->assertCount(5, $census_dates);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfCzechRepublic1880::class, $census_dates[0]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfCzechRepublic1890::class, $census_dates[1]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfCzechRepublic1900::class, $census_dates[2]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfCzechRepublic1910::class, $census_dates[3]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfCzechRepublic1921::class, $census_dates[4]);
+        $this->assertInstanceOf(CensusOfCzechRepublic1880::class, $census_dates[0]);
+        $this->assertInstanceOf(CensusOfCzechRepublic1890::class, $census_dates[1]);
+        $this->assertInstanceOf(CensusOfCzechRepublic1900::class, $census_dates[2]);
+        $this->assertInstanceOf(CensusOfCzechRepublic1910::class, $census_dates[3]);
+        $this->assertInstanceOf(CensusOfCzechRepublic1921::class, $census_dates[4]);
     }
 }
diff --git a/tests/app/Census/CensusOfDenmark1787Test.php b/tests/app/Census/CensusOfDenmark1787Test.php
index 5becdc6f23..e8d90de974 100644
--- a/tests/app/Census/CensusOfDenmark1787Test.php
+++ b/tests/app/Census/CensusOfDenmark1787Test.php
@@ -52,7 +52,7 @@ class CensusOfDenmark1787Test extends \Fisharebest\Webtrees\TestCase
         $columns = $census->columns();
 
         $this->assertCount(5, $columns);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]);
+        $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
         $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]);
         $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[2]);
         $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionDanish::class, $columns[3]);
diff --git a/tests/app/Census/CensusOfWalesTest.php b/tests/app/Census/CensusOfWalesTest.php
index cb5761b72e..66c551d9b0 100644
--- a/tests/app/Census/CensusOfWalesTest.php
+++ b/tests/app/Census/CensusOfWalesTest.php
@@ -51,14 +51,14 @@ class CensusOfWalesTest extends \Fisharebest\Webtrees\TestCase
         $census_dates = $census->allCensusDates();
 
         $this->assertCount(9, $census_dates);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfWales1841::class, $census_dates[0]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfWales1851::class, $census_dates[1]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfWales1861::class, $census_dates[2]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfWales1871::class, $census_dates[3]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfWales1881::class, $census_dates[4]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfWales1891::class, $census_dates[5]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfWales1901::class, $census_dates[6]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfWales1911::class, $census_dates[7]);
-        $this->assertInstanceOf(\Fisharebest\Webtrees\Census\RegisterOfWales1939::class, $census_dates[8]);
+        $this->assertInstanceOf(CensusOfWales1841::class, $census_dates[0]);
+        $this->assertInstanceOf(CensusOfWales1851::class, $census_dates[1]);
+        $this->assertInstanceOf(CensusOfWales1861::class, $census_dates[2]);
+        $this->assertInstanceOf(CensusOfWales1871::class, $census_dates[3]);
+        $this->assertInstanceOf(CensusOfWales1881::class, $census_dates[4]);
+        $this->assertInstanceOf(CensusOfWales1891::class, $census_dates[5]);
+        $this->assertInstanceOf(CensusOfWales1901::class, $census_dates[6]);
+        $this->assertInstanceOf(CensusOfWales1911::class, $census_dates[7]);
+        $this->assertInstanceOf(RegisterOfWales1939::class, $census_dates[8]);
     }
 }
diff --git a/tests/app/Http/Controllers/Admin/ChangesLogControllerTest.php b/tests/app/Http/Controllers/Admin/ChangesLogControllerTest.php
index 43a845e849..58cf440959 100644
--- a/tests/app/Http/Controllers/Admin/ChangesLogControllerTest.php
+++ b/tests/app/Http/Controllers/Admin/ChangesLogControllerTest.php
@@ -18,7 +18,11 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\Controllers\Admin;
 
+use Fig\Http\Message\RequestMethodInterface;
+use Fig\Http\Message\StatusCodeInterface;
+use Fisharebest\Algorithm\MyersDiff;
 use Fisharebest\Webtrees\Auth;
+use Fisharebest\Webtrees\Services\DatatablesService;
 use Fisharebest\Webtrees\Services\UserService;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Tree;
@@ -41,10 +45,14 @@ class ChangesLogControllerTest extends TestCase
     {
         app()->instance(Tree::class, Tree::create('', ''));
 
-        $request  = self::createRequest(self::METHOD_GET, ['route' => 'admin-changes-log']);
-        $response = app(ChangesLogController::class)->changesLog($request);
+        $datatables_service = new DatatablesService();
+        $myers_diff         = new MyersDiff();
+        $user_service       = new UserService();
+        $controller         = new ChangesLogController($datatables_service, $myers_diff, $user_service);
+        $request            = self::createRequest();
+        $response           = $controller->changesLog($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -57,7 +65,11 @@ class ChangesLogControllerTest extends TestCase
         Auth::login($user);
         $individual = $tree->createIndividual("0 @@ INDI\n1 NAME Joe Bloggs");
 
-        $request  = self::createRequest(self::METHOD_GET, [
+        $datatables_service = new DatatablesService();
+        $myers_diff         = new MyersDiff();
+        $user_service       = new UserService();
+        $controller         = new ChangesLogController($datatables_service, $myers_diff, $user_service);
+        $request            = self::createRequest(RequestMethodInterface::METHOD_GET, [
             'route'  => 'admin-changes-log-data',
             'search' => 'Joe',
             'from'   => '2000-01-01',
@@ -67,9 +79,9 @@ class ChangesLogControllerTest extends TestCase
             'ged'    => $tree->name(),
             'user'   => $user->userName(),
         ]);
-        $response = app(ChangesLogController::class)->changesLogData($request);
+        $response           = $controller->changesLogData($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -82,12 +94,13 @@ class ChangesLogControllerTest extends TestCase
         Auth::login($user);
         $tree->createIndividual("0 @@ INDI\n1 NAME Joe Bloggs");
 
-        $request  = self::createRequest(self::METHOD_GET, [
-            'route' => 'admin-changes-log-download',
-            'ged'   => $tree->name(),
-        ]);
-        $response = app(ChangesLogController::class)->changesLogDownload($request);
+        $datatables_service = new DatatablesService();
+        $myers_diff         = new MyersDiff();
+        $user_service       = new UserService();
+        $controller         = new ChangesLogController($datatables_service, $myers_diff, $user_service);
+        $request            = self::createRequest();
+        $response           = $controller->changesLogDownload($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 }
diff --git a/tests/app/Http/Controllers/Admin/ControlPanelControllerTest.php b/tests/app/Http/Controllers/Admin/ControlPanelControllerTest.php
index 5e41336d13..6e2ee1de42 100644
--- a/tests/app/Http/Controllers/Admin/ControlPanelControllerTest.php
+++ b/tests/app/Http/Controllers/Admin/ControlPanelControllerTest.php
@@ -18,10 +18,14 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\Controllers\Admin;
 
+use Fig\Http\Message\StatusCodeInterface;
+use Fisharebest\Webtrees\Services\HousekeepingService;
+use Fisharebest\Webtrees\Services\ModuleService;
+use Fisharebest\Webtrees\Services\ServerCheckService;
+use Fisharebest\Webtrees\Services\TimeoutService;
+use Fisharebest\Webtrees\Services\UpgradeService;
+use Fisharebest\Webtrees\Services\UserService;
 use Fisharebest\Webtrees\TestCase;
-use Fisharebest\Webtrees\Tree;
-
-use function app;
 
 /**
  * Test the control panel controller
@@ -37,12 +41,17 @@ class ControlPanelControllerTest extends TestCase
      */
     public function testControlPanel(): void
     {
-        app()->instance(Tree::class, Tree::create('', ''));
-
-        $request  = self::createRequest(self::METHOD_GET, ['route' => 'control-panel']);
-        $response = app(ControlPanelController::class)->controlPanel($request);
+        $module_service       = new ModuleService();
+        $housekeeping_service = new HousekeepingService();
+        $server_check_service = new ServerCheckService();
+        $timeout_service      = new TimeoutService();
+        $upgrade_service      = new UpgradeService($timeout_service);
+        $user_service         = new UserService();
+        $controller           = new ControlPanelController($housekeeping_service, $module_service, $server_check_service, $upgrade_service, $user_service);
+        $request              = self::createRequest();
+        $response             = $controller->controlPanel($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -50,9 +59,16 @@ class ControlPanelControllerTest extends TestCase
      */
     public function testControlPanelManager(): void
     {
-        $request  = self::createRequest(self::METHOD_GET, ['route' => 'control-panel']);
-        $response = app(ControlPanelController::class)->controlPanelManager($request);
+        $module_service       = new ModuleService();
+        $housekeeping_service = new HousekeepingService();
+        $server_check_service = new ServerCheckService();
+        $timeout_service      = new TimeoutService();
+        $upgrade_service      = new UpgradeService($timeout_service);
+        $user_service         = new UserService();
+        $controller           = new ControlPanelController($housekeeping_service, $module_service, $server_check_service, $upgrade_service, $user_service);
+        $request              = self::createRequest();
+        $response             = $controller->controlPanelManager($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 }
diff --git a/tests/app/Http/Controllers/Admin/FixLevel0MediaControllerTest.php b/tests/app/Http/Controllers/Admin/FixLevel0MediaControllerTest.php
index 9b57c38f31..90ae0eeecc 100644
--- a/tests/app/Http/Controllers/Admin/FixLevel0MediaControllerTest.php
+++ b/tests/app/Http/Controllers/Admin/FixLevel0MediaControllerTest.php
@@ -18,6 +18,8 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\Controllers\Admin;
 
+use Fig\Http\Message\RequestMethodInterface;
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Services\DatatablesService;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Tree;
@@ -37,10 +39,10 @@ class FixLevel0MediaControllerTest extends TestCase
     public function testFixLevel0Media(): void
     {
         $controller = new FixLevel0MediaController(new DatatablesService());
-        $request    = self::createRequest(self::METHOD_GET, ['route' => 'admin-fix-level-0-media']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'admin-fix-level-0-media']);
         $response   = $controller->fixLevel0Media($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -50,7 +52,7 @@ class FixLevel0MediaControllerTest extends TestCase
     {
         $tree       = Tree::create('name', 'title');
         $controller = new FixLevel0MediaController(new DatatablesService());
-        $request    = self::createRequest(self::METHOD_POST, ['route' => 'admin-fix-level-0-media'], [
+        $request    = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'admin-fix-level-0-media'], [
             'tree_id'   => $tree->id(),
             'fact_id'   => '',
             'indi_xref' => '',
@@ -58,7 +60,7 @@ class FixLevel0MediaControllerTest extends TestCase
         ]);
         $response   = $controller->fixLevel0MediaAction($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -69,9 +71,9 @@ class FixLevel0MediaControllerTest extends TestCase
         $datatables_service = new DatatablesService();
         $tree               = Tree::create('name', 'title');
         $controller         = new FixLevel0MediaController($datatables_service);
-        $request            = self::createRequest(self::METHOD_GET, ['route' => 'admin-fix-level-0-media-data', ['tree_id' => $tree->id()]]);
+        $request            = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'admin-fix-level-0-media-data', ['tree_id' => $tree->id()]]);
         $response           = $controller->fixLevel0MediaData($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 }
diff --git a/tests/app/Http/Controllers/Admin/ImportThumbnailsControllerTest.php b/tests/app/Http/Controllers/Admin/ImportThumbnailsControllerTest.php
index 65dd4486b7..fe14a16b4f 100644
--- a/tests/app/Http/Controllers/Admin/ImportThumbnailsControllerTest.php
+++ b/tests/app/Http/Controllers/Admin/ImportThumbnailsControllerTest.php
@@ -18,6 +18,8 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\Controllers\Admin;
 
+use Fig\Http\Message\RequestMethodInterface;
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\TestCase;
 
 /**
@@ -35,10 +37,10 @@ class ImportThumbnailsControllerTest extends TestCase
     public function testWebtrees1Thumbnails(): void
     {
         $controller = new ImportThumbnailsController();
-        $request    = self::createRequest(self::METHOD_GET, ['route' => 'admin-webtrees1-thumbs']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'admin-webtrees1-thumbs']);
         $response   = $controller->webtrees1Thumbnails($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -47,7 +49,7 @@ class ImportThumbnailsControllerTest extends TestCase
     public function testWebtrees1ThumbnailsAction(): void
     {
         $controller = new ImportThumbnailsController();
-        $request    = self::createRequest(self::METHOD_POST, ['route' => 'admin-webtrees1-thumbs-action'], [
+        $request    = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'admin-webtrees1-thumbs-action'], [
             'thumbnail' => 'foo',
             'action'    => '',
             'xref'      => [],
@@ -55,7 +57,7 @@ class ImportThumbnailsControllerTest extends TestCase
         ]);
         $response   = $controller->webtrees1ThumbnailsAction($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -64,7 +66,7 @@ class ImportThumbnailsControllerTest extends TestCase
     public function testWebtrees1ThumbnailsData(): void
     {
         $controller = new ImportThumbnailsController();
-        $request    = self::createRequest(self::METHOD_GET, [
+        $request    = self::createRequest(RequestMethodInterface::METHOD_GET, [
             'route'  => 'admin-webtrees1-thumbs-data',
             'start'  => '0',
             'length' => '10',
@@ -73,6 +75,6 @@ class ImportThumbnailsControllerTest extends TestCase
         ]);
         $response   = $controller->webtrees1ThumbnailsData($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 }
diff --git a/tests/app/Http/Controllers/Admin/LocationControllerTest.php b/tests/app/Http/Controllers/Admin/LocationControllerTest.php
index 8078a14dde..2ade4f000a 100644
--- a/tests/app/Http/Controllers/Admin/LocationControllerTest.php
+++ b/tests/app/Http/Controllers/Admin/LocationControllerTest.php
@@ -18,6 +18,8 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\Controllers\Admin;
 
+use Fig\Http\Message\RequestMethodInterface;
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Services\GedcomService;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Tree;
@@ -39,10 +41,10 @@ class LocationControllerTest extends TestCase
     public function testMapData(): void
     {
         $controller = new LocationController(new GedcomService());
-        $request    = self::createRequest(self::METHOD_GET, ['route' => 'map-data']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'map-data']);
         $response   = $controller->mapData($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -51,10 +53,10 @@ class LocationControllerTest extends TestCase
     public function testMapDataEdit(): void
     {
         $controller = new LocationController(new GedcomService());
-        $request    = self::createRequest(self::METHOD_GET, ['route' => 'map-data-edit', 'place_id' => '0', 'parent_id' => '0']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'map-data-edit', 'place_id' => '0', 'parent_id' => '0']);
         $response   = $controller->mapDataEdit($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -63,7 +65,7 @@ class LocationControllerTest extends TestCase
     public function testMapDataSave(): void
     {
         $controller = new LocationController(new GedcomService());
-        $request    = self::createRequest(self::METHOD_POST, [
+        $request    = self::createRequest(RequestMethodInterface::METHOD_POST, [
             'route'     => 'map-data-edit',
             'parent_id' => '0',
             'place_id'  => '0',
@@ -78,7 +80,7 @@ class LocationControllerTest extends TestCase
         ]);
         $response   = $controller->mapDataSave($request);
 
-        $this->assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 
     /**
@@ -87,10 +89,10 @@ class LocationControllerTest extends TestCase
     public function testMapDataDelete(): void
     {
         $controller = new LocationController(new GedcomService());
-        $request    = self::createRequest(self::METHOD_POST, ['route' => 'map-data-delete', 'parent_id' => '0', 'place_id' => '0']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'map-data-delete', 'parent_id' => '0', 'place_id' => '0']);
         $response   = $controller->mapDataDelete($request);
 
-        $this->assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 
     /**
@@ -99,10 +101,10 @@ class LocationControllerTest extends TestCase
     public function testExportLocations(): void
     {
         $controller = new LocationController(new GedcomService());
-        $request    = self::createRequest(self::METHOD_GET, ['route' => 'locations-export', 'parent_id' => '0', 'format' => 'geojson']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'locations-export', 'parent_id' => '0', 'format' => 'geojson']);
         $response   = $controller->exportLocations($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
         $this->assertSame($response->getHeaderLine('Content-Type'), 'application/vnd.geo+json');
     }
 
@@ -112,10 +114,10 @@ class LocationControllerTest extends TestCase
     public function testImportLocations(): void
     {
         $controller = new LocationController(new GedcomService());
-        $request    = self::createRequest(self::METHOD_GET, ['route' => 'locations-import','parent_id' => '0']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'locations-import','parent_id' => '0']);
         $response   = $controller->importLocations($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -125,10 +127,10 @@ class LocationControllerTest extends TestCase
     {
         $csv        = $this->createUploadedFile(dirname(__DIR__, 4) . '/data/places.csv', 'text/csv');
         $controller = new LocationController(new GedcomService());
-        $request    = self::createRequest(self::METHOD_POST, ['route' => 'locations-import','parent_id' => '0'], [], ['csv' => $csv]);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'locations-import','parent_id' => '0'], [], ['csv' => $csv]);
         $response   = $controller->importLocationsAction($request);
 
-        $this->assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 
     /**
@@ -138,10 +140,10 @@ class LocationControllerTest extends TestCase
     {
         $tree       = Tree::create('name', 'title');
         $controller = new LocationController(new GedcomService());
-        $request    = self::createRequest(self::METHOD_POST, ['route' => 'locations-import-from-tree'])
+        $request    = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'locations-import-from-tree'])
             ->withAttribute('tree', $tree);
         $response = $controller->importLocationsFromTree($request);
 
-        $this->assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 }
diff --git a/tests/app/Http/Controllers/Admin/MapProviderControllerTest.php b/tests/app/Http/Controllers/Admin/MapProviderControllerTest.php
index 812369ff21..3ecdf273f2 100644
--- a/tests/app/Http/Controllers/Admin/MapProviderControllerTest.php
+++ b/tests/app/Http/Controllers/Admin/MapProviderControllerTest.php
@@ -18,6 +18,8 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\Controllers\Admin;
 
+use Fig\Http\Message\RequestMethodInterface;
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\TestCase;
 
 /**
@@ -35,10 +37,10 @@ class MapProviderControllerTest extends TestCase
     public function testMapProviderEdit(): void
     {
         $controller = new MapProviderController();
-        $request    = self::createRequest(self::METHOD_GET, ['route' => 'map-provider']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'map-provider']);
         $response   = $controller->mapProviderEdit($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -47,9 +49,9 @@ class MapProviderControllerTest extends TestCase
     public function testMapProviderSave(): void
     {
         $controller = new MapProviderController();
-        $request    = self::createRequest(self::METHOD_POST, ['route' => 'map-provider'], ['provider' => '', 'geonames' => '']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'map-provider'], ['provider' => '', 'geonames' => '']);
         $response   = $controller->mapProviderSave($request);
 
-        $this->assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 }
diff --git a/tests/app/Http/Controllers/Admin/MediaControllerTest.php b/tests/app/Http/Controllers/Admin/MediaControllerTest.php
index fce2dc3715..62574edb4f 100644
--- a/tests/app/Http/Controllers/Admin/MediaControllerTest.php
+++ b/tests/app/Http/Controllers/Admin/MediaControllerTest.php
@@ -18,6 +18,8 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\Controllers\Admin;
 
+use Fig\Http\Message\RequestMethodInterface;
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Services\DatatablesService;
 use Fisharebest\Webtrees\TestCase;
 use League\Flysystem\Filesystem;
@@ -40,10 +42,10 @@ class MediaControllerTest extends TestCase
         $datatables_service = new DatatablesService();
         $filesystem         = new Filesystem(new MemoryAdapter());
         $controller         = new MediaController($datatables_service, $filesystem);
-        $request            = self::createRequest(self::METHOD_GET, ['route' => 'admin-media']);
+        $request            = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'admin-media']);
         $response           = $controller->index($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -54,7 +56,7 @@ class MediaControllerTest extends TestCase
         $datatables_service = new DatatablesService();
         $filesystem         = new Filesystem(new MemoryAdapter());
         $controller         = new MediaController($datatables_service, $filesystem);
-        $request            = self::createRequest(self::METHOD_GET, [
+        $request            = self::createRequest(RequestMethodInterface::METHOD_GET, [
             'route'        => 'admin-media-data',
             'files'        => 'local',
             'media_folder' => '',
@@ -65,7 +67,7 @@ class MediaControllerTest extends TestCase
         ]);
         $response           = $controller->data($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -76,7 +78,7 @@ class MediaControllerTest extends TestCase
         $datatables_service = new DatatablesService();
         $filesystem         = new Filesystem(new MemoryAdapter());
         $controller         = new MediaController($datatables_service, $filesystem);
-        $request            = self::createRequest(self::METHOD_GET, [
+        $request            = self::createRequest(RequestMethodInterface::METHOD_GET, [
             'route'        => 'admin-media-external',
             'files'        => 'local',
             'media_folder' => '',
@@ -87,7 +89,7 @@ class MediaControllerTest extends TestCase
         ]);
         $response           = $controller->data($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -98,7 +100,7 @@ class MediaControllerTest extends TestCase
         $datatables_service = new DatatablesService();
         $filesystem         = new Filesystem(new MemoryAdapter());
         $controller         = new MediaController($datatables_service, $filesystem);
-        $request            = self::createRequest(self::METHOD_GET, [
+        $request            = self::createRequest(RequestMethodInterface::METHOD_GET, [
             'route'        => 'admin-media-unused',
             'files'        => 'local',
             'media_folder' => '',
@@ -109,7 +111,7 @@ class MediaControllerTest extends TestCase
         ]);
         $response           = $controller->data($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -120,10 +122,10 @@ class MediaControllerTest extends TestCase
         $datatables_service = new DatatablesService();
         $filesystem         = new Filesystem(new MemoryAdapter());
         $controller         = new MediaController($datatables_service, $filesystem);
-        $request            = self::createRequest(self::METHOD_POST, ['route' => 'admin-media-delete', 'file' => 'foo', 'folder' => 'bar']);
+        $request            = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'admin-media-delete', 'file' => 'foo', 'folder' => 'bar']);
         $response           = $controller->delete($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -134,10 +136,10 @@ class MediaControllerTest extends TestCase
         $datatables_service = new DatatablesService();
         $filesystem         = new Filesystem(new MemoryAdapter());
         $controller         = new MediaController($datatables_service, $filesystem);
-        $request            = self::createRequest(self::METHOD_GET, ['route' => 'admin-media-upload']);
+        $request            = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'admin-media-upload']);
         $response           = $controller->upload($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -148,9 +150,9 @@ class MediaControllerTest extends TestCase
         $datatables_service = new DatatablesService();
         $filesystem         = new Filesystem(new MemoryAdapter());
         $controller         = new MediaController($datatables_service, $filesystem);
-        $request            = self::createRequest(self::METHOD_POST, ['route' => 'admin-media-delete']);
+        $request            = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'admin-media-delete']);
         $response           = $controller->uploadAction($request);
 
-        $this->assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 }
diff --git a/tests/app/Http/Controllers/Admin/ModuleControllerTest.php b/tests/app/Http/Controllers/Admin/ModuleControllerTest.php
index 07c339cb34..5c7f2349c4 100644
--- a/tests/app/Http/Controllers/Admin/ModuleControllerTest.php
+++ b/tests/app/Http/Controllers/Admin/ModuleControllerTest.php
@@ -18,6 +18,8 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\Controllers\Admin;
 
+use Fig\Http\Message\RequestMethodInterface;
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Services\ModuleService;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Tree;
@@ -37,10 +39,10 @@ class ModuleControllerTest extends TestCase
     public function testList(): void
     {
         $controller = new ModuleController(new ModuleService());
-        $request    = self::createRequest(self::METHOD_GET, ['route' => 'modules']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'modules']);
         $response   = $controller->list($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -49,10 +51,10 @@ class ModuleControllerTest extends TestCase
     public function testListAnalytics(): void
     {
         $controller = new ModuleController(new ModuleService());
-        $request    = self::createRequest(self::METHOD_GET, ['route' => 'analytics']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'analytics']);
         $response   = $controller->listAnalytics($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -61,10 +63,10 @@ class ModuleControllerTest extends TestCase
     public function testListBlocks(): void
     {
         $controller = new ModuleController(new ModuleService());
-        $request    = self::createRequest(self::METHOD_GET, ['route' => 'blocks']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'blocks']);
         $response   = $controller->listBlocks($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -73,10 +75,10 @@ class ModuleControllerTest extends TestCase
     public function testListCharts(): void
     {
         $controller = new ModuleController(new ModuleService());
-        $request    = self::createRequest(self::METHOD_GET, ['route' => 'charts']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'charts']);
         $response   = $controller->listCharts($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -85,10 +87,10 @@ class ModuleControllerTest extends TestCase
     public function testListFooters(): void
     {
         $controller = new ModuleController(new ModuleService());
-        $request    = self::createRequest(self::METHOD_GET, ['route' => 'footers']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'footers']);
         $response   = $controller->listFooters($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -97,10 +99,10 @@ class ModuleControllerTest extends TestCase
     public function testListHistory(): void
     {
         $controller = new ModuleController(new ModuleService());
-        $request    = self::createRequest(self::METHOD_GET, ['route' => 'history']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'history']);
         $response   = $controller->listHistory($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -109,10 +111,10 @@ class ModuleControllerTest extends TestCase
     public function testListLanguages(): void
     {
         $controller = new ModuleController(new ModuleService());
-        $request    = self::createRequest(self::METHOD_GET, ['route' => 'languages']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'languages']);
         $response   = $controller->listLanguages($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -121,10 +123,10 @@ class ModuleControllerTest extends TestCase
     public function testListMenus(): void
     {
         $controller = new ModuleController(new ModuleService());
-        $request    = self::createRequest(self::METHOD_GET, ['route' => 'menus']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'menus']);
         $response   = $controller->listMenus($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -133,10 +135,10 @@ class ModuleControllerTest extends TestCase
     public function testListReports(): void
     {
         $controller = new ModuleController(new ModuleService());
-        $request    = self::createRequest(self::METHOD_GET, ['route' => 'reports']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'reports']);
         $response   = $controller->listReports($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -145,10 +147,10 @@ class ModuleControllerTest extends TestCase
     public function testListSidebars(): void
     {
         $controller = new ModuleController(new ModuleService());
-        $request    = self::createRequest(self::METHOD_GET, ['route' => 'sidebars']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'sidebars']);
         $response   = $controller->listSidebars($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -157,10 +159,10 @@ class ModuleControllerTest extends TestCase
     public function testListTabs(): void
     {
         $controller = new ModuleController(new ModuleService());
-        $request    = self::createRequest(self::METHOD_GET, ['route' => 'tabs']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'tabs']);
         $response   = $controller->listTabs($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -169,10 +171,10 @@ class ModuleControllerTest extends TestCase
     public function testListThemes(): void
     {
         $controller = new ModuleController(new ModuleService());
-        $request    = self::createRequest(self::METHOD_GET, ['route' => 'themes']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'themes']);
         $response   = $controller->listThemes($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -182,10 +184,10 @@ class ModuleControllerTest extends TestCase
     {
         Tree::create('name', 'title');
         $controller = new ModuleController(new ModuleService());
-        $request    = self::createRequest(self::METHOD_POST, ['route' => 'modules']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'modules']);
         $response   = $controller->update($request);
 
-        $this->assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 
     /**
@@ -195,10 +197,10 @@ class ModuleControllerTest extends TestCase
     {
         Tree::create('name', 'title');
         $controller = new ModuleController(new ModuleService());
-        $request    = self::createRequest(self::METHOD_POST, ['route' => 'analytics']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'analytics']);
         $response   = $controller->updateAnalytics($request);
 
-        $this->assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 
     /**
@@ -208,10 +210,10 @@ class ModuleControllerTest extends TestCase
     {
         Tree::create('name', 'title');
         $controller = new ModuleController(new ModuleService());
-        $request    = self::createRequest(self::METHOD_POST, ['route' => 'blocks']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'blocks']);
         $response   = $controller->updateBlocks($request);
 
-        $this->assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 
     /**
@@ -221,10 +223,10 @@ class ModuleControllerTest extends TestCase
     {
         Tree::create('name', 'title');
         $controller = new ModuleController(new ModuleService());
-        $request    = self::createRequest(self::METHOD_POST, ['route' => 'charts']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'charts']);
         $response   = $controller->updateCharts($request);
 
-        $this->assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 
     /**
@@ -234,10 +236,10 @@ class ModuleControllerTest extends TestCase
     {
         Tree::create('name', 'title');
         $controller = new ModuleController(new ModuleService());
-        $request    = self::createRequest(self::METHOD_POST, ['route' => 'footers']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'footers']);
         $response   = $controller->updateFooters($request);
 
-        $this->assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 
     /**
@@ -247,10 +249,10 @@ class ModuleControllerTest extends TestCase
     {
         Tree::create('name', 'title');
         $controller = new ModuleController(new ModuleService());
-        $request    = self::createRequest(self::METHOD_POST, ['route' => 'history']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'history']);
         $response   = $controller->updateHistory($request);
 
-        $this->assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 
     /**
@@ -260,10 +262,10 @@ class ModuleControllerTest extends TestCase
     {
         Tree::create('name', 'title');
         $controller = new ModuleController(new ModuleService());
-        $request    = self::createRequest(self::METHOD_POST, ['route' => 'languages']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'languages']);
         $response   = $controller->updateLanguages($request);
 
-        $this->assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 
     /**
@@ -273,10 +275,10 @@ class ModuleControllerTest extends TestCase
     {
         Tree::create('name', 'title');
         $controller = new ModuleController(new ModuleService());
-        $request    = self::createRequest(self::METHOD_POST, ['route' => 'menus']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'menus']);
         $response   = $controller->updateMenus($request);
 
-        $this->assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 
     /**
@@ -286,10 +288,10 @@ class ModuleControllerTest extends TestCase
     {
         Tree::create('name', 'title');
         $controller = new ModuleController(new ModuleService());
-        $request    = self::createRequest(self::METHOD_POST, ['route' => 'reports']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'reports']);
         $response   = $controller->updateReports($request);
 
-        $this->assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 
     /**
@@ -299,10 +301,10 @@ class ModuleControllerTest extends TestCase
     {
         Tree::create('name', 'title');
         $controller = new ModuleController(new ModuleService());
-        $request    = self::createRequest(self::METHOD_POST, ['route' => 'sidebars']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'sidebars']);
         $response   = $controller->updateSidebars($request);
 
-        $this->assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 
     /**
@@ -312,10 +314,10 @@ class ModuleControllerTest extends TestCase
     {
         Tree::create('name', 'title');
         $controller = new ModuleController(new ModuleService());
-        $request    = self::createRequest(self::METHOD_POST, ['route' => 'tabs']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'tabs']);
         $response   = $controller->updateTabs($request);
 
-        $this->assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 
     /**
@@ -325,10 +327,10 @@ class ModuleControllerTest extends TestCase
     {
         Tree::create('name', 'title');
         $controller = new ModuleController(new ModuleService());
-        $request    = self::createRequest(self::METHOD_POST, ['route' => 'themes']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'themes']);
         $response   = $controller->updateThemes($request);
 
-        $this->assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 
     /**
@@ -337,9 +339,9 @@ class ModuleControllerTest extends TestCase
     public function testDeleteModuleSettings(): void
     {
         $controller = new ModuleController(new ModuleService());
-        $request    = self::createRequest(self::METHOD_POST, ['route' => 'delete-module-settings'], ['module_name' => 'foo']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'delete-module-settings'], ['module_name' => 'foo']);
         $response   = $controller->deleteModuleSettings($request);
 
-        $this->assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 }
diff --git a/tests/app/Http/Controllers/Admin/UpgradeControllerTest.php b/tests/app/Http/Controllers/Admin/UpgradeControllerTest.php
index 357c79ff05..9de2f910a0 100644
--- a/tests/app/Http/Controllers/Admin/UpgradeControllerTest.php
+++ b/tests/app/Http/Controllers/Admin/UpgradeControllerTest.php
@@ -19,6 +19,8 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Http\Controllers\Admin;
 
 use Exception;
+use Fig\Http\Message\RequestMethodInterface;
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Auth;
 use Fisharebest\Webtrees\Services\TimeoutService;
 use Fisharebest\Webtrees\Services\UpgradeService;
@@ -48,10 +50,10 @@ class UpgradeControllerTest extends TestCase
             new UpgradeService(new TimeoutService())
         );
 
-        $request  = self::createRequest(self::METHOD_GET, ['route' => 'wizard']);
+        $request  = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'wizard']);
         $response = $controller->wizard($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -66,10 +68,10 @@ class UpgradeControllerTest extends TestCase
             new UpgradeService(new TimeoutService())
         );
 
-        $request  = self::createRequest(self::METHOD_GET, ['route' => 'wizard', 'continue' => '1']);
+        $request  = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'wizard', 'continue' => '1']);
         $response = $controller->wizard($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -83,7 +85,7 @@ class UpgradeControllerTest extends TestCase
             new UpgradeService(new TimeoutService())
         );
 
-        $request = self::createRequest(self::METHOD_POST, ['route' => 'wizard', 'step' => 'Invalid']);
+        $request = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'wizard', 'step' => 'Invalid']);
         $controller->step($request);
     }
 
@@ -99,10 +101,10 @@ class UpgradeControllerTest extends TestCase
             $mock_upgrade_service
         );
 
-        $request  = self::createRequest(self::METHOD_POST, ['route' => 'wizard', 'step' => 'Check']);
+        $request  = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'wizard', 'step' => 'Check']);
         $response = $controller->step($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -118,7 +120,7 @@ class UpgradeControllerTest extends TestCase
             $mock_upgrade_service
         );
 
-        $request = self::createRequest(self::METHOD_POST, ['route' => 'wizard', 'step' => 'Check']);
+        $request = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'wizard', 'step' => 'Check']);
         $controller->step($request);
     }
 
@@ -135,7 +137,7 @@ class UpgradeControllerTest extends TestCase
             $mock_upgrade_service
         );
 
-        $request = self::createRequest(self::METHOD_POST, ['route' => 'wizard', 'step' => 'Check']);
+        $request = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'wizard', 'step' => 'Check']);
         $controller->step($request);
     }
 
@@ -149,10 +151,10 @@ class UpgradeControllerTest extends TestCase
             new UpgradeService(new TimeoutService())
         );
 
-        $request  = self::createRequest(self::METHOD_POST, ['route' => 'wizard', 'step' => 'Prepare']);
+        $request  = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'wizard', 'step' => 'Prepare']);
         $response = $controller->step($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -165,10 +167,10 @@ class UpgradeControllerTest extends TestCase
             new UpgradeService(new TimeoutService())
         );
 
-        $request  = self::createRequest(self::METHOD_POST, ['route' => 'wizard', 'step' => 'Pending']);
+        $request  = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'wizard', 'step' => 'Pending']);
         $response = $controller->step($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -187,7 +189,7 @@ class UpgradeControllerTest extends TestCase
             new UpgradeService(new TimeoutService())
         );
 
-        $request = self::createRequest(self::METHOD_POST, ['route' => 'wizard', 'step' => 'Pending']);
+        $request = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'wizard', 'step' => 'Pending']);
         $controller->step($request);
     }
 
@@ -202,16 +204,16 @@ class UpgradeControllerTest extends TestCase
             new UpgradeService(new TimeoutService())
         );
 
-        $request  = self::createRequest(self::METHOD_POST, ['route' => 'wizard', 'step' => 'Export'])
+        $request  = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'wizard', 'step' => 'Export'])
             ->withAttribute('tree', $tree);
         $response = $controller->step($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
 
         // Now overwrite the file we just created
         $response = $controller->step($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -227,7 +229,7 @@ class UpgradeControllerTest extends TestCase
             $mock_upgrade_service
         );
 
-        $request = self::createRequest(self::METHOD_POST, ['route' => 'wizard', 'step' => 'Download']);
+        $request = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'wizard', 'step' => 'Download']);
         $controller->step($request);
     }
 
@@ -243,10 +245,10 @@ class UpgradeControllerTest extends TestCase
             $mock_upgrade_service
         );
 
-        $request  = self::createRequest(self::METHOD_POST, ['route' => 'wizard', 'step' => 'Download']);
+        $request  = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'wizard', 'step' => 'Download']);
         $response = $controller->step($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -261,10 +263,10 @@ class UpgradeControllerTest extends TestCase
             $mock_upgrade_service
         );
 
-        $request  = self::createRequest(self::METHOD_POST, ['route' => 'wizard', 'step' => 'Unzip']);
+        $request  = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'wizard', 'step' => 'Unzip']);
         $response = $controller->step($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -277,10 +279,10 @@ class UpgradeControllerTest extends TestCase
             new UpgradeService(new TimeoutService())
         );
 
-        $request  = self::createRequest(self::METHOD_POST, ['route' => 'wizard', 'step' => 'Copy']);
+        $request  = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'wizard', 'step' => 'Copy']);
         $response = $controller->step($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -294,9 +296,9 @@ class UpgradeControllerTest extends TestCase
             $mock_upgrade_service
         );
 
-        $request  = self::createRequest(self::METHOD_POST, ['route' => 'wizard', 'step' => 'Cleanup']);
+        $request  = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'wizard', 'step' => 'Cleanup']);
         $response = $controller->step($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 }
diff --git a/tests/app/Http/Controllers/Admin/UsersControllerTest.php b/tests/app/Http/Controllers/Admin/UsersControllerTest.php
index 42e2860062..6e80a11a17 100644
--- a/tests/app/Http/Controllers/Admin/UsersControllerTest.php
+++ b/tests/app/Http/Controllers/Admin/UsersControllerTest.php
@@ -18,6 +18,8 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\Controllers\Admin;
 
+use Fig\Http\Message\RequestMethodInterface;
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Auth;
 use Fisharebest\Webtrees\Services\DatatablesService;
 use Fisharebest\Webtrees\Services\MailService;
@@ -43,11 +45,11 @@ class UsersControllerTest extends TestCase
     public function testIndex(): void
     {
         $controller = app(UsersController::class);
-        $request    = self::createRequest(self::METHOD_GET, ['route' => 'admin-users'])
+        $request    = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'admin-users'])
             ->withAttribute('user', Auth::user());
         $response   = $controller->index($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -56,10 +58,10 @@ class UsersControllerTest extends TestCase
     public function testData(): void
     {
         $controller = app(UsersController::class);
-        $request    = self::createRequest(self::METHOD_GET, ['route' => 'admin-users-data']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'admin-users-data']);
         $response   = $controller->data($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -68,10 +70,10 @@ class UsersControllerTest extends TestCase
     public function testCreate(): void
     {
         $controller = app(UsersController::class);
-        $request    = self::createRequest(self::METHOD_GET, ['route' => 'admin-users-create']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'admin-users-create']);
         $response   = $controller->create($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -80,7 +82,7 @@ class UsersControllerTest extends TestCase
     public function testSave(): void
     {
         $controller = app(UsersController::class);
-        $request    = self::createRequest(self::METHOD_POST, ['route' => 'admin-users-create'], [
+        $request    = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'admin-users-create'], [
             'username'  => 'User name',
             'email'     => 'email@example.com',
             'real_name' => 'Real Name',
@@ -88,7 +90,7 @@ class UsersControllerTest extends TestCase
         ]);
         $response   = $controller->save($request);
 
-        $this->assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 
     /**
@@ -98,10 +100,10 @@ class UsersControllerTest extends TestCase
     {
         $user       = (new UserService())->create('user', 'real', 'email', 'pass');
         $controller = app(UsersController::class);
-        $request    = self::createRequest(self::METHOD_GET, ['route' => 'admin-users-edit', 'user_id' => (string) $user->id()]);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'admin-users-edit', 'user_id' => (string) $user->id()]);
         $response   = $controller->edit($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -112,7 +114,7 @@ class UsersControllerTest extends TestCase
         /** @var User $user */
         $user       = app(UserService::class)->create('user', 'real', 'email', 'pass');
         $controller = app(UsersController::class);
-        $request    = self::createRequest(self::METHOD_POST, ['route' => 'admin-users-edit'], [
+        $request    = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'admin-users-edit'], [
             'user_id'        => $user->id(),
             'username'       => '',
             'real_name'      => '',
@@ -132,7 +134,7 @@ class UsersControllerTest extends TestCase
             ->withAttribute('user', $user);
         $response   = $controller->update($request);
 
-        $this->assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 
     /**
@@ -141,10 +143,10 @@ class UsersControllerTest extends TestCase
     public function testCleanup(): void
     {
         $controller = app(UsersController::class);
-        $request    = self::createRequest(self::METHOD_GET, ['route' => 'admin-users-cleanup']);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'admin-users-cleanup']);
         $response   = $controller->cleanup($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -157,9 +159,9 @@ class UsersControllerTest extends TestCase
         $module_service     = new ModuleService();
         $user_service       = new UserService();
         $controller         = new UsersController($datatables_service, $mail_service, $module_service, $user_service);
-        $request            = self::createRequest(self::METHOD_POST, ['route' => 'admin-users-cleanup']);
+        $request            = self::createRequest(RequestMethodInterface::METHOD_POST, ['route' => 'admin-users-cleanup']);
         $response           = $controller->cleanupAction($request);
 
-        $this->assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 }
diff --git a/tests/app/Http/Controllers/CalendarControllerTest.php b/tests/app/Http/Controllers/CalendarControllerTest.php
index 4d4eb23f1c..515d3f337b 100644
--- a/tests/app/Http/Controllers/CalendarControllerTest.php
+++ b/tests/app/Http/Controllers/CalendarControllerTest.php
@@ -18,9 +18,12 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\Controllers;
 
+use Fig\Http\Message\RequestMethodInterface;
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Localization\Locale\LocaleEnUs;
 use Fisharebest\Webtrees\Services\CalendarService;
 use Fisharebest\Webtrees\Services\LocalizationService;
+use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Tree;
 
 use function app;
@@ -32,7 +35,7 @@ use function app;
  * @covers \Fisharebest\Webtrees\Http\Controllers\CalendarController
  * @covers \Fisharebest\Webtrees\Services\CalendarService
  */
-class CalendarControllerTest extends \Fisharebest\Webtrees\TestCase
+class CalendarControllerTest extends TestCase
 {
     protected static $uses_database = true;
 
@@ -48,34 +51,34 @@ class CalendarControllerTest extends \Fisharebest\Webtrees\TestCase
         $localization_service = new LocalizationService(new LocaleEnUs());
         $controller           = new CalendarController($calendar_service, $localization_service);
 
-        $request  = self::createRequest(self::METHOD_GET, ['route' => 'calendar', 'view' => 'day'])
+        $request  = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'calendar', 'view' => 'day'])
             ->withAttribute('tree', $tree);
         $response = $controller->page($request);
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
 
-        $request  = self::createRequest(self::METHOD_GET, ['route' => 'calendar-events', 'view' => 'day'])
+        $request  = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'calendar-events', 'view' => 'day'])
             ->withAttribute('tree', $tree);
         $response = $controller->calendar($request);
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
 
-        $request  = self::createRequest(self::METHOD_GET, ['route' => 'calendar', 'view' => 'month'])
+        $request  = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'calendar', 'view' => 'month'])
             ->withAttribute('tree', $tree);
         $response = $controller->page($request);
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
 
-        $request  = self::createRequest(self::METHOD_GET, ['route' => 'calendar-events', 'view' => 'month'])
+        $request  = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'calendar-events', 'view' => 'month'])
             ->withAttribute('tree', $tree);
         $response = $controller->calendar($request);
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
 
-        $request  = self::createRequest(self::METHOD_GET, ['route' => 'calendar', 'view' => 'year'])
+        $request  = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'calendar', 'view' => 'year'])
             ->withAttribute('tree', $tree);
         $response = $controller->page($request);
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
 
-        $request  = self::createRequest(self::METHOD_GET, ['route' => 'calendar-events', 'view' => 'year'])
+        $request  = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'calendar-events', 'view' => 'year'])
             ->withAttribute('tree', $tree);
         $response = $controller->calendar($request);
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 }
diff --git a/tests/app/Http/Middleware/AuthAdministratorTest.php b/tests/app/Http/Middleware/AuthAdministratorTest.php
index 5f135cd2f9..59c894169f 100644
--- a/tests/app/Http/Middleware/AuthAdministratorTest.php
+++ b/tests/app/Http/Middleware/AuthAdministratorTest.php
@@ -18,6 +18,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\Middleware;
 
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\GuestUser;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\User;
@@ -48,7 +49,7 @@ class AuthAdministratorTest extends TestCase
         $middleware = new AuthAdministrator();
         $response   = $middleware->process($request, $handler);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
         $this->assertSame('lorem ipsum', (string) $response->getBody());
     }
 
@@ -81,6 +82,6 @@ class AuthAdministratorTest extends TestCase
         $middleware = new AuthAdministrator();
         $response   = $middleware->process($request, $handler);
 
-        $this->assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 }
diff --git a/tests/app/Http/Middleware/AuthEditorTest.php b/tests/app/Http/Middleware/AuthEditorTest.php
index af0300a1e6..3af9ce6620 100644
--- a/tests/app/Http/Middleware/AuthEditorTest.php
+++ b/tests/app/Http/Middleware/AuthEditorTest.php
@@ -18,6 +18,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\Middleware;
 
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\GuestUser;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Tree;
@@ -52,7 +53,7 @@ class AuthEditorTest extends TestCase
         $middleware = new AuthEditor();
         $response   = $middleware->process($request, $handler);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
         $this->assertSame('lorem ipsum', (string) $response->getBody());
     }
 
@@ -90,6 +91,6 @@ class AuthEditorTest extends TestCase
         $middleware = new AuthEditor();
         $response   = $middleware->process($request, $handler);
 
-        $this->assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 }
diff --git a/tests/app/Http/Middleware/AuthManagerTest.php b/tests/app/Http/Middleware/AuthManagerTest.php
index c6f4ce21a6..2a74793274 100644
--- a/tests/app/Http/Middleware/AuthManagerTest.php
+++ b/tests/app/Http/Middleware/AuthManagerTest.php
@@ -18,6 +18,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\Middleware;
 
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\GuestUser;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Tree;
@@ -51,7 +52,7 @@ class AuthManagerTest extends TestCase
         $middleware = new AuthManager();
         $response   = $middleware->process($request, $handler);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
         $this->assertSame('lorem ipsum', (string) $response->getBody());
     }
 
@@ -89,6 +90,6 @@ class AuthManagerTest extends TestCase
         $middleware = new AuthManager();
         $response   = $middleware->process($request, $handler);
 
-        $this->assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 }
diff --git a/tests/app/Http/Middleware/AuthMemberTest.php b/tests/app/Http/Middleware/AuthMemberTest.php
index fb01488fc6..8918f5dd0d 100644
--- a/tests/app/Http/Middleware/AuthMemberTest.php
+++ b/tests/app/Http/Middleware/AuthMemberTest.php
@@ -18,6 +18,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\Middleware;
 
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\GuestUser;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Tree;
@@ -51,7 +52,7 @@ class AuthMemberTest extends TestCase
         $middleware = new AuthMember();
         $response   = $middleware->process($request, $handler);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
         $this->assertSame('lorem ipsum', (string) $response->getBody());
     }
 
@@ -89,6 +90,6 @@ class AuthMemberTest extends TestCase
         $middleware = new AuthMember();
         $response   = $middleware->process($request, $handler);
 
-        $this->assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 }
diff --git a/tests/app/Http/Middleware/AuthModeratorTest.php b/tests/app/Http/Middleware/AuthModeratorTest.php
index ca305c94de..ba271cf640 100644
--- a/tests/app/Http/Middleware/AuthModeratorTest.php
+++ b/tests/app/Http/Middleware/AuthModeratorTest.php
@@ -18,6 +18,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\Middleware;
 
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\GuestUser;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Tree;
@@ -51,7 +52,7 @@ class AuthModeratorTest extends TestCase
         $middleware = new AuthModerator();
         $response   = $middleware->process($request, $handler);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
         $this->assertSame('lorem ipsum', (string) $response->getBody());
     }
 
@@ -89,6 +90,6 @@ class AuthModeratorTest extends TestCase
         $middleware = new AuthModerator();
         $response   = $middleware->process($request, $handler);
 
-        $this->assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 }
diff --git a/tests/app/Http/Middleware/BootModulesTest.php b/tests/app/Http/Middleware/BootModulesTest.php
index 2ded4ecf95..29c80cdc46 100644
--- a/tests/app/Http/Middleware/BootModulesTest.php
+++ b/tests/app/Http/Middleware/BootModulesTest.php
@@ -18,6 +18,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\Middleware;
 
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Module\WebtreesTheme;
 use Fisharebest\Webtrees\Module\XeneaTheme;
 use Fisharebest\Webtrees\Services\ModuleService;
@@ -39,45 +40,22 @@ class BootModulesTest extends TestCase
      */
     public function testMiddleware(): void
     {
-        $handler = $this->createMock(RequestHandlerInterface::class);
-        $handler->method('handle')->willReturn(response());
-
-        // Theme 1 (not default) is not booted.
-        $theme1 = new class extends WebtreesTheme {
-            public function boot()
-            {
-                throw new \Exception('Should not get here!');
-            }
-        };
-
-        // Theme 2 (default) is booted.
-        $theme2 = new class($this) extends XeneaTheme {
-            private $booted = false;
-            private $test;
+        $theme = new WebtreesTheme();
 
-            public function __construct($test)
-            {
-                $this->test = $test;
-            }
-
-            public function boot()
-            {
-                $this->booted = true;
-            }
-
-            public function __destruct()
-            {
-                $this->test->assertTrue($this->booted);
-            }
-        };
+        $handler = $this->createMock(RequestHandlerInterface::class);
+        $handler->method('handle')->willReturn(response('It works!'));
 
         $module_service = $this->createMock(ModuleService::class);
-        $module_service->method('all')->willReturn(new Collection([$theme1, $theme2]));
+        $module_service
+            ->expects($this->once())
+            ->method('bootModules')
+            ->with($theme);
 
         $request    = self::createRequest();
-        $middleware = new BootModules($module_service, $theme2);
+        $middleware = new BootModules($module_service, $theme);
         $response   = $middleware->process($request, $handler);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
+        $this->assertSame('It works!', (string) $response->getBody());
     }
 }
diff --git a/tests/app/Http/Middleware/CheckCsrfTest.php b/tests/app/Http/Middleware/CheckCsrfTest.php
index 715b8f1e49..e57bd6679c 100644
--- a/tests/app/Http/Middleware/CheckCsrfTest.php
+++ b/tests/app/Http/Middleware/CheckCsrfTest.php
@@ -18,6 +18,8 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\Middleware;
 
+use Fig\Http\Message\RequestMethodInterface;
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\TestCase;
 use Psr\Http\Server\RequestHandlerInterface;
 
@@ -38,13 +40,13 @@ class CheckCsrfTest extends TestCase
         $handler = $this->createMock(RequestHandlerInterface::class);
         $handler->method('handle')->willReturn(response());
 
-        $request = self::createRequest(self::METHOD_POST)
+        $request = self::createRequest(RequestMethodInterface::METHOD_POST)
             ->withAttribute('request_uri', 'http://example.com');
 
         $middleware = new CheckCsrf();
         $response   = $middleware->process($request, $handler);
 
-        $this->assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
         $this->assertSame('http://example.com', $response->getHeaderLine('Location'));
     }
 }
diff --git a/tests/app/Http/Middleware/CheckForMaintenanceModeTest.php b/tests/app/Http/Middleware/CheckForMaintenanceModeTest.php
index 5d08c7c4a6..badb1b6e1c 100644
--- a/tests/app/Http/Middleware/CheckForMaintenanceModeTest.php
+++ b/tests/app/Http/Middleware/CheckForMaintenanceModeTest.php
@@ -18,6 +18,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\Middleware;
 
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\TestCase;
 use Psr\Http\Server\RequestHandlerInterface;
 
@@ -42,6 +43,6 @@ class CheckForMaintenanceModeTest extends TestCase
         $middleware = new CheckForMaintenanceMode();
         $response   = $middleware->process($request, $handler);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 }
diff --git a/tests/app/Http/Middleware/DoHousekeepingTest.php b/tests/app/Http/Middleware/DoHousekeepingTest.php
index 93911f4c8d..7daa740e00 100644
--- a/tests/app/Http/Middleware/DoHousekeepingTest.php
+++ b/tests/app/Http/Middleware/DoHousekeepingTest.php
@@ -18,6 +18,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\Middleware;
 
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Services\HousekeepingService;
 use Fisharebest\Webtrees\TestCase;
 use Psr\Http\Server\RequestHandlerInterface;
@@ -43,6 +44,6 @@ class DoHousekeepingTest extends TestCase
         $middleware = new DoHousekeeping(new HousekeepingService());
         $response   = $middleware->process($request, $handler);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 }
diff --git a/tests/app/Http/Middleware/HandleExceptionsTest.php b/tests/app/Http/Middleware/HandleExceptionsTest.php
index 66e5a332d1..69d3d6a061 100644
--- a/tests/app/Http/Middleware/HandleExceptionsTest.php
+++ b/tests/app/Http/Middleware/HandleExceptionsTest.php
@@ -18,6 +18,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\Middleware;
 
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Exceptions\InternalServerErrorException;
 use Fisharebest\Webtrees\Services\ModuleService;
 use Fisharebest\Webtrees\Services\UserService;
@@ -60,7 +61,7 @@ class HandleExceptionsTest extends TestCase
         $middleware = new HandleExceptions();
         $response   = $middleware->process($request, $handler);
 
-        $this->assertSame(self::STATUS_INTERNAL_SERVER_ERROR, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_INTERNAL_SERVER_ERROR, $response->getStatusCode());
 
         app()->forgetInstance(ModuleService::class);
         app()->forgetInstance(UserService::class);
diff --git a/tests/app/Http/Middleware/NoRouteFoundTest.php b/tests/app/Http/Middleware/NoRouteFoundTest.php
index 7a5032e92b..3c8b795bbe 100644
--- a/tests/app/Http/Middleware/NoRouteFoundTest.php
+++ b/tests/app/Http/Middleware/NoRouteFoundTest.php
@@ -18,6 +18,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\Middleware;
 
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\TestCase;
 use Psr\Http\Server\RequestHandlerInterface;
 
@@ -42,6 +43,6 @@ class NoRouteFoundTest extends TestCase
         $middleware = new NoRouteFound();
         $response   = $middleware->process($request, $handler);
 
-        $this->assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 }
diff --git a/tests/app/Http/RequestHandlers/DeleteUserTest.php b/tests/app/Http/RequestHandlers/DeleteUserTest.php
index 1aded01e6e..82ca2cba27 100644
--- a/tests/app/Http/RequestHandlers/DeleteUserTest.php
+++ b/tests/app/Http/RequestHandlers/DeleteUserTest.php
@@ -18,6 +18,8 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
+use Fig\Http\Message\RequestMethodInterface;
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Services\UserService;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\User;
@@ -40,11 +42,11 @@ class DeleteUserTest extends TestCase
         $user_service = $this->createMock(UserService::class);
         $user_service->expects($this->once())->method('find')->willReturn($user);
 
-        $request  = self::createRequest(self::METHOD_POST, [], ['user_id' => $user->id()]);
+        $request  = self::createRequest(RequestMethodInterface::METHOD_POST, [], ['user_id' => $user->id()]);
         $handler  = new DeleteUser($user_service);
         $response = $handler->handle($request);
 
-        self::assertSame(self::STATUS_NO_CONTENT, $response->getStatusCode());
+        self::assertSame(StatusCodeInterface::STATUS_NO_CONTENT, $response->getStatusCode());
     }
 
     /**
@@ -57,7 +59,7 @@ class DeleteUserTest extends TestCase
         $user_service = $this->createMock(UserService::class);
         $user_service->expects($this->once())->method('find')->willReturn(null);
 
-        $request  = self::createRequest(self::METHOD_POST, [], ['user_id' => 98765]);
+        $request  = self::createRequest(RequestMethodInterface::METHOD_POST, [], ['user_id' => 98765]);
         $handler  = new DeleteUser($user_service);
         $response = $handler->handle($request);
     }
@@ -76,7 +78,7 @@ class DeleteUserTest extends TestCase
         $user_service = $this->createMock(UserService::class);
         $user_service->expects($this->once())->method('find')->willReturn($user);
 
-        $request = self::createRequest(self::METHOD_POST, [], ['user_id' => $user->id()]);
+        $request = self::createRequest(RequestMethodInterface::METHOD_POST, [], ['user_id' => $user->id()]);
         $handler = new DeleteUser($user_service);
         $handler->handle($request);
     }
diff --git a/tests/app/Http/RequestHandlers/LoginPageTest.php b/tests/app/Http/RequestHandlers/LoginPageTest.php
index 03be2d3d52..038b9e9538 100644
--- a/tests/app/Http/RequestHandlers/LoginPageTest.php
+++ b/tests/app/Http/RequestHandlers/LoginPageTest.php
@@ -18,6 +18,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\User;
 use Fisharebest\Webtrees\View;
@@ -37,7 +38,7 @@ class LoginPageTest extends TestCase
         $handler  = new LoginPage();
         $response = $handler->handle($request);
 
-        self::assertSame(self::STATUS_OK, $response->getStatusCode());
+        self::assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -50,6 +51,6 @@ class LoginPageTest extends TestCase
         $handler  = new LoginPage();
         $response = $handler->handle($request);
 
-        self::assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        self::assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 }
diff --git a/tests/app/Http/RequestHandlers/MasqueradeAsUserTest.php b/tests/app/Http/RequestHandlers/MasqueradeAsUserTest.php
index 3d5fc02958..83e336c575 100644
--- a/tests/app/Http/RequestHandlers/MasqueradeAsUserTest.php
+++ b/tests/app/Http/RequestHandlers/MasqueradeAsUserTest.php
@@ -18,6 +18,8 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
+use Fig\Http\Message\RequestMethodInterface;
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Auth;
 use Fisharebest\Webtrees\Services\UserService;
 use Fisharebest\Webtrees\Session;
@@ -43,13 +45,13 @@ class MasqueradeAsUserTest extends TestCase
         $user_service = $this->createMock(UserService::class);
         $user_service->expects($this->once())->method('find')->willReturn($user2);
 
-        $request = self::createRequest(self::METHOD_POST, [], ['user_id' => $user2->id()])
+        $request = self::createRequest(RequestMethodInterface::METHOD_POST, [], ['user_id' => $user2->id()])
             ->withAttribute('user', $user1);
 
         $handler  = new MasqueradeAsUser($user_service);
         $response = $handler->handle($request);
 
-        self::assertSame(self::STATUS_NO_CONTENT, $response->getStatusCode());
+        self::assertSame(StatusCodeInterface::STATUS_NO_CONTENT, $response->getStatusCode());
         self::assertSame($user2->id(), Auth::id());
         self::assertSame('1', Session::get('masquerade'));
     }
@@ -65,13 +67,13 @@ class MasqueradeAsUserTest extends TestCase
         $user_service = $this->createMock(UserService::class);
         $user_service->expects($this->once())->method('find')->willReturn($user);
 
-        $request = self::createRequest(self::METHOD_POST, [], ['user_id' => $user->id()])
+        $request = self::createRequest(RequestMethodInterface::METHOD_POST, [], ['user_id' => $user->id()])
             ->withAttribute('user', $user);
 
         $handler  = new MasqueradeAsUser($user_service);
         $response = $handler->handle($request);
 
-        self::assertSame(self::STATUS_NO_CONTENT, $response->getStatusCode());
+        self::assertSame(StatusCodeInterface::STATUS_NO_CONTENT, $response->getStatusCode());
         self::assertNull(Session::get('masquerade'));
     }
 
@@ -88,7 +90,7 @@ class MasqueradeAsUserTest extends TestCase
         $user_service = $this->createMock(UserService::class);
         $user_service->expects($this->once())->method('find')->willReturn(null);
 
-        $request = self::createRequest(self::METHOD_POST, [], ['user_id' => 2])
+        $request = self::createRequest(RequestMethodInterface::METHOD_POST, [], ['user_id' => 2])
             ->withAttribute('user', $user);
 
         $handler = new MasqueradeAsUser($user_service);
diff --git a/tests/app/Http/RequestHandlers/ModuleActionTest.php b/tests/app/Http/RequestHandlers/ModuleActionTest.php
index 62a0e7756f..b4946f82be 100644
--- a/tests/app/Http/RequestHandlers/ModuleActionTest.php
+++ b/tests/app/Http/RequestHandlers/ModuleActionTest.php
@@ -18,75 +18,87 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\GuestUser;
+use Fisharebest\Webtrees\Module\AbstractModule;
+use Fisharebest\Webtrees\Module\ModuleInterface;
 use Fisharebest\Webtrees\Services\ModuleService;
 use Fisharebest\Webtrees\TestCase;
-use Fisharebest\Webtrees\Tree;
+use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 
+use function response;
+
 /**
  * @covers \Fisharebest\Webtrees\Http\RequestHandlers\ModuleAction
  */
 class ModuleActionTest extends TestCase
 {
-    protected static $uses_database = true;
-
     /**
      * @return void
      */
     public function testModuleAction(): void
     {
-        $tree = Tree::create('tree', 'tree');
-        app()->instance(Tree::class, $tree);
-        $user           = new GuestUser();
-        $module_service = new ModuleService();
-        $handler        = new ModuleAction($module_service, $user);
-        $request        = self::createRequest(self::METHOD_GET, ['route' => 'module', 'ged' => $tree->name()])
-            ->withAttribute('module', 'faq')
-            ->withAttribute('action', 'Show')
-            ->withAttribute('tree', $tree);
-
-        app()->instance(ServerRequestInterface::class, $request);
+        $module_service = $this->createMock(ModuleService::class);
+        $module_service
+            ->expects($this->once())
+            ->method('findByName')
+            ->with('test')
+            ->willReturn($this->dummyModule());
 
+        $user     = new GuestUser();
+        $request  = self::createRequest()
+            ->withAttribute('module', 'test')
+            ->withAttribute('action', 'Test');
+        $handler  = new ModuleAction($module_service, $user);
         $response = $handler->handle($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
+        $this->assertSame('It works!', (string) $response->getBody());
     }
 
     /**
      * @expectedException \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
-     * @expectedExceptionMessage Method getFishAction() not found in faq
+     * @expectedExceptionMessage Method getTestingAction() not found in test
      * @return void
      */
     public function testNonExistingAction(): void
     {
-        $user           = new GuestUser();
-        $module_service = new ModuleService();
-        $handler        = new ModuleAction($module_service, $user);
-        $request        = self::createRequest(self::METHOD_GET, ['route' => 'module'])
-            ->withAttribute('module', 'faq')
-            ->withAttribute('action', 'Fish')
-        ;
+        $module_service = $this->createMock(ModuleService::class);
+        $module_service
+            ->expects($this->once())
+            ->method('findByName')
+            ->with('test')
+            ->willReturn($this->dummyModule());
+
+        $user    = new GuestUser();
+        $request = self::createRequest()
+            ->withAttribute('module', 'test')
+            ->withAttribute('action', 'Testing');
+        $handler = new ModuleAction($module_service, $user);
         $handler->handle($request);
     }
 
     /**
      * @expectedException \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
-     * @expectedExceptionMessage Module fish does not exist
+     * @expectedExceptionMessage Module test does not exist
      * @return void
      */
     public function testNonExistingModule(): void
     {
-        $user           = new GuestUser();
-        $module_service = new ModuleService();
-        $handler        = new ModuleAction($module_service, $user);
-        $request        = self::createRequest(self::METHOD_GET, ['route' => 'module'])
-            ->withAttribute('module', 'fish')
-            ->withAttribute('action', 'Show')
-        ;
-        $response       = $handler->handle($request);
+        $module_service = $this->createMock(ModuleService::class);
+        $module_service
+            ->expects($this->once())
+            ->method('findByName')
+            ->with('test')
+            ->willReturn(null);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $user    = new GuestUser();
+        $request = self::createRequest()
+            ->withAttribute('module', 'test')
+            ->withAttribute('action', 'Test');
+        $handler = new ModuleAction($module_service, $user);
+        $handler->handle($request);
     }
 
     /**
@@ -96,15 +108,32 @@ class ModuleActionTest extends TestCase
      */
     public function testAdminAction(): void
     {
-        $tree = Tree::create('tree', 'tree');
-        app()->instance(Tree::class, $tree);
-        $user           = new GuestUser();
-        $module_service = new ModuleService();
-        $handler        = new ModuleAction($module_service, $user);
-        $request        = self::createRequest(self::METHOD_GET, ['route' => 'module', 'ged' => $tree->name()])
-            ->withAttribute('module', 'faq')
-            ->withAttribute('action', 'Admin')
-        ;
+        $module_service = $this->createMock(ModuleService::class);
+        $module_service
+            ->expects($this->once())
+            ->method('findByName')
+            ->with('test')
+            ->willReturn($this->dummyModule());
+
+        $user    = new GuestUser();
+        $request = self::createRequest()
+            ->withAttribute('module', 'test')
+            ->withAttribute('action', 'Admin');
+        $handler = new ModuleAction($module_service, $user);
         $handler->handle($request);
     }
+
+    /**
+     * @return ModuleInterface
+     */
+    private function dummyModule(): ModuleInterface
+    {
+        return new class extends AbstractModule
+        {
+            public function getTestAction(ServerRequestInterface $request): ResponseInterface
+            {
+                return response('It works!');
+            }
+        };
+    }
 }
diff --git a/tests/app/Http/RequestHandlers/PasswordRequestPageTest.php b/tests/app/Http/RequestHandlers/PasswordRequestPageTest.php
index eca2b61faa..cb262fa51c 100644
--- a/tests/app/Http/RequestHandlers/PasswordRequestPageTest.php
+++ b/tests/app/Http/RequestHandlers/PasswordRequestPageTest.php
@@ -18,6 +18,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\User;
 
@@ -35,7 +36,7 @@ class PasswordRequestPageTest extends TestCase
         $handler  = new PasswordRequestPage();
         $response = $handler->handle($request);
 
-        self::assertSame(self::STATUS_OK, $response->getStatusCode());
+        self::assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -48,6 +49,6 @@ class PasswordRequestPageTest extends TestCase
         $handler  = new PasswordRequestPage();
         $response = $handler->handle($request);
 
-        self::assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        self::assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 }
diff --git a/tests/app/Http/RequestHandlers/PasswordResetPageTest.php b/tests/app/Http/RequestHandlers/PasswordResetPageTest.php
index 4e140ee1af..27956e417e 100644
--- a/tests/app/Http/RequestHandlers/PasswordResetPageTest.php
+++ b/tests/app/Http/RequestHandlers/PasswordResetPageTest.php
@@ -18,6 +18,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\ResetHandlers;
 
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Http\RequestHandlers\PasswordResetPage;
 use Fisharebest\Webtrees\Services\UserService;
 use Fisharebest\Webtrees\TestCase;
@@ -45,7 +46,7 @@ class PasswordResetPageTest extends TestCase
         $handler  = new PasswordResetPage($user_service);
         $response = $handler->handle($request);
 
-        self::assertSame(self::STATUS_OK, $response->getStatusCode());
+        self::assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 
     /**
@@ -60,6 +61,6 @@ class PasswordResetPageTest extends TestCase
         $handler  = new PasswordResetPage($user_service);
         $response = $handler->handle($request);
 
-        self::assertSame(self::STATUS_FOUND, $response->getStatusCode());
+        self::assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
 }
diff --git a/tests/app/Http/RequestHandlers/PingTest.php b/tests/app/Http/RequestHandlers/PingTest.php
index 589942c219..e7114cdec2 100644
--- a/tests/app/Http/RequestHandlers/PingTest.php
+++ b/tests/app/Http/RequestHandlers/PingTest.php
@@ -18,6 +18,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Services\ServerCheckService;
 use Fisharebest\Webtrees\Services\UserService;
 use Fisharebest\Webtrees\TestCase;
@@ -41,7 +42,7 @@ class PingTest extends TestCase
         $handler  = new Ping($server_check_service);
         $response = $handler->handle($request);
 
-        self::assertSame(self::STATUS_OK, $response->getStatusCode());
+        self::assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
         self::assertSame('OK', (string) $response->getBody());
     }
 
@@ -58,7 +59,7 @@ class PingTest extends TestCase
         $handler  = new Ping($server_check_service);
         $response = $handler->handle($request);
 
-        self::assertSame(self::STATUS_OK, $response->getStatusCode());
+        self::assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
         self::assertSame('WARNING', (string) $response->getBody());
     }
 
@@ -74,7 +75,7 @@ class PingTest extends TestCase
         $handler  = new Ping($server_check_service);
         $response = $handler->handle($request);
 
-        self::assertSame(self::STATUS_OK, $response->getStatusCode());
+        self::assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
         self::assertSame('ERROR', (string) $response->getBody());
     }
 }
diff --git a/tests/app/Http/RequestHandlers/PrivacyPolicyTest.php b/tests/app/Http/RequestHandlers/PrivacyPolicyTest.php
index 75ba31987b..28f75e7893 100644
--- a/tests/app/Http/RequestHandlers/PrivacyPolicyTest.php
+++ b/tests/app/Http/RequestHandlers/PrivacyPolicyTest.php
@@ -18,6 +18,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\TestCase;
 
 /**
@@ -33,6 +34,6 @@ class PrivacyPolicyTest extends TestCase
         $request  = self::createRequest();
         $response = app(PrivacyPolicy::class)->handle($request);
 
-        self::assertSame(self::STATUS_OK, $response->getStatusCode());
+        self::assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 }
diff --git a/tests/app/Http/RequestHandlers/SelectLanguageTest.php b/tests/app/Http/RequestHandlers/SelectLanguageTest.php
index e2be952c90..30e0eb7892 100644
--- a/tests/app/Http/RequestHandlers/SelectLanguageTest.php
+++ b/tests/app/Http/RequestHandlers/SelectLanguageTest.php
@@ -18,6 +18,8 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
+use Fig\Http\Message\RequestMethodInterface;
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\GuestUser;
 use Fisharebest\Webtrees\Services\UserService;
 use Fisharebest\Webtrees\TestCase;
@@ -34,10 +36,10 @@ class SelectLanguageTest extends TestCase
     {
         $user     = new GuestUser();
         $handler  = new SelectLanguage($user);
-        $request  = self::createRequest(self::METHOD_POST, [], ['language' => 'fr']);
+        $request  = self::createRequest(RequestMethodInterface::METHOD_POST, [], ['language' => 'fr']);
         $response = $handler->handle($request);
 
-        self::assertSame(self::STATUS_NO_CONTENT, $response->getStatusCode());
+        self::assertSame(StatusCodeInterface::STATUS_NO_CONTENT, $response->getStatusCode());
     }
 
     /**
@@ -48,9 +50,9 @@ class SelectLanguageTest extends TestCase
         $user_service = new UserService();
         $user         = $user_service->create('user', 'real', 'email', 'pass');
         $handler      = new SelectLanguage($user);
-        $request      = self::createRequest(self::METHOD_POST, [], ['language' => 'fr']);
+        $request      = self::createRequest(RequestMethodInterface::METHOD_POST, [], ['language' => 'fr']);
         $response     = $handler->handle($request);
 
-        self::assertSame(self::STATUS_NO_CONTENT, $response->getStatusCode());
+        self::assertSame(StatusCodeInterface::STATUS_NO_CONTENT, $response->getStatusCode());
     }
 }
diff --git a/tests/app/Http/RequestHandlers/SelectThemeTest.php b/tests/app/Http/RequestHandlers/SelectThemeTest.php
index 1da460c1d3..84d8def7e5 100644
--- a/tests/app/Http/RequestHandlers/SelectThemeTest.php
+++ b/tests/app/Http/RequestHandlers/SelectThemeTest.php
@@ -18,6 +18,8 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
+use Fig\Http\Message\RequestMethodInterface;
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\GuestUser;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\User;
@@ -35,13 +37,13 @@ class SelectThemeTest extends TestCase
         $user = $this->createMock(GuestUser::class);
         $user->expects($this->once())->method('setPreference')->with('theme', 'FOO');
 
-        $request = self::createRequest(self::METHOD_POST, [], ['theme' => 'FOO'])
+        $request = self::createRequest(RequestMethodInterface::METHOD_POST, [], ['theme' => 'FOO'])
             ->withAttribute('user', $user);
 
         $handler  = new SelectTheme();
         $response = $handler->handle($request);
 
-        self::assertSame(self::STATUS_NO_CONTENT, $response->getStatusCode());
+        self::assertSame(StatusCodeInterface::STATUS_NO_CONTENT, $response->getStatusCode());
     }
 
     /**
@@ -52,12 +54,12 @@ class SelectThemeTest extends TestCase
         $user = $this->createMock(User::class);
         $user->expects($this->once())->method('setPreference')->with('theme', 'FOO');
 
-        $request = self::createRequest(self::METHOD_POST, [], ['theme' => 'FOO'])
+        $request = self::createRequest(RequestMethodInterface::METHOD_POST, [], ['theme' => 'FOO'])
             ->withAttribute('user', $user);
 
         $handler  = new SelectTheme();
         $response = $handler->handle($request);
 
-        self::assertSame(self::STATUS_NO_CONTENT, $response->getStatusCode());
+        self::assertSame(StatusCodeInterface::STATUS_NO_CONTENT, $response->getStatusCode());
     }
 }
diff --git a/tests/app/Module/AlbumModuleTest.php b/tests/app/Module/AlbumModuleTest.php
index 0847a0fcdb..8044079110 100644
--- a/tests/app/Module/AlbumModuleTest.php
+++ b/tests/app/Module/AlbumModuleTest.php
@@ -18,10 +18,12 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Module;
 
+use Fisharebest\Webtrees\TestCase;
+
 /**
  * Test harness for the class AlbumModule
  */
-class AlbumModuleTest extends \Fisharebest\Webtrees\TestCase
+class AlbumModuleTest extends TestCase
 {
     /**
      * Test that the class exists
@@ -30,6 +32,6 @@ class AlbumModuleTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testClassExists(): void
     {
-        $this->assertTrue(class_exists(\Fisharebest\Webtrees\Module\AlbumModule::class));
+        $this->assertTrue(class_exists(AlbumModule::class));
     }
 }
diff --git a/tests/app/Module/AncestorsChartModuleTest.php b/tests/app/Module/AncestorsChartModuleTest.php
index 85b2592a23..dd8f853860 100644
--- a/tests/app/Module/AncestorsChartModuleTest.php
+++ b/tests/app/Module/AncestorsChartModuleTest.php
@@ -30,6 +30,6 @@ class AncestorsChartModuleTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testClassExists(): void
     {
-        $this->assertTrue(class_exists(\Fisharebest\Webtrees\Module\AncestorsChartModule::class));
+        $this->assertTrue(class_exists(AncestorsChartModule::class));
     }
 }
diff --git a/tests/app/Module/BatchUpdate/BatchUpdateBasePluginTest.php b/tests/app/Module/BatchUpdate/BatchUpdateBasePluginTest.php
index 430b755736..c317b468a7 100644
--- a/tests/app/Module/BatchUpdate/BatchUpdateBasePluginTest.php
+++ b/tests/app/Module/BatchUpdate/BatchUpdateBasePluginTest.php
@@ -18,10 +18,12 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Module\BatchUpdate;
 
+use Fisharebest\Webtrees\TestCase;
+
 /**
  * Test harness for the class BatchUpdateBasePlugin
  */
-class BatchUpdateBasePluginTest extends \Fisharebest\Webtrees\TestCase
+class BatchUpdateBasePluginTest extends TestCase
 {
     /**
      * Test that the class exists
@@ -30,6 +32,6 @@ class BatchUpdateBasePluginTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testClassExists(): void
     {
-        $this->assertTrue(class_exists(\Fisharebest\Webtrees\Module\BatchUpdate\BatchUpdateBasePlugin::class));
+        $this->assertTrue(class_exists(BatchUpdateBasePlugin::class));
     }
 }
diff --git a/tests/app/Module/BatchUpdate/BatchUpdateDuplicateLinksPluginTest.php b/tests/app/Module/BatchUpdate/BatchUpdateDuplicateLinksPluginTest.php
index 09073400da..be8789dded 100644
--- a/tests/app/Module/BatchUpdate/BatchUpdateDuplicateLinksPluginTest.php
+++ b/tests/app/Module/BatchUpdate/BatchUpdateDuplicateLinksPluginTest.php
@@ -30,6 +30,6 @@ class BatchUpdateDuplicateLinksPluginTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testClassExists(): void
     {
-        $this->assertTrue(class_exists(\Fisharebest\Webtrees\Module\BatchUpdate\BatchUpdateDuplicateLinksPlugin::class));
+        $this->assertTrue(class_exists(BatchUpdateDuplicateLinksPlugin::class));
     }
 }
diff --git a/tests/app/Module/BatchUpdate/BatchUpdateMarriedNamesPluginTest.php b/tests/app/Module/BatchUpdate/BatchUpdateMarriedNamesPluginTest.php
index 4387aa65fc..281c587dbf 100644
--- a/tests/app/Module/BatchUpdate/BatchUpdateMarriedNamesPluginTest.php
+++ b/tests/app/Module/BatchUpdate/BatchUpdateMarriedNamesPluginTest.php
@@ -30,6 +30,6 @@ class BatchUpdateMarriedNamesPluginTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testClassExists(): void
     {
-        $this->assertTrue(class_exists(\Fisharebest\Webtrees\Module\BatchUpdate\BatchUpdateMarriedNamesPlugin::class));
+        $this->assertTrue(class_exists(BatchUpdateMarriedNamesPlugin::class));
     }
 }
diff --git a/tests/app/Module/BatchUpdate/BatchUpdateMissingDeathPluginTest.php b/tests/app/Module/BatchUpdate/BatchUpdateMissingDeathPluginTest.php
index 1a263fdb5a..e679be0d34 100644
--- a/tests/app/Module/BatchUpdate/BatchUpdateMissingDeathPluginTest.php
+++ b/tests/app/Module/BatchUpdate/BatchUpdateMissingDeathPluginTest.php
@@ -30,6 +30,6 @@ class BatchUpdateMissingDeathPluginTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testClassExists(): void
     {
-        $this->assertTrue(class_exists(\Fisharebest\Webtrees\Module\BatchUpdate\BatchUpdateMissingDeathPlugin::class));
+        $this->assertTrue(class_exists(BatchUpdateMissingDeathPlugin::class));
     }
 }
diff --git a/tests/app/Module/BatchUpdate/BatchUpdateNameFormatPluginTest.php b/tests/app/Module/BatchUpdate/BatchUpdateNameFormatPluginTest.php
index b3e91aa79d..1787f2aa1f 100644
--- a/tests/app/Module/BatchUpdate/BatchUpdateNameFormatPluginTest.php
+++ b/tests/app/Module/BatchUpdate/BatchUpdateNameFormatPluginTest.php
@@ -30,6 +30,6 @@ class BatchUpdateNameFormatPluginTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testClassExists(): void
     {
-        $this->assertTrue(class_exists(\Fisharebest\Webtrees\Module\BatchUpdate\BatchUpdateNameFormatPlugin::class));
+        $this->assertTrue(class_exists(BatchUpdateNameFormatPlugin::class));
     }
 }
diff --git a/tests/app/Module/BatchUpdate/BatchUpdateSearchReplacePluginTest.php b/tests/app/Module/BatchUpdate/BatchUpdateSearchReplacePluginTest.php
index fbf48a94fb..c192d8ab73 100644
--- a/tests/app/Module/BatchUpdate/BatchUpdateSearchReplacePluginTest.php
+++ b/tests/app/Module/BatchUpdate/BatchUpdateSearchReplacePluginTest.php
@@ -30,6 +30,6 @@ class BatchUpdateSearchReplacePluginTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testClassExists(): void
     {
-        $this->assertTrue(class_exists(\Fisharebest\Webtrees\Module\BatchUpdate\BatchUpdateSearchReplacePlugin::class));
+        $this->assertTrue(class_exists(BatchUpdateSearchReplacePlugin::class));
     }
 }
diff --git a/tests/app/Module/BatchUpdateModuleTest.php b/tests/app/Module/BatchUpdateModuleTest.php
index 98b0752012..9d7ba94d4b 100644
--- a/tests/app/Module/BatchUpdateModuleTest.php
+++ b/tests/app/Module/BatchUpdateModuleTest.php
@@ -30,6 +30,6 @@ class BatchUpdateModuleTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testClassExists(): void
     {
-        $this->assertTrue(class_exists(\Fisharebest\Webtrees\Module\BatchUpdateModule::class));
+        $this->assertTrue(class_exists(BatchUpdateModule::class));
     }
 }
diff --git a/tests/app/Module/CensusAssistantModuleTest.php b/tests/app/Module/CensusAssistantModuleTest.php
index 8ddae76980..936f42c0c0 100644
--- a/tests/app/Module/CensusAssistantModuleTest.php
+++ b/tests/app/Module/CensusAssistantModuleTest.php
@@ -30,6 +30,6 @@ class CensusAssistantModuleTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testClassExists(): void
     {
-        $this->assertTrue(class_exists(\Fisharebest\Webtrees\Module\CensusAssistantModule::class));
+        $this->assertTrue(class_exists(CensusAssistantModule::class));
     }
 }
diff --git a/tests/feature/IndividualListTest.php b/tests/feature/IndividualListTest.php
index 72775f07aa..8f4ac0a272 100644
--- a/tests/feature/IndividualListTest.php
+++ b/tests/feature/IndividualListTest.php
@@ -18,6 +18,8 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees;
 
+use Fig\Http\Message\RequestMethodInterface;
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Localization\Locale\LocaleEnUs;
 use Fisharebest\Webtrees\Http\Controllers\ListController;
 use Fisharebest\Webtrees\Module\IndividualListModule;
@@ -49,37 +51,37 @@ class IndividualListTest extends TestCase
         $individual_list_service = new IndividualListService($localization_service, $tree);
         $controller              = new ListController($individual_list_service, $localization_service);
 
-        $request  = self::createRequest(self::METHOD_GET, [
+        $request  = self::createRequest(RequestMethodInterface::METHOD_GET, [
             'route'  => 'module',
             'module' => 'individual_list',
             'action' => 'List',
         ])->withAttribute('tree', $tree)
             ->withAttribute('user', $user);
         $response = $controller->individualList($request, $list_module);
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
 
-        $request  = self::createRequest(self::METHOD_GET, ['route' => 'module', 'module' => 'individual_list', 'action' => 'List', 'alpha' => 'B'])
+        $request  = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'module', 'module' => 'individual_list', 'action' => 'List', 'alpha' => 'B'])
             ->withAttribute('tree', $tree)
             ->withAttribute('user', $user);
         $response = $controller->individualList($request, $list_module);
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
 
-        $request  = self::createRequest(self::METHOD_GET, ['route' => 'module', 'module' => 'individual_list', 'action' => 'List', 'alpha' => ','])
+        $request  = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'module', 'module' => 'individual_list', 'action' => 'List', 'alpha' => ','])
             ->withAttribute('tree', $tree)
             ->withAttribute('user', $user);
         $response = $controller->individualList($request, $list_module);
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
 
-        $request  = self::createRequest(self::METHOD_GET, ['route' => 'module', 'module' => 'individual_list', 'action' => 'List', 'alpha' => '@'])
+        $request  = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'module', 'module' => 'individual_list', 'action' => 'List', 'alpha' => '@'])
             ->withAttribute('tree', $tree)
             ->withAttribute('user', $tree);
         $response = $controller->individualList($request, $list_module);
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
 
-        $request  = self::createRequest(self::METHOD_GET, ['route' => 'module', 'module' => 'individual_list', 'action' => 'List', 'surname' => 'BRAUN'])
+        $request  = self::createRequest(RequestMethodInterface::METHOD_GET, ['route' => 'module', 'module' => 'individual_list', 'action' => 'List', 'surname' => 'BRAUN'])
             ->withAttribute('tree', $tree)
             ->withAttribute('user', $user);
         $response = $controller->individualList($request, $list_module);
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
 }
diff --git a/tests/feature/UserAdminTest.php b/tests/feature/UserAdminTest.php
index 08f95d1ee9..695f4d2a90 100644
--- a/tests/feature/UserAdminTest.php
+++ b/tests/feature/UserAdminTest.php
@@ -18,6 +18,8 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees;
 
+use Fig\Http\Message\RequestMethodInterface;
+use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Http\Controllers\Admin\UsersController;
 use Fisharebest\Webtrees\Services\UserService;
 
@@ -42,10 +44,10 @@ class UserAdminTest extends TestCase
         $user_service->create('UserName', 'RealName', 'user@example.com', 'secret');
 
         $controller = app(UsersController::class);
-        $request    = self::createRequest(self::METHOD_GET, ['length' => '10',])->withAttribute('user', $admin);
+        $request    = self::createRequest(RequestMethodInterface::METHOD_GET, ['length' => '10',])->withAttribute('user', $admin);
         $response   = $controller->data($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
         $this->assertSame('application/json', $response->getHeaderLine('Content-Type'));
         $html = (string) $response->getBody();
 
@@ -75,7 +77,7 @@ class UserAdminTest extends TestCase
         $controller = app(UsersController::class);
         $response   = $controller->data($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
         $this->assertSame('application/json', $response->getHeaderLine('Content-Type'));
         $html = (string) $response->getBody();
 
@@ -105,7 +107,7 @@ class UserAdminTest extends TestCase
         $controller = app(UsersController::class);
         $response   = $controller->data($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
         $this->assertSame('application/json', $response->getHeaderLine('Content-Type'));
         $html = (string) $response->getBody();
 
@@ -131,7 +133,7 @@ class UserAdminTest extends TestCase
 
         $response = app(UsersController::class)->data($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
         $this->assertSame('application/json', $response->getHeaderLine('Content-Type'));
         $html = (string) $response->getBody();
 
@@ -146,7 +148,7 @@ class UserAdminTest extends TestCase
         $controller = app(UsersController::class);
         $response   = $controller->data($request);
 
-        $this->assertSame(self::STATUS_OK, $response->getStatusCode());
+        $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
         $this->assertSame('application/json', $response->getHeaderLine('Content-Type'));
         $html = (string) $response->getBody();