diff --git a/tests/Api/V1/Controllers/AccountControllerTest.php b/tests/Api/V1/Controllers/AccountControllerTest.php
index d5a3145f24..932e2c9e55 100644
--- a/tests/Api/V1/Controllers/AccountControllerTest.php
+++ b/tests/Api/V1/Controllers/AccountControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AccountControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Api/V1/Controllers/AttachmentControllerTest.php b/tests/Api/V1/Controllers/AttachmentControllerTest.php
index 28c2d20f06..6a40908a79 100644
--- a/tests/Api/V1/Controllers/AttachmentControllerTest.php
+++ b/tests/Api/V1/Controllers/AttachmentControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AttachmentControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Api/V1/Controllers/AvailableBudgetControllerTest.php b/tests/Api/V1/Controllers/AvailableBudgetControllerTest.php
index 0c3414d4ab..4e64dc5dc2 100644
--- a/tests/Api/V1/Controllers/AvailableBudgetControllerTest.php
+++ b/tests/Api/V1/Controllers/AvailableBudgetControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AvailableBudgetControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Api/V1/Controllers/BillControllerTest.php b/tests/Api/V1/Controllers/BillControllerTest.php
index 1d100ca8b8..876000f6bb 100644
--- a/tests/Api/V1/Controllers/BillControllerTest.php
+++ b/tests/Api/V1/Controllers/BillControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * BillControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Api/V1/Controllers/BudgetControllerTest.php b/tests/Api/V1/Controllers/BudgetControllerTest.php
index a7374a8316..1f88c18b8d 100644
--- a/tests/Api/V1/Controllers/BudgetControllerTest.php
+++ b/tests/Api/V1/Controllers/BudgetControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * BudgetControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Api/V1/Controllers/BudgetLimitControllerTest.php b/tests/Api/V1/Controllers/BudgetLimitControllerTest.php
index 367371c090..7eae543c25 100644
--- a/tests/Api/V1/Controllers/BudgetLimitControllerTest.php
+++ b/tests/Api/V1/Controllers/BudgetLimitControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * BudgetLimitControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Api/V1/Controllers/CategoryControllerTest.php b/tests/Api/V1/Controllers/CategoryControllerTest.php
index 1e68353621..e846c8298e 100644
--- a/tests/Api/V1/Controllers/CategoryControllerTest.php
+++ b/tests/Api/V1/Controllers/CategoryControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * CategoryControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Api/V1/Controllers/Chart/AccountControllerTest.php b/tests/Api/V1/Controllers/Chart/AccountControllerTest.php
index 20e7cd2754..0b4014b7a0 100644
--- a/tests/Api/V1/Controllers/Chart/AccountControllerTest.php
+++ b/tests/Api/V1/Controllers/Chart/AccountControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AccountControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Api/V1/Controllers/Chart/AvailableBudgetControllerTest.php b/tests/Api/V1/Controllers/Chart/AvailableBudgetControllerTest.php
index adc8bd479b..6d59378aa2 100644
--- a/tests/Api/V1/Controllers/Chart/AvailableBudgetControllerTest.php
+++ b/tests/Api/V1/Controllers/Chart/AvailableBudgetControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AvailableBudgetControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Api/V1/Controllers/Chart/CategoryControllerTest.php b/tests/Api/V1/Controllers/Chart/CategoryControllerTest.php
index b135cc3ba1..04b21190fb 100644
--- a/tests/Api/V1/Controllers/Chart/CategoryControllerTest.php
+++ b/tests/Api/V1/Controllers/Chart/CategoryControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * CategoryControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Api/V1/Controllers/CurrencyControllerTest.php b/tests/Api/V1/Controllers/CurrencyControllerTest.php
index 940be9967e..94a0c9ef7b 100644
--- a/tests/Api/V1/Controllers/CurrencyControllerTest.php
+++ b/tests/Api/V1/Controllers/CurrencyControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * CurrencyControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Api/V1/Controllers/LinkTypeControllerTest.php b/tests/Api/V1/Controllers/LinkTypeControllerTest.php
index 49bd7e949f..6a53894469 100644
--- a/tests/Api/V1/Controllers/LinkTypeControllerTest.php
+++ b/tests/Api/V1/Controllers/LinkTypeControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * LinkTypeControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Api/V1/Controllers/PiggyBankControllerTest.php b/tests/Api/V1/Controllers/PiggyBankControllerTest.php
index 062d1ea026..40815f54e9 100644
--- a/tests/Api/V1/Controllers/PiggyBankControllerTest.php
+++ b/tests/Api/V1/Controllers/PiggyBankControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * PiggyBankControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Api/V1/Controllers/PreferencesControllerTest.php b/tests/Api/V1/Controllers/PreferencesControllerTest.php
index d11443b9c9..25ed6964ff 100644
--- a/tests/Api/V1/Controllers/PreferencesControllerTest.php
+++ b/tests/Api/V1/Controllers/PreferencesControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * PreferencesControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Api/V1/Controllers/RecurrenceControllerTest.php b/tests/Api/V1/Controllers/RecurrenceControllerTest.php
index 25dc69025a..661a206436 100644
--- a/tests/Api/V1/Controllers/RecurrenceControllerTest.php
+++ b/tests/Api/V1/Controllers/RecurrenceControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * RecurrenceControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Api/V1/Controllers/RuleControllerTest.php b/tests/Api/V1/Controllers/RuleControllerTest.php
index ca132f96ef..9be548e1ba 100644
--- a/tests/Api/V1/Controllers/RuleControllerTest.php
+++ b/tests/Api/V1/Controllers/RuleControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * RuleControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Api/V1/Controllers/RuleGroupControllerTest.php b/tests/Api/V1/Controllers/RuleGroupControllerTest.php
index 1c6d2e1664..7333ca03af 100644
--- a/tests/Api/V1/Controllers/RuleGroupControllerTest.php
+++ b/tests/Api/V1/Controllers/RuleGroupControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * RuleGroupControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Api/V1/Controllers/SummaryControllerTest.php b/tests/Api/V1/Controllers/SummaryControllerTest.php
index 3ebd6297fb..e789fa35ce 100644
--- a/tests/Api/V1/Controllers/SummaryControllerTest.php
+++ b/tests/Api/V1/Controllers/SummaryControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * SummaryControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Api/V1/Controllers/TagControllerTest.php b/tests/Api/V1/Controllers/TagControllerTest.php
index 48548c1b9f..9339462aaa 100644
--- a/tests/Api/V1/Controllers/TagControllerTest.php
+++ b/tests/Api/V1/Controllers/TagControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * TagControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Api/V1/Controllers/TransactionControllerTest.php b/tests/Api/V1/Controllers/TransactionControllerTest.php
index 5583822c68..70f54172bc 100644
--- a/tests/Api/V1/Controllers/TransactionControllerTest.php
+++ b/tests/Api/V1/Controllers/TransactionControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * TransactionControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Api/V1/Controllers/TransactionLinkControllerTest.php b/tests/Api/V1/Controllers/TransactionLinkControllerTest.php
index 6552f03634..720f379f79 100644
--- a/tests/Api/V1/Controllers/TransactionLinkControllerTest.php
+++ b/tests/Api/V1/Controllers/TransactionLinkControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * TransactionLinkControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Api/V1/Controllers/UserControllerTest.php b/tests/Api/V1/Controllers/UserControllerTest.php
index 69719d2416..85f9511c0b 100644
--- a/tests/Api/V1/Controllers/UserControllerTest.php
+++ b/tests/Api/V1/Controllers/UserControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * UserControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Account/CreateControllerTest.php b/tests/Feature/Controllers/Account/CreateControllerTest.php
index 68056c07ee..990efc2d73 100644
--- a/tests/Feature/Controllers/Account/CreateControllerTest.php
+++ b/tests/Feature/Controllers/Account/CreateControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * CreateControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Account/DeleteControllerTest.php b/tests/Feature/Controllers/Account/DeleteControllerTest.php
index 5e65ab1b85..04b9fbcbc0 100644
--- a/tests/Feature/Controllers/Account/DeleteControllerTest.php
+++ b/tests/Feature/Controllers/Account/DeleteControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * DeleteControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Account/EditControllerTest.php b/tests/Feature/Controllers/Account/EditControllerTest.php
index 686a420ce6..10b69ce499 100644
--- a/tests/Feature/Controllers/Account/EditControllerTest.php
+++ b/tests/Feature/Controllers/Account/EditControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * EditControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Account/IndexControllerTest.php b/tests/Feature/Controllers/Account/IndexControllerTest.php
index 84e1883b00..449ea66153 100644
--- a/tests/Feature/Controllers/Account/IndexControllerTest.php
+++ b/tests/Feature/Controllers/Account/IndexControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * IndexControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Account/ReconcileControllerTest.php b/tests/Feature/Controllers/Account/ReconcileControllerTest.php
index aea49aad5e..6c36d2d7b9 100644
--- a/tests/Feature/Controllers/Account/ReconcileControllerTest.php
+++ b/tests/Feature/Controllers/Account/ReconcileControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ReconcileControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Account/ShowControllerTest.php b/tests/Feature/Controllers/Account/ShowControllerTest.php
index 399eae3487..377e49c66e 100644
--- a/tests/Feature/Controllers/Account/ShowControllerTest.php
+++ b/tests/Feature/Controllers/Account/ShowControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ShowControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php b/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php
index 072c99c7b6..8c0f6cd0a9 100644
--- a/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php
+++ b/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ConfigurationControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Admin/HomeControllerTest.php b/tests/Feature/Controllers/Admin/HomeControllerTest.php
index d214368496..2c577cb4c0 100644
--- a/tests/Feature/Controllers/Admin/HomeControllerTest.php
+++ b/tests/Feature/Controllers/Admin/HomeControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * HomeControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Admin/LinkControllerTest.php b/tests/Feature/Controllers/Admin/LinkControllerTest.php
index 8f0c9a0697..ae12cc2821 100644
--- a/tests/Feature/Controllers/Admin/LinkControllerTest.php
+++ b/tests/Feature/Controllers/Admin/LinkControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * LinkControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Admin/UpdateControllerTest.php b/tests/Feature/Controllers/Admin/UpdateControllerTest.php
index 65f6ead49b..197a54e7d4 100644
--- a/tests/Feature/Controllers/Admin/UpdateControllerTest.php
+++ b/tests/Feature/Controllers/Admin/UpdateControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * UpdateControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Admin/UserControllerTest.php b/tests/Feature/Controllers/Admin/UserControllerTest.php
index 898ed733dc..3248765b33 100644
--- a/tests/Feature/Controllers/Admin/UserControllerTest.php
+++ b/tests/Feature/Controllers/Admin/UserControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * UserControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/AttachmentControllerTest.php b/tests/Feature/Controllers/AttachmentControllerTest.php
index dbd814784c..76cf8e5841 100644
--- a/tests/Feature/Controllers/AttachmentControllerTest.php
+++ b/tests/Feature/Controllers/AttachmentControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AttachmentControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php b/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php
index 114c3c1d42..2fe021fecf 100644
--- a/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php
+++ b/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * TwoFactorControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/BillControllerTest.php b/tests/Feature/Controllers/BillControllerTest.php
index c39cb63f50..dac9dc58be 100644
--- a/tests/Feature/Controllers/BillControllerTest.php
+++ b/tests/Feature/Controllers/BillControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * BillControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Budget/CreateControllerTest.php b/tests/Feature/Controllers/Budget/CreateControllerTest.php
index 92f1358cbb..6aae119397 100644
--- a/tests/Feature/Controllers/Budget/CreateControllerTest.php
+++ b/tests/Feature/Controllers/Budget/CreateControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * CreateControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Budget/DeleteControllerTest.php b/tests/Feature/Controllers/Budget/DeleteControllerTest.php
index a98b14cc10..07e40a68e9 100644
--- a/tests/Feature/Controllers/Budget/DeleteControllerTest.php
+++ b/tests/Feature/Controllers/Budget/DeleteControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * DeleteControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Budget/EditControllerTest.php b/tests/Feature/Controllers/Budget/EditControllerTest.php
index a5a4e2fcc3..37fedc14cc 100644
--- a/tests/Feature/Controllers/Budget/EditControllerTest.php
+++ b/tests/Feature/Controllers/Budget/EditControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * EditControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Budget/IndexControllerTest.php b/tests/Feature/Controllers/Budget/IndexControllerTest.php
index 95028b256a..c56a5c5914 100644
--- a/tests/Feature/Controllers/Budget/IndexControllerTest.php
+++ b/tests/Feature/Controllers/Budget/IndexControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * IndexControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Budget/ShowControllerTest.php b/tests/Feature/Controllers/Budget/ShowControllerTest.php
index 030eb95e69..7c5e9d9208 100644
--- a/tests/Feature/Controllers/Budget/ShowControllerTest.php
+++ b/tests/Feature/Controllers/Budget/ShowControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ShowControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Category/CreateControllerTest.php b/tests/Feature/Controllers/Category/CreateControllerTest.php
index a707553513..0be105fac3 100644
--- a/tests/Feature/Controllers/Category/CreateControllerTest.php
+++ b/tests/Feature/Controllers/Category/CreateControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * CreateControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Category/DeleteControllerTest.php b/tests/Feature/Controllers/Category/DeleteControllerTest.php
index d1259224a6..a12de1c99b 100644
--- a/tests/Feature/Controllers/Category/DeleteControllerTest.php
+++ b/tests/Feature/Controllers/Category/DeleteControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * DeleteControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Category/EditControllerTest.php b/tests/Feature/Controllers/Category/EditControllerTest.php
index eaced588e9..cfa8e7d237 100644
--- a/tests/Feature/Controllers/Category/EditControllerTest.php
+++ b/tests/Feature/Controllers/Category/EditControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * EditControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Category/IndexControllerTest.php b/tests/Feature/Controllers/Category/IndexControllerTest.php
index 811a28714c..fb7dc9375c 100644
--- a/tests/Feature/Controllers/Category/IndexControllerTest.php
+++ b/tests/Feature/Controllers/Category/IndexControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * IndexControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Category/NoCategoryControllerTest.php b/tests/Feature/Controllers/Category/NoCategoryControllerTest.php
index 74e1483590..c7ef951df2 100644
--- a/tests/Feature/Controllers/Category/NoCategoryControllerTest.php
+++ b/tests/Feature/Controllers/Category/NoCategoryControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * NoCategoryControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Category/ShowControllerTest.php b/tests/Feature/Controllers/Category/ShowControllerTest.php
index 56236b1b2e..26cbff414f 100644
--- a/tests/Feature/Controllers/Category/ShowControllerTest.php
+++ b/tests/Feature/Controllers/Category/ShowControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ShowControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Chart/AccountControllerTest.php b/tests/Feature/Controllers/Chart/AccountControllerTest.php
index 8ef6a34123..147f04098b 100644
--- a/tests/Feature/Controllers/Chart/AccountControllerTest.php
+++ b/tests/Feature/Controllers/Chart/AccountControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AccountControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Chart/BillControllerTest.php b/tests/Feature/Controllers/Chart/BillControllerTest.php
index 4a58765f52..619cae720c 100644
--- a/tests/Feature/Controllers/Chart/BillControllerTest.php
+++ b/tests/Feature/Controllers/Chart/BillControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * BillControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Chart/BudgetControllerTest.php b/tests/Feature/Controllers/Chart/BudgetControllerTest.php
index 2c10dc86e9..030a3ad084 100644
--- a/tests/Feature/Controllers/Chart/BudgetControllerTest.php
+++ b/tests/Feature/Controllers/Chart/BudgetControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * BudgetControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Chart/BudgetReportControllerTest.php b/tests/Feature/Controllers/Chart/BudgetReportControllerTest.php
index 4102625708..1776cd7766 100644
--- a/tests/Feature/Controllers/Chart/BudgetReportControllerTest.php
+++ b/tests/Feature/Controllers/Chart/BudgetReportControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * BudgetReportControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Chart/CategoryControllerTest.php b/tests/Feature/Controllers/Chart/CategoryControllerTest.php
index 48aa96bcc4..782ed1d044 100644
--- a/tests/Feature/Controllers/Chart/CategoryControllerTest.php
+++ b/tests/Feature/Controllers/Chart/CategoryControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * CategoryControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php b/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php
index 7246432bcf..34b0916735 100644
--- a/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php
+++ b/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * CategoryReportControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Chart/PiggyBankControllerTest.php b/tests/Feature/Controllers/Chart/PiggyBankControllerTest.php
index 3dd27e0723..cad95034a2 100644
--- a/tests/Feature/Controllers/Chart/PiggyBankControllerTest.php
+++ b/tests/Feature/Controllers/Chart/PiggyBankControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * PiggyBankControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Chart/ReportControllerTest.php b/tests/Feature/Controllers/Chart/ReportControllerTest.php
index 2a05aeb147..aa60a932a0 100644
--- a/tests/Feature/Controllers/Chart/ReportControllerTest.php
+++ b/tests/Feature/Controllers/Chart/ReportControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ReportControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Chart/TagReportControllerTest.php b/tests/Feature/Controllers/Chart/TagReportControllerTest.php
index c732d4de05..0b72bef9c8 100644
--- a/tests/Feature/Controllers/Chart/TagReportControllerTest.php
+++ b/tests/Feature/Controllers/Chart/TagReportControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * TagReportControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/CurrencyControllerTest.php b/tests/Feature/Controllers/CurrencyControllerTest.php
index d38374d02f..4e4225b4e7 100644
--- a/tests/Feature/Controllers/CurrencyControllerTest.php
+++ b/tests/Feature/Controllers/CurrencyControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * CurrencyControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/DebugControllerTest.php b/tests/Feature/Controllers/DebugControllerTest.php
index aabfb844cc..a9ca49bf19 100644
--- a/tests/Feature/Controllers/DebugControllerTest.php
+++ b/tests/Feature/Controllers/DebugControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * DebugControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/HelpControllerTest.php b/tests/Feature/Controllers/HelpControllerTest.php
index 483ab6a81a..4f2b91de69 100644
--- a/tests/Feature/Controllers/HelpControllerTest.php
+++ b/tests/Feature/Controllers/HelpControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * HelpControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/HomeControllerTest.php b/tests/Feature/Controllers/HomeControllerTest.php
index ed27edb3e1..caaf244fe3 100644
--- a/tests/Feature/Controllers/HomeControllerTest.php
+++ b/tests/Feature/Controllers/HomeControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * HomeControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Import/CallbackControllerTest.php b/tests/Feature/Controllers/Import/CallbackControllerTest.php
index 437f952fa3..a3efc38083 100644
--- a/tests/Feature/Controllers/Import/CallbackControllerTest.php
+++ b/tests/Feature/Controllers/Import/CallbackControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * CallbackControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Import/IndexControllerTest.php b/tests/Feature/Controllers/Import/IndexControllerTest.php
index 92e6d70e26..e75d96f978 100644
--- a/tests/Feature/Controllers/Import/IndexControllerTest.php
+++ b/tests/Feature/Controllers/Import/IndexControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * IndexControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Import/JobConfigurationControllerTest.php b/tests/Feature/Controllers/Import/JobConfigurationControllerTest.php
index 0c2447604d..be5fc3bf64 100644
--- a/tests/Feature/Controllers/Import/JobConfigurationControllerTest.php
+++ b/tests/Feature/Controllers/Import/JobConfigurationControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * JobConfigurationControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Import/JobStatusControllerTest.php b/tests/Feature/Controllers/Import/JobStatusControllerTest.php
index 5e8b8aa825..a305e8b713 100644
--- a/tests/Feature/Controllers/Import/JobStatusControllerTest.php
+++ b/tests/Feature/Controllers/Import/JobStatusControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * JobStatusControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Import/PrerequisitesControllerTest.php b/tests/Feature/Controllers/Import/PrerequisitesControllerTest.php
index 7dd4d42ad9..b0c6a6a84e 100644
--- a/tests/Feature/Controllers/Import/PrerequisitesControllerTest.php
+++ b/tests/Feature/Controllers/Import/PrerequisitesControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * PrerequisitesControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/JavascriptControllerTest.php b/tests/Feature/Controllers/JavascriptControllerTest.php
index fb81ae23f3..32625a8643 100644
--- a/tests/Feature/Controllers/JavascriptControllerTest.php
+++ b/tests/Feature/Controllers/JavascriptControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * JavascriptControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php b/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php
index 70c90954b3..0e13e9a386 100644
--- a/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php
+++ b/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AutoCompleteControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Json/BoxControllerTest.php b/tests/Feature/Controllers/Json/BoxControllerTest.php
index 75a8aa0b9e..f391f4b455 100644
--- a/tests/Feature/Controllers/Json/BoxControllerTest.php
+++ b/tests/Feature/Controllers/Json/BoxControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * BoxControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Json/ExchangeControllerTest.php b/tests/Feature/Controllers/Json/ExchangeControllerTest.php
index ca065ec001..f74f05f9ba 100644
--- a/tests/Feature/Controllers/Json/ExchangeControllerTest.php
+++ b/tests/Feature/Controllers/Json/ExchangeControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ExchangeControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Json/FrontpageControllerTest.php b/tests/Feature/Controllers/Json/FrontpageControllerTest.php
index b7e9a3d159..f94f751d1e 100644
--- a/tests/Feature/Controllers/Json/FrontpageControllerTest.php
+++ b/tests/Feature/Controllers/Json/FrontpageControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * FrontpageControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Json/IntroControllerTest.php b/tests/Feature/Controllers/Json/IntroControllerTest.php
index c90c4001b6..4445a6aec4 100644
--- a/tests/Feature/Controllers/Json/IntroControllerTest.php
+++ b/tests/Feature/Controllers/Json/IntroControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * IntroControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Json/ReconcileControllerTest.php b/tests/Feature/Controllers/Json/ReconcileControllerTest.php
index ade00e2f6b..2b6f36fab8 100644
--- a/tests/Feature/Controllers/Json/ReconcileControllerTest.php
+++ b/tests/Feature/Controllers/Json/ReconcileControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ReconcileControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Json/RecurrenceControllerTest.php b/tests/Feature/Controllers/Json/RecurrenceControllerTest.php
index c184e8f7ae..8a8ff3a859 100644
--- a/tests/Feature/Controllers/Json/RecurrenceControllerTest.php
+++ b/tests/Feature/Controllers/Json/RecurrenceControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * RecurrenceControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Json/RuleControllerTest.php b/tests/Feature/Controllers/Json/RuleControllerTest.php
index 3fcf2130b5..dd77686c17 100644
--- a/tests/Feature/Controllers/Json/RuleControllerTest.php
+++ b/tests/Feature/Controllers/Json/RuleControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * RuleControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/NewUserControllerTest.php b/tests/Feature/Controllers/NewUserControllerTest.php
index 934b3a5574..5b38753d81 100644
--- a/tests/Feature/Controllers/NewUserControllerTest.php
+++ b/tests/Feature/Controllers/NewUserControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * NewUserControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/PiggyBankControllerTest.php b/tests/Feature/Controllers/PiggyBankControllerTest.php
index 912769f6ba..3a3cc446cb 100644
--- a/tests/Feature/Controllers/PiggyBankControllerTest.php
+++ b/tests/Feature/Controllers/PiggyBankControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * PiggyBankControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Popup/ReportControllerTest.php b/tests/Feature/Controllers/Popup/ReportControllerTest.php
index 87b16c1b37..2ccbb6b97f 100644
--- a/tests/Feature/Controllers/Popup/ReportControllerTest.php
+++ b/tests/Feature/Controllers/Popup/ReportControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ReportControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/PreferencesControllerTest.php b/tests/Feature/Controllers/PreferencesControllerTest.php
index 50c3978f8b..0f2a3efa19 100644
--- a/tests/Feature/Controllers/PreferencesControllerTest.php
+++ b/tests/Feature/Controllers/PreferencesControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * PreferencesControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/ProfileControllerTest.php b/tests/Feature/Controllers/ProfileControllerTest.php
index 4981bfdc23..b1191f60ea 100644
--- a/tests/Feature/Controllers/ProfileControllerTest.php
+++ b/tests/Feature/Controllers/ProfileControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ProfileControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Recurring/CreateControllerTest.php b/tests/Feature/Controllers/Recurring/CreateControllerTest.php
index 2acead0eb9..c6e78e7d0e 100644
--- a/tests/Feature/Controllers/Recurring/CreateControllerTest.php
+++ b/tests/Feature/Controllers/Recurring/CreateControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * CreateControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Recurring/DeleteControllerTest.php b/tests/Feature/Controllers/Recurring/DeleteControllerTest.php
index 561984ab6d..faf9a0ba43 100644
--- a/tests/Feature/Controllers/Recurring/DeleteControllerTest.php
+++ b/tests/Feature/Controllers/Recurring/DeleteControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * DeleteControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Recurring/EditControllerTest.php b/tests/Feature/Controllers/Recurring/EditControllerTest.php
index 0220817e93..9948b591cf 100644
--- a/tests/Feature/Controllers/Recurring/EditControllerTest.php
+++ b/tests/Feature/Controllers/Recurring/EditControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * EditControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Recurring/IndexControllerTest.php b/tests/Feature/Controllers/Recurring/IndexControllerTest.php
index be1b8a6a8e..b1d9bfd5e1 100644
--- a/tests/Feature/Controllers/Recurring/IndexControllerTest.php
+++ b/tests/Feature/Controllers/Recurring/IndexControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * IndexControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Recurring/ShowControllerTest.php b/tests/Feature/Controllers/Recurring/ShowControllerTest.php
index 0edc0425be..e64db56a9d 100644
--- a/tests/Feature/Controllers/Recurring/ShowControllerTest.php
+++ b/tests/Feature/Controllers/Recurring/ShowControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ShowControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Report/AccountControllerTest.php b/tests/Feature/Controllers/Report/AccountControllerTest.php
index da246be85b..85d1b6c185 100644
--- a/tests/Feature/Controllers/Report/AccountControllerTest.php
+++ b/tests/Feature/Controllers/Report/AccountControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AccountControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Report/BalanceControllerTest.php b/tests/Feature/Controllers/Report/BalanceControllerTest.php
index 0d0f658fa0..745ef2f48f 100644
--- a/tests/Feature/Controllers/Report/BalanceControllerTest.php
+++ b/tests/Feature/Controllers/Report/BalanceControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * BalanceControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Report/BudgetControllerTest.php b/tests/Feature/Controllers/Report/BudgetControllerTest.php
index 5d0e4ab3bb..352e8d686b 100644
--- a/tests/Feature/Controllers/Report/BudgetControllerTest.php
+++ b/tests/Feature/Controllers/Report/BudgetControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * BudgetControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Report/CategoryControllerTest.php b/tests/Feature/Controllers/Report/CategoryControllerTest.php
index dac09e6719..90b9c28535 100644
--- a/tests/Feature/Controllers/Report/CategoryControllerTest.php
+++ b/tests/Feature/Controllers/Report/CategoryControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * CategoryControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Report/OperationsControllerTest.php b/tests/Feature/Controllers/Report/OperationsControllerTest.php
index e3bcc25e2d..df453f8986 100644
--- a/tests/Feature/Controllers/Report/OperationsControllerTest.php
+++ b/tests/Feature/Controllers/Report/OperationsControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * OperationsControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/ReportControllerTest.php b/tests/Feature/Controllers/ReportControllerTest.php
index f16145c59d..6fb1e8e4c4 100644
--- a/tests/Feature/Controllers/ReportControllerTest.php
+++ b/tests/Feature/Controllers/ReportControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ReportControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Rule/CreateControllerTest.php b/tests/Feature/Controllers/Rule/CreateControllerTest.php
index f31fdbde77..a31d71be96 100644
--- a/tests/Feature/Controllers/Rule/CreateControllerTest.php
+++ b/tests/Feature/Controllers/Rule/CreateControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * CreateControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Rule/DeleteControllerTest.php b/tests/Feature/Controllers/Rule/DeleteControllerTest.php
index d8e17ca6c8..7b14cea9ec 100644
--- a/tests/Feature/Controllers/Rule/DeleteControllerTest.php
+++ b/tests/Feature/Controllers/Rule/DeleteControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * DeleteControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Rule/EditControllerTest.php b/tests/Feature/Controllers/Rule/EditControllerTest.php
index 110683a270..fb3cd79d7e 100644
--- a/tests/Feature/Controllers/Rule/EditControllerTest.php
+++ b/tests/Feature/Controllers/Rule/EditControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * EditControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Rule/IndexControllerTest.php b/tests/Feature/Controllers/Rule/IndexControllerTest.php
index 8c7d59edc1..fc1e2b1cce 100644
--- a/tests/Feature/Controllers/Rule/IndexControllerTest.php
+++ b/tests/Feature/Controllers/Rule/IndexControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * IndexControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Rule/SelectControllerTest.php b/tests/Feature/Controllers/Rule/SelectControllerTest.php
index f6294eb94d..eeba6d2235 100644
--- a/tests/Feature/Controllers/Rule/SelectControllerTest.php
+++ b/tests/Feature/Controllers/Rule/SelectControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * SelectControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/RuleGroup/CreateControllerTest.php b/tests/Feature/Controllers/RuleGroup/CreateControllerTest.php
index 780456ba9f..52b875184e 100644
--- a/tests/Feature/Controllers/RuleGroup/CreateControllerTest.php
+++ b/tests/Feature/Controllers/RuleGroup/CreateControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * CreateControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/RuleGroup/DeleteControllerTest.php b/tests/Feature/Controllers/RuleGroup/DeleteControllerTest.php
index c46320ddb0..9dd5653915 100644
--- a/tests/Feature/Controllers/RuleGroup/DeleteControllerTest.php
+++ b/tests/Feature/Controllers/RuleGroup/DeleteControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * DeleteControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/RuleGroup/EditControllerTest.php b/tests/Feature/Controllers/RuleGroup/EditControllerTest.php
index 374c075a31..3987ed985c 100644
--- a/tests/Feature/Controllers/RuleGroup/EditControllerTest.php
+++ b/tests/Feature/Controllers/RuleGroup/EditControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * EditControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/RuleGroup/ExecutionControllerTest.php b/tests/Feature/Controllers/RuleGroup/ExecutionControllerTest.php
index 2b7f33cbce..7c32f7b5da 100644
--- a/tests/Feature/Controllers/RuleGroup/ExecutionControllerTest.php
+++ b/tests/Feature/Controllers/RuleGroup/ExecutionControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ExecutionControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/SearchControllerTest.php b/tests/Feature/Controllers/SearchControllerTest.php
index 20908ca919..5a7caf456e 100644
--- a/tests/Feature/Controllers/SearchControllerTest.php
+++ b/tests/Feature/Controllers/SearchControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * SearchControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/System/CronControllerTest.php b/tests/Feature/Controllers/System/CronControllerTest.php
index b14ab15ee8..86b80078e9 100644
--- a/tests/Feature/Controllers/System/CronControllerTest.php
+++ b/tests/Feature/Controllers/System/CronControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * CronControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/TagControllerTest.php b/tests/Feature/Controllers/TagControllerTest.php
index 26aec79f3c..0e87cf1312 100644
--- a/tests/Feature/Controllers/TagControllerTest.php
+++ b/tests/Feature/Controllers/TagControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * TagControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Transaction/BulkControllerTest.php b/tests/Feature/Controllers/Transaction/BulkControllerTest.php
index ba93ee0379..aad8377e01 100644
--- a/tests/Feature/Controllers/Transaction/BulkControllerTest.php
+++ b/tests/Feature/Controllers/Transaction/BulkControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * BulkControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Transaction/ConvertControllerTest.php b/tests/Feature/Controllers/Transaction/ConvertControllerTest.php
index 25ca5ad01c..ebf3468dad 100644
--- a/tests/Feature/Controllers/Transaction/ConvertControllerTest.php
+++ b/tests/Feature/Controllers/Transaction/ConvertControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ConvertControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Transaction/CreateControllerTest.php b/tests/Feature/Controllers/Transaction/CreateControllerTest.php
index ec061b4578..1f62fcab08 100644
--- a/tests/Feature/Controllers/Transaction/CreateControllerTest.php
+++ b/tests/Feature/Controllers/Transaction/CreateControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * CreateControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Transaction/EditControllerTest.php b/tests/Feature/Controllers/Transaction/EditControllerTest.php
index b0119c4297..657efed874 100644
--- a/tests/Feature/Controllers/Transaction/EditControllerTest.php
+++ b/tests/Feature/Controllers/Transaction/EditControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * EditControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Transaction/IndexControllerTest.php b/tests/Feature/Controllers/Transaction/IndexControllerTest.php
index 43b248f8d2..efae1b89b6 100644
--- a/tests/Feature/Controllers/Transaction/IndexControllerTest.php
+++ b/tests/Feature/Controllers/Transaction/IndexControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * IndexControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Transaction/LinkControllerTest.php b/tests/Feature/Controllers/Transaction/LinkControllerTest.php
index 5c16990289..f9b4bb45b1 100644
--- a/tests/Feature/Controllers/Transaction/LinkControllerTest.php
+++ b/tests/Feature/Controllers/Transaction/LinkControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * LinkControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Transaction/MassControllerTest.php b/tests/Feature/Controllers/Transaction/MassControllerTest.php
index 504650392d..2d5e9eb765 100644
--- a/tests/Feature/Controllers/Transaction/MassControllerTest.php
+++ b/tests/Feature/Controllers/Transaction/MassControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * MassControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/Controllers/Transaction/ShowControllerTest.php b/tests/Feature/Controllers/Transaction/ShowControllerTest.php
index e6a103e539..846223a013 100644
--- a/tests/Feature/Controllers/Transaction/ShowControllerTest.php
+++ b/tests/Feature/Controllers/Transaction/ShowControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ShowControllerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php
index 0a5ec25588..84c36b1b95 100644
--- a/tests/Feature/ExampleTest.php
+++ b/tests/Feature/ExampleTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ExampleTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Object/FakeApiContext.php b/tests/Object/FakeApiContext.php
index 7d5fc9dd57..84e3575039 100644
--- a/tests/Object/FakeApiContext.php
+++ b/tests/Object/FakeApiContext.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * FakeApiContext.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Support/TestDataTrait.php b/tests/Support/TestDataTrait.php
index adecc5a0db..707f8ea7a5 100644
--- a/tests/Support/TestDataTrait.php
+++ b/tests/Support/TestDataTrait.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * TestDataTrait.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Console/Commands/Correction/CreateAccessTokensTest.php b/tests/Unit/Console/Commands/Correction/CreateAccessTokensTest.php
index 2cafdad40b..9f09c03e90 100644
--- a/tests/Unit/Console/Commands/Correction/CreateAccessTokensTest.php
+++ b/tests/Unit/Console/Commands/Correction/CreateAccessTokensTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * CreateAccessTokensTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Console/Commands/Correction/CreateLinkTypesTest.php b/tests/Unit/Console/Commands/Correction/CreateLinkTypesTest.php
index 1dd6f3cbe7..0497752bd0 100644
--- a/tests/Unit/Console/Commands/Correction/CreateLinkTypesTest.php
+++ b/tests/Unit/Console/Commands/Correction/CreateLinkTypesTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * CreateLinkTypesTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Console/Commands/Correction/DeleteEmptyGroupsTest.php b/tests/Unit/Console/Commands/Correction/DeleteEmptyGroupsTest.php
index 50cc34ca36..7bcb404471 100644
--- a/tests/Unit/Console/Commands/Correction/DeleteEmptyGroupsTest.php
+++ b/tests/Unit/Console/Commands/Correction/DeleteEmptyGroupsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * DeleteEmptyGroupsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Console/Commands/Correction/DeleteEmptyJournalsTest.php b/tests/Unit/Console/Commands/Correction/DeleteEmptyJournalsTest.php
index d53dcea409..239551b6ed 100644
--- a/tests/Unit/Console/Commands/Correction/DeleteEmptyJournalsTest.php
+++ b/tests/Unit/Console/Commands/Correction/DeleteEmptyJournalsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * DeleteEmptyJournalsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Console/Commands/Correction/DeleteOrphanedTransactionsTest.php b/tests/Unit/Console/Commands/Correction/DeleteOrphanedTransactionsTest.php
index 7f487e7df3..d3e8acd56f 100644
--- a/tests/Unit/Console/Commands/Correction/DeleteOrphanedTransactionsTest.php
+++ b/tests/Unit/Console/Commands/Correction/DeleteOrphanedTransactionsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * DeleteOrphanedTransactionsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Console/Commands/Correction/DeleteZeroAmountTest.php b/tests/Unit/Console/Commands/Correction/DeleteZeroAmountTest.php
index 05fb491eb3..c55fd4cedc 100644
--- a/tests/Unit/Console/Commands/Correction/DeleteZeroAmountTest.php
+++ b/tests/Unit/Console/Commands/Correction/DeleteZeroAmountTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * DeleteZeroAmountTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Console/Commands/Correction/EnableCurrenciesTest.php b/tests/Unit/Console/Commands/Correction/EnableCurrenciesTest.php
index ca3db30ada..47cdc6e8e7 100644
--- a/tests/Unit/Console/Commands/Correction/EnableCurrenciesTest.php
+++ b/tests/Unit/Console/Commands/Correction/EnableCurrenciesTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * EnableCurrenciesTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Console/Commands/Correction/FixAccountTypesTest.php b/tests/Unit/Console/Commands/Correction/FixAccountTypesTest.php
index cb64910d7c..29fea4d54c 100644
--- a/tests/Unit/Console/Commands/Correction/FixAccountTypesTest.php
+++ b/tests/Unit/Console/Commands/Correction/FixAccountTypesTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * FixAccountTypesTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Console/Commands/Correction/FixPiggiesTest.php b/tests/Unit/Console/Commands/Correction/FixPiggiesTest.php
index 9808a9e5d4..48e7e8af60 100644
--- a/tests/Unit/Console/Commands/Correction/FixPiggiesTest.php
+++ b/tests/Unit/Console/Commands/Correction/FixPiggiesTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * FixPiggiesTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Console/Commands/Correction/FixUnevenAmountTest.php b/tests/Unit/Console/Commands/Correction/FixUnevenAmountTest.php
index 4eb04052b7..2ea943a506 100644
--- a/tests/Unit/Console/Commands/Correction/FixUnevenAmountTest.php
+++ b/tests/Unit/Console/Commands/Correction/FixUnevenAmountTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * FixUnevenAmountTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Console/Commands/Correction/RemoveBillsTest.php b/tests/Unit/Console/Commands/Correction/RemoveBillsTest.php
index 1d9bab98a5..e28e147c9e 100644
--- a/tests/Unit/Console/Commands/Correction/RemoveBillsTest.php
+++ b/tests/Unit/Console/Commands/Correction/RemoveBillsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * RemoveBillsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Console/Commands/Correction/RenameMetaFieldsTest.php b/tests/Unit/Console/Commands/Correction/RenameMetaFieldsTest.php
index fa75118e9d..3cfdbcd28f 100644
--- a/tests/Unit/Console/Commands/Correction/RenameMetaFieldsTest.php
+++ b/tests/Unit/Console/Commands/Correction/RenameMetaFieldsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * RenameMetaFieldsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Console/Commands/Correction/TransferBudgetsTest.php b/tests/Unit/Console/Commands/Correction/TransferBudgetsTest.php
index 662513d874..e86047e509 100644
--- a/tests/Unit/Console/Commands/Correction/TransferBudgetsTest.php
+++ b/tests/Unit/Console/Commands/Correction/TransferBudgetsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * TransferBudgetsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Console/Commands/DecryptDatabaseTest.php b/tests/Unit/Console/Commands/DecryptDatabaseTest.php
index ba755d2001..3cc3ba4560 100644
--- a/tests/Unit/Console/Commands/DecryptDatabaseTest.php
+++ b/tests/Unit/Console/Commands/DecryptDatabaseTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * DecryptDatabaseTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Console/Commands/Import/CreateCSVImportTest.php b/tests/Unit/Console/Commands/Import/CreateCSVImportTest.php
index 943848a727..4008d81744 100644
--- a/tests/Unit/Console/Commands/Import/CreateCSVImportTest.php
+++ b/tests/Unit/Console/Commands/Import/CreateCSVImportTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * CreateCSVImportTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -110,7 +110,7 @@ class CreateCSVImportTest extends TestCase
         $this->artisan('firefly-iii:csv-import ' . implode(' ', $parameters))
              ->expectsOutput(sprintf('Import file        : %s', $file))
              ->expectsOutput(sprintf('Configuration file : %s', $config))
