diff --git a/app/Generator/Chart/Budget/ChartJsBudgetChartGenerator.php b/app/Generator/Chart/Budget/ChartJsBudgetChartGenerator.php
index 6af797b8a3..f9c8d88f59 100644
--- a/app/Generator/Chart/Budget/ChartJsBudgetChartGenerator.php
+++ b/app/Generator/Chart/Budget/ChartJsBudgetChartGenerator.php
@@ -14,7 +14,6 @@ namespace FireflyIII\Generator\Chart\Budget;
 
 
 use Illuminate\Support\Collection;
-use Navigation;
 
 /**
  * Class ChartJsBudgetChartGenerator
diff --git a/app/Generator/Chart/Category/CategoryChartGeneratorInterface.php b/app/Generator/Chart/Category/CategoryChartGeneratorInterface.php
index 2b95ba820b..d5950bbaeb 100644
--- a/app/Generator/Chart/Category/CategoryChartGeneratorInterface.php
+++ b/app/Generator/Chart/Category/CategoryChartGeneratorInterface.php
@@ -23,13 +23,6 @@ use Illuminate\Support\Collection;
 interface CategoryChartGeneratorInterface
 {
 
-    /**
-     * @param array $data
-     *
-     * @return array
-     */
-    public function pieChart(array $data): array;
-
     /**
      * @param Collection $entries
      *
@@ -37,13 +30,6 @@ interface CategoryChartGeneratorInterface
      */
     public function all(Collection $entries): array;
 
-    /**
-     * @param array $entries
-     *
-     * @return array
-     */
-    public function mainReportChart(array $entries): array;
-
     /**
      * @param Collection $categories
      * @param Collection $entries
@@ -59,6 +45,13 @@ interface CategoryChartGeneratorInterface
      */
     public function frontpage(Collection $entries): array;
 
+    /**
+     * @param array $entries
+     *
+     * @return array
+     */
+    public function mainReportChart(array $entries): array;
+
     /**
      * @param Collection $entries
      *
@@ -66,6 +59,13 @@ interface CategoryChartGeneratorInterface
      */
     public function period(Collection $entries): array;
 
+    /**
+     * @param array $data
+     *
+     * @return array
+     */
+    public function pieChart(array $data): array;
+
     /**
      * @param Collection $categories
      * @param Collection $entries
diff --git a/app/Generator/Report/Standard/MonthReportGenerator.php b/app/Generator/Report/Standard/MonthReportGenerator.php
index fc02233e9c..5bb42eee37 100644
--- a/app/Generator/Report/Standard/MonthReportGenerator.php
+++ b/app/Generator/Report/Standard/MonthReportGenerator.php
@@ -64,6 +64,16 @@ class MonthReportGenerator implements ReportGeneratorInterface
         return $this;
     }
 
+    /**
+     * @param Collection $categories
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setCategories(Collection $categories): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
     /**
      * @param Carbon $date
      *
@@ -87,14 +97,4 @@ class MonthReportGenerator implements ReportGeneratorInterface
 
         return $this;
     }
-
-    /**
-     * @param Collection $categories
-     *
-     * @return ReportGeneratorInterface
-     */
-    public function setCategories(Collection $categories): ReportGeneratorInterface
-    {
-        return $this;
-    }
 }
\ No newline at end of file
diff --git a/app/Helpers/Collector/JournalCollectorInterface.php b/app/Helpers/Collector/JournalCollectorInterface.php
index da72c8f809..e857bdaadc 100644
--- a/app/Helpers/Collector/JournalCollectorInterface.php
+++ b/app/Helpers/Collector/JournalCollectorInterface.php
@@ -43,11 +43,6 @@ interface JournalCollectorInterface
      */
     public function getJournals(): Collection;
 
-    /**
-     * @return JournalCollectorInterface
-     */
-    public function withOpposingAccount(): JournalCollectorInterface;
-
     /**
      * @return LengthAwarePaginator
      */
@@ -136,6 +131,11 @@ interface JournalCollectorInterface
      */
     public function setTypes(array $types): JournalCollectorInterface;
 
+    /**
+     * @return JournalCollectorInterface
+     */
+    public function withOpposingAccount(): JournalCollectorInterface;
+
     /**
      * @return JournalCollectorInterface
      */
diff --git a/app/Helpers/Report/BudgetReportHelper.php b/app/Helpers/Report/BudgetReportHelper.php
index 675c4e2046..c8d417d3b8 100644
--- a/app/Helpers/Report/BudgetReportHelper.php
+++ b/app/Helpers/Report/BudgetReportHelper.php
@@ -19,11 +19,9 @@ use FireflyIII\Helpers\Collection\Budget as BudgetCollection;
 use FireflyIII\Helpers\Collection\BudgetLine;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\LimitRepetition;
-use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use Illuminate\Support\Collection;
 use Navigation;
