diff --git a/app/Import/Configuration/BunqConfigurator.php b/app/Import/Configuration/BunqConfigurator.php
index 910c494d71..a115f8e933 100644
--- a/app/Import/Configuration/BunqConfigurator.php
+++ b/app/Import/Configuration/BunqConfigurator.php
@@ -29,6 +29,8 @@ use FireflyIII\Support\Import\Configuration\Bunq\HaveAccounts;
 use Log;
 
 /**
+ * @deprecated
+ * @codeCoverageIgnore
  * Class BunqConfigurator.
  */
 class BunqConfigurator implements ConfiguratorInterface
diff --git a/app/Import/Configuration/ConfiguratorInterface.php b/app/Import/Configuration/ConfiguratorInterface.php
index f171044f7c..a1e961b0ec 100644
--- a/app/Import/Configuration/ConfiguratorInterface.php
+++ b/app/Import/Configuration/ConfiguratorInterface.php
@@ -25,6 +25,8 @@ namespace FireflyIII\Import\Configuration;
 use FireflyIII\Models\ImportJob;
 
 /**
+ * @deprecated
+ * @codeCoverageIgnore
  * Interface ConfiguratorInterface.
  */
 interface ConfiguratorInterface
diff --git a/app/Import/Configuration/FileConfigurator.php b/app/Import/Configuration/FileConfigurator.php
index 4d98232d2a..b525d1c40e 100644
--- a/app/Import/Configuration/FileConfigurator.php
+++ b/app/Import/Configuration/FileConfigurator.php
@@ -33,6 +33,8 @@ use FireflyIII\Support\Import\Configuration\File\UploadConfig;
 use Log;
 
 /**
+ * @deprecated
+ * @codeCoverageIgnore
  * Class FileConfigurator.
  */
 class FileConfigurator implements ConfiguratorInterface
diff --git a/app/Import/Configuration/SpectreConfigurator.php b/app/Import/Configuration/SpectreConfigurator.php
index 3f65633d3a..a71953ed4b 100644
--- a/app/Import/Configuration/SpectreConfigurator.php
+++ b/app/Import/Configuration/SpectreConfigurator.php
@@ -29,6 +29,8 @@ use FireflyIII\Support\Import\Configuration\Spectre\HaveAccounts;
 use Log;
 
 /**
+ * @deprecated
+ * @codeCoverageIgnore
  * Class SpectreConfigurator.
  */
 class SpectreConfigurator implements ConfiguratorInterface