-             ->expectsOutput('User               : #1 (thegrumpydictator@gmail.com)')
+             ->expectsOutput('User               : #1 (james@firefly-iii.org)')
              ->expectsOutput(sprintf('Job                : %s', $importJob->key))
              ->assertExitCode(0);
 
@@ -184,7 +184,7 @@ class CreateCSVImportTest extends TestCase
         $this->artisan('firefly-iii:csv-import ' . implode(' ', $parameters))
              ->expectsOutput(sprintf('Import file        : %s', $file))
              ->expectsOutput(sprintf('Configuration file : %s', $config))
-             ->expectsOutput('User               : #1 (thegrumpydictator@gmail.com)')
+             ->expectsOutput('User               : #1 (james@firefly-iii.org)')
              ->expectsOutput(sprintf('Job                : %s', $importJob->key))
              ->expectsOutput('No transactions have been imported :(.')
              ->assertExitCode(0);
@@ -258,7 +258,7 @@ class CreateCSVImportTest extends TestCase
         $this->artisan('firefly-iii:csv-import ' . implode(' ', $parameters))
              ->expectsOutput(sprintf('Import file        : %s', $file))
              ->expectsOutput(sprintf('Configuration file : %s', $config))
-             ->expectsOutput('User               : #1 (thegrumpydictator@gmail.com)')
+             ->expectsOutput('User               : #1 (james@firefly-iii.org)')
              ->expectsOutput(sprintf('Job                : %s', $importJob->key))
              ->expectsOutput('- I am an error')
              ->assertExitCode(0);
