diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php
index 565d9bfe8b..1e4545d518 100644
--- a/app/Http/Controllers/BudgetController.php
+++ b/app/Http/Controllers/BudgetController.php
@@ -183,6 +183,7 @@ class BudgetController extends Controller
                 $start = new Carbon($moment);
                 $end   = Navigation::endOfPeriod($start, $range);
             } catch (Exception $e) {
+                // start and end are already defined.
 
             }
         }
diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php
index 81fcf35c81..c0af003e81 100644
--- a/app/Http/Controllers/Chart/AccountController.php
+++ b/app/Http/Controllers/Chart/AccountController.php
@@ -349,7 +349,7 @@ class AccountController extends Controller
         $cache->addProperty('chart.account.period');
         $cache->addProperty($account->id);
         if ($cache->has()) {
-            //return Response::json($cache->get()); // @codeCoverageIgnore
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
         $format    = (string)trans('config.month_and_day');
diff --git a/app/Http/Controllers/Transaction/ConvertController.php b/app/Http/Controllers/Transaction/ConvertController.php
index 8853a3dbaa..2b1e8bf061 100644
--- a/app/Http/Controllers/Transaction/ConvertController.php
+++ b/app/Http/Controllers/Transaction/ConvertController.php
@@ -174,14 +174,17 @@ class ConvertController extends Controller
         switch ($joined) {
             default:
                 throw new FireflyException('Cannot handle ' . $joined); // @codeCoverageIgnore
-            case TransactionType::WITHDRAWAL . '-' . TransactionType::DEPOSIT: // one
+            case TransactionType::WITHDRAWAL . '-' . TransactionType::DEPOSIT:
+                // one
                 $destination = $sourceAccount;
                 break;
-            case TransactionType::WITHDRAWAL . '-' . TransactionType::TRANSFER: // two
+            case TransactionType::WITHDRAWAL . '-' . TransactionType::TRANSFER:
+                // two
                 $destination = $accountRepository->find(intval($data['destination_account_asset']));
                 break;
-            case TransactionType::DEPOSIT . '-' . TransactionType::WITHDRAWAL: // three
-            case TransactionType::TRANSFER . '-' . TransactionType::WITHDRAWAL: // five
+            case TransactionType::DEPOSIT . '-' . TransactionType::WITHDRAWAL:
+            case TransactionType::TRANSFER . '-' . TransactionType::WITHDRAWAL:
+                // three and five
                 if ($data['destination_account_expense'] === '') {
                     // destination is a cash account.
                     $destination = $accountRepository->getCashAccount();
@@ -197,8 +200,9 @@ class ConvertController extends Controller
                 ];
                 $destination = $accountRepository->store($data);
                 break;
-            case TransactionType::DEPOSIT . '-' . TransactionType::TRANSFER: // four
-            case TransactionType::TRANSFER . '-' . TransactionType::DEPOSIT: // six
+            case TransactionType::DEPOSIT . '-' . TransactionType::TRANSFER:
+            case TransactionType::TRANSFER . '-' . TransactionType::DEPOSIT:
+                // four and six
                 $destination = $destinationAccount;
                 break;
         }
diff --git a/app/Support/Search/Search.php b/app/Support/Search/Search.php
index 4b9ffacb31..ebceaf59f9 100644
--- a/app/Support/Search/Search.php
+++ b/app/Support/Search/Search.php
@@ -53,7 +53,7 @@ class Search implements SearchInterface
     public function __construct()
     {
         $this->modifiers      = new Collection;
-        $this->validModifiers = config('firefly.search_modifiers');
+        $this->validModifiers = (array) config('firefly.search_modifiers');
     }
 
     /**
diff --git a/app/Support/Steam.php b/app/Support/Steam.php
index e97b0f2c03..398400e05b 100644
--- a/app/Support/Steam.php
+++ b/app/Support/Steam.php
@@ -135,7 +135,7 @@ class Steam
         $cache->addProperty($start);
         $cache->addProperty($end);
         if ($cache->has()) {
-            //return $cache->get(); // @codeCoverageIgnore
+            return $cache->get(); // @codeCoverageIgnore
         }
 
         $start->subDay();
@@ -167,10 +167,6 @@ class Steam
                            ]
                        );
 
-//        echo '<pre>';
-//        var_dump($set->toArray());
-//        exit;
-
         $currentBalance = $startBalance;
         /** @var Transaction $entry */
         foreach ($set as $entry) {
@@ -217,7 +213,7 @@ class Steam
         $cache->addProperty('balances');
         $cache->addProperty($date);
         if ($cache->has()) {
-            //return $cache->get(); // @codeCoverageIgnore
+            return $cache->get(); // @codeCoverageIgnore
         }
 
         // need to do this per account.
diff --git a/public/js/ff/budgets/show.js b/public/js/ff/budgets/show.js
index 1852c5b6cd..01dda2660e 100644
--- a/public/js/ff/budgets/show.js
+++ b/public/js/ff/budgets/show.js
@@ -8,7 +8,7 @@
  * See the LICENSE file for details.
  */
 
-/** global: budgetChartUri, expenseCategoryUri, expenseAssetUri, expenseExpenseUri */
+/** global: budgetChartUri, expenseCategoryUri, expenseAssetUri, expenseExpenseUri, budgetLimitID */
 
 $(function () {
     "use strict";
diff --git a/public/js/ff/transactions/single/edit.js b/public/js/ff/transactions/single/edit.js
index 05c2132260..7d9308e1cb 100644
--- a/public/js/ff/transactions/single/edit.js
+++ b/public/js/ff/transactions/single/edit.js
@@ -32,8 +32,6 @@ $(document).ready(function () {
  */
 function updateInitialPage() {
 
-    console.log('Native currency is #' + journalData.native_currency.id + ' and (foreign) currency id is #' + journalData.currency.id);
-
     if (journal.transaction_type.type === "Transfer") {
         $('#native_amount_holder').hide();
         $('#amount_holder').hide();
diff --git a/test.sh b/test.sh
index 177dc25cb9..90e472cd80 100755
--- a/test.sh
+++ b/test.sh
@@ -87,6 +87,10 @@ then
 
     # call test data generation script
     $(which php) /sites/FF3/test-data/artisan generate:data local sqlite
+
+    # also run upgrade routine:
+    $(which php) /sites/FF3/firefly-iii/artisan firefly:upgrade-database
+
     # copy new database over backup (resets backup)
     cp $DATABASE $DATABASECOPY
 fi