diff --git a/app/Console/Commands/CreateAdmin.php b/app/Console/Commands/CreateAdmin.php
index 48da87af4..8c273bc1f 100644
--- a/app/Console/Commands/CreateAdmin.php
+++ b/app/Console/Commands/CreateAdmin.php
@@ -48,7 +48,6 @@ class CreateAdmin extends Command
      */
     public function handle()
     {
-
         $details = $this->options();
 
         if (empty($details['email'])) {
@@ -62,8 +61,8 @@ class CreateAdmin extends Command
         }
 
         $validator = Validator::make($details, [
-            'email' => ['required', 'email', 'min:5', new Unique('users', 'email')],
-            'name' => ['required', 'min:2'],
+            'email'    => ['required', 'email', 'min:5', new Unique('users', 'email')],
+            'name'     => ['required', 'min:2'],
             'password' => ['required', Password::default()],
         ]);
 
@@ -71,6 +70,7 @@ class CreateAdmin extends Command
             foreach ($validator->errors()->all() as $error) {
                 $this->error($error);
             }
+
             return SymfonyCommand::FAILURE;
         }
 
diff --git a/database/factories/Auth/UserFactory.php b/database/factories/Auth/UserFactory.php
index 77d63ac68..805782fd8 100644
--- a/database/factories/Auth/UserFactory.php
+++ b/database/factories/Auth/UserFactory.php
@@ -2,6 +2,7 @@
 
 namespace Database\Factories\Auth;
 
+use BookStack\Auth\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Str;
 
@@ -12,7 +13,7 @@ class UserFactory extends Factory
      *
      * @var string
      */
-    protected $model = \BookStack\Auth\User::class;
+    protected $model = User::class;
 
     /**
      * Define the model's default state.
@@ -26,7 +27,7 @@ class UserFactory extends Factory
         return [
             'name'            => $name,
             'email'           => $this->faker->email,
-            'slug'            => \Illuminate\Support\Str::slug($name . '-' . \Illuminate\Support\Str::random(5)),
+            'slug'            => Str::slug($name . '-' . Str::random(5)),
             'password'        => Str::random(10),
             'remember_token'  => Str::random(10),
             'email_confirmed' => 1,
diff --git a/tests/TestEmailTest.php b/tests/TestEmailTest.php
index 0a2091fe3..e0350371a 100644
--- a/tests/TestEmailTest.php
+++ b/tests/TestEmailTest.php
@@ -34,7 +34,7 @@ class TestEmailTest extends TestCase
         $this->app[Dispatcher::class] = $mockDispatcher;
 
         $exception = new \Exception('A random error occurred when testing an email');
-        $mockDispatcher->shouldReceive('send')->andThrow($exception);
+        $mockDispatcher->shouldReceive('sendNow')->andThrow($exception);
 
         $admin = $this->getAdmin();
         $sendReq = $this->actingAs($admin)->post('/settings/maintenance/send-test-email');
diff --git a/tests/Uploads/AvatarTest.php b/tests/Uploads/AvatarTest.php
index d10b5cfc6..650f5b4ea 100644
--- a/tests/Uploads/AvatarTest.php
+++ b/tests/Uploads/AvatarTest.php
@@ -11,16 +11,16 @@ class AvatarTest extends TestCase
 {
     use UsesImages;
 
-    protected function createUserRequest($user)
+    protected function createUserRequest($user): User
     {
         $this->asAdmin()->post('/settings/users/create', [
             'name'             => $user->name,
             'email'            => $user->email,
-            'password'         => 'testing',
-            'password-confirm' => 'testing',
+            'password'         => 'testing101',
+            'password-confirm' => 'testing101',
         ]);
 
-        return User::where('email', '=', $user->email)->first();
+        return User::query()->where('email', '=', $user->email)->first();
     }
 
     protected function assertImageFetchFrom(string $url)