diff --git a/app/Http/Controllers/Json/AutoCompleteController.php b/app/Http/Controllers/Json/AutoCompleteController.php
index 2cca2c370a..e5f87f3b68 100644
--- a/app/Http/Controllers/Json/AutoCompleteController.php
+++ b/app/Http/Controllers/Json/AutoCompleteController.php
@@ -22,21 +22,16 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Json;
 
-use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
-use FireflyIII\Support\CacheProperties;
-use FireflyIII\Support\Http\Controllers\AutoCompleteCollector;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Log;
@@ -44,11 +39,12 @@ use Log;
 /**
  * Class AutoCompleteController.
  *
+ * TODO autocomplete for transaction types.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AutoCompleteController extends Controller
 {
-    use AutoCompleteCollector;
 
     /**
      * @param Request $request
@@ -95,119 +91,9 @@ class AutoCompleteController extends Controller
         return response()->json($return);
     }
 
-    /**
-     * List of all journals.
-     *
-     * @param Request $request
-     * @return JsonResponse
-     */
-    public function allTransactionJournals(Request $request): JsonResponse
-    {
-        $search = (string)$request->get('search');
-        $cache  = new CacheProperties;
-        $cache->addProperty('ac-all-journals');
-        // very unlikely a user will actually search for this string.
-        $key = '' === $search ? 'skjf0893j89fj2398hd89dh289h2398hr7isd8900828u209ujnxs88929282u' : $search;
-        $cache->addProperty($key);
-        if ($cache->has()) {
-            return response()->json($cache->get()); // @codeCoverageIgnore
-        }
-        // find everything:
-        /** @var GroupCollectorInterface $collector */
-        $collector = app(GroupCollectorInterface::class);
-        $collector->setLimit(250)->setPage(1);
-
-        $journals = $collector->getExtractedJournals();
-        $return   = [];
-        /** @var array $journal */
-        foreach ($journals as $journal) {
-            if (strlen($journal['group_title']) > 0) {
-                $return[] = $journal['group_title'];
-            }
-            if (strlen($journal['description']) > 0) {
-                $return[] = $journal['description'];
-            }
-        }
-        $return = array_unique($return);
-
-        if ('' !== $search) {
-            $return = array_values(
-                array_unique(
-                    array_filter(
-                        $return, function (string $value) use ($search) {
-                        return !(false === stripos($value, $search));
-                    }, ARRAY_FILTER_USE_BOTH
-                    )
-                )
-            );
-        }
-        $cache->store($return);
-
-        return response()->json($return);
-    }
-
-    /**
-     * @param Request $request
-     * @param string $subject
-     *
-     * @return JsonResponse
-     * @throws FireflyException
-     */
-    public function autoComplete(Request $request, string $subject): JsonResponse
-    {
-        $search     = (string)$request->get('search');
-        $unfiltered = null;
-        $filtered   = null;
-
-        switch ($subject) {
-            default:
-                break;
-            case 'all-accounts':
-                $unfiltered = $this->getAccounts(
-                    [AccountType::REVENUE, AccountType::EXPENSE, AccountType::BENEFICIARY, AccountType::DEFAULT, AccountType::ASSET, AccountType::LOAN,
-                     AccountType::DEBT, AccountType::MORTGAGE]
-                );
-                break;
-            case 'expense-accounts':
-                $unfiltered = $this->getAccounts([AccountType::EXPENSE, AccountType::BENEFICIARY]);
-                break;
-            case 'revenue-accounts':
-                $unfiltered = $this->getAccounts([AccountType::REVENUE]);
-                break;
-            case 'asset-accounts':
-                $unfiltered = $this->getAccounts([AccountType::ASSET, AccountType::DEFAULT]);
-                break;
-            case 'categories':
-                $unfiltered = $this->getCategories();
-                break;
-            case 'budgets':
-                $unfiltered = $this->getBudgets();
-                break;
-            case 'tags':
-                $unfiltered = $this->getTags();
-                break;
-            case 'bills':
-                $unfiltered = $this->getBills();
-                break;
-            case 'currency-names':
-                $unfiltered = $this->getCurrencyNames();
-                break;
-            case 'transaction-types':
-            case 'transaction_types':
-                $unfiltered = $this->getTransactionTypes();
-                break;
-        }
-        $filtered = $this->filterResult($unfiltered, $search);
-
-        if (null === $filtered) {
-            throw new FireflyException(sprintf('Auto complete handler cannot handle "%s"', $subject)); // @codeCoverageIgnore
-        }
-
-        return response()->json($filtered);
-    }
-
     /**
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
     public function budgets(): JsonResponse
     {
@@ -221,6 +107,7 @@ class AutoCompleteController extends Controller
      * @param Request $request
      *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
     public function categories(Request $request): JsonResponse
     {
@@ -233,11 +120,10 @@ class AutoCompleteController extends Controller
     }
 
     /**
-     * @param Request $request
-     *
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
-    public function currencies(Request $request): JsonResponse
+    public function currencies(): JsonResponse
     {
         /** @var CurrencyRepositoryInterface $repository */
         $repository = app(CurrencyRepositoryInterface::class);
@@ -259,61 +145,9 @@ class AutoCompleteController extends Controller
         return response()->json($return);
     }
 
-    /**
-     * List of journals with their ID.
-     *
-     * @param Request $request
-     * @param TransactionJournal $except
-     *
-     * @return JsonResponse
-     */
-    public function journalsWithId(Request $request, TransactionJournal $except): JsonResponse
-    {
-        $search = (string)$request->get('search');
-        $cache  = new CacheProperties;
-        $cache->addProperty('ac-expense-accounts');
-        // very unlikely a user will actually search for this string.
-        $key = '' === $search ? 'skjf0893j89fj2398hd89dh289h2398hr7isd8900828u209ujnxs88929282u' : $search;
-        $cache->addProperty($key);
-        if ($cache->has()) {
-            return response()->json($cache->get()); // @codeCoverageIgnore
-        }
-        // find everything:
-        /** @var GroupCollectorInterface $collector */
-        $collector = app(GroupCollectorInterface::class);
-        $collector->setLimit(400)->setPage(1);
-        $set    = $collector->getExtractedJournals();
-        $return = [];
-        foreach ($set as $journal) {
-            $id = (int)$journal['transaction_journal_id'];
-            if ($id !== $except->id) {
-                $return[] = [
-                    'id'   => $id,
-                    'name' => $id . ': ' . $journal['description'],
-                ];
-            }
-        }
-
-        sort($return);
-
-        if ('' !== $search) {
-            $return = array_filter(
-                $return, function (array $array) use ($search) {
-                $haystack = $array['name'];
-                $result   = stripos($haystack, $search);
-
-                return !(false === $result);
-            }
-            );
-
-        }
-        $cache->store($return);
-
-        return response()->json($return);
-    }
-
     /**
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
     public function piggyBanks(): JsonResponse
     {
@@ -324,7 +158,9 @@ class AutoCompleteController extends Controller
     }
 
     /**
+     * @param Request $request
      * @return JsonResponse
+     * @codeCoverageIgnore
      */
     public function tags(Request $request): JsonResponse
     {
@@ -337,53 +173,4 @@ class AutoCompleteController extends Controller
         return response()->json($result->toArray());
     }
 
-    /**
-     * List of journals by type.
-     *
-     * @param Request $request
-     * @param string $what
-     *
-     * @return JsonResponse
-     */
-    public function transactionJournals(Request $request, string $what): JsonResponse
-    {
-        $search = (string)$request->get('search');
-        $cache  = new CacheProperties;
-        $cache->addProperty('ac-journals');
-        // very unlikely a user will actually search for this string.
-        $key = '' === $search ? 'skjf0893j89fj2398hd89dh289h2398hr7isd8900828u209ujnxs88929282u' : $search;
-        $cache->addProperty($key);
-        if ($cache->has()) {
-            return response()->json($cache->get()); // @codeCoverageIgnore
-        }
-        // find everything:
-        $type  = config('firefly.transactionTypesByWhat.' . $what);
-        $types = [$type];
-
-        /** @var GroupCollectorInterface $collector */
-        $collector = app(GroupCollectorInterface::class);
-        $collector->setTypes($types)->setLimit(250)->setPage(1);
-        $result = $collector->getExtractedJournals();
-        $return = [];
-        foreach ($result as $journal) {
-            $return[] = $journal['description'];
-        }
-        $return = array_unique($return);
-        sort($return);
-
-        if ('' !== $search) {
-            $return = array_values(
-                array_unique(
-                    array_filter(
-                        $return, function (string $value) use ($search) {
-                        return !(false === stripos($value, $search));
-                    }, ARRAY_FILTER_USE_BOTH
-                    )
-                )
-            );
-        }
-        $cache->store($return);
-
-        return response()->json($return);
-    }
 }
diff --git a/app/Http/Controllers/Json/ReconcileController.php b/app/Http/Controllers/Json/ReconcileController.php
index d111379fdf..25cd2e07e0 100644
--- a/app/Http/Controllers/Json/ReconcileController.php
+++ b/app/Http/Controllers/Json/ReconcileController.php
@@ -145,7 +145,7 @@ class ReconcileController extends Controller
             // @codeCoverageIgnoreStart
         } catch (Throwable $e) {
             Log::debug(sprintf('View error: %s', $e->getMessage()));
-            $view = 'Could not render accounts.reconcile.overview';
+            $view = sprintf('Could not render accounts.reconcile.overview: %s', $e->getMessage());
         }
         // @codeCoverageIgnoreEnd
 
@@ -196,6 +196,7 @@ class ReconcileController extends Controller
         /** @var array $journal */
         foreach ($array as $journal) {
             $inverse = false;
+            // @codeCoverageIgnoreStart
             if (TransactionType::DEPOSIT === $journal['transaction_type_type']) {
                 $inverse = true;
             }
@@ -211,6 +212,7 @@ class ReconcileController extends Controller
                     $journal['foreign_amount'] = app('steam')->positive($journal['foreign_amount']);
                 }
             }