diff --git a/app/Import/FileProcessor/CsvProcessor.php b/app/Import/FileProcessor/CsvProcessor.php
index affd463daa..deba0399d5 100644
--- a/app/Import/FileProcessor/CsvProcessor.php
+++ b/app/Import/FileProcessor/CsvProcessor.php
@@ -33,6 +33,9 @@ use League\Csv\Statement;
 use Log;
 
 /**
+ * @deprecated
+ * @codeCoverageIgnore
+ *
  * Class CsvProcessor, as the name suggests, goes over CSV file line by line and creates
  * "ImportJournal" objects, which are used in another step to create new journals and transactions
  * and what-not.
diff --git a/app/Import/JobConfiguration/FileJobConfiguration.php b/app/Import/JobConfiguration/FileJobConfiguration.php
deleted file mode 100644
index 7f486a0125..0000000000
--- a/app/Import/JobConfiguration/FileJobConfiguration.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-namespace FireflyIII\Import\JobConfiguration;
-
-
-use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Models\ImportJob;
-use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
-use FireflyIII\Support\Import\Configuration\ConfigurationInterface;
-use FireflyIII\Support\Import\Configuration\File\Initial;
-use FireflyIII\Support\Import\Configuration\File\Map;
-use FireflyIII\Support\Import\Configuration\File\Roles;
-use FireflyIII\Support\Import\Configuration\File\UploadConfig;
-use Illuminate\Support\MessageBag;
-use Log;
-
-/**
- * Class FileJobConfiguration
- *
- * @package FireflyIII\Import\JobConfiguration
- */
-class FileJobConfiguration implements JobConfigurationInterface
-{
-    /** @var ImportJob */
-    private $job;
-
-    /** @var ImportJobRepositoryInterface */
-    private $repository;
-
-    /**
-     * ConfiguratorInterface constructor.
-     */
-    public function __construct()
-    {
-        $this->repository = app(ImportJobRepositoryInterface::class);
-    }
-
-    /**
-     * Store any data from the $data array into the job. Anything in the message bag will be flashed
-     * as an error to the user, regardless of its content.
-     *
-     * @param array $data
-     *
-     * @return MessageBag
-     * @throws FireflyException
-     */
-    public function configureJob(array $data): MessageBag
-    {
-        /** @var ConfigurationInterface $object */
-        $object = app($this->getConfigurationClass());
-        $object->setJob($this->job);
-        $result        = $object->storeConfiguration($data);
-
-        return $result;
-    }
-
-    /**
-     * Return the data required for the next step in the job configuration.
-     *
-     * @return array
-     * @throws FireflyException
-     */
-    public function getNextData(): array
-    {
-        /** @var ConfigurationInterface $object */
-        $object = app($this->getConfigurationClass());
-        $object->setJob($this->job);
-
-        return $object->getData();
-    }
-
-    /**
-     * Returns the view of the next step in the job configuration.
-     *
-     * @return string
-     * @throws FireflyException
-     */
-    public function getNextView(): string
-    {
-        switch ($this->job->stage) {
-            case 'new': // has nothing, no file upload or anything.
-                return 'import.file.new';
-            case 'upload-config': // has file, needs file config.
-                return 'import.file.upload-config';
-            case 'roles': // has configured file, needs roles.
-                return 'import.file.roles';
-            case 'map': // has roles, needs mapping.
-                return 'import.file.map';
-        }
-        throw new FireflyException(sprintf('No view for stage "%s"', $this->job->stage));
-    }
-
-    /**
-     * Returns true when the initial configuration for this job is complete.
-     *
-     * @return bool
-     */
-    public function configurationComplete(): bool
-    {
-        if ('ready' === $this->job->stage) {
-            Log::debug('isJobConfigured returns true');
-
-            return true;
-        }
-        Log::debug('isJobConfigured returns false');
-
-        return false;
-    }
-
-    /**
-     * @param ImportJob $job
-     */
-    public function setJob(ImportJob $job): void
-    {
-        $this->job = $job;
-        $this->repository->setUser($job->user);
-    }
-
-
-    /**
-     * @return string
-     *
-     * @throws FireflyException
-     */
-    private function getConfigurationClass(): string
-    {
-        $class = false;
-        Log::debug(sprintf('Now in getConfigurationClass() for stage "%s"', $this->job->stage));
-
-        switch ($this->job->stage) {
-            case 'new': // has nothing, no file upload or anything.
-                $class = Initial::class;
-                break;
-            case 'upload-config': // has file, needs file config.
-                $class = UploadConfig::class;
-                break;
-            case 'roles': // has configured file, needs roles.
-                $class = Roles::class;
-                break;
-            case 'map': // has roles, needs mapping.
-                $class = Map::class;
-                break;
-            default:
-                break;
-        }
-
-        if (false === $class || 0 === \strlen($class)) {
-            throw new FireflyException(sprintf('Cannot handle job stage "%s" in getConfigurationClass().', $this->job->stage));
-        }
-        if (!class_exists($class)) {
-            throw new FireflyException(sprintf('Class %s does not exist in getConfigurationClass().', $class)); // @codeCoverageIgnore
-        }
-        Log::debug(sprintf('Configuration class is "%s"', $class));
-
-        return $class;
-    }
-}
\ No newline at end of file
diff --git a/app/Import/Logging/CommandHandler.php b/app/Import/Logging/CommandHandler.php
deleted file mode 100644
index c1dfc85773..0000000000
--- a/app/Import/Logging/CommandHandler.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * CommandHandler.php
- * Copyright (c) 2017 thegrumpydictator@gmail.com
- *
- * This file is part of Firefly III.
- *
- * Firefly III is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Firefly III is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
- */
-declare(strict_types=1);
-
-namespace FireflyIII\Import\Logging;
-
-use Illuminate\Console\Command;
-use Monolog\Handler\AbstractProcessingHandler;
-
-/**
- * @codeCoverageIgnore
- * Class CommandHandler.
- */
-class CommandHandler extends AbstractProcessingHandler
-{
-    /** @var Command */
-    private $command;
-
-    /**
-     * Handler constructor.
-     *
-     * @param Command $command
-     */
-    public function __construct(Command $command)
-    {
-        parent::__construct();
-        $this->command = $command;
-
-        $this->changeLevel(env('APP_LOG_LEVEL', 'info'));
-    }
-
-    /**
-     * Writes the record down to the log of the implementing handler.
-     *
-     * @param array $record
-     */
-    protected function write(array $record)
-    {
-        $this->command->line(trim($record['formatted']));
-    }
-
-    /**
-     * @param string $level
-     */
-    private function changeLevel(string $level)
-    {
-        $level     = strtoupper($level);
-        $reference = sprintf('\Monolog\Logger::%s', $level);
-        if (\defined($reference)) {
-            $this->setLevel(\constant($reference));
-        }
-    }
-}
diff --git a/app/Import/Prerequisites/BunqPrerequisites.php b/app/Import/Prerequisites/BunqPrerequisites.php
index feaa23d477..f1f93aab3e 100644
--- a/app/Import/Prerequisites/BunqPrerequisites.php
+++ b/app/Import/Prerequisites/BunqPrerequisites.php
@@ -30,6 +30,8 @@ use Log;
 use Preferences;
 
 /**
+ * @deprecated
+ * @codeCoverageIgnore
  * This class contains all the routines necessary to connect to Bunq.
  */
 class BunqPrerequisites implements PrerequisitesInterface