-use stdClass;
 
 /**
  * Class BudgetReportHelper
diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php
index 7068130116..e1834cd7c1 100644
--- a/app/Http/Controllers/CategoryController.php
+++ b/app/Http/Controllers/CategoryController.php
@@ -184,7 +184,7 @@ class CategoryController extends Controller
         $end          = session('end', Navigation::endOfPeriod(new Carbon, $range));
         $accounts     = $accountRepository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
         $hideCategory = true; // used in list.
-        $page     = intval(Input::get('page')) === 0 ? 1 : intval(Input::get('page'));
+        $page         = intval(Input::get('page')) === 0 ? 1 : intval(Input::get('page'));
         $pageSize     = intval(Preferences::get('transactionPageSize', 50)->data);
         $subTitle     = $category->name;
         $subTitleIcon = 'fa-bar-chart';
@@ -253,7 +253,7 @@ class CategoryController extends Controller
         $end          = Navigation::endOfPeriod($carbon, $range);
         $subTitle     = $category->name;
         $hideCategory = true; // used in list.
-        $page     = intval(Input::get('page')) === 0 ? 1 : intval(Input::get('page'));
+        $page         = intval(Input::get('page')) === 0 ? 1 : intval(Input::get('page'));
         $pageSize     = intval(Preferences::get('transactionPageSize', 50)->data);
 
         // new collector:
diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php
index e337126f71..4ceb55d805 100644
--- a/app/Http/Controllers/Chart/BudgetController.php
+++ b/app/Http/Controllers/Chart/BudgetController.php
@@ -252,7 +252,7 @@ class BudgetController extends Controller
         // join them:
         $result = [];
         foreach (array_keys($periods) as $period) {
-            $nice = $periods[$period];
+            $nice          = $periods[$period];
             $result[$nice] = [
                 'spent'    => isset($entries[$period]) ? $entries[$period] : '0',
                 'budgeted' => isset($entries[$period]) ? $budgeted[$period] : 0,
diff --git a/app/Http/Controllers/Chart/CategoryReportController.php b/app/Http/Controllers/Chart/CategoryReportController.php
index 6c292609a9..35b221d76b 100644
--- a/app/Http/Controllers/Chart/CategoryReportController.php
+++ b/app/Http/Controllers/Chart/CategoryReportController.php
@@ -299,16 +299,17 @@ class CategoryReportController extends Controller
             /** @var Category $category */
             foreach ($categories as $category) {
                 // get sum, and get label:
-                $categoryId                       = $category->id;
-                $data[$label]['name'][$categoryId]             = $category->name;
-                $data[$label]['in'][$categoryId]  = $income[$categoryId] ?? '0';
-                $data[$label]['out'][$categoryId] = $expenses[$categoryId] ?? '0';
+                $categoryId                        = $category->id;
+                $data[$label]['name'][$categoryId] = $category->name;
+                $data[$label]['in'][$categoryId]   = $income[$categoryId] ?? '0';
+                $data[$label]['out'][$categoryId]  = $expenses[$categoryId] ?? '0';
             }
 
             $current = Navigation::addPeriod($current, $period, 0);
         }
 
         $data = $this->generator->mainReportChart($data);
+
         return Response::json($data);
     }
 
diff --git a/app/Http/Controllers/Chart/ReportController.php b/app/Http/Controllers/Chart/ReportController.php
index ca02e01e37..50ed37c990 100644
--- a/app/Http/Controllers/Chart/ReportController.php
+++ b/app/Http/Controllers/Chart/ReportController.php
@@ -128,9 +128,9 @@ class ReportController extends Controller
     }
 
     /**
-     * @param Carbon                 $start
-     * @param Carbon                 $end
-     * @param Collection             $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param Collection $accounts
      *
      * @return \Illuminate\Http\JsonResponse
      * @internal param AccountRepositoryInterface $repository
diff --git a/app/Import/Converter/TagSplit.php b/app/Import/Converter/TagSplit.php
index ab1cdf21be..53d3fc1d1c 100644
--- a/app/Import/Converter/TagSplit.php
+++ b/app/Import/Converter/TagSplit.php
@@ -33,8 +33,9 @@ class TagSplit
      *
      * @return Collection
      */
-    public static function createSetFromSplits(User $user, array $mapping, array $parts): Collection {
-        $set   = new Collection;
+    public static function createSetFromSplits(User $user, array $mapping, array $parts): Collection
+    {
+        $set = new Collection;
         Log::debug('Exploded parts.', $parts);
 
         /** @var TagRepositoryInterface $repository */
@@ -77,6 +78,7 @@ class TagSplit
                 $set->push($tag);
             }
         }
+
         return $set;
     }
 
diff --git a/app/Providers/JournalServiceProvider.php b/app/Providers/JournalServiceProvider.php
index 8b61fe4bf2..2ac7f61f64 100644
--- a/app/Providers/JournalServiceProvider.php
+++ b/app/Providers/JournalServiceProvider.php
@@ -47,7 +47,8 @@ class JournalServiceProvider extends ServiceProvider
         $this->registerCollector();
     }
 
