diff --git a/app/Models/RecurringInvoice.php b/app/Models/RecurringInvoice.php
index 128b704fda9a..a650ba3c7ea4 100644
--- a/app/Models/RecurringInvoice.php
+++ b/app/Models/RecurringInvoice.php
@@ -16,6 +16,7 @@ use App\Helpers\Invoice\InvoiceSumInclusive;
 use App\Models\Filterable;
 use App\Utils\Traits\MakesDates;
 use App\Utils\Traits\MakesHash;
+use App\Utils\Traits\Recurring\HasRecurrence;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Carbon;
@@ -29,6 +30,8 @@ class RecurringInvoice extends BaseModel
     use SoftDeletes;
     use Filterable;
     use MakesDates;
+    use HasRecurrence;
+
     /**
      * Invoice Statuses.
      */
@@ -353,7 +356,7 @@ class RecurringInvoice extends BaseModel
      */
     public function recurringDates()
     {
-    info($this->next_send_date);
+
         /* Return early if nothing to send back! */        
         if( $this->status_id == self::STATUS_COMPLETED ||
             $this->status_id == self::STATUS_DRAFT ||
@@ -387,7 +390,7 @@ class RecurringInvoice extends BaseModel
                 'due_date' => $next_due_date->format('Y-m-d'),
             ];
 
-            $next_send_date = $this->nextDateByFrequency($next_send_date);        
+            $next_send_date = $this->calculateDueDate($next_send_date);        
 
         }
 
@@ -404,4 +407,35 @@ class RecurringInvoice extends BaseModel
     }
 
 
+    private function calculateDueDate($date) 
+    {
+
+        switch ($this->due_date_days) {
+            case 'terms':
+                return $this->calculateDateFromTerms($date);
+                break;
+            default:
+                return $this->setDayOfMonth($date, $this->due_date_days);
+                break;
+        }
+    }
+
+    /**
+     * Calculates a date based on the client payment terms.
+     * 
+     * @param  Carbon $date A given date
+     * @return NULL|Carbon  The date
+     */
+    public function calculateDateFromTerms($date) 
+    {
+
+        $client_payment_terms = $this->client->getSetting('payment_terms');
+
+        if($client_payment_terms == '')//no due date! return null;
+            return null;
+
+        return $date->copy()->addDays($client_payment_terms); //add the number of days in the payment terms to the date
+    }
+
+
 }
diff --git a/app/Transformers/RecurringInvoiceTransformer.php b/app/Transformers/RecurringInvoiceTransformer.php
index 1458595b8792..e8af2751ef00 100644
--- a/app/Transformers/RecurringInvoiceTransformer.php
+++ b/app/Transformers/RecurringInvoiceTransformer.php
@@ -131,7 +131,7 @@ class RecurringInvoiceTransformer extends EntityTransformer
             'custom_surcharge_tax3' => (bool) $invoice->custom_surcharge_tax3,
             'custom_surcharge_tax4' => (bool) $invoice->custom_surcharge_tax4,
             'line_items' => $invoice->line_items ?: (array) [],
-            'entity_type' => 'recurring_invoice',
+            'entity_type' => 'recurringInvoice',
             'frequency_id' => (string) $invoice->frequency_id,
             'remaining_cycles' => (int) $invoice->remaining_cycles,
             'recurring_dates' => (array) $invoice->recurringDates(),
diff --git a/app/Utils/Traits/Recurring/HasRecurrence.php b/app/Utils/Traits/Recurring/HasRecurrence.php
new file mode 100644
index 000000000000..6560e18dd956
--- /dev/null
+++ b/app/Utils/Traits/Recurring/HasRecurrence.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Utils\Traits\Recurring;
+
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Log;
+
+trait HasRecurrence
+{
+
+    /**
+     * Calculates the first day of the month, this will ALWAYS 
+     * be the first of NEXT month
+     * 
+     * @param  Carbon $date The given date
+     * @return Carbon       The first of NEXT month 
+     */
+    public function calculateFirstDayOfMonth($date)
+    {
+        return $date->copy()->startOfMonth()->addMonth();
+    }
+
+    /**
+     * Calculates the last day of the month.
+     *
+     * If it is the last day of the month - we add a month on.
+     * 
+     * @param  Carbon $date The start date
+     * @return Carbon       The last day of month
+     */
+    public function calculateLastDayOfMonth($date)
+    {
+        if($date->isLastOfMonth())
+            return $date->copy()->addMonthNoOverflow()->endOfMonth();
+
+        return $date->copy()->endOfMonth();
+    }
+
+    /**
+     * Sets the day of the month, if in the past we ADD a month
+     *     
+     * @param Carbon $date              The start date
+     * @param String|Int $day_of_month  The day of the month
+     */
+    public function setDayOfMonth($date, $day_of_month)
+    {
+
+        $set_date = $date->copy()->setUnitNoOverflow('day', $day_of_month, 'month');
+
+        //If the set date is less than the original date we need to add a month.
+        //If we are overflowing dates, then we need to diff the dates and ensure it doesn't equal 0
+        if($set_date->lte($date) || $set_date->diffInDays($date) == 0)
+            $set_date->addMonthNoOverflow();
+
+        if($day_of_month == '31')
+            $set_date->endOfMonth();
+
+
+        return $set_date;
+    }
+
+}
\ No newline at end of file
diff --git a/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php b/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php
index e7e86ec690fb..8713851f8e66 100644
--- a/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php
+++ b/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php
@@ -70,7 +70,7 @@ class AddIsPublicToDocumentsTable extends Migration
         Schema::table('recurring_invoices', function (Blueprint $table) {
             $table->integer('remaining_cycles')->nullable()->change();
             $table->dropColumn('start_date');
-            $table->integer('due_date_days')->nullable();
+            $table->string('due_date_days')->nullable();
             $table->date('partial_due_date')->nullable();
         });
     }
