diff --git a/Modules/Core/Support/NumberFormatter.php b/Modules/Core/Support/NumberFormatter.php
index d877affbb..b06d417ef 100644
--- a/Modules/Core/Support/NumberFormatter.php
+++ b/Modules/Core/Support/NumberFormatter.php
@@ -16,7 +16,7 @@ public static function formatTrimmed(float $number, int $decimalPlaces = 4): str
     {
         $formatted = number_format($number, $decimalPlaces, '.', '');
 
-        return mb_rtrim(mb_rtrim($formatted, '0'), '.');
+        return rtrim(rtrim($formatted, '0'), '.');
     }
 
     public static function unformat($number, $currency = null): float | string
diff --git a/Modules/Core/Tests/AbstractAdminPanelTestCase.php b/Modules/Core/Tests/AbstractAdminPanelTestCase.php
index 4919d4bf4..d25a806d6 100644
--- a/Modules/Core/Tests/AbstractAdminPanelTestCase.php
+++ b/Modules/Core/Tests/AbstractAdminPanelTestCase.php
@@ -11,7 +11,7 @@ abstract class AbstractAdminPanelTestCase extends BaseTestCase
 {
     use RefreshDatabase;
 
-    protected $superAdmin;
+    protected ?User $superAdmin;
 
     protected function setUp(): void
     {
diff --git a/Modules/Core/Tests/Feature/UsersTest.php b/Modules/Core/Tests/Feature/UsersTest.php
index a713bad42..5f011ce98 100644
--- a/Modules/Core/Tests/Feature/UsersTest.php
+++ b/Modules/Core/Tests/Feature/UsersTest.php
@@ -45,6 +45,8 @@ public function it_lists_users(): void
     # endregion
 
     # region crud
+    #[Test]
+    #[Group('crud')]
     public function it_deletes_a_user(): void
     {
         /* arrange */
diff --git a/Modules/Expenses/Database/Factories/ExpenseItemFactory.php b/Modules/Expenses/Database/Factories/ExpenseItemFactory.php
index 15dfd2c77..2a5a7a451 100644
--- a/Modules/Expenses/Database/Factories/ExpenseItemFactory.php
+++ b/Modules/Expenses/Database/Factories/ExpenseItemFactory.php
@@ -43,7 +43,9 @@ public function definition(): array
             ->first();
 
         if ( ! $item) {
-            dd('die early');
+            $item = Product::factory()
+                ->state(['company_id' => $company->id])
+                ->create();
         }
 
         // Get a unit that belongs to this company
@@ -53,7 +55,9 @@ public function definition(): array
             ->first();
 
         if ( ! $unit) {
-            dd('die early');
+            $unit = ProductUnit::factory()
+                ->state(['company_id' => $company->id])
+                ->create();
         }
 
         // Get a tax rate that belongs to this company
@@ -63,7 +67,9 @@ public function definition(): array
             ->first();
 
         if ( ! $taxRate) {
-            dd('die early');
+            $taxRate = TaxRate::factory()
+                ->state(['company_id' => $company->id])
+                ->create();
         }
 
         // Get a second tax rate 75% of the time that belongs to this company
@@ -76,7 +82,9 @@ public function definition(): array
                 ->first();
 
             if ( ! $taxRate2) {
-                dd('die early');
+                $taxRate2 = TaxRate::factory()
+                    ->state(['company_id' => $company->id])
+                    ->create();
             }
         }
 
diff --git a/Modules/Invoices/Database/Factories/InvoiceFactory.php b/Modules/Invoices/Database/Factories/InvoiceFactory.php
index e7445a652..6add4d9be 100644
--- a/Modules/Invoices/Database/Factories/InvoiceFactory.php
+++ b/Modules/Invoices/Database/Factories/InvoiceFactory.php
@@ -76,7 +76,7 @@ public function configure(): static
                 ->first();
 
             if ( ! $taxRate) {
-                $taxRate = Product::factory()
+                $taxRate = TaxRate::factory()
                     ->state(['company_id' => $invoice->company_id])
                     ->create();
             }