diff --git a/app/Import/Prerequisites/FilePrerequisites.php b/app/Import/Prerequisites/FilePrerequisites.php
index c574cfa05b..ad299fee09 100644
--- a/app/Import/Prerequisites/FilePrerequisites.php
+++ b/app/Import/Prerequisites/FilePrerequisites.php
@@ -28,6 +28,8 @@ use Illuminate\Http\Request;
 use Illuminate\Support\MessageBag;
 
 /**
+ * @deprecated
+ * @codeCoverageIgnore
  * This class contains all the routines necessary to import from a file. Hint: there are none.
  */
 class FilePrerequisites implements PrerequisitesInterface
diff --git a/app/Import/Prerequisites/SpectrePrerequisites.php b/app/Import/Prerequisites/SpectrePrerequisites.php
index 7da7d93942..1905ea2b6f 100644
--- a/app/Import/Prerequisites/SpectrePrerequisites.php
+++ b/app/Import/Prerequisites/SpectrePrerequisites.php
@@ -30,6 +30,8 @@ use Log;
 use Preferences;
 
 /**
+ * @deprecated
+ * @codeCoverageIgnore
  * This class contains all the routines necessary to connect to Spectre.
  */
 class SpectrePrerequisites implements PrerequisitesInterface
diff --git a/app/Import/Routine/BunqRoutine.php b/app/Import/Routine/BunqRoutine.php
index ff4b79112e..1d705eba93 100644
--- a/app/Import/Routine/BunqRoutine.php
+++ b/app/Import/Routine/BunqRoutine.php
@@ -58,6 +58,8 @@ use Log;
 use Preferences;
 
 /**
+ * @deprecated
+ * @codeCoverageIgnore
  * Class BunqRoutine
  *
  * Steps before import:
diff --git a/app/Import/Routine/FileRoutine.php b/app/Import/Routine/FileRoutine.php
index a685eeac1d..a6ce949dea 100644
--- a/app/Import/Routine/FileRoutine.php
+++ b/app/Import/Routine/FileRoutine.php
@@ -35,6 +35,8 @@ use Illuminate\Support\Collection;
 use Log;
 
 /**
+ * @deprecated
+ * @codeCoverageIgnore
  * Class FileRoutine
  */
 class FileRoutine implements RoutineInterface
diff --git a/app/Import/Routine/SpectreRoutine.php b/app/Import/Routine/SpectreRoutine.php
index abde781fad..16eeba2c65 100644
--- a/app/Import/Routine/SpectreRoutine.php
+++ b/app/Import/Routine/SpectreRoutine.php
@@ -48,6 +48,8 @@ use Log;
 use Preferences;
 
 /**
+ * @deprecated
+ * @codeCoverageIgnore
  * Class FileRoutine
  */
 class SpectreRoutine implements RoutineInterface
diff --git a/app/Import/Storage/ImportArrayStorage.php b/app/Import/Storage/ImportArrayStorage.php
index 99ee41171d..ac4c0d153c 100644
--- a/app/Import/Storage/ImportArrayStorage.php
+++ b/app/Import/Storage/ImportArrayStorage.php
@@ -40,6 +40,8 @@ class ImportArrayStorage
     private $transfers;
 
     /**
+     * Set job, count transfers in the array and create the repository.
+     *
      * @param ImportJob $importJob
      */
     public function setJob(ImportJob $importJob): void