+            // @codeCoverageIgnoreEnd
 
             $journals[] = $journal;
         }
@@ -240,6 +242,9 @@ class ReconcileController extends Controller
     {
         $toAdd = '0';
         Log::debug(sprintf('User submitted %s #%d: "%s"', $journal['transaction_type_type'], $journal['transaction_journal_id'], $journal['description']));
+
+        // not much magic below we need to cover using tests.
+        // @codeCoverageIgnoreStart
         if ($account->id === $journal['source_account_id']) {
             if ($currency->id === $journal['currency_id']) {
                 $toAdd = $journal['amount'];
@@ -256,6 +261,8 @@ class ReconcileController extends Controller
                 $toAdd = bcmul($journal['foreign_amount'], '-1');
             }
         }
+        // @codeCoverageIgnoreEnd
+
         Log::debug(sprintf('Going to add %s to %s', $toAdd, $amount));
         $amount = bcadd($amount, $toAdd);
         Log::debug(sprintf('Result is %s', $amount));
diff --git a/app/Http/Controllers/Json/RecurrenceController.php b/app/Http/Controllers/Json/RecurrenceController.php
index d672b01311..77ef359ae4 100644
--- a/app/Http/Controllers/Json/RecurrenceController.php
+++ b/app/Http/Controllers/Json/RecurrenceController.php
@@ -42,6 +42,7 @@ class RecurrenceController extends Controller
 
     /**
      * RecurrenceController constructor.
+     * @codeCoverageIgnore
      */
     public function __construct()
     {
diff --git a/app/Support/Http/Controllers/AutoCompleteCollector.php b/app/Support/Http/Controllers/AutoCompleteCollector.php
deleted file mode 100644
index 719640f082..0000000000
--- a/app/Support/Http/Controllers/AutoCompleteCollector.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-/**
- * AutoCompleteCollector.php
- * Copyright (c) 2018 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\Support\Http\Controllers;
-
-use FireflyIII\Models\Account;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use FireflyIII\Repositories\Bill\BillRepositoryInterface;
-use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
-use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
-use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
-use FireflyIII\Repositories\Tag\TagRepositoryInterface;
-use Illuminate\Support\Collection;
-
-/**
- * Trait AutoCompleteCollector
- */
-trait AutoCompleteCollector
-{
-
-    /**
-     * @param array  $unfiltered
-     * @param string $query
-     *
-     * @return array|null
-     */
-    protected function filterResult(?array $unfiltered, string $query): ?array
-    {
-        if (null === $unfiltered) {
-            return null; // @codeCoverageIgnore
-        }
-        if ('' === $query) {
-            sort($unfiltered);
-
-            return $unfiltered;
-        }
-        $return = [];
-        if ('' !== $query) {
-            $return = array_values(
-                array_filter(
-                    $unfiltered, function (string $value) use ($query) {
-                    return !(false === stripos($value, $query));
-                }, ARRAY_FILTER_USE_BOTH
-                )
-            );
-        }
-        sort($return);
-
-
-        return $return;
-    }
-
-    /**
-     * @param array $types
-     *
-     * @return array
-     */
-    protected function getAccounts(array $types): array
-    {
-        $repository = app(AccountRepositoryInterface::class);
-        // find everything:
-        /** @var Collection $collection */
-        $collection = $repository->getAccountsByType($types);
-        $filtered   = $collection->filter(
-            function (Account $account) {
-                return true === $account->active;
-            }
-        );
-
-        return array_values(array_unique($filtered->pluck('name')->toArray()));
-    }
-
-    /**
-     * @return array
-     */
-    protected function getBills(): array
-    {
-        $repository = app(BillRepositoryInterface::class);
-
-        return array_unique($repository->getActiveBills()->pluck('name')->toArray());
-    }
-
-    /**
-     * @return array
-     */
-    protected function getBudgets(): array
-    {
-        $repository = app(BudgetRepositoryInterface::class);
-
-        return array_unique($repository->getBudgets()->pluck('name')->toArray());
-    }
-
-    /**
-     * @return array
-     */
-    protected function getCategories(): array
-    {
-        $repository = app(CategoryRepositoryInterface::class);
-
-        return array_unique($repository->getCategories()->pluck('name')->toArray());
-    }
-
-    /**
-     * @return array
-     */
-    protected function getCurrencyNames(): array
-    {
-        /** @var CurrencyRepositoryInterface $repository */
-        $repository = app(CurrencyRepositoryInterface::class);
-
-        return $repository->get()->pluck('name')->toArray();
-    }
-
-    /**
-     * @return array
-     */
-    protected function getTags(): array
-    {
-        /** @var TagRepositoryInterface $repository */
-        $repository = app(TagRepositoryInterface::class);
-
-        return array_unique($repository->get()->pluck('tag')->toArray());
-    }
-
-    /**
-     * @return array
-     */
-    protected function getTransactionTypes(): array
-    {
-        $repository = app(JournalRepositoryInterface::class);
-
-        return array_unique($repository->getTransactionTypes()->pluck('type')->toArray());
-    }
-}
diff --git a/app/Support/Twig/AmountFormat.php b/app/Support/Twig/AmountFormat.php
index c9be6b5258..ec8b8b3d61 100644
--- a/app/Support/Twig/AmountFormat.php
+++ b/app/Support/Twig/AmountFormat.php
@@ -25,7 +25,6 @@ namespace FireflyIII\Support\Twig;
 use FireflyIII\Models\Account as AccountModel;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use Log;
 use Twig_Extension;
 use Twig_SimpleFilter;
@@ -87,23 +86,14 @@ class AmountFormat extends Twig_Extension
             static function (AccountModel $account, string $amount, bool $coloured = null): string {
 
                 if ('testing' === config('app.env')) {
-                    Log::warning('AmountFormat::formatAmountByAccount should NOT be called in the TEST environment!');
+                    Log::warning('Twig AmountFormat::formatAmountByAccount should NOT be called in the TEST environment!');
+                    Log::warning('Make sure AccountRepos and Amount::getDefaultCurrency are mocked.');
                 }
 
                 $coloured = $coloured ?? true;
                 /** @var AccountRepositoryInterface $accountRepos */
                 $accountRepos = app(AccountRepositoryInterface::class);
-                /** @var CurrencyRepositoryInterface $currencyRepos */
-                $currencyRepos   = app(CurrencyRepositoryInterface::class);
-                $currency        = app('amount')->getDefaultCurrency();
-                $currencyId      = (int)$accountRepos->getMetaValue($account, 'currency_id');
-                $accountCurrency = null;
-                if (0 !== $currencyId) {
-                    $accountCurrency = $currencyRepos->findNull($currencyId);
-                }
-                if (null !== $accountCurrency) {
-                    $currency = $accountCurrency;
-                }
+                $currency     = $accountRepos->getAccountCurrency($account) ?? app('amount')->getDefaultCurrency();
 
                 return app('amount')->formatAnything($currency, $amount, $coloured);
             },
diff --git a/app/Validation/AccountValidator.php b/app/Validation/AccountValidator.php
index e91e90ef19..6e87415335 100644
--- a/app/Validation/AccountValidator.php
+++ b/app/Validation/AccountValidator.php
@@ -554,6 +554,7 @@ class AccountValidator
         }
 
         // don't expect to end up here:
+
         return false;
     }
 
diff --git a/phpunit.coverage.specific.xml b/phpunit.coverage.specific.xml
index 2665e0bf58..d9a53a5f60 100644
--- a/phpunit.coverage.specific.xml
+++ b/phpunit.coverage.specific.xml
@@ -51,6 +51,8 @@
             <directory suffix="Test.php">./tests/Feature/Controllers/Category</directory>
             <directory suffix="Test.php">./tests/Feature/Controllers/Chart</directory>
             <directory suffix="Test.php">./tests/Feature/Controllers/Import</directory>
+            <directory suffix="Test.php">./tests/Feature/Controllers/Json</directory>
+            <directory suffix="Test.php">./tests/Feature/Controllers/Popup</directory>
         </testsuite>
 
 
diff --git a/phpunit.coverage.xml b/phpunit.coverage.xml
index 2499add904..d676ea64f1 100644
--- a/phpunit.coverage.xml
+++ b/phpunit.coverage.xml
@@ -51,6 +51,8 @@
             <directory suffix="Test.php">./tests/Feature/Controllers/Category</directory>
             <directory suffix="Test.php">./tests/Feature/Controllers/Chart</directory>
             <directory suffix="Test.php">./tests/Feature/Controllers/Import</directory>
+            <directory suffix="Test.php">./tests/Feature/Controllers/Json</directory>
+            <directory suffix="Test.php">./tests/Feature/Controllers/Popup</directory>
         </testsuite>
 
 
diff --git a/phpunit.xml b/phpunit.xml
index 6ad538ee36..8000be2857 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -51,6 +51,8 @@
             <directory suffix="Test.php">./tests/Feature/Controllers/Category</directory>
             <directory suffix="Test.php">./tests/Feature/Controllers/Chart</directory>
             <directory suffix="Test.php">./tests/Feature/Controllers/Import</directory>
+            <directory suffix="Test.php">./tests/Feature/Controllers/Json</directory>
+            <directory suffix="Test.php">./tests/Feature/Controllers/Popup</directory>
         </testsuite>
 
         <!--
diff --git a/tests/Api/V1/Controllers/BudgetControllerTest.php b/tests/Api/V1/Controllers/BudgetControllerTest.php
index 134ad004c7..df95a46115 100644
--- a/tests/Api/V1/Controllers/BudgetControllerTest.php
+++ b/tests/Api/V1/Controllers/BudgetControllerTest.php
@@ -24,7 +24,7 @@ declare(strict_types=1);
 namespace Tests\Api\V1\Controllers;
 
 
