diff --git a/app/Http/Controllers/Api/v1/AbilityApiController.php b/app/Http/Controllers/Api/v1/AbilityApiController.php
index 7b43a91fbc..d3ab0eaf40 100644
--- a/app/Http/Controllers/Api/v1/AbilityApiController.php
+++ b/app/Http/Controllers/Api/v1/AbilityApiController.php
@@ -47,6 +47,7 @@ public function store(Request $request, Campaign $campaign)
         $data['campaign_id'] = $campaign->id;
         $model = Ability::create($data);
         $this->crudSave($model);
+
         return new Resource($model);
     }
 
diff --git a/app/Http/Controllers/Api/v1/ApiController.php b/app/Http/Controllers/Api/v1/ApiController.php
index 57211ed2ee..12bdf0dce2 100644
--- a/app/Http/Controllers/Api/v1/ApiController.php
+++ b/app/Http/Controllers/Api/v1/ApiController.php
@@ -23,5 +23,6 @@ protected function crudSave(MiscModel $model)
                 $model->entity->touch();
             }
         }
+        $model->refresh();
     }
 }
diff --git a/app/Http/Controllers/Api/v1/BookmarkApiController.php b/app/Http/Controllers/Api/v1/BookmarkApiController.php
index 0d19758768..8469230e58 100644
--- a/app/Http/Controllers/Api/v1/BookmarkApiController.php
+++ b/app/Http/Controllers/Api/v1/BookmarkApiController.php
@@ -46,7 +46,7 @@ public function store(Request $request, Campaign $campaign)
         /** @var Bookmark $model */
         $model = Bookmark::create($data);
         $this->crudSave($model);
-        $model->refresh();
+
         return new Resource($model);
     }
 
diff --git a/app/Http/Controllers/Api/v1/CalendarApiController.php b/app/Http/Controllers/Api/v1/CalendarApiController.php
index 18f6047ac4..25d34ac3bb 100644
--- a/app/Http/Controllers/Api/v1/CalendarApiController.php
+++ b/app/Http/Controllers/Api/v1/CalendarApiController.php
@@ -57,6 +57,7 @@ public function store(Request $request, Campaign $campaign)
         /** @var Calendar $model */
         $model = Calendar::create($data);
         $this->crudSave($model);
+
         return new Resource($model);
     }
 
diff --git a/app/Http/Controllers/Api/v1/CreatureApiController.php b/app/Http/Controllers/Api/v1/CreatureApiController.php
index 780944edbe..10623ebf8a 100644
--- a/app/Http/Controllers/Api/v1/CreatureApiController.php
+++ b/app/Http/Controllers/Api/v1/CreatureApiController.php
@@ -48,7 +48,7 @@ public function store(Request $request, Campaign $campaign)
         $data['campaign_id'] = $campaign->id;
         $model = Creature::create($data);
         $this->crudSave($model);
-        $model->refresh();
+
         return new Resource($model);
     }
 
diff --git a/phpunit.xml b/phpunit.xml
index 393f2d1120..b2e382bd31 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -25,5 +25,6 @@
         <env name="DB_DATABASE" value=":memory:" />
         <env name="TELESCOPE_ENABLED" value="false"/>
         <env name="MAIL_MAILER" value="array"/>
+        <env name="SCOUT_DRIVER" value="null"/>
     </php>
 </phpunit>