diff --git a/app/Models/Account.php b/app/Models/Account.php
index dcea8ec26e..635f5d63fe 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -29,6 +29,7 @@ class Account extends Model
     /**
      * @param array $fields
      *
+     *
      * @return Account|null
      */
     public static function firstOrCreateEncrypted(array $fields)
@@ -86,6 +87,7 @@ class Account extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function accountMeta()
@@ -94,6 +96,7 @@ class Account extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function accountType()
@@ -102,6 +105,7 @@ class Account extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return array
      */
     public function getDates()
@@ -110,6 +114,7 @@ class Account extends Model
     }
 
     /**
+     *
      * @param $fieldName
      *
      * @return string|null
@@ -127,6 +132,7 @@ class Account extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @param $value
      *
      * @return string
@@ -144,6 +150,7 @@ class Account extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function piggyBanks()
@@ -181,6 +188,7 @@ class Account extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @param $value
      */
     public function setNameAttribute($value)
@@ -190,6 +198,7 @@ class Account extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function transactions()
@@ -198,6 +207,7 @@ class Account extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function user()
diff --git a/app/Models/AccountMeta.php b/app/Models/AccountMeta.php
index 16e6f7a91b..960d3d7759 100644
--- a/app/Models/AccountMeta.php
+++ b/app/Models/AccountMeta.php
@@ -6,6 +6,7 @@ use Watson\Validating\ValidatingTrait;
 /**
  * Class AccountMeta
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Models
  */
 class AccountMeta extends Model
@@ -22,6 +23,7 @@ class AccountMeta extends Model
     protected $table    = 'account_meta';
 
     /**
+     *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function account()
diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php
index aee84c7c1e..4d17499645 100644
--- a/app/Models/AccountType.php
+++ b/app/Models/AccountType.php
@@ -5,6 +5,7 @@ use Illuminate\Database\Eloquent\Model;
 /**
  * Class AccountType
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Models
  */
 class AccountType extends Model
diff --git a/app/Models/BudgetLimit.php b/app/Models/BudgetLimit.php
index 5189d91664..25bf48a4b4 100644
--- a/app/Models/BudgetLimit.php
+++ b/app/Models/BudgetLimit.php
@@ -5,6 +5,7 @@ use Illuminate\Database\Eloquent\Model;
 /**
  * Class BudgetLimit
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Models
  */
 class BudgetLimit extends Model
diff --git a/app/Models/Category.php b/app/Models/Category.php
index 12efc295b6..502ef8bcfa 100644
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -8,6 +8,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 /**
  * Class Category
  *
+ *
  * @package FireflyIII\Models
  */
 class Category extends Model