-use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
+
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
diff --git a/tests/Api/V1/Controllers/BudgetLimitControllerTest.php b/tests/Api/V1/Controllers/BudgetLimitControllerTest.php
index b1c4bf1584..c5ccefda5c 100644
--- a/tests/Api/V1/Controllers/BudgetLimitControllerTest.php
+++ b/tests/Api/V1/Controllers/BudgetLimitControllerTest.php
@@ -24,7 +24,7 @@ declare(strict_types=1);
 namespace Tests\Api\V1\Controllers;
 
 
-use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
+
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Transformers\BudgetLimitTransformer;
diff --git a/tests/Api/V1/Controllers/CategoryControllerTest.php b/tests/Api/V1/Controllers/CategoryControllerTest.php
index 5a4fed8dd9..8d424c4c0b 100644
--- a/tests/Api/V1/Controllers/CategoryControllerTest.php
+++ b/tests/Api/V1/Controllers/CategoryControllerTest.php
@@ -24,7 +24,7 @@ declare(strict_types=1);
 namespace Tests\Api\V1\Controllers;
 
 
-use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
+
 use FireflyIII\Models\Category;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use FireflyIII\Transformers\CategoryTransformer;
diff --git a/tests/Api/V1/Controllers/CurrencyControllerTest.php b/tests/Api/V1/Controllers/CurrencyControllerTest.php
index e1fb52d23e..b384d739f2 100644
--- a/tests/Api/V1/Controllers/CurrencyControllerTest.php
+++ b/tests/Api/V1/Controllers/CurrencyControllerTest.php
@@ -24,7 +24,7 @@ declare(strict_types=1);
 namespace Tests\Api\V1\Controllers;
 
 
-use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
+
 use FireflyIII\Models\Preference;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
diff --git a/tests/Api/V1/Controllers/TransactionLinkControllerTest.php b/tests/Api/V1/Controllers/TransactionLinkControllerTest.php
index 1a4919757f..ed57e7d286 100644
--- a/tests/Api/V1/Controllers/TransactionLinkControllerTest.php
+++ b/tests/Api/V1/Controllers/TransactionLinkControllerTest.php
@@ -25,7 +25,7 @@ namespace Tests\Api\V1\Controllers;
 
 
 use Carbon\Carbon;
-use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
+
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournalLink;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
diff --git a/tests/Feature/Controllers/Account/IndexControllerTest.php b/tests/Feature/Controllers/Account/IndexControllerTest.php
index 1d59a8a49a..3dc5181320 100644
--- a/tests/Feature/Controllers/Account/IndexControllerTest.php
+++ b/tests/Feature/Controllers/Account/IndexControllerTest.php
@@ -65,17 +65,16 @@ class IndexControllerTest extends TestCase
     public function testIndex(string $range): void
     {
         // mock stuff
+        $this->mock(CurrencyRepositoryInterface::class);
         $account       = $this->getRandomAsset();
         $repository    = $this->mock(AccountRepositoryInterface::class);
-        $currencyRepos = $this->mock(CurrencyRepositoryInterface::class);
         $userRepos     = $this->mock(UserRepositoryInterface::class);
         $euro          = $this->getEuro();
         // mock hasRole for user repository:
         $userRepos->shouldReceive('hasRole')->withArgs([Mockery::any(), 'owner'])->andReturn(true)->atLeast()->once();
 
         $repository->shouldReceive('getAccountsByType')->andReturn(new Collection([$account]));
-        $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1');
-        $currencyRepos->shouldReceive('findNull')->withArgs([1])->andReturn($euro);
+        $repository->shouldReceive('getAccountCurrency')->atLeast()->once()->andReturn($euro);
         Steam::shouldReceive('balancesByAccounts')->andReturn([$account->id => '100']);
         Steam::shouldReceive('getLastActivities')->andReturn([]);
 
diff --git a/tests/Feature/Controllers/BillControllerTest.php b/tests/Feature/Controllers/BillControllerTest.php
index 4209f30fb9..fc36ff007b 100644
--- a/tests/Feature/Controllers/BillControllerTest.php
+++ b/tests/Feature/Controllers/BillControllerTest.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
 namespace Tests\Feature\Controllers;
 
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
-use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
+
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\Rule;
 use FireflyIII\Models\TransactionJournal;
diff --git a/tests/Feature/Controllers/Category/NoCategoryControllerTest.php b/tests/Feature/Controllers/Category/NoCategoryControllerTest.php
index 679beb540d..6d2b967c0e 100644
--- a/tests/Feature/Controllers/Category/NoCategoryControllerTest.php
+++ b/tests/Feature/Controllers/Category/NoCategoryControllerTest.php
@@ -26,8 +26,8 @@ namespace Tests\Feature\Controllers\Category;
 
 use Carbon\Carbon;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
-use FireflyIII\Helpers\Filter\InternalTransferFilter;
+
+
 use FireflyIII\Helpers\Fiscal\FiscalHelperInterface;
 use FireflyIII\Models\Preference;
 use FireflyIII\Models\TransactionJournal;
diff --git a/tests/Feature/Controllers/Category/ShowControllerTest.php b/tests/Feature/Controllers/Category/ShowControllerTest.php
index 27d5512491..4fd5fe754f 100644
--- a/tests/Feature/Controllers/Category/ShowControllerTest.php
+++ b/tests/Feature/Controllers/Category/ShowControllerTest.php
@@ -26,8 +26,8 @@ namespace Tests\Feature\Controllers\Category;
 
 use Carbon\Carbon;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
-use FireflyIII\Helpers\Filter\InternalTransferFilter;
+
+
 use FireflyIII\Helpers\Fiscal\FiscalHelperInterface;
 use FireflyIII\Models\Preference;
 use FireflyIII\Models\Transaction;
diff --git a/tests/Feature/Controllers/Chart/AccountControllerTest.php b/tests/Feature/Controllers/Chart/AccountControllerTest.php
index 1ca58eb4a1..32165a1b3b 100644
--- a/tests/Feature/Controllers/Chart/AccountControllerTest.php
+++ b/tests/Feature/Controllers/Chart/AccountControllerTest.php
@@ -25,7 +25,7 @@ namespace Tests\Feature\Controllers\Chart;
 use Carbon\Carbon;
 use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
+
 use FireflyIII\Helpers\Fiscal\FiscalHelperInterface;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
diff --git a/tests/Feature/Controllers/Chart/BudgetReportControllerTest.php b/tests/Feature/Controllers/Chart/BudgetReportControllerTest.php
index 54adeb44c0..1f5db9a55e 100644
--- a/tests/Feature/Controllers/Chart/BudgetReportControllerTest.php
+++ b/tests/Feature/Controllers/Chart/BudgetReportControllerTest.php
@@ -26,10 +26,10 @@ use Carbon\Carbon;
 use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
 use FireflyIII\Helpers\Chart\MetaPieChartInterface;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
-use FireflyIII\Helpers\Filter\OpposingAccountFilter;
-use FireflyIII\Helpers\Filter\PositiveAmountFilter;
-use FireflyIII\Helpers\Filter\TransferFilter;
+
+
+
+
 use FireflyIII\Helpers\Fiscal\FiscalHelperInterface;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\TransactionType;
diff --git a/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php b/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php
index 6805d94335..a121fa6035 100644
--- a/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php
+++ b/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php
@@ -26,11 +26,11 @@ use Carbon\Carbon;
 use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
 use FireflyIII\Helpers\Chart\MetaPieChartInterface;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
-use FireflyIII\Helpers\Filter\NegativeAmountFilter;
-use FireflyIII\Helpers\Filter\OpposingAccountFilter;
-use FireflyIII\Helpers\Filter\PositiveAmountFilter;
-use FireflyIII\Helpers\Filter\TransferFilter;
+
+
+
+
+
 use FireflyIII\Helpers\Fiscal\FiscalHelperInterface;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionType;
diff --git a/tests/Feature/Controllers/Chart/ExpenseReportControllerTest.php b/tests/Feature/Controllers/Chart/ExpenseReportControllerTest.php
index c94efb4877..1a3d7590a1 100644
--- a/tests/Feature/Controllers/Chart/ExpenseReportControllerTest.php
+++ b/tests/Feature/Controllers/Chart/ExpenseReportControllerTest.php
@@ -25,7 +25,7 @@ namespace Tests\Feature\Controllers\Chart;
 use Carbon\Carbon;
 use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
+
 use FireflyIII\Helpers\Fiscal\FiscalHelperInterface;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
diff --git a/tests/Feature/Controllers/HomeControllerTest.php b/tests/Feature/Controllers/HomeControllerTest.php
index da0138dfd5..c67d820cd0 100644
--- a/tests/Feature/Controllers/HomeControllerTest.php
+++ b/tests/Feature/Controllers/HomeControllerTest.php
@@ -22,7 +22,7 @@ declare(strict_types=1);
 
 namespace Tests\Feature\Controllers;
 
-use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
+
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\TransactionCurrency;
diff --git a/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php b/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php
index bc15f39916..dda3b1e7c9 100644
--- a/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php
+++ b/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php
@@ -22,7 +22,7 @@ declare(strict_types=1);
 
 namespace Tests\Feature\Controllers\Json;
 
-use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
+
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Bill;
@@ -58,344 +58,28 @@ class AutoCompleteControllerTest extends TestCase
     }
 
     /**
+     * Request a list of asset accounts
+     *
      * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
      */