diff --git a/tests/Feature/CancelInvoiceTest.php b/tests/Feature/CancelInvoiceTest.php
index 89667fb75739..654f165a8560 100644
--- a/tests/Feature/CancelInvoiceTest.php
+++ b/tests/Feature/CancelInvoiceTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature;
 
 use App\Factory\CreditFactory;
diff --git a/tests/Feature/ClientApiTest.php b/tests/Feature/ClientApiTest.php
index 18b284f151db..63b596bf94be 100644
--- a/tests/Feature/ClientApiTest.php
+++ b/tests/Feature/ClientApiTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature;
 
 use App\DataMapper\DefaultSettings;
diff --git a/tests/Feature/ClientModelTest.php b/tests/Feature/ClientModelTest.php
index 1af904756153..646880a4fcb9 100644
--- a/tests/Feature/ClientModelTest.php
+++ b/tests/Feature/ClientModelTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature;
 
 use Illuminate\Foundation\Testing\DatabaseTransactions;
diff --git a/tests/Feature/ClientPresenterTest.php b/tests/Feature/ClientPresenterTest.php
index 1859881e3451..ca6df40f6950 100644
--- a/tests/Feature/ClientPresenterTest.php
+++ b/tests/Feature/ClientPresenterTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature;
 
 use Illuminate\Foundation\Testing\DatabaseTransactions;
diff --git a/tests/Feature/ClientTest.php b/tests/Feature/ClientTest.php
index c43c269ff2d8..4a48d8ad5da4 100644
--- a/tests/Feature/ClientTest.php
+++ b/tests/Feature/ClientTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature;
 
 use App\DataMapper\CompanySettings;
diff --git a/tests/Feature/CompanyGatewayApiTest.php b/tests/Feature/CompanyGatewayApiTest.php
index ecfaa40557c9..c16670bbb6f5 100644
--- a/tests/Feature/CompanyGatewayApiTest.php
+++ b/tests/Feature/CompanyGatewayApiTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature;
 
 use App\DataMapper\DefaultSettings;
diff --git a/tests/Feature/CompanyGatewayTest.php b/tests/Feature/CompanyGatewayTest.php
index 83631de6728a..7da9cdd2977a 100644
--- a/tests/Feature/CompanyGatewayTest.php
+++ b/tests/Feature/CompanyGatewayTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature;
 
 use App\Models\CompanyGateway;
diff --git a/tests/Feature/CompanySettingsTest.php b/tests/Feature/CompanySettingsTest.php
index b95e2937fe7c..c78a3e6d429f 100644
--- a/tests/Feature/CompanySettingsTest.php
+++ b/tests/Feature/CompanySettingsTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature;
 
 use App\DataMapper\CompanySettings;
diff --git a/tests/Feature/CompanyTest.php b/tests/Feature/CompanyTest.php
index c29965dc2859..83a607f13067 100644
--- a/tests/Feature/CompanyTest.php
+++ b/tests/Feature/CompanyTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature;
 
 use App\DataMapper\CompanySettings;
diff --git a/tests/Feature/CompanyTokenApiTest.php b/tests/Feature/CompanyTokenApiTest.php
index 90dbd1ea3518..77e7104b5ee3 100644
--- a/tests/Feature/CompanyTokenApiTest.php
+++ b/tests/Feature/CompanyTokenApiTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature;
 
 use App\DataMapper\DefaultSettings;
diff --git a/tests/Feature/CreditTest.php b/tests/Feature/CreditTest.php
index beb80868e631..f763b6ac2f57 100644
--- a/tests/Feature/CreditTest.php
+++ b/tests/Feature/CreditTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature;
 
 use App\Models\Account;
diff --git a/tests/Feature/DesignApiTest.php b/tests/Feature/DesignApiTest.php
index 9a2812db0662..3c093c2083b2 100644
--- a/tests/Feature/DesignApiTest.php
+++ b/tests/Feature/DesignApiTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature;
 
 use App\DataMapper\DefaultSettings;
diff --git a/tests/Feature/GroupSettingTest.php b/tests/Feature/GroupSettingTest.php
index e088d91da49a..cacff8059168 100644
--- a/tests/Feature/GroupSettingTest.php
+++ b/tests/Feature/GroupSettingTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature;
 
 use App\Models\Account;
diff --git a/tests/Feature/InvitationTest.php b/tests/Feature/InvitationTest.php
index 832b5944ae66..26713aeee6ed 100644
--- a/tests/Feature/InvitationTest.php
+++ b/tests/Feature/InvitationTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Feature;
 
 use App\DataMapper\ClientSettings;
diff --git a/tests/Feature/InvoiceEmailTest.php b/tests/Feature/InvoiceEmailTest.php
index 1f7ec0b67702..58a2d1d01372 100644
--- a/tests/Feature/InvoiceEmailTest.php
+++ b/tests/Feature/InvoiceEmailTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Feature;
 
 use App\Helpers\Email\InvoiceEmail;