-    private function registerCollector() {
+    private function registerCollector()
+    {
         $this->app->bind(
             'FireflyIII\Helpers\Collector\JournalCollectorInterface',
             function (Application $app, array $arguments) {
diff --git a/app/Support/Search/Search.php b/app/Support/Search/Search.php
index c5e1da96c7..a3da570829 100644
--- a/app/Support/Search/Search.php
+++ b/app/Support/Search/Search.php
@@ -109,7 +109,7 @@ class Search implements SearchInterface
     {
         $categories = $this->user->categories()->get();
         /** @var Collection $result */
-        $result     = $categories->filter(
+        $result = $categories->filter(
             function (Category $category) use ($words) {
                 if ($this->strpos_arr(strtolower($category->name), $words)) {
                     return $category;
@@ -118,7 +118,7 @@ class Search implements SearchInterface
                 return false;
             }
         );
-        $result     = $result->slice(0, $this->limit);
+        $result = $result->slice(0, $this->limit);
 
         return $result;
     }
@@ -131,7 +131,7 @@ class Search implements SearchInterface
      */
     public function searchTags(array $words): Collection
     {
-        $tags   = $this->user->tags()->get();
+        $tags = $this->user->tags()->get();
 
         /** @var Collection $result */
         $result = $tags->filter(
diff --git a/tests/acceptance/Controllers/Admin/ConfigurationControllerTest.php b/tests/acceptance/Controllers/Admin/ConfigurationControllerTest.php
index 738a2037f9..7c23cc443b 100644
--- a/tests/acceptance/Controllers/Admin/ConfigurationControllerTest.php
+++ b/tests/acceptance/Controllers/Admin/ConfigurationControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 namespace Admin;
+
 use TestCase;
 
 /**
@@ -8,7 +9,6 @@ use TestCase;
 class ConfigurationControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -19,14 +19,6 @@ class ConfigurationControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers \FireflyIII\Http\Controllers\Admin\ConfigurationController::index
      */
@@ -48,4 +40,12 @@ class ConfigurationControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Admin/DomainControllerTest.php b/tests/acceptance/Controllers/Admin/DomainControllerTest.php
index 470506a3cb..bfa08ef00f 100644
--- a/tests/acceptance/Controllers/Admin/DomainControllerTest.php
+++ b/tests/acceptance/Controllers/Admin/DomainControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 namespace Admin;
+
 use TestCase;
 
 /**
@@ -8,7 +9,6 @@ use TestCase;
 class DomainControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -19,14 +19,6 @@ class DomainControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\Admin\DomainController::domains
      * @todo   Implement testDomains().
@@ -62,4 +54,12 @@ class DomainControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Admin/HomeControllerTest.php b/tests/acceptance/Controllers/Admin/HomeControllerTest.php
index 482b029c2e..1a24df5e6f 100644
--- a/tests/acceptance/Controllers/Admin/HomeControllerTest.php
+++ b/tests/acceptance/Controllers/Admin/HomeControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 namespace Admin;
+
 use TestCase;
 
 /**
@@ -8,7 +9,6 @@ use TestCase;
 class HomeControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -19,14 +19,6 @@ class HomeControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\Admin\HomeController::index
      * @todo   Implement testIndex().
@@ -38,4 +30,12 @@ class HomeControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Admin/UserControllerTest.php b/tests/acceptance/Controllers/Admin/UserControllerTest.php
index 0ed1978b90..9cc482e252 100644
--- a/tests/acceptance/Controllers/Admin/UserControllerTest.php
+++ b/tests/acceptance/Controllers/Admin/UserControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 namespace Admin;
+
 use TestCase;
 
 /**
@@ -8,7 +9,6 @@ use TestCase;
 class UserControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -19,14 +19,6 @@ class UserControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\Admin\UserController::edit
      * @todo   Implement testEdit().
@@ -62,4 +54,12 @@ class UserControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/AttachmentControllerTest.php b/tests/acceptance/Controllers/AttachmentControllerTest.php
index 310e7589fb..82031db768 100644
--- a/tests/acceptance/Controllers/AttachmentControllerTest.php
+++ b/tests/acceptance/Controllers/AttachmentControllerTest.php
@@ -7,7 +7,6 @@
 class AttachmentControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -18,14 +17,6 @@ class AttachmentControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\AttachmentController::delete
      * @todo   Implement testDelete().
@@ -97,4 +88,12 @@ class AttachmentControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Auth/ConfirmationControllerTest.php b/tests/acceptance/Controllers/Auth/ConfirmationControllerTest.php
index 3099e7213c..89b148de97 100644
--- a/tests/acceptance/Controllers/Auth/ConfirmationControllerTest.php
+++ b/tests/acceptance/Controllers/Auth/ConfirmationControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 namespace Auth;
+
 use TestCase;
 
 /**
@@ -8,7 +9,6 @@ use TestCase;
 class ConfirmationControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -19,14 +19,6 @@ class ConfirmationControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\Auth\ConfirmationController::confirmationError
      * @todo   Implement testConfirmationError().
@@ -62,4 +54,12 @@ class ConfirmationControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Auth/ForgotPasswordControllerTest.php b/tests/acceptance/Controllers/Auth/ForgotPasswordControllerTest.php
index d7c1cc8d7b..051ddce017 100644
--- a/tests/acceptance/Controllers/Auth/ForgotPasswordControllerTest.php
+++ b/tests/acceptance/Controllers/Auth/ForgotPasswordControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 namespace Auth;
+
 use TestCase;
 
 /**
@@ -8,7 +9,6 @@ use TestCase;
 class ForgotPasswordControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -20,18 +20,10 @@ class ForgotPasswordControllerTest extends TestCase
     }
 
     /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
+     * @covers FireflyIII\Http\Controllers\Auth\ForgotPasswordController::broker
+     * @todo   Implement testBroker().
      */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * @covers FireflyIII\Http\Controllers\Auth\ForgotPasswordController::showLinkRequestForm
-     * @todo   Implement testShowLinkRequestForm().
-     */
-    public function testShowLinkRequestForm()
+    public function testBroker()
     {
         // Remove the following lines when you implement this test.
         $this->markTestIncomplete(
@@ -52,14 +44,22 @@ class ForgotPasswordControllerTest extends TestCase
     }
 
     /**
-     * @covers FireflyIII\Http\Controllers\Auth\ForgotPasswordController::broker
-     * @todo   Implement testBroker().
+     * @covers FireflyIII\Http\Controllers\Auth\ForgotPasswordController::showLinkRequestForm
+     * @todo   Implement testShowLinkRequestForm().
      */
-    public function testBroker()
+    public function testShowLinkRequestForm()
     {
         // Remove the following lines when you implement this test.
         $this->markTestIncomplete(
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Auth/LoginControllerTest.php b/tests/acceptance/Controllers/Auth/LoginControllerTest.php
index de1d3569eb..2df971be1d 100644
--- a/tests/acceptance/Controllers/Auth/LoginControllerTest.php
+++ b/tests/acceptance/Controllers/Auth/LoginControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 namespace Auth;
+
 use TestCase;
 
 /**
@@ -8,7 +9,6 @@ use TestCase;
 class LoginControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -19,14 +19,6 @@ class LoginControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\Auth\LoginController::login
      * @todo   Implement testLogin().
@@ -39,6 +31,30 @@ class LoginControllerTest extends TestCase
         );
     }
 
+    /**
+     * @covers FireflyIII\Http\Controllers\Auth\LoginController::logout
+     * @todo   Implement testLogout().
+     */
+    public function testLogout()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+            'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers FireflyIII\Http\Controllers\Auth\LoginController::redirectPath
+     * @todo   Implement testRedirectPath().
+     */
+    public function testRedirectPath()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+            'This test has not been implemented yet.'
+        );
+    }
+
     /**
      * @covers FireflyIII\Http\Controllers\Auth\LoginController::showLoginForm
      * @todo   Implement testShowLoginForm().
@@ -64,26 +80,10 @@ class LoginControllerTest extends TestCase
     }
 
     /**
-     * @covers FireflyIII\Http\Controllers\Auth\LoginController::logout
-     * @todo   Implement testLogout().
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
      */
-    public function testLogout()
+    protected function tearDown()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers FireflyIII\Http\Controllers\Auth\LoginController::redirectPath
-     * @todo   Implement testRedirectPath().
-     */
-    public function testRedirectPath()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
     }
 }
diff --git a/tests/acceptance/Controllers/Auth/PasswordControllerTest.php b/tests/acceptance/Controllers/Auth/PasswordControllerTest.php
index 0b04b65b09..02d793ddce 100644
--- a/tests/acceptance/Controllers/Auth/PasswordControllerTest.php
+++ b/tests/acceptance/Controllers/Auth/PasswordControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 namespace Auth;
+
 use TestCase;
 
 /**
@@ -8,7 +9,6 @@ use TestCase;
 class PasswordControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -20,11 +20,39 @@ class PasswordControllerTest extends TestCase
     }
 
     /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
+     * @covers FireflyIII\Http\Controllers\Auth\PasswordController::broker
+     * @todo   Implement testBroker().
      */
-    protected function tearDown()
+    public function testBroker()
     {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+            'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers FireflyIII\Http\Controllers\Auth\PasswordController::redirectPath
+     * @todo   Implement testRedirectPath().
+     */
+    public function testRedirectPath()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+            'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers FireflyIII\Http\Controllers\Auth\PasswordController::reset
+     * @todo   Implement testReset().
+     */
+    public function testReset()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+            'This test has not been implemented yet.'
+        );
     }
 
     /**
@@ -52,38 +80,10 @@ class PasswordControllerTest extends TestCase
     }
 
     /**
-     * @covers FireflyIII\Http\Controllers\Auth\PasswordController::reset
-     * @todo   Implement testReset().
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
      */
-    public function testReset()
+    protected function tearDown()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers FireflyIII\Http\Controllers\Auth\PasswordController::broker
-     * @todo   Implement testBroker().
-     */
-    public function testBroker()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers FireflyIII\Http\Controllers\Auth\PasswordController::redirectPath
-     * @todo   Implement testRedirectPath().
-     */
-    public function testRedirectPath()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
     }
 }
diff --git a/tests/acceptance/Controllers/Auth/RegisterControllerTest.php b/tests/acceptance/Controllers/Auth/RegisterControllerTest.php
index 35f9ce9fad..48de774930 100644
--- a/tests/acceptance/Controllers/Auth/RegisterControllerTest.php
+++ b/tests/acceptance/Controllers/Auth/RegisterControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 namespace Auth;
+
 use TestCase;
 
 /**
@@ -8,7 +9,6 @@ use TestCase;
 class RegisterControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -20,11 +20,15 @@ class RegisterControllerTest extends TestCase
     }
 
     /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
+     * @covers FireflyIII\Http\Controllers\Auth\RegisterController::redirectPath
+     * @todo   Implement testRedirectPath().
      */
-    protected function tearDown()
+    public function testRedirectPath()
     {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+            'This test has not been implemented yet.'
+        );
     }
 
     /**
@@ -52,14 +56,10 @@ class RegisterControllerTest extends TestCase
     }
 
     /**
-     * @covers FireflyIII\Http\Controllers\Auth\RegisterController::redirectPath
-     * @todo   Implement testRedirectPath().
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
      */
-    public function testRedirectPath()
+    protected function tearDown()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
     }
 }
diff --git a/tests/acceptance/Controllers/Auth/ResetPasswordControllerTest.php b/tests/acceptance/Controllers/Auth/ResetPasswordControllerTest.php
index d527bb562f..779b28614f 100644
--- a/tests/acceptance/Controllers/Auth/ResetPasswordControllerTest.php
+++ b/tests/acceptance/Controllers/Auth/ResetPasswordControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 namespace Auth;
+
 use TestCase;
 
 /**
@@ -8,7 +9,6 @@ use TestCase;
 class ResetPasswordControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -19,38 +19,6 @@ class ResetPasswordControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * @covers FireflyIII\Http\Controllers\Auth\ResetPasswordController::showResetForm
-     * @todo   Implement testShowResetForm().
-     */
-    public function testShowResetForm()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers FireflyIII\Http\Controllers\Auth\ResetPasswordController::reset
-     * @todo   Implement testReset().
-     */
-    public function testReset()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\Auth\ResetPasswordController::broker
      * @todo   Implement testBroker().
@@ -74,4 +42,36 @@ class ResetPasswordControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * @covers FireflyIII\Http\Controllers\Auth\ResetPasswordController::reset
+     * @todo   Implement testReset().
+     */
+    public function testReset()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+            'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers FireflyIII\Http\Controllers\Auth\ResetPasswordController::showResetForm
+     * @todo   Implement testShowResetForm().
+     */
+    public function testShowResetForm()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+            'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Auth/TwoFactorControllerTest.php b/tests/acceptance/Controllers/Auth/TwoFactorControllerTest.php
index 3e6b032ceb..cbf020c16d 100644
--- a/tests/acceptance/Controllers/Auth/TwoFactorControllerTest.php
+++ b/tests/acceptance/Controllers/Auth/TwoFactorControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 namespace Auth;
+
 use TestCase;
 
 /**
@@ -8,7 +9,6 @@ use TestCase;
 class TwoFactorControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -19,14 +19,6 @@ class TwoFactorControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\Auth\TwoFactorController::index
      * @todo   Implement testIndex().
@@ -62,4 +54,12 @@ class TwoFactorControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/BillControllerTest.php b/tests/acceptance/Controllers/BillControllerTest.php
index 70e33dcd35..e54185cd1f 100644
--- a/tests/acceptance/Controllers/BillControllerTest.php
+++ b/tests/acceptance/Controllers/BillControllerTest.php
@@ -7,7 +7,6 @@
 class BillControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -18,14 +17,6 @@ class BillControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\BillController::create
      * @todo   Implement testCreate().
@@ -133,4 +124,12 @@ class BillControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/BudgetControllerTest.php b/tests/acceptance/Controllers/BudgetControllerTest.php
index fce236f666..c74ed7bd73 100644
--- a/tests/acceptance/Controllers/BudgetControllerTest.php
+++ b/tests/acceptance/Controllers/BudgetControllerTest.php
@@ -7,7 +7,6 @@
 class BudgetControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -18,14 +17,6 @@ class BudgetControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\BudgetController::amount
      * @todo   Implement testAmount().
@@ -181,4 +172,12 @@ class BudgetControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/CategoryControllerTest.php b/tests/acceptance/Controllers/CategoryControllerTest.php
index 381ec52424..07fa20ab68 100644
--- a/tests/acceptance/Controllers/CategoryControllerTest.php
+++ b/tests/acceptance/Controllers/CategoryControllerTest.php
@@ -7,7 +7,6 @@
 class CategoryControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -18,14 +17,6 @@ class CategoryControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\CategoryController::create
      * @todo   Implement testCreate().
@@ -145,4 +136,12 @@ class CategoryControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Chart/AccountControllerTest.php b/tests/acceptance/Controllers/Chart/AccountControllerTest.php
index 64316461e0..3548e84e20 100644
--- a/tests/acceptance/Controllers/Chart/AccountControllerTest.php
+++ b/tests/acceptance/Controllers/Chart/AccountControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 namespace Chart;
+
 use TestCase;
 
 /**
@@ -8,7 +9,6 @@ use TestCase;
 class AccountControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -19,14 +19,6 @@ class AccountControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\Chart\AccountController::expenseAccounts
      * @todo   Implement testExpenseAccounts().
@@ -98,4 +90,12 @@ class AccountControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Chart/BillControllerTest.php b/tests/acceptance/Controllers/Chart/BillControllerTest.php
index 58b507cee8..199821e21c 100644
--- a/tests/acceptance/Controllers/Chart/BillControllerTest.php
+++ b/tests/acceptance/Controllers/Chart/BillControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 namespace Chart;
+
 use TestCase;
 
 /**
@@ -8,7 +9,6 @@ use TestCase;
 class BillControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -19,14 +19,6 @@ class BillControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\Chart\BillController::frontpage
      * @todo   Implement testFrontpage().
@@ -50,4 +42,12 @@ class BillControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Chart/BudgetControllerTest.php b/tests/acceptance/Controllers/Chart/BudgetControllerTest.php
index 2d7ce2e35f..63a66eabf6 100644
--- a/tests/acceptance/Controllers/Chart/BudgetControllerTest.php
+++ b/tests/acceptance/Controllers/Chart/BudgetControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 namespace Chart;
+
 use TestCase;
 
 /**
@@ -8,7 +9,6 @@ use TestCase;
 class BudgetControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -19,14 +19,6 @@ class BudgetControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\Chart\BudgetController::budget
      * @todo   Implement testBudget().
@@ -74,4 +66,12 @@ class BudgetControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Chart/CategoryControllerTest.php b/tests/acceptance/Controllers/Chart/CategoryControllerTest.php
index 2b9d62b301..9a38e4a5e9 100644
--- a/tests/acceptance/Controllers/Chart/CategoryControllerTest.php
+++ b/tests/acceptance/Controllers/Chart/CategoryControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 namespace Chart;
+
 use TestCase;
 
 /**
@@ -8,7 +9,6 @@ use TestCase;
 class CategoryControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -19,14 +19,6 @@ class CategoryControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\Chart\CategoryController::all
      * @todo   Implement testAll().
@@ -74,4 +66,12 @@ class CategoryControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Chart/CategoryReportControllerTest.php b/tests/acceptance/Controllers/Chart/CategoryReportControllerTest.php
index f42bfe27e7..7bed2c6d61 100644
--- a/tests/acceptance/Controllers/Chart/CategoryReportControllerTest.php
+++ b/tests/acceptance/Controllers/Chart/CategoryReportControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 namespace Chart;
+
 use TestCase;
 
 /**
@@ -8,7 +9,6 @@ use TestCase;
 class CategoryReportControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -19,14 +19,6 @@ class CategoryReportControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\Chart\CategoryReportController::accountExpense
      * @todo   Implement testAccountExpense().
@@ -86,4 +78,12 @@ class CategoryReportControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Chart/PiggyBankControllerTest.php b/tests/acceptance/Controllers/Chart/PiggyBankControllerTest.php
index 3ddb6f452d..11d7fb8fa6 100644
--- a/tests/acceptance/Controllers/Chart/PiggyBankControllerTest.php
+++ b/tests/acceptance/Controllers/Chart/PiggyBankControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 namespace Chart;
+
 use TestCase;
 
 /**
@@ -8,7 +9,6 @@ use TestCase;
 class PiggyBankControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -19,14 +19,6 @@ class PiggyBankControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\Chart\PiggyBankController::history
      * @todo   Implement testHistory().
@@ -38,4 +30,12 @@ class PiggyBankControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Chart/ReportControllerTest.php b/tests/acceptance/Controllers/Chart/ReportControllerTest.php
index 1cd08fdcd3..79aa395e3d 100644
--- a/tests/acceptance/Controllers/Chart/ReportControllerTest.php
+++ b/tests/acceptance/Controllers/Chart/ReportControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 namespace Chart;
+
 use TestCase;
 
 /**
@@ -8,7 +9,6 @@ use TestCase;
 class ReportControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -19,14 +19,6 @@ class ReportControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\Chart\ReportController::netWorth
      * @todo   Implement testNetWorth().
@@ -62,4 +54,12 @@ class ReportControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/ControllerTest.php b/tests/acceptance/Controllers/ControllerTest.php
index d664eda3e3..5dd633bd7c 100644
--- a/tests/acceptance/Controllers/ControllerTest.php
+++ b/tests/acceptance/Controllers/ControllerTest.php
@@ -7,7 +7,6 @@
 class ControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -18,14 +17,6 @@ class ControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\Controller::authorize
      * @todo   Implement testAuthorize().
@@ -75,10 +66,10 @@ class ControllerTest extends TestCase
     }
 
     /**
-     * @covers FireflyIII\Http\Controllers\Controller::validateWith
-     * @todo   Implement testValidateWith().
+     * @covers FireflyIII\Http\Controllers\Controller::validate
+     * @todo   Implement testValidate().
      */
-    public function testValidateWith()
+    public function testValidate()
     {
         // Remove the following lines when you implement this test.
         $this->markTestIncomplete(
@@ -87,10 +78,10 @@ class ControllerTest extends TestCase
     }
 
     /**
-     * @covers FireflyIII\Http\Controllers\Controller::validate
-     * @todo   Implement testValidate().
+     * @covers FireflyIII\Http\Controllers\Controller::validateWith
+     * @todo   Implement testValidateWith().
      */
-    public function testValidate()
+    public function testValidateWith()
     {
         // Remove the following lines when you implement this test.
         $this->markTestIncomplete(
@@ -109,4 +100,12 @@ class ControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/CurrencyControllerTest.php b/tests/acceptance/Controllers/CurrencyControllerTest.php
index b283a23f13..a435f2ee98 100644
--- a/tests/acceptance/Controllers/CurrencyControllerTest.php
+++ b/tests/acceptance/Controllers/CurrencyControllerTest.php
@@ -7,7 +7,6 @@
 class CurrencyControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -18,14 +17,6 @@ class CurrencyControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\CurrencyController::create
      * @todo   Implement testCreate().
@@ -121,4 +112,12 @@ class CurrencyControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/ExportControllerTest.php b/tests/acceptance/Controllers/ExportControllerTest.php
index 9850eb4392..5d9c205b40 100644
--- a/tests/acceptance/Controllers/ExportControllerTest.php
+++ b/tests/acceptance/Controllers/ExportControllerTest.php
@@ -7,7 +7,6 @@
 class ExportControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -18,14 +17,6 @@ class ExportControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\ExportController::download
      * @todo   Implement testDownload().
@@ -73,4 +64,12 @@ class ExportControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/HelpControllerTest.php b/tests/acceptance/Controllers/HelpControllerTest.php
index 9b45e5fb48..2b4aa55e42 100644
--- a/tests/acceptance/Controllers/HelpControllerTest.php
+++ b/tests/acceptance/Controllers/HelpControllerTest.php
@@ -7,7 +7,6 @@
 class HelpControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -18,14 +17,6 @@ class HelpControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\HelpController::show
      * @todo   Implement testShow().
@@ -37,4 +28,12 @@ class HelpControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/ImportControllerTest.php b/tests/acceptance/Controllers/ImportControllerTest.php
index ca995c45f6..130d8c98bf 100644
--- a/tests/acceptance/Controllers/ImportControllerTest.php
+++ b/tests/acceptance/Controllers/ImportControllerTest.php
@@ -7,7 +7,6 @@
 class ImportControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -18,14 +17,6 @@ class ImportControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\ImportController::complete
      * @todo   Implement testComplete().
@@ -169,4 +160,12 @@ class ImportControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/JsonControllerTest.php b/tests/acceptance/Controllers/JsonControllerTest.php
index 5bb9a3dc32..123b31ade3 100644
--- a/tests/acceptance/Controllers/JsonControllerTest.php
+++ b/tests/acceptance/Controllers/JsonControllerTest.php
@@ -7,7 +7,6 @@
 class JsonControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -18,14 +17,6 @@ class JsonControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\JsonController::action
      * @todo   Implement testAction().
@@ -181,4 +172,12 @@ class JsonControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/NewUserControllerTest.php b/tests/acceptance/Controllers/NewUserControllerTest.php
index 1a90642f51..6c0b6979af 100644
--- a/tests/acceptance/Controllers/NewUserControllerTest.php
+++ b/tests/acceptance/Controllers/NewUserControllerTest.php
@@ -7,7 +7,6 @@
 class NewUserControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -18,14 +17,6 @@ class NewUserControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\NewUserController::index
      * @todo   Implement testIndex().
@@ -49,4 +40,12 @@ class NewUserControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/PiggyBankControllerTest.php b/tests/acceptance/Controllers/PiggyBankControllerTest.php
index e3ad2bf35f..cba932a6a5 100644
--- a/tests/acceptance/Controllers/PiggyBankControllerTest.php
+++ b/tests/acceptance/Controllers/PiggyBankControllerTest.php
@@ -7,7 +7,6 @@
 class PiggyBankControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -18,14 +17,6 @@ class PiggyBankControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\PiggyBankController::add
      * @todo   Implement testAdd().
@@ -205,4 +196,12 @@ class PiggyBankControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Popup/ReportControllerTest.php b/tests/acceptance/Controllers/Popup/ReportControllerTest.php
index a240c9c7d1..c98eae9006 100644
--- a/tests/acceptance/Controllers/Popup/ReportControllerTest.php
+++ b/tests/acceptance/Controllers/Popup/ReportControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 namespace Popup;
+
 use TestCase;
 
 /**
@@ -8,7 +9,6 @@ use TestCase;
 class ReportControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -19,14 +19,6 @@ class ReportControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\Popup\ReportController::info
      * @todo   Implement testInfo().
@@ -38,4 +30,12 @@ class ReportControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/PreferencesControllerTest.php b/tests/acceptance/Controllers/PreferencesControllerTest.php
index 34d2ebe312..6da8efb81e 100644
--- a/tests/acceptance/Controllers/PreferencesControllerTest.php
+++ b/tests/acceptance/Controllers/PreferencesControllerTest.php
@@ -7,7 +7,6 @@
 class PreferencesControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -18,14 +17,6 @@ class PreferencesControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\PreferencesController::code
      * @todo   Implement testCode().
@@ -85,4 +76,12 @@ class PreferencesControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/ProfileControllerTest.php b/tests/acceptance/Controllers/ProfileControllerTest.php
index 1fa9bb283a..9e76ac1b08 100644
--- a/tests/acceptance/Controllers/ProfileControllerTest.php
+++ b/tests/acceptance/Controllers/ProfileControllerTest.php
@@ -7,7 +7,6 @@
 class ProfileControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -18,14 +17,6 @@ class ProfileControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\ProfileController::changePassword
      * @todo   Implement testChangePassword().
@@ -85,4 +76,12 @@ class ProfileControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Report/AccountControllerTest.php b/tests/acceptance/Controllers/Report/AccountControllerTest.php
index d26ae55059..4f0ae09523 100644
--- a/tests/acceptance/Controllers/Report/AccountControllerTest.php
+++ b/tests/acceptance/Controllers/Report/AccountControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 namespace Report;
+
 use TestCase;
 
 /**
@@ -8,7 +9,6 @@ use TestCase;
 class AccountControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -19,14 +19,6 @@ class AccountControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\Report\AccountController::accountReport
      * @todo   Implement testAccountReport().
@@ -38,4 +30,12 @@ class AccountControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Report/BalanceControllerTest.php b/tests/acceptance/Controllers/Report/BalanceControllerTest.php
index 12bf3f858f..8457e40677 100644
--- a/tests/acceptance/Controllers/Report/BalanceControllerTest.php
+++ b/tests/acceptance/Controllers/Report/BalanceControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 namespace Report;
+
 use TestCase;
 
 /**
@@ -8,7 +9,6 @@ use TestCase;
 class BalanceControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -19,14 +19,6 @@ class BalanceControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\Report\BalanceController::balanceReport
      * @todo   Implement testBalanceReport().
@@ -38,4 +30,12 @@ class BalanceControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Report/BudgetControllerTest.php b/tests/acceptance/Controllers/Report/BudgetControllerTest.php
index 7557cfe60f..efaa961536 100644
--- a/tests/acceptance/Controllers/Report/BudgetControllerTest.php
+++ b/tests/acceptance/Controllers/Report/BudgetControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 namespace Report;
+
 use TestCase;
 
 /**
@@ -8,7 +9,6 @@ use TestCase;
 class BudgetControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -19,14 +19,6 @@ class BudgetControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\Report\BudgetController::budgetPeriodReport
      * @todo   Implement testBudgetPeriodReport().
@@ -50,4 +42,12 @@ class BudgetControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Report/CategoryControllerTest.php b/tests/acceptance/Controllers/Report/CategoryControllerTest.php
index e6065b0c08..6ca592d9a6 100644
--- a/tests/acceptance/Controllers/Report/CategoryControllerTest.php
+++ b/tests/acceptance/Controllers/Report/CategoryControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 namespace Report;
+
 use TestCase;
 
 /**
@@ -8,7 +9,6 @@ use TestCase;
 class CategoryControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -19,14 +19,6 @@ class CategoryControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\Report\CategoryController::categoryReport
      * @todo   Implement testCategoryReport().
@@ -38,4 +30,12 @@ class CategoryControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Report/InOutControllerTest.php b/tests/acceptance/Controllers/Report/InOutControllerTest.php
index 33b3f03759..dd7d869355 100644
--- a/tests/acceptance/Controllers/Report/InOutControllerTest.php
+++ b/tests/acceptance/Controllers/Report/InOutControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 namespace Report;
+
 use TestCase;
 
 /**
@@ -8,7 +9,6 @@ use TestCase;
 class InOutControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -19,14 +19,6 @@ class InOutControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\Report\InOutController::expenseReport
      * @todo   Implement testExpenseReport().
@@ -62,4 +54,12 @@ class InOutControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/ReportControllerTest.php b/tests/acceptance/Controllers/ReportControllerTest.php
index 5552a3b651..f431ece115 100644
--- a/tests/acceptance/Controllers/ReportControllerTest.php
+++ b/tests/acceptance/Controllers/ReportControllerTest.php
@@ -7,7 +7,6 @@
 class ReportControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -18,14 +17,6 @@ class ReportControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\ReportController::auditReport
      * @todo   Implement testAuditReport().
@@ -97,4 +88,12 @@ class ReportControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/RuleControllerTest.php b/tests/acceptance/Controllers/RuleControllerTest.php
index a0686f63d9..6f661b838e 100644
--- a/tests/acceptance/Controllers/RuleControllerTest.php
+++ b/tests/acceptance/Controllers/RuleControllerTest.php
@@ -7,7 +7,6 @@
 class RuleControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -18,14 +17,6 @@ class RuleControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\RuleController::create
      * @todo   Implement testCreate().
@@ -169,4 +160,12 @@ class RuleControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/RuleGroupControllerTest.php b/tests/acceptance/Controllers/RuleGroupControllerTest.php
index 6303d9a227..540004a9ac 100644
--- a/tests/acceptance/Controllers/RuleGroupControllerTest.php
+++ b/tests/acceptance/Controllers/RuleGroupControllerTest.php
@@ -7,7 +7,6 @@
 class RuleGroupControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -18,14 +17,6 @@ class RuleGroupControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\RuleGroupController::create
      * @todo   Implement testCreate().
@@ -145,4 +136,12 @@ class RuleGroupControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/SearchControllerTest.php b/tests/acceptance/Controllers/SearchControllerTest.php
index 9caced22b9..cf402d2691 100644
--- a/tests/acceptance/Controllers/SearchControllerTest.php
+++ b/tests/acceptance/Controllers/SearchControllerTest.php
@@ -7,7 +7,6 @@
 class SearchControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -18,14 +17,6 @@ class SearchControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\SearchController::index
      * @todo   Implement testIndex().
@@ -37,4 +28,12 @@ class SearchControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/TagControllerTest.php b/tests/acceptance/Controllers/TagControllerTest.php
index 428c5ef2e9..edcfd9a0a2 100644
--- a/tests/acceptance/Controllers/TagControllerTest.php
+++ b/tests/acceptance/Controllers/TagControllerTest.php
@@ -7,7 +7,6 @@
 class TagControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -18,14 +17,6 @@ class TagControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\TagController::create
      * @todo   Implement testCreate().
@@ -133,4 +124,12 @@ class TagControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Transaction/ConvertControllerTest.php b/tests/acceptance/Controllers/Transaction/ConvertControllerTest.php
index 5b8d8d6ff3..f6f444159e 100644
--- a/tests/acceptance/Controllers/Transaction/ConvertControllerTest.php
+++ b/tests/acceptance/Controllers/Transaction/ConvertControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 namespace Transaction;
+
 use TestCase;
 
 /**
@@ -8,7 +9,6 @@ use TestCase;
 class ConvertControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -19,14 +19,6 @@ class ConvertControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\Transaction\ConvertController::convert
      * @todo   Implement testConvert().
@@ -50,4 +42,12 @@ class ConvertControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Transaction/MassControllerTest.php b/tests/acceptance/Controllers/Transaction/MassControllerTest.php
index 7f7b684ae5..eb24b914e5 100644
--- a/tests/acceptance/Controllers/Transaction/MassControllerTest.php
+++ b/tests/acceptance/Controllers/Transaction/MassControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 namespace Transaction;
+
 use TestCase;
 
 /**
@@ -8,7 +9,6 @@ use TestCase;
 class MassControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -19,14 +19,6 @@ class MassControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\Transaction\MassController::massDelete
      * @todo   Implement testMassDelete().
@@ -74,4 +66,12 @@ class MassControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Transaction/SingleControllerTest.php b/tests/acceptance/Controllers/Transaction/SingleControllerTest.php
index 9531e2a0c7..e54e1c7255 100644
--- a/tests/acceptance/Controllers/Transaction/SingleControllerTest.php
+++ b/tests/acceptance/Controllers/Transaction/SingleControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 namespace Transaction;
+
 use TestCase;
 
 /**
@@ -8,7 +9,6 @@ use TestCase;
 class SingleControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -19,14 +19,6 @@ class SingleControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\Transaction\SingleController::create
      * @todo   Implement testCreate().
@@ -98,4 +90,12 @@ class SingleControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Transaction/SplitControllerTest.php b/tests/acceptance/Controllers/Transaction/SplitControllerTest.php
index 69d94170ff..3407592042 100644
--- a/tests/acceptance/Controllers/Transaction/SplitControllerTest.php
+++ b/tests/acceptance/Controllers/Transaction/SplitControllerTest.php
@@ -1,5 +1,6 @@
 <?php
 namespace Transaction;
+
 use TestCase;
 
 /**
@@ -8,7 +9,6 @@ use TestCase;
 class SplitControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -19,14 +19,6 @@ class SplitControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\Transaction\SplitController::edit
      * @todo   Implement testEdit().
@@ -50,4 +42,12 @@ class SplitControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/TransactionControllerTest.php b/tests/acceptance/Controllers/TransactionControllerTest.php
index f5af20d09a..fb16bd53de 100644
--- a/tests/acceptance/Controllers/TransactionControllerTest.php
+++ b/tests/acceptance/Controllers/TransactionControllerTest.php
@@ -7,7 +7,6 @@
 class TransactionControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -18,14 +17,6 @@ class TransactionControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers FireflyIII\Http\Controllers\TransactionController::index
      * @todo   Implement testIndex().
@@ -61,4 +52,12 @@ class TransactionControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }