diff --git a/app/Nami/HasNamiField.php b/app/Nami/HasNamiField.php
index 7a1c79ce..c5ba855d 100644
--- a/app/Nami/HasNamiField.php
+++ b/app/Nami/HasNamiField.php
@@ -7,7 +7,7 @@ use Exception;
 trait HasNamiField
 {
 
-    public static function nami(int $id): ?self
+    public static function nami(int $id): self
     {
         $model = static::firstWhere('nami_id', $id);
 
diff --git a/tests/Feature/Initialize/InitializeTest.php b/tests/Feature/Initialize/InitializeTest.php
index 0e40f011..dcdd9769 100644
--- a/tests/Feature/Initialize/InitializeTest.php
+++ b/tests/Feature/Initialize/InitializeTest.php
@@ -22,7 +22,7 @@ class InitializeTest extends TestCase
     public function initializeProvider(callable $callback = null): void
     {
         $backend = app(FakeBackend::class)
-            ->fakeLogin('123', [])
+            ->fakeLogin('123')
             ->addSearch(123, ['entries_vorname' => '::firstname::', 'entries_nachname' => '::lastname::', 'entries_gruppierungId' => 1000])
             ->fakeNationalities([['name' => 'deutsch', 'id' => 291]])
             ->fakeFees(1000, [['name' => 'Family', 'id' => 300]])
@@ -40,7 +40,6 @@ class InitializeTest extends TestCase
                 'beitragsartId' => 300,
                 'geburtsDatum' => '2014-07-11 00:00:00',
                 'gruppierungId' => 1000,
-                'geschlechtId' => 303,
                 'id' => 411,
                 'eintrittsdatum' => '2020-11-17 00:00:00',
                 'geschlechtId' => 303,
@@ -219,7 +218,6 @@ class InitializeTest extends TestCase
             'geschlechtId' => 303,
             'id' => 116,
             'eintrittsdatum' => '2020-11-17 00:00:00',
-            'geschlechtId' => 303,
             'landId' => 302,
             'staatsangehoerigkeitId' => 291,
             'zeitschriftenversand' => true,
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 5997005a..f8a8a58d 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -6,19 +6,16 @@ use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
 use Illuminate\Testing\TestResponse;
 use Tests\Lib\InertiaMixin;
 use Zoomyboy\LaravelNami\Backend\FakeBackend;
-use Zoomyboy\LaravelNami\FakesNami;
 use Zoomyboy\LaravelNami\Nami;
 use Zoomyboy\LaravelNami\NamiUser;
 
 abstract class TestCase extends BaseTestCase
 {
     use CreatesApplication;
-    use FakesNami;
 
     public function setUp(): void {
         parent::setUp();
     
-        $this->fakeNami();
         TestResponse::mixin(new InertiaMixin());
     }