diff --git a/tests/Feature/InvoiceTest.php b/tests/Feature/InvoiceTest.php
index ff6cfa5afae4..1961a463699c 100644
--- a/tests/Feature/InvoiceTest.php
+++ b/tests/Feature/InvoiceTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature;
 
 use App\DataMapper\ClientSettings;
diff --git a/tests/Feature/LoginTest.php b/tests/Feature/LoginTest.php
index c5142b4f0969..eaef3032df81 100644
--- a/tests/Feature/LoginTest.php
+++ b/tests/Feature/LoginTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature;
 
 use App\DataMapper\CompanySettings;
diff --git a/tests/Feature/MigrationTest.php b/tests/Feature/MigrationTest.php
index 730ce57f09de..10d8d6bf78c0 100644
--- a/tests/Feature/MigrationTest.php
+++ b/tests/Feature/MigrationTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Feature;
 
 use App\Jobs\Account\CreateAccount;
diff --git a/tests/Feature/PaymentTermsApiTest.php b/tests/Feature/PaymentTermsApiTest.php
index 8a97bad722fe..1662d71c945c 100644
--- a/tests/Feature/PaymentTermsApiTest.php
+++ b/tests/Feature/PaymentTermsApiTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature;
 
 use App\DataMapper\DefaultSettings;
diff --git a/tests/Feature/PaymentTest.php b/tests/Feature/PaymentTest.php
index 439a7202ca36..22f3401f7579 100644
--- a/tests/Feature/PaymentTest.php
+++ b/tests/Feature/PaymentTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature;
 
 use App\DataMapper\ClientSettings;
diff --git a/tests/Feature/PdfMaker/ExampleDesign.php b/tests/Feature/PdfMaker/ExampleDesign.php
index 5859549f09a6..6e178527e805 100644
--- a/tests/Feature/PdfMaker/ExampleDesign.php
+++ b/tests/Feature/PdfMaker/ExampleDesign.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature\PdfMaker;
 
 use App\Services\PdfMaker\Designs\Utilities\DesignHelpers;
diff --git a/tests/Feature/PdfMaker/ExampleIntegrationTest.php b/tests/Feature/PdfMaker/ExampleIntegrationTest.php
index f8a8299375be..176a10eee1fe 100644
--- a/tests/Feature/PdfMaker/ExampleIntegrationTest.php
+++ b/tests/Feature/PdfMaker/ExampleIntegrationTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature\PdfMaker;
 
 use App\Models\Invoice;
diff --git a/tests/Feature/PdfMaker/PdfMakerTest.php b/tests/Feature/PdfMaker/PdfMakerTest.php
index 7325f3521d0c..5935ca4f894f 100644
--- a/tests/Feature/PdfMaker/PdfMakerTest.php
+++ b/tests/Feature/PdfMaker/PdfMakerTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature\PdfMaker;
 
 use App\Services\PdfMaker\Design;
diff --git a/tests/Feature/ProductTest.php b/tests/Feature/ProductTest.php
index 1ebcca44de32..6002efdd03eb 100644
--- a/tests/Feature/ProductTest.php
+++ b/tests/Feature/ProductTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature;
 
 use App\Models\Account;
diff --git a/tests/Feature/QuoteTest.php b/tests/Feature/QuoteTest.php
index ef41a34532ce..51500c0837b7 100644
--- a/tests/Feature/QuoteTest.php
+++ b/tests/Feature/QuoteTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature;
 
 use App\DataMapper\ClientSettings;
diff --git a/tests/Feature/RecurringInvoiceTest.php b/tests/Feature/RecurringInvoiceTest.php
index 60b0133e4284..baa1e5d687e4 100644
--- a/tests/Feature/RecurringInvoiceTest.php
+++ b/tests/Feature/RecurringInvoiceTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature;
 
 use App\DataMapper\ClientSettings;
diff --git a/tests/Feature/RecurringInvoicesCronTest.php b/tests/Feature/RecurringInvoicesCronTest.php
index d61aca3818e8..ff1d92b80dc9 100644
--- a/tests/Feature/RecurringInvoicesCronTest.php
+++ b/tests/Feature/RecurringInvoicesCronTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature;
 
 use App\DataMapper\ClientSettings;
diff --git a/tests/Feature/RecurringQuoteTest.php b/tests/Feature/RecurringQuoteTest.php
index 8b0b8dfe5c47..2bad66392b40 100644
--- a/tests/Feature/RecurringQuoteTest.php
+++ b/tests/Feature/RecurringQuoteTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature;
 
 use App\DataMapper\ClientSettings;
diff --git a/tests/Feature/RefundTest.php b/tests/Feature/RefundTest.php
index 5a0ff7ac53a5..23a39d7d554f 100644
--- a/tests/Feature/RefundTest.php
+++ b/tests/Feature/RefundTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature;
 
 use App\DataMapper\ClientSettings;
diff --git a/tests/Feature/ReminderTest.php b/tests/Feature/ReminderTest.php
index 397b14f747a3..1a444de3c5d4 100644
--- a/tests/Feature/ReminderTest.php
+++ b/tests/Feature/ReminderTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature;
 
 use App\Jobs\Account\CreateAccount;
diff --git a/tests/Feature/ReverseInvoiceTest.php b/tests/Feature/ReverseInvoiceTest.php
index 9306bdc8e8ee..3a69276d6095 100644
--- a/tests/Feature/ReverseInvoiceTest.php
+++ b/tests/Feature/ReverseInvoiceTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature;
 
 use App\Factory\CreditFactory;
diff --git a/tests/Feature/Shop/ShopInvoiceTest.php b/tests/Feature/Shop/ShopInvoiceTest.php
index 72725050b111..92244ba09c3d 100644
--- a/tests/Feature/Shop/ShopInvoiceTest.php
+++ b/tests/Feature/Shop/ShopInvoiceTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature\Shop;
 
 use App\Factory\CompanyUserFactory;
diff --git a/tests/Feature/SystemLogApiTest.php b/tests/Feature/SystemLogApiTest.php
index 2cae10055d95..b4c9ab9f5a26 100644
--- a/tests/Feature/SystemLogApiTest.php
+++ b/tests/Feature/SystemLogApiTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature;
 
 use App\DataMapper\DefaultSettings;
diff --git a/tests/Feature/UpdateExchangeRatesTest.php b/tests/Feature/UpdateExchangeRatesTest.php
index e65f45c4e77e..f1b2a16daa0c 100644
--- a/tests/Feature/UpdateExchangeRatesTest.php
+++ b/tests/Feature/UpdateExchangeRatesTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature;
 
 use App\DataMapper\DefaultSettings;
diff --git a/tests/Feature/UserTest.php b/tests/Feature/UserTest.php
index 1c1463f3201b..b1b30570bf74 100644
--- a/tests/Feature/UserTest.php
+++ b/tests/Feature/UserTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Feature;
 
 use App\Factory\CompanyUserFactory;
diff --git a/tests/Feature/WebhookAPITest.php b/tests/Feature/WebhookAPITest.php
index b428764ae3c7..a489b4b6ef83 100644
--- a/tests/Feature/WebhookAPITest.php
+++ b/tests/Feature/WebhookAPITest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Feature;
 
 use App\Utils\Traits\MakesHash;
diff --git a/tests/Integration/CheckCacheTest.php b/tests/Integration/CheckCacheTest.php
index f46b51926516..a389ceea79e9 100644
--- a/tests/Integration/CheckCacheTest.php
+++ b/tests/Integration/CheckCacheTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Integration;
 
 use Illuminate\Foundation\Testing\Concerns\InteractsWithDatabase;
diff --git a/tests/Integration/CheckLockedInvoiceValidationTest.php b/tests/Integration/CheckLockedInvoiceValidationTest.php
index 891e7dcc0093..05d1728e6f3d 100644
--- a/tests/Integration/CheckLockedInvoiceValidationTest.php
+++ b/tests/Integration/CheckLockedInvoiceValidationTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Integration;
 
 use Illuminate\Foundation\Testing\Concerns\InteractsWithDatabase;
diff --git a/tests/Integration/CheckRemindersTest.php b/tests/Integration/CheckRemindersTest.php
index bd46a388ca09..7e74f3a1cfe2 100644
--- a/tests/Integration/CheckRemindersTest.php
+++ b/tests/Integration/CheckRemindersTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Integration;
 
 use App\Models\Invoice;
diff --git a/tests/Integration/CompanyLedgerTest.php b/tests/Integration/CompanyLedgerTest.php
index 8e88d26e0136..9f442cfbb285 100644
--- a/tests/Integration/CompanyLedgerTest.php
+++ b/tests/Integration/CompanyLedgerTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Integration;
 
 use App\DataMapper\CompanySettings;
diff --git a/tests/Integration/ContainerTest.php b/tests/Integration/ContainerTest.php
index 63e92dfb6362..1596c1987705 100644
--- a/tests/Integration/ContainerTest.php
+++ b/tests/Integration/ContainerTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Integration;
 
 use App\Models\Company;
diff --git a/tests/Integration/DownloadHistoricalInvoiceTest.php b/tests/Integration/DownloadHistoricalInvoiceTest.php
index 67e0a36cba76..4d7773641d92 100644
--- a/tests/Integration/DownloadHistoricalInvoiceTest.php
+++ b/tests/Integration/DownloadHistoricalInvoiceTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Integration;
 
 use App\Events\Invoice\InvoiceWasUpdated;
diff --git a/tests/Integration/HtmlGenerationTest.php b/tests/Integration/HtmlGenerationTest.php
index 9619315afe65..da75b2fab458 100644
--- a/tests/Integration/HtmlGenerationTest.php
+++ b/tests/Integration/HtmlGenerationTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Integration;
 
 use App\Designs\Bold;
diff --git a/tests/Integration/InvoiceUploadTest.php b/tests/Integration/InvoiceUploadTest.php
index d77b2e339c20..f2bc6267a5bb 100644
--- a/tests/Integration/InvoiceUploadTest.php
+++ b/tests/Integration/InvoiceUploadTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Integration;
 
 use App\Jobs\Invoice\CreateInvoicePdf;
diff --git a/tests/Integration/MarkInvoicePaidTest.php b/tests/Integration/MarkInvoicePaidTest.php
index 486c57d9a946..65a95089649a 100644
--- a/tests/Integration/MarkInvoicePaidTest.php
+++ b/tests/Integration/MarkInvoicePaidTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Integration;
 
 use App\Models\Account;
