diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 20e396a7bd9..4eb0ad33aa2 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -22,7 +22,7 @@ Please read the list below. Feel free to delete this text after but we need you
 - [ ] The API has been updated.
 - [ ] API's documentation has been added by submitting a pull request in the [marketing website repository](https://github.com/monicahq/marketing_site/pulls).
 - [ ] Tests have been added for the new code.
-- [ ] If you change a model, make sure the FakeContentTableSeeder is updated. We need seeders to develop locally and generate fake data.
+- [ ] If you change a model, make sure the SetupTest file is updated. We need seeders to develop locally and generate fake data.
 
 #### If the code changes the SQL schema
 - [ ] Make sure exporting account data as SQL is still working.
diff --git a/app/Console/Commands/SetupTest.php b/app/Console/Commands/SetupTest.php
index 2e75763bd07..458b7115d92 100644
--- a/app/Console/Commands/SetupTest.php
+++ b/app/Console/Commands/SetupTest.php
@@ -2,11 +2,39 @@
 
 namespace App\Console\Commands;
 
+use Carbon\Carbon;
+use App\Models\User\User;
+use App\Helpers\DateHelper;
+use App\Models\Account\Account;
+use App\Models\Contact\Contact;
 use Illuminate\Console\Command;
+use App\Helpers\CountriesHelper;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Console\Application;
+use App\Models\Contact\LifeEventType;
+use App\Models\Contact\ContactFieldType;
+use App\Services\Contact\Gift\CreateGift;
+use App\Services\Contact\Tag\AssociateTag;
+use Illuminate\Foundation\Testing\WithFaker;
+use App\Services\Contact\Address\CreateAddress;
+use App\Services\Contact\Contact\CreateContact;
+use App\Services\Contact\Reminder\CreateReminder;
+use Symfony\Component\Console\Helper\ProgressBar;
+use App\Services\Contact\LifeEvent\CreateLifeEvent;
+use Symfony\Component\Console\Output\ConsoleOutput;
+use App\Services\Contact\Conversation\CreateConversation;
+use App\Services\Contact\Relationship\CreateRelationship;
+use App\Services\Account\Activity\Activity\CreateActivity;
+use App\Services\Contact\Contact\UpdateBirthdayInformation;
+use App\Services\Contact\Contact\UpdateDeceasedInformation;
+use App\Services\Contact\Conversation\AddMessageToConversation;
+use App\Services\Account\Activity\Activity\AttachContactToActivity;
 
 class SetupTest extends Command
 {
+    use WithFaker;
+
     /**
      * The name and signature of the console command.
      *
@@ -22,6 +50,41 @@ class SetupTest extends Command
      */
     protected $description = 'Create the test environment with optional fake data for testing purposes.';
 
+    /**
+     * The number of contacts that need to be generated.
+     *
+     * @var int
+     */
+    private $numberOfContacts;
+
+    /**
+     * The Current contact instance.
+     *
+     * @var Contact
+     */
+    private $contact;
+
+    /**
+     * The current Contact instance.
+     *
+     * @var Account
+     */
+    private $account;
+
+    /**
+     * The list of countries.
+     *
+     * @var Collection
+     */
+    private $countries = null;
+
+    /**
+     * The logged user.
+     *
+     * @var User
+     */
+    private $user;
+
     /**
      * Execute the console command.
      *
@@ -38,7 +101,9 @@ public function handle()
         $this->artisan('✓ Symlink the storage folder', 'storage:link');
 
         if (! $this->option('skipSeed')) {
-            $this->artisan('✓ Filling database with fake data', 'db:seed', ['--class' => 'FakeContentTableSeeder']);
+            $this->numberOfContacts = $this->ask('How many contacts would you like to have in this test account?');
+            $this->info('✓ Filling database with fake data');
+            $this->seed();
         }
 
         $this->line('');
@@ -72,4 +137,537 @@ public function artisan($message, $command, array $arguments = [])
         $this->callSilent($command, $arguments);
         $this->line('');
     }
+
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function seed()
+    {
+        $this->setUpFaker();
+
+        // Get or create the first account
+        if (User::where('email', 'admin@admin.com')->exists()) {
+            $this->user = User::where('email', 'admin@admin.com')->first();
+            $userId = $this->user->value('id');
+            $this->account = Account::where('id', $userId)->first();
+        } else {
+            $this->account = Account::createDefault('John', 'Doe', 'admin@admin.com', 'admin0');
+
+            // set default admin account to confirmed
+            $adminUser = $this->account->users()->first();
+            $this->confirmUser($adminUser);
+            $this->user = $adminUser;
+        }
+
+        // create a random number of contacts
+        //$this->numberOfContacts = rand(60, 100);
+        echo 'Generating '.$this->numberOfContacts.' fake contacts'.PHP_EOL;
+
+        $output = new ConsoleOutput();
+        $progress = new ProgressBar($output, $this->numberOfContacts);
+        $progress->start();
+
+        for ($i = 0; $i < $this->numberOfContacts; $i++) {
+            $gender = (rand(1, 2) == 1) ? 'male' : 'female';
+
+            $this->contact = app(CreateContact::class)->execute([
+                'account_id' => $this->account->id,
+                'author_id' => $this->user->id,
+                'first_name' => $this->faker->firstName($gender),
+                'last_name' => (rand(1, 2) == 1) ? $this->faker->lastName : null,
+                'nickname' => (rand(1, 2) == 1) ? $this->faker->name : null,
+                'gender_id' => $this->getRandomGender()->id,
+                'is_partial' => false,
+                'is_birthdate_known' => false,
+                'is_deceased' => false,
+                'is_deceased_date_known' => false,
+            ]);
+
+            $this->populateTags();
+            $this->populateFoodPreferences();
+            $this->populateDeceasedDate();
+            $this->populateBirthday();
+            $this->populateFirstMetInformation();
+            $this->populateRelationships();
+            $this->populateNotes();
+            $this->populateActivities();
+            $this->populateTasks();
+            $this->populateDebts();
+            $this->populateCalls();
+            $this->populateConversations();
+            $this->populateLifeEvents();
+            $this->populateGifts();
+            $this->populateAddresses();
+            $this->populateContactFields();
+            $this->populatePets();
+            $this->changeUpdatedAt();
+
+            $progress->advance();
+        }
+
+        $this->populateDayRatings();
+        $this->populateEntries();
+
+        $progress->finish();
+
+        // create the second test, blank account
+        if (! User::where('email', 'blank@blank.com')->exists()) {
+            $blankAccount = Account::createDefault('Blank', 'State', 'blank@blank.com', 'blank0');
+            $blankUser = $blankAccount->users()->first();
+            $this->confirmUser($blankUser);
+        }
+    }
+
+    public function populateTags()
+    {
+        if (rand(1, 2) == 1) {
+            $i = 0;
+            do {
+                app(AssociateTag::class)->execute([
+                    'account_id' => $this->contact->account->id,
+                    'contact_id' => $this->contact->id,
+                    'name' => $this->faker->word,
+                ]);
+                $i++;
+            } while ($i < 10);
+        }
+    }
+
+    public function populateFoodPreferences()
+    {
+        // add food preferences
+        if (rand(1, 2) == 1) {
+            $this->contact->food_preferences = $this->faker->realText();
+            $this->contact->save();
+        }
+    }
+
+    public function populateDeceasedDate()
+    {
+        // deceased?
+        if (rand(1, 7) == 1) {
+            $birthdate = $this->faker->dateTimeThisCentury();
+
+            app(UpdateDeceasedInformation::class)->execute([
+                'account_id' => $this->contact->account_id,
+                'contact_id' => $this->contact->id,
+                'is_deceased' => rand(1, 2) == 1,
+                'is_date_known' => rand(1, 2) == 1,
+                'day' => (int) $birthdate->format('d'),
+                'month' => (int) $birthdate->format('m'),
+                'year' => (int) $birthdate->format('Y'),
+                'add_reminder' => rand(1, 2) == 1,
+            ]);
+        }
+    }
+
+    public function populateBirthday()
+    {
+        if (rand(1, 2) == 1) {
+            $birthdate = $this->faker->dateTimeThisCentury();
+
+            app(UpdateBirthdayInformation::class)->execute([
+                'account_id' => $this->contact->account_id,
+                'contact_id' => $this->contact->id,
+                'is_date_known' => rand(1, 2) == 1,
+                'day' => (int) $birthdate->format('d'),
+                'month' => (int) $birthdate->format('m'),
+                'year' => (int) $birthdate->format('Y'),
+                'is_age_based' => rand(1, 2) == 1,
+                'age' => rand(1, 99),
+                'add_reminder' => rand(1, 2) == 1,
+            ]);
+        }
+    }
+
+    public function populateFirstMetInformation()
+    {
+        if (rand(1, 2) == 1) {
+            $this->contact->first_met_where = $this->faker->realText(20);
+        }
+
+        if (rand(1, 2) == 1) {
+            $this->contact->first_met_additional_info = $this->faker->realText(20);
+            $firstMetDate = $this->faker->dateTimeThisCentury();
+
+            if (rand(1, 2) == 1) {
+                // add a date where we don't know the year
+                $specialDate = $this->contact->setSpecialDate('first_met', 0, $firstMetDate->format('m'), $firstMetDate->format('d'));
+            } else {
+                // add a date where we know the year
+                $specialDate = $this->contact->setSpecialDate('first_met', $firstMetDate->format('Y'), $firstMetDate->format('m'), $firstMetDate->format('d'));
+            }
+            app(CreateReminder::class)->execute([
+                'account_id' => $this->contact->account_id,
+                'contact_id' => $this->contact->id,
+                'initial_date' => $specialDate->date->toDateString(),
+                'frequency_type' => 'year',
+                'frequency_number' => 1,
+                'title' => trans(
+                    'people.introductions_reminder_title',
+                    ['name' => $this->contact->first_name]
+                ),
+            ]);
+        }
+
+        if (rand(1, 2) == 1) {
+            do {
+                $rand = rand(1, $this->numberOfContacts);
+            } while (in_array($rand, [$this->contact->id]));
+
+            $this->contact->first_met_through_contact_id = $rand;
+        }
+
+        $this->contact->save();
+    }
+
+    public function populateRelationships()
+    {
+        if (rand(1, 2) == 1) {
+            foreach (range(1, rand(2, 6)) as $index) {
+                $gender = (rand(1, 2) == 1) ? 'male' : 'female';
+
+                $relatedContact = app(CreateContact::class)->execute([
+                    'account_id' => $this->contact->account_id,
+                    'author_id' => $this->user->id,
+                    'first_name' => $this->faker->firstName($gender),
+                    'last_name' => (rand(1, 2) == 1) ? $this->faker->lastName : null,
+                    'nickname' => (rand(1, 2) == 1) ? $this->faker->name : null,
+                    'gender_id' => $this->getRandomGender()->id,
+                    'is_partial' => rand(1, 2) == 1,
+                    'is_birthdate_known' => false,
+                    'is_deceased' => false,
+                    'is_deceased_date_known' => false,
+                ]);
+
+                $relatedContactBirthDate = $this->faker->dateTimeThisCentury();
+                app(UpdateBirthdayInformation::class)->execute([
+                    'account_id' => $this->contact->account_id,
+                    'contact_id' => $relatedContact->id,
+                    'is_date_known' => rand(1, 2) == 1,
+                    'day' => (int) $relatedContactBirthDate->format('d'),
+                    'month' => (int) $relatedContactBirthDate->format('m'),
+                    'year' => (int) $relatedContactBirthDate->format('Y'),
+                    'is_age_based' => rand(1, 2) == 1,
+                    'age' => rand(1, 99),
+                    'add_reminder' => rand(1, 2) == 1,
+                ]);
+
+                // set relationship
+                $relationshipId = $this->contact->account->relationshipTypes->random()->id;
+                $relationship = app(CreateRelationship::class)->execute([
+                    'account_id' => $this->contact->account_id,
+                    'contact_is' => $this->contact->id,
+                    'of_contact' => $relatedContact->id,
+                    'relationship_type_id' => $relationshipId,
+                ]);
+            }
+        }
+    }
+
+    public function populateNotes()
+    {
+        if (rand(1, 2) == 1) {
+            for ($j = 0; $j < rand(1, 13); $j++) {
+                $note = $this->contact->notes()->create([
+                    'body' => $this->faker->realText(rand(40, 500)),
+                    'account_id' => $this->contact->account_id,
+                    'is_favorited' => rand(1, 3) == 1,
+                    'favorited_at' => $this->faker->dateTimeThisCentury(),
+                ]);
+            }
+        }
+    }
+
+    public function populateActivities()
+    {
+        if (rand(1, 2) == 1) {
+            for ($j = 0; $j < rand(1, 13); $j++) {
+                $date = DateHelper::getDate(Carbon::instance($this->faker->dateTimeThisYear($max = 'now')));
+
+                $request = [
+                    'account_id' => $this->contact->account_id,
+                    'activity_type_id' => rand(1, 13),
+                    'summary' => $this->faker->realText(rand(40, 100)),
+                    'description' => (rand(1, 2) == 1 ? $this->faker->realText(rand(100, 1000)) : null),
+                    'happened_at' => $date,
+                    'contacts' => [$this->contact->id],
+                ];
+
+                $activity = app(CreateActivity::class)->execute($request);
+
+                $request = [
+                    'account_id' => $this->contact->account_id,
+                    'activity_id' => $activity->id,
+                    'contacts' => [$this->contact->id],
+                ];
+
+                app(AttachContactToActivity::class)->execute($request);
+
+                DB::table('journal_entries')->insertGetId([
+                    'account_id' => $this->account->id,
+                    'date' => $date,
+                    'journalable_id' => $activity->id,
+                    'journalable_type' => 'App\Models\Account\Activity',
+                ]);
+            }
+        }
+    }
+
+    public function populateTasks()
+    {
+        if (rand(1, 2) == 1) {
+            for ($j = 0; $j < rand(1, 10); $j++) {
+                $task = $this->contact->tasks()->create([
+                    'title' => $this->faker->realText(rand(40, 100)),
+                    'description' => $this->faker->realText(rand(100, 1000)),
+                    'completed' => (rand(1, 2) == 1 ? 0 : 1),
+                    'completed_at' => (rand(1, 2) == 1 ? $this->faker->dateTimeThisCentury() : null),
+                    'account_id' => $this->contact->account_id,
+                ]);
+            }
+        }
+    }
+
+    public function populateDebts()
+    {
+        if (rand(1, 2) == 1) {
+            for ($j = 0; $j < rand(1, 6); $j++) {
+                $this->contact->debts()->create([
+                    'in_debt' => (rand(1, 2) == 1 ? 'yes' : 'no'),
+                    'amount' => rand(321, 39391),
+                    'reason' => $this->faker->realText(rand(100, 1000)),
+                    'status' => 'inprogress',
+                    'account_id' => $this->contact->account_id,
+                ]);
+            }
+        }
+    }
+
+    public function populateGifts()
+    {
+        if (rand(1, 2) == 1) {
+            for ($j = 0; $j < rand(1, 31); $j++) {
+                app(CreateGift::class)->execute([
+                    'account_id' => $this->contact->account_id,
+                    'contact_id' => $this->contact->id,
+                    'status' => (rand(1, 3) == 1 ? 'offered' : 'idea'),
+                    'name' => $this->faker->realText(rand(10, 100)),
+                    'comment' => $this->faker->realText(rand(1000, 5000)),
+                    'url' => $this->faker->url,
+                    'amount' => rand(12, 120),
+                ]);
+            }
+        }
+    }
+
+    public function populateAddresses()
+    {
+        if (rand(1, 3) == 1) {
+            $request = [
+                'account_id' => $this->contact->account_id,
+                'contact_id' => $this->contact->id,
+                'country' => $this->getRandomCountry(),
+                'name' => $this->faker->word,
+                'street' => (rand(1, 3) == 1) ? $this->faker->streetAddress : null,
+                'city' => (rand(1, 3) == 1) ? $this->faker->city : null,
+                'province' => (rand(1, 3) == 1) ? $this->faker->state : null,
+                'postal_code' => (rand(1, 3) == 1) ? $this->faker->postcode : null,
+            ];
+
+            app(CreateAddress::class)->execute($request);
+        }
+    }
+
+    private function getRandomCountry()
+    {
+        if ($this->countries == null) {
+            $this->countries = CountriesHelper::getAll();
+        }
+
+        return $this->countries->random()->id;
+    }
+
+    public function populateContactFields()
+    {
+        if (rand(1, 3) == 1) {
+
+            // Fetch number of types
+            $numberOfTypes = ContactFieldType::where('account_id', $this->account->id)->count();
+
+            for ($j = 0; $j < rand(1, $numberOfTypes); $j++) {
+                // Retrieve random ContactFieldType
+                $contactFieldType = ContactFieldType::where('account_id', $this->account->id)->orderBy(DB::raw('RAND()'))->firstOrFail();
+
+                // Fake data according to type
+                $data = null;
+                switch ($contactFieldType->name) {
+                    case 'Email':
+                        $data = $this->faker->email;
+                        break;
+                    case 'Phone':
+                        $data = $this->faker->phoneNumber;
+                        break;
+                    case 'Facebook':
+                        $data = 'https://facebook.com/'.$this->faker->userName;
+                        break;
+                    case 'Twitter':
+                        $data = 'https://twitter.com/'.$this->faker->userName;
+                        break;
+                    case 'Whatsapp':
+                        $data = $this->faker->phoneNumber;
+                        break;
+                    case 'Telegram':
+                        $data = $this->faker->phoneNumber;
+                        break;
+                    default:
+                        $data = $this->faker->url;
+                        break;
+                }
+
+                $this->contact->contactFields()->create([
+                    'contact_field_type_id' => $contactFieldType->id,
+                    'data' => $data,
+                    'account_id' => $this->contact->account->id,
+                ]);
+            }
+        }
+    }
+
+    public function populateEntries()
+    {
+        for ($j = 0; $j < rand(10, 100); $j++) {
+            $date = $this->faker->dateTimeThisYear();
+
+            $entryId = DB::table('entries')->insertGetId([
+                'account_id' => $this->account->id,
+                'title' => $this->faker->realText(rand(12, 20)),
+                'post' => $this->faker->realText(rand(400, 500)),
+                'created_at' => $date,
+            ]);
+
+            DB::table('journal_entries')->insertGetId([
+                'account_id' => $this->account->id,
+                'date' => $date,
+                'journalable_id' => $entryId,
+                'journalable_type' => 'App\Models\Journal\Entry',
+                'created_at' => now(),
+            ]);
+        }
+    }
+
+    public function populatePets()
+    {
+        if (rand(1, 3) == 1) {
+            for ($j = 0; $j < rand(1, 3); $j++) {
+                $date = $this->faker->dateTimeThisYear();
+
+                DB::table('pets')->insertGetId([
+                    'account_id' => $this->account->id,
+                    'contact_id' => $this->contact->id,
+                    'pet_category_id' => rand(1, 11),
+                    'name' => (rand(1, 3) == 1) ? $this->faker->firstName : null,
+                    'created_at' => $date,
+                ]);
+            }
+        }
+    }
+
+    public function populateDayRatings()
+    {
+        for ($j = 0; $j < rand(10, 100); $j++) {
+            $date = $this->faker->dateTimeThisYear();
+
+            $dayId = DB::table('days')->insertGetId([
+                'account_id' => $this->account->id,
+                'rate' => rand(1, 3),
+                'date' => $date,
+                'created_at' => $date,
+            ]);
+
+            DB::table('journal_entries')->insertGetId([
+                'account_id' => $this->account->id,
+                'date' => $date,
+                'journalable_id' => $dayId,
+                'journalable_type' => 'App\Models\Journal\Day',
+                'created_at' => now(),
+            ]);
+        }
+    }
+
+    public function changeUpdatedAt()
+    {
+        $this->contact->last_consulted_at = $this->faker->dateTimeThisYear();
+        $this->contact->save();
+    }
+
+    public function populateCalls()
+    {
+        if (rand(1, 3) == 1) {
+            $this->contact->calls()->create([
+                'account_id' => $this->contact->account_id,
+                'called_at' => $this->faker->dateTimeThisYear(),
+            ]);
+        }
+    }
+
+    public function populateConversations()
+    {
+        if (rand(1, 1) == 1) {
+            for ($j = 0; $j < rand(1, 20); $j++) {
+                $contactFieldType = ContactFieldType::where('account_id', $this->account->id)->orderBy(DB::raw('RAND()'))->firstOrFail();
+
+                $conversation = app(CreateConversation::class)->execute([
+                    'happened_at' => $this->faker->dateTimeThisCentury(),
+                    'contact_id' => $this->contact->id,
+                    'contact_field_type_id' => $contactFieldType->id,
+                    'account_id' => $this->contact->account->id,
+                ]);
+
+                for ($k = 0; $k < rand(1, 20); $k++) {
+                    app(AddMessageToConversation::class)->execute([
+                        'account_id' => $this->contact->account->id,
+                        'contact_id' => $this->contact->id,
+                        'conversation_id' => $conversation->id,
+                        'written_at' => $this->faker->dateTimeThisCentury(),
+                        'written_by_me' => (rand(1, 2) == 1),
+                        'content' => $this->faker->realText(),
+                    ]);
+                }
+            }
+        }
+    }
+
+    public function populateLifeEvents()
+    {
+        if (rand(1, 1) == 1) {
+            for ($j = 0; $j < rand(1, 20); $j++) {
+                $lifeEventType = LifeEventType::where('account_id', $this->account->id)->orderBy(DB::raw('RAND()'))->firstOrFail();
+
+                app(CreateLifeEvent::class)->execute([
+                    'account_id' => $this->contact->account->id,
+                    'contact_id' => $this->contact->id,
+                    'life_event_type_id' => $lifeEventType->id,
+                    'happened_at' => $this->faker->dateTimeThisCentury(),
+                    'name' => $this->faker->realText(),
+                    'note' => $this->faker->realText(),
+                    'has_reminder' => false,
+                    'happened_at_month_unknown' => false,
+                    'happened_at_day_unknown' => false,
+                ]);
+            }
+        }
+    }
+
+    public function getRandomGender()
+    {
+        return $this->account->genders->random();
+    }
+
+    public function confirmUser($user)
+    {
+        $user->markEmailAsVerified();
+    }
 }
diff --git a/database/seeds/FakeContentTableSeeder.php b/database/seeds/FakeContentTableSeeder.php
deleted file mode 100644
index 46300ff489e..00000000000
--- a/database/seeds/FakeContentTableSeeder.php
+++ /dev/null
@@ -1,571 +0,0 @@
-<?php
-
-use Carbon\Carbon;
-use App\Models\User\User;
-use App\Helpers\DateHelper;
-use App\Models\Account\Account;
-use Illuminate\Database\Seeder;
-use App\Helpers\CountriesHelper;
-use Illuminate\Support\Facades\DB;
-use App\Models\Contact\LifeEventType;
-use App\Models\Contact\ContactFieldType;
-use App\Services\Contact\Gift\CreateGift;
-use App\Services\Contact\Tag\AssociateTag;
-use Illuminate\Foundation\Testing\WithFaker;
-use App\Services\Contact\Address\CreateAddress;
-use App\Services\Contact\Contact\CreateContact;
-use App\Services\Contact\Reminder\CreateReminder;
-use Symfony\Component\Console\Helper\ProgressBar;
-use App\Services\Contact\LifeEvent\CreateLifeEvent;
-use Symfony\Component\Console\Output\ConsoleOutput;
-use App\Services\Contact\Conversation\CreateConversation;
-use App\Services\Contact\Relationship\CreateRelationship;
-use App\Services\Account\Activity\Activity\CreateActivity;
-use App\Services\Contact\Contact\UpdateBirthdayInformation;
-use App\Services\Contact\Contact\UpdateDeceasedInformation;
-use App\Services\Contact\Conversation\AddMessageToConversation;
-use App\Services\Account\Activity\Activity\AttachContactToActivity;
-
-class FakeContentTableSeeder extends Seeder
-{
-    use WithFaker;
-
-    private $numberOfContacts;
-    private $contact;
-    private $account;
-    private $countries = null;
-    private $user;
-
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        $this->setUpFaker();
-
-        // Get or create the first account
-        if (User::where('email', 'admin@admin.com')->exists()) {
-            $this->user = User::where('email', 'admin@admin.com')->first();
-            $userId = $this->user->value('id');
-            $this->account = Account::where('id', $userId)->first();
-        } else {
-            $this->account = Account::createDefault('John', 'Doe', 'admin@admin.com', 'admin0');
-
-            // set default admin account to confirmed
-            $adminUser = $this->account->users()->first();
-            $this->confirmUser($adminUser);
-            $this->user = $adminUser;
-        }
-
-        // create a random number of contacts
-        $this->numberOfContacts = rand(60, 100);
-        echo 'Generating '.$this->numberOfContacts.' fake contacts'.PHP_EOL;
-
-        $output = new ConsoleOutput();
-        $progress = new ProgressBar($output, $this->numberOfContacts);
-        $progress->start();
-
-        for ($i = 0; $i < $this->numberOfContacts; $i++) {
-            $gender = (rand(1, 2) == 1) ? 'male' : 'female';
-
-            $this->contact = app(CreateContact::class)->execute([
-                'account_id' => $this->account->id,
-                'author_id' => $this->user->id,
-                'first_name' => $this->faker->firstName($gender),
-                'last_name' => (rand(1, 2) == 1) ? $this->faker->lastName : null,
-                'nickname' => (rand(1, 2) == 1) ? $this->faker->name : null,
-                'gender_id' => $this->getRandomGender()->id,
-                'is_partial' => false,
-                'is_birthdate_known' => false,
-                'is_deceased' => false,
-                'is_deceased_date_known' => false,
-            ]);
-
-            $this->populateTags();
-            $this->populateFoodPreferences();
-            $this->populateDeceasedDate();
-            $this->populateBirthday();
-            $this->populateFirstMetInformation();
-            $this->populateRelationships();
-            $this->populateNotes();
-            $this->populateActivities();
-            $this->populateTasks();
-            $this->populateDebts();
-            $this->populateCalls();
-            $this->populateConversations();
-            $this->populateLifeEvents();
-            $this->populateGifts();
-            $this->populateAddresses();
-            $this->populateContactFields();
-            $this->populatePets();
-            $this->changeUpdatedAt();
-
-            $progress->advance();
-        }
-
-        $this->populateDayRatings();
-        $this->populateEntries();
-
-        $progress->finish();
-
-        // create the second test, blank account
-        if (! User::where('email', 'blank@blank.com')->exists()) {
-            $blankAccount = Account::createDefault('Blank', 'State', 'blank@blank.com', 'blank0');
-            $blankUser = $blankAccount->users()->first();
-            $this->confirmUser($blankUser);
-        }
-    }
-
-    public function populateTags()
-    {
-        if (rand(1, 2) == 1) {
-            $i = 0;
-            do {
-                app(AssociateTag::class)->execute([
-                    'account_id' => $this->contact->account->id,
-                    'contact_id' => $this->contact->id,
-                    'name' => $this->faker->word,
-                ]);
-                $i++;
-            } while ($i < 10);
-        }
-    }
-
-    public function populateFoodPreferences()
-    {
-        // add food preferences
-        if (rand(1, 2) == 1) {
-            $this->contact->food_preferences = $this->faker->realText();
-            $this->contact->save();
-        }
-    }
-
-    public function populateDeceasedDate()
-    {
-        // deceased?
-        if (rand(1, 7) == 1) {
-            $birthdate = $this->faker->dateTimeThisCentury();
-
-            app(UpdateDeceasedInformation::class)->execute([
-                'account_id' => $this->contact->account_id,
-                'contact_id' => $this->contact->id,
-                'is_deceased' => rand(1, 2) == 1,
-                'is_date_known' => rand(1, 2) == 1,
-                'day' => (int) $birthdate->format('d'),
-                'month' => (int) $birthdate->format('m'),
-                'year' => (int) $birthdate->format('Y'),
-                'add_reminder' => rand(1, 2) == 1,
-            ]);
-        }
-    }
-
-    public function populateBirthday()
-    {
-        if (rand(1, 2) == 1) {
-            $birthdate = $this->faker->dateTimeThisCentury();
-
-            app(UpdateBirthdayInformation::class)->execute([
-                'account_id' => $this->contact->account_id,
-                'contact_id' => $this->contact->id,
-                'is_date_known' => rand(1, 2) == 1,
-                'day' => (int) $birthdate->format('d'),
-                'month' => (int) $birthdate->format('m'),
-                'year' => (int) $birthdate->format('Y'),
-                'is_age_based' => rand(1, 2) == 1,
-                'age' => rand(1, 99),
-                'add_reminder' => rand(1, 2) == 1,
-            ]);
-        }
-    }
-
-    public function populateFirstMetInformation()
-    {
-        if (rand(1, 2) == 1) {
-            $this->contact->first_met_where = $this->faker->realText(20);
-        }
-
-        if (rand(1, 2) == 1) {
-            $this->contact->first_met_additional_info = $this->faker->realText(20);
-            $firstMetDate = $this->faker->dateTimeThisCentury();
-
-            if (rand(1, 2) == 1) {
-                // add a date where we don't know the year
-                $specialDate = $this->contact->setSpecialDate('first_met', 0, $firstMetDate->format('m'), $firstMetDate->format('d'));
-            } else {
-                // add a date where we know the year
-                $specialDate = $this->contact->setSpecialDate('first_met', $firstMetDate->format('Y'), $firstMetDate->format('m'), $firstMetDate->format('d'));
-            }
-            app(CreateReminder::class)->execute([
-                'account_id' => $this->contact->account_id,
-                'contact_id' => $this->contact->id,
-                'initial_date' => $specialDate->date->toDateString(),
-                'frequency_type' => 'year',
-                'frequency_number' => 1,
-                'title' => trans(
-                    'people.introductions_reminder_title',
-                    ['name' => $this->contact->first_name]
-                ),
-            ]);
-        }
-
-        if (rand(1, 2) == 1) {
-            do {
-                $rand = rand(1, $this->numberOfContacts);
-            } while (in_array($rand, [$this->contact->id]));
-
-            $this->contact->first_met_through_contact_id = $rand;
-        }
-
-        $this->contact->save();
-    }
-
-    public function populateRelationships()
-    {
-        if (rand(1, 2) == 1) {
-            foreach (range(1, rand(2, 6)) as $index) {
-                $gender = (rand(1, 2) == 1) ? 'male' : 'female';
-
-                $relatedContact = app(CreateContact::class)->execute([
-                    'account_id' => $this->contact->account_id,
-                    'author_id' => $this->user->id,
-                    'first_name' => $this->faker->firstName($gender),
-                    'last_name' => (rand(1, 2) == 1) ? $this->faker->lastName : null,
-                    'nickname' => (rand(1, 2) == 1) ? $this->faker->name : null,
-                    'gender_id' => $this->getRandomGender()->id,
-                    'is_partial' => rand(1, 2) == 1,
-                    'is_birthdate_known' => false,
-                    'is_deceased' => false,
-                    'is_deceased_date_known' => false,
-                ]);
-
-                $relatedContactBirthDate = $this->faker->dateTimeThisCentury();
-                app(UpdateBirthdayInformation::class)->execute([
-                    'account_id' => $this->contact->account_id,
-                    'contact_id' => $relatedContact->id,
-                    'is_date_known' => rand(1, 2) == 1,
-                    'day' => (int) $relatedContactBirthDate->format('d'),
-                    'month' => (int) $relatedContactBirthDate->format('m'),
-                    'year' => (int) $relatedContactBirthDate->format('Y'),
-                    'is_age_based' => rand(1, 2) == 1,
-                    'age' => rand(1, 99),
-                    'add_reminder' => rand(1, 2) == 1,
-                ]);
-
-                // set relationship
-                $relationshipId = $this->contact->account->relationshipTypes->random()->id;
-                $relationship = app(CreateRelationship::class)->execute([
-                    'account_id' => $this->contact->account_id,
-                    'contact_is' => $this->contact->id,
-                    'of_contact' => $relatedContact->id,
-                    'relationship_type_id' => $relationshipId,
-                ]);
-            }
-        }
-    }
-
-    public function populateNotes()
-    {
-        if (rand(1, 2) == 1) {
-            for ($j = 0; $j < rand(1, 13); $j++) {
-                $note = $this->contact->notes()->create([
-                    'body' => $this->faker->realText(rand(40, 500)),
-                    'account_id' => $this->contact->account_id,
-                    'is_favorited' => rand(1, 3) == 1,
-                    'favorited_at' => $this->faker->dateTimeThisCentury(),
-                ]);
-            }
-        }
-    }
-
-    public function populateActivities()
-    {
-        if (rand(1, 2) == 1) {
-            for ($j = 0; $j < rand(1, 13); $j++) {
-                $date = DateHelper::getDate(Carbon::instance($this->faker->dateTimeThisYear($max = 'now')));
-
-                $request = [
-                    'account_id' => $this->contact->account_id,
-                    'activity_type_id' => rand(1, 13),
-                    'summary' => $this->faker->realText(rand(40, 100)),
-                    'description' => (rand(1, 2) == 1 ? $this->faker->realText(rand(100, 1000)) : null),
-                    'happened_at' => $date,
-                    'contacts' => [$this->contact->id],
-                ];
-
-                $activity = app(CreateActivity::class)->execute($request);
-
-                $request = [
-                    'account_id' => $this->contact->account_id,
-                    'activity_id' => $activity->id,
-                    'contacts' => [$this->contact->id],
-                ];
-
-                app(AttachContactToActivity::class)->execute($request);
-
-                DB::table('journal_entries')->insertGetId([
-                    'account_id' => $this->account->id,
-                    'date' => $date,
-                    'journalable_id' => $activity->id,
-                    'journalable_type' => 'App\Models\Account\Activity',
-                ]);
-            }
-        }
-    }
-
-    public function populateTasks()
-    {
-        if (rand(1, 2) == 1) {
-            for ($j = 0; $j < rand(1, 10); $j++) {
-                $task = $this->contact->tasks()->create([
-                    'title' => $this->faker->realText(rand(40, 100)),
-                    'description' => $this->faker->realText(rand(100, 1000)),
-                    'completed' => (rand(1, 2) == 1 ? 0 : 1),
-                    'completed_at' => (rand(1, 2) == 1 ? $this->faker->dateTimeThisCentury() : null),
-                    'account_id' => $this->contact->account_id,
-                ]);
-            }
-        }
-    }
-
-    public function populateDebts()
-    {
-        if (rand(1, 2) == 1) {
-            for ($j = 0; $j < rand(1, 6); $j++) {
-                $this->contact->debts()->create([
-                    'in_debt' => (rand(1, 2) == 1 ? 'yes' : 'no'),
-                    'amount' => rand(321, 39391),
-                    'reason' => $this->faker->realText(rand(100, 1000)),
-                    'status' => 'inprogress',
-                    'account_id' => $this->contact->account_id,
-                ]);
-            }
-        }
-    }
-
-    public function populateGifts()
-    {
-        if (rand(1, 2) == 1) {
-            for ($j = 0; $j < rand(1, 31); $j++) {
-                app(CreateGift::class)->execute([
-                    'account_id' => $this->contact->account_id,
-                    'contact_id' => $this->contact->id,
-                    'status' => (rand(1, 3) == 1 ? 'offered' : 'idea'),
-                    'name' => $this->faker->realText(rand(10, 100)),
-                    'comment' => $this->faker->realText(rand(1000, 5000)),
-                    'url' => $this->faker->url,
-                    'amount' => rand(12, 120),
-                ]);
-            }
-        }
-    }
-
-    public function populateAddresses()
-    {
-        if (rand(1, 3) == 1) {
-            $request = [
-                'account_id' => $this->contact->account_id,
-                'contact_id' => $this->contact->id,
-                'country' => $this->getRandomCountry(),
-                'name' => $this->faker->word,
-                'street' => (rand(1, 3) == 1) ? $this->faker->streetAddress : null,
-                'city' => (rand(1, 3) == 1) ? $this->faker->city : null,
-                'province' => (rand(1, 3) == 1) ? $this->faker->state : null,
-                'postal_code' => (rand(1, 3) == 1) ? $this->faker->postcode : null,
-            ];
-
-            app(CreateAddress::class)->execute($request);
-        }
-    }
-
-    private function getRandomCountry()
-    {
-        if ($this->countries == null) {
-            $this->countries = CountriesHelper::getAll();
-        }
-
-        return $this->countries->random()->id;
-    }
-
-    public function populateContactFields()
-    {
-        if (rand(1, 3) == 1) {
-
-            // Fetch number of types
-            $numberOfTypes = ContactFieldType::where('account_id', $this->account->id)->count();
-
-            for ($j = 0; $j < rand(1, $numberOfTypes); $j++) {
-                // Retrieve random ContactFieldType
-                $contactFieldType = ContactFieldType::where('account_id', $this->account->id)->orderBy(DB::raw('RAND()'))->firstOrFail();
-
-                // Fake data according to type
-                $data = null;
-                switch ($contactFieldType->name) {
-                    case 'Email':
-                        $data = $this->faker->email;
-                    break;
-                    case 'Phone':
-                        $data = $this->faker->phoneNumber;
-                    break;
-                    case 'Facebook':
-                        $data = 'https://facebook.com/'.$this->faker->userName;
-                    break;
-                    case 'Twitter':
-                        $data = 'https://twitter.com/'.$this->faker->userName;
-                    break;
-                    case 'Whatsapp':
-                        $data = $this->faker->phoneNumber;
-                    break;
-                    case 'Telegram':
-                        $data = $this->faker->phoneNumber;
-                    break;
-                    default:
-                        $data = $this->faker->url;
-                    break;
-                }
-
-                $this->contact->contactFields()->create([
-                    'contact_field_type_id' => $contactFieldType->id,
-                    'data' => $data,
-                    'account_id' => $this->contact->account->id,
-                ]);
-            }
-        }
-    }
-
-    public function populateEntries()
-    {
-        for ($j = 0; $j < rand(10, 100); $j++) {
-            $date = $this->faker->dateTimeThisYear();
-
-            $entryId = DB::table('entries')->insertGetId([
-                'account_id' => $this->account->id,
-                'title' => $this->faker->realText(rand(12, 20)),
-                'post' => $this->faker->realText(rand(400, 500)),
-                'created_at' => $date,
-            ]);
-
-            DB::table('journal_entries')->insertGetId([
-                'account_id' => $this->account->id,
-                'date' => $date,
-                'journalable_id' => $entryId,
-                'journalable_type' => 'App\Models\Journal\Entry',
-                'created_at' => now(),
-            ]);
-        }
-    }
-
-    public function populatePets()
-    {
-        if (rand(1, 3) == 1) {
-            for ($j = 0; $j < rand(1, 3); $j++) {
-                $date = $this->faker->dateTimeThisYear();
-
-                DB::table('pets')->insertGetId([
-                    'account_id' => $this->account->id,
-                    'contact_id' => $this->contact->id,
-                    'pet_category_id' => rand(1, 11),
-                    'name' => (rand(1, 3) == 1) ? $this->faker->firstName : null,
-                    'created_at' => $date,
-                ]);
-            }
-        }
-    }
-
-    public function populateDayRatings()
-    {
-        for ($j = 0; $j < rand(10, 100); $j++) {
-            $date = $this->faker->dateTimeThisYear();
-
-            $dayId = DB::table('days')->insertGetId([
-                'account_id' => $this->account->id,
-                'rate' => rand(1, 3),
-                'date' => $date,
-                'created_at' => $date,
-            ]);
-
-            DB::table('journal_entries')->insertGetId([
-                'account_id' => $this->account->id,
-                'date' => $date,
-                'journalable_id' => $dayId,
-                'journalable_type' => 'App\Models\Journal\Day',
-                'created_at' => now(),
-            ]);
-        }
-    }
-
-    public function changeUpdatedAt()
-    {
-        $this->contact->last_consulted_at = $this->faker->dateTimeThisYear();
-        $this->contact->save();
-    }
-
-    public function populateCalls()
-    {
-        if (rand(1, 3) == 1) {
-            $this->contact->calls()->create([
-                'account_id' => $this->contact->account_id,
-                'called_at' => $this->faker->dateTimeThisYear(),
-            ]);
-        }
-    }
-
-    public function populateConversations()
-    {
-        if (rand(1, 1) == 1) {
-            for ($j = 0; $j < rand(1, 20); $j++) {
-                $contactFieldType = ContactFieldType::where('account_id', $this->account->id)->orderBy(DB::raw('RAND()'))->firstOrFail();
-
-                $conversation = app(CreateConversation::class)->execute([
-                    'happened_at' => $this->faker->dateTimeThisCentury(),
-                    'contact_id' => $this->contact->id,
-                    'contact_field_type_id' => $contactFieldType->id,
-                    'account_id' => $this->contact->account->id,
-                ]);
-
-                for ($k = 0; $k < rand(1, 20); $k++) {
-                    app(AddMessageToConversation::class)->execute([
-                        'account_id' => $this->contact->account->id,
-                        'contact_id' => $this->contact->id,
-                        'conversation_id' => $conversation->id,
-                        'written_at' => $this->faker->dateTimeThisCentury(),
-                        'written_by_me' => (rand(1, 2) == 1),
-                        'content' => $this->faker->realText(),
-                    ]);
-                }
-            }
-        }
-    }
-
-    public function populateLifeEvents()
-    {
-        if (rand(1, 1) == 1) {
-            for ($j = 0; $j < rand(1, 20); $j++) {
-                $lifeEventType = LifeEventType::where('account_id', $this->account->id)->orderBy(DB::raw('RAND()'))->firstOrFail();
-
-                app(CreateLifeEvent::class)->execute([
-                    'account_id' => $this->contact->account->id,
-                    'contact_id' => $this->contact->id,
-                    'life_event_type_id' => $lifeEventType->id,
-                    'happened_at' => $this->faker->dateTimeThisCentury(),
-                    'name' => $this->faker->realText(),
-                    'note' => $this->faker->realText(),
-                    'has_reminder' => false,
-                    'happened_at_month_unknown' => false,
-                    'happened_at_day_unknown' => false,
-                ]);
-            }
-        }
-    }
-
-    public function getRandomGender()
-    {
-        return $this->account->genders->random();
-    }
-
-    public function confirmUser($user)
-    {
-        $user->markEmailAsVerified();
-    }
-}
diff --git a/phpstan.neon b/phpstan.neon
index c613432615a..07a273bb8db 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -43,3 +43,4 @@ parameters:
         - */app/Http/Controllers/Contacts/ContactAuditLogController.php
         - */app/Http/Controllers/Settings/AuditLogController.php
         - */app/Helpers/AuditLogHelper.php
+        - */app/Console/Commands/SetupTest.php