diff --git a/app/Models/LimitRepetition.php b/app/Models/LimitRepetition.php
index 129e0a4901..3faef2b46d 100644
--- a/app/Models/LimitRepetition.php
+++ b/app/Models/LimitRepetition.php
@@ -13,6 +13,7 @@ class LimitRepetition extends Model
 {
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function budgetLimit()
@@ -21,6 +22,7 @@ class LimitRepetition extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return array
      */
     public function getDates()
diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php
index 7d00585d6c..9879b3f1a8 100644
--- a/app/Models/PiggyBank.php
+++ b/app/Models/PiggyBank.php
@@ -17,6 +17,7 @@ class PiggyBank extends Model
         = ['name', 'account_id', 'order', 'reminder_skip', 'targetamount', 'startdate', 'targetdate', 'reminder', 'remind_me'];
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function account()
@@ -44,6 +45,7 @@ class PiggyBank extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function piggyBankRepetitions()
@@ -52,6 +54,7 @@ class PiggyBank extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return array
      */
     public function getDates()
@@ -60,6 +63,7 @@ class PiggyBank extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @param $value
      *
      * @return int
@@ -70,6 +74,7 @@ class PiggyBank extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function piggyBankEvents()
@@ -78,6 +83,7 @@ class PiggyBank extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\MorphMany
      */
     public function reminders()
@@ -86,6 +92,7 @@ class PiggyBank extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @param $value
      */
     public function setNameAttribute($value)
@@ -95,6 +102,7 @@ class PiggyBank extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @param $value
      *
      * @return string
diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php
index 775a4e310d..4a54c0b3f2 100644
--- a/app/Models/PiggyBankEvent.php
+++ b/app/Models/PiggyBankEvent.php
@@ -5,6 +5,7 @@ use Illuminate\Database\Eloquent\Model;
 /**
  * Class PiggyBankEvent
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Models
  */
 class PiggyBankEvent extends Model
diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php
index 07202b672e..12019da640 100644
--- a/app/Models/PiggyBankRepetition.php
+++ b/app/Models/PiggyBankRepetition.php
@@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Model;
 /**
  * Class PiggyBankRepetition
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Models
  */
 class PiggyBankRepetition extends Model
diff --git a/app/Models/Preference.php b/app/Models/Preference.php
index b0c1cb7d03..86c5dd9f40 100644
--- a/app/Models/Preference.php
+++ b/app/Models/Preference.php
@@ -5,6 +5,7 @@ use Illuminate\Database\Eloquent\Model;
 /**
  * Class Preference
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Models
  */
 class Preference extends Model
diff --git a/app/Models/Reminder.php b/app/Models/Reminder.php
index f6116b2754..0160f1a9f1 100644
--- a/app/Models/Reminder.php
+++ b/app/Models/Reminder.php
@@ -17,6 +17,7 @@ class Reminder extends Model
     protected $fillable = ['user_id', 'startdate', 'metadata', 'enddate', 'active', 'notnow', 'remindersable_id', 'remindersable_type',];
 
     /**
+     * @codeCoverageIgnore
      * @param $value
      *
      * @return int
@@ -27,6 +28,7 @@ class Reminder extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return array
      */
     public function getDates()
@@ -35,6 +37,7 @@ class Reminder extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @param $value
      *
      * @return mixed
@@ -49,6 +52,7 @@ class Reminder extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @param $value
      *
      * @return bool
@@ -59,6 +63,7 @@ class Reminder extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\MorphTo
      */
     public function remindersable()
@@ -67,6 +72,7 @@ class Reminder extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @param EloquentBuilder $query
      * @param Carbon          $start
      * @param Carbon          $end
@@ -79,6 +85,7 @@ class Reminder extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @param EloquentBuilder $query
      *
      * @return $this
@@ -92,6 +99,7 @@ class Reminder extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @param $value
      */
     public function setMetadataAttribute($value)
@@ -101,6 +109,7 @@ class Reminder extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function user()
diff --git a/app/Models/Tag.php b/app/Models/Tag.php
index 11ce119559..286a481fc0 100644
--- a/app/Models/Tag.php
+++ b/app/Models/Tag.php
@@ -67,6 +67,7 @@ class Tag extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return array
      */
     public function getDates()
@@ -75,6 +76,7 @@ class Tag extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @param $value
      *
      * @return string
@@ -85,6 +87,7 @@ class Tag extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @param $value
      *
      * @return string
@@ -95,6 +98,7 @@ class Tag extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @param $value
      */
     public function setDescriptionAttribute($value)
@@ -103,6 +107,7 @@ class Tag extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @param $value
      */
     public function setTagAttribute($value)
@@ -111,6 +116,7 @@ class Tag extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
      */
     public function transactionjournals()
@@ -119,6 +125,7 @@ class Tag extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function user()
diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php
index 85f8e74e17..447c3085e0 100644
--- a/app/Models/Transaction.php
+++ b/app/Models/Transaction.php
@@ -9,6 +9,7 @@ use Watson\Validating\ValidatingTrait;
 /**
  * Class Transaction
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Models
  */
 class Transaction extends Model
diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php
index 9283709f9e..a91c2df889 100644
--- a/app/Models/TransactionCurrency.php
+++ b/app/Models/TransactionCurrency.php
@@ -4,8 +4,10 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
+ *
  * Class TransactionCurrency
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Models
  */
 class TransactionCurrency extends Model
diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php
index 6f49c9669a..7fd1e4db4c 100644
--- a/app/Models/TransactionJournal.php
+++ b/app/Models/TransactionJournal.php
@@ -32,6 +32,7 @@ class TransactionJournal extends Model
         ];
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function bill()
@@ -40,6 +41,7 @@ class TransactionJournal extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
      */
     public function budgets()
@@ -48,6 +50,7 @@ class TransactionJournal extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
      */
     public function categories()
@@ -94,6 +97,7 @@ class TransactionJournal extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function transactions()
@@ -102,6 +106,7 @@ class TransactionJournal extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return array
      */
     public function getDates()
@@ -110,6 +115,7 @@ class TransactionJournal extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @param $value
      *
      * @return string
@@ -120,12 +126,11 @@ class TransactionJournal extends Model
             return Crypt::decrypt($value);
         }
 
-        // @codeCoverageIgnoreStart
         return $value;
-        // @codeCoverageIgnoreEnd
     }
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function piggyBankEvents()
@@ -134,6 +139,7 @@ class TransactionJournal extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @param EloquentBuilder $query
      * @param Account         $account
      */
@@ -147,6 +153,7 @@ class TransactionJournal extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @param EloquentBuilder $query
      * @param Carbon          $date
      *
@@ -158,6 +165,7 @@ class TransactionJournal extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @param EloquentBuilder $query
      * @param Carbon          $date
      *
@@ -169,6 +177,7 @@ class TransactionJournal extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @param EloquentBuilder $query
      * @param                 $amount
      */
@@ -185,6 +194,7 @@ class TransactionJournal extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @param EloquentBuilder $query
      * @param Carbon          $date
      *
@@ -196,6 +206,7 @@ class TransactionJournal extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @param EloquentBuilder $query
      * @param array           $types
      */
@@ -211,6 +222,7 @@ class TransactionJournal extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * Automatically includes the 'with' parameters to get relevant related
      * objects.
      *
@@ -226,6 +238,7 @@ class TransactionJournal extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @param $value
      */
     public function setDescriptionAttribute($value)
@@ -235,6 +248,7 @@ class TransactionJournal extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
      */
     public function tags()
@@ -243,6 +257,7 @@ class TransactionJournal extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function transactionCurrency()
@@ -251,6 +266,7 @@ class TransactionJournal extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function transactionType()
@@ -259,6 +275,7 @@ class TransactionJournal extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
      */
     public function transactiongroups()
@@ -267,6 +284,7 @@ class TransactionJournal extends Model
     }
 
     /**
+     * @codeCoverageIgnore
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function user()
diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php
index dbabd104f8..cee923cfc2 100644
--- a/app/Models/TransactionType.php
+++ b/app/Models/TransactionType.php
@@ -6,6 +6,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 /**
  * Class TransactionType
  *
+ * @codeCoverageIgnore
  * @package FireflyIII\Models
  */
 class TransactionType extends Model