diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 6fb884f4..d7fd1ca3 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -2,6 +2,7 @@
   <profile version="1.0">
     <option name="myName" value="Project Default" />
     <inspection_tool class="AndroidLintTypos" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ArgumentEqualsDefaultValueInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="ClassOverridesFieldOfSuperClassInspection" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="ForgottenDebugOutputInspection" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="configuration">
diff --git a/database/factories/AirportFactory.php b/database/factories/AirportFactory.php
index e8d064e1..aab541e5 100644
--- a/database/factories/AirportFactory.php
+++ b/database/factories/AirportFactory.php
@@ -1,5 +1,8 @@
 <?php
-$factory->define(App\Models\Airport::class, function (Faker\Generator $faker) {
+
+use Faker\Generator as Faker;
+
+$factory->define(App\Models\Airport::class, function (Faker $faker) {
     return [
         'code' => 'Y',
         'name' => 'Economy',
diff --git a/database/factories/FlightFactory.php b/database/factories/FlightFactory.php
new file mode 100644
index 00000000..a4e4cb43
--- /dev/null
+++ b/database/factories/FlightFactory.php
@@ -0,0 +1,30 @@
+<?php
+
+use Faker\Generator as Faker;
+
+# Match the list available in tests/data/*.yml
+
+$airlinesAvailable = [1];
+
+$airportsAvailable = [
+    'KJFK',
+    'KAUS',
+    'EGLL',
+];
+
+$factory->define(App\Models\Flight::class, function (Faker $faker) use ($airportsAvailable, $airlinesAvailable) {
+    return [
+        'id' => $faker->sha1,
+        'flight_number' => $faker->numberBetween(),
+        'airline_id' => $faker->randomElement($airlinesAvailable),
+        'dpt_airport_id' => $faker->randomElement($airportsAvailable),
+        'arr_airport_id' => $faker->randomElement($airportsAvailable),
+        'route' => $faker->text(),
+        'dpt_time' => $faker->time(),
+        'arr_time' => $faker->time(),
+        'flight_time' => $faker->randomFloat(2),
+        'has_bid' => false,
+        'active' => true,
+        'created_at' => $faker->dateTimeBetween('-1 week', 'now'),
+    ];
+});
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
index e376e12e..b3d9bbc7 100755
--- a/database/factories/ModelFactory.php
+++ b/database/factories/ModelFactory.php
@@ -1,12 +1 @@
 <?php
-
-$factory->define(App\User::class, function (Faker\Generator $faker) {
-    static $password;
-
-    return [
-        'name' => $faker->name,
-        'email' => $faker->safeEmail,
-        'password' => $password ?: $password = bcrypt('secret'),
-        'remember_token' => str_random(10),
-    ];
-});
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
new file mode 100644
index 00000000..6cdf8eb9
--- /dev/null
+++ b/database/factories/UserFactory.php
@@ -0,0 +1,17 @@
+<?php
+
+use Faker\Generator as Faker;
+
+$factory->define(App\Models\User::class, function (Faker $faker) {
+    static $password;
+
+    return [
+        'name' => $faker->name,
+        'email' => $faker->safeEmail,
+        'password' => $password ?: $password = bcrypt('secret'),
+        'api_key' => $faker->sha1,
+        'flights' => $faker->numberBetween(0, 1000),
+        'flight_time' => $faker->numberBetween(0, 10000),
+        'remember_token' => str_random(10),
+    ];
+});
diff --git a/tests/ApiTest.php b/tests/ApiTest.php
index a8cd0900..4bd328d1 100644
--- a/tests/ApiTest.php
+++ b/tests/ApiTest.php
@@ -5,6 +5,8 @@
  */
 class ApiTest extends TestCase
 {
+    use \Tests\Traits\FixtureDataLoader;
+
     public function setUp()
     {
         parent::setUp();
@@ -26,11 +28,11 @@ class ApiTest extends TestCase
             ->assertStatus(401);
 
         // Test upper/lower case of Authorization header, etc
-        $this->withHeaders(self::$auth_headers)->get($uri)
+        $this->withHeaders($this->apiHeaders())->get($uri)
             ->assertStatus(200)
             ->assertJson(['icao' => 'KJFK'], true);
 
-        $this->withHeaders(['AUTHORIZATION' => 'testapikey'])->get($uri)
+        $this->withHeaders(['AUTHORIZATION' => 'testadminapikey'])->get($uri)
             ->assertStatus(200)
             ->assertJson(['icao' => 'KJFK'], true);
     }
@@ -40,11 +42,11 @@ class ApiTest extends TestCase
      */
     public function testAirportRequest()
     {
-        $this->withHeaders(self::$auth_headers)->get('/api/airports/KJFK')
+        $this->withHeaders($this->apiHeaders())->get('/api/airports/KJFK')
             ->assertStatus(200)
             ->assertJson(['icao' => 'KJFK'], true);
 
-        $this->withHeaders(self::$auth_headers)->get('/api/airports/UNK')
+        $this->withHeaders($this->apiHeaders())->get('/api/airports/UNK')
             ->assertStatus(404);
     }
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
index bc4186cb..3ce3836f 100755
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -24,6 +24,7 @@ abstract class TestCase extends Illuminate\Foundation\Testing\TestCase
 
     public function __construct($name = null, array $data = [], $dataName = '') {
         parent::__construct($name, $data, $dataName);
+        Eloquent::unguard();
     }
 
     protected function reset_db() {
diff --git a/tests/traits/FixtureDataLoader.php b/tests/traits/FixtureDataLoader.php
new file mode 100644
index 00000000..0fc1a7e8
--- /dev/null
+++ b/tests/traits/FixtureDataLoader.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ */
+
+namespace Tests\Traits;
+
+use App\Models\Flight;
+use Faker\Factory;
+
+trait FixtureDataLoader {
+
+    public static $airports = ['KAUS', 'KJFK', 'KSFO', 'OPKC', 'OMDB', 'KLGA'];
+
+    public function apiHeaders()
+    {
+        return [
+            'Authorization' => 'testadminapikey'
+        ];
+    }
+
+    /**
+     * Create new ID of integer type
+     * @return integer
+     */
+    protected function create_id_int()
+    {
+        return random_int(1, 10000);
+    }
+
+    /**
+     * Create a new ID
+     * @return mixed
+     */
+    protected function create_id_hash()
+    {
+        $hashids = new Hashids('', 12);
+        $mt = str_replace('.', '', microtime(true));
+        $id = $hashids->encode($mt);
+        return $id;
+    }
+
+    /**
+     * Dynamically apply options to a model
+     * @param $model
+     * @param array $options
+     * @return mixed
+     */
+    protected function apply_options($model, array $options)
+    {
+        foreach ($options as $key => $value) {
+            $model->{$key} = $value;
+        }
+
+        $model->save();
+        return $model;
+    }
+
+    /**
+     * Add a flight
+     * @param array $options
+     * @return mixed
+     */
+    public function addFlight(array $options=[])
+    {
+        $faker = Factory::create();
+        $options = array_merge([
+            'id' => $this->create_id_hash(),
+            'flight_number' => $faker->numberBetween(),
+            'airline_id' => 1,
+            'dpt_airport_id' => $faker->randomElement(self::$airports),
+            'arr_airport_id' => $faker->randomElement(self::$airports),
+        ], $options);
+
+        $flight = new Flight();
+        $flight = $this->apply_options($flight, $options);
+        $flight->subfleets()->syncWithoutDetaching([1]);
+
+        return $flight;
+    }
+
+}