diff --git a/tests/Integration/MultiDBUserTest.php b/tests/Integration/MultiDBUserTest.php
index 7938a5171f3e..73e8d003a6f7 100644
--- a/tests/Integration/MultiDBUserTest.php
+++ b/tests/Integration/MultiDBUserTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Integration;
 
 use App\Factory\CompanyUserFactory;
diff --git a/tests/Integration/PaymentDrivers/AuthorizeTest.php b/tests/Integration/PaymentDrivers/AuthorizeTest.php
index 48e1eec15325..df76e186742e 100644
--- a/tests/Integration/PaymentDrivers/AuthorizeTest.php
+++ b/tests/Integration/PaymentDrivers/AuthorizeTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Integration\PaymentDrivers;
 
 use App\Factory\PaymentFactory;
diff --git a/tests/Integration/SendFailedEmailsTest.php b/tests/Integration/SendFailedEmailsTest.php
index 346814c5da09..b61038ef65b7 100644
--- a/tests/Integration/SendFailedEmailsTest.php
+++ b/tests/Integration/SendFailedEmailsTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Integration;
 
 use App\Jobs\Invoice\EmailInvoice;
diff --git a/tests/Integration/SystemHealthTest.php b/tests/Integration/SystemHealthTest.php
index 8fe6f2fb952d..58285561ac52 100644
--- a/tests/Integration/SystemHealthTest.php
+++ b/tests/Integration/SystemHealthTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Integration;
 
 use Illuminate\Foundation\Testing\Concerns\InteractsWithDatabase;
diff --git a/tests/Integration/UniqueEmailTest.php b/tests/Integration/UniqueEmailTest.php
index 453f9f04cb06..4da343184f4d 100644
--- a/tests/Integration/UniqueEmailTest.php
+++ b/tests/Integration/UniqueEmailTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Integration;
 
 use App\Http\ValidationRules\NewUniqueUserRule;
diff --git a/tests/Integration/UpdateCompanyLedgerTest.php b/tests/Integration/UpdateCompanyLedgerTest.php
index fa0e2ff97795..d331591ac088 100644
--- a/tests/Integration/UpdateCompanyLedgerTest.php
+++ b/tests/Integration/UpdateCompanyLedgerTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Integration;
 
 use App\Events\Invoice\InvoiceWasCreated;
diff --git a/tests/Integration/UpdateCompanyUserTest.php b/tests/Integration/UpdateCompanyUserTest.php
index 6dd406279ba5..5a73ec7a67ad 100644
--- a/tests/Integration/UpdateCompanyUserTest.php
+++ b/tests/Integration/UpdateCompanyUserTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Integration;
 
 use App\Models\CompanyUser;
diff --git a/tests/Integration/UploadFileTest.php b/tests/Integration/UploadFileTest.php
index 1dc74393a21b..1430f1a54f76 100644
--- a/tests/Integration/UploadFileTest.php
+++ b/tests/Integration/UploadFileTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Integration;
 
 use App\Events\Invoice\InvoiceWasCreated;
diff --git a/tests/Integration/UploadLogoTest.php b/tests/Integration/UploadLogoTest.php
index bb4802282b48..9208ab5caaec 100644
--- a/tests/Integration/UploadLogoTest.php
+++ b/tests/Integration/UploadLogoTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Integration;
 
 use App\Events\Invoice\InvoiceWasCreated;
diff --git a/tests/Pdf/PdfGenerationTest.php b/tests/Pdf/PdfGenerationTest.php
index b9d0f2c3a570..0b42ce14241f 100644
--- a/tests/Pdf/PdfGenerationTest.php
+++ b/tests/Pdf/PdfGenerationTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Pdf;
 
 use Illuminate\Support\Facades\Storage;