@@ -321,7 +321,7 @@ class CreateCSVImportTest extends TestCase
         $this->artisan('firefly-iii:csv-import ' . implode(' ', $parameters))
              ->expectsOutput(sprintf('Import file        : %s', $file))
              ->expectsOutput(sprintf('Configuration file : %s', $config))
-             ->expectsOutput('User               : #1 (thegrumpydictator@gmail.com)')
+             ->expectsOutput('User               : #1 (james@firefly-iii.org)')
              ->expectsOutput(sprintf('Job                : %s', $importJob->key))
              ->expectsOutput('The import routine crashed: I am storage error.')
              ->assertExitCode(1);
@@ -378,7 +378,7 @@ class CreateCSVImportTest extends TestCase
         $this->artisan('firefly-iii:csv-import ' . implode(' ', $parameters))
              ->expectsOutput(sprintf('Import file        : %s', $file))
              ->expectsOutput(sprintf('Configuration file : %s', $config))
-             ->expectsOutput('User               : #1 (thegrumpydictator@gmail.com)')
+             ->expectsOutput('User               : #1 (james@firefly-iii.org)')
              ->expectsOutput(sprintf('Job                : %s', $importJob->key))
              ->expectsOutput('The import routine crashed: I am big bad exception.')
              ->assertExitCode(1);
