diff --git a/app/Console/Commands/SendTestEmails.php b/app/Console/Commands/SendTestEmails.php
index 0b0aef8bdfcb..5a113e8f2f58 100644
--- a/app/Console/Commands/SendTestEmails.php
+++ b/app/Console/Commands/SendTestEmails.php
@@ -11,16 +11,18 @@
 
 namespace App\Console\Commands;
 
-use App\DataMapper\CompanySettings;
-use App\DataMapper\DefaultSettings;
-use App\Jobs\Mail\NinjaMailerJob;
-use App\Jobs\Mail\NinjaMailerObject;
-use App\Mail\Migration\MaxCompanies;
+use Faker\Factory;
+use App\Models\User;
 use App\Models\Account;
 use App\Models\Company;
-use App\Models\User;
-use Faker\Factory;
+use App\Mail\TestMailServer;
 use Illuminate\Console\Command;
+use App\Jobs\Mail\NinjaMailerJob;
+use App\DataMapper\CompanySettings;
+use App\DataMapper\DefaultSettings;
+use App\Jobs\Mail\NinjaMailerObject;
+use App\Mail\Migration\MaxCompanies;
+use Illuminate\Support\Facades\Mail;
 
 class SendTestEmails extends Command
 {
@@ -55,39 +57,26 @@ class SendTestEmails extends Command
      */
     public function handle()
     {
-        $faker = Factory::create();
 
-        $account = Account::factory()->create();
-
-        $user = User::factory()->create([
-            'account_id' => $account->id,
-            'confirmation_code' => '123',
-            'email' => $faker->safeEmail(),
-            'first_name' => 'John',
-            'last_name' => 'Doe',
-        ]);
-
-        $company = Company::factory()->create([
-            'account_id' => $account->id,
-        ]);
-
-        $user->companies()->attach($company->id, [
-            'account_id' => $account->id,
-            'is_owner' => 1,
-            'is_admin' => 1,
-            'is_locked' => 0,
-            'permissions' => '',
-            'notifications' => CompanySettings::notificationDefaults(),
-            //'settings' => DefaultSettings::userSettings(),
-            'settings' => null,
-        ]);
+        $to_user = User::first();
 
         $nmo = new NinjaMailerObject;
-        $nmo->mailable = new MaxCompanies($user->account->companies()->first());
-        $nmo->company = $user->account->companies()->first();
-        $nmo->settings = $user->account->companies()->first()->settings;
-        $nmo->to_user = $user;
+        $nmo->mailable = new TestMailServer('Email Server Works!', config('mail.from.address'));
+        $nmo->company = $to_user->account->companies()->first();
+        $nmo->settings = $to_user->account->companies()->first()->settings;
+        $nmo->to_user = $to_user;
 
-        (new NinjaMailerJob($nmo))->handle();
+        try {
+
+            Mail::raw("Test Message", function ($message) {
+                $message->to(config('mail.from.address'))
+                        ->from(config('mail.from.address'), config('mail.from.name'))
+                        ->subject('Test Email');
+            });
+
+
+        } catch(\Exception $e) {
+            $this->info("Error sending email: " . $e->getMessage());
+        }
     }
 }
diff --git a/app/Http/Controllers/StripeConnectController.php b/app/Http/Controllers/StripeConnectController.php
index 5f8900e6705f..edb97e486d14 100644
--- a/app/Http/Controllers/StripeConnectController.php
+++ b/app/Http/Controllers/StripeConnectController.php
@@ -117,6 +117,7 @@ class StripeConnectController extends BaseController
             'refresh_token' => $response->refresh_token,
             'access_token' => $response->access_token,
             'appleDomainVerification' => '',
+            // "statementDescriptor" => "",
         ];
 
         $company_gateway->setConfig($payload);
diff --git a/app/Listeners/Mail/MailSentListener.php b/app/Listeners/Mail/MailSentListener.php
index b6228b8bf1d8..34bd8a5300e2 100644
--- a/app/Listeners/Mail/MailSentListener.php
+++ b/app/Listeners/Mail/MailSentListener.php
@@ -41,6 +41,7 @@ class MailSentListener implements ShouldQueue
      */
     public function handle(MessageSent $event)
     {
+        
         if (!Ninja::isHosted()) {
             return;
         }
diff --git a/app/Mail/TestMailServer.php b/app/Mail/TestMailServer.php
index a0c7f784f563..917a1fa9f039 100644
--- a/app/Mail/TestMailServer.php
+++ b/app/Mail/TestMailServer.php
@@ -17,7 +17,6 @@ use Illuminate\Queue\SerializesModels;
 
 class TestMailServer extends Mailable
 {
-    //   use Queueable, SerializesModels;
 
     public $support_messages;