diff --git a/tests/Unit/BaseSettingsTest.php b/tests/Unit/BaseSettingsTest.php
index 632a1848502c..95719e86db58 100644
--- a/tests/Unit/BaseSettingsTest.php
+++ b/tests/Unit/BaseSettingsTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use App\DataMapper\ClientSettings;
diff --git a/tests/Unit/CloneQuoteToInvoiceFactoryTest.php b/tests/Unit/CloneQuoteToInvoiceFactoryTest.php
index cab7d17a2e15..e5f67ceea139 100644
--- a/tests/Unit/CloneQuoteToInvoiceFactoryTest.php
+++ b/tests/Unit/CloneQuoteToInvoiceFactoryTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use App\Factory\CloneQuoteToInvoiceFactory;
diff --git a/tests/Unit/CollectionMergingTest.php b/tests/Unit/CollectionMergingTest.php
index a759b5138b29..37cb02eec362 100644
--- a/tests/Unit/CollectionMergingTest.php
+++ b/tests/Unit/CollectionMergingTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use App\Models\PaymentTerm;
diff --git a/tests/Unit/CompanyDocumentsTest.php b/tests/Unit/CompanyDocumentsTest.php
index ec9d1ef5982b..a5016acef06c 100644
--- a/tests/Unit/CompanyDocumentsTest.php
+++ b/tests/Unit/CompanyDocumentsTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use App\Jobs\Util\UploadFile;
diff --git a/tests/Unit/CompanySettingsSaveableTest.php b/tests/Unit/CompanySettingsSaveableTest.php
index bee5bd2b9fd3..496617bffbed 100644
--- a/tests/Unit/CompanySettingsSaveableTest.php
+++ b/tests/Unit/CompanySettingsSaveableTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use App\DataMapper\CompanySettings;
diff --git a/tests/Unit/CompanySettingsTest.php b/tests/Unit/CompanySettingsTest.php
index 77ec0e8d1481..80eb2c6907a0 100644
--- a/tests/Unit/CompanySettingsTest.php
+++ b/tests/Unit/CompanySettingsTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use App\DataMapper\CompanySettings;
diff --git a/tests/Unit/CompareCollectionTest.php b/tests/Unit/CompareCollectionTest.php
index 5ec852d2be48..53687708d134 100644
--- a/tests/Unit/CompareCollectionTest.php
+++ b/tests/Unit/CompareCollectionTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use Tests\TestCase;
diff --git a/tests/Unit/CompareObjectTest.php b/tests/Unit/CompareObjectTest.php
index 11d214e740d6..88e95a4d2b5e 100644
--- a/tests/Unit/CompareObjectTest.php
+++ b/tests/Unit/CompareObjectTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use App\DataMapper\ClientSettings;
diff --git a/tests/Unit/CurrencyApiTest.php b/tests/Unit/CurrencyApiTest.php
index 90b4d9cf7d65..ef18b97dc4e8 100644
--- a/tests/Unit/CurrencyApiTest.php
+++ b/tests/Unit/CurrencyApiTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use App\Libraries\Currency\Conversion\CurrencyApi;
diff --git a/tests/Unit/EncryptionSettingsTest.php b/tests/Unit/EncryptionSettingsTest.php
index 2ce48fef0736..a9d7cb910b38 100644
--- a/tests/Unit/EncryptionSettingsTest.php
+++ b/tests/Unit/EncryptionSettingsTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use App\DataMapper\ClientSettings;
diff --git a/tests/Unit/EntityTest.php b/tests/Unit/EntityTest.php
index 048d1f4e1c52..bed6bf72f6b2 100644
--- a/tests/Unit/EntityTest.php
+++ b/tests/Unit/EntityTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use App\Factory\InvoiceFactory;
diff --git a/tests/Unit/EvaluateStringTest.php b/tests/Unit/EvaluateStringTest.php
index d2454301b628..069b3c762481 100644
--- a/tests/Unit/EvaluateStringTest.php
+++ b/tests/Unit/EvaluateStringTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use App\DataMapper\DefaultSettings;
diff --git a/tests/Unit/FactoryCreationTest.php b/tests/Unit/FactoryCreationTest.php
index 8d7c941b2e4b..a025cd7cb24f 100644
--- a/tests/Unit/FactoryCreationTest.php
+++ b/tests/Unit/FactoryCreationTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use App\Factory\ClientContactFactory;
diff --git a/tests/Unit/GeneratesCounterTest.php b/tests/Unit/GeneratesCounterTest.php
index 372fc39a96a5..fde2585866bb 100644
--- a/tests/Unit/GeneratesCounterTest.php
+++ b/tests/Unit/GeneratesCounterTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use App\DataMapper\ClientSettings;
diff --git a/tests/Unit/GoogleAnalyticsTest.php b/tests/Unit/GoogleAnalyticsTest.php
index e57afa8c0950..76295f627e4d 100644
--- a/tests/Unit/GoogleAnalyticsTest.php
+++ b/tests/Unit/GoogleAnalyticsTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use App\DataMapper\ClientSettings;
diff --git a/tests/Unit/GroupSettingsTest.php b/tests/Unit/GroupSettingsTest.php
index ff2ac1eaa6c7..e888e32791bc 100644
--- a/tests/Unit/GroupSettingsTest.php
+++ b/tests/Unit/GroupSettingsTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use App\DataMapper\ClientSettings;
diff --git a/tests/Unit/GroupTest.php b/tests/Unit/GroupTest.php
index 73f095bc0d92..c15edf39c126 100644
--- a/tests/Unit/GroupTest.php
+++ b/tests/Unit/GroupTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use App\DataMapper\ClientSettings;
diff --git a/tests/Unit/InvitationTest.php b/tests/Unit/InvitationTest.php
index 42da0dd4ee12..fddfd47ccf56 100644
--- a/tests/Unit/InvitationTest.php
+++ b/tests/Unit/InvitationTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use App\Factory\InvoiceInvitationFactory;
diff --git a/tests/Unit/InvoiceActionsTest.php b/tests/Unit/InvoiceActionsTest.php
index c72a53f6d870..4698ab3f7ccd 100644
--- a/tests/Unit/InvoiceActionsTest.php
+++ b/tests/Unit/InvoiceActionsTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use App\Factory\PaymentFactory;
diff --git a/tests/Unit/InvoiceInclusiveTest.php b/tests/Unit/InvoiceInclusiveTest.php
index c1d4c122f1fb..0bb0d0689523 100644
--- a/tests/Unit/InvoiceInclusiveTest.php
+++ b/tests/Unit/InvoiceInclusiveTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use App\Factory\InvoiceFactory;
diff --git a/tests/Unit/InvoiceItemInclusiveTest.php b/tests/Unit/InvoiceItemInclusiveTest.php
index b0d1395883ed..5f87449d79b1 100644
--- a/tests/Unit/InvoiceItemInclusiveTest.php
+++ b/tests/Unit/InvoiceItemInclusiveTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use App\Factory\InvoiceItemFactory;
diff --git a/tests/Unit/InvoiceItemTest.php b/tests/Unit/InvoiceItemTest.php
index 2d432f9547f3..be52738763b2 100644
--- a/tests/Unit/InvoiceItemTest.php
+++ b/tests/Unit/InvoiceItemTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use App\Factory\InvoiceItemFactory;
diff --git a/tests/Unit/InvoiceItemV2Test.php b/tests/Unit/InvoiceItemV2Test.php
index 2657829b461b..f895a2f99b41 100644
--- a/tests/Unit/InvoiceItemV2Test.php
+++ b/tests/Unit/InvoiceItemV2Test.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use App\Factory\InvoiceItemFactory;
diff --git a/tests/Unit/InvoiceTest.php b/tests/Unit/InvoiceTest.php
index c1d26031d37c..3c4b5d0f7888 100644
--- a/tests/Unit/InvoiceTest.php
+++ b/tests/Unit/InvoiceTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use App\Factory\InvoiceFactory;
diff --git a/tests/Unit/MakesDatesTest.php b/tests/Unit/MakesDatesTest.php
index c5e798e12d14..bf86b915796c 100644
--- a/tests/Unit/MakesDatesTest.php
+++ b/tests/Unit/MakesDatesTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use App\Utils\Traits\MakesDates;
diff --git a/tests/Unit/MakesInvoiceValuesTest.php b/tests/Unit/MakesInvoiceValuesTest.php
index c2a8f4bf6a76..6306c4cbf833 100644
--- a/tests/Unit/MakesInvoiceValuesTest.php
+++ b/tests/Unit/MakesInvoiceValuesTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use Tests\TestCase;
diff --git a/tests/Unit/Migration/FeesAndLimitsTest.php b/tests/Unit/Migration/FeesAndLimitsTest.php
index 7ee4c2e698c6..7550bf1a644b 100644
--- a/tests/Unit/Migration/FeesAndLimitsTest.php
+++ b/tests/Unit/Migration/FeesAndLimitsTest.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 
 namespace Tests\Unit\Migration;
 
