diff --git a/resources/lang/en_US/validation.php b/resources/lang/en_US/validation.php
index 6ed91c4a65..3c140253fe 100644
--- a/resources/lang/en_US/validation.php
+++ b/resources/lang/en_US/validation.php
@@ -60,6 +60,7 @@ return [
     'less'                           => ':attribute must be less than 10,000,000',
     'active_url'                     => 'The :attribute is not a valid URL.',
     'after'                          => 'The :attribute must be a date after :date.',
+    'date_after'                     => 'End date must be before start date.',
     'alpha'                          => 'The :attribute may only contain letters.',
     'alpha_dash'                     => 'The :attribute may only contain letters, numbers, and dashes.',
     'alpha_num'                      => 'The :attribute may only contain letters and numbers.',
diff --git a/tests/Api/Models/Account/StoreControllerTest.php b/tests/Api/Models/Account/StoreControllerTest.php
index 6d40968105..fe72c6a2a6 100644
--- a/tests/Api/Models/Account/StoreControllerTest.php
+++ b/tests/Api/Models/Account/StoreControllerTest.php
@@ -50,7 +50,7 @@ class StoreControllerTest extends TestCase
     /**
      * @param array $submission
      * emptyDataProvider / storeDataProvider
-     * @dataProvider emptyDataProvider
+     * @dataProvider storeDataProvider
      */
     public function testStore(array $submission): void
     {
@@ -193,7 +193,7 @@ class StoreControllerTest extends TestCase
             'asset'     => [
                 'parameters' => [],
                 'fields' => [
-                    'name'         => $faker->name . join(' ', $faker->words(2)),
+                    'name'         => $faker->uuid,
                     'type'         => 'asset',
                     'account_role' => $this->randomAccountRole(),
                 ],
@@ -201,14 +201,14 @@ class StoreControllerTest extends TestCase
             'expense'   => [
                 'parameters' => [],
                 'fields' => [
-                    'name' => $faker->name,
+                    'name' => $faker->uuid,
                     'type' => 'expense',
                 ],
             ],
             'liability' => [
                 'parameters' => [],
                 'fields' => [
-                    'name'                 => $faker->name,
+                    'name'                 => $faker->uuid,
                     'type'                 => 'liabilities',
                     'liability_type'       => $this->randomLiabilityType(),
                     'liability_amount'     => $this->getRandomAmount(),
@@ -219,7 +219,7 @@ class StoreControllerTest extends TestCase
             ],
             'cc'        => [
                 'fields' => [
-                    'name'                 => $faker->name,
+                    'name'                 => $faker->uuid,
                     'type'                 => 'asset',
                     'account_role'         => 'ccAsset',
                     'credit_card_type'     => 'monthlyFull',
diff --git a/tests/Api/Models/Account/UpdateControllerTest.php b/tests/Api/Models/Account/UpdateControllerTest.php
index efc20be5fc..866894d146 100644
--- a/tests/Api/Models/Account/UpdateControllerTest.php
+++ b/tests/Api/Models/Account/UpdateControllerTest.php
@@ -102,7 +102,7 @@ class UpdateControllerTest extends TestCase
             'name'              => [
                 'id'           => 1,
                 'fields'       => [
-                    'name' => ['test_value' => $faker->text(64)],
+                    'name' => ['test_value' => $faker->uuid],
                 ],
                 'extra_ignore' => [],
             ],
diff --git a/tests/Api/Models/Attachment/StoreControllerTest.php b/tests/Api/Models/Attachment/StoreControllerTest.php
index ef83887c76..ccdfea465e 100644
--- a/tests/Api/Models/Attachment/StoreControllerTest.php
+++ b/tests/Api/Models/Attachment/StoreControllerTest.php
@@ -52,7 +52,7 @@ class StoreControllerTest extends TestCase
      * @param array $submission
      *
      * emptyDataProvider / storeDataProvider
-     * @dataProvider emptyDataProvider
+     * @dataProvider storeDataProvider
      */
     public function testStore(array $submission): void
     {
@@ -125,7 +125,7 @@ class StoreControllerTest extends TestCase
         return [
             'title' => [
                 'fields' => [
-                    'title' => join(' ', $faker->words(3)),
+                    'title' => $faker->uuid,
                 ],
             ],
             'notes' => [
diff --git a/tests/Api/Models/Attachment/UpdateControllerTest.php b/tests/Api/Models/Attachment/UpdateControllerTest.php
index a7551ae247..77192a9d3a 100644
--- a/tests/Api/Models/Attachment/UpdateControllerTest.php
+++ b/tests/Api/Models/Attachment/UpdateControllerTest.php
@@ -95,7 +95,7 @@ class UpdateControllerTest extends TestCase
             'title'    => [
                 'id'           => 1,
                 'fields'       => [
-                    'title' => ['test_value' => $faker->text(64)],
+                    'title' => ['test_value' => $faker->uuid],
                 ],
                 'extra_ignore' => [],
             ],
diff --git a/tests/Api/Models/AvailableBudget/StoreControllerTest.php b/tests/Api/Models/AvailableBudget/StoreControllerTest.php
index e5d543e7fd..5271a56028 100644
--- a/tests/Api/Models/AvailableBudget/StoreControllerTest.php
+++ b/tests/Api/Models/AvailableBudget/StoreControllerTest.php
@@ -52,7 +52,7 @@ class StoreControllerTest extends TestCase
      * @param array $submission
      *
      * emptyDataProvider / storeDataProvider
-     * @dataProvider emptyDataProvider
+     * @dataProvider storeDataProvider
      */
     public function testStore(array $submission): void
     {
diff --git a/tests/Api/Models/Bill/StoreControllerTest.php b/tests/Api/Models/Bill/StoreControllerTest.php
index c55efb3211..2e23cc54aa 100644
--- a/tests/Api/Models/Bill/StoreControllerTest.php
+++ b/tests/Api/Models/Bill/StoreControllerTest.php
@@ -52,7 +52,7 @@ class StoreControllerTest extends TestCase
      * @param array $submission
      *
      * emptyDataProvider / storeDataProvider
-     * @dataProvider emptyDataProvider
+     * @dataProvider storeDataProvider
      */
     public function testStore(array $submission): void
     {
@@ -104,7 +104,7 @@ class StoreControllerTest extends TestCase
         return [
             'default_bill' => [
                 'fields' => [
-                    'name'        => join(',', $faker->words(5)),
+                    'name'        => $faker->uuid,
                     'amount_min'  => number_format($faker->randomFloat(2, 10, 50), 2),
                     'amount_max'  => number_format($faker->randomFloat(2, 60, 90), 2),
                     'date'        => $faker->dateTimeBetween('-1 year', 'now')->format('Y-m-d'),
@@ -146,7 +146,7 @@ class StoreControllerTest extends TestCase
             ],
             'name'               => [
                 'fields' => [
-                    'name' => join(' ', $faker->words(5)),
+                    'name' => $faker->uuid,
                 ],
             ],
             'amount_min'         => [
diff --git a/tests/Api/Models/Bill/UpdateControllerTest.php b/tests/Api/Models/Bill/UpdateControllerTest.php
index 814d1b9226..4104b2f99a 100644
--- a/tests/Api/Models/Bill/UpdateControllerTest.php
+++ b/tests/Api/Models/Bill/UpdateControllerTest.php
@@ -99,7 +99,7 @@ class UpdateControllerTest extends TestCase
             'name'       => [
                 'id'           => 1,
                 'fields'       => [
-                    'name' => ['test_value' => join(' ', $faker->words(4))],
+                    'name' => ['test_value' => $faker->uuid],
                 ],
                 'extra_ignore' => [],
             ],
diff --git a/tests/Api/Models/Budget/StoreControllerTest.php b/tests/Api/Models/Budget/StoreControllerTest.php
index a37ed941fc..b1bfe16906 100644
--- a/tests/Api/Models/Budget/StoreControllerTest.php
+++ b/tests/Api/Models/Budget/StoreControllerTest.php
@@ -52,7 +52,7 @@ class StoreControllerTest extends TestCase
      * @param array $submission
      *
      * emptyDataProvider / storeDataProvider
-     * @dataProvider emptyDataProvider
+     * @dataProvider storeDataProvider
      */
     public function testStore(array $submission): void
     {
@@ -101,7 +101,7 @@ class StoreControllerTest extends TestCase
         return [
             'default_budget' => [
                 'fields' => [
-                    'name' => join(',', $faker->words(5)),
+                    'name' => $faker->uuid,
                 ],
             ],
         ];
diff --git a/tests/Api/Models/Budget/UpdateControllerTest.php b/tests/Api/Models/Budget/UpdateControllerTest.php
index d75ea944b7..cf63712240 100644
--- a/tests/Api/Models/Budget/UpdateControllerTest.php
+++ b/tests/Api/Models/Budget/UpdateControllerTest.php
@@ -103,7 +103,7 @@ class UpdateControllerTest extends TestCase
             'name'                    => [
                 'id'           => 1,
                 'fields'       => [
-                    'name' => ['test_value' => join(' ', $faker->words(4))],
+                    'name' => ['test_value' => $faker->uuid],
                 ],
                 'extra_ignore' => [],
             ],
diff --git a/tests/Api/Models/BudgetLimit/StoreControllerTest.php b/tests/Api/Models/BudgetLimit/StoreControllerTest.php
index c3624a3751..86026bfa3d 100644
--- a/tests/Api/Models/BudgetLimit/StoreControllerTest.php
+++ b/tests/Api/Models/BudgetLimit/StoreControllerTest.php
@@ -52,7 +52,7 @@ class StoreControllerTest extends TestCase
      * @param array $submission
      *
      * emptyDataProvider / storeDataProvider
-     * @dataProvider emptyDataProvider
+     * @dataProvider storeDataProvider
      */
     public function testStore(array $submission): void
     {
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 53e13748aa..ab0eeae795 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -32,6 +32,7 @@ use Tests\Traits\CollectsValues;
 abstract class TestCase extends BaseTestCase
 {
     use CreatesApplication, CollectsValues;
+    protected const MAX_ITERATIONS = 2;
 
     /**
      * @return array
diff --git a/tests/Traits/TestHelpers.php b/tests/Traits/TestHelpers.php
index 7592216d7d..da4e2709cc 100644
--- a/tests/Traits/TestHelpers.php
+++ b/tests/Traits/TestHelpers.php
@@ -53,7 +53,8 @@ trait TestHelpers
             // then loop and add fields:
             $optionalSets = $startOptionalSets;
             $keys         = array_keys($optionalSets);
-            for ($i = 1; $i <= count($keys); $i++) {
+            $count        = count($keys) > self::MAX_ITERATIONS ? self::MAX_ITERATIONS : count($keys);
+            for ($i = 1; $i <= $count; $i++) {
                 $combinations = $this->combinationsOf($i, $keys);
                 // expand body with N extra fields:
                 foreach ($combinations as $extraFields) {
@@ -71,6 +72,7 @@ trait TestHelpers
             }
             unset($second);
         }
+
         return $submissions;
     }