@@ -429,7 +429,7 @@ class CreateCSVImportTest extends TestCase
         $this->artisan('firefly-iii:csv-import ' . implode(' ', $parameters))
              ->expectsOutput(sprintf('Import file        : %s', $file))
              ->expectsOutput(sprintf('Configuration file : %s', $config))
-             ->expectsOutput('User               : #1 (thegrumpydictator@gmail.com)')
+             ->expectsOutput('User               : #1 (james@firefly-iii.org)')
              ->expectsOutput(sprintf('Job                : %s', $importJob->key))
              ->expectsOutput('Some file error.')
              ->assertExitCode(1);
diff --git a/tests/Unit/Console/Commands/Integrity/ReportEmptyObjectsTest.php b/tests/Unit/Console/Commands/Integrity/ReportEmptyObjectsTest.php
index 93bfcb456a..57b1b7c0e6 100644
--- a/tests/Unit/Console/Commands/Integrity/ReportEmptyObjectsTest.php
+++ b/tests/Unit/Console/Commands/Integrity/ReportEmptyObjectsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ReportEmptyObjectsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Console/Commands/Integrity/ReportSumTest.php b/tests/Unit/Console/Commands/Integrity/ReportSumTest.php
index 4e575874fd..9105d4dedb 100644
--- a/tests/Unit/Console/Commands/Integrity/ReportSumTest.php
+++ b/tests/Unit/Console/Commands/Integrity/ReportSumTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ReportSumTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Console/Commands/Tools/ApplyRulesTest.php b/tests/Unit/Console/Commands/Tools/ApplyRulesTest.php
index 1261b476a5..6d21d3ea2f 100644
--- a/tests/Unit/Console/Commands/Tools/ApplyRulesTest.php
+++ b/tests/Unit/Console/Commands/Tools/ApplyRulesTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ApplyRulesTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Console/Commands/Upgrade/AccountCurrenciesTest.php b/tests/Unit/Console/Commands/Upgrade/AccountCurrenciesTest.php
index 376edc9d8e..284548e3ce 100644
--- a/tests/Unit/Console/Commands/Upgrade/AccountCurrenciesTest.php
+++ b/tests/Unit/Console/Commands/Upgrade/AccountCurrenciesTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AccountCurrenciesTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Console/Commands/Upgrade/BackToJournalsTest.php b/tests/Unit/Console/Commands/Upgrade/BackToJournalsTest.php
index 75c4941282..d344b18fe3 100644
--- a/tests/Unit/Console/Commands/Upgrade/BackToJournalsTest.php
+++ b/tests/Unit/Console/Commands/Upgrade/BackToJournalsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * BackToJournalsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Console/Commands/Upgrade/BudgetLimitCurrencyTest.php b/tests/Unit/Console/Commands/Upgrade/BudgetLimitCurrencyTest.php
index 7e06a892ea..a51486c29d 100644
--- a/tests/Unit/Console/Commands/Upgrade/BudgetLimitCurrencyTest.php
+++ b/tests/Unit/Console/Commands/Upgrade/BudgetLimitCurrencyTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * BudgetLimitCurrencyTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Console/Commands/Upgrade/CCLiabilitiesTest.php b/tests/Unit/Console/Commands/Upgrade/CCLiabilitiesTest.php
index 0bf9b16044..81c88646c9 100644
--- a/tests/Unit/Console/Commands/Upgrade/CCLiabilitiesTest.php
+++ b/tests/Unit/Console/Commands/Upgrade/CCLiabilitiesTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * CCLiabilitiesTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Console/Commands/Upgrade/MigrateAttachmentsTest.php b/tests/Unit/Console/Commands/Upgrade/MigrateAttachmentsTest.php
index b8e8462d94..d6f268de2f 100644
--- a/tests/Unit/Console/Commands/Upgrade/MigrateAttachmentsTest.php
+++ b/tests/Unit/Console/Commands/Upgrade/MigrateAttachmentsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * MigrateAttachmentsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Console/Commands/Upgrade/MigrateJournalNotesTest.php b/tests/Unit/Console/Commands/Upgrade/MigrateJournalNotesTest.php
index 46a2bc4b0a..09b1a76a7c 100644
--- a/tests/Unit/Console/Commands/Upgrade/MigrateJournalNotesTest.php
+++ b/tests/Unit/Console/Commands/Upgrade/MigrateJournalNotesTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * MigrateJournalNotesTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Console/Commands/Upgrade/MigrateToGroupsTest.php b/tests/Unit/Console/Commands/Upgrade/MigrateToGroupsTest.php
index 7c2ce66ce4..d4267b5335 100644
--- a/tests/Unit/Console/Commands/Upgrade/MigrateToGroupsTest.php
+++ b/tests/Unit/Console/Commands/Upgrade/MigrateToGroupsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * MigrateToGroupsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Console/Commands/Upgrade/MigrateToRulesTest.php b/tests/Unit/Console/Commands/Upgrade/MigrateToRulesTest.php
index c1963afb68..609c91b4e2 100644
--- a/tests/Unit/Console/Commands/Upgrade/MigrateToRulesTest.php
+++ b/tests/Unit/Console/Commands/Upgrade/MigrateToRulesTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * MigrateToRulesTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Console/Commands/Upgrade/OtherCurrenciesCorrectionsTest.php b/tests/Unit/Console/Commands/Upgrade/OtherCurrenciesCorrectionsTest.php
index f59aa8b26c..07705354d8 100644
--- a/tests/Unit/Console/Commands/Upgrade/OtherCurrenciesCorrectionsTest.php
+++ b/tests/Unit/Console/Commands/Upgrade/OtherCurrenciesCorrectionsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * OtherCurrenciesCorrectionsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Console/Commands/Upgrade/RenameAccountMetaTest.php b/tests/Unit/Console/Commands/Upgrade/RenameAccountMetaTest.php
index 759c2b09fe..c9aac1cceb 100644
--- a/tests/Unit/Console/Commands/Upgrade/RenameAccountMetaTest.php
+++ b/tests/Unit/Console/Commands/Upgrade/RenameAccountMetaTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * RenameAccountMetaTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Console/Commands/Upgrade/TransactionIdentifierTest.php b/tests/Unit/Console/Commands/Upgrade/TransactionIdentifierTest.php
index f2dd867ff2..e02ea813e4 100644
--- a/tests/Unit/Console/Commands/Upgrade/TransactionIdentifierTest.php
+++ b/tests/Unit/Console/Commands/Upgrade/TransactionIdentifierTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * TransactionIdentifierTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Console/Commands/Upgrade/TransferCurrenciesCorrectionsTest.php b/tests/Unit/Console/Commands/Upgrade/TransferCurrenciesCorrectionsTest.php
index fdc3784426..bbfbbb04cf 100644
--- a/tests/Unit/Console/Commands/Upgrade/TransferCurrenciesCorrectionsTest.php
+++ b/tests/Unit/Console/Commands/Upgrade/TransferCurrenciesCorrectionsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * TransferCurrenciesCorrectionsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php
index 2c8fd18272..fdbcced2fb 100644
--- a/tests/Unit/ExampleTest.php
+++ b/tests/Unit/ExampleTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ExampleTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Factory/AccountFactoryTest.php b/tests/Unit/Factory/AccountFactoryTest.php
index df20ddb0ed..b03bad4e3b 100644
--- a/tests/Unit/Factory/AccountFactoryTest.php
+++ b/tests/Unit/Factory/AccountFactoryTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AccountFactoryTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Factory/AccountMetaFactoryTest.php b/tests/Unit/Factory/AccountMetaFactoryTest.php
index 6b39cc2a59..ba2daff8a7 100644
--- a/tests/Unit/Factory/AccountMetaFactoryTest.php
+++ b/tests/Unit/Factory/AccountMetaFactoryTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AccountMetaFactoryTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Factory/AttachmentFactoryTest.php b/tests/Unit/Factory/AttachmentFactoryTest.php
index 35f20524bb..43597a8bd8 100644
--- a/tests/Unit/Factory/AttachmentFactoryTest.php
+++ b/tests/Unit/Factory/AttachmentFactoryTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AttachmentFactoryTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Factory/BillFactoryTest.php b/tests/Unit/Factory/BillFactoryTest.php
index fff3ac849f..6d3bbeb79a 100644
--- a/tests/Unit/Factory/BillFactoryTest.php
+++ b/tests/Unit/Factory/BillFactoryTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * BillFactoryTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Factory/BudgetFactoryTest.php b/tests/Unit/Factory/BudgetFactoryTest.php
index 1f1831bb2b..0b1eda7b73 100644
--- a/tests/Unit/Factory/BudgetFactoryTest.php
+++ b/tests/Unit/Factory/BudgetFactoryTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * BudgetFactoryTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Factory/CategoryFactoryTest.php b/tests/Unit/Factory/CategoryFactoryTest.php
index 6497552e58..6a800d7e18 100644
--- a/tests/Unit/Factory/CategoryFactoryTest.php
+++ b/tests/Unit/Factory/CategoryFactoryTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * CategoryFactoryTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Factory/PiggyBankEventFactoryTest.php b/tests/Unit/Factory/PiggyBankEventFactoryTest.php
index 1721bf7eee..f91e12b763 100644
--- a/tests/Unit/Factory/PiggyBankEventFactoryTest.php
+++ b/tests/Unit/Factory/PiggyBankEventFactoryTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * PiggyBankEventFactoryTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Factory/PiggyBankFactoryTest.php b/tests/Unit/Factory/PiggyBankFactoryTest.php
index a1f8e8a9a7..c0687ecf27 100644
--- a/tests/Unit/Factory/PiggyBankFactoryTest.php
+++ b/tests/Unit/Factory/PiggyBankFactoryTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * PiggyBankFactoryTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Factory/RecurrenceFactoryTest.php b/tests/Unit/Factory/RecurrenceFactoryTest.php
index f42458d734..5a2109b3fa 100644
--- a/tests/Unit/Factory/RecurrenceFactoryTest.php
+++ b/tests/Unit/Factory/RecurrenceFactoryTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * RecurrenceFactoryTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Factory/TagFactoryTest.php b/tests/Unit/Factory/TagFactoryTest.php
index f4be43c38c..23a2905a4b 100644
--- a/tests/Unit/Factory/TagFactoryTest.php
+++ b/tests/Unit/Factory/TagFactoryTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * TagFactoryTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Factory/TransactionCurrencyFactoryTest.php b/tests/Unit/Factory/TransactionCurrencyFactoryTest.php
index 957d2c41ce..0b3631d4cb 100644
--- a/tests/Unit/Factory/TransactionCurrencyFactoryTest.php
+++ b/tests/Unit/Factory/TransactionCurrencyFactoryTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * TransactionCurrencyFactoryTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Factory/TransactionFactoryTest.php b/tests/Unit/Factory/TransactionFactoryTest.php
index b7db1a6f44..0ecbe19961 100644
--- a/tests/Unit/Factory/TransactionFactoryTest.php
+++ b/tests/Unit/Factory/TransactionFactoryTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * TransactionFactoryTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Factory/TransactionJournalFactoryTest.php b/tests/Unit/Factory/TransactionJournalFactoryTest.php
index 4b7fc47061..115e7cbe22 100644
--- a/tests/Unit/Factory/TransactionJournalFactoryTest.php
+++ b/tests/Unit/Factory/TransactionJournalFactoryTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * TransactionJournalFactoryTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Factory/TransactionJournalMetaFactoryTest.php b/tests/Unit/Factory/TransactionJournalMetaFactoryTest.php
index b9f601f9c4..5d88976cec 100644
--- a/tests/Unit/Factory/TransactionJournalMetaFactoryTest.php
+++ b/tests/Unit/Factory/TransactionJournalMetaFactoryTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * TransactionJournalMetaFactoryTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Factory/TransactionTypeFactoryTest.php b/tests/Unit/Factory/TransactionTypeFactoryTest.php
index 42e8e79ec9..4b6c2c2cd9 100644
--- a/tests/Unit/Factory/TransactionTypeFactoryTest.php
+++ b/tests/Unit/Factory/TransactionTypeFactoryTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * TransactionTypeFactoryTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Generator/Chart/Basic/ChartJsGeneratorTest.php b/tests/Unit/Generator/Chart/Basic/ChartJsGeneratorTest.php
index 52d5c66ffe..3d67fc3955 100644
--- a/tests/Unit/Generator/Chart/Basic/ChartJsGeneratorTest.php
+++ b/tests/Unit/Generator/Chart/Basic/ChartJsGeneratorTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ChartJsGeneratorTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Generator/Report/Audit/MonthReportGeneratorTest.php b/tests/Unit/Generator/Report/Audit/MonthReportGeneratorTest.php
index d0d60aaa8e..b21f872606 100644
--- a/tests/Unit/Generator/Report/Audit/MonthReportGeneratorTest.php
+++ b/tests/Unit/Generator/Report/Audit/MonthReportGeneratorTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * MonthReportGeneratorTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Handlers/Events/APIEventHandlerTest.php b/tests/Unit/Handlers/Events/APIEventHandlerTest.php
index f908766020..00ab75b657 100644
--- a/tests/Unit/Handlers/Events/APIEventHandlerTest.php
+++ b/tests/Unit/Handlers/Events/APIEventHandlerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * APIEventHandlerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -70,7 +70,7 @@ class APIEventHandlerTest extends TestCase
         // assert a message was sent.
         Mail::assertSent(
             AccessTokenCreatedMail::class, function ($mail) {
-            return $mail->hasTo('thegrumpydictator@gmail.com') && '127.0.0.1' === $mail->ipAddress;
+            return $mail->hasTo('james@firefly-iii.org') && '127.0.0.1' === $mail->ipAddress;
         }
         );
 
