diff --git a/app/lib/FireflyIII/Database/Account/Account.php b/app/lib/FireflyIII/Database/Account/Account.php
index cc87471b98..9894dda5c3 100644
--- a/app/lib/FireflyIII/Database/Account/Account.php
+++ b/app/lib/FireflyIII/Database/Account/Account.php
@@ -402,6 +402,7 @@ class Account implements CUDInterface, CommonDatabaseCallsInterface, AccountInte
 
     /**
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @codeCoverageIgnore
      *
      * @param $what
      *
@@ -418,6 +419,7 @@ class Account implements CUDInterface, CommonDatabaseCallsInterface, AccountInte
      *
      * @return Collection
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function get()
     {
diff --git a/app/lib/FireflyIII/Database/AccountType/AccountType.php b/app/lib/FireflyIII/Database/AccountType/AccountType.php
index 30a9c2bcc6..2b30ea3e25 100644
--- a/app/lib/FireflyIII/Database/AccountType/AccountType.php
+++ b/app/lib/FireflyIII/Database/AccountType/AccountType.php
@@ -23,6 +23,7 @@ class AccountType implements CUDInterface, CommonDatabaseCallsInterface
      *
      * @return bool
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function destroy(Eloquent $model)
     {
@@ -35,6 +36,7 @@ class AccountType implements CUDInterface, CommonDatabaseCallsInterface
      *
      * @return \Eloquent
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function store(array $data)
     {
@@ -48,6 +50,7 @@ class AccountType implements CUDInterface, CommonDatabaseCallsInterface
      *
      * @return bool
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function update(Eloquent $model, array $data)
     {
@@ -64,6 +67,7 @@ class AccountType implements CUDInterface, CommonDatabaseCallsInterface
      *
      * @return array
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function validate(array $model)
     {
@@ -79,6 +83,7 @@ class AccountType implements CUDInterface, CommonDatabaseCallsInterface
      *
      * @return \Eloquent
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function find($objectId)
     {
@@ -115,6 +120,7 @@ class AccountType implements CUDInterface, CommonDatabaseCallsInterface
      *
      * @return Collection
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function get()
     {
@@ -128,6 +134,7 @@ class AccountType implements CUDInterface, CommonDatabaseCallsInterface
      *
      * @return Collection
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function getByIds(array $ids)
     {
diff --git a/app/lib/FireflyIII/Database/Bill/Bill.php b/app/lib/FireflyIII/Database/Bill/Bill.php
index 2110180426..4bca112659 100644
--- a/app/lib/FireflyIII/Database/Bill/Bill.php
+++ b/app/lib/FireflyIII/Database/Bill/Bill.php
@@ -141,6 +141,7 @@ class Bill implements CUDInterface, CommonDatabaseCallsInterface, BillInterface
      *
      * @return \Eloquent
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function find($objectId)
     {
@@ -156,6 +157,7 @@ class Bill implements CUDInterface, CommonDatabaseCallsInterface, BillInterface
      *
      * @return \AccountType|null
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function findByWhat($what)
     {
@@ -178,6 +180,7 @@ class Bill implements CUDInterface, CommonDatabaseCallsInterface, BillInterface
      *
      * @return Collection
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function getByIds(array $ids)
     {
diff --git a/app/lib/FireflyIII/Database/Budget/Budget.php b/app/lib/FireflyIII/Database/Budget/Budget.php
index f437879e87..013a931297 100644
--- a/app/lib/FireflyIII/Database/Budget/Budget.php
+++ b/app/lib/FireflyIII/Database/Budget/Budget.php
@@ -183,6 +183,7 @@ class Budget implements CUDInterface, CommonDatabaseCallsInterface, BudgetInterf
      *
      * @return \AccountType|null
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function findByWhat($what)
     {
@@ -208,6 +209,7 @@ class Budget implements CUDInterface, CommonDatabaseCallsInterface, BudgetInterf
      *
      * @return Collection
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function getByIds(array $ids)
     {
diff --git a/app/lib/FireflyIII/Database/Category/Category.php b/app/lib/FireflyIII/Database/Category/Category.php
index a4a8dc0137..7c94a818eb 100644
--- a/app/lib/FireflyIII/Database/Category/Category.php
+++ b/app/lib/FireflyIII/Database/Category/Category.php
@@ -107,6 +107,7 @@ class Category implements CUDInterface, CommonDatabaseCallsInterface
      *
      * @return \Eloquent
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function find($objectId)
     {
@@ -122,6 +123,7 @@ class Category implements CUDInterface, CommonDatabaseCallsInterface
      *
      * @return \AccountType|null
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function findByWhat($what)
     {
@@ -147,6 +149,7 @@ class Category implements CUDInterface, CommonDatabaseCallsInterface
      *
      * @return Collection
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function getByIds(array $ids)
     {
diff --git a/app/lib/FireflyIII/Database/PiggyBank/PiggyBank.php b/app/lib/FireflyIII/Database/PiggyBank/PiggyBank.php
index 5de40005e9..6490b96d9b 100644
--- a/app/lib/FireflyIII/Database/PiggyBank/PiggyBank.php
+++ b/app/lib/FireflyIII/Database/PiggyBank/PiggyBank.php
@@ -21,7 +21,6 @@ class PiggyBank extends PiggyBankShared implements CUDInterface, CommonDatabaseC
      *
      * @return mixed
      * @throws FireflyException
-     * @throws NotImplementedException
      */
     public function findRepetitionByDate(\PiggyBank $piggyBank, Carbon $date)
     {
diff --git a/app/lib/FireflyIII/Database/PiggyBank/PiggyBankShared.php b/app/lib/FireflyIII/Database/PiggyBank/PiggyBankShared.php
index 1d5fa492aa..ecd39623de 100644
--- a/app/lib/FireflyIII/Database/PiggyBank/PiggyBankShared.php
+++ b/app/lib/FireflyIII/Database/PiggyBank/PiggyBankShared.php
@@ -66,6 +66,7 @@ class PiggyBankShared
      *
      * @return \AccountType|null
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function findByWhat($what)
     {
diff --git a/app/lib/FireflyIII/Database/Transaction/Transaction.php b/app/lib/FireflyIII/Database/Transaction/Transaction.php
index 6880999fb7..d8c2ea909d 100644
--- a/app/lib/FireflyIII/Database/Transaction/Transaction.php
+++ b/app/lib/FireflyIII/Database/Transaction/Transaction.php
@@ -26,6 +26,7 @@ class Transaction implements CUDInterface, CommonDatabaseCallsInterface
      *
      * @return bool
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function destroy(Eloquent $model)
     {
@@ -67,6 +68,7 @@ class Transaction implements CUDInterface, CommonDatabaseCallsInterface
      *
      * @return bool
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function update(Eloquent $model, array $data)
     {
@@ -103,6 +105,7 @@ class Transaction implements CUDInterface, CommonDatabaseCallsInterface
      *
      * @return \Eloquent
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function find($objectId)
     {
@@ -118,6 +121,7 @@ class Transaction implements CUDInterface, CommonDatabaseCallsInterface
      *
      * @return \AccountType|null
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function findByWhat($what)
     {
@@ -129,6 +133,7 @@ class Transaction implements CUDInterface, CommonDatabaseCallsInterface
      *
      * @return Collection
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function get()
     {
@@ -142,6 +147,7 @@ class Transaction implements CUDInterface, CommonDatabaseCallsInterface
      *
      * @return Collection
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function getByIds(array $ids)
     {
diff --git a/app/lib/FireflyIII/Database/TransactionCurrency/TransactionCurrency.php b/app/lib/FireflyIII/Database/TransactionCurrency/TransactionCurrency.php
index fc72379da4..c3ca7d946c 100644
--- a/app/lib/FireflyIII/Database/TransactionCurrency/TransactionCurrency.php
+++ b/app/lib/FireflyIII/Database/TransactionCurrency/TransactionCurrency.php
@@ -95,6 +95,7 @@ class TransactionCurrency implements TransactionCurrencyInterface, CommonDatabas
      *
      * @param int $objectId
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      *
      * @return \Eloquent
      */
@@ -110,6 +111,7 @@ class TransactionCurrency implements TransactionCurrencyInterface, CommonDatabas
      *
      * @param $what
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      *
      * @return \AccountType|null
      */
@@ -133,6 +135,7 @@ class TransactionCurrency implements TransactionCurrencyInterface, CommonDatabas
      *
      * @param array $objectIds
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      *
      * @return Collection
      */
diff --git a/app/lib/FireflyIII/Database/TransactionJournal/TransactionJournal.php b/app/lib/FireflyIII/Database/TransactionJournal/TransactionJournal.php
index b3f6f5fd5c..032e722283 100644
--- a/app/lib/FireflyIII/Database/TransactionJournal/TransactionJournal.php
+++ b/app/lib/FireflyIII/Database/TransactionJournal/TransactionJournal.php
@@ -413,6 +413,7 @@ class TransactionJournal implements TransactionJournalInterface, CUDInterface, C
      *
      * @return \AccountType|null
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function findByWhat($what)
     {
diff --git a/app/lib/FireflyIII/Database/TransactionType/TransactionType.php b/app/lib/FireflyIII/Database/TransactionType/TransactionType.php
index ca5b678587..cd202a3c2d 100644
--- a/app/lib/FireflyIII/Database/TransactionType/TransactionType.php
+++ b/app/lib/FireflyIII/Database/TransactionType/TransactionType.php
@@ -26,6 +26,7 @@ class TransactionType implements CUDInterface, CommonDatabaseCallsInterface
      *
      * @return bool
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function destroy(Eloquent $model)
     {
@@ -39,6 +40,7 @@ class TransactionType implements CUDInterface, CommonDatabaseCallsInterface
      *
      * @return \Eloquent
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function store(array $data)
     {
@@ -53,6 +55,7 @@ class TransactionType implements CUDInterface, CommonDatabaseCallsInterface
      *
      * @return bool
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function update(Eloquent $model, array $data)
     {
@@ -69,6 +72,7 @@ class TransactionType implements CUDInterface, CommonDatabaseCallsInterface
      *
      * @return array
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function validate(array $model)
     {
@@ -84,6 +88,7 @@ class TransactionType implements CUDInterface, CommonDatabaseCallsInterface
      *
      * @return \Eloquent
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function find($objectId)
     {
@@ -120,6 +125,7 @@ class TransactionType implements CUDInterface, CommonDatabaseCallsInterface
      *
      * @return Collection
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function get()
     {
@@ -133,6 +139,7 @@ class TransactionType implements CUDInterface, CommonDatabaseCallsInterface
      *
      * @return Collection
      * @throws NotImplementedException
+     * @codeCoverageIgnore
      */
     public function getByIds(array $ids)
     {
diff --git a/app/lib/FireflyIII/Shared/Toolkit/Steam.php b/app/lib/FireflyIII/Shared/Toolkit/Steam.php
index 2a2696372f..584fa13ee8 100644
--- a/app/lib/FireflyIII/Shared/Toolkit/Steam.php
+++ b/app/lib/FireflyIII/Shared/Toolkit/Steam.php
@@ -35,6 +35,7 @@ class Steam
     }
 
     /**
+     * @codeCoverageIgnore
      * @param $boolean
      *
      * @return string
@@ -61,12 +62,18 @@ class Steam
     {
         $pct = $repetition->currentamount / $piggyBank->targetamount * 100;
         if ($pct > 100) {
+            // @codeCoverageIgnoreStart
             return 100;
+            // @codeCoverageIgnoreEnd
         } else {
             return floor($pct);
         }
     }
 
+    /**
+     * @codeCoverageIgnore
+     * @throws \Exception
+     */
     public function removeEmptyBudgetLimits()
     {
         $user = \Auth::user();