diff --git a/tests/Unit/Migration/ImportTest.php b/tests/Unit/Migration/ImportTest.php
index 792ab0de655a..c5335e6da389 100644
--- a/tests/Unit/Migration/ImportTest.php
+++ b/tests/Unit/Migration/ImportTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit\Migration;
 
 use App\Exceptions\MigrationValidatorFailed;
diff --git a/tests/Unit/NestedCollectionTest.php b/tests/Unit/NestedCollectionTest.php
index f3d7d490da7f..827f386aa57c 100644
--- a/tests/Unit/NestedCollectionTest.php
+++ b/tests/Unit/NestedCollectionTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use Tests\TestCase;
diff --git a/tests/Unit/NumberTest.php b/tests/Unit/NumberTest.php
index 026f2b04d038..1e2ce9852c79 100644
--- a/tests/Unit/NumberTest.php
+++ b/tests/Unit/NumberTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use App\Models\Currency;
diff --git a/tests/Unit/PdfVariablesTest.php b/tests/Unit/PdfVariablesTest.php
index 98135f0e7872..35e55a834194 100644
--- a/tests/Unit/PdfVariablesTest.php
+++ b/tests/Unit/PdfVariablesTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use App\DataMapper\ClientSettings;
diff --git a/tests/Unit/PrimaryKeyTransformationTest.php b/tests/Unit/PrimaryKeyTransformationTest.php
index 9fe40a1f77f8..813b9e4fa19e 100644
--- a/tests/Unit/PrimaryKeyTransformationTest.php
+++ b/tests/Unit/PrimaryKeyTransformationTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use App\DataMapper\ClientSettings;
diff --git a/tests/Unit/RecurringDatesTest.php b/tests/Unit/RecurringDatesTest.php
index 16ab02d51284..29beb0a72acb 100644
--- a/tests/Unit/RecurringDatesTest.php
+++ b/tests/Unit/RecurringDatesTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use App\Factory\CloneQuoteToInvoiceFactory;
@@ -52,7 +60,7 @@ class RecurringDatesTest extends TestCase
         $recurring_invoice->status_id = RecurringInvoice::STATUS_PENDING;
         $recurring_invoice->frequency_id = RecurringInvoice::FREQUENCY_MONTHLY;
         $recurring_invoice->remaining_cycles = 5;
-        $recurring_invoice->due_date_days = 5;
+        $recurring_invoice->due_date_days = '5';
         $recurring_invoice->next_send_date = now();
 
         $recurring_invoice->save();
