diff --git a/tests/Feature/Member/PreventionTest.php b/tests/Feature/Member/PreventionTest.php
index bb25d46b..f30fb452 100644
--- a/tests/Feature/Member/PreventionTest.php
+++ b/tests/Feature/Member/PreventionTest.php
@@ -22,285 +22,261 @@ use Tests\Lib\CreatesFormFields;
 use Tests\RequestFactories\EditorRequestFactory;
 use Tests\TestCase;
 
-class PreventionTest extends TestCase
+uses(DatabaseTransactions::class);
+uses(CreatesFormFields::class);
+
+function createForm(): Form
 {
-
-    use DatabaseTransactions;
-    use CreatesFormFields;
-
-    public function testItRemembersWhenNotRememberedYet(): void
-    {
-        Mail::fake();
-        $form = $this->createForm();
-        $participant = $this->createParticipant($form);
-
-        PreventionRememberAction::run();
-
-        $this->assertEquals(now()->format('Y-m-d'), $participant->fresh()->last_remembered_at->format('Y-m-d'));
-    }
-
-    public function testItDoesntRememberPastEvents(): void
-    {
-        Mail::fake();
-        $form = $this->createForm();
-        $participant = $this->createParticipant($form);
-        $form->update(['from' => now()->subDay()]);
-
-        PreventionRememberAction::run();
-
-        $this->assertNull($participant->fresh()->last_remembered_at);
-    }
-
-    public function testItDoesntRememberWhenConditionDoesntMatch(): void
-    {
-        Mail::fake();
-        $form = $this->createForm();
-        $form->update(['prevention_conditions' => Condition::from(['mode' => 'all', 'ifs' => [['field' => 'vorname', 'comparator' => 'isEqual', 'value' => 'Max']]])]);
-        $participant = $this->createParticipant($form);
-        $participant->update(['data' => [...$participant->data, 'vorname' => 'Jane']]);
-
-        PreventionRememberAction::run();
-
-        $this->assertNull($participant->fresh()->last_remembered_at);
-    }
-
-    public function testItRemembersWhenRememberIsDue(): void
-    {
-        Mail::fake();
-        $form = $this->createForm();
-        $participant = tap($this->createParticipant($form), fn ($p) => $p->update(['last_remembered_at' => now()->subWeeks(3)]));
-
-        PreventionRememberAction::run();
-
-        $this->assertEquals(now()->format('Y-m-d'), $participant->fresh()->last_remembered_at->format('Y-m-d'));
-    }
-
-    public function testItDoesntRememberWhenRememberingIsNotDue(): void
-    {
-        Mail::fake();
-        $form = $this->createForm();
-        $participant = tap($this->createParticipant($form), fn ($p) => $p->update(['last_remembered_at' => now()->subWeeks(1)]));
-
-        PreventionRememberAction::run();
-
-        $this->assertEquals(now()->subWeeks(1)->format('Y-m-d'), $participant->fresh()->last_remembered_at->format('Y-m-d'));
-    }
-
-    public function testItDoesntRememberWhenFormDoesntNeedPrevention(): void
-    {
-        Mail::fake();
-        $form = tap($this->createForm(), fn ($form) => $form->update(['needs_prevention' => false]));
-        $participant = $this->createParticipant($form);
-
-        PreventionRememberAction::run();
-
-        $this->assertNull($participant->fresh()->last_remembered_at);
-    }
-
-    public function testItDoesntRememberWhenParticipantDoesntHaveMember(): void
-    {
-        Mail::fake();
-        $form = $this->createForm();
-        $participant = $this->createParticipant($form);
-        $participant->member->delete();
-
-        PreventionRememberAction::run();
-
-        $this->assertNull($participant->fresh()->last_remembered_at);
-    }
-
-    public function testItRemembersNonLeaders(): void
-    {
-        Mail::fake();
-        $form = $this->createForm();
-        $participant = $this->createParticipant($form);
-        $participant->member->memberships->each->delete();
-
-        PreventionRememberAction::run();
-
-        $this->assertNotNull($participant->fresh()->last_remembered_at);
-    }
-
-    public static function attributes(): Generator
-    {
-        yield [
-            'attrs' => ['has_vk' => true, 'efz' => null, 'ps_at' => now()],
-            'preventions' => [Prevention::EFZ]
-        ];
-
-        yield [
-            'attrs' => ['has_vk' => true, 'efz' => now(), 'ps_at' => null],
-            'preventions' => [Prevention::PS]
-        ];
-
-        yield [
-            'attrs' => ['has_vk' => true, 'efz' => now()->subDay(), 'ps_at' => now()],
-            'preventions' => []
-        ];
-
-        yield [
-            'attrs' => ['has_vk' => true, 'efz' => now(), 'ps_at' => now()->subDay()],
-            'preventions' => []
-        ];
-
-        yield [
-            'attrs' => ['has_vk' => true, 'efz' => now()->subYears(5)->subDay(), 'ps_at' => now()],
-            'preventions' => [Prevention::EFZ]
-        ];
-
-        yield [
-            'attrs' => ['has_vk' => true, 'efz' => now(), 'ps_at' => null],
-            'preventions' => [Prevention::PS]
-        ];
-
-        yield [
-            'attrs' => ['has_vk' => true, 'efz' => now(), 'ps_at' => now()->subYears(5)->subDay()],
-            'preventions' => [Prevention::MOREPS]
-        ];
-
-        yield [
-            'attrs' => ['has_vk' => true, 'efz' => now(), 'ps_at' => now()->subYears(5)->subDay(), 'more_ps_at' => now()],
-            'preventions' => []
-        ];
-
-        yield [
-            'attrs' => ['has_vk' => true, 'efz' => now(), 'ps_at' => now()->subYears(15), 'more_ps_at' => now()->subYears(5)->subDay()],
-            'preventions' => [Prevention::MOREPS],
-        ];
-
-        yield [
-            'attrs' => ['has_vk' => false, 'efz' => now(), 'ps_at' => now()],
-            'preventions' => [Prevention::VK],
-        ];
-
-        yield [
-            'attrs' => ['has_vk' => true, 'efz' => now(), 'ps_at' => now()->subYears(7)],
-            'preventions' => [Prevention::MOREPS],
-        ];
-    }
-
-    /**
-     * @param array<int, Prevention> $preventions
-     * @param array<string, mixed> $memberAttributes
-     */
-    #[DataProvider('attributes')]
-    public function testItRemembersMember(array $attrs, array $preventions): void
-    {
-        Mail::fake();
-        $form = $this->createForm();
-        $participant = $this->createParticipant($form);
-        $participant->member->update($attrs);
-
-        PreventionRememberAction::run();
-
-        if (count($preventions)) {
-            Mail::assertSent(PreventionRememberMail::class, fn ($mail) => $mail->preventable->preventions() === $preventions);
-            $this->assertNotNull($participant->fresh()->last_remembered_at);
-        } else {
-            Mail::assertNotSent(PreventionRememberMail::class);
-            $this->assertNull($participant->fresh()->last_remembered_at);
-        }
-    }
-
-    public function testItDoesntRememberParticipantThatHasNoMail(): void
-    {
-        Mail::fake();
-        $form = $this->createForm();
-        $participant = $this->createParticipant($form);
-        $participant->update(['data' => [...$participant->data, 'email' => '']]);
-
-        PreventionRememberAction::run();
-
-        Mail::assertNotSent(PreventionRememberMail::class);
-    }
-
-    public function testItRendersMail(): void
-    {
-        InvoiceSettings::fake(['from_long' => 'Stamm Beispiel']);
-        $form = $this->createForm();
-        $participant = $this->createParticipant($form);
-        (new PreventionRememberMail($participant, app(PreventionSettings::class)->formmail))
-            ->assertSeeInText($participant->member->firstname)
-            ->assertSeeInText($participant->member->lastname)
-            ->assertSeeInText('Stamm Beispiel');
-    }
-
-    public function testItRendersSetttingMail(): void
-    {
-        Mail::fake();
-        app(PreventionSettings::class)->fill([
-            'formmail' => EditorRequestFactory::new()->paragraphs(["lorem lala {formname} g", "{wanted}", "bbb"])->toData()
-        ])->save();
-        $form = $this->createForm();
-        $this->createParticipant($form);
-
-        PreventionRememberAction::run();
-
-        Mail::assertSent(PreventionRememberMail::class, fn ($mail) => $mail->bodyText->hasAll([
-            'lorem lala ' . $form->name,
-            'erweitertes'
-        ]));
-    }
-
-    public function testItAppendsTextOfForm(): void
-    {
-        Mail::fake();
-        app(PreventionSettings::class)->fill([
-            'formmail' => EditorRequestFactory::new()->paragraphs(["::first::"])->toData()
-        ])->save();
-        $form = $this->createForm();
-        $form->update(['prevention_text' => EditorRequestFactory::new()->paragraphs(['event'])->toData()]);
-        $this->createParticipant($form);
-
-        PreventionRememberAction::run();
-
-        Mail::assertSent(PreventionRememberMail::class, fn ($mail) => $mail->bodyText->hasAll([
-            'event'
-        ]));
-    }
-
-    public function testItDoesntAppendTextTwice(): void
-    {
-        Mail::fake();
-        app(PreventionSettings::class)->fill(['frommail' => EditorRequestFactory::new()->paragraphs(["::first::"])->toData()])->save();
-        tap($this->createForm(), function ($f) {
-            $f->update(['prevention_text' => EditorRequestFactory::new()->paragraphs(['oberhausen'])->toData()]);
-            $this->createParticipant($f);
-        });
-        tap($this->createForm(), function ($f) {
-            $f->update(['prevention_text' => EditorRequestFactory::new()->paragraphs(['siegburg'])->toData()]);
-            $this->createParticipant($f);
-        });
-
-        PreventionRememberAction::run();
-
-        Mail::assertSent(PreventionRememberMail::class, fn ($mail) => $mail->bodyText->hasAll(['oberhausen']) && !$mail->bodyText->hasAll(['siegburg']));
-    }
-
-    public function testItDisplaysBodyTextInMail(): void
-    {
-        $form = $this->createForm();
-        $participant = $this->createParticipant($form);
-
-        $mail = new PreventionRememberMail($participant, EditorRequestFactory::new()->paragraphs(['ggtt'])->toData());
-        $mail->assertSeeInText('ggtt');
-    }
-
-    protected function createForm(): Form
-    {
-        return Form::factory()->fields([
-            $this->textField('vorname')->namiType(NamiType::FIRSTNAME)->specialType(SpecialType::FIRSTNAME),
-            $this->textField('nachname')->namiType(NamiType::FIRSTNAME)->specialType(SpecialType::LASTNAME),
-            $this->textField('email')->namiType(NamiType::FIRSTNAME)->specialType(SpecialType::EMAIL),
-        ])->create(['needs_prevention' => true]);
-    }
-
-    protected function createParticipant(Form $form): Participant
-    {
-        return Participant::factory()->for($form)->data([
-            'vorname' => 'Max',
-            'nachname' => 'Muster',
-            'email' => 'mail@a.de',
-        ])->for(Member::factory()->defaults()->has(Membership::factory()->inLocal('€ LeiterIn', 'Wölfling')))->create();
-    }
+    return Form::factory()->fields([
+        test()->textField('vorname')->namiType(NamiType::FIRSTNAME)->specialType(SpecialType::FIRSTNAME),
+        test()->textField('nachname')->namiType(NamiType::FIRSTNAME)->specialType(SpecialType::LASTNAME),
+        test()->textField('email')->namiType(NamiType::FIRSTNAME)->specialType(SpecialType::EMAIL),
+    ])->create(['needs_prevention' => true]);
 }
+
+function createParticipant(Form $form): Participant
+{
+    return Participant::factory()->for($form)->data([
+        'vorname' => 'Max',
+        'nachname' => 'Muster',
+        'email' => 'mail@a.de',
+    ])->for(Member::factory()->defaults()->has(Membership::factory()->inLocal('€ LeiterIn', 'Wölfling')))->create();
+}
+
+dataset('attributes', fn() => [
+    [
+        ['has_vk' => true, 'efz' => null, 'ps_at' => now()],
+        [Prevention::EFZ]
+    ],
+
+    [
+        ['has_vk' => true, 'efz' => now(), 'ps_at' => null],
+        [Prevention::PS]
+    ],
+
+    [
+        ['has_vk' => true, 'efz' => now()->subDay(), 'ps_at' => now()],
+        []
+    ],
+
+    [
+        ['has_vk' => true, 'efz' => now(), 'ps_at' => now()->subDay()],
+        []
+    ],
+
+    [
+        ['has_vk' => true, 'efz' => now()->subYears(5)->subDay(), 'ps_at' => now()],
+        [Prevention::EFZ]
+    ],
+
+    [
+        ['has_vk' => true, 'efz' => now(), 'ps_at' => null],
+        [Prevention::PS]
+    ],
+
+    [
+        ['has_vk' => true, 'efz' => now(), 'ps_at' => now()->subYears(5)->subDay()],
+        [Prevention::MOREPS]
+    ],
+
+    [
+        ['has_vk' => true, 'efz' => now(), 'ps_at' => now()->subYears(5)->subDay(), 'more_ps_at' => now()],
+        []
+    ],
+
+    [
+        ['has_vk' => true, 'efz' => now(), 'ps_at' => now()->subYears(15), 'more_ps_at' => now()->subYears(5)->subDay()],
+        [Prevention::MOREPS],
+    ],
+
+    [
+        ['has_vk' => false, 'efz' => now(), 'ps_at' => now()],
+        [Prevention::VK],
+    ],
+
+    [
+        ['has_vk' => true, 'efz' => now(), 'ps_at' => now()->subYears(7)],
+        [Prevention::MOREPS],
+    ]
+]);
+
+it('testItRemembersWhenNotRememberedYet', function () {
+    Mail::fake();
+    $form = createForm();
+    $participant = createParticipant($form);
+
+    PreventionRememberAction::run();
+
+    $this->assertEquals(now()->format('Y-m-d'), $participant->fresh()->last_remembered_at->format('Y-m-d'));
+});
+
+it('testItDoesntRememberPastEvents', function () {
+    Mail::fake();
+    $form = createForm();
+    $participant = createParticipant($form);
+    $form->update(['from' => now()->subDay()]);
+
+    PreventionRememberAction::run();
+
+    $this->assertNull($participant->fresh()->last_remembered_at);
+});
+
+it('testItDoesntRememberWhenConditionDoesntMatch', function () {
+    Mail::fake();
+    $form = createForm();
+    $form->update(['prevention_conditions' => Condition::from(['mode' => 'all', 'ifs' => [['field' => 'vorname', 'comparator' => 'isEqual', 'value' => 'Max']]])]);
+    $participant = createParticipant($form);
+    $participant->update(['data' => [...$participant->data, 'vorname' => 'Jane']]);
+
+    PreventionRememberAction::run();
+
+    $this->assertNull($participant->fresh()->last_remembered_at);
+});
+
+it('testItRemembersWhenRememberIsDue', function () {
+    Mail::fake();
+    $form = createForm();
+    $participant = tap(createParticipant($form), fn($p) => $p->update(['last_remembered_at' => now()->subWeeks(3)]));
+
+    PreventionRememberAction::run();
+
+    $this->assertEquals(now()->format('Y-m-d'), $participant->fresh()->last_remembered_at->format('Y-m-d'));
+});
+
+it('testItDoesntRememberWhenRememberingIsNotDue', function () {
+    Mail::fake();
+    $form = createForm();
+    $participant = tap(createParticipant($form), fn($p) => $p->update(['last_remembered_at' => now()->subWeeks(1)]));
+
+    PreventionRememberAction::run();
+
+    $this->assertEquals(now()->subWeeks(1)->format('Y-m-d'), $participant->fresh()->last_remembered_at->format('Y-m-d'));
+});
+
+it('testItDoesntRememberWhenFormDoesntNeedPrevention', function () {
+    Mail::fake();
+    $form = tap(createForm(), fn($form) => $form->update(['needs_prevention' => false]));
+    $participant = createParticipant($form);
+
+    PreventionRememberAction::run();
+
+    $this->assertNull($participant->fresh()->last_remembered_at);
+});
+
+it('testItDoesntRememberWhenParticipantDoesntHaveMember', function () {
+    Mail::fake();
+    $form = createForm();
+    $participant = createParticipant($form);
+    $participant->member->delete();
+
+    PreventionRememberAction::run();
+
+    $this->assertNull($participant->fresh()->last_remembered_at);
+});
+
+it('testItRemembersNonLeaders', function () {
+    Mail::fake();
+    $form = createForm();
+    $participant = createParticipant($form);
+    $participant->member->memberships->each->delete();
+
+    PreventionRememberAction::run();
+
+    $this->assertNotNull($participant->fresh()->last_remembered_at);
+});
+
+
+it('testItRemembersMember', function ($attrs, $preventions) {
+    Mail::fake();
+    $form = createForm();
+    $participant = createParticipant($form);
+    $participant->member->update($attrs);
+
+    PreventionRememberAction::run();
+
+    if (count($preventions)) {
+        Mail::assertSent(PreventionRememberMail::class, fn($mail) => $mail->preventable->preventions() === $preventions);
+        $this->assertNotNull($participant->fresh()->last_remembered_at);
+    } else {
+        Mail::assertNotSent(PreventionRememberMail::class);
+        $this->assertNull($participant->fresh()->last_remembered_at);
+    }
+})->with('attributes');
+
+it('testItDoesntRememberParticipantThatHasNoMail', function () {
+    Mail::fake();
+    $form = createForm();
+    $participant = createParticipant($form);
+    $participant->update(['data' => [...$participant->data, 'email' => '']]);
+
+    PreventionRememberAction::run();
+
+    Mail::assertNotSent(PreventionRememberMail::class);
+});
+
+it('testItRendersMail', function () {
+    InvoiceSettings::fake(['from_long' => 'Stamm Beispiel']);
+    $form = createForm();
+    $participant = createParticipant($form);
+    (new PreventionRememberMail($participant, app(PreventionSettings::class)->formmail))
+        ->assertSeeInText($participant->member->firstname)
+        ->assertSeeInText($participant->member->lastname)
+        ->assertSeeInText('Stamm Beispiel');
+});
+
+it('testItRendersSetttingMail', function () {
+    Mail::fake();
+    app(PreventionSettings::class)->fill([
+        'formmail' => EditorRequestFactory::new()->paragraphs(["lorem lala {formname} g", "{wanted}", "bbb"])->toData()
+    ])->save();
+    $form = createForm();
+    createParticipant($form);
+
+    PreventionRememberAction::run();
+
+    Mail::assertSent(PreventionRememberMail::class, fn($mail) => $mail->bodyText->hasAll([
+        'lorem lala ' . $form->name,
+        'erweitertes'
+    ]));
+});
+
+it('testItAppendsTextOfForm', function () {
+    Mail::fake();
+    app(PreventionSettings::class)->fill([
+        'formmail' => EditorRequestFactory::new()->paragraphs(["::first::"])->toData()
+    ])->save();
+    $form = createForm();
+    $form->update(['prevention_text' => EditorRequestFactory::new()->paragraphs(['event'])->toData()]);
+    createParticipant($form);
+
+    PreventionRememberAction::run();
+
+    Mail::assertSent(PreventionRememberMail::class, fn($mail) => $mail->bodyText->hasAll([
+        'event'
+    ]));
+});
+
+it('testItDoesntAppendTextTwice', function () {
+    Mail::fake();
+    app(PreventionSettings::class)->fill(['frommail' => EditorRequestFactory::new()->paragraphs(["::first::"])->toData()])->save();
+    tap(createForm(), function ($f) {
+        $f->update(['prevention_text' => EditorRequestFactory::new()->paragraphs(['oberhausen'])->toData()]);
+        createParticipant($f);
+    });
+    tap(createForm(), function ($f) {
+        $f->update(['prevention_text' => EditorRequestFactory::new()->paragraphs(['siegburg'])->toData()]);
+        createParticipant($f);
+    });
+
+    PreventionRememberAction::run();
+
+    Mail::assertSent(PreventionRememberMail::class, fn($mail) => $mail->bodyText->hasAll(['oberhausen']) && !$mail->bodyText->hasAll(['siegburg']));
+});
+
+it('testItDisplaysBodyTextInMail', function () {
+    $form = createForm();
+    $participant = createParticipant($form);
+
+    $mail = new PreventionRememberMail($participant, EditorRequestFactory::new()->paragraphs(['ggtt'])->toData());
+    $mail->assertSeeInText('ggtt');
+});