-    public function testAllAccounts(): void
+    public function testAccounts(): void
     {
-        // mock stuff
-        $accountA     = factory(Account::class)->make();
-        $collection   = new Collection([$accountA]);
         $accountRepos = $this->mock(AccountRepositoryInterface::class);
-        $accountRepos->shouldReceive('getAccountsByType')
-                     ->withArgs(
-                         [[AccountType::REVENUE, AccountType::EXPENSE, AccountType::BENEFICIARY, AccountType::DEFAULT, AccountType::ASSET, AccountType::LOAN,
-                           AccountType::DEBT, AccountType::MORTGAGE]]
-                     )
-                     ->andReturn($collection);
+        $account      = $this->getRandomAsset();
+        $euro         = $this->getEuro();
+
+
+
+        $accountRepos->shouldReceive('searchAccount')->atLeast()->once()->andReturn(new Collection([$account]));
+        $accountRepos->shouldReceive('getAccountCurrency')->atLeast()->once()->andReturn($euro);
+        $this->mockDefaultSession();
 
         $this->be($this->user());
-        $response = $this->get(route('json.autocomplete', ['all-accounts']));
+        $httpQuery = http_build_query(['types' => AccountType::ASSET]);
+        $response  = $this->get(route('json.autocomplete.accounts') . '?' . $httpQuery);
         $response->assertStatus(200);
-        $response->assertExactJson([$accountA->name]);
-
+        $response->assertSee($account->name);
     }
 
-    /**
-     * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
-     */
-    public function testAllTransactionJournals(): void
-    {
-        $this->markTestIncomplete('Needs to be rewritten for v4.8.0');
 
-        return;
-        $transaction              = new Transaction();
-        $transaction->description = 'hi there';
-        $collection               = new Collection([$transaction]);
-
-        $collector = $this->mock(TransactionCollectorInterface::class);
-        $collector->shouldReceive('setLimit')->withArgs([250])->andReturnSelf();
-        $collector->shouldReceive('setPage')->withArgs([1])->andReturnSelf();
-        $collector->shouldReceive('getTransactions')->andReturn($collection);
-
-        $this->be($this->user());
-        $response = $this->get(route('json.all-transaction-journals'));
-        $response->assertStatus(200);
-    }
-
-    /**
-     * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
-     */
-    public function testAllTransactionJournalsSearch(): void
-    {
-        $this->markTestIncomplete('Needs to be rewritten for v4.8.0');
-
-        return;
-        $transaction              = new Transaction();
-        $transaction->description = 'hi there';
-        $collection               = new Collection([$transaction]);
-
-        $collector = $this->mock(TransactionCollectorInterface::class);
-        $collector->shouldReceive('setLimit')->withArgs([250])->andReturnSelf();
-        $collector->shouldReceive('setPage')->withArgs([1])->andReturnSelf();
-        $collector->shouldReceive('getTransactions')->andReturn($collection);
-
-        $this->be($this->user());
-        $response = $this->get(route('json.all-transaction-journals') . '?search=hi');
-        $response->assertStatus(200);
-    }
-
-    /**
-     * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
-     */
-    public function testAssetAccounts(): void
-    {
-        // mock stuff
-        $accountA     = factory(Account::class)->make();
-        $collection   = new Collection([$accountA]);
-        $accountRepos = $this->mock(AccountRepositoryInterface::class);
-        $accountRepos->shouldReceive('getAccountsByType')
-                     ->withArgs([[AccountType::ASSET, AccountType::DEFAULT]])->andReturn($collection);
-
-        $this->be($this->user());
-        $response = $this->get(route('json.autocomplete', ['asset-accounts']));
-        $response->assertStatus(200);
-        $response->assertExactJson([$accountA->name]);
-
-    }
-
-    /**
-     * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
-     */
-    public function testBills(): void
-    {
-        $repository = $this->mock(BillRepositoryInterface::class);
-        $bills      = factory(Bill::class, 10)->make();
-
-        $repository->shouldReceive('getActiveBills')->andReturn($bills);
-
-        $this->be($this->user());
-        $response = $this->get(route('json.autocomplete', ['bills']));
-        $response->assertStatus(200);
-    }
-
-    /**
-     * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
-     */
-    public function testBillsSearch(): void
-    {
-        $repository = $this->mock(BillRepositoryInterface::class);
-        $bills      = factory(Bill::class, 10)->make();
-
-        $repository->shouldReceive('getActiveBills')->andReturn($bills);
-
-        $this->be($this->user());
-        $response = $this->get(route('json.autocomplete', ['bills']) . '?search=1234');
-        $response->assertStatus(200);
-    }
-
-    /**
-     * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
-     */
-    public function testBudgets(): void
-    {
-        // mock stuff
-        $budget        = factory(Budget::class)->make();
-        $categoryRepos = $this->mock(BudgetRepositoryInterface::class);
-        $journalRepos  = $this->mock(JournalRepositoryInterface::class);
-        $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
-        $categoryRepos->shouldReceive('getBudgets')->andReturn(new Collection([$budget]));
-        $this->be($this->user());
-        $response = $this->get(route('json.autocomplete', ['budgets']));
-        $response->assertStatus(200);
-        $response->assertExactJson([$budget->name]);
-    }
-
-    /**
-     * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
-     */
-    public function testCategories(): void
-    {
-        // mock stuff
-        $category      = factory(Category::class)->make();
-        $categoryRepos = $this->mock(CategoryRepositoryInterface::class);
-        $journalRepos  = $this->mock(JournalRepositoryInterface::class);
-        $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
-        $categoryRepos->shouldReceive('getCategories')->andReturn(new Collection([$category]));
-        $this->be($this->user());
-        $response = $this->get(route('json.autocomplete', ['categories']));
-        $response->assertStatus(200);
-        $response->assertExactJson([$category->name]);
-    }
-
-    /**
-     * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
-     */
-    public function testCurrencyNames(): void
-    {
-        $repository = $this->mock(CurrencyRepositoryInterface::class);
-
-        $currency = TransactionCurrency::find(1);
-        $repository->shouldReceive('get')->andReturn(new Collection([$currency]))->once();
-
-        $this->be($this->user());
-        $response = $this->get(route('json.autocomplete', ['currency-names']));
-        $response->assertStatus(200);
-        $response->assertExactJson(['Euro']);
-    }
-
-    /**
-     * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
-     */
-    public function testExpenseAccounts(): void
-    {
-        // mock stuff
-        $accountA         = factory(Account::class)->make();
-        $accountB         = factory(Account::class)->make();
-        $accountA->active = true;
-        $accountB->active = false;
-        $collection       = new Collection([$accountA, $accountB]);
-        $accountRepos     = $this->mock(AccountRepositoryInterface::class);
-        $journalRepos     = $this->mock(JournalRepositoryInterface::class);
-        $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
-        $accountRepos->shouldReceive('getAccountsByType')->withArgs([[AccountType::EXPENSE, AccountType::BENEFICIARY]])->once()->andReturn($collection);
-
-        $this->be($this->user());
-        $response = $this->get(route('json.autocomplete', ['expense-accounts']));
-        $response->assertStatus(200);
-        $response->assertExactJson([$accountA->name]);
-    }
-
-    /**
-     * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
-     */
-    public function testJournalsWithId(): void
-    {
-        $this->markTestIncomplete('Needs to be rewritten for v4.8.0');
-
-        return;
-        $journal             = $this->user()->transactionJournals()->where('id', '!=', 1)->first();
-        $journal->journal_id = $journal->id;
-        $collection          = new Collection([$journal]);
-        $collector           = $this->mock(TransactionCollectorInterface::class);
-        $collector->shouldReceive('setLimit')->withArgs([400])->andReturnSelf();
-        $collector->shouldReceive('setPage')->withArgs([1])->andReturnSelf();
-        $collector->shouldReceive('getTransactions')->andReturn($collection);
-
-        $this->be($this->user());
-        $response = $this->get(route('json.journals-with-id', [1]));
-        $response->assertStatus(200);
-        $response->assertExactJson([['id' => $journal->id, 'name' => $journal->id . ': ' . $journal->description]]);
-    }
-
-    /**
-     * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
-     */
-    public function testJournalsWithIdSearch(): void
-    {
-        $this->markTestIncomplete('Needs to be rewritten for v4.8.0');
-
-        return;
-        $journal             = $this->user()->transactionJournals()->where('id', '!=', 1)->first();
-        $journal->journal_id = $journal->id;
-        $collection          = new Collection([$journal]);
-        $collector           = $this->mock(TransactionCollectorInterface::class);
-        $collector->shouldReceive('setLimit')->withArgs([400])->andReturnSelf();
-        $collector->shouldReceive('setPage')->withArgs([1])->andReturnSelf();
-        $collector->shouldReceive('getTransactions')->andReturn($collection);
-
-        $this->be($this->user());
-        $response = $this->get(route('json.journals-with-id', [1]) . '?search=a');
-        $response->assertStatus(200);
-        $response->assertExactJson([['id' => $journal->id, 'name' => $journal->id . ': ' . $journal->description]]);
-    }
-
-    /**
-     * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
-     */
-    public function testRevenueAccounts(): void
-    {
-        // mock stuff
-        $accountA         = factory(Account::class)->make();
-        $accountB         = factory(Account::class)->make();
-        $accountA->active = true;
-        $accountB->active = false;
-        $collection       = new Collection([$accountA, $accountB]);
-        $accountRepos     = $this->mock(AccountRepositoryInterface::class);
-        $journalRepos     = $this->mock(JournalRepositoryInterface::class);
-        $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
-        $accountRepos->shouldReceive('getAccountsByType')->withArgs([[AccountType::REVENUE]])->once()->andReturn($collection);
-
-        $this->be($this->user());
-        $response = $this->get(route('json.autocomplete', ['revenue-accounts']));
-        $response->assertStatus(200);
-        $response->assertExactJson([$accountA->name]);
-    }
-
-    /**
-     * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
-     */
-    public function testTags(): void
-    {
-        // mock stuff
-        $tag          = factory(Tag::class)->make();
-        $tagRepos     = $this->mock(TagRepositoryInterface::class);
-        $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
-        $tagRepos->shouldReceive('get')->andReturn(new Collection([$tag]))->once();
-
-        $this->be($this->user());
-        $response = $this->get(route('json.autocomplete', ['tags']));
-        $response->assertStatus(200);
-        $response->assertExactJson([$tag->tag]);
-    }
-
-    /**
-     * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
-     */
-    public function testTransactionJournals(): void
-    {
-        $this->markTestIncomplete('Needs to be rewritten for v4.8.0');
-
-        return;
-        $transaction              = new Transaction();
-        $transaction->description = 'hi there';
-        $collection               = new Collection([$transaction]);
-
-        // mock stuff
-        $collector    = $this->mock(TransactionCollectorInterface::class);
-        $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
-        $collector->shouldReceive('setTypes')->andReturnSelf();
-        $collector->shouldReceive('setLimit')->andReturnSelf();
-        $collector->shouldReceive('setPage')->andReturnSelf();
-        $collector->shouldReceive('getTransactions')->andReturn($collection);
-
-        $this->be($this->user());
-        $response = $this->get(route('json.transaction-journals', ['deposit']));
-        $response->assertStatus(200);
-        $response->assertExactJson(['hi there']);
-    }
-
-    /**
-     * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
-     */
-    public function testTransactionJournalsSearch(): void
-    {
-        $this->markTestIncomplete('Needs to be rewritten for v4.8.0');
-
-        return;
-        $transaction              = new Transaction();
-        $transaction->description = 'hi there';
-        $collection               = new Collection([$transaction]);
-
-        // mock stuff
-        $collector    = $this->mock(TransactionCollectorInterface::class);
-        $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
-        $collector->shouldReceive('setTypes')->andReturnSelf();
-        $collector->shouldReceive('setLimit')->andReturnSelf();
-        $collector->shouldReceive('setPage')->andReturnSelf();
-        $collector->shouldReceive('getTransactions')->andReturn($collection);
-
-        $this->be($this->user());
-        $response = $this->get(route('json.transaction-journals', ['deposit']) . '?search=hi');
-        $response->assertStatus(200);
-        $response->assertExactJson(['hi there']);
-    }
-
-    /**
-     * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
-     */
-    public function testTransactionTypes(): void
-    {
-        // mock stuff
-        $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
-        $journalRepos->shouldReceive('getTransactionTypes')->once()->andReturn(new Collection);
-
-        $this->be($this->user());
-        $response = $this->get(route('json.autocomplete', ['transaction_types']));
-        $response->assertStatus(200);
-        $response->assertExactJson([]);
-    }
 }