@@ -86,6 +88,8 @@ class ImportArrayStorage
     }
 
     /**
+     * Applies the users rules to the created journals.
+     *
      * @param Collection $collection
      *
      * @throws FireflyException
@@ -135,6 +139,8 @@ class ImportArrayStorage
     }
 
     /**
+     * Gets the users rules.
+     *
      * @return Collection
      */
     private function getRules(): Collection
@@ -173,6 +179,8 @@ class ImportArrayStorage
     }
 
     /**
+     * Check if the hash exists for the array the user wants to import.
+     *
      * @param array $transaction
      *
      * @return int|null
@@ -202,6 +210,8 @@ class ImportArrayStorage
     }
 
     /**
+     * Link all imported journals to a tag.
+     *
      * @param Collection $collection
      */
     private function linkToTag(Collection $collection): void
@@ -235,6 +245,8 @@ class ImportArrayStorage
     }
 
     /**
+     * Log about a duplicate object (double hash).
+     *
      * @param array $transaction
      * @param int   $existingId
      */
@@ -253,6 +265,8 @@ class ImportArrayStorage
     }
 
     /**
+     * Log about a duplicate transfer.
+     *
      * @param array $transaction
      */
     private function logDuplicateTransfer(array $transaction): void
diff --git a/tests/Feature/Controllers/PiggyBankControllerTest.php b/tests/Feature/Controllers/PiggyBankControllerTest.php
index 57a4fd3471..558ef244f9 100644
--- a/tests/Feature/Controllers/PiggyBankControllerTest.php
+++ b/tests/Feature/Controllers/PiggyBankControllerTest.php
@@ -204,6 +204,8 @@ class PiggyBankControllerTest extends TestCase
         $repository->shouldReceive('getPiggyBanks')->andReturn(new Collection([$one, $two]));
         $repository->shouldReceive('getCurrentAmount')->andReturn('10');
         $repository->shouldReceive('setUser');
+        $repository->shouldReceive('correctOrder');
+
 
         Steam::shouldReceive('balance')->twice()->andReturn('1');
 
@@ -213,27 +215,10 @@ class PiggyBankControllerTest extends TestCase
         $response->assertSee('<ol class="breadcrumb">');
     }
 
-    /**
-     * @covers \FireflyIII\Http\Controllers\PiggyBankController::order
-     */
-    public function testOrder()
-    {
-        // mock stuff
-        $repository   = $this->mock(PiggyBankRepositoryInterface::class);
-        $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
-        $repository->shouldReceive('reset');
-        $repository->shouldReceive('setOrder')->times(2);
-
-        $this->be($this->user());
-        $response = $this->post(route('piggy-banks.order'), ['order' => [1, 2]]);
-        $response->assertStatus(200);
-    }
-
     /**
      * @covers \FireflyIII\Http\Controllers\PiggyBankController::postAdd
      */