diff --git a/tests/Unit/RecurringDueDatesTest.php b/tests/Unit/RecurringDueDatesTest.php
new file mode 100644
index 000000000000..fa153791a076
--- /dev/null
+++ b/tests/Unit/RecurringDueDatesTest.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace Tests\Unit;
+
+use App\Utils\Traits\Recurring\HasRecurrence;
+use Illuminate\Support\Carbon;
+use Tests\TestCase;
+
+/**
+ * @test
+ * @covers App\Utils\Traits\Recurring\HasRecurrence
+ */
+class RecurringDueDatesTest extends TestCase
+{
+
+    use HasRecurrence;
+
+
+    public function testFirstDate()
+    {
+
+        $date = Carbon::parse('2020-02-15');
+
+        $due_date = $this->calculateFirstDayOfMonth($date);
+
+        $this->assertEquals('2020-03-01', $due_date->format('Y-m-d'));
+    }
+
+    public function testFirstOfMonthOnFirst()
+    {
+
+        $date = Carbon::parse('2020-02-01');
+
+        $due_date = $this->calculateFirstDayOfMonth($date);
+
+        $this->assertEquals('2020-03-01', $due_date->format('Y-m-d'));
+
+    }  
+
+
+    public function testFirstOfMonthOnLast()
+    {
+
+        $date = Carbon::parse('2020-03-31');
+
+        $due_date = $this->calculateFirstDayOfMonth($date);
+
+        $this->assertEquals('2020-04-01', $due_date->format('Y-m-d'));
+        
+    }    
+
+    public function testLastOfMonth()
+    {
+
+        $date = Carbon::parse('2020-02-15');
+
+        $due_date = $this->calculateLastDayOfMonth($date);
+
+        $this->assertEquals('2020-02-29', $due_date->format('Y-m-d'));
+
+    } 
+
+    public function testLastOfMonthOnFirst()
+    {
+
+        $date = Carbon::parse('2020-02-1');
+
+        $due_date = $this->calculateLastDayOfMonth($date);
+
+        $this->assertEquals('2020-02-29', $due_date->format('Y-m-d'));
+
+    } 
+
+    public function testLastOfMonthOnLast()
+    {
+
+        $date = Carbon::parse('2020-02-29');
+
+        $due_date = $this->calculateLastDayOfMonth($date);
+
+        $this->assertEquals('2020-03-31', $due_date->format('Y-m-d'));
+
+    } 
+
+    public function testDayOfMonth()
+    {
+        $date = Carbon::parse('2020-02-01');
+
+        $due_date = $this->setDayOfMonth($date, '15');
+
+        $this->assertEquals('2020-02-15', $due_date->format('Y-m-d'));
+
+    }
+
+    public function testDayOfMonthInFuture()
+    {
+        $date = Carbon::parse('2020-02-16');
+
+        $due_date = $this->setDayOfMonth($date, '15');
+
+        $this->assertEquals('2020-03-15', $due_date->format('Y-m-d'));
+
+    }
+
+    public function testDayOfMonthSameDay()
+    {
+        $date = Carbon::parse('2020-02-01');
+
+        $due_date = $this->setDayOfMonth($date, '1');
+
+        $this->assertEquals('2020-03-01', $due_date->format('Y-m-d'));
+
+    }
+
+
+    public function testDayOfMonthWithOverflow()
+    {
+        $date = Carbon::parse('2020-1-31');
+
+        $due_date = $this->setDayOfMonth($date, '31');
+
+        $this->assertEquals('2020-02-29', $due_date->format('Y-m-d'));
+
+    }
+
+    public function testDayOfMonthWithOverflow2()
+    {
+        $date = Carbon::parse('2020-02-29');
+
+        $due_date = $this->setDayOfMonth($date, '31');
+
+        $this->assertEquals('2020-03-31', $due_date->format('Y-m-d'));
+
+    }
+
+    public function testDayOfMonthWithOverflow3()
+    {
+        $date = Carbon::parse('2020-01-30');
+
+        $due_date = $this->setDayOfMonth($date, '30');
+
+        $this->assertEquals('2020-02-29', $due_date->format('Y-m-d'));
+
+    }
+
+    public function testDayOfMonthWithOverflow4()
+    {
+        $date = Carbon::parse('2019-02-28');
+
+        $due_date = $this->setDayOfMonth($date, '31');
+
+        $this->assertEquals('2019-03-31', $due_date->format('Y-m-d'));
+
+    }
+
+    public function testDayOfMonthWithOverflow5()
+    {
+        $date = Carbon::parse('2019-1-31');
+
+        $due_date = $this->setDayOfMonth($date, '31');
+
+        $this->assertEquals('2019-02-28', $due_date->format('Y-m-d'));
+
+    }
+
+}
diff --git a/tests/Unit/SentryTest.php b/tests/Unit/SentryTest.php
index 9b8fa2ef3103..42abb51ced57 100644
--- a/tests/Unit/SentryTest.php
+++ b/tests/Unit/SentryTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use Illuminate\Foundation\Testing\RefreshDatabase;
diff --git a/tests/Unit/Shop/ShopProfileTest.php b/tests/Unit/Shop/ShopProfileTest.php
index 6d800a495c98..e8d41a1a2a1c 100644
--- a/tests/Unit/Shop/ShopProfileTest.php
+++ b/tests/Unit/Shop/ShopProfileTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit\Shop;
 
 use App\Factory\InvoiceFactory;
diff --git a/tests/Unit/SystemHealthTest.php b/tests/Unit/SystemHealthTest.php
index d1d29ad9c268..57daadddcfe0 100644
--- a/tests/Unit/SystemHealthTest.php
+++ b/tests/Unit/SystemHealthTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use App\Utils\SystemHealth;
diff --git a/tests/Unit/TranslationTest.php b/tests/Unit/TranslationTest.php
index d97394c665a7..84e33c4ccc36 100644
--- a/tests/Unit/TranslationTest.php
+++ b/tests/Unit/TranslationTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use Illuminate\Support\Facades\Lang;
diff --git a/tests/Unit/UBLInvoiceTest.php b/tests/Unit/UBLInvoiceTest.php
index 99ce53026d0f..5305a61f7138 100644
--- a/tests/Unit/UBLInvoiceTest.php
+++ b/tests/Unit/UBLInvoiceTest.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 namespace Tests\Unit;
 
 use App\Factory\InvoiceFactory;