diff --git a/tests/Feature/Controllers/Json/BoxControllerTest.php b/tests/Feature/Controllers/Json/BoxControllerTest.php
index 38a6cef888..d465474401 100644
--- a/tests/Feature/Controllers/Json/BoxControllerTest.php
+++ b/tests/Feature/Controllers/Json/BoxControllerTest.php
@@ -22,8 +22,10 @@ declare(strict_types=1);
 
 namespace Tests\Feature\Controllers\Json;
 
+use Amount;
 use Carbon\Carbon;
-use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
+use FireflyIII\Helpers\Collector\GroupCollectorInterface;
+
 use FireflyIII\Helpers\Report\NetWorthInterface;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
@@ -34,6 +36,7 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use Illuminate\Support\Collection;
 use Log;
 use Mockery;
+use Preferences;
 use Tests\TestCase;
 
 /**
@@ -63,6 +66,10 @@ class BoxControllerTest extends TestCase
         $repository    = $this->mock(BudgetRepositoryInterface::class);
         $currencyRepos = $this->mock(CurrencyRepositoryInterface::class);
 
+        $this->mockDefaultSession();
+        Preferences::shouldReceive('lastActivity')->atLeast()->once()->andReturn('md512345');
+        Amount::shouldReceive('formatAnything')->atLeast()->once()->andReturn('-100');
+
         $repository->shouldReceive('getAvailableBudget')->andReturn('1000');
         $repository->shouldReceive('getActiveBudgets')->andReturn(new Collection);
         $repository->shouldReceive('collectBudgetInformation')->andReturn($return);
@@ -86,6 +93,11 @@ class BoxControllerTest extends TestCase
         $repository    = $this->mock(BudgetRepositoryInterface::class);
         $currencyRepos = $this->mock(CurrencyRepositoryInterface::class);
 
+        $this->mockDefaultSession();
+        Preferences::shouldReceive('lastActivity')->atLeast()->once()->andReturn('md512345');
+        Amount::shouldReceive('formatAnything')->atLeast()->once()->andReturn('-100');
+
+
         $repository->shouldReceive('getAvailableBudget')->andReturn('1000');
         $repository->shouldReceive('getActiveBudgets')->andReturn(new Collection);
         $repository->shouldReceive('collectBudgetInformation')->andReturn($return);
@@ -101,21 +113,21 @@ class BoxControllerTest extends TestCase
      */
     public function testBalance(): void
     {
-        $this->markTestIncomplete('Needs to be rewritten for v4.8.0');
-
-        return;
         $accountRepos  = $this->mock(AccountRepositoryInterface::class);
-        $collector     = $this->mock(TransactionCollectorInterface::class);
+        $collector     = $this->mock(GroupCollectorInterface::class);
         $currencyRepos = $this->mock(CurrencyRepositoryInterface::class);
 
+        $this->mockDefaultSession();
+        Preferences::shouldReceive('lastActivity')->atLeast()->once()->andReturn('md512345');
+        Amount::shouldReceive('formatAnything')->atLeast()->once()->andReturn('-100');
 
         // try a collector for income:
 
-        $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf();
-        $collector->shouldReceive('setRange')->andReturnSelf();
-        $collector->shouldReceive('setTypes')->andReturnSelf();
-        $collector->shouldReceive('withOpposingAccount')->andReturnSelf();
-        $collector->shouldReceive('getTransactions')->andReturn(new Collection);
+        //$collector->shouldReceive('setAllAssetAccounts')->andReturnSelf()->atLeast()->once();
+        $collector->shouldReceive('setRange')->andReturnSelf()->atLeast()->once();
+        $collector->shouldReceive('setTypes')->andReturnSelf()->atLeast()->once();
+        //$collector->shouldReceive('withOpposingAccount')->andReturnSelf()->atLeast()->once();
+        $collector->shouldReceive('getExtractedJournals')->andReturn([])->atLeast()->once();
 
         $this->be($this->user());
         $response = $this->get(route('json.box.balance'));
@@ -127,26 +139,25 @@ class BoxControllerTest extends TestCase
      */
     public function testBalanceTransactions(): void
     {
-        $this->markTestIncomplete('Needs to be rewritten for v4.8.0');
-
-        return;
-        $transaction                          = new Transaction;
-        $transaction->transaction_currency_id = 1;
-        $transaction->transaction_amount      = '5';
-
+        $withdrawal = $this->getRandomWithdrawalAsArray();
         $accountRepos  = $this->mock(AccountRepositoryInterface::class);
-        $collector     = $this->mock(TransactionCollectorInterface::class);
+        $collector     = $this->mock(GroupCollectorInterface::class);
         $currencyRepos = $this->mock(CurrencyRepositoryInterface::class);
+        $euro =$this->getEuro();
 
-        $currencyRepos->shouldReceive('findNull')->withArgs([1])->andReturn(TransactionCurrency::find(1))->atLeast()->once();
-
+        $this->mockDefaultSession();
+        Preferences::shouldReceive('lastActivity')->atLeast()->once()->andReturn('md512345');
+        Amount::shouldReceive('formatAnything')->atLeast()->once()->andReturn('-100');
 
         // try a collector for income:
-        $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf();
-        $collector->shouldReceive('setRange')->andReturnSelf();
-        $collector->shouldReceive('setTypes')->andReturnSelf();
-        $collector->shouldReceive('withOpposingAccount')->andReturnSelf();
-        $collector->shouldReceive('getTransactions')->andReturn(new Collection([$transaction]));
+
+        //$collector->shouldReceive('setAllAssetAccounts')->andReturnSelf()->atLeast()->once();
+        $collector->shouldReceive('setRange')->andReturnSelf()->atLeast()->once();
+        $collector->shouldReceive('setTypes')->andReturnSelf()->atLeast()->once();
+        //$collector->shouldReceive('withOpposingAccount')->andReturnSelf()->atLeast()->once();
+        $collector->shouldReceive('getExtractedJournals')->andReturn([$withdrawal])->atLeast()->once();
+
+        $currencyRepos->shouldReceive('findNull')->atLeast()->once()->andReturn($euro);
 
         $this->be($this->user());
         $response = $this->get(route('json.box.balance'));
diff --git a/tests/Feature/Controllers/Json/ExchangeControllerTest.php b/tests/Feature/Controllers/Json/ExchangeControllerTest.php
index d8420d4c19..d053dc69b3 100644
--- a/tests/Feature/Controllers/Json/ExchangeControllerTest.php
+++ b/tests/Feature/Controllers/Json/ExchangeControllerTest.php
@@ -55,6 +55,9 @@ class ExchangeControllerTest extends TestCase
     {
         $repository   = $this->mock(CurrencyRepositoryInterface::class);
         $fiscalHelper = $this->mock(FiscalHelperInterface::class);
+
+        $this->mockDefaultSession();
+
         $date         = new Carbon;
         $fiscalHelper->shouldReceive('endOfFiscalYear')->atLeast()->once()->andReturn($date);
         $fiscalHelper->shouldReceive('startOfFiscalYear')->atLeast()->once()->andReturn($date);
diff --git a/tests/Feature/Controllers/Json/FrontpageControllerTest.php b/tests/Feature/Controllers/Json/FrontpageControllerTest.php
index 3f6879966b..a19d33ebff 100644
--- a/tests/Feature/Controllers/Json/FrontpageControllerTest.php
+++ b/tests/Feature/Controllers/Json/FrontpageControllerTest.php
@@ -50,6 +50,8 @@ class FrontpageControllerTest extends TestCase
      */
     public function testPiggyBanks(): void
     {
+        $this->mockDefaultSession();
+
         $piggy      = $this->user()->piggyBanks()->first();
         $repository = $this->mock(PiggyBankRepositoryInterface::class);
         $repository->shouldReceive('getPiggyBanks')->andReturn(new Collection([$piggy]));
diff --git a/tests/Feature/Controllers/Json/IntroControllerTest.php b/tests/Feature/Controllers/Json/IntroControllerTest.php
index 8af6baeccd..21c792b35a 100644
--- a/tests/Feature/Controllers/Json/IntroControllerTest.php
+++ b/tests/Feature/Controllers/Json/IntroControllerTest.php
@@ -24,6 +24,7 @@ namespace Tests\Feature\Controllers\Json;
 
 use Log;
 use Tests\TestCase;
+use Preferences;
 
 /**
  * Class IntroControllerTest
@@ -48,6 +49,7 @@ class IntroControllerTest extends TestCase
      */
     public function testGetIntroSteps(): void
     {
+        $this->mockDefaultSession();
         $this->be($this->user());
         $response = $this->get(route('json.intro', ['index']));
         $response->assertStatus(200);
@@ -58,6 +60,7 @@ class IntroControllerTest extends TestCase
      */
     public function testGetIntroStepsAsset(): void
     {
+        $this->mockDefaultSession();
         $this->be($this->user());
         $response = $this->get(route('json.intro', ['accounts_create', 'asset']));
         $response->assertStatus(200);
@@ -68,6 +71,7 @@ class IntroControllerTest extends TestCase
      */
     public function testGetIntroStepsOutro(): void
     {
+        $this->mockDefaultSession();
         $this->be($this->user());
         $response = $this->get(route('json.intro', ['reports_report', 'category']));
         $response->assertStatus(200);
@@ -78,6 +82,10 @@ class IntroControllerTest extends TestCase
      */
     public function testPostEnable(): void
     {
+        $this->mockDefaultSession();
+
+        Preferences::shouldReceive('set')->withArgs(['shown_demo_accounts_create_asset', false])->atLeast()->once();
+
         $this->be($this->user());
         $response = $this->post(route('json.intro.enable', ['accounts_create', 'asset']));
         $response->assertStatus(200);
@@ -88,6 +96,10 @@ class IntroControllerTest extends TestCase
      */
     public function testPostFinished(): void
     {
+        $this->mockDefaultSession();
+
+        Preferences::shouldReceive('set')->withArgs(['shown_demo_accounts_create_asset', true])->atLeast()->once();
+
         $this->be($this->user());
         $response = $this->post(route('json.intro.finished', ['accounts_create', 'asset']));
         $response->assertStatus(200);
diff --git a/tests/Feature/Controllers/Json/ReconcileControllerTest.php b/tests/Feature/Controllers/Json/ReconcileControllerTest.php
index b9e936e548..d4902ff397 100644
--- a/tests/Feature/Controllers/Json/ReconcileControllerTest.php
+++ b/tests/Feature/Controllers/Json/ReconcileControllerTest.php
@@ -24,19 +24,20 @@ declare(strict_types=1);
 namespace Tests\Feature\Controllers\Json;
 
 
+use Amount;
 use Carbon\Carbon;
-use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
+use FireflyIII\Helpers\Collector\GroupCollectorInterface;
+
 use FireflyIII\Helpers\Fiscal\FiscalHelperInterface;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
-use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
 use Illuminate\Support\Collection;
 use Log;
 use Mockery;
+use Preferences;
 use Tests\TestCase;
 
 /**
@@ -61,73 +62,44 @@ class ReconcileControllerTest extends TestCase
      */
     public function testOverview(): void
     {
-        $this->markTestIncomplete('Needs to be rewritten for v4.8.0');
-
-        return;
-        $accountRepos   = $this->mock(AccountRepositoryInterface::class);
-        $currencyRepos  = $this->mock(CurrencyRepositoryInterface::class);
-        $recurringRepos = $this->mock(RecurringRepositoryInterface::class);
-        $collector      = $this->mock(TransactionCollectorInterface::class);
-        $transactions   = $this->user()->transactions()->inRandomOrder()->take(3)->get();
-        $transactions   = $transactions->each(
-            function (Transaction $transaction) {
-                $transaction->transaction_amount = '5';
-            }
-        );
-        $repository     = $this->mock(JournalRepositoryInterface::class);
-        $repository->shouldReceive('firstNull')->andReturn(new TransactionJournal);
-        $repository->shouldReceive('getTransactionsById')->andReturn($transactions)->twice();
-
+        $this->mock(CurrencyRepositoryInterface::class);
+        $this->mock(RecurringRepositoryInterface::class);
+        $this->mockDefaultSession();
+        $accountRepos = $this->mock(AccountRepositoryInterface::class);
+        $collector    = $this->mock(GroupCollectorInterface::class);
         $fiscalHelper = $this->mock(FiscalHelperInterface::class);
+        $euro         = $this->getEuro();
+        $withdrawal   = $this->getRandomWithdrawalAsArray();
         $date         = new Carbon;
+        $account      = $this->user()->accounts()->where('id', $withdrawal['source_account_id'])->first();
+
+        // make sure it falls into the current range
+        $withdrawal['date'] = new Carbon('2017-01-30');
+
+        $accountRepos->shouldReceive('getAccountCurrency')->atLeast()->once()->andReturn($euro);
+
+        $collector->shouldReceive('setJournalIds')->atLeast()->once()->andReturnSelf();
+        $collector->shouldReceive('getExtractedJournals')->atLeast()->once()->andReturn([$withdrawal]);
+
+        Amount::shouldReceive('formatAnything')->andReturn('-100');
+        Amount::shouldReceive('getDefaultCurrency')->andReturn($euro);
+
+
         $fiscalHelper->shouldReceive('endOfFiscalYear')->atLeast()->once()->andReturn($date);
         $fiscalHelper->shouldReceive('startOfFiscalYear')->atLeast()->once()->andReturn($date);
 
-        $accountRepos->shouldReceive('findNull')->andReturn($this->getRandomAsset())->atLeast()->once();
-        $accountRepos->shouldReceive('getMetaValue')->atLeast()->once()->andReturn(1);
-
         $parameters = [
             'startBalance' => '0',
             'endBalance'   => '10',
-            'transactions' => [1, 2, 3],
-            'cleared'      => [4, 5, 6],
-        ];
-        $this->be($this->user());
-        $response = $this->get(route('accounts.reconcile.overview', [1, '20170101', '20170131']) . '?' . http_build_query($parameters));
-        $response->assertStatus(200);
-    }
-
-    /**
-     * Test overview when it's not an asset.
-     *
-     * @covers                   \FireflyIII\Http\Controllers\Json\ReconcileController
-     */
-    public function testOverviewNotAsset(): void
-    {
-        $this->markTestIncomplete('Needs to be rewritten for v4.8.0');
-
-        return;
-        $accountRepos   = $this->mock(AccountRepositoryInterface::class);
-        $currencyRepos  = $this->mock(CurrencyRepositoryInterface::class);
-        $recurringRepos = $this->mock(RecurringRepositoryInterface::class);
-        $fiscalHelper   = $this->mock(FiscalHelperInterface::class);
-        $collector      = $this->mock(TransactionCollectorInterface::class);
-        $date           = new Carbon;
-        $fiscalHelper->shouldReceive('endOfFiscalYear')->atLeast()->once()->andReturn($date);
-        $fiscalHelper->shouldReceive('startOfFiscalYear')->atLeast()->once()->andReturn($date);
-        $account    = $this->user()->accounts()->where('account_type_id', '!=', 3)->first();
-        $parameters = [
-            'startBalance' => '0',
-            'endBalance'   => '10',
-            'transactions' => [1, 2, 3],
+            'journals'     => [1, 2, 3],
             'cleared'      => [4, 5, 6],
         ];
         $this->be($this->user());
         $response = $this->get(route('accounts.reconcile.overview', [$account->id, '20170101', '20170131']) . '?' . http_build_query($parameters));
-        $response->assertStatus(500);
+        $response->assertStatus(200);
+        $response->assertSee('-100');
     }
 
-
     /**
      * List transactions for reconciliation view.
      *
@@ -135,56 +107,38 @@ class ReconcileControllerTest extends TestCase
      */
     public function testTransactions(): void
     {
-        $this->markTestIncomplete('Needs to be rewritten for v4.8.0');
+        $this->mock(RecurringRepositoryInterface::class);
+        $this->mockDefaultSession();
 
-        return;
         $repository     = $this->mock(CurrencyRepositoryInterface::class);
         $accountRepos   = $this->mock(AccountRepositoryInterface::class);
-        $recurringRepos = $this->mock(RecurringRepositoryInterface::class);
         $fiscalHelper   = $this->mock(FiscalHelperInterface::class);
-        $collector      = $this->mock(TransactionCollectorInterface::class);
+        $collector      = $this->mock(GroupCollectorInterface::class);
         $date           = new Carbon;
+        $euro =$this->getEuro();
+        $withdrawal = $this->getRandomWithdrawalAsArray();
+
+
+        $accountRepos->shouldReceive('getAccountCurrency')->atLeast()->once()->andReturn($euro);
+        Preferences::shouldReceive('lastActivity')->atLeast()->once()->andReturn('md512345');
+        Amount::shouldReceive('formatAnything')->andReturn('-100');
+
         $fiscalHelper->shouldReceive('endOfFiscalYear')->atLeast()->once()->andReturn($date);
         $fiscalHelper->shouldReceive('startOfFiscalYear')->atLeast()->once()->andReturn($date);
         $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1')->atLeast()->once();
-        $repository->shouldReceive('findNull')->once()->andReturn(TransactionCurrency::find(1));
+
 
         $collector->shouldReceive('setAccounts')->atLeast()->once()->andReturnSelf();
         $collector->shouldReceive('setRange')->atLeast()->once()->andReturnSelf();
         $collector->shouldReceive('withBudgetInformation')->atLeast()->once()->andReturnSelf();
-        $collector->shouldReceive('withOpposingAccount')->atLeast()->once()->andReturnSelf();
+        $collector->shouldReceive('withAccountInformation')->atLeast()->once()->andReturnSelf();
         $collector->shouldReceive('withCategoryInformation')->atLeast()->once()->andReturnSelf();
-        $collector->shouldReceive('getTransactions')->atLeast()->once()->andReturn(new Collection);
+        $collector->shouldReceive('getExtractedJournals')->atLeast()->once()->andReturn([$withdrawal]);
 
 
         $this->be($this->user());
         $response = $this->get(route('accounts.reconcile.transactions', [1, '20170101', '20170131']));
         $response->assertStatus(200);
+        $response->assertSee('-100');
     }
-
-    /**
-     * @covers \FireflyIII\Http\Controllers\Json\ReconcileController
-     */
-    public function testTransactionsInitialBalance(): void
-    {
-        $this->markTestIncomplete('Needs to be rewritten for v4.8.0');
-
-        return;
-        $accountRepos   = $this->mock(AccountRepositoryInterface::class);
-        $currencyRepos  = $this->mock(CurrencyRepositoryInterface::class);
-        $recurringRepos = $this->mock(RecurringRepositoryInterface::class);
-        $fiscalHelper   = $this->mock(FiscalHelperInterface::class);
-        $collector      = $this->mock(TransactionCollectorInterface::class);
-        $date           = new Carbon;
-        $fiscalHelper->shouldReceive('endOfFiscalYear')->atLeast()->once()->andReturn($date);
-        $fiscalHelper->shouldReceive('startOfFiscalYear')->atLeast()->once()->andReturn($date);
-
-        $transaction = Transaction::leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
-                                  ->where('accounts.user_id', $this->user()->id)->where('accounts.account_type_id', 6)->first(['account_id']);
-        $this->be($this->user());
-        $response = $this->get(route('accounts.reconcile.transactions', [$transaction->account_id, '20170101', '20170131']));
-        $response->assertStatus(302);
-    }
-
-
 }
diff --git a/tests/Feature/Controllers/Json/RecurrenceControllerTest.php b/tests/Feature/Controllers/Json/RecurrenceControllerTest.php
index 80a0167141..f20f7976ae 100644
--- a/tests/Feature/Controllers/Json/RecurrenceControllerTest.php
+++ b/tests/Feature/Controllers/Json/RecurrenceControllerTest.php
@@ -53,7 +53,7 @@ class RecurrenceControllerTest extends TestCase
     public function testEventsNdom(): void
     {
         $repository = $this->mock(RecurringRepositoryInterface::class);
-
+        $this->mockDefaultSession();
         // collection of dates:
         $dates = [new Carbon('2018-01-01'), new Carbon('2018-01-07')];
         $repository->shouldReceive('getOccurrencesInRange')->withAnyArgs()->once()
@@ -106,6 +106,7 @@ class RecurrenceControllerTest extends TestCase
     public function testEventsNumberOfEvents(): void
     {
         $repository = $this->mock(RecurringRepositoryInterface::class);
+        $this->mockDefaultSession();
 
         // collection of dates:
         $dates = [new Carbon('2018-01-01'), new Carbon('2018-01-07')];
@@ -158,7 +159,8 @@ class RecurrenceControllerTest extends TestCase
      */
     public function testEventsStartAfterEnd(): void
     {
-        $repository = $this->mock(RecurringRepositoryInterface::class);
+        $this->mock(RecurringRepositoryInterface::class);
+        $this->mockDefaultSession();
 
         $parameters = [
             'start'      => '2018-01-01',
@@ -182,6 +184,7 @@ class RecurrenceControllerTest extends TestCase
     public function testEventsUntilDate(): void
     {
         $repository = $this->mock(RecurringRepositoryInterface::class);
+        $this->mockDefaultSession();
 
         // collection of dates:
         $dates = [new Carbon('2018-01-01'), new Carbon('2018-01-07')];
@@ -235,6 +238,7 @@ class RecurrenceControllerTest extends TestCase
     public function testEventsWeeklyMonday(): void
     {
         $repository = $this->mock(RecurringRepositoryInterface::class);
+        $this->mockDefaultSession();
 
         // collection of dates:
         $dates = [new Carbon('2018-01-01'), new Carbon('2018-01-07')];
@@ -288,6 +292,7 @@ class RecurrenceControllerTest extends TestCase
     public function testEventsYearly(): void
     {
         $repository = $this->mock(RecurringRepositoryInterface::class);
+        $this->mockDefaultSession();
 
         // collection of dates:
         $dates = [new Carbon('2018-01-01'), new Carbon('2018-01-07')];
@@ -338,7 +343,8 @@ class RecurrenceControllerTest extends TestCase
      */
     public function testSuggest(): void
     {
-        $repository = $this->mock(RecurringRepositoryInterface::class);
+        $this->mock(RecurringRepositoryInterface::class);
+        $this->mockDefaultSession();
 
         $this->be($this->user());
 
diff --git a/tests/Feature/Controllers/Popup/ReportControllerTest.php b/tests/Feature/Controllers/Popup/ReportControllerTest.php
index b3e7dc7a0f..d6753a53d7 100644
--- a/tests/Feature/Controllers/Popup/ReportControllerTest.php
+++ b/tests/Feature/Controllers/Popup/ReportControllerTest.php
@@ -22,6 +22,7 @@ declare(strict_types=1);
 
 namespace Tests\Feature\Controllers\Popup;
 
+use Amount;
 use Carbon\Carbon;
 use FireflyIII\Helpers\Report\PopupReportInterface;
 use FireflyIII\Models\Account;
@@ -53,11 +54,15 @@ class ReportControllerTest extends TestCase
     }
 
     /**
-     * @covers                   \FireflyIII\Http\Controllers\Popup\ReportController
+     * @covers \FireflyIII\Http\Controllers\Popup\ReportController
      */
     public function testBadEndDate(): void
     {
-        $popupReport = $this->mock(PopupReportInterface::class);
+        $this->mock(PopupReportInterface::class);
+
+        $this->mockDefaultSession();
+
+
         $this->be($this->user());
         $arguments = [
             'attributes' => [
@@ -73,17 +78,19 @@ class ReportControllerTest extends TestCase
         $uri       = route('popup.general') . '?' . http_build_query($arguments);
         $response  = $this->get($uri);
         $response->assertStatus(200);
+        $response->assertSee('Firefly III cannot handle');
     }
 
     /**
-     * @covers                   \FireflyIII\Http\Controllers\Popup\ReportController
-     * @expectedExceptionMessage Could not parse start date
+     * @covers \FireflyIII\Http\Controllers\Popup\ReportController
      */
     public function testBadStartDate(): void
     {
-        $popupReport = $this->mock(PopupReportInterface::class);
+        $this->mock(PopupReportInterface::class);
 
         $this->be($this->user());
+        $this->mockDefaultSession();
+
         $arguments = [
             'attributes' => [
                 'location'   => 'bla-bla',
@@ -98,6 +105,7 @@ class ReportControllerTest extends TestCase
         $uri       = route('popup.general') . '?' . http_build_query($arguments);
         $response  = $this->get($uri);
         $response->assertStatus(200);
+        $response->assertSee('Firefly III cannot handle');
     }
 
     /**
@@ -105,15 +113,20 @@ class ReportControllerTest extends TestCase
      */
     public function testBalanceAmountDefaultNoBudget(): void
     {
-        $categoryRepos = $this->mock(CategoryRepositoryInterface::class);
-        $accountRepos  = $this->mock(AccountRepositoryInterface::class);
-        $budgetRepos   = $this->mock(BudgetRepositoryInterface::class);
-        $popupHelper   = $this->mock(PopupReportInterface::class);
-        $account       = factory(Account::class)->make();
-        $popupHelper->shouldReceive('balanceForNoBudget')->andReturn(new Collection);
+        $this->mock(CategoryRepositoryInterface::class);
+        $accountRepos = $this->mock(AccountRepositoryInterface::class);
+        $budgetRepos  = $this->mock(BudgetRepositoryInterface::class);
+        $popupHelper  = $this->mock(PopupReportInterface::class);
+        $account      = $this->getRandomAsset();
+
+        $this->mockDefaultSession();
+
+        $popupHelper->shouldReceive('balanceForNoBudget')->andReturn([]);
         $budgetRepos->shouldReceive('findNull')->andReturn(new Budget)->once()->withArgs([0]);
         $accountRepos->shouldReceive('findNull')->andReturn($account)->once()->withArgs([1]);
-        $popupHelper->shouldReceive('balanceForBudget')->once()->andReturn(new Collection);
+        $popupHelper->shouldReceive('balanceForBudget')->once()->andReturn([]);
+
+        Amount::shouldReceive('formatAnything')->andReturn('-100');
 
         $this->be($this->user());
         $arguments = [
@@ -131,6 +144,7 @@ class ReportControllerTest extends TestCase
         $uri       = route('popup.general') . '?' . http_build_query($arguments);
         $response  = $this->get($uri);
         $response->assertStatus(200);
+        $response->assertSee($account->name);
     }
 
     /**
@@ -138,16 +152,18 @@ class ReportControllerTest extends TestCase
      */
     public function testBalanceAmountDefaultRole(): void
     {
-        $categoryRepos = $this->mock(CategoryRepositoryInterface::class);
-        $accountRepos  = $this->mock(AccountRepositoryInterface::class);
-        $budgetRepos   = $this->mock(BudgetRepositoryInterface::class);
-        $popupHelper   = $this->mock(PopupReportInterface::class);
-        $budget        = factory(Budget::class)->make();
-        $account       = factory(Account::class)->make();
+        $this->mock(CategoryRepositoryInterface::class);
+        $accountRepos = $this->mock(AccountRepositoryInterface::class);
+        $budgetRepos  = $this->mock(BudgetRepositoryInterface::class);
+        $popupHelper  = $this->mock(PopupReportInterface::class);
+        $account      = $this->getRandomAsset();
+        $budget       = $this->getRandomBudget();
+        $this->mockDefaultSession();
+
 
         $budgetRepos->shouldReceive('findNull')->andReturn($budget)->once()->withArgs([1]);
         $accountRepos->shouldReceive('findNull')->andReturn($account)->once()->withArgs([1]);
-        $popupHelper->shouldReceive('balanceForBudget')->once()->andReturn(new Collection);
+        $popupHelper->shouldReceive('balanceForBudget')->once()->andReturn([]);
 
         $this->be($this->user());
         $arguments = [
@@ -176,9 +192,10 @@ class ReportControllerTest extends TestCase
         $accountRepos  = $this->mock(AccountRepositoryInterface::class);
         $budgetRepos   = $this->mock(BudgetRepositoryInterface::class);
         $popupReport   = $this->mock(PopupReportInterface::class);
-        $budget        = factory(Budget::class)->make();
-        $account       = factory(Account::class)->make();
+        $account      = $this->getRandomAsset();
+        $budget       = $this->getRandomBudget();
 
+        $this->mockDefaultSession();
         $budgetRepos->shouldReceive('findNull')->andReturn($budget)->once()->withArgs([1]);
         $accountRepos->shouldReceive('findNull')->andReturn($account)->once()->withArgs([1]);
 
@@ -210,10 +227,11 @@ class ReportControllerTest extends TestCase
         $categoryRepos = $this->mock(CategoryRepositoryInterface::class);
         $budgetRepos   = $this->mock(BudgetRepositoryInterface::class);
         $popupHelper   = $this->mock(PopupReportInterface::class);
-        $budget        = factory(Budget::class)->make();
+        $budget       = $this->getRandomBudget();
 
+        $this->mockDefaultSession();
         $budgetRepos->shouldReceive('findNull')->andReturn($budget)->once()->withArgs([1]);
-        $popupHelper->shouldReceive('byBudget')->andReturn(new Collection);
+        $popupHelper->shouldReceive('byBudget')->andReturn([]);
 
         $this->be($this->user());
         $arguments = [
@@ -237,14 +255,15 @@ class ReportControllerTest extends TestCase
      */
     public function testCategoryEntry(): void
     {
-        $budgetRepos   = $this->mock(BudgetRepositoryInterface::class);
-        $accountRepos  = $this->mock(AccountRepositoryInterface::class);
+        $this->mock(BudgetRepositoryInterface::class);
+        $this->mock(AccountRepositoryInterface::class);
         $categoryRepos = $this->mock(CategoryRepositoryInterface::class);
         $popupHelper   = $this->mock(PopupReportInterface::class);
-        $category      = factory(Category::class)->make();
+        $category = $this->getRandomCategory();
 
+        $this->mockDefaultSession();
         $categoryRepos->shouldReceive('findNull')->andReturn($category)->once()->withArgs([1]);
-        $popupHelper->shouldReceive('byCategory')->andReturn(new Collection);
+        $popupHelper->shouldReceive('byCategory')->andReturn([]);
 
         $this->be($this->user());
         $arguments = [
@@ -273,10 +292,11 @@ class ReportControllerTest extends TestCase
         $categoryRepos = $this->mock(CategoryRepositoryInterface::class);
         $popupHelper   = $this->mock(PopupReportInterface::class);
         $accountRepos  = $this->mock(AccountRepositoryInterface::class);
-        $account       = factory(Account::class)->make();
+        $account      = $this->getRandomAsset();
 
+        $this->mockDefaultSession();
         $accountRepos->shouldReceive('findNull')->withArgs([1])->andReturn($account)->once();
-        $popupHelper->shouldReceive('byExpenses')->andReturn(new Collection);
+        $popupHelper->shouldReceive('byExpenses')->andReturn([]);
 
         $this->be($this->user());
         $arguments = [
@@ -305,10 +325,11 @@ class ReportControllerTest extends TestCase
         $categoryRepos = $this->mock(CategoryRepositoryInterface::class);
         $popupHelper   = $this->mock(PopupReportInterface::class);
         $accountRepos  = $this->mock(AccountRepositoryInterface::class);
-        $account       = factory(Account::class)->make();
+        $account      = $this->getRandomAsset();
 
+        $this->mockDefaultSession();
         $accountRepos->shouldReceive('findNull')->withArgs([1])->andReturn($account)->once();
-        $popupHelper->shouldReceive('byIncome')->andReturn(new Collection);
+        $popupHelper->shouldReceive('byIncome')->andReturn([]);
 
         $this->be($this->user());
         $arguments = [
@@ -335,6 +356,7 @@ class ReportControllerTest extends TestCase
     {
         $popupReport = $this->mock(PopupReportInterface::class);
 
+        $this->mockDefaultSession();
         $this->be($this->user());
         $arguments = [
             'attributes' => [
diff --git a/tests/Feature/Controllers/Report/ExpenseControllerTest.php b/tests/Feature/Controllers/Report/ExpenseControllerTest.php
index a0de1c571c..54c49dee5c 100644
--- a/tests/Feature/Controllers/Report/ExpenseControllerTest.php
+++ b/tests/Feature/Controllers/Report/ExpenseControllerTest.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
 namespace Tests\Feature\Controllers\Report;
 
 use Carbon\Carbon;
-use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
+
 use FireflyIII\Helpers\Fiscal\FiscalHelperInterface;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Transaction;
diff --git a/tests/Feature/Controllers/TagControllerTest.php b/tests/Feature/Controllers/TagControllerTest.php
index 590fa046ab..26b117bbdb 100644
--- a/tests/Feature/Controllers/TagControllerTest.php
+++ b/tests/Feature/Controllers/TagControllerTest.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
 namespace Tests\Feature\Controllers;
 
 use Carbon\Carbon;
-use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
+
 use FireflyIII\Helpers\Fiscal\FiscalHelperInterface;
 use FireflyIII\Models\Tag;
 use FireflyIII\Models\TransactionJournal;
diff --git a/tests/Feature/Controllers/Transaction/MassControllerTest.php b/tests/Feature/Controllers/Transaction/MassControllerTest.php
index b60e1833c2..c79554aec4 100644
--- a/tests/Feature/Controllers/Transaction/MassControllerTest.php
+++ b/tests/Feature/Controllers/Transaction/MassControllerTest.php
@@ -22,7 +22,7 @@ declare(strict_types=1);
 
 namespace Tests\Feature\Controllers\Transaction;
 
-use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
+
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
diff --git a/tests/Feature/Controllers/Transaction/SingleControllerTest.php b/tests/Feature/Controllers/Transaction/SingleControllerTest.php
index a7f8dfb7a1..dbee579733 100644
--- a/tests/Feature/Controllers/Transaction/SingleControllerTest.php
+++ b/tests/Feature/Controllers/Transaction/SingleControllerTest.php
@@ -28,7 +28,7 @@ use Exception;
 use FireflyIII\Events\StoredTransactionJournal;
 use FireflyIII\Events\UpdatedTransactionJournal;
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
-use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
+
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
diff --git a/tests/Feature/Controllers/Transaction/SplitControllerTest.php b/tests/Feature/Controllers/Transaction/SplitControllerTest.php
index 8c95c007b6..ae6f70d11f 100644
--- a/tests/Feature/Controllers/Transaction/SplitControllerTest.php
+++ b/tests/Feature/Controllers/Transaction/SplitControllerTest.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
 namespace Tests\Feature\Controllers\Transaction;
 
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
-use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
+
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
diff --git a/tests/Feature/Controllers/TransactionControllerTest.php b/tests/Feature/Controllers/TransactionControllerTest.php
index 4b7ed3f2de..0c0ab08f50 100644
--- a/tests/Feature/Controllers/TransactionControllerTest.php
+++ b/tests/Feature/Controllers/TransactionControllerTest.php
@@ -23,8 +23,8 @@ declare(strict_types=1);
 namespace Tests\Feature\Controllers;
 
 use Carbon\Carbon;
-use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
-use FireflyIII\Helpers\Filter\InternalTransferFilter;
+
+
 use FireflyIII\Helpers\Fiscal\FiscalHelperInterface;
 use FireflyIII\Models\Attachment;
 use FireflyIII\Models\Transaction;
diff --git a/tests/TestCase.php b/tests/TestCase.php
index b7282a5d2c..787fd9f7d0 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -30,7 +30,7 @@ use DB;
 use Exception;
 use FireflyConfig;
 use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
+
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Budget;
@@ -131,7 +131,7 @@ abstract class TestCase extends BaseTestCase
         $falseConfig       = new Configuration;
         $falseConfig->data = false;
 
-        FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->once()->andReturn($falseConfig);
+        FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->andReturn($falseConfig);
     }
 
     /**
@@ -156,6 +156,7 @@ abstract class TestCase extends BaseTestCase
             'currency_id'              => $euro->id,
             'foreign_currency_id'      => null,
             'date'                     => $date,
+            'description'              => sprintf('I am descr #%d', $this->randomInt()),
             'source_account_id'        => 1,
             'destination_account_id'   => $expense->id,
             'destination_account_name' => $expense->name,
diff --git a/tests/Unit/Import/Storage/ImportArrayStorageTest.php b/tests/Unit/Import/Storage/ImportArrayStorageTest.php
index c47fdcbefc..68d7fd9c64 100644
--- a/tests/Unit/Import/Storage/ImportArrayStorageTest.php
+++ b/tests/Unit/Import/Storage/ImportArrayStorageTest.php
@@ -26,9 +26,9 @@ namespace Tests\Unit\Import\Storage;
 use Carbon\Carbon;
 use Exception;
 use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Helpers\Collector\TransactionCollector;
-use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
-use FireflyIII\Helpers\Filter\InternalTransferFilter;
+
+
+
 use FireflyIII\Import\Storage\ImportArrayStorage;
 use FireflyIII\Models\ImportJob;
 use FireflyIII\Models\Rule;