-    public function testPostAdd()
+    public function testPostAdd(): void
     {
         // mock stuff
         $repository   = $this->mock(PiggyBankRepositoryInterface::class);
@@ -255,7 +240,7 @@ class PiggyBankControllerTest extends TestCase
      *
      * @covers \FireflyIII\Http\Controllers\PiggyBankController::postAdd
      */
-    public function testPostAddTooMuch()
+    public function testPostAddTooMuch(): void
     {
         // mock stuff
         $repository   = $this->mock(PiggyBankRepositoryInterface::class);
@@ -274,7 +259,7 @@ class PiggyBankControllerTest extends TestCase
     /**
      * @covers \FireflyIII\Http\Controllers\PiggyBankController::postRemove
      */
-    public function testPostRemove()
+    public function testPostRemove(): void
     {
         // mock stuff
         $repository   = $this->mock(PiggyBankRepositoryInterface::class);
@@ -294,7 +279,7 @@ class PiggyBankControllerTest extends TestCase
     /**
      * @covers \FireflyIII\Http\Controllers\PiggyBankController::postRemove
      */
-    public function testPostRemoveTooMuch()
+    public function testPostRemoveTooMuch(): void
     {
         // mock stuff
         $repository   = $this->mock(PiggyBankRepositoryInterface::class);
@@ -313,7 +298,7 @@ class PiggyBankControllerTest extends TestCase
     /**
      * @covers \FireflyIII\Http\Controllers\PiggyBankController::remove
      */
-    public function testRemove()
+    public function testRemove(): void
     {
         // mock stuff
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
@@ -327,7 +312,7 @@ class PiggyBankControllerTest extends TestCase
     /**
      * @covers \FireflyIII\Http\Controllers\PiggyBankController::removeMobile
      */
-    public function testRemoveMobile()
+    public function testRemoveMobile(): void
     {
         // mock stuff
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
@@ -342,7 +327,7 @@ class PiggyBankControllerTest extends TestCase
     /**
      * @covers \FireflyIII\Http\Controllers\PiggyBankController::show
      */
-    public function testShow()
+    public function testShow(): void
     {
         // mock stuff
         $repository   = $this->mock(PiggyBankRepositoryInterface::class);
@@ -360,7 +345,7 @@ class PiggyBankControllerTest extends TestCase
      * @covers       \FireflyIII\Http\Controllers\PiggyBankController::store
      * @covers       \FireflyIII\Http\Requests\PiggyBankFormRequest
      */
-    public function testStore()
+    public function testStore(): void
     {
         // mock stuff
         $repository   = $this->mock(PiggyBankRepositoryInterface::class);
@@ -386,7 +371,7 @@ class PiggyBankControllerTest extends TestCase
      * @covers       \FireflyIII\Http\Controllers\PiggyBankController::update
      * @covers       \FireflyIII\Http\Requests\PiggyBankFormRequest
      */
-    public function testUpdate()
+    public function testUpdate(): void
     {
         // mock stuff
         $repository   = $this->mock(PiggyBankRepositoryInterface::class);
diff --git a/tests/Unit/Middleware/BinderTest.php b/tests/Unit/Middleware/BinderTest.php
index 10f6b780cf..9f4c796af8 100644
--- a/tests/Unit/Middleware/BinderTest.php
+++ b/tests/Unit/Middleware/BinderTest.php
@@ -41,12 +41,10 @@ class BinderTest extends TestCase
 {
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\Account::routeBinder
      */
-    public function testAccount()
+    public function testAccount(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{account}', function () {
@@ -60,12 +58,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Support\Binder\AccountList::routeBinder
      */
-    public function testAccountList()
+    public function testAccountList(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{accountList}', function (Collection $accounts) {
@@ -79,12 +75,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Support\Binder\AccountList::routeBinder
      */
-    public function testAccountListEmpty()
+    public function testAccountListEmpty(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{accountList}', function (Collection $accounts) {
@@ -97,12 +91,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Support\Binder\AccountList::routeBinder
      */
-    public function testAccountListInvalid()
+    public function testAccountListInvalid(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{accountList}', function (Collection $accounts) {
@@ -116,12 +108,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Support\Binder\AccountList::routeBinder
      */
-    public function testAccountListNotLoggedIn()
+    public function testAccountListNotLoggedIn(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{accountList}', function (Collection $accounts) {
@@ -133,12 +123,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\Account::routeBinder
      */
-    public function testAccountNotFound()
+    public function testAccountNotFound(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{account}', function () {
@@ -152,12 +140,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\Account::routeBinder
      */
-    public function testAccountNotLoggedIn()
+    public function testAccountNotLoggedIn(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{account}', function () {
@@ -170,12 +156,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\Attachment::routeBinder
      */
-    public function testAttachment()
+    public function testAttachment(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{attachment}', function () {
@@ -189,12 +173,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\Attachment::routeBinder
      */
-    public function testAttachmentNotFound()
+    public function testAttachmentNotFound(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{attachment}', function () {
@@ -208,12 +190,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\Attachment::routeBinder
      */
-    public function testAttachmentNotLoggedIn()
+    public function testAttachmentNotLoggedIn(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{attachment}', function () {
@@ -226,12 +206,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\Bill::routeBinder
      */
-    public function testBill()
+    public function testBill(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{bill}', function () {
@@ -245,12 +223,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\Bill::routeBinder
      */
-    public function testBillNotFound()
+    public function testBillNotFound(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{bill}', function () {
@@ -264,12 +240,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\Bill::routeBinder
      */
-    public function testBillNotLoggedIn()
+    public function testBillNotLoggedIn(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{bill}', function () {
@@ -282,12 +256,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\Budget::routeBinder
      */
-    public function testBudget()
+    public function testBudget(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{budget}', function () {
@@ -301,12 +273,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\BudgetLimit::routeBinder
      */
-    public function testBudgetLimit()
+    public function testBudgetLimit(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{budgetLimit}', function () {
@@ -320,12 +290,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\BudgetLimit::routeBinder
      */
-    public function testBudgetLimitNotFound()
+    public function testBudgetLimitNotFound(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{budgetLimit}', function () {
@@ -339,12 +307,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\BudgetLimit::routeBinder
      */
-    public function testBudgetLimitNotLoggedIn()
+    public function testBudgetLimitNotLoggedIn(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{budgetLimit}', function () {
@@ -357,12 +323,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Support\Binder\BudgetList::routeBinder
      */
-    public function testBudgetList()
+    public function testBudgetList(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{budgetList}', function (Collection $budgets) {
@@ -376,12 +340,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Support\Binder\BudgetList::routeBinder
      */
-    public function testBudgetListInvalid()
+    public function testBudgetListInvalid(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{budgetList}', function (Collection $budgets) {
@@ -394,12 +356,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\Budget::routeBinder
      */
-    public function testBudgetNotFound()
+    public function testBudgetNotFound(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{budget}', function () {
@@ -413,12 +373,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\Budget::routeBinder
      */
-    public function testBudgetNotLoggedIn()
+    public function testBudgetNotLoggedIn(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{budget}', function () {
@@ -431,12 +389,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\Category::routeBinder
      */
-    public function testCategory()
+    public function testCategory(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{category}', function () {
@@ -450,12 +406,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Support\Binder\CategoryList::routeBinder
      */
-    public function testCategoryList()
+    public function testCategoryList(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{categoryList}', function (Collection $categories) {
@@ -469,12 +423,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Support\Binder\CategoryList::routeBinder
      */
-    public function testCategoryListInvalid()
+    public function testCategoryListInvalid(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{categoryList}', function (Collection $categories) {
@@ -487,12 +439,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\Category::routeBinder
      */
-    public function testCategoryNotFound()
+    public function testCategoryNotFound(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{category}', function () {
@@ -506,12 +456,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\Category::routeBinder
      */
-    public function testCategoryNotLoggedIn()
+    public function testCategoryNotLoggedIn(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{category}', function () {
@@ -524,12 +472,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Support\Binder\CurrencyCode::routeBinder
      */
-    public function testCurrencyCode()
+    public function testCurrencyCode(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{fromCurrencyCode}', function () {
@@ -543,12 +489,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Support\Binder\CurrencyCode::routeBinder
      */
-    public function testCurrencyCodeNotFound()
+    public function testCurrencyCodeNotFound(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{fromCurrencyCode}', function () {
@@ -562,12 +506,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Support\Binder\CurrencyCode::routeBinder
      */
-    public function testCurrencyCodeNotLoggedIn()
+    public function testCurrencyCodeNotLoggedIn(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{fromCurrencyCode}', function () {
@@ -580,12 +522,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Support\Binder\Date::routeBinder
      */
-    public function testDate()
+    public function testDate(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{date}', function (Carbon $date) {
@@ -599,12 +539,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Support\Binder\Date::routeBinder
      */
-    public function testDateCurrentMonthEnd()
+    public function testDateCurrentMonthEnd(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{date}', function (Carbon $date) {
@@ -620,12 +558,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Support\Binder\Date::routeBinder
      */
-    public function testDateCurrentMonthStart()
+    public function testDateCurrentMonthStart(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{date}', function (Carbon $date) {
@@ -641,12 +577,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Support\Binder\Date::routeBinder
      */
-    public function testDateCurrentYearEnd()
+    public function testDateCurrentYearEnd(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{date}', function (Carbon $date) {
@@ -662,12 +596,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Support\Binder\Date::routeBinder
      */
-    public function testDateCurrentYearStart()
+    public function testDateCurrentYearStart(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{date}', function (Carbon $date) {
@@ -683,12 +615,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Support\Binder\Date::routeBinder
      */
-    public function testDateFiscalYearEnd()
+    public function testDateFiscalYearEnd(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{date}', function (Carbon $date) {
@@ -711,12 +641,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Support\Binder\Date::routeBinder
      */
-    public function testDateFiscalYearStart()
+    public function testDateFiscalYearStart(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{date}', function (Carbon $date) {
@@ -739,12 +667,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Support\Binder\Date::routeBinder
      */
-    public function testDateInvalid()
+    public function testDateInvalid(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{date}', function (Carbon $date) {
@@ -757,12 +683,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\ExportJob::routeBinder
      */
-    public function testExportJob()
+    public function testExportJob(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{exportJob}', function () {
@@ -776,12 +700,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\ExportJob::routeBinder
      */
-    public function testExportJobNotFound()
+    public function testExportJobNotFound(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{exportJob}', function () {
@@ -795,12 +717,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\ExportJob::routeBinder
      */
-    public function testExportJobNotLoggedIn()
+    public function testExportJobNotLoggedIn(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{exportJob}', function () {
@@ -813,12 +733,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\ImportJob::routeBinder
      */
-    public function testImportJob()
+    public function testImportJob(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{importJob}', function () {
@@ -832,30 +750,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\ImportJob::routeBinder
      */
-    public function testImportJobBadStatus()
-    {
-        Route::middleware(Binder::class)->any(
-            '/_test/binder/{importJob}', function () {
-            return 'OK';
-        }
-        );
-        $this->be($this->user());
-        $response = $this->get('/_test/binder/bad-status');
-        $this->assertEquals(Response::HTTP_INTERNAL_SERVER_ERROR, $response->getStatusCode());
-    }
-
-    /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
-     * @covers \FireflyIII\Models\ImportJob::routeBinder
-     */
-    public function testImportJobNotFound()
+    public function testImportJobNotFound(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{importJob}', function () {
@@ -869,12 +767,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\ImportJob::routeBinder
      */
-    public function testImportJobNotLoggedIn()
+    public function testImportJobNotLoggedIn(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{importJob}', function () {
@@ -887,12 +783,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Support\Binder\JournalList::routeBinder
      */
-    public function testJournalList()
+    public function testJournalList(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{journalList}', function (Collection $journals) {
@@ -906,12 +800,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Support\Binder\JournalList::routeBinder
      */
-    public function testJournalListEmpty()
+    public function testJournalListEmpty(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{journalList}', function (Collection $journals) {
@@ -924,12 +816,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\LinkType::routeBinder
      */
-    public function testLinkType()
+    public function testLinkType(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{linkType}', function () {
@@ -943,12 +833,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\LinkType::routeBinder
      */
-    public function testLinkTypeNotFound()
+    public function testLinkTypeNotFound(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{linkType}', function () {
@@ -962,12 +850,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\LinkType::routeBinder
      */
-    public function testLinkTypeNotLoggedIn()
+    public function testLinkTypeNotLoggedIn(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{linkType}', function () {
@@ -980,12 +866,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\PiggyBank::routeBinder
      */
-    public function testPiggyBank()
+    public function testPiggyBank(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{piggyBank}', function () {
@@ -999,12 +883,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\PiggyBank::routeBinder
      */
-    public function testPiggyBankNotFound()
+    public function testPiggyBankNotFound(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{piggyBank}', function () {
@@ -1018,12 +900,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\PiggyBank::routeBinder
      */
-    public function testPiggyBankNotLoggedIn()
+    public function testPiggyBankNotLoggedIn(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{piggyBank}', function () {
@@ -1036,12 +916,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\Rule::routeBinder
      */
-    public function testRule()
+    public function testRule(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{rule}', function () {
@@ -1055,12 +933,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\RuleGroup::routeBinder
      */
-    public function testRuleGroup()
+    public function testRuleGroup(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{ruleGroup}', function () {
@@ -1074,12 +950,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\RuleGroup::routeBinder
      */
-    public function testRuleGroupNotFound()
+    public function testRuleGroupNotFound(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{ruleGroup}', function () {
@@ -1093,12 +967,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\RuleGroup::routeBinder
      */
-    public function testRuleGroupNotLoggedIn()
+    public function testRuleGroupNotLoggedIn(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{ruleGroup}', function () {
@@ -1111,12 +983,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\Rule::routeBinder
      */
-    public function testRuleNotFound()
+    public function testRuleNotFound(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{rule}', function () {
@@ -1130,12 +1000,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\Rule::routeBinder
      */
-    public function testRuleNotLoggedIn()
+    public function testRuleNotLoggedIn(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{rule}', function () {
@@ -1148,12 +1016,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\TransactionJournal::routeBinder
      */
-    public function testTJ()
+    public function testTJ(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{tj}', function () {
@@ -1167,12 +1033,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\TransactionJournal::routeBinder
      */
-    public function testTJNotFound()
+    public function testTJNotFound(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{tj}', function () {
@@ -1186,12 +1050,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\TransactionJournal::routeBinder
      */
-    public function testTJNotLoggedIn()
+    public function testTJNotLoggedIn(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{tj}', function () {
@@ -1204,12 +1066,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\Tag::routeBinder
      */
-    public function testTag()
+    public function testTag(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{tag}', function () {
@@ -1223,12 +1083,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Support\Binder\TagList::routeBinder
      */
-    public function testTagList()
+    public function testTagList(): void
     {
         $tagRepos = $this->mock(TagRepositoryInterface::class);
         $tagRepos->shouldReceive('setUser');
@@ -1251,12 +1109,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Support\Binder\TagList::routeBinder
      */
-    public function testTagListEmpty()
+    public function testTagListEmpty(): void
     {
         $tagRepos = $this->mock(TagRepositoryInterface::class);
         $tagRepos->shouldReceive('setUser');
@@ -1273,12 +1129,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\Tag::routeBinder
      */
-    public function testTagNotFound()
+    public function testTagNotFound(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{tag}', function () {
@@ -1292,12 +1146,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\Tag::routeBinder
      */
-    public function testTagNotLoggedIn()
+    public function testTagNotLoggedIn(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{tag}', function () {
@@ -1310,12 +1162,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\TransactionCurrency::routeBinder
      */
-    public function testTransactionCurrency()
+    public function testTransactionCurrency(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{currency}', function () {
@@ -1329,12 +1179,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\TransactionCurrency::routeBinder
      */
-    public function testTransactionCurrencyNotFound()
+    public function testTransactionCurrencyNotFound(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{currency}', function () {
@@ -1348,12 +1196,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\TransactionCurrency::routeBinder
      */
-    public function testTransactionCurrencyNotLoggedIn()
+    public function testTransactionCurrencyNotLoggedIn(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{currency}', function () {
@@ -1366,12 +1212,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\TransactionJournalLink::routeBinder
      */
-    public function testTransactionJournalLink()
+    public function testTransactionJournalLink(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{journalLink}', function () {
@@ -1385,12 +1229,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\TransactionJournalLink::routeBinder
      */
-    public function testTransactionJournalLinkNotFound()
+    public function testTransactionJournalLinkNotFound(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{journalLink}', function () {
@@ -1404,12 +1246,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\TransactionJournalLink::routeBinder
      */
-    public function testTransactionJournalLinkNotLoggedIn()
+    public function testTransactionJournalLinkNotLoggedIn(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{journalLink}', function () {
@@ -1422,12 +1262,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\TransactionType::routeBinder
      */
-    public function testTransactionType()
+    public function testTransactionType(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{transactionType}', function () {
@@ -1441,12 +1279,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\TransactionType::routeBinder
      */
-    public function testTransactionTypeNotFound()
+    public function testTransactionTypeNotFound(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{transactionType}', function () {
@@ -1460,12 +1296,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Models\TransactionType::routeBinder
      */
-    public function testTransactionTypeNotLoggedIn()
+    public function testTransactionTypeNotLoggedIn(): void
     {
         Route::middleware(Binder::class)->any(
             '/_test/binder/{transactionType}', function () {
@@ -1478,12 +1312,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Support\Binder\UnfinishedJournal::routeBinder
      */
-    public function testUnfinishedJournal()
+    public function testUnfinishedJournal(): void
     {
         $journal = $this->user()->transactionJournals()->where('completed', 0)->first();
         Route::middleware(Binder::class)->any(
@@ -1497,12 +1329,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Support\Binder\UnfinishedJournal::routeBinder
      */
-    public function testUnfinishedJournalFinished()
+    public function testUnfinishedJournalFinished(): void
     {
         $journal = $this->user()->transactionJournals()->where('completed', 1)->first();
         Route::middleware(Binder::class)->any(
@@ -1515,12 +1345,10 @@ class BinderTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Middleware\Binder::handle
-     * @covers \FireflyIII\Http\Middleware\Binder::__construct
-     * @covers \FireflyIII\Http\Middleware\Binder::performBinding
+     * @covers \FireflyIII\Http\Middleware\Binder
      * @covers \FireflyIII\Support\Binder\UnfinishedJournal::routeBinder
      */
-    public function testUnfinishedJournalNotLoggedIn()
+    public function testUnfinishedJournalNotLoggedIn(): void
     {
         $journal = $this->user()->transactionJournals()->where('completed', 0)->first();
         Route::middleware(Binder::class)->any(