diff --git a/tests/Unit/Handlers/Events/AdminEventHandlerTest.php b/tests/Unit/Handlers/Events/AdminEventHandlerTest.php
index 290acad0a5..d5bd1d6d59 100644
--- a/tests/Unit/Handlers/Events/AdminEventHandlerTest.php
+++ b/tests/Unit/Handlers/Events/AdminEventHandlerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AdminEventHandlerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -86,7 +86,7 @@ class AdminEventHandlerTest extends TestCase
         // assert a message was sent.
         Mail::assertSent(
             AdminTestMail::class, function ($mail) {
-            return $mail->hasTo('thegrumpydictator@gmail.com') && '127.0.0.1' === $mail->ipAddress;
+            return $mail->hasTo('james@firefly-iii.org') && '127.0.0.1' === $mail->ipAddress;
         }
         );
 
diff --git a/tests/Unit/Handlers/Events/AutomationHandlerTest.php b/tests/Unit/Handlers/Events/AutomationHandlerTest.php
index 211c078e46..58d3c9e668 100644
--- a/tests/Unit/Handlers/Events/AutomationHandlerTest.php
+++ b/tests/Unit/Handlers/Events/AutomationHandlerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AutomationHandlerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -76,7 +76,7 @@ class AutomationHandlerTest extends TestCase
         // assert a message was sent.
         Mail::assertSent(
             ReportNewJournalsMail::class, function ($mail) {
-            return $mail->hasTo('thegrumpydictator@gmail.com') && '127.0.0.1' === $mail->ipAddress;
+            return $mail->hasTo('james@firefly-iii.org') && '127.0.0.1' === $mail->ipAddress;
         }
         );
     }
