diff --git a/tests/Feature/Controllers/Chart/CategoryControllerTest.php b/tests/Feature/Controllers/Chart/CategoryControllerTest.php
index 89197731b8..c37093ef87 100644
--- a/tests/Feature/Controllers/Chart/CategoryControllerTest.php
+++ b/tests/Feature/Controllers/Chart/CategoryControllerTest.php
@@ -98,10 +98,10 @@ class CategoryControllerTest extends TestCase
         $this->mockDefaultSession();
         Preferences::shouldReceive('lastActivity')->atLeast()->once()->andReturn('md512345');
 
-        $repository->shouldReceive('spentInPeriod')->andReturn('0')->atLeast()->once();
-        $repository->shouldReceive('earnedInPeriod')->andReturn('0')->atLeast()->once();
+        $repository->shouldReceive('spentInPeriod')->andReturn([])->atLeast()->once();
+        $repository->shouldReceive('earnedInPeriod')->andReturn([])->atLeast()->once();
         $repository->shouldReceive('firstUseDate')->andReturn($firstUseDate)->once();
-        $accountRepos->shouldReceive('getAccountsByType')->withArgs([[AccountType::DEFAULT, AccountType::ASSET]])->andReturn(new Collection)->once();
+        $accountRepos->shouldReceive('getAccountsByType')->withArgs([[AccountType::DEFAULT, AccountType::ASSET, AccountType::LOAN, AccountType::DEBT,AccountType::MORTGAGE]])->andReturn(new Collection)->once();
         $generator->shouldReceive('multiSet')->once()->andReturn([]);
 
         $this->be($this->user());
@@ -245,8 +245,8 @@ class CategoryControllerTest extends TestCase
         $fiscalHelper->shouldReceive('startOfFiscalYear')->atLeast()->once()->andReturn($date);
 
         $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection([$account]));
-        $repository->shouldReceive('spentInPeriod')->andReturn('0');
-        $repository->shouldReceive('earnedInPeriod')->andReturn('0');
+        $repository->shouldReceive('spentInPeriod')->andReturn([]);
+        $repository->shouldReceive('earnedInPeriod')->andReturn([]);
         $generator->shouldReceive('multiSet')->andReturn([])->once();
 
         $this->be($this->user());
diff --git a/tests/Feature/Controllers/Chart/ReportControllerTest.php b/tests/Feature/Controllers/Chart/ReportControllerTest.php
index f2c3ebd1a8..cadb24e0e6 100644
--- a/tests/Feature/Controllers/Chart/ReportControllerTest.php
+++ b/tests/Feature/Controllers/Chart/ReportControllerTest.php
@@ -26,7 +26,6 @@ use Carbon\Carbon;
 use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
 use FireflyIII\Helpers\Fiscal\FiscalHelperInterface;
 use FireflyIII\Helpers\Report\NetWorthInterface;
-use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Account\AccountTaskerInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
@@ -116,8 +115,12 @@ class ReportControllerTest extends TestCase
 
         $fiscalHelper->shouldReceive('endOfFiscalYear')->atLeast()->once()->andReturn($date);
         $fiscalHelper->shouldReceive('startOfFiscalYear')->atLeast()->once()->andReturn($date);
-        $income  = [1 => ['sum' => '100']];
-        $expense = [2 => ['sum' => '-100']];
+        $income  = [
+            'accounts' => [
+                1 => ['sum' => '100']]];
+        $expense = [
+            'accounts' => [
+                2 => ['sum' => '-100']]];
         $tasker->shouldReceive('getIncomeReport')->once()->andReturn($income);
         $tasker->shouldReceive('getExpenseReport')->once()->andReturn($expense);
         $generator->shouldReceive('multiSet')->andReturn([]);
@@ -144,8 +147,12 @@ class ReportControllerTest extends TestCase
         $fiscalHelper->shouldReceive('endOfFiscalYear')->atLeast()->once()->andReturn($date);
         $fiscalHelper->shouldReceive('startOfFiscalYear')->atLeast()->once()->andReturn($date);
 
-        $income  = [];
-        $expense = [];
+        $income  = [
+            'accounts' => [
+                1 => ['sum' => '100']]];
+        $expense = [
+            'accounts' => [
+                2 => ['sum' => '-100']]];
         $tasker->shouldReceive('getIncomeReport')->andReturn($income)->times(1);
         $tasker->shouldReceive('getExpenseReport')->andReturn($expense)->times(1);
 
diff --git a/tests/Unit/Support/NavigationTest.php b/tests/Unit/Support/NavigationTest.php
index 6141bbca4d..7c9db89d72 100644
--- a/tests/Unit/Support/NavigationTest.php
+++ b/tests/Unit/Support/NavigationTest.php
@@ -108,32 +108,6 @@ class NavigationTest extends TestCase
         }
     }
 
-    /**
-     * @covers \FireflyIII\Support\Navigation
-     */
-    public function testAddPeriodError(): void
-    {
-        $tests = [
-            // period, skip, start, expected end
-            ['bla', 0, '2018-01-01', '2018-01-02'],
-        ];
-
-        /** @var array $test */
-        foreach ($tests as $test) {
-
-            $freq = $test[0];
-            /** @noinspection MultiAssignmentUsageInspection */
-            $skip  = $test[1];
-            $start = new Carbon($test[2]);
-            $nav   = new Navigation;
-            try {
-                $nav->addPeriod($start, $freq, $skip);
-            } catch (FireflyException $e) {
-                $this->assertEquals('Cannot do addPeriod for $repeat_freq "bla"', $e->getMessage());
-            }
-        }
-    }
-
     /**
      * @covers \FireflyIII\Support\Navigation
      */
diff --git a/tests/Unit/Transformers/CategoryTransformerTest.php b/tests/Unit/Transformers/CategoryTransformerTest.php
index 99b8b273b6..8734a60f69 100644
--- a/tests/Unit/Transformers/CategoryTransformerTest.php
+++ b/tests/Unit/Transformers/CategoryTransformerTest.php
@@ -88,21 +88,27 @@ class CategoryTransformerTest extends TestCase
         $parameters->set('end', new Carbon('2018-01-31'));
 
         // mock some objects for the spent/earned lists.
-        $expense                            = new Transaction;
-        $expense->transaction_currency_code = 'EUR';
-        $expense->transactionCurrency       = $this->getEuro();
-        $expense->transaction_amount        = '-100';
-        $income                             = new Transaction;
-        $income->transaction_currency_code  = 'EUR';
-        $income->transactionCurrency        = $this->getEuro();
-        $income->transaction_amount         = '100';
+        $expense                            = [
+            'currency_id'             => 1,
+            'currency_code'           => 'EUR',
+            'currency_symbol'         => '€',
+            'currency_decimal_places' => 2,
+            'amount'                  => -100,
+        ];
+        $income                             = [
+            'currency_id'             => 1,
+            'currency_code'           => 'EUR',
+            'currency_symbol'         => '€',
+            'currency_decimal_places' => 2,
+            'amount'                  => 100,
+        ];
 
 
         $incomeCollection  = [$income];
         $expenseCollection = [$expense];
 
-        $repository->shouldReceive('spentInPeriodCollection')->atLeast()->once()->andReturn($expenseCollection);
-        $repository->shouldReceive('earnedInPeriodCollection')->atLeast()->once()->andReturn($incomeCollection);
+        $repository->shouldReceive('spentInPeriod')->atLeast()->once()->andReturn($expenseCollection);
+        $repository->shouldReceive('earnedInPeriod')->atLeast()->once()->andReturn($incomeCollection);
 
         /** @var Category $category */
         $category    = Category::first();