diff --git a/api/app/Models/TestEntity.php b/api/app/Models/TestEntity.php
index ef6b6fce..14653552 100644
--- a/api/app/Models/TestEntity.php
+++ b/api/app/Models/TestEntity.php
@@ -48,42 +48,4 @@ public function entityRoute()
         return '/test/entities';
     }
 
-    /**
-     * Generate fake user
-     * @param array $overrides
-     * @param null $seed
-     * @return TestEntity
-     */
-    public static function fakeTestEntity($overrides = [], $seed = null){
-
-        $faker = Faker::create('au_AU');;
-
-        if ($seed){
-            $faker->seed($seed);
-        }
-
-        $testEntityInfo = array_merge([
-
-            'entity_id' => $faker->uuid,
-            'varchar' => $faker->word,
-            'hash' => Hash::make($faker->randomDigitNotNull),
-            'integer' => $faker->numberBetween(0, 500),
-            'decimal' => $faker->randomFloat(2, 0, 100),
-            'boolean' => $faker->boolean(),
-            'nullable' => null,
-            'text' => $faker->paragraph(3),
-            'date' => $faker->date(),
-            'multi_word_column_title' => true,
-            'hidden' => $faker->boolean()
-
-        ], $overrides);
-
-        $testEntity = new TestEntity($testEntityInfo);
-
-        $testEntity->timestamps = true;
-        $testEntity->save();
-
-        return $testEntity;
-
-    }
 }
\ No newline at end of file
diff --git a/api/database/seeds/TestEntitySeeder.php b/api/database/seeds/TestEntitySeeder.php
index b5e0187d..80eda2ca 100644
--- a/api/database/seeds/TestEntitySeeder.php
+++ b/api/database/seeds/TestEntitySeeder.php
@@ -13,11 +13,7 @@ class TestEntitySeeder extends Seeder {
 	public function run()
 	{
 
-        foreach(range(0, 20) as $index){
-
-            TestEntity::fakeTestEntity();
-
-        }
+        factory(App\Models\TestEntity::class, 20)->create();
 
 	}
 
diff --git a/api/database/seeds/UserStorySeeder.php b/api/database/seeds/UserStorySeeder.php
index 4febeb99..b2cbf866 100644
--- a/api/database/seeds/UserStorySeeder.php
+++ b/api/database/seeds/UserStorySeeder.php
@@ -12,16 +12,11 @@ class UserStorySeeder extends Seeder {
 	 */
 	public function run()
 	{
-
-        User::fakeUser([
+        factory(App\Models\User::class)->create([
             'email'=>'john.smith@example.com'
         ]);
 
-        foreach(range(0, 99) as $index){
-
-            User::fakeUser();
-
-        }
+        factory(App\Models\User::class, 99)->create();
 
 	}
 
diff --git a/api/tests/json/QueueTest.php b/api/tests/json/QueueTest.php
index 0c8205d9..11f3f375 100644
--- a/api/tests/json/QueueTest.php
+++ b/api/tests/json/QueueTest.php
@@ -17,7 +17,7 @@ public function testQueue()
 
         Queue::push(function($job){
 
-            TestEntity::fakeTestEntity();
+            factory(App\Models\TestEntity::class)->create();
 
             $job->delete();
         });