diff --git a/tests/Unit/Handlers/Events/StoredGroupEventHandlerTest.php b/tests/Unit/Handlers/Events/StoredGroupEventHandlerTest.php
index 63a3c00584..c8e0a4f3e8 100644
--- a/tests/Unit/Handlers/Events/StoredGroupEventHandlerTest.php
+++ b/tests/Unit/Handlers/Events/StoredGroupEventHandlerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * StoredGroupEventHandlerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Handlers/Events/UpdatedGroupEventHandlerTest.php b/tests/Unit/Handlers/Events/UpdatedGroupEventHandlerTest.php
index 01adce56a2..ac393b80bc 100644
--- a/tests/Unit/Handlers/Events/UpdatedGroupEventHandlerTest.php
+++ b/tests/Unit/Handlers/Events/UpdatedGroupEventHandlerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * UpdatedGroupEventHandlerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Handlers/Events/UserEventHandlerTest.php b/tests/Unit/Handlers/Events/UserEventHandlerTest.php
index 6ce78d4bde..96b0ed2fb4 100644
--- a/tests/Unit/Handlers/Events/UserEventHandlerTest.php
+++ b/tests/Unit/Handlers/Events/UserEventHandlerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * UserEventHandlerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Handlers/Events/VersionCheckEventHandlerTest.php b/tests/Unit/Handlers/Events/VersionCheckEventHandlerTest.php
index 1f9727c56c..6db33b5e7d 100644
--- a/tests/Unit/Handlers/Events/VersionCheckEventHandlerTest.php
+++ b/tests/Unit/Handlers/Events/VersionCheckEventHandlerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * VersionCheckEventHandlerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Helpers/Attachments/AttachmentHelperTest.php b/tests/Unit/Helpers/Attachments/AttachmentHelperTest.php
index 69c5f2ea62..c0361c7e1b 100644
--- a/tests/Unit/Helpers/Attachments/AttachmentHelperTest.php
+++ b/tests/Unit/Helpers/Attachments/AttachmentHelperTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AttachmentHelperTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Helpers/Fiscal/FiscalHelperTest.php b/tests/Unit/Helpers/Fiscal/FiscalHelperTest.php
index 84c2c7b8e7..3403b4f84e 100644
--- a/tests/Unit/Helpers/Fiscal/FiscalHelperTest.php
+++ b/tests/Unit/Helpers/Fiscal/FiscalHelperTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * FiscalHelperTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Helpers/Help/HelpTest.php b/tests/Unit/Helpers/Help/HelpTest.php
index 1db04d0703..307b2afcc4 100644
--- a/tests/Unit/Helpers/Help/HelpTest.php
+++ b/tests/Unit/Helpers/Help/HelpTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * HelpTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Helpers/Report/NetWorthTest.php b/tests/Unit/Helpers/Report/NetWorthTest.php
index 9f65bc4042..69afbf9312 100644
--- a/tests/Unit/Helpers/Report/NetWorthTest.php
+++ b/tests/Unit/Helpers/Report/NetWorthTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * NetWorthTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Jobs/CreateRecurringTransactionsTest.php b/tests/Unit/Jobs/CreateRecurringTransactionsTest.php
index 2732b8c480..1ccd9fb3f3 100644
--- a/tests/Unit/Jobs/CreateRecurringTransactionsTest.php
+++ b/tests/Unit/Jobs/CreateRecurringTransactionsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * CreateRecurringTransactionsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Middleware/AuthenticateTest.php b/tests/Unit/Middleware/AuthenticateTest.php
index 8581bd880c..f825bc6d2a 100644
--- a/tests/Unit/Middleware/AuthenticateTest.php
+++ b/tests/Unit/Middleware/AuthenticateTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AuthenticateTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Middleware/BinderTest.php b/tests/Unit/Middleware/BinderTest.php
index 0266000e80..458581eced 100644
--- a/tests/Unit/Middleware/BinderTest.php
+++ b/tests/Unit/Middleware/BinderTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * BinderTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Middleware/IsAdminTest.php b/tests/Unit/Middleware/IsAdminTest.php
index e995893920..0c8b81ad5c 100644
--- a/tests/Unit/Middleware/IsAdminTest.php
+++ b/tests/Unit/Middleware/IsAdminTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * IsAdminTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Middleware/IsDemoUserTest.php b/tests/Unit/Middleware/IsDemoUserTest.php
index e97c5a03d2..f5a4a30567 100644
--- a/tests/Unit/Middleware/IsDemoUserTest.php
+++ b/tests/Unit/Middleware/IsDemoUserTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * IsDemoUserTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Middleware/IsSandstormUserTest.php b/tests/Unit/Middleware/IsSandstormUserTest.php
index a5173b9167..4360447591 100644
--- a/tests/Unit/Middleware/IsSandstormUserTest.php
+++ b/tests/Unit/Middleware/IsSandstormUserTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * IsSandstormUserTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Middleware/RangeTest.php b/tests/Unit/Middleware/RangeTest.php
index 962daf5c6a..2ef361ef01 100644
--- a/tests/Unit/Middleware/RangeTest.php
+++ b/tests/Unit/Middleware/RangeTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * RangeTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Middleware/RedirectIfAuthenticatedTest.php b/tests/Unit/Middleware/RedirectIfAuthenticatedTest.php
index 74fb97fdce..6e55a5a214 100644
--- a/tests/Unit/Middleware/RedirectIfAuthenticatedTest.php
+++ b/tests/Unit/Middleware/RedirectIfAuthenticatedTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * RedirectIfAuthenticatedTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Middleware/SandstormTest.php b/tests/Unit/Middleware/SandstormTest.php
index 3d009a7c04..9e4459a753 100644
--- a/tests/Unit/Middleware/SandstormTest.php
+++ b/tests/Unit/Middleware/SandstormTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * SandstormTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Middleware/SecureHeadersTest.php b/tests/Unit/Middleware/SecureHeadersTest.php
index 23e862a3cf..8c30a97846 100644
--- a/tests/Unit/Middleware/SecureHeadersTest.php
+++ b/tests/Unit/Middleware/SecureHeadersTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * SecureHeadersTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Rules/BelongsUserTest.php b/tests/Unit/Rules/BelongsUserTest.php
index e1f9033ab9..65893c0221 100644
--- a/tests/Unit/Rules/BelongsUserTest.php
+++ b/tests/Unit/Rules/BelongsUserTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * BelongsUserTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Rules/IsAssetAccountIdTest.php b/tests/Unit/Rules/IsAssetAccountIdTest.php
index f993bd184d..dd33e56295 100644
--- a/tests/Unit/Rules/IsAssetAccountIdTest.php
+++ b/tests/Unit/Rules/IsAssetAccountIdTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * IsAssetAccountIdTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Rules/IsBooleanTest.php b/tests/Unit/Rules/IsBooleanTest.php
index 55c7b5dd75..ed406b84b4 100644
--- a/tests/Unit/Rules/IsBooleanTest.php
+++ b/tests/Unit/Rules/IsBooleanTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * IsBooleanTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Rules/IsDateOrTimeTest.php b/tests/Unit/Rules/IsDateOrTimeTest.php
index d0be81b064..6f5cc5e87d 100644
--- a/tests/Unit/Rules/IsDateOrTimeTest.php
+++ b/tests/Unit/Rules/IsDateOrTimeTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * IsDateOrTimeTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Rules/IsValidAttachmentModelTest.php b/tests/Unit/Rules/IsValidAttachmentModelTest.php
index 862898a316..6f32da8457 100644
--- a/tests/Unit/Rules/IsValidAttachmentModelTest.php
+++ b/tests/Unit/Rules/IsValidAttachmentModelTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * IsValidAttachmentModelTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Rules/UniqueIbanTest.php b/tests/Unit/Rules/UniqueIbanTest.php
index e560f4b6aa..db14036c1f 100644
--- a/tests/Unit/Rules/UniqueIbanTest.php
+++ b/tests/Unit/Rules/UniqueIbanTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * UniqueIbanTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Services/Internal/Destroy/AccountDestroyServiceTest.php b/tests/Unit/Services/Internal/Destroy/AccountDestroyServiceTest.php
index b076c8ef0a..288635eec6 100644
--- a/tests/Unit/Services/Internal/Destroy/AccountDestroyServiceTest.php
+++ b/tests/Unit/Services/Internal/Destroy/AccountDestroyServiceTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AccountDestroyServiceTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Services/Internal/Update/AccountUpdateServiceTest.php b/tests/Unit/Services/Internal/Update/AccountUpdateServiceTest.php
index 789b0a74e0..8d34d01cb8 100644
--- a/tests/Unit/Services/Internal/Update/AccountUpdateServiceTest.php
+++ b/tests/Unit/Services/Internal/Update/AccountUpdateServiceTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AccountUpdateServiceTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Support/Cronjobs/RecurringCronjobTest.php b/tests/Unit/Support/Cronjobs/RecurringCronjobTest.php
index a6973bf92b..dfb9087e7d 100644
--- a/tests/Unit/Support/Cronjobs/RecurringCronjobTest.php
+++ b/tests/Unit/Support/Cronjobs/RecurringCronjobTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * RecurringCronjobTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Support/FinTS/MetadataParserTest.php b/tests/Unit/Support/FinTS/MetadataParserTest.php
index 37d23e6558..70b7eb1257 100644
--- a/tests/Unit/Support/FinTS/MetadataParserTest.php
+++ b/tests/Unit/Support/FinTS/MetadataParserTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * MetadataParserTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandlerTest.php
index 732feb79c7..15dfe7294f 100644
--- a/tests/Unit/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandlerTest.php
+++ b/tests/Unit/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandlerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ChooseAccountsHandlerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Support/Import/JobConfiguration/Bunq/NewBunqJobHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/Bunq/NewBunqJobHandlerTest.php
index 5d4250eae9..b7a75e98f7 100644
--- a/tests/Unit/Support/Import/JobConfiguration/Bunq/NewBunqJobHandlerTest.php
+++ b/tests/Unit/Support/Import/JobConfiguration/Bunq/NewBunqJobHandlerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * NewBunqJobHandlerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Support/Import/JobConfiguration/File/ConfigureMappingHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/File/ConfigureMappingHandlerTest.php
index 64f3fbd071..d884e11371 100644
--- a/tests/Unit/Support/Import/JobConfiguration/File/ConfigureMappingHandlerTest.php
+++ b/tests/Unit/Support/Import/JobConfiguration/File/ConfigureMappingHandlerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ConfigureMappingHandlerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Support/Import/JobConfiguration/File/ConfigureRolesHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/File/ConfigureRolesHandlerTest.php
index 55f3ed72de..8a4569338f 100644
--- a/tests/Unit/Support/Import/JobConfiguration/File/ConfigureRolesHandlerTest.php
+++ b/tests/Unit/Support/Import/JobConfiguration/File/ConfigureRolesHandlerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ConfigureRolesHandlerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Support/Import/JobConfiguration/File/ConfigureUploadHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/File/ConfigureUploadHandlerTest.php
index 23b53e41da..d8503747d2 100644
--- a/tests/Unit/Support/Import/JobConfiguration/File/ConfigureUploadHandlerTest.php
+++ b/tests/Unit/Support/Import/JobConfiguration/File/ConfigureUploadHandlerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ConfigureUploadHandlerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Support/Import/JobConfiguration/File/NewFileJobHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/File/NewFileJobHandlerTest.php
index aa7ef9365e..9fa5673146 100644
--- a/tests/Unit/Support/Import/JobConfiguration/File/NewFileJobHandlerTest.php
+++ b/tests/Unit/Support/Import/JobConfiguration/File/NewFileJobHandlerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * NewFileJobHandlerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandlerTest.php
index b7eee9bdf4..ed614e27ec 100644
--- a/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandlerTest.php
+++ b/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandlerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ChooseAccountsHandlerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseLoginHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseLoginHandlerTest.php
index e4473520f5..9e3fa57db4 100644
--- a/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseLoginHandlerTest.php
+++ b/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseLoginHandlerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ChooseLoginHandlerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandlerTest.php
index a3c9d75ac9..a7ab2dc172 100644
--- a/tests/Unit/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandlerTest.php
+++ b/tests/Unit/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandlerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * DoAuthenticateHandlerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Support/Import/Placeholder/ImportTransactionTest.php b/tests/Unit/Support/Import/Placeholder/ImportTransactionTest.php
index c1881cb27a..1c29040488 100644
--- a/tests/Unit/Support/Import/Placeholder/ImportTransactionTest.php
+++ b/tests/Unit/Support/Import/Placeholder/ImportTransactionTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ImportTransactionTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Support/Import/Routine/Bunq/StageImportDataHandlerTest.php b/tests/Unit/Support/Import/Routine/Bunq/StageImportDataHandlerTest.php
index 6a2c25285e..39090d6521 100644
--- a/tests/Unit/Support/Import/Routine/Bunq/StageImportDataHandlerTest.php
+++ b/tests/Unit/Support/Import/Routine/Bunq/StageImportDataHandlerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * StageImportDataHandlerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Support/Import/Routine/Bunq/StageNewHandlerTest.php b/tests/Unit/Support/Import/Routine/Bunq/StageNewHandlerTest.php
index 30c0be68c7..148e61e483 100644
--- a/tests/Unit/Support/Import/Routine/Bunq/StageNewHandlerTest.php
+++ b/tests/Unit/Support/Import/Routine/Bunq/StageNewHandlerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * StageNewHandlerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Support/Import/Routine/File/AssetAccountMapperTest.php b/tests/Unit/Support/Import/Routine/File/AssetAccountMapperTest.php
index d75b6b99fa..5fed70a7e0 100644
--- a/tests/Unit/Support/Import/Routine/File/AssetAccountMapperTest.php
+++ b/tests/Unit/Support/Import/Routine/File/AssetAccountMapperTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AssetAccountMapperTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Support/Import/Routine/File/CSVProcessorTest.php b/tests/Unit/Support/Import/Routine/File/CSVProcessorTest.php
index 5a997300b8..e2aeccbad0 100644
--- a/tests/Unit/Support/Import/Routine/File/CSVProcessorTest.php
+++ b/tests/Unit/Support/Import/Routine/File/CSVProcessorTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * CSVProcessorTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Support/Import/Routine/File/CurrencyMapperTest.php b/tests/Unit/Support/Import/Routine/File/CurrencyMapperTest.php
index cb2f5f24ec..d83a50eed6 100644
--- a/tests/Unit/Support/Import/Routine/File/CurrencyMapperTest.php
+++ b/tests/Unit/Support/Import/Routine/File/CurrencyMapperTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * CurrencyMapperTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Support/Import/Routine/File/ImportableConverterTest.php b/tests/Unit/Support/Import/Routine/File/ImportableConverterTest.php
index 5a5f27f4c6..380b243d25 100644
--- a/tests/Unit/Support/Import/Routine/File/ImportableConverterTest.php
+++ b/tests/Unit/Support/Import/Routine/File/ImportableConverterTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ImportableConverterTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Support/Import/Routine/File/ImportableCreatorTest.php b/tests/Unit/Support/Import/Routine/File/ImportableCreatorTest.php
index 25942fb933..c592bddbda 100644
--- a/tests/Unit/Support/Import/Routine/File/ImportableCreatorTest.php
+++ b/tests/Unit/Support/Import/Routine/File/ImportableCreatorTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ImportableCreatorTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Support/Import/Routine/File/LineReaderTest.php b/tests/Unit/Support/Import/Routine/File/LineReaderTest.php
index 2dd0d4fd26..ccc3a07e70 100644
--- a/tests/Unit/Support/Import/Routine/File/LineReaderTest.php
+++ b/tests/Unit/Support/Import/Routine/File/LineReaderTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * LineReaderTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Support/Import/Routine/File/MappedValuesValidatorTest.php b/tests/Unit/Support/Import/Routine/File/MappedValuesValidatorTest.php
index 126f8596dd..61be3d5aa2 100644
--- a/tests/Unit/Support/Import/Routine/File/MappedValuesValidatorTest.php
+++ b/tests/Unit/Support/Import/Routine/File/MappedValuesValidatorTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * MappedValuesValidatorTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Support/Import/Routine/File/MappingConvergerTest.php b/tests/Unit/Support/Import/Routine/File/MappingConvergerTest.php
index 262b67fecd..9986351cbb 100644
--- a/tests/Unit/Support/Import/Routine/File/MappingConvergerTest.php
+++ b/tests/Unit/Support/Import/Routine/File/MappingConvergerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * MappingConvergerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Support/Import/Routine/File/OpposingAccountMapperTest.php b/tests/Unit/Support/Import/Routine/File/OpposingAccountMapperTest.php
index f705f2230f..8d6618350e 100644
--- a/tests/Unit/Support/Import/Routine/File/OpposingAccountMapperTest.php
+++ b/tests/Unit/Support/Import/Routine/File/OpposingAccountMapperTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * OpposingAccountMapperTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Support/Import/Routine/Spectre/StageAuthenticatedHandlerTest.php b/tests/Unit/Support/Import/Routine/Spectre/StageAuthenticatedHandlerTest.php
index 0c07f5a6f9..e0b6d2164e 100644
--- a/tests/Unit/Support/Import/Routine/Spectre/StageAuthenticatedHandlerTest.php
+++ b/tests/Unit/Support/Import/Routine/Spectre/StageAuthenticatedHandlerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * StageAuthenticatedHandlerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Support/Import/Routine/Spectre/StageImportDataHandlerTest.php b/tests/Unit/Support/Import/Routine/Spectre/StageImportDataHandlerTest.php
index 2a7a2e38e3..9164c81862 100644
--- a/tests/Unit/Support/Import/Routine/Spectre/StageImportDataHandlerTest.php
+++ b/tests/Unit/Support/Import/Routine/Spectre/StageImportDataHandlerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * StageImportDataHandlerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Support/Import/Routine/Spectre/StageNewHandlerTest.php b/tests/Unit/Support/Import/Routine/Spectre/StageNewHandlerTest.php
index 4ae423e242..3e780198b2 100644
--- a/tests/Unit/Support/Import/Routine/Spectre/StageNewHandlerTest.php
+++ b/tests/Unit/Support/Import/Routine/Spectre/StageNewHandlerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * StageNewHandlerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Support/NavigationTest.php b/tests/Unit/Support/NavigationTest.php
index a8f01fddfb..464973bad4 100644
--- a/tests/Unit/Support/NavigationTest.php
+++ b/tests/Unit/Support/NavigationTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * NavigationTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Actions/AddTagTest.php b/tests/Unit/TransactionRules/Actions/AddTagTest.php
index 5c4629d1ca..4b7cfaf99f 100644
--- a/tests/Unit/TransactionRules/Actions/AddTagTest.php
+++ b/tests/Unit/TransactionRules/Actions/AddTagTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AddTagTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Actions/AppendDescriptionTest.php b/tests/Unit/TransactionRules/Actions/AppendDescriptionTest.php
index b3f95f835b..a133a87d8b 100644
--- a/tests/Unit/TransactionRules/Actions/AppendDescriptionTest.php
+++ b/tests/Unit/TransactionRules/Actions/AppendDescriptionTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AppendDescriptionTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Actions/AppendNotesTest.php b/tests/Unit/TransactionRules/Actions/AppendNotesTest.php
index 1f1ee057a6..976858313c 100644
--- a/tests/Unit/TransactionRules/Actions/AppendNotesTest.php
+++ b/tests/Unit/TransactionRules/Actions/AppendNotesTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AppendNotesTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Actions/ClearBudgetTest.php b/tests/Unit/TransactionRules/Actions/ClearBudgetTest.php
index 9e9f4765cf..26fed757bb 100644
--- a/tests/Unit/TransactionRules/Actions/ClearBudgetTest.php
+++ b/tests/Unit/TransactionRules/Actions/ClearBudgetTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ClearBudgetTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Actions/ClearCategoryTest.php b/tests/Unit/TransactionRules/Actions/ClearCategoryTest.php
index 2b66f48b7f..bb0bc29ab2 100644
--- a/tests/Unit/TransactionRules/Actions/ClearCategoryTest.php
+++ b/tests/Unit/TransactionRules/Actions/ClearCategoryTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ClearCategoryTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Actions/ClearNotesTest.php b/tests/Unit/TransactionRules/Actions/ClearNotesTest.php
index 4fd539376a..9a6e6088d3 100644
--- a/tests/Unit/TransactionRules/Actions/ClearNotesTest.php
+++ b/tests/Unit/TransactionRules/Actions/ClearNotesTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ClearNotesTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Actions/ConvertToDepositTest.php b/tests/Unit/TransactionRules/Actions/ConvertToDepositTest.php
index abb869eee3..594d9164f6 100644
--- a/tests/Unit/TransactionRules/Actions/ConvertToDepositTest.php
+++ b/tests/Unit/TransactionRules/Actions/ConvertToDepositTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ConvertToDepositTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Actions/ConvertToTransferTest.php b/tests/Unit/TransactionRules/Actions/ConvertToTransferTest.php
index dc7794cf6e..0182919d08 100644
--- a/tests/Unit/TransactionRules/Actions/ConvertToTransferTest.php
+++ b/tests/Unit/TransactionRules/Actions/ConvertToTransferTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ConvertToTransferTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Actions/ConvertToWithdrawalTest.php b/tests/Unit/TransactionRules/Actions/ConvertToWithdrawalTest.php
index 72a57a783d..967242134a 100644
--- a/tests/Unit/TransactionRules/Actions/ConvertToWithdrawalTest.php
+++ b/tests/Unit/TransactionRules/Actions/ConvertToWithdrawalTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ConvertToWithdrawalTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Actions/LinkToBillTest.php b/tests/Unit/TransactionRules/Actions/LinkToBillTest.php
index afeb669e2a..cf44e7af05 100644
--- a/tests/Unit/TransactionRules/Actions/LinkToBillTest.php
+++ b/tests/Unit/TransactionRules/Actions/LinkToBillTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * LinkToBillTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Actions/PrependDescriptionTest.php b/tests/Unit/TransactionRules/Actions/PrependDescriptionTest.php
index e4016e3e59..d261416a0d 100644
--- a/tests/Unit/TransactionRules/Actions/PrependDescriptionTest.php
+++ b/tests/Unit/TransactionRules/Actions/PrependDescriptionTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * PrependDescriptionTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Actions/PrependNotesTest.php b/tests/Unit/TransactionRules/Actions/PrependNotesTest.php
index d8543965c3..aecd12ffb0 100644
--- a/tests/Unit/TransactionRules/Actions/PrependNotesTest.php
+++ b/tests/Unit/TransactionRules/Actions/PrependNotesTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * PrependNotesTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Actions/RemoveAllTagsTest.php b/tests/Unit/TransactionRules/Actions/RemoveAllTagsTest.php
index 0f8eb44710..f4eed56c73 100644
--- a/tests/Unit/TransactionRules/Actions/RemoveAllTagsTest.php
+++ b/tests/Unit/TransactionRules/Actions/RemoveAllTagsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * RemoveAllTagsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Actions/RemoveTagTest.php b/tests/Unit/TransactionRules/Actions/RemoveTagTest.php
index 87a2441184..bf35987342 100644
--- a/tests/Unit/TransactionRules/Actions/RemoveTagTest.php
+++ b/tests/Unit/TransactionRules/Actions/RemoveTagTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * RemoveTagTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Actions/SetBudgetTest.php b/tests/Unit/TransactionRules/Actions/SetBudgetTest.php
index ba5a050814..c9df7bc2d3 100644
--- a/tests/Unit/TransactionRules/Actions/SetBudgetTest.php
+++ b/tests/Unit/TransactionRules/Actions/SetBudgetTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * SetBudgetTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Actions/SetCategoryTest.php b/tests/Unit/TransactionRules/Actions/SetCategoryTest.php
index 67c80c5bd8..9adac982c7 100644
--- a/tests/Unit/TransactionRules/Actions/SetCategoryTest.php
+++ b/tests/Unit/TransactionRules/Actions/SetCategoryTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * SetCategoryTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Actions/SetDescriptionTest.php b/tests/Unit/TransactionRules/Actions/SetDescriptionTest.php
index 0022fe890e..897119e252 100644
--- a/tests/Unit/TransactionRules/Actions/SetDescriptionTest.php
+++ b/tests/Unit/TransactionRules/Actions/SetDescriptionTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * SetDescriptionTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Actions/SetDestinationAccountTest.php b/tests/Unit/TransactionRules/Actions/SetDestinationAccountTest.php
index 4ce3508e6e..42f458b15c 100644
--- a/tests/Unit/TransactionRules/Actions/SetDestinationAccountTest.php
+++ b/tests/Unit/TransactionRules/Actions/SetDestinationAccountTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * SetDestinationAccountTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Actions/SetNotesTest.php b/tests/Unit/TransactionRules/Actions/SetNotesTest.php
index 68563cf5c6..0770bb3183 100644
--- a/tests/Unit/TransactionRules/Actions/SetNotesTest.php
+++ b/tests/Unit/TransactionRules/Actions/SetNotesTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * SetNotesTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Actions/SetSourceAccountTest.php b/tests/Unit/TransactionRules/Actions/SetSourceAccountTest.php
index fbb49eebf6..014fd825a9 100644
--- a/tests/Unit/TransactionRules/Actions/SetSourceAccountTest.php
+++ b/tests/Unit/TransactionRules/Actions/SetSourceAccountTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * SetSourceAccountTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/AmountExactlyTest.php b/tests/Unit/TransactionRules/Triggers/AmountExactlyTest.php
index 1a53de984f..4b50d47a7d 100644
--- a/tests/Unit/TransactionRules/Triggers/AmountExactlyTest.php
+++ b/tests/Unit/TransactionRules/Triggers/AmountExactlyTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AmountExactlyTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/AmountLessTest.php b/tests/Unit/TransactionRules/Triggers/AmountLessTest.php
index 7c6ddded44..7eee7e810d 100644
--- a/tests/Unit/TransactionRules/Triggers/AmountLessTest.php
+++ b/tests/Unit/TransactionRules/Triggers/AmountLessTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AmountLessTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/AmountMoreTest.php b/tests/Unit/TransactionRules/Triggers/AmountMoreTest.php
index 5e93592c13..42c7c68b2f 100644
--- a/tests/Unit/TransactionRules/Triggers/AmountMoreTest.php
+++ b/tests/Unit/TransactionRules/Triggers/AmountMoreTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AmountMoreTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/BudgetIsTest.php b/tests/Unit/TransactionRules/Triggers/BudgetIsTest.php
index 73dfc29651..34ce386f3e 100644
--- a/tests/Unit/TransactionRules/Triggers/BudgetIsTest.php
+++ b/tests/Unit/TransactionRules/Triggers/BudgetIsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * BudgetIsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/CategoryIsTest.php b/tests/Unit/TransactionRules/Triggers/CategoryIsTest.php
index 56dc4a7338..f14c2b7998 100644
--- a/tests/Unit/TransactionRules/Triggers/CategoryIsTest.php
+++ b/tests/Unit/TransactionRules/Triggers/CategoryIsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * CategoryIsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/DescriptionContainsTest.php b/tests/Unit/TransactionRules/Triggers/DescriptionContainsTest.php
index b4ee78b67c..5ba71bce83 100644
--- a/tests/Unit/TransactionRules/Triggers/DescriptionContainsTest.php
+++ b/tests/Unit/TransactionRules/Triggers/DescriptionContainsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * DescriptionContainsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/DescriptionEndsTest.php b/tests/Unit/TransactionRules/Triggers/DescriptionEndsTest.php
index ed9dceb66c..80b947d4b6 100644
--- a/tests/Unit/TransactionRules/Triggers/DescriptionEndsTest.php
+++ b/tests/Unit/TransactionRules/Triggers/DescriptionEndsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * DescriptionEndsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/DescriptionIsTest.php b/tests/Unit/TransactionRules/Triggers/DescriptionIsTest.php
index 147cb125fb..215824c4ca 100644
--- a/tests/Unit/TransactionRules/Triggers/DescriptionIsTest.php
+++ b/tests/Unit/TransactionRules/Triggers/DescriptionIsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * DescriptionIsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/DescriptionStartsTest.php b/tests/Unit/TransactionRules/Triggers/DescriptionStartsTest.php
index e8d7db064d..dd4822263b 100644
--- a/tests/Unit/TransactionRules/Triggers/DescriptionStartsTest.php
+++ b/tests/Unit/TransactionRules/Triggers/DescriptionStartsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * DescriptionStartsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/FromAccountContainsTest.php b/tests/Unit/TransactionRules/Triggers/FromAccountContainsTest.php
index c1dc83cbfd..3e4180cdba 100644
--- a/tests/Unit/TransactionRules/Triggers/FromAccountContainsTest.php
+++ b/tests/Unit/TransactionRules/Triggers/FromAccountContainsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * FromAccountContainsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/FromAccountEndsTest.php b/tests/Unit/TransactionRules/Triggers/FromAccountEndsTest.php
index cf2e3e8695..74dda4cc8c 100644
--- a/tests/Unit/TransactionRules/Triggers/FromAccountEndsTest.php
+++ b/tests/Unit/TransactionRules/Triggers/FromAccountEndsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * FromAccountEndsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/FromAccountIsTest.php b/tests/Unit/TransactionRules/Triggers/FromAccountIsTest.php
index 143e7ad154..43cdfdf6c4 100644
--- a/tests/Unit/TransactionRules/Triggers/FromAccountIsTest.php
+++ b/tests/Unit/TransactionRules/Triggers/FromAccountIsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * FromAccountIsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/FromAccountNumberContainsTest.php b/tests/Unit/TransactionRules/Triggers/FromAccountNumberContainsTest.php
index 10c2317ec8..da871e4753 100644
--- a/tests/Unit/TransactionRules/Triggers/FromAccountNumberContainsTest.php
+++ b/tests/Unit/TransactionRules/Triggers/FromAccountNumberContainsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * FromAccountNumberContainsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/FromAccountNumberEndsTest.php b/tests/Unit/TransactionRules/Triggers/FromAccountNumberEndsTest.php
index e91652f640..e29f14df3a 100644
--- a/tests/Unit/TransactionRules/Triggers/FromAccountNumberEndsTest.php
+++ b/tests/Unit/TransactionRules/Triggers/FromAccountNumberEndsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * FromAccountNumberEndsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/FromAccountNumberIsTest.php b/tests/Unit/TransactionRules/Triggers/FromAccountNumberIsTest.php
index b9790122b3..ef93ab0561 100644
--- a/tests/Unit/TransactionRules/Triggers/FromAccountNumberIsTest.php
+++ b/tests/Unit/TransactionRules/Triggers/FromAccountNumberIsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * FromAccountNumberIsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/FromAccountNumberStartsTest.php b/tests/Unit/TransactionRules/Triggers/FromAccountNumberStartsTest.php
index 837ae3a0b3..872966a5bb 100644
--- a/tests/Unit/TransactionRules/Triggers/FromAccountNumberStartsTest.php
+++ b/tests/Unit/TransactionRules/Triggers/FromAccountNumberStartsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * FromAccountNumberStartsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php b/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php
index 81081a2ee2..2ea67abf06 100644
--- a/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php
+++ b/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * FromAccountStartsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/HasAnyBudgetTest.php b/tests/Unit/TransactionRules/Triggers/HasAnyBudgetTest.php
index e56fc85e0a..6a0e033633 100644
--- a/tests/Unit/TransactionRules/Triggers/HasAnyBudgetTest.php
+++ b/tests/Unit/TransactionRules/Triggers/HasAnyBudgetTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * HasAnyBudgetTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/HasAnyCategoryTest.php b/tests/Unit/TransactionRules/Triggers/HasAnyCategoryTest.php
index 531c095b7f..0db84ade0d 100644
--- a/tests/Unit/TransactionRules/Triggers/HasAnyCategoryTest.php
+++ b/tests/Unit/TransactionRules/Triggers/HasAnyCategoryTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * HasAnyCategoryTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/HasAnyTagTest.php b/tests/Unit/TransactionRules/Triggers/HasAnyTagTest.php
index 916816eb1e..789c23e4fc 100644
--- a/tests/Unit/TransactionRules/Triggers/HasAnyTagTest.php
+++ b/tests/Unit/TransactionRules/Triggers/HasAnyTagTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * HasAnyTagTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/HasAttachmentTest.php b/tests/Unit/TransactionRules/Triggers/HasAttachmentTest.php
index e5994140a8..1b8534ebaf 100644
--- a/tests/Unit/TransactionRules/Triggers/HasAttachmentTest.php
+++ b/tests/Unit/TransactionRules/Triggers/HasAttachmentTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * HasAttachmentTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/HasNoBudgetTest.php b/tests/Unit/TransactionRules/Triggers/HasNoBudgetTest.php
index 846642b820..90ce0ce41c 100644
--- a/tests/Unit/TransactionRules/Triggers/HasNoBudgetTest.php
+++ b/tests/Unit/TransactionRules/Triggers/HasNoBudgetTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * HasNoBudgetTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/HasNoCategoryTest.php b/tests/Unit/TransactionRules/Triggers/HasNoCategoryTest.php
index eac6bb31dd..6e320d77f0 100644
--- a/tests/Unit/TransactionRules/Triggers/HasNoCategoryTest.php
+++ b/tests/Unit/TransactionRules/Triggers/HasNoCategoryTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * HasNoCategoryTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/HasNoTagTest.php b/tests/Unit/TransactionRules/Triggers/HasNoTagTest.php
index ac401d0fed..fc4c653399 100644
--- a/tests/Unit/TransactionRules/Triggers/HasNoTagTest.php
+++ b/tests/Unit/TransactionRules/Triggers/HasNoTagTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * HasNoTagTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/NotesAnyTest.php b/tests/Unit/TransactionRules/Triggers/NotesAnyTest.php
index 5beadf9695..baefd9a370 100644
--- a/tests/Unit/TransactionRules/Triggers/NotesAnyTest.php
+++ b/tests/Unit/TransactionRules/Triggers/NotesAnyTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * NotesAnyTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/NotesAreTest.php b/tests/Unit/TransactionRules/Triggers/NotesAreTest.php
index effcd4f6e8..6570ac8591 100644
--- a/tests/Unit/TransactionRules/Triggers/NotesAreTest.php
+++ b/tests/Unit/TransactionRules/Triggers/NotesAreTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * NotesAreTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/NotesContainTest.php b/tests/Unit/TransactionRules/Triggers/NotesContainTest.php
index 6e9af75985..378af55cb0 100644
--- a/tests/Unit/TransactionRules/Triggers/NotesContainTest.php
+++ b/tests/Unit/TransactionRules/Triggers/NotesContainTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * NotesContainTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/NotesEmptyTest.php b/tests/Unit/TransactionRules/Triggers/NotesEmptyTest.php
index d61737c177..42b8ebdcab 100644
--- a/tests/Unit/TransactionRules/Triggers/NotesEmptyTest.php
+++ b/tests/Unit/TransactionRules/Triggers/NotesEmptyTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * NotesEmptyTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/NotesEndTest.php b/tests/Unit/TransactionRules/Triggers/NotesEndTest.php
index fcc375dfef..222118fc6d 100644
--- a/tests/Unit/TransactionRules/Triggers/NotesEndTest.php
+++ b/tests/Unit/TransactionRules/Triggers/NotesEndTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * NotesEndTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/NotesStartTest.php b/tests/Unit/TransactionRules/Triggers/NotesStartTest.php
index 523ff89820..26d87fec40 100644
--- a/tests/Unit/TransactionRules/Triggers/NotesStartTest.php
+++ b/tests/Unit/TransactionRules/Triggers/NotesStartTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * NotesStartTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/TagIsTest.php b/tests/Unit/TransactionRules/Triggers/TagIsTest.php
index 5a1b76368d..cf4db38206 100644
--- a/tests/Unit/TransactionRules/Triggers/TagIsTest.php
+++ b/tests/Unit/TransactionRules/Triggers/TagIsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * TagIsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/ToAccountContainsTest.php b/tests/Unit/TransactionRules/Triggers/ToAccountContainsTest.php
index a344170b37..cb1ccc4daa 100644
--- a/tests/Unit/TransactionRules/Triggers/ToAccountContainsTest.php
+++ b/tests/Unit/TransactionRules/Triggers/ToAccountContainsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ToAccountContainsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/ToAccountEndsTest.php b/tests/Unit/TransactionRules/Triggers/ToAccountEndsTest.php
index 05448e1190..37170790b6 100644
--- a/tests/Unit/TransactionRules/Triggers/ToAccountEndsTest.php
+++ b/tests/Unit/TransactionRules/Triggers/ToAccountEndsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ToAccountEndsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/ToAccountIsTest.php b/tests/Unit/TransactionRules/Triggers/ToAccountIsTest.php
index fc6878e0bc..dc5edc5b80 100644
--- a/tests/Unit/TransactionRules/Triggers/ToAccountIsTest.php
+++ b/tests/Unit/TransactionRules/Triggers/ToAccountIsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ToAccountIsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/ToAccountNumberContainsTest.php b/tests/Unit/TransactionRules/Triggers/ToAccountNumberContainsTest.php
index 9a6a353e16..5c76c0a114 100644
--- a/tests/Unit/TransactionRules/Triggers/ToAccountNumberContainsTest.php
+++ b/tests/Unit/TransactionRules/Triggers/ToAccountNumberContainsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ToAccountNumberContainsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/ToAccountNumberEndsTest.php b/tests/Unit/TransactionRules/Triggers/ToAccountNumberEndsTest.php
index 0b481cd169..f6267f1a53 100644
--- a/tests/Unit/TransactionRules/Triggers/ToAccountNumberEndsTest.php
+++ b/tests/Unit/TransactionRules/Triggers/ToAccountNumberEndsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ToAccountNumberEndsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/ToAccountNumberIsTest.php b/tests/Unit/TransactionRules/Triggers/ToAccountNumberIsTest.php
index 14153d205c..458b43c207 100644
--- a/tests/Unit/TransactionRules/Triggers/ToAccountNumberIsTest.php
+++ b/tests/Unit/TransactionRules/Triggers/ToAccountNumberIsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ToAccountNumberIsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/ToAccountNumberStartsTest.php b/tests/Unit/TransactionRules/Triggers/ToAccountNumberStartsTest.php
index 7a13a9c31a..9c9eea947f 100644
--- a/tests/Unit/TransactionRules/Triggers/ToAccountNumberStartsTest.php
+++ b/tests/Unit/TransactionRules/Triggers/ToAccountNumberStartsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ToAccountNumberStartsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/ToAccountStartsTest.php b/tests/Unit/TransactionRules/Triggers/ToAccountStartsTest.php
index 7b28478b45..b65aecff8c 100644
--- a/tests/Unit/TransactionRules/Triggers/ToAccountStartsTest.php
+++ b/tests/Unit/TransactionRules/Triggers/ToAccountStartsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ToAccountStartsTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/TransactionRules/Triggers/TransactionTypeTest.php b/tests/Unit/TransactionRules/Triggers/TransactionTypeTest.php
index e7efe07f84..8a6e3d7e54 100644
--- a/tests/Unit/TransactionRules/Triggers/TransactionTypeTest.php
+++ b/tests/Unit/TransactionRules/Triggers/TransactionTypeTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * TransactionTypeTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Transformers/AccountTransformerTest.php b/tests/Unit/Transformers/AccountTransformerTest.php
index 274b43f140..2f5a8c2286 100644
--- a/tests/Unit/Transformers/AccountTransformerTest.php
+++ b/tests/Unit/Transformers/AccountTransformerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AccountTransformerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Transformers/AttachmentTransformerTest.php b/tests/Unit/Transformers/AttachmentTransformerTest.php
index d51858d795..26ae3cb257 100644
--- a/tests/Unit/Transformers/AttachmentTransformerTest.php
+++ b/tests/Unit/Transformers/AttachmentTransformerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AttachmentTransformerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Transformers/AvailableBudgetTransformerTest.php b/tests/Unit/Transformers/AvailableBudgetTransformerTest.php
index f58e0b1edd..2dcbbd46fc 100644
--- a/tests/Unit/Transformers/AvailableBudgetTransformerTest.php
+++ b/tests/Unit/Transformers/AvailableBudgetTransformerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AvailableBudgetTransformerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Transformers/BillTransformerTest.php b/tests/Unit/Transformers/BillTransformerTest.php
index a326e9d422..100c8c8f14 100644
--- a/tests/Unit/Transformers/BillTransformerTest.php
+++ b/tests/Unit/Transformers/BillTransformerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * BillTransformerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Transformers/BudgetLimitTransformerTest.php b/tests/Unit/Transformers/BudgetLimitTransformerTest.php
index 29c98a5f36..0fa2748e3b 100644
--- a/tests/Unit/Transformers/BudgetLimitTransformerTest.php
+++ b/tests/Unit/Transformers/BudgetLimitTransformerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * BudgetLimitTransformerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Transformers/BudgetTransformerTest.php b/tests/Unit/Transformers/BudgetTransformerTest.php
index 53f942b99e..4766557c33 100644
--- a/tests/Unit/Transformers/BudgetTransformerTest.php
+++ b/tests/Unit/Transformers/BudgetTransformerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * BudgetTransformerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Transformers/CategoryTransformerTest.php b/tests/Unit/Transformers/CategoryTransformerTest.php
index bc9f9ca6d4..39e8ee2137 100644
--- a/tests/Unit/Transformers/CategoryTransformerTest.php
+++ b/tests/Unit/Transformers/CategoryTransformerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * CategoryTransformerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Transformers/CurrencyExchangeRateTransformerTest.php b/tests/Unit/Transformers/CurrencyExchangeRateTransformerTest.php
index e13c6a7d10..dbd7e6a65d 100644
--- a/tests/Unit/Transformers/CurrencyExchangeRateTransformerTest.php
+++ b/tests/Unit/Transformers/CurrencyExchangeRateTransformerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * CurrencyExchangeRateTransformerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Transformers/CurrencyTransformerTest.php b/tests/Unit/Transformers/CurrencyTransformerTest.php
index c0d88f3a36..a5afc21d29 100644
--- a/tests/Unit/Transformers/CurrencyTransformerTest.php
+++ b/tests/Unit/Transformers/CurrencyTransformerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * CurrencyTransformerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Transformers/ImportJobTransformerTest.php b/tests/Unit/Transformers/ImportJobTransformerTest.php
index dbe9beff38..1536297e9f 100644
--- a/tests/Unit/Transformers/ImportJobTransformerTest.php
+++ b/tests/Unit/Transformers/ImportJobTransformerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ImportJobTransformerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Transformers/LinkTypeTransformerTest.php b/tests/Unit/Transformers/LinkTypeTransformerTest.php
index a4a9dca1ad..bfb2efc469 100644
--- a/tests/Unit/Transformers/LinkTypeTransformerTest.php
+++ b/tests/Unit/Transformers/LinkTypeTransformerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * LinkTypeTransformerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Transformers/PiggyBankEventTransformerTest.php b/tests/Unit/Transformers/PiggyBankEventTransformerTest.php
index 71b7134fb9..b831df5042 100644
--- a/tests/Unit/Transformers/PiggyBankEventTransformerTest.php
+++ b/tests/Unit/Transformers/PiggyBankEventTransformerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * PiggyBankEventTransformerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Transformers/PiggyBankTransformerTest.php b/tests/Unit/Transformers/PiggyBankTransformerTest.php
index bccd4593c0..73974fe2b3 100644
--- a/tests/Unit/Transformers/PiggyBankTransformerTest.php
+++ b/tests/Unit/Transformers/PiggyBankTransformerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * PiggyBankTransformerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Transformers/PreferenceTransformerTest.php b/tests/Unit/Transformers/PreferenceTransformerTest.php
index 8d720a9c75..76a52e455b 100644
--- a/tests/Unit/Transformers/PreferenceTransformerTest.php
+++ b/tests/Unit/Transformers/PreferenceTransformerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * PreferenceTransformerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Transformers/RecurrenceTransformerTest.php b/tests/Unit/Transformers/RecurrenceTransformerTest.php
index 654d005230..05764471f8 100644
--- a/tests/Unit/Transformers/RecurrenceTransformerTest.php
+++ b/tests/Unit/Transformers/RecurrenceTransformerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * RecurrenceTransformerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Transformers/RuleGroupTransformerTest.php b/tests/Unit/Transformers/RuleGroupTransformerTest.php
index 2323f58a73..2906869223 100644
--- a/tests/Unit/Transformers/RuleGroupTransformerTest.php
+++ b/tests/Unit/Transformers/RuleGroupTransformerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * RuleGroupTransformerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Transformers/RuleTransformerTest.php b/tests/Unit/Transformers/RuleTransformerTest.php
index 0d599b7833..6620b19cc7 100644
--- a/tests/Unit/Transformers/RuleTransformerTest.php
+++ b/tests/Unit/Transformers/RuleTransformerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * RuleTransformerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Transformers/TagTransformerTest.php b/tests/Unit/Transformers/TagTransformerTest.php
index dcbc0b6228..32eacad8fd 100644
--- a/tests/Unit/Transformers/TagTransformerTest.php
+++ b/tests/Unit/Transformers/TagTransformerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * TagTransformerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Transformers/TransactionGroupTransformerTest.php b/tests/Unit/Transformers/TransactionGroupTransformerTest.php
index 6b319dbc50..2e6623a257 100644
--- a/tests/Unit/Transformers/TransactionGroupTransformerTest.php
+++ b/tests/Unit/Transformers/TransactionGroupTransformerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * TransactionGroupTransformerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Transformers/TransactionLinkTransformerTest.php b/tests/Unit/Transformers/TransactionLinkTransformerTest.php
index 4f629cb953..ca49f7e5a2 100644
--- a/tests/Unit/Transformers/TransactionLinkTransformerTest.php
+++ b/tests/Unit/Transformers/TransactionLinkTransformerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * TransactionLinkTransformerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/Unit/Transformers/UserTransformerTest.php b/tests/Unit/Transformers/UserTransformerTest.php
index e13976afc7..5093b83c6b 100644
--- a/tests/Unit/Transformers/UserTransformerTest.php
+++ b/tests/Unit/Transformers/UserTransformerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * UserTransformerTest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *