diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b4f079e4..1d1a3ac00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
 - Account sprinkle now extend the Core `BakeCommand` class to add the `create-admin` to the general bake command. Any sprinkle already extending the Core `BakeCommand` might need adjustments.
+- Updated custom Eloquent relations (`belongsToManyThrough`, `morphToManyUnique`, `belongsToManyUnique`, `morphToManyUnique`, etc.) to support Laravel 5.8. See [The `belongsToMany` Method](https://laravel.com/docs/5.5/upgrade#upgrade-5.5.0).
 
+### Removed
+- Removed `belongsToManyConstrained` (deprecated in 4.1.6)
 
 ## [v4.2.3]
 
diff --git a/README.md b/README.md
index efde315bc..256477619 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ If you simply want to show that you like this project, or want to remember it fo
 
 Copyright (c) 2019, free to use in personal and commercial software as per the [license](LICENSE.md).
 
-UserFrosting is a secure, modern user management system written in PHP and built on top of the [Slim Microframework](http://www.slimframework.com/), [Twig](http://twig.sensiolabs.org/) templating engine, and [Eloquent](https://laravel.com/docs/5.4/eloquent#introduction) ORM.
+UserFrosting is a secure, modern user management system written in PHP and built on top of the [Slim Microframework](http://www.slimframework.com/), [Twig](http://twig.sensiolabs.org/) templating engine, and [Eloquent](https://laravel.com/docs/5.8/eloquent#introduction) ORM.
 
 ## Features
 
diff --git a/app/sprinkles/account/src/Database/Migrations/v400/ActivitiesTable.php b/app/sprinkles/account/src/Database/Migrations/v400/ActivitiesTable.php
index c4eb8e2bb..59fe9abc7 100644
--- a/app/sprinkles/account/src/Database/Migrations/v400/ActivitiesTable.php
+++ b/app/sprinkles/account/src/Database/Migrations/v400/ActivitiesTable.php
@@ -17,7 +17,7 @@
  * Sessions table migration
  * Version 4.0.0.
  *
- * See https://laravel.com/docs/5.4/migrations#tables
+ * See https://laravel.com/docs/5.8/migrations#tables
  *
  * @author Alex Weissman (https://alexanderweissman.com)
  */
diff --git a/app/sprinkles/account/src/Database/Migrations/v400/GroupsTable.php b/app/sprinkles/account/src/Database/Migrations/v400/GroupsTable.php
index 31def4bb2..6b6a48840 100644
--- a/app/sprinkles/account/src/Database/Migrations/v400/GroupsTable.php
+++ b/app/sprinkles/account/src/Database/Migrations/v400/GroupsTable.php
@@ -19,7 +19,7 @@
  * "Group" now replaces the notion of "primary group" in earlier versions of UF.  A user can belong to exactly one group.
  * Version 4.0.0.
  *
- * See https://laravel.com/docs/5.4/migrations#tables
+ * See https://laravel.com/docs/5.8/migrations#tables
  *
  * @author Alex Weissman (https://alexanderweissman.com)
  */
diff --git a/app/sprinkles/account/src/Database/Migrations/v400/PasswordResetsTable.php b/app/sprinkles/account/src/Database/Migrations/v400/PasswordResetsTable.php
index 9c90cd9c4..e86c3ba56 100644
--- a/app/sprinkles/account/src/Database/Migrations/v400/PasswordResetsTable.php
+++ b/app/sprinkles/account/src/Database/Migrations/v400/PasswordResetsTable.php
@@ -18,7 +18,7 @@
  * Manages requests for password resets.
  * Version 4.0.0.
  *
- * See https://laravel.com/docs/5.4/migrations#tables
+ * See https://laravel.com/docs/5.8/migrations#tables
  *
  * @author Alex Weissman (https://alexanderweissman.com)
  */
diff --git a/app/sprinkles/account/src/Database/Migrations/v400/PermissionRolesTable.php b/app/sprinkles/account/src/Database/Migrations/v400/PermissionRolesTable.php
index 895adfe60..4f78b8e49 100644
--- a/app/sprinkles/account/src/Database/Migrations/v400/PermissionRolesTable.php
+++ b/app/sprinkles/account/src/Database/Migrations/v400/PermissionRolesTable.php
@@ -18,7 +18,7 @@
  * Many-to-many mapping between permissions and roles.
  * Version 4.0.0.
  *
- * See https://laravel.com/docs/5.4/migrations#tables
+ * See https://laravel.com/docs/5.8/migrations#tables
  *
  * @author Alex Weissman (https://alexanderweissman.com)
  */
diff --git a/app/sprinkles/account/src/Database/Migrations/v400/PermissionsTable.php b/app/sprinkles/account/src/Database/Migrations/v400/PermissionsTable.php
index f178bf6da..b737d2596 100644
--- a/app/sprinkles/account/src/Database/Migrations/v400/PermissionsTable.php
+++ b/app/sprinkles/account/src/Database/Migrations/v400/PermissionsTable.php
@@ -21,7 +21,7 @@
  * Also, they now map many-to-many to roles.
  * Version 4.0.0.
  *
- * See https://laravel.com/docs/5.4/migrations#tables
+ * See https://laravel.com/docs/5.8/migrations#tables
  *
  * @author Alex Weissman (https://alexanderweissman.com)
  */
diff --git a/app/sprinkles/account/src/Database/Migrations/v400/PersistencesTable.php b/app/sprinkles/account/src/Database/Migrations/v400/PersistencesTable.php
index a0a4e7e3b..39b8a26ce 100644
--- a/app/sprinkles/account/src/Database/Migrations/v400/PersistencesTable.php
+++ b/app/sprinkles/account/src/Database/Migrations/v400/PersistencesTable.php
@@ -18,7 +18,7 @@
  * Many-to-many mapping between roles and users.
  * Version 4.0.0.
  *
- * See https://laravel.com/docs/5.4/migrations#tables
+ * See https://laravel.com/docs/5.8/migrations#tables
  *
  * @author Alex Weissman (https://alexanderweissman.com)
  */
diff --git a/app/sprinkles/account/src/Database/Migrations/v400/RoleUsersTable.php b/app/sprinkles/account/src/Database/Migrations/v400/RoleUsersTable.php
index eef88b5da..187f637b5 100644
--- a/app/sprinkles/account/src/Database/Migrations/v400/RoleUsersTable.php
+++ b/app/sprinkles/account/src/Database/Migrations/v400/RoleUsersTable.php
@@ -18,7 +18,7 @@
  * Many-to-many mapping between roles and users.
  * Version 4.0.0.
  *
- * See https://laravel.com/docs/5.4/migrations#tables
+ * See https://laravel.com/docs/5.8/migrations#tables
  *
  * @author Alex Weissman (https://alexanderweissman.com)
  */
diff --git a/app/sprinkles/account/src/Database/Migrations/v400/RolesTable.php b/app/sprinkles/account/src/Database/Migrations/v400/RolesTable.php
index 11752836c..e0f3d31e5 100644
--- a/app/sprinkles/account/src/Database/Migrations/v400/RolesTable.php
+++ b/app/sprinkles/account/src/Database/Migrations/v400/RolesTable.php
@@ -19,7 +19,7 @@
  * N.B.: Default roles will be added in `DefaultPermissions` seed
  * Version 4.0.0.
  *
- * See https://laravel.com/docs/5.4/migrations#tables
+ * See https://laravel.com/docs/5.8/migrations#tables
  *
  * @author Alex Weissman (https://alexanderweissman.com)
  */
diff --git a/app/sprinkles/account/src/Database/Migrations/v400/UsersTable.php b/app/sprinkles/account/src/Database/Migrations/v400/UsersTable.php
index bf90090e6..fa2f841da 100644
--- a/app/sprinkles/account/src/Database/Migrations/v400/UsersTable.php
+++ b/app/sprinkles/account/src/Database/Migrations/v400/UsersTable.php
@@ -18,7 +18,7 @@
  * Removed the 'display_name', 'title', 'secret_token', and 'flag_password_reset' fields, and added first and last name and 'last_activity_id'.
  * Version 4.0.0.
  *
- * See https://laravel.com/docs/5.4/migrations#tables
+ * See https://laravel.com/docs/5.8/migrations#tables
  *
  * @author Alex Weissman (https://alexanderweissman.com)
  */
diff --git a/app/sprinkles/account/src/Database/Migrations/v400/VerificationsTable.php b/app/sprinkles/account/src/Database/Migrations/v400/VerificationsTable.php
index 784e91e96..207baafb3 100644
--- a/app/sprinkles/account/src/Database/Migrations/v400/VerificationsTable.php
+++ b/app/sprinkles/account/src/Database/Migrations/v400/VerificationsTable.php
@@ -18,7 +18,7 @@
  * Manages requests for email account verification.
  * Version 4.0.0.
  *
- * See https://laravel.com/docs/5.4/migrations#tables
+ * See https://laravel.com/docs/5.8/migrations#tables
  *
  * @author Alex Weissman (https://alexanderweissman.com)
  */
diff --git a/app/sprinkles/account/src/Database/Migrations/v420/AddingForeignKeys.php b/app/sprinkles/account/src/Database/Migrations/v420/AddingForeignKeys.php
index fe46d893f..41ab504b8 100644
--- a/app/sprinkles/account/src/Database/Migrations/v420/AddingForeignKeys.php
+++ b/app/sprinkles/account/src/Database/Migrations/v420/AddingForeignKeys.php
@@ -11,6 +11,7 @@
 namespace UserFrosting\Sprinkle\Account\Database\Migrations\v420;
 
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\SQLiteConnection;
 use UserFrosting\Sprinkle\Core\Database\Migration;
 
 /**
@@ -71,6 +72,15 @@ public function up()
      */
     public function down()
     {
+        /*
+         * sqlite can't drop foreign key wihout dropping the entire table
+         * since Laravel 5.7. Skip drop if an sqlite connection is detected
+         * @see https://github.com/laravel/framework/issues/25475
+         */
+        if ($this->schema->getConnection() instanceof SQLiteConnection) {
+            return;
+        }
+
         foreach ($this->tables as $tableName => $keys) {
             if ($this->schema->hasTable($tableName)) {
                 $this->schema->table($tableName, function (Blueprint $table) use ($keys) {
diff --git a/app/sprinkles/account/src/Database/Models/User.php b/app/sprinkles/account/src/Database/Models/User.php
index 5dac2f86d..dc71c45a8 100644
--- a/app/sprinkles/account/src/Database/Models/User.php
+++ b/app/sprinkles/account/src/Database/Models/User.php
@@ -75,7 +75,7 @@ class User extends Model implements UserInterface
     /**
      * A list of attributes to hide by default when using toArray() and toJson().
      *
-     * @link https://laravel.com/docs/5.4/eloquent-serialization#hiding-attributes-from-json
+     * @link https://laravel.com/docs/5.8/eloquent-serialization#hiding-attributes-from-json
      *
      * @var string[]
      */
diff --git a/app/sprinkles/account/tests/Integration/Controller/AccountControllerTest.php b/app/sprinkles/account/tests/Integration/Controller/AccountControllerTest.php
index 2378407e6..a635f12ad 100644
--- a/app/sprinkles/account/tests/Integration/Controller/AccountControllerTest.php
+++ b/app/sprinkles/account/tests/Integration/Controller/AccountControllerTest.php
@@ -82,7 +82,7 @@ public function testControllerConstructor()
     /**
      * N.B.: Must be first test, before any master user is created
      * @depends testControllerConstructor
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     public function testRegisterWithNoMasterUser(AccountController $controller)
     {
@@ -170,7 +170,7 @@ public function testRegisterWithNoEmailVerification()
     }
 
     /**
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     protected function performActualRegisterTest(AccountController $controller)
     {
@@ -208,15 +208,14 @@ protected function performActualRegisterTest(AccountController $controller)
         $this->assertSame('success', end($messages)['type']);
     }
 
-
     /**
      * @depends testControllerConstructor
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     public function testcheckUsername(AccountController $controller)
     {
         $request = $this->getRequest()->withQueryParams([
-            'user_name' => 'potato'
+            'user_name' => 'potato',
         ]);
 
         $result = $controller->checkUsername($request, $this->getResponse(), []);
@@ -228,7 +227,7 @@ public function testcheckUsername(AccountController $controller)
     /**
      * @depends testControllerConstructor
      * @depends testcheckUsername
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     public function testcheckUsernameWithNoData(AccountController $controller)
     {
@@ -239,17 +238,17 @@ public function testcheckUsernameWithNoData(AccountController $controller)
     /**
      * @depends testControllerConstructor
      * @depends testcheckUsername
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     public function testcheckUsernameWithUsernameNotAvailable(AccountController $controller)
     {
         // Create test user
         $this->createTestUser(false, false, [
-            'user_name' => 'userfoo'
+            'user_name' => 'userfoo',
         ]);
 
         $request = $this->getRequest()->withQueryParams([
-            'user_name' => 'userfoo'
+            'user_name' => 'userfoo',
         ]);
 
         $result = $controller->checkUsername($request, $this->getResponse(), []);
@@ -274,7 +273,7 @@ public function testcheckUsernameWithThrottler()
         $controller = $this->getController();
 
         $request = $this->getRequest()->withQueryParams([
-            'user_name' => 'potato'
+            'user_name' => 'potato',
         ]);
 
         $result = $controller->checkUsername($request, $this->getResponse(), []);
@@ -298,7 +297,7 @@ public function testdenyResetPassword()
         $controller = $this->getController();
 
         $request = $this->getRequest()->withQueryParams([
-            'token' => 'potato'
+            'token' => 'potato',
         ]);
 
         $result = $controller->denyResetPassword($request, $this->getResponse(), []);
@@ -327,7 +326,7 @@ public function testdenyResetPasswordWithFailedPasswordReset()
         $controller = $this->getController();
 
         $request = $this->getRequest()->withQueryParams([
-            'token' => 'potato'
+            'token' => 'potato',
         ]);
 
         $result = $controller->denyResetPassword($request, $this->getResponse(), []);
@@ -344,7 +343,7 @@ public function testdenyResetPasswordWithFailedPasswordReset()
     /**
      * @depends testControllerConstructor
      * @depends testdenyResetPassword
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     public function testdenyResetPasswordWithFailedValidation(AccountController $controller)
     {
@@ -374,7 +373,7 @@ public function testforgotPassword()
 
         // Create fake user to test
         $user = $this->createTestUser(false, false, [
-            'email' => 'foo@bar.com'
+            'email' => 'foo@bar.com',
         ]);
 
         // Recreate controller to use fake mailer
@@ -382,7 +381,7 @@ public function testforgotPassword()
 
         // Set POST
         $request = $this->getRequest()->withParsedBody([
-            'email' => 'foo@bar.com'
+            'email' => 'foo@bar.com',
         ]);
 
         $result = $controller->forgotPassword($request, $this->getResponse(), []);
@@ -400,7 +399,7 @@ public function testforgotPassword()
     /**
      * @depends testControllerConstructor
      * @depends testforgotPassword
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     public function testforgotPasswordWithFailedValidation(AccountController $controller)
     {
@@ -434,7 +433,7 @@ public function testforgotPasswordWithThrottler()
 
         // Set POST
         $request = $this->getRequest()->withParsedBody([
-            'email' => 'foo@bar.com'
+            'email' => 'foo@bar.com',
         ]);
 
         $result = $controller->forgotPassword($request, $this->getResponse(), []);
@@ -446,7 +445,7 @@ public function testforgotPasswordWithThrottler()
 
     /**
      * @depends testControllerConstructor
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     public function testgetModalAccountTos(AccountController $controller)
     {
@@ -458,7 +457,7 @@ public function testgetModalAccountTos(AccountController $controller)
 
     /**
      * @depends testControllerConstructor
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     public function testimageCaptcha(AccountController $controller)
     {
@@ -470,7 +469,7 @@ public function testimageCaptcha(AccountController $controller)
 
     /**
      * @depends testControllerConstructor
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     public function testlogin(AccountController $controller)
     {
@@ -505,7 +504,7 @@ public function testlogin(AccountController $controller)
     /**
      * @depends testControllerConstructor
      * @depends testlogin
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     public function testloginWithEmail(AccountController $controller)
     {
@@ -539,7 +538,7 @@ public function testloginWithEmail(AccountController $controller)
 
     /**
      * @depends testControllerConstructor
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     public function testloginWithLoggedInUser(AccountController $controller)
     {
@@ -563,7 +562,7 @@ public function testloginWithLoggedInUser(AccountController $controller)
 
     /**
      * @depends testControllerConstructor
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     public function testloginWithFailledValidation(AccountController $controller)
     {
@@ -662,7 +661,7 @@ public function testlogoutWithLoggedInUser()
 
     /**
      * @depends testControllerConstructor
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     public function testlogoutWithNoUser(AccountController $controller)
     {
@@ -674,7 +673,7 @@ public function testlogoutWithNoUser(AccountController $controller)
 
     /**
      * @depends testControllerConstructor
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     public function testpageForgotPassword(AccountController $controller)
     {
@@ -686,7 +685,7 @@ public function testpageForgotPassword(AccountController $controller)
 
     /**
      * @depends testControllerConstructor
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     public function testpageRegister(AccountController $controller)
     {
@@ -749,7 +748,7 @@ public function testpageRegisterWithLoggedInUser()
 
     /**
      * @depends testControllerConstructor
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     public function testpageResendVerification(AccountController $controller)
     {
@@ -761,7 +760,7 @@ public function testpageResendVerification(AccountController $controller)
 
     /**
      * @depends testControllerConstructor
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     public function testpageResetPassword(AccountController $controller)
     {
@@ -773,7 +772,7 @@ public function testpageResetPassword(AccountController $controller)
 
     /**
      * @depends testControllerConstructor
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     public function testpageSetPassword(AccountController $controller)
     {
@@ -817,7 +816,7 @@ public function testpageSettingsWithPartialPermissions()
     }
 
     /**
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     protected function actualpageSettings(AccountController $controller)
     {
@@ -829,7 +828,7 @@ protected function actualpageSettings(AccountController $controller)
 
     /**
      * @depends testControllerConstructor
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     public function testpageSettingsWithNoPermissions(AccountController $controller)
     {
@@ -839,7 +838,7 @@ public function testpageSettingsWithNoPermissions(AccountController $controller)
 
     /**
      * @depends testControllerConstructor
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     public function testpageSignIn(AccountController $controller)
     {
@@ -908,8 +907,8 @@ public function testProfileWithPartialPermissions()
     }
 
     /**
-     * @param  AccountController $controller
-     * @param  UserInterface     $user
+     * @param AccountController $controller
+     * @param UserInterface     $user
      */
     protected function performActualProfileTests(AccountController $controller, UserInterface $user)
     {
@@ -941,7 +940,7 @@ protected function performActualProfileTests(AccountController $controller, User
     /**
      * @depends testControllerConstructor
      * @depends testProfile
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     public function testProfileWithNoPermissions(AccountController $controller)
     {
@@ -1035,7 +1034,7 @@ public function testProfileWithInvalidLocale()
 
     /**
      * @depends testControllerConstructor
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     public function testRegisterWithHoneypot(AccountController $controller)
     {
@@ -1045,7 +1044,7 @@ public function testRegisterWithHoneypot(AccountController $controller)
 
     /**
      * @depends testControllerConstructor
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     public function testRegisterWithRegistrationDisabled(AccountController $controller)
     {
@@ -1134,7 +1133,7 @@ public function testRegisterWithFailedThrottle()
     /**
      * @depends testControllerConstructor
      * @depends testRegisterWithFailedThrottle
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     public function testRegisterWithFailedCaptcha(AccountController $controller)
     {
@@ -1163,7 +1162,7 @@ public function testRegisterWithFailedCaptcha(AccountController $controller)
     /**
      * @depends testControllerConstructor
      * @depends testRegisterWithFailedCaptcha
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     public function testRegisterWithFailedValidation(AccountController $controller)
     {
@@ -1202,7 +1201,7 @@ public function testresendVerification()
 
         // Create fake user to test
         $user = $this->createTestUser(false, false, [
-            'flag_verified' => 0
+            'flag_verified' => 0,
         ]);
 
         // Recreate controller to use fake mailer
@@ -1210,7 +1209,7 @@ public function testresendVerification()
 
         // Set POST
         $request = $this->getRequest()->withParsedBody([
-            'email' => $user->email
+            'email' => $user->email,
         ]);
 
         $result = $controller->resendVerification($request, $this->getResponse(), []);
@@ -1233,7 +1232,7 @@ public function testresendVerificationWithVerifiedUser()
     {
         // Create fake user to test
         $user = $this->createTestUser(false, false, [
-            'flag_verified' => 1
+            'flag_verified' => 1,
         ]);
 
         // Recreate controller to use fake mailer
@@ -1241,7 +1240,7 @@ public function testresendVerificationWithVerifiedUser()
 
         // Set POST
         $request = $this->getRequest()->withParsedBody([
-            'email' => $user->email
+            'email' => $user->email,
         ]);
 
         $result = $controller->resendVerification($request, $this->getResponse(), []);
@@ -1272,7 +1271,7 @@ public function testresendVerificationWithFailedThrottle()
 
         // Set POST
         $request = $this->getRequest()->withParsedBody([
-            'email' => 'testresendVerificationWithVerifiedUser@test.com'
+            'email' => 'testresendVerificationWithVerifiedUser@test.com',
         ]);
 
         $result = $controller->resendVerification($request, $this->getResponse(), []);
@@ -1285,7 +1284,7 @@ public function testresendVerificationWithFailedThrottle()
     /**
      * @depends testControllerConstructor
      * @depends testresendVerification
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     public function testresendVerificationWithFailedValidation(AccountController $controller)
     {
@@ -1317,7 +1316,7 @@ public function testSetPassword()
         $request = $this->getRequest()->withParsedBody([
             'password'  => 'testSetPassword',
             'passwordc' => 'testSetPassword',
-            'token'     => $resetModel->getToken()
+            'token'     => $resetModel->getToken(),
         ]);
 
         $result = $controller->setPassword($request, $this->getResponse(), []);
@@ -1335,7 +1334,7 @@ public function testSetPassword()
     /**
      * @depends testControllerConstructor
      * @depends testSetPassword
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     public function testSetPasswordWithNoToken(AccountController $controller)
     {
@@ -1343,7 +1342,7 @@ public function testSetPasswordWithNoToken(AccountController $controller)
         $request = $this->getRequest()->withParsedBody([
             'password'  => 'testSetPassword',
             'passwordc' => 'testSetPassword',
-            'token' => 'potato'
+            'token'     => 'potato',
         ]);
 
         $result = $controller->setPassword($request, $this->getResponse(), []);
@@ -1361,7 +1360,7 @@ public function testSetPasswordWithNoToken(AccountController $controller)
     /**
      * @depends testControllerConstructor
      * @depends testSetPassword
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     public function testsetPasswordWithFailedValidation(AccountController $controller)
     {
@@ -1559,7 +1558,7 @@ public function testSettingsWithEmailInUse()
 
         // Set POST
         $request = $this->getRequest()->withParsedBody([
-            'email' => $firstUser->email,
+            'email'    => $firstUser->email,
             'password' => '',
         ]);
 
@@ -1577,7 +1576,7 @@ public function testSettingsWithEmailInUse()
 
     /**
      * @depends testControllerConstructor
-     * @param  AccountController $controller
+     * @param AccountController $controller
      */
     public function testSuggestUsername(AccountController $controller)
     {
@@ -1609,7 +1608,7 @@ public function testVerify()
         $controller = $this->getController();
 
         $request = $this->getRequest()->withQueryParams([
-            'token' => 'potato'
+            'token' => 'potato',
         ]);
 
         $result = $controller->verify($request, $this->getResponse(), []);
@@ -1638,7 +1637,7 @@ public function testVerifyWithFailedVerification()
         $controller = $this->getController();
 
         $request = $this->getRequest()->withQueryParams([
-            'token' => 'potato'
+            'token' => 'potato',
         ]);
 
         $result = $controller->verify($request, $this->getResponse(), []);
diff --git a/app/sprinkles/admin/tests/Integration/Controller/GroupControllerGuestTest.php b/app/sprinkles/admin/tests/Integration/Controller/GroupControllerGuestTest.php
index d78a3f864..51b39b503 100644
--- a/app/sprinkles/admin/tests/Integration/Controller/GroupControllerGuestTest.php
+++ b/app/sprinkles/admin/tests/Integration/Controller/GroupControllerGuestTest.php
@@ -47,8 +47,7 @@ public function setUp()
             // Setup database, then setup User & default role
             $this->refreshDatabase();
             $this->setupUser();
-
-        } else if (!static::$initialized) {
+        } elseif (!static::$initialized) {
 
             // Only refresh db once
             $this->refreshDatabase();
@@ -56,8 +55,6 @@ public function setUp()
         }
     }
 
-    /**
-     */
     public function testControllerConstructor()
     {
         $controller = $this->getController();
@@ -82,7 +79,7 @@ public function testControllerConstructorWithUser()
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testGetInfo_GuestUser(GroupController $controller)
     {
@@ -93,7 +90,7 @@ public function testGetInfo_GuestUser(GroupController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testGetInfo_ForbiddenException(GroupController $controller)
     {
@@ -108,7 +105,7 @@ public function testGetInfo_ForbiddenException(GroupController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testGetListWithNoPermission(GroupController $controller)
     {
@@ -127,7 +124,7 @@ public function testGetListWithNoPermission(GroupController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testGetUsersWithNoPermission(GroupController $controller)
     {
@@ -150,7 +147,7 @@ public function testGetUsersWithNoPermission(GroupController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testpageInfoWithNoPermission(GroupController $controller)
     {
@@ -173,7 +170,7 @@ public function testpageInfoWithNoPermission(GroupController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testpageInfoWithPartialPermissions(GroupController $controller)
     {
@@ -200,7 +197,7 @@ public function testpageInfoWithPartialPermissions(GroupController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testpageListWithNoPermission(GroupController $controller)
     {
@@ -219,7 +216,7 @@ public function testpageListWithNoPermission(GroupController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testCreateWithNoPermission(GroupController $controller)
     {
@@ -239,7 +236,7 @@ public function testCreateWithNoPermission(GroupController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @todo test individual permission with the delete_group permission too
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testDeleteWithNoPermission(GroupController $controller)
     {
@@ -262,7 +259,7 @@ public function testDeleteWithNoPermission(GroupController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testGetModalConfirmDeleteWithNoPermission(GroupController $controller)
     {
@@ -277,7 +274,7 @@ public function testGetModalConfirmDeleteWithNoPermission(GroupController $contr
         $controller = $this->getController();
 
         $request = $this->getRequest()->withQueryParams([
-            'slug' => $group->slug
+            'slug' => $group->slug,
         ]);
 
         // Set expectations
@@ -289,7 +286,7 @@ public function testGetModalConfirmDeleteWithNoPermission(GroupController $contr
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testGetModalCreateWithNoPermission(GroupController $controller)
     {
@@ -308,7 +305,7 @@ public function testGetModalCreateWithNoPermission(GroupController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testGetModalEditWithNoPermission(GroupController $controller)
     {
@@ -323,7 +320,7 @@ public function testGetModalEditWithNoPermission(GroupController $controller)
         $controller = $this->getController();
 
         $request = $this->getRequest()->withQueryParams([
-            'slug' => $group->slug
+            'slug' => $group->slug,
         ]);
 
         // Set expectations
@@ -335,7 +332,7 @@ public function testGetModalEditWithNoPermission(GroupController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testUpdateInfoWithNoPermission(GroupController $controller)
     {
@@ -353,7 +350,7 @@ public function testUpdateInfoWithNoPermission(GroupController $controller)
         $data = [
             'name' => 'foo',
             'slug' => 'foo',
-            'icon' => 'foo'
+            'icon' => 'foo',
         ];
         $request = $this->getRequest()->withParsedBody($data);
 
@@ -366,7 +363,7 @@ public function testUpdateInfoWithNoPermission(GroupController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testUpdateInfoWithNoGroup(GroupController $controller)
     {
@@ -383,7 +380,6 @@ public function testUpdateInfoWithNoGroup(GroupController $controller)
         $controller->updateInfo($this->getRequest(), $this->getResponse(), ['slug' => 'blah']);
     }
 
-
     /**
      * @return GroupController
      */
@@ -392,8 +388,6 @@ private function getController()
         return new GroupController($this->ci);
     }
 
-    /**
-     */
     private function setupUser()
     {
         // Guest user, won't have any access
@@ -403,7 +397,7 @@ private function setupUser()
         $fm = $this->ci->factory;
         $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group', [
             'slug' => 'foo',
-            'name' => 'bar'
+            'name' => 'bar',
         ]);
     }
 }
diff --git a/app/sprinkles/admin/tests/Integration/Controller/GroupControllerTest.php b/app/sprinkles/admin/tests/Integration/Controller/GroupControllerTest.php
index 3df60928e..0faf9cb30 100644
--- a/app/sprinkles/admin/tests/Integration/Controller/GroupControllerTest.php
+++ b/app/sprinkles/admin/tests/Integration/Controller/GroupControllerTest.php
@@ -49,8 +49,7 @@ public function setUp()
             // Setup database, then setup User & default role
             $this->refreshDatabase();
             $this->setupUser();
-
-        } else if (!static::$initialized) {
+        } elseif (!static::$initialized) {
 
             // Only refresh db once
             $this->refreshDatabase();
@@ -58,8 +57,6 @@ public function setUp()
         }
     }
 
-    /**
-     */
     public function testControllerConstructor()
     {
         $controller = $this->getController();
@@ -84,7 +81,7 @@ public function testControllerConstructorWithUser()
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testGetInfoWithNotFoundException(GroupController $controller)
     {
@@ -94,7 +91,7 @@ public function testGetInfoWithNotFoundException(GroupController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testGetInfo(GroupController $controller)
     {
@@ -107,7 +104,7 @@ public function testGetInfo(GroupController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testGetList(GroupController $controller)
     {
@@ -119,7 +116,7 @@ public function testGetList(GroupController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testGetUsersWithBadSlug(GroupController $controller)
     {
@@ -129,7 +126,7 @@ public function testGetUsersWithBadSlug(GroupController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testGetUsersWithNoSlug(GroupController $controller)
     {
@@ -139,7 +136,7 @@ public function testGetUsersWithNoSlug(GroupController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testGetUsers(GroupController $controller)
     {
@@ -151,7 +148,7 @@ public function testGetUsers(GroupController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testpageInfo(GroupController $controller)
     {
@@ -162,7 +159,7 @@ public function testpageInfo(GroupController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testpageInfoWithBadSlug(GroupController $controller)
     {
@@ -172,7 +169,7 @@ public function testpageInfoWithBadSlug(GroupController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testpageList(GroupController $controller)
     {
@@ -183,7 +180,7 @@ public function testpageList(GroupController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testCreate(GroupController $controller)
     {
@@ -191,7 +188,7 @@ public function testCreate(GroupController $controller)
         $data = [
             'name' => 'foo',
             'slug' => 'bar',
-            'icon' => 'icon'
+            'icon' => 'icon',
         ];
         $request = $this->getRequest()->withParsedBody($data);
 
@@ -215,7 +212,7 @@ public function testCreate(GroupController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testCreate
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testCreateWithMissingName(GroupController $controller)
     {
@@ -223,7 +220,7 @@ public function testCreateWithMissingName(GroupController $controller)
         $data = [
             'name' => '',
             'slug' => 'missingName',
-            'icon' => 'foo'
+            'icon' => 'foo',
         ];
         $request = $this->getRequest()->withParsedBody($data);
 
@@ -247,7 +244,7 @@ public function testCreateWithMissingName(GroupController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testCreate
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testCreateWithDuplicateSlug(GroupController $controller)
     {
@@ -255,7 +252,7 @@ public function testCreateWithDuplicateSlug(GroupController $controller)
         $data = [
             'name' => 'bar',
             'slug' => 'foo',
-            'icon' => 'foo'
+            'icon' => 'foo',
         ];
         $request = $this->getRequest()->withParsedBody($data);
 
@@ -275,7 +272,7 @@ public function testCreateWithDuplicateSlug(GroupController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testCreate
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testCreateWithDuplicateName(GroupController $controller)
     {
@@ -283,7 +280,7 @@ public function testCreateWithDuplicateName(GroupController $controller)
         $data = [
             'name' => 'bar',
             'slug' => 'duplicateName',
-            'icon' => 'foo'
+            'icon' => 'foo',
         ];
         $request = $this->getRequest()->withParsedBody($data);
 
@@ -306,7 +303,7 @@ public function testCreateWithDuplicateName(GroupController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testDelete(GroupController $controller)
     {
@@ -333,7 +330,7 @@ public function testDelete(GroupController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testDelete
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testDeleteWithNotExistingGroup(GroupController $controller)
     {
@@ -344,7 +341,7 @@ public function testDeleteWithNotExistingGroup(GroupController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testDelete
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testDeleteWithDefaultGroup(GroupController $controller)
     {
@@ -372,7 +369,7 @@ public function testDeleteWithDefaultGroup(GroupController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testDeleteWithDefaultGroup
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testDeleteWithUserInGroup(GroupController $controller)
     {
@@ -393,12 +390,12 @@ public function testDeleteWithUserInGroup(GroupController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testDeleteWithUserInGroup
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testGetModalConfirmDelete(GroupController $controller)
     {
         $request = $this->getRequest()->withQueryParams([
-            'slug' => 'foo'
+            'slug' => 'foo',
         ]);
 
         // Get controller stuff
@@ -410,7 +407,7 @@ public function testGetModalConfirmDelete(GroupController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testGetModalConfirmDelete
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testGetModalConfirmDeleteWithNoGetData(GroupController $controller)
     {
@@ -421,12 +418,12 @@ public function testGetModalConfirmDeleteWithNoGetData(GroupController $controll
     /**
      * @depends testControllerConstructorWithUser
      * @depends testGetModalConfirmDelete
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testGetModalConfirmDeleteWithNonExistingGroup(GroupController $controller)
     {
         $request = $this->getRequest()->withQueryParams([
-            'slug' => 'foobar'
+            'slug' => 'foobar',
         ]);
 
         $this->expectException(NotFoundException::class);
@@ -436,7 +433,7 @@ public function testGetModalConfirmDeleteWithNonExistingGroup(GroupController $c
     /**
      * @depends testControllerConstructorWithUser
      * @depends testGetModalConfirmDelete
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testGetModalConfirmDeleteWithUserInGroup(GroupController $controller)
     {
@@ -451,7 +448,7 @@ public function testGetModalConfirmDeleteWithUserInGroup(GroupController $contro
         $testUser->save();
 
         $request = $this->getRequest()->withQueryParams([
-            'slug' => $group->slug
+            'slug' => $group->slug,
         ]);
 
         $this->expectException(BadRequestException::class);
@@ -460,7 +457,7 @@ public function testGetModalConfirmDeleteWithUserInGroup(GroupController $contro
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testGetModalCreate(GroupController $controller)
     {
@@ -471,12 +468,12 @@ public function testGetModalCreate(GroupController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testGetModalEdit(GroupController $controller)
     {
         $request = $this->getRequest()->withQueryParams([
-            'slug' => 'foo'
+            'slug' => 'foo',
         ]);
 
         // Get controller stuff
@@ -488,7 +485,7 @@ public function testGetModalEdit(GroupController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testGetModalEdit
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testGetModalEditWithNoGetData(GroupController $controller)
     {
@@ -499,12 +496,12 @@ public function testGetModalEditWithNoGetData(GroupController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testGetModalEdit
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testGetModalEditWithNonExistingGroup(GroupController $controller)
     {
         $request = $this->getRequest()->withQueryParams([
-            'slug' => 'foobar'
+            'slug' => 'foobar',
         ]);
 
         $this->expectException(NotFoundException::class);
@@ -513,7 +510,7 @@ public function testGetModalEditWithNonExistingGroup(GroupController $controller
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testUpdateInfo(GroupController $controller)
     {
@@ -528,7 +525,7 @@ public function testUpdateInfo(GroupController $controller)
         $data = [
             'name' => 'barbarbar',
             'slug' => 'foofoo',
-            'icon' => 'icon'
+            'icon' => 'icon',
         ];
         $request = $this->getRequest()->withParsedBody($data);
 
@@ -554,7 +551,7 @@ public function testUpdateInfo(GroupController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testUpdateInfo
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testUpdateInfoWithMissingName(GroupController $controller)
     {
@@ -562,7 +559,7 @@ public function testUpdateInfoWithMissingName(GroupController $controller)
         $data = [
             'name' => '',
             'slug' => 'foo',
-            'icon' => 'foo'
+            'icon' => 'foo',
         ];
         $request = $this->getRequest()->withParsedBody($data);
 
@@ -586,7 +583,7 @@ public function testUpdateInfoWithMissingName(GroupController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testUpdateInfo
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testUpdateInfoWithMissingSlug(GroupController $controller)
     {
@@ -594,7 +591,7 @@ public function testUpdateInfoWithMissingSlug(GroupController $controller)
         $data = [
             'name' => 'bar',
             'slug' => '',
-            'icon' => 'foo'
+            'icon' => 'foo',
         ];
         $request = $this->getRequest()->withParsedBody($data);
 
@@ -618,7 +615,7 @@ public function testUpdateInfoWithMissingSlug(GroupController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testUpdateInfo
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testUpdateInfoWithDuplicateSlug(GroupController $controller)
     {
@@ -628,7 +625,7 @@ public function testUpdateInfoWithDuplicateSlug(GroupController $controller)
 
         // Set post data
         $data = [
-            'slug' => $group2->slug
+            'slug' => $group2->slug,
         ];
         $request = $this->getRequest()->withParsedBody($data);
 
@@ -648,7 +645,7 @@ public function testUpdateInfoWithDuplicateSlug(GroupController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testUpdateInfo
-     * @param  GroupController $controller
+     * @param GroupController $controller
      */
     public function testUpdateInfoWithDuplicateName(GroupController $controller)
     {
@@ -658,7 +655,7 @@ public function testUpdateInfoWithDuplicateName(GroupController $controller)
 
         // Set post data
         $data = [
-            'name' => $group2->name
+            'name' => $group2->name,
         ];
         $request = $this->getRequest()->withParsedBody($data);
 
@@ -675,7 +672,6 @@ public function testUpdateInfoWithDuplicateName(GroupController $controller)
         $this->assertSame('danger', end($messages)['type']);
     }
 
-
     /**
      * @return GroupController
      */
@@ -684,8 +680,6 @@ private function getController()
         return new GroupController($this->ci);
     }
 
-    /**
-     */
     private function setupUser()
     {
         // Admin user, WILL have access
@@ -695,7 +689,7 @@ private function setupUser()
         $fm = $this->ci->factory;
         $role = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group', [
             'slug' => 'foo',
-            'name' => 'bar'
+            'name' => 'bar',
         ]);
     }
 }
diff --git a/app/sprinkles/admin/tests/Integration/Controller/PermissionControllerGuestTest.php b/app/sprinkles/admin/tests/Integration/Controller/PermissionControllerGuestTest.php
index 4fc5ba67a..2e674fd22 100644
--- a/app/sprinkles/admin/tests/Integration/Controller/PermissionControllerGuestTest.php
+++ b/app/sprinkles/admin/tests/Integration/Controller/PermissionControllerGuestTest.php
@@ -16,7 +16,6 @@
 use UserFrosting\Sprinkle\Core\Tests\TestDatabase;
 use UserFrosting\Sprinkle\Core\Tests\withController;
 use UserFrosting\Support\Exception\ForbiddenException;
-use UserFrosting\Support\Exception\NotFoundException;
 use UserFrosting\Tests\TestCase;
 
 /**
@@ -47,8 +46,7 @@ public function setUp()
             // Setup database, then setup User & default role
             $this->refreshDatabase();
             $this->setupUser();
-
-        } else if (!static::$initialized) {
+        } elseif (!static::$initialized) {
 
             // Only refresh db once
             $this->refreshDatabase();
@@ -56,8 +54,6 @@ public function setUp()
         }
     }
 
-    /**
-     */
     public function testControllerConstructor()
     {
         $controller = $this->getController();
@@ -93,7 +89,7 @@ public function testGetInfo_GuestUser()
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  PermissionController $controller
+     * @param PermissionController $controller
      */
     public function testGetInfo_ForbiddenException(PermissionController $controller)
     {
@@ -103,7 +99,7 @@ public function testGetInfo_ForbiddenException(PermissionController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  PermissionController $controller
+     * @param PermissionController $controller
      */
     public function testGetListWithNoPermission(PermissionController $controller)
     {
@@ -113,7 +109,7 @@ public function testGetListWithNoPermission(PermissionController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  PermissionController $controller
+     * @param PermissionController $controller
      */
     public function testGetUsersWithNoPermission(PermissionController $controller)
     {
@@ -123,7 +119,7 @@ public function testGetUsersWithNoPermission(PermissionController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  PermissionController $controller
+     * @param PermissionController $controller
      */
     public function testpageInfoWithNoPermission(PermissionController $controller)
     {
@@ -133,7 +129,7 @@ public function testpageInfoWithNoPermission(PermissionController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  PermissionController $controller
+     * @param PermissionController $controller
      */
     public function testpageListWithNoPermission(PermissionController $controller)
     {
@@ -149,8 +145,6 @@ private function getController()
         return new PermissionController($this->ci);
     }
 
-    /**
-     */
     private function setupUser()
     {
         $this->createTestUser(false, true);
diff --git a/app/sprinkles/admin/tests/Integration/Controller/PermissionControllerTest.php b/app/sprinkles/admin/tests/Integration/Controller/PermissionControllerTest.php
index 5ad53fc94..eafd72863 100644
--- a/app/sprinkles/admin/tests/Integration/Controller/PermissionControllerTest.php
+++ b/app/sprinkles/admin/tests/Integration/Controller/PermissionControllerTest.php
@@ -49,8 +49,7 @@ public function setUp()
             // Setup database, then setup User & default role
             $this->refreshDatabase();
             $this->setupUser();
-
-        } else if (!static::$initialized) {
+        } elseif (!static::$initialized) {
 
             // Only refresh db once
             $this->refreshDatabase();
@@ -58,8 +57,6 @@ public function setUp()
         }
     }
 
-    /**
-     */
     public function testControllerConstructor()
     {
         $controller = $this->getController();
@@ -85,7 +82,7 @@ public function testControllerConstructorWithUser()
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  PermissionController $controller
+     * @param PermissionController $controller
      */
     public function testGetInfoWithNotFoundException(PermissionController $controller)
     {
@@ -95,7 +92,7 @@ public function testGetInfoWithNotFoundException(PermissionController $controlle
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  PermissionController $controller
+     * @param PermissionController $controller
      */
     public function testGetInfo(PermissionController $controller)
     {
@@ -108,7 +105,7 @@ public function testGetInfo(PermissionController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  PermissionController $controller
+     * @param PermissionController $controller
      */
     public function testGetList(PermissionController $controller)
     {
@@ -120,7 +117,7 @@ public function testGetList(PermissionController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  PermissionController $controller
+     * @param PermissionController $controller
      */
     public function testGetUsers(PermissionController $controller)
     {
@@ -132,7 +129,7 @@ public function testGetUsers(PermissionController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  PermissionController $controller
+     * @param PermissionController $controller
      */
     public function testpageInfo(PermissionController $controller)
     {
@@ -143,7 +140,7 @@ public function testpageInfo(PermissionController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  PermissionController $controller
+     * @param PermissionController $controller
      */
     public function testpageInfoWithNotFoundPermission(PermissionController $controller)
     {
@@ -153,7 +150,7 @@ public function testpageInfoWithNotFoundPermission(PermissionController $control
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  PermissionController $controller
+     * @param PermissionController $controller
      */
     public function testpageList(PermissionController $controller)
     {
@@ -170,8 +167,6 @@ private function getController()
         return new PermissionController($this->ci);
     }
 
-    /**
-     */
     private function setupUser()
     {
         // Admin user, WILL have access
@@ -181,7 +176,7 @@ private function setupUser()
         $fm = $this->ci->factory;
         $permission = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Permission', [
             'slug' => 'foo',
-            'name' => 'bar'
+            'name' => 'bar',
         ]);
 
         self::$permissionID = $permission->id;
diff --git a/app/sprinkles/admin/tests/Integration/Controller/RoleControllerGuestTest.php b/app/sprinkles/admin/tests/Integration/Controller/RoleControllerGuestTest.php
index d4e34e914..c87a75940 100644
--- a/app/sprinkles/admin/tests/Integration/Controller/RoleControllerGuestTest.php
+++ b/app/sprinkles/admin/tests/Integration/Controller/RoleControllerGuestTest.php
@@ -47,8 +47,7 @@ public function setUp()
             // Setup database, then setup User & default role
             $this->refreshDatabase();
             $this->setupUser();
-
-        } else if (!static::$initialized) {
+        } elseif (!static::$initialized) {
 
             // Only refresh db once
             $this->refreshDatabase();
@@ -56,8 +55,6 @@ public function setUp()
         }
     }
 
-    /**
-     */
     public function testControllerConstructor()
     {
         $controller = $this->getController();
@@ -83,7 +80,7 @@ public function testControllerConstructorWithUser()
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testCreateWithNoPermission(RoleController $controller)
     {
@@ -94,7 +91,7 @@ public function testCreateWithNoPermission(RoleController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @todo test individual permissions too
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testDeleteWithNoPermission(RoleController $controller)
     {
@@ -107,7 +104,7 @@ public function testDeleteWithNoPermission(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testGetInfoWithGuestUser(RoleController $controller)
     {
@@ -117,7 +114,7 @@ public function testGetInfoWithGuestUser(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testGetListWithNoPermission(RoleController $controller)
     {
@@ -127,12 +124,12 @@ public function testGetListWithNoPermission(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testGetModalConfirmDeleteWithNoPermission(RoleController $controller)
     {
         $request = $this->getRequest()->withQueryParams([
-            'slug' => 'foo'
+            'slug' => 'foo',
         ]);
 
         $this->expectException(ForbiddenException::class);
@@ -141,7 +138,7 @@ public function testGetModalConfirmDeleteWithNoPermission(RoleController $contro
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testGetModalCreateWithNoPermission(RoleController $controller)
     {
@@ -151,12 +148,12 @@ public function testGetModalCreateWithNoPermission(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testGetModalEditWithNoPermission(RoleController $controller)
     {
         $request = $this->getRequest()->withQueryParams([
-            'slug' => 'foo'
+            'slug' => 'foo',
         ]);
 
         $this->expectException(ForbiddenException::class);
@@ -165,12 +162,12 @@ public function testGetModalEditWithNoPermission(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testGetModalEditPermissionsWithNoPermission(RoleController $controller)
     {
         $request = $this->getRequest()->withQueryParams([
-            'slug' => 'foo'
+            'slug' => 'foo',
         ]);
 
         $this->expectException(ForbiddenException::class);
@@ -179,7 +176,7 @@ public function testGetModalEditPermissionsWithNoPermission(RoleController $cont
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testGetPermissionsWithNoPermission(RoleController $controller)
     {
@@ -189,7 +186,7 @@ public function testGetPermissionsWithNoPermission(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testUpdateFieldWithNoPermission(RoleController $controller)
     {
@@ -199,7 +196,7 @@ public function testUpdateFieldWithNoPermission(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testGetUsersWithNoPermission(RoleController $controller)
     {
@@ -209,7 +206,7 @@ public function testGetUsersWithNoPermission(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testpageInfoWithNoPermission(RoleController $controller)
     {
@@ -219,7 +216,7 @@ public function testpageInfoWithNoPermission(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testpageInfoWithPartialPermissions(RoleController $controller)
     {
@@ -240,7 +237,7 @@ public function testpageInfoWithPartialPermissions(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testpageListWithNoPermission(RoleController $controller)
     {
@@ -250,14 +247,14 @@ public function testpageListWithNoPermission(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testUpdateInfoWithNoPermission(RoleController $controller)
     {
         // Set post data
         $data = [
             'name' => 'foo',
-            'slug' => 'foo'
+            'slug' => 'foo',
         ];
         $request = $this->getRequest()->withParsedBody($data);
 
@@ -270,7 +267,7 @@ public function testUpdateInfoWithNoPermission(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testUpdateInfoWithNoRole(RoleController $controller)
     {
@@ -286,8 +283,6 @@ private function getController()
         return new RoleController($this->ci);
     }
 
-    /**
-     */
     private function setupUser()
     {
         // Guest user, won't have any access
@@ -297,7 +292,7 @@ private function setupUser()
         $fm = $this->ci->factory;
         $role = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Role', [
             'slug' => 'foo',
-            'name' => 'bar'
+            'name' => 'bar',
         ]);
     }
 }
diff --git a/app/sprinkles/admin/tests/Integration/Controller/RoleControllerTest.php b/app/sprinkles/admin/tests/Integration/Controller/RoleControllerTest.php
index e8c0bb293..eebcd1a0c 100644
--- a/app/sprinkles/admin/tests/Integration/Controller/RoleControllerTest.php
+++ b/app/sprinkles/admin/tests/Integration/Controller/RoleControllerTest.php
@@ -50,8 +50,7 @@ public function setUp()
             // Setup database, then setup User & default role
             $this->refreshDatabase();
             $this->setupUser();
-
-        } else if (!static::$initialized) {
+        } elseif (!static::$initialized) {
 
             // Only refresh db once
             $this->refreshDatabase();
@@ -59,8 +58,6 @@ public function setUp()
         }
     }
 
-    /**
-     */
     public function testControllerConstructor()
     {
         $controller = $this->getController();
@@ -86,14 +83,14 @@ public function testControllerConstructorWithUser()
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testCreate(RoleController $controller)
     {
         // Set post data
         $data = [
             'name' => 'foo',
-            'slug' => 'bar'
+            'slug' => 'bar',
         ];
         $request = $this->getRequest()->withParsedBody($data);
 
@@ -116,14 +113,14 @@ public function testCreate(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testCreateWithMissingName(RoleController $controller)
     {
         // Set post data
         $data = [
             'name' => '',
-            'slug' => 'foo'
+            'slug' => 'foo',
         ];
         $request = $this->getRequest()->withParsedBody($data);
 
@@ -142,14 +139,14 @@ public function testCreateWithMissingName(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testCreateWithDuplicateSlug(RoleController $controller)
     {
         // Set post data. Foo has already been set by testCreate
         $data = [
             'name' => 'bar',
-            'slug' => 'foo'
+            'slug' => 'foo',
         ];
         $request = $this->getRequest()->withParsedBody($data);
 
@@ -168,14 +165,14 @@ public function testCreateWithDuplicateSlug(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testCreateWithDuplicateName(RoleController $controller)
     {
         // Set post data. Bar has already been set by testCreate
         $data = [
             'name' => 'bar',
-            'slug' => 'foo'
+            'slug' => 'foo',
         ];
         $request = $this->getRequest()->withParsedBody($data);
 
@@ -194,7 +191,7 @@ public function testCreateWithDuplicateName(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testDelete(RoleController $controller)
     {
@@ -221,7 +218,7 @@ public function testDelete(RoleController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testDelete
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testDeleteWithNotExistingRole(RoleController $controller)
     {
@@ -235,7 +232,7 @@ public function testDeleteWithNotExistingRole(RoleController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testDelete
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testDeleteWithDefaultRole(RoleController $controller)
     {
@@ -249,7 +246,7 @@ public function testDeleteWithDefaultRole(RoleController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testDelete
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testDeleteWithUserInRole(RoleController $controller)
     {
@@ -269,7 +266,7 @@ public function testDeleteWithUserInRole(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testGetInfoWithNotFoundException(RoleController $controller)
     {
@@ -279,7 +276,7 @@ public function testGetInfoWithNotFoundException(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testGetInfo(RoleController $controller)
     {
@@ -292,7 +289,7 @@ public function testGetInfo(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testGetList(RoleController $controller)
     {
@@ -304,12 +301,12 @@ public function testGetList(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testGetModalConfirmDelete(RoleController $controller)
     {
         $request = $this->getRequest()->withQueryParams([
-            'slug' => 'foo'
+            'slug' => 'foo',
         ]);
 
         // Get controller stuff
@@ -321,7 +318,7 @@ public function testGetModalConfirmDelete(RoleController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testGetModalConfirmDelete
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testGetModalConfirmDeleteWithNoGetData(RoleController $controller)
     {
@@ -332,12 +329,12 @@ public function testGetModalConfirmDeleteWithNoGetData(RoleController $controlle
     /**
      * @depends testControllerConstructorWithUser
      * @depends testGetModalConfirmDelete
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testGetModalConfirmDeleteWithNonExistingRole(RoleController $controller)
     {
         $request = $this->getRequest()->withQueryParams([
-            'slug' => 'foobar'
+            'slug' => 'foobar',
         ]);
 
         $this->expectException(NotFoundException::class);
@@ -347,7 +344,7 @@ public function testGetModalConfirmDeleteWithNonExistingRole(RoleController $con
     /**
      * @depends testControllerConstructorWithUser
      * @depends testGetModalConfirmDelete
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testGetModalConfirmDeleteWithUserInRole(RoleController $controller)
     {
@@ -362,7 +359,7 @@ public function testGetModalConfirmDeleteWithUserInRole(RoleController $controll
         $testUser->save();
 
         $request = $this->getRequest()->withQueryParams([
-            'slug' => $role->slug
+            'slug' => $role->slug,
         ]);
 
         $this->expectException(BadRequestException::class);
@@ -372,7 +369,7 @@ public function testGetModalConfirmDeleteWithUserInRole(RoleController $controll
     /**
      * @depends testControllerConstructorWithUser
      * @depends testGetModalConfirmDelete
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testGetModalConfirmDeleteWithDefaultRole(RoleController $controller)
     {
@@ -380,7 +377,7 @@ public function testGetModalConfirmDeleteWithDefaultRole(RoleController $control
         $this->ci->config['site.registration.user_defaults.roles'] = ['foo' => true];
 
         $request = $this->getRequest()->withQueryParams([
-            'slug' => 'foo'
+            'slug' => 'foo',
         ]);
 
         // Set expectations
@@ -392,7 +389,7 @@ public function testGetModalConfirmDeleteWithDefaultRole(RoleController $control
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testGetModalCreate(RoleController $controller)
     {
@@ -403,12 +400,12 @@ public function testGetModalCreate(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testGetModalEdit(RoleController $controller)
     {
         $request = $this->getRequest()->withQueryParams([
-            'slug' => 'foo'
+            'slug' => 'foo',
         ]);
 
         // Get controller stuff
@@ -420,7 +417,7 @@ public function testGetModalEdit(RoleController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testGetModalEdit
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testGetModalEditWithNoGetData(RoleController $controller)
     {
@@ -431,12 +428,12 @@ public function testGetModalEditWithNoGetData(RoleController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testGetModalEdit
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testGetModalEditWithNonExistingRole(RoleController $controller)
     {
         $request = $this->getRequest()->withQueryParams([
-            'slug' => 'foobar'
+            'slug' => 'foobar',
         ]);
 
         $this->expectException(NotFoundException::class);
@@ -445,7 +442,7 @@ public function testGetModalEditWithNonExistingRole(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testGetUsersWithBadSlug(RoleController $controller)
     {
@@ -455,7 +452,7 @@ public function testGetUsersWithBadSlug(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testGetUsersWithNoSlug(RoleController $controller)
     {
@@ -465,7 +462,7 @@ public function testGetUsersWithNoSlug(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testGetUsers(RoleController $controller)
     {
@@ -477,7 +474,7 @@ public function testGetUsers(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testpageInfo(RoleController $controller)
     {
@@ -488,7 +485,7 @@ public function testpageInfo(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testpageInfoWithBadSlug(RoleController $controller)
     {
@@ -498,7 +495,7 @@ public function testpageInfoWithBadSlug(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testpageList(RoleController $controller)
     {
@@ -509,7 +506,7 @@ public function testpageList(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testUpdateInfo(RoleController $controller)
     {
@@ -523,7 +520,7 @@ public function testUpdateInfo(RoleController $controller)
         // Set post data
         $data = [
             'name' => 'foofoo',
-            'slug' => 'foofoo'
+            'slug' => 'foofoo',
         ];
         $request = $this->getRequest()->withParsedBody($data);
 
@@ -549,14 +546,14 @@ public function testUpdateInfo(RoleController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testUpdateInfo
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testUpdateInfoWithMissingName(RoleController $controller)
     {
         // Set post data
         $data = [
             'name' => '',
-            'slug' => 'foo'
+            'slug' => 'foo',
         ];
         $request = $this->getRequest()->withParsedBody($data);
 
@@ -580,14 +577,14 @@ public function testUpdateInfoWithMissingName(RoleController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testUpdateInfo
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testUpdateInfoWithMissingSlug(RoleController $controller)
     {
         // Set post data
         $data = [
             'name' => 'bar',
-            'slug' => ''
+            'slug' => '',
         ];
         $request = $this->getRequest()->withParsedBody($data);
 
@@ -611,7 +608,7 @@ public function testUpdateInfoWithMissingSlug(RoleController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testUpdateInfo
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testUpdateInfoWithDuplicateSlug(RoleController $controller)
     {
@@ -621,7 +618,7 @@ public function testUpdateInfoWithDuplicateSlug(RoleController $controller)
 
         // Set post data
         $data = [
-            'slug' => $role2->slug
+            'slug' => $role2->slug,
         ];
         $request = $this->getRequest()->withParsedBody($data);
 
@@ -641,7 +638,7 @@ public function testUpdateInfoWithDuplicateSlug(RoleController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testUpdateInfo
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testUpdateInfoWithDuplicateName(RoleController $controller)
     {
@@ -670,12 +667,12 @@ public function testUpdateInfoWithDuplicateName(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testGetModalEditPermissions(RoleController $controller)
     {
         $request = $this->getRequest()->withQueryParams([
-            'slug' => 'foo'
+            'slug' => 'foo',
         ]);
 
         // Get controller stuff
@@ -687,7 +684,7 @@ public function testGetModalEditPermissions(RoleController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testGetModalEditPermissions
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testGetModalEditPermissionsWithNoGetData(RoleController $controller)
     {
@@ -698,12 +695,12 @@ public function testGetModalEditPermissionsWithNoGetData(RoleController $control
     /**
      * @depends testControllerConstructorWithUser
      * @depends testGetModalEditPermissions
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testGetModalEditPermissionsWithNonExistingRole(RoleController $controller)
     {
         $request = $this->getRequest()->withQueryParams([
-            'slug' => 'foobar'
+            'slug' => 'foobar',
         ]);
 
         $this->expectException(NotFoundException::class);
@@ -712,7 +709,7 @@ public function testGetModalEditPermissionsWithNonExistingRole(RoleController $c
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testGetPermissions(RoleController $controller)
     {
@@ -725,7 +722,7 @@ public function testGetPermissions(RoleController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testGetPermissions
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testGetPermissionsWithNoArgs(RoleController $controller)
     {
@@ -736,7 +733,7 @@ public function testGetPermissionsWithNoArgs(RoleController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testGetPermissions
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testGetPermissionsWithNonExistingRole(RoleController $controller)
     {
@@ -746,7 +743,7 @@ public function testGetPermissionsWithNonExistingRole(RoleController $controller
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testupdateField(RoleController $controller)
     {
@@ -759,7 +756,7 @@ public function testupdateField(RoleController $controller)
 
         // Set post data
         $data = [
-            'value' => 'foo123'
+            'value' => 'foo123',
         ];
         $request = $this->getRequest()->withParsedBody($data);
 
@@ -784,7 +781,7 @@ public function testupdateField(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testupdateFieldWithNonExistingRole(RoleController $controller)
     {
@@ -794,7 +791,7 @@ public function testupdateFieldWithNonExistingRole(RoleController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testupdateFieldNoValue(RoleController $controller)
     {
@@ -805,7 +802,7 @@ public function testupdateFieldNoValue(RoleController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testupdateField
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testupdateFieldWithFailedValidation(RoleController $controller)
     {
@@ -815,7 +812,7 @@ public function testupdateFieldWithFailedValidation(RoleController $controller)
 
         // Set post data
         $data = [
-            'value' => $value
+            'value' => $value,
         ];
         $request = $this->getRequest()->withParsedBody($data);
 
@@ -827,7 +824,7 @@ public function testupdateFieldWithFailedValidation(RoleController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testupdateField
-     * @param  RoleController $controller
+     * @param RoleController $controller
      */
     public function testupdateFieldWithPermissionField(RoleController $controller)
     {
@@ -841,7 +838,7 @@ public function testupdateFieldWithPermissionField(RoleController $controller)
 
         // Set post data
         $data = [
-            'value' => [['permission_id' => $permission->id]]
+            'value' => [['permission_id' => $permission->id]],
         ];
         $request = $this->getRequest()->withParsedBody($data);
 
@@ -866,7 +863,6 @@ public function testupdateFieldWithPermissionField(RoleController $controller)
         $this->assertSame('success', end($messages)['type']);
     }
 
-
     /**
      * @return RoleController
      */
@@ -875,8 +871,6 @@ private function getController()
         return new RoleController($this->ci);
     }
 
-    /**
-     */
     private function setupUser()
     {
         // Admin user, WILL have access
@@ -886,7 +880,7 @@ private function setupUser()
         $fm = $this->ci->factory;
         $role = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Role', [
             'slug' => 'foo',
-            'name' => 'bar'
+            'name' => 'bar',
         ]);
     }
 }
diff --git a/app/sprinkles/admin/tests/Integration/Controller/UserControllerCreateTest.php b/app/sprinkles/admin/tests/Integration/Controller/UserControllerCreateTest.php
index def451864..36608ea85 100644
--- a/app/sprinkles/admin/tests/Integration/Controller/UserControllerCreateTest.php
+++ b/app/sprinkles/admin/tests/Integration/Controller/UserControllerCreateTest.php
@@ -11,7 +11,6 @@
 namespace UserFrosting\Sprinkle\Admin\Tests\Integration\Controller;
 
 use Mockery as m;
-use League\FactoryMuffin\Faker\Facade as Faker;
 use UserFrosting\Sprinkle\Account\Database\Models\User;
 use UserFrosting\Sprinkle\Account\Tests\withTestUser;
 use UserFrosting\Sprinkle\Admin\Controller\UserController;
@@ -20,8 +19,6 @@
 use UserFrosting\Sprinkle\Core\Tests\RefreshDatabase;
 use UserFrosting\Sprinkle\Core\Tests\TestDatabase;
 use UserFrosting\Sprinkle\Core\Tests\withController;
-use UserFrosting\Support\Exception\BadRequestException;
-use UserFrosting\Support\Exception\NotFoundException;
 use UserFrosting\Tests\TestCase;
 
 /**
@@ -52,8 +49,6 @@ public function tearDown()
         m::close();
     }
 
-    /**
-     */
     public function testCreate()
     {
         $fm = $this->ci->factory;
@@ -83,7 +78,7 @@ public function testCreate()
             'first_name' => 'foo name',
             'last_name'  => 'foo last',
             'email'      => 'foo@bar.com',
-            'group_id'   => $group->id
+            'group_id'   => $group->id,
         ];
         $request = $this->getRequest()->withParsedBody($data);
 
diff --git a/app/sprinkles/admin/tests/Integration/Controller/UserControllerGuestTest.php b/app/sprinkles/admin/tests/Integration/Controller/UserControllerGuestTest.php
index 8d6318816..208eca890 100644
--- a/app/sprinkles/admin/tests/Integration/Controller/UserControllerGuestTest.php
+++ b/app/sprinkles/admin/tests/Integration/Controller/UserControllerGuestTest.php
@@ -51,8 +51,7 @@ public function setUp()
             // Setup database, then setup User & default role
             $this->refreshDatabase();
             $this->setupUser();
-
-        } else if (!static::$initialized) {
+        } elseif (!static::$initialized) {
 
             // Only refresh db once
             $this->refreshDatabase();
@@ -66,8 +65,6 @@ public function tearDown()
         m::close();
     }
 
-    /**
-     */
     public function testControllerConstructor()
     {
         $controller = $this->getController();
@@ -93,7 +90,7 @@ public function testControllerConstructorWithUser()
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testCreateWithNoPermissions(UserController $controller)
     {
@@ -122,7 +119,7 @@ public function testCreateWithNoGroupPermissions()
             'first_name' => 'foo name',
             'last_name'  => 'foo last',
             'email'      => 'foo@bar.com',
-            'group_id'   => $group->id
+            'group_id'   => $group->id,
         ];
         $request = $this->getRequest()->withParsedBody($data);
 
@@ -133,7 +130,7 @@ public function testCreateWithNoGroupPermissions()
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testCreatePasswordResetWithNoPermissions(UserController $controller)
     {
@@ -144,7 +141,7 @@ public function testCreatePasswordResetWithNoPermissions(UserController $control
     /**
      * @depends testControllerConstructorWithUser
      * @depends testCreatePasswordResetWithNoPermissions
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testCreatePasswordResetWithPartialPermissions(UserController $controller)
     {
@@ -172,7 +169,7 @@ public function testCreatePasswordResetWithPartialPermissions(UserController $co
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testDeleteWithNoPermission(UserController $controller)
     {
@@ -182,7 +179,7 @@ public function testDeleteWithNoPermission(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetActivitiesWithNoPermission(UserController $controller)
     {
@@ -192,7 +189,7 @@ public function testGetActivitiesWithNoPermission(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetActivitiesWithPartialPermission(UserController $controller)
     {
@@ -213,7 +210,7 @@ public function testGetActivitiesWithPartialPermission(UserController $controlle
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetInfoWithNoPermission(UserController $controller)
     {
@@ -223,7 +220,7 @@ public function testGetInfoWithNoPermission(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetInfoWithPartialPermission(UserController $controller)
     {
@@ -244,7 +241,7 @@ public function testGetInfoWithPartialPermission(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetListWithNoPermission(UserController $controller)
     {
@@ -254,12 +251,12 @@ public function testGetListWithNoPermission(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetModalConfirmDeleteWithNoPermission(UserController $controller)
     {
         $request = $this->getRequest()->withQueryParams([
-            'user_name' => 'userfoo'
+            'user_name' => 'userfoo',
         ]);
 
         $this->expectException(ForbiddenException::class);
@@ -268,12 +265,12 @@ public function testGetModalConfirmDeleteWithNoPermission(UserController $contro
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetModalCreateWithNoPermission(UserController $controller)
     {
         $request = $this->getRequest()->withQueryParams([
-            'user_name' => 'userfoo'
+            'user_name' => 'userfoo',
         ]);
 
         $this->expectException(ForbiddenException::class);
@@ -282,7 +279,7 @@ public function testGetModalCreateWithNoPermission(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetModalCreateWithNoUserGroup(UserController $controller)
     {
@@ -302,12 +299,12 @@ public function testGetModalCreateWithNoUserGroup(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetModalEditWithNoPermissions(UserController $controller)
     {
         $request = $this->getRequest()->withQueryParams([
-            'user_name' => 'userfoo'
+            'user_name' => 'userfoo',
         ]);
 
         $this->expectException(ForbiddenException::class);
@@ -316,7 +313,7 @@ public function testGetModalEditWithNoPermissions(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetModalEditWithPartialPermissions(UserController $controller)
     {
@@ -330,7 +327,7 @@ public function testGetModalEditWithPartialPermissions(UserController $controlle
         $controller = $this->getController();
 
         $request = $this->getRequest()->withQueryParams([
-            'user_name' => 'userfoo'
+            'user_name' => 'userfoo',
         ]);
 
         $result = $controller->getModalEdit($request, $this->getResponse(), []);
@@ -340,7 +337,7 @@ public function testGetModalEditWithPartialPermissions(UserController $controlle
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetModalEditWithNoGroupPermissions(UserController $controller)
     {
@@ -354,7 +351,7 @@ public function testGetModalEditWithNoGroupPermissions(UserController $controlle
         $controller = $this->getController();
 
         $request = $this->getRequest()->withQueryParams([
-            'user_name' => 'userfoo'
+            'user_name' => 'userfoo',
         ]);
 
         $result = $controller->getModalEdit($request, $this->getResponse(), []);
@@ -364,12 +361,12 @@ public function testGetModalEditWithNoGroupPermissions(UserController $controlle
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetModalEditPasswordWithNoPermissions(UserController $controller)
     {
         $request = $this->getRequest()->withQueryParams([
-            'user_name' => 'userfoo'
+            'user_name' => 'userfoo',
         ]);
 
         $this->expectException(ForbiddenException::class);
@@ -378,7 +375,7 @@ public function testGetModalEditPasswordWithNoPermissions(UserController $contro
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetModalEditPasswordWithPartialPermissions(UserController $controller)
     {
@@ -392,7 +389,7 @@ public function testGetModalEditPasswordWithPartialPermissions(UserController $c
         $controller = $this->getController();
 
         $request = $this->getRequest()->withQueryParams([
-            'user_name' => 'userfoo'
+            'user_name' => 'userfoo',
         ]);
 
         $result = $controller->getModalEditPassword($request, $this->getResponse(), []);
@@ -402,12 +399,12 @@ public function testGetModalEditPasswordWithPartialPermissions(UserController $c
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetModalEditRolesWithNoPermission(UserController $controller)
     {
         $request = $this->getRequest()->withQueryParams([
-            'user_name' => 'userfoo'
+            'user_name' => 'userfoo',
         ]);
 
         $this->expectException(ForbiddenException::class);
@@ -416,7 +413,7 @@ public function testGetModalEditRolesWithNoPermission(UserController $controller
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetPermissionsWithNoPermissions(UserController $controller)
     {
@@ -426,7 +423,7 @@ public function testGetPermissionsWithNoPermissions(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetPermissionsWithPartialPermissions(UserController $controller)
     {
@@ -447,7 +444,7 @@ public function testGetPermissionsWithPartialPermissions(UserController $control
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetRolesWithNoPermissions(UserController $controller)
     {
@@ -457,7 +454,7 @@ public function testGetRolesWithNoPermissions(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetRolesWithPartialPermissions(UserController $controller)
     {
@@ -478,7 +475,7 @@ public function testGetRolesWithPartialPermissions(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testPageInfoWithNoPermissions(UserController $controller)
     {
@@ -488,7 +485,7 @@ public function testPageInfoWithNoPermissions(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testPageInfoWithPartialPermissions(UserController $controller)
     {
@@ -508,7 +505,7 @@ public function testPageInfoWithPartialPermissions(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testPageListWithNoPermission(UserController $controller)
     {
@@ -518,14 +515,14 @@ public function testPageListWithNoPermission(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testUpdateInfoWithNoPermissions(UserController $controller)
     {
         // Create a user
         $fm = $this->ci->factory;
         $user = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\User', [
-            'user_name' => 'testUpdateInfoWithNoPermissions',
+            'user_name'  => 'testUpdateInfoWithNoPermissions',
             'first_name' => 'foo',
         ]);
 
@@ -541,7 +538,7 @@ public function testUpdateInfoWithNoPermissions(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testUpdateInfoWithPartialPermissions(UserController $controller)
     {
@@ -557,7 +554,7 @@ public function testUpdateInfoWithPartialPermissions(UserController $controller)
         // Create a user
         $fm = $this->ci->factory;
         $user = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\User', [
-            'user_name' => 'testUpdateInfoWithPartialPermissions',
+            'user_name'  => 'testUpdateInfoWithPartialPermissions',
             'first_name' => 'foo',
         ]);
 
@@ -593,7 +590,7 @@ public function testUpdateInfoWithPartialPermissions(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testUpdateInfoForMasterUserWithNoPermissions(UserController $controller)
     {
@@ -613,7 +610,7 @@ public function testUpdateInfoForMasterUserWithNoPermissions(UserController $con
         if (!$user) {
             $fm = $this->ci->factory;
             $user = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\User', [
-                'id' => $this->ci->config['reserved_user_ids.master']
+                'id' => $this->ci->config['reserved_user_ids.master'],
             ]);
         }
 
@@ -630,7 +627,7 @@ public function testUpdateInfoForMasterUserWithNoPermissions(UserController $con
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testUpdateFieldWithNoPermissions(UserController $controller)
     {
@@ -640,7 +637,7 @@ public function testUpdateFieldWithNoPermissions(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testUpdateFieldWithPartialPermissions(UserController $controller)
     {
@@ -656,7 +653,7 @@ public function testUpdateFieldWithPartialPermissions(UserController $controller
         // Create a user
         $fm = $this->ci->factory;
         $user = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\User', [
-            'user_name' => 'testUpdateFieldWithPartialPermissions',
+            'user_name'  => 'testUpdateFieldWithPartialPermissions',
             'first_name' => 'foo',
         ]);
 
@@ -687,7 +684,7 @@ public function testUpdateFieldWithPartialPermissions(UserController $controller
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testUpdateFieldWithMasterUserWithNoPermissions(UserController $controller)
     {
@@ -707,7 +704,7 @@ public function testUpdateFieldWithMasterUserWithNoPermissions(UserController $c
         if (!$user) {
             $fm = $this->ci->factory;
             $user = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\User', [
-                'id' => $this->ci->config['reserved_user_ids.master']
+                'id' => $this->ci->config['reserved_user_ids.master'],
             ]);
         }
 
@@ -724,7 +721,7 @@ public function testUpdateFieldWithMasterUserWithNoPermissions(UserController $c
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testUpdateFieldForFlagEnabledWithCurrentUser(UserController $controller)
     {
@@ -756,8 +753,6 @@ private function getController()
         return new UserController($this->ci);
     }
 
-    /**
-     */
     private function setupUser()
     {
         // Admin user, WILL have access
@@ -768,7 +763,7 @@ private function setupUser()
         $user = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\User', [
             'id'        => '9999',
             'user_name' => 'userfoo',
-            'email'     => 'bar@foo.com'
+            'email'     => 'bar@foo.com',
         ]);
     }
 }
diff --git a/app/sprinkles/admin/tests/Integration/Controller/UserControllerTest.php b/app/sprinkles/admin/tests/Integration/Controller/UserControllerTest.php
index cc59cb9b7..dc3fc67a1 100644
--- a/app/sprinkles/admin/tests/Integration/Controller/UserControllerTest.php
+++ b/app/sprinkles/admin/tests/Integration/Controller/UserControllerTest.php
@@ -52,8 +52,7 @@ public function setUp()
             // Setup database, then setup User & default role
             $this->refreshDatabase();
             $this->setupUser();
-
-        } else if (!static::$initialized) {
+        } elseif (!static::$initialized) {
 
             // Only refresh db once
             $this->refreshDatabase();
@@ -67,8 +66,6 @@ public function tearDown()
         m::close();
     }
 
-    /**
-     */
     public function testControllerConstructor()
     {
         $controller = $this->getController();
@@ -94,7 +91,7 @@ public function testControllerConstructorWithUser()
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testCreateWithNoUsername(UserController $controller)
     {
@@ -103,7 +100,7 @@ public function testCreateWithNoUsername(UserController $controller)
             //'user_name'  => 'foo',
             'first_name' => 'foo name',
             'last_name'  => 'foo last',
-            'email'      => 'foo@bar.com'
+            'email'      => 'foo@bar.com',
         ];
         $request = $this->getRequest()->withParsedBody($data);
 
@@ -121,7 +118,7 @@ public function testCreateWithNoUsername(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testCreateWithNoEmail(UserController $controller)
     {
@@ -148,7 +145,7 @@ public function testCreateWithNoEmail(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testCreateWithDuplicateUsername(UserController $controller)
     {
@@ -157,7 +154,7 @@ public function testCreateWithDuplicateUsername(UserController $controller)
             'user_name'  => 'userfoo',
             'first_name' => 'foo name',
             'last_name'  => 'foo last',
-            'email'      => 'foo@bar.com'
+            'email'      => 'foo@bar.com',
         ];
         $request = $this->getRequest()->withParsedBody($data);
 
@@ -176,7 +173,7 @@ public function testCreateWithDuplicateUsername(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testCreateWithDuplicateEmail(UserController $controller)
     {
@@ -185,7 +182,7 @@ public function testCreateWithDuplicateEmail(UserController $controller)
             'user_name'  => 'barbarbar',
             'first_name' => 'foo name',
             'last_name'  => 'foo last',
-            'email'      => 'bar@foo.com'
+            'email'      => 'bar@foo.com',
         ];
         $request = $this->getRequest()->withParsedBody($data);
 
@@ -230,18 +227,17 @@ public function testCreatePasswordReset()
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testCreatePasswordResetWithNotExistingUser(UserController $controller)
     {
         $this->expectException(NotFoundException::class);
         $result = $controller->createPasswordReset($this->getRequest(), $this->getResponse(), ['user_name' => 'potato']);
-
     }
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testDelete(UserController $controller)
     {
@@ -266,7 +262,7 @@ public function testDelete(UserController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testDelete
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testDeleteWithNotExistingUser(UserController $controller)
     {
@@ -277,7 +273,7 @@ public function testDeleteWithNotExistingUser(UserController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testDelete
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testDeleteWithReservedIds(UserController $controller)
     {
@@ -288,7 +284,7 @@ public function testDeleteWithReservedIds(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetActivities(UserController $controller)
     {
@@ -301,7 +297,7 @@ public function testGetActivities(UserController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testGetActivities
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetActivitiesWithBadUser(UserController $controller)
     {
@@ -311,7 +307,7 @@ public function testGetActivitiesWithBadUser(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetInfo(UserController $controller)
     {
@@ -324,7 +320,7 @@ public function testGetInfo(UserController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testGetInfo
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetInfoWithBadUser(UserController $controller)
     {
@@ -334,7 +330,7 @@ public function testGetInfoWithBadUser(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetList(UserController $controller)
     {
@@ -346,12 +342,12 @@ public function testGetList(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetModalConfirmDelete(UserController $controller)
     {
         $request = $this->getRequest()->withQueryParams([
-            'user_name' => 'userfoo'
+            'user_name' => 'userfoo',
         ]);
 
         // Get controller stuff
@@ -363,7 +359,7 @@ public function testGetModalConfirmDelete(UserController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testGetModalConfirmDelete
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetModalConfirmDeleteWithNoUser(UserController $controller)
     {
@@ -374,12 +370,12 @@ public function testGetModalConfirmDeleteWithNoUser(UserController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testGetModalConfirmDelete
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetModalConfirmDeleteWithNonExistingUser(UserController $controller)
     {
         $request = $this->getRequest()->withQueryParams([
-            'user_name' => 'foobar'
+            'user_name' => 'foobar',
         ]);
 
         $this->expectException(NotFoundException::class);
@@ -389,14 +385,14 @@ public function testGetModalConfirmDeleteWithNonExistingUser(UserController $con
     /**
      * @depends testControllerConstructorWithUser
      * @depends testGetModalConfirmDelete
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetModalConfirmDeleteWithReservedId(UserController $controller)
     {
         $user = User::find($this->ci->config['reserved_user_ids.master']);
 
         $request = $this->getRequest()->withQueryParams([
-            'user_name' => $user->user_name
+            'user_name' => $user->user_name,
         ]);
 
         $this->expectException(BadRequestException::class);
@@ -405,7 +401,7 @@ public function testGetModalConfirmDeleteWithReservedId(UserController $controll
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetModalCreate(UserController $controller)
     {
@@ -417,7 +413,7 @@ public function testGetModalCreate(UserController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testGetModalCreate
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetModalCreateWithNoLocale(UserController $controller)
     {
@@ -435,12 +431,12 @@ public function testGetModalCreateWithNoLocale(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetModalEdit(UserController $controller)
     {
         $request = $this->getRequest()->withQueryParams([
-            'user_name' => 'userfoo'
+            'user_name' => 'userfoo',
         ]);
 
         $result = $controller->getModalEdit($request, $this->getResponse(), []);
@@ -451,7 +447,7 @@ public function testGetModalEdit(UserController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testGetModalEdit
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetModalEditWithNoLocale(UserController $controller)
     {
@@ -463,7 +459,7 @@ public function testGetModalEditWithNoLocale(UserController $controller)
         $controller = $this->getController();
 
         $request = $this->getRequest()->withQueryParams([
-            'user_name' => 'userfoo'
+            'user_name' => 'userfoo',
         ]);
 
         $result = $controller->getModalEdit($request, $this->getResponse(), []);
@@ -473,12 +469,12 @@ public function testGetModalEditWithNoLocale(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetModalEditWithNoUser(UserController $controller)
     {
         $request = $this->getRequest()->withQueryParams([
-            'user_name' => 'foobar'
+            'user_name' => 'foobar',
         ]);
 
         $this->expectException(NotFoundException::class);
@@ -487,12 +483,12 @@ public function testGetModalEditWithNoUser(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetModalEditPassword(UserController $controller)
     {
         $request = $this->getRequest()->withQueryParams([
-            'user_name' => 'userfoo'
+            'user_name' => 'userfoo',
         ]);
 
         $result = $controller->getModalEditPassword($request, $this->getResponse(), []);
@@ -502,12 +498,12 @@ public function testGetModalEditPassword(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetModalEditPasswordWithNoUser(UserController $controller)
     {
         $request = $this->getRequest()->withQueryParams([
-            'user_name' => 'foobar'
+            'user_name' => 'foobar',
         ]);
 
         $this->expectException(NotFoundException::class);
@@ -516,12 +512,12 @@ public function testGetModalEditPasswordWithNoUser(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetModalEditRoles(UserController $controller)
     {
         $request = $this->getRequest()->withQueryParams([
-            'user_name' => 'userfoo'
+            'user_name' => 'userfoo',
         ]);
 
         $result = $controller->getModalEditRoles($request, $this->getResponse(), []);
@@ -531,12 +527,12 @@ public function testGetModalEditRoles(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetModalEditRolesWithNoUser(UserController $controller)
     {
         $request = $this->getRequest()->withQueryParams([
-            'user_name' => 'foobar'
+            'user_name' => 'foobar',
         ]);
 
         $this->expectException(NotFoundException::class);
@@ -545,7 +541,7 @@ public function testGetModalEditRolesWithNoUser(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetPermissions(UserController $controller)
     {
@@ -557,7 +553,7 @@ public function testGetPermissions(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetPermissionsWithNoUser(UserController $controller)
     {
@@ -567,7 +563,7 @@ public function testGetPermissionsWithNoUser(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetRoles(UserController $controller)
     {
@@ -579,7 +575,7 @@ public function testGetRoles(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testGetRolesWithNoUser(UserController $controller)
     {
@@ -589,7 +585,7 @@ public function testGetRolesWithNoUser(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testPageInfo(UserController $controller)
     {
@@ -600,7 +596,7 @@ public function testPageInfo(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testPageInfoWithNoLocale(UserController $controller)
     {
@@ -618,7 +614,7 @@ public function testPageInfoWithNoLocale(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testPageInfoWithNoUser(UserController $controller)
     {
@@ -628,7 +624,7 @@ public function testPageInfoWithNoUser(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testPageList(UserController $controller)
     {
@@ -639,7 +635,7 @@ public function testPageList(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testUpdateInfo(UserController $controller)
     {
@@ -680,7 +676,7 @@ public function testUpdateInfo(UserController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testUpdateInfo
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testUpdateInfoWithNoUser(UserController $controller)
     {
@@ -691,7 +687,7 @@ public function testUpdateInfoWithNoUser(UserController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testUpdateInfo
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testUpdateInfoWithValidationError(UserController $controller)
     {
@@ -701,7 +697,7 @@ public function testUpdateInfoWithValidationError(UserController $controller)
 
         // Set post data
         $data = [
-            'first_name' => $value
+            'first_name' => $value,
         ];
         $request = $this->getRequest()->withParsedBody($data);
 
@@ -724,7 +720,7 @@ public function testUpdateInfoWithValidationError(UserController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testUpdateInfo
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testUpdateInfoWithDuplicateEmail(UserController $controller)
     {
@@ -757,7 +753,7 @@ public function testUpdateInfoWithDuplicateEmail(UserController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testUpdateInfo
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testUpdateInfoForMasterUser(UserController $controller)
     {
@@ -791,7 +787,7 @@ public function testUpdateInfoForMasterUser(UserController $controller)
 
     /**
      * @depends testControllerConstructorWithUser
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testUpdateField(UserController $controller)
     {
@@ -826,7 +822,7 @@ public function testUpdateField(UserController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testUpdateField
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testUpdateFieldWithNoUser(UserController $controller)
     {
@@ -837,7 +833,7 @@ public function testUpdateFieldWithNoUser(UserController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testUpdateField
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testUpdateFieldWithNoUserWithNoValue(UserController $controller)
     {
@@ -848,7 +844,7 @@ public function testUpdateFieldWithNoUserWithNoValue(UserController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testUpdateField
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testUpdateFieldWithMasterUser(UserController $controller)
     {
@@ -883,7 +879,7 @@ public function testUpdateFieldWithMasterUser(UserController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testUpdateField
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testUpdateFieldWithValidationError(UserController $controller)
     {
@@ -905,7 +901,7 @@ public function testUpdateFieldWithValidationError(UserController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testUpdateField
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testUpdateFieldForFlagEnabled(UserController $controller)
     {
@@ -935,7 +931,7 @@ public function testUpdateFieldForFlagEnabled(UserController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testUpdateFieldForFlagEnabled
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testUpdateFieldForFlagEnabledDisabled(UserController $controller)
     {
@@ -965,7 +961,7 @@ public function testUpdateFieldForFlagEnabledDisabled(UserController $controller
     /**
      * @depends testControllerConstructorWithUser
      * @depends testUpdateField
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testUpdateFieldForFlagVerified(UserController $controller)
     {
@@ -995,7 +991,7 @@ public function testUpdateFieldForFlagVerified(UserController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testUpdateField
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testUpdateFieldForFlagEnabledWithMasterUser(UserController $controller)
     {
@@ -1016,7 +1012,7 @@ public function testUpdateFieldForFlagEnabledWithMasterUser(UserController $cont
     /**
      * @depends testControllerConstructorWithUser
      * @depends testUpdateField
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testUpdateFieldForPassword(UserController $controller)
     {
@@ -1046,7 +1042,7 @@ public function testUpdateFieldForPassword(UserController $controller)
     /**
      * @depends testControllerConstructorWithUser
      * @depends testUpdateField
-     * @param  UserController $controller
+     * @param UserController $controller
      */
     public function testUpdateFieldForRoles(UserController $controller)
     {
@@ -1060,7 +1056,7 @@ public function testUpdateFieldForRoles(UserController $controller)
 
         // Set post data
         $data = [
-            'value' => [['role_id' => $role->id]]
+            'value' => [['role_id' => $role->id]],
         ];
         $request = $this->getRequest()->withParsedBody($data);
 
@@ -1089,8 +1085,6 @@ private function getController()
         return new UserController($this->ci);
     }
 
-    /**
-     */
     private function setupUser()
     {
         // Admin user, WILL have access
@@ -1099,7 +1093,7 @@ private function setupUser()
         // Create test user
         $this->createTestUser(false, false, [
             'user_name' => 'userfoo',
-            'email'     => 'bar@foo.com'
+            'email'     => 'bar@foo.com',
         ]);
     }
 }
diff --git a/app/sprinkles/core/composer.json b/app/sprinkles/core/composer.json
index 7d5e82a18..a44275781 100644
--- a/app/sprinkles/core/composer.json
+++ b/app/sprinkles/core/composer.json
@@ -28,10 +28,10 @@
     "require": {
         "doctrine/dbal": "^2.5",
         "filp/whoops": "^2.3.1",
-        "illuminate/cache": "5.4.*",
-        "illuminate/database": "5.4.*",
-        "illuminate/events": "5.4.*",
-        "illuminate/filesystem": "5.4.*",
+        "illuminate/cache": "5.8.*",
+        "illuminate/database": "5.8.*",
+        "illuminate/events": "5.8.*",
+        "illuminate/filesystem": "5.8.*",
         "league/csv": "^8.1",
         "league/flysystem": "~1.0",
         "league/flysystem-aws-s3-v3": "~1.0",
diff --git a/app/sprinkles/core/config/default.php b/app/sprinkles/core/config/default.php
index 1da67ffd6..2e3a619e4 100755
--- a/app/sprinkles/core/config/default.php
+++ b/app/sprinkles/core/config/default.php
@@ -66,7 +66,7 @@
         * Cache Service Config
         * ----------------------------------------------------------------------
         * Redis & Memcached driver configuration
-        * See Laravel for more info : https://laravel.com/docs/5.4/cache
+        * See Laravel for more info : https://laravel.com/docs/5.8/cache
         *
         * Edit prefix to something unique when multiple instance of memcached /
         * redis are used on the same server.
@@ -120,7 +120,7 @@
         * should be store in environment variables
         *
         * Multiple connections can also be used.
-        * See Laravel docs : https://laravel.com/docs/5.4/database
+        * See Laravel docs : https://laravel.com/docs/5.8/database
         */
         'db' => [
             'default' => [
diff --git a/app/sprinkles/core/src/Bakery/SetupDbCommand.php b/app/sprinkles/core/src/Bakery/SetupDbCommand.php
index 14e43e06c..9a4aa8ab6 100644
--- a/app/sprinkles/core/src/Bakery/SetupDbCommand.php
+++ b/app/sprinkles/core/src/Bakery/SetupDbCommand.php
@@ -166,10 +166,11 @@ protected function askForDatabase(InputInterface $args)
         // Ask further questions based on driver
         if ($driver['driver'] == 'sqlite') {
             $name = ($args->getOption('db_name')) ?: $this->io->ask('Database name', $driver['defaultDBName']);
+            $host = ($args->getOption('db_host')) ?: $this->io->ask('Hostname', '127.0.0.1');
 
             return [
                 'driver'   => $driver['driver'],
-                'host'     => '',
+                'host'     => $host,
                 'port'     => '',
                 'database' => $name,
                 'username' => '',
diff --git a/app/sprinkles/core/src/Csrf/SlimCsrfProvider.php b/app/sprinkles/core/src/Csrf/SlimCsrfProvider.php
index 850a079e7..c51cc3f84 100644
--- a/app/sprinkles/core/src/Csrf/SlimCsrfProvider.php
+++ b/app/sprinkles/core/src/Csrf/SlimCsrfProvider.php
@@ -46,7 +46,6 @@ public static function setupService(ContainerInterface $ci)
             $e->addUserMessage('CSRF_MISSING');
 
             throw $e;
-            return $next($request, $response);
         };
 
         return new Guard($ci->config['csrf.name'], $csrfStorage, $onFailure, $ci->config['csrf.storage_limit'], $ci->config['csrf.strength'], $ci->config['csrf.persistent_token']);
diff --git a/app/sprinkles/core/src/Database/Migrations/v400/SessionsTable.php b/app/sprinkles/core/src/Database/Migrations/v400/SessionsTable.php
index ed79534b7..f9f8a054f 100644
--- a/app/sprinkles/core/src/Database/Migrations/v400/SessionsTable.php
+++ b/app/sprinkles/core/src/Database/Migrations/v400/SessionsTable.php
@@ -17,7 +17,7 @@
  * Sessions table migration
  * Version 4.0.0.
  *
- * See https://laravel.com/docs/5.4/migrations#tables
+ * See https://laravel.com/docs/5.8/migrations#tables
  *
  * @author Alex Weissman (https://alexanderweissman.com)
  */
diff --git a/app/sprinkles/core/src/Database/Models/Concerns/HasRelationships.php b/app/sprinkles/core/src/Database/Models/Concerns/HasRelationships.php
index adf131fca..af2dce674 100644
--- a/app/sprinkles/core/src/Database/Models/Concerns/HasRelationships.php
+++ b/app/sprinkles/core/src/Database/Models/Concerns/HasRelationships.php
@@ -12,7 +12,6 @@
 
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
-use UserFrosting\Sprinkle\Core\Database\Relations\BelongsToManyConstrained;
 use UserFrosting\Sprinkle\Core\Database\Relations\BelongsToManyThrough;
 use UserFrosting\Sprinkle\Core\Database\Relations\BelongsToManyUnique;
 use UserFrosting\Sprinkle\Core\Database\Relations\HasManySyncable;
@@ -92,10 +91,10 @@ public function morphMany($related, $name, $type = null, $id = null, $localKey =
      * @param string $related
      * @param string $through
      * @param string $firstJoiningTable
-     * @param string $firstForeignKey
+     * @param string $firstForeignPivotKey
      * @param string $firstRelatedKey
      * @param string $secondJoiningTable
-     * @param string $secondForeignKey
+     * @param string $secondForeignPivotKey
      * @param string $secondRelatedKey
      * @param string $throughRelation
      * @param string $relation
@@ -106,10 +105,10 @@ public function belongsToManyThrough(
         $related,
         $through,
         $firstJoiningTable = null,
-        $firstForeignKey = null,
+        $firstForeignPivotKey = null,
         $firstRelatedKey = null,
         $secondJoiningTable = null,
-        $secondForeignKey = null,
+        $secondForeignPivotKey = null,
         $secondRelatedKey = null,
         $throughRelation = null,
         $relation = null
@@ -123,7 +122,11 @@ public function belongsToManyThrough(
 
         // Create models for through and related
         $through = new $through();
-        $related = $this->newRelatedInstance($related);
+
+        // First, we'll need to determine the foreign key and "other key" for the
+        // relationship. Once we have determined the keys we'll make the query
+        // instances as well as the relationship instances we need for this.
+        $instance = $this->newRelatedInstance($related);
 
         if (is_null($throughRelation)) {
             $throughRelation = $through->getTable();
@@ -137,26 +140,28 @@ public function belongsToManyThrough(
         }
 
         if (is_null($secondJoiningTable)) {
-            $secondJoiningTable = $through->joiningTable($related);
+            $secondJoiningTable = $through->joiningTable($instance);
         }
 
-        $firstForeignKey = $firstForeignKey ?: $this->getForeignKey();
+        $firstForeignPivotKey = $firstForeignPivotKey ?: $this->getForeignKey();
         $firstRelatedKey = $firstRelatedKey ?: $through->getForeignKey();
-        $secondForeignKey = $secondForeignKey ?: $through->getForeignKey();
-        $secondRelatedKey = $secondRelatedKey ?: $related->getForeignKey();
+        $secondForeignPivotKey = $secondForeignPivotKey ?: $through->getForeignKey();
+        $secondRelatedKey = $secondRelatedKey ?: $instance->getForeignKey();
 
         // This relationship maps the top model (this) to the through model.
-        $intermediateRelationship = $this->belongsToMany($through, $firstJoiningTable, $firstForeignKey, $firstRelatedKey, $throughRelation)
-            ->withPivot($firstForeignKey);
+        $intermediateRelationship = $this->belongsToMany($through, $firstJoiningTable, $firstForeignPivotKey, $firstRelatedKey, $throughRelation)
+            ->withPivot($firstForeignPivotKey);
 
         // Now we set up the relationship with the related model.
         $query = new BelongsToManyThrough(
-            $related->newQuery(),
+            $instance->newQuery(),
             $this,
             $intermediateRelationship,
             $secondJoiningTable,
-            $secondForeignKey,
+            $secondForeignPivotKey,
             $secondRelatedKey,
+            $this->getKeyName(),
+            $instance->getKeyName(),
             $relation
         );
 
@@ -169,13 +174,15 @@ public function belongsToManyThrough(
      *
      * @param string $related
      * @param string $table
-     * @param string $foreignKey
+     * @param string $foreignPivotKey
+     * @param string $relatedPivotKey
+     * @param string $parentKey
      * @param string $relatedKey
      * @param string $relation
      *
      * @return BelongsToManyUnique
      */
-    public function belongsToManyUnique($related, $table = null, $foreignKey = null, $relatedKey = null, $relation = null)
+    public function belongsToManyUnique($related, $table = null, $foreignPivotKey = null, $relatedPivotKey = null, $parentKey = null, $relatedKey = null, $relation = null)
     {
         // If no relationship name was passed, we will pull backtraces to get the
         // name of the calling function. We will use that function name as the
@@ -189,23 +196,25 @@ public function belongsToManyUnique($related, $table = null, $foreignKey = null,
         // instances as well as the relationship instances we need for this.
         $instance = $this->newRelatedInstance($related);
 
-        $foreignKey = $foreignKey ?: $this->getForeignKey();
+        $foreignPivotKey = $foreignPivotKey ?: $this->getForeignKey();
 
-        $relatedKey = $relatedKey ?: $instance->getForeignKey();
+        $relatedPivotKey = $relatedPivotKey ?: $instance->getForeignKey();
 
         // If no table name was provided, we can guess it by concatenating the two
         // models using underscores in alphabetical order. The two model names
         // are transformed to snake case from their default CamelCase also.
         if (is_null($table)) {
-            $table = $this->joiningTable($related);
+            $table = $this->joiningTable($related, $instance);
         }
 
         return new BelongsToManyUnique(
             $instance->newQuery(),
             $this,
             $table,
-            $foreignKey,
-            $relatedKey,
+            $foreignPivotKey,
+            $relatedPivotKey,
+            $parentKey ?: $this->getKeyName(),
+            $relatedKey ?: $instance->getKeyName(),
             $relation
         );
     }
@@ -216,93 +225,42 @@ public function belongsToManyUnique($related, $table = null, $foreignKey = null,
      * @param string $related
      * @param string $name
      * @param string $table
-     * @param string $foreignKey
-     * @param string $otherKey
+     * @param string $foreignPivotKey
+     * @param string $relatedPivotKey
+     * @param string $parentKey
+     * @param string $relatedKey
      * @param bool   $inverse
      *
      * @return MorphToManyUnique
      */
-    public function morphToManyUnique($related, $name, $table = null, $foreignKey = null, $otherKey = null, $inverse = false)
+    public function morphToManyUnique($related, $name, $table = null, $foreignPivotKey = null, $relatedPivotKey = null, $parentKey = null, $relatedKey = null, $inverse = false)
     {
-        $caller = $this->getBelongsToManyCaller();
+        $caller = $this->guessBelongsToManyRelation();
 
         // First, we will need to determine the foreign key and "other key" for the
         // relationship. Once we have determined the keys we will make the query
         // instances, as well as the relationship instances we need for these.
-        $foreignKey = $foreignKey ?: $name . '_id';
+        $instance = $this->newRelatedInstance($related);
 
-        $instance = new $related();
+        $foreignPivotKey = $foreignPivotKey ?: $name . '_id';
 
-        $otherKey = $otherKey ?: $instance->getForeignKey();
+        $relatedPivotKey = $relatedPivotKey ?: $instance->getForeignKey();
 
         // Now we're ready to create a new query builder for this related model and
         // the relationship instances for this relation. This relations will set
         // appropriate query constraints then entirely manages the hydrations.
-        $query = $instance->newQuery();
-
-        $table = $table ?: Str::plural($name);
-
-        return new MorphToManyUnique(
-            $query,
-            $this,
-            $name,
-            $table,
-            $foreignKey,
-            $otherKey,
-            $caller,
-            $inverse
-        );
-    }
-
-    /**
-     * Define a constrained many-to-many relationship.
-     * This is similar to a regular many-to-many, but constrains the child results to match an additional constraint key in the parent object.
-     * This has been superseded by the belongsToManyUnique relationship's `withTernary` method since 4.1.7.
-     *
-     * @deprecated since 4.1.6
-     *
-     * @param string $related
-     * @param string $constraintKey
-     * @param string $table
-     * @param string $foreignKey
-     * @param string $relatedKey
-     * @param string $relation
-     *
-     * @return BelongsToManyConstrained
-     */
-    public function belongsToManyConstrained($related, $constraintKey, $table = null, $foreignKey = null, $relatedKey = null, $relation = null)
-    {
-        // If no relationship name was passed, we will pull backtraces to get the
-        // name of the calling function. We will use that function name as the
-        // title of this relation since that is a great convention to apply.
-        if (is_null($relation)) {
-            $relation = $this->guessBelongsToManyRelation();
-        }
-
-        // First, we'll need to determine the foreign key and "other key" for the
-        // relationship. Once we have determined the keys we'll make the query
-        // instances as well as the relationship instances we need for this.
-        $instance = $this->newRelatedInstance($related);
-
-        $foreignKey = $foreignKey ?: $this->getForeignKey();
+        if (!$table) {
+            $words = preg_split('/(_)/u', $name, -1, PREG_SPLIT_DELIM_CAPTURE);
 
-        $relatedKey = $relatedKey ?: $instance->getForeignKey();
+            $lastWord = array_pop($words);
 
-        // If no table name was provided, we can guess it by concatenating the two
-        // models using underscores in alphabetical order. The two model names
-        // are transformed to snake case from their default CamelCase also.
-        if (is_null($table)) {
-            $table = $this->joiningTable($related);
+            $table = implode('', $words) . Str::plural($lastWord);
         }
 
-        return new BelongsToManyConstrained(
-            $instance->newQuery(),
-            $this,
-            $constraintKey,
-            $table,
-            $foreignKey,
-            $relatedKey,
-            $relation
+        return new MorphToManyUnique(
+            $instance->newQuery(), $this, $name, $table,
+            $foreignPivotKey, $relatedPivotKey, $parentKey ?: $this->getKeyName(),
+            $relatedKey ?: $instance->getKeyName(), $caller, $inverse
         );
     }
 
diff --git a/app/sprinkles/core/src/Database/Relations/BelongsToManyConstrained.php b/app/sprinkles/core/src/Database/Relations/BelongsToManyConstrained.php
deleted file mode 100644
index 5b904db63..000000000
--- a/app/sprinkles/core/src/Database/Relations/BelongsToManyConstrained.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-
-/*
- * UserFrosting (http://www.userfrosting.com)
- *
- * @link      https://github.com/userfrosting/UserFrosting
- * @copyright Copyright (c) 2019 Alexander Weissman
- * @license   https://github.com/userfrosting/UserFrosting/blob/master/LICENSE.md (MIT License)
- */
-
-namespace UserFrosting\Sprinkle\Core\Database\Relations;
-
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsToMany;
-
-/**
- * A BelongsToMany relationship that constrains on the value of an additional foreign key in the pivot table.
- * This has been superseded by the BelongsToTernary relationship since 4.1.6.
- *
- * @deprecated since 4.1.6
- *
- * @author Alex Weissman (https://alexanderweissman.com)
- *
- * @see https://github.com/laravel/framework/blob/5.4/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
- */
-class BelongsToManyConstrained extends BelongsToMany
-{
-    /**
-     * @var string The pivot foreign key on which to constrain the result sets for this relation.
-     */
-    protected $constraintKey;
-
-    /**
-     * Create a new belongs to many constrained relationship instance.
-     *
-     * @param \Illuminate\Database\Eloquent\Builder $query
-     * @param \Illuminate\Database\Eloquent\Model   $parent
-     * @param string                                $constraintKey
-     * @param string                                $table
-     * @param string                                $foreignKey
-     * @param string                                $relatedKey
-     * @param string                                $relationName
-     */
-    public function __construct(Builder $query, Model $parent, $constraintKey, $table, $foreignKey, $relatedKey, $relationName = null)
-    {
-        $this->constraintKey = $constraintKey;
-        parent::__construct($query, $parent, $table, $foreignKey, $relatedKey, $relationName);
-    }
-
-    /**
-     * Set the constraints for an eager load of the relation.
-     *
-     * @param array $models
-     */
-    public function addEagerConstraints(array $models)
-    {
-        // To make the query more efficient, we only bother querying related models if their pivot key value
-        // matches the pivot key value of one of the parent models.
-        $pivotKeys = $this->getPivotKeys($models, $this->constraintKey);
-        $this->query->whereIn($this->getQualifiedForeignKeyName(), $this->getKeys($models))
-            ->whereIn($this->constraintKey, $pivotKeys);
-    }
-
-    /**
-     * Gets a list of unique pivot key values from an array of models.
-     *
-     * @param array  $models
-     * @param string $pivotKey
-     *
-     * @return array
-     */
-    protected function getPivotKeys(array $models, $pivotKey)
-    {
-        $pivotKeys = [];
-        foreach ($models as $model) {
-            $pivotKeys[] = $model->getRelation('pivot')->{$pivotKey};
-        }
-
-        return array_unique($pivotKeys);
-    }
-
-    /**
-     * Match the eagerly loaded results to their parents, constraining the results by matching the values of $constraintKey
-     * in the parent object to the child objects.
-     *
-     * @see Called in https://github.com/laravel/framework/blob/2f4135d8db5ded851d1f4f611124c53b768a3c08/src/Illuminate/Database/Eloquent/Builder.php
-     *
-     * @param array                                    $models
-     * @param \Illuminate\Database\Eloquent\Collection $results
-     * @param string                                   $relation
-     *
-     * @return array
-     */
-    public function match(array $models, Collection $results, $relation)
-    {
-        $dictionary = $this->buildDictionary($results);
-
-        // Once we have an array dictionary of child objects we can easily match the
-        // children back to their parent using the dictionary and the keys on the
-        // the parent models. Then we will return the hydrated models back out.
-        foreach ($models as $model) {
-            $pivotValue = $model->getRelation('pivot')->{$this->constraintKey};
-            if (isset($dictionary[$key = $model->getKey()])) {
-                // Only match children if their pivot key value matches that of the parent model
-                $items = $this->findMatchingPivots($dictionary[$key], $pivotValue);
-                $model->setRelation(
-                    $relation,
-                    $this->related->newCollection($items)
-                );
-            }
-        }
-
-        return $models;
-    }
-
-    /**
-     * Filter an array of models, only taking models whose $constraintKey value matches $pivotValue.
-     *
-     * @param array $items
-     * @param mixed $pivotValue
-     *
-     * @return array
-     */
-    protected function findMatchingPivots($items, $pivotValue)
-    {
-        $result = [];
-        foreach ($items as $item) {
-            if ($item->getRelation('pivot')->{$this->constraintKey} == $pivotValue) {
-                $result[] = $item;
-            }
-        }
-
-        return $result;
-    }
-}
diff --git a/app/sprinkles/core/src/Database/Relations/BelongsToManyThrough.php b/app/sprinkles/core/src/Database/Relations/BelongsToManyThrough.php
index 1cab91adf..a4b70792a 100644
--- a/app/sprinkles/core/src/Database/Relations/BelongsToManyThrough.php
+++ b/app/sprinkles/core/src/Database/Relations/BelongsToManyThrough.php
@@ -22,7 +22,7 @@
  *
  * @author Alex Weissman (https://alexanderweissman.com)
  *
- * @see https://github.com/laravel/framework/blob/5.4/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
+ * @see https://github.com/laravel/framework/blob/5.8/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
  */
 class BelongsToManyThrough extends BelongsToMany
 {
@@ -42,15 +42,17 @@ class BelongsToManyThrough extends BelongsToMany
      * @param \Illuminate\Database\Eloquent\Model              $parent
      * @param \Illuminate\Database\Eloquent\Relations\Relation $intermediateRelation
      * @param string                                           $table
-     * @param string                                           $foreignKey
+     * @param string                                           $foreignPivotKey
+     * @param string                                           $relatedPivotKey
+     * @param string                                           $parentKey
      * @param string                                           $relatedKey
      * @param string                                           $relationName
      */
-    public function __construct(Builder $query, Model $parent, Relation $intermediateRelation, $table, $foreignKey, $relatedKey, $relationName = null)
+    public function __construct(Builder $query, Model $parent, Relation $intermediateRelation, $table, $foreignPivotKey, $relatedPivotKey, $parentKey, $relatedKey, $relationName = null)
     {
         $this->intermediateRelation = $intermediateRelation;
 
-        parent::__construct($query, $parent, $table, $foreignKey, $relatedKey, $relationName);
+        parent::__construct($query, $parent, $table, $foreignPivotKey, $relatedPivotKey, $parentKey, $relatedKey, $relationName);
     }
 
     /**
@@ -75,7 +77,7 @@ public function getParentKeyName()
      */
     public function getExistenceCompareKey()
     {
-        return $this->intermediateRelation->getQualifiedForeignKeyName();
+        return $this->intermediateRelation->getQualifiedForeignPivotKeyName();
     }
 
     /**
@@ -91,7 +93,7 @@ public function withVia($viaRelationName = null, $viaCallback = null)
         $this->tertiaryRelated = $this->intermediateRelation->getRelated();
 
         // Set tertiary key and related model
-        $this->tertiaryKey = $this->foreignKey;
+        $this->tertiaryKey = $this->foreignPivotKey;
 
         $this->tertiaryRelationName = is_null($viaRelationName) ? $this->intermediateRelation->getRelationName() . '_via' : $viaRelationName;
 
@@ -112,7 +114,7 @@ public function withVia($viaRelationName = null, $viaCallback = null)
     public function addEagerConstraints(array $models)
     {
         // Constraint to only load models where the intermediate relation's foreign key matches the parent model
-        $intermediateForeignKeyName = $this->intermediateRelation->getQualifiedForeignKeyName();
+        $intermediateForeignKeyName = $this->intermediateRelation->getQualifiedForeignPivotKeyName();
 
         return $this->query->whereIn($intermediateForeignKeyName, $this->getKeys($models));
     }
@@ -167,7 +169,7 @@ public function match(array $models, Collection $results, $relation)
 
                 // Remove the tertiary pivot key from the condensed models
                 foreach ($items as $relatedModel) {
-                    unset($relatedModel->pivot->{$this->foreignKey});
+                    unset($relatedModel->pivot->{$this->foreignPivotKey});
                 }
 
                 $model->setRelation(
@@ -188,7 +190,7 @@ public function match(array $models, Collection $results, $relation)
     protected function unsetTertiaryPivots(Collection $models)
     {
         foreach ($models as $model) {
-            unset($model->pivot->{$this->foreignKey});
+            unset($model->pivot->{$this->foreignPivotKey});
         }
     }
 
@@ -210,9 +212,9 @@ protected function performJoin($query = null)
         // model instance. Then we can set the "where" for the parent models.
         $intermediateTable = $this->intermediateRelation->getTable();
 
-        $key = $this->intermediateRelation->getQualifiedRelatedKeyName();
+        $key = $this->intermediateRelation->getQualifiedRelatedPivotKeyName();
 
-        $query->join($intermediateTable, $key, '=', $this->getQualifiedForeignKeyName());
+        $query->join($intermediateTable, $key, '=', $this->getQualifiedForeignPivotKeyName());
 
         return $this;
     }
@@ -226,7 +228,7 @@ protected function performJoin($query = null)
      */
     protected function aliasedPivotColumns()
     {
-        $defaults = [$this->foreignKey, $this->relatedKey];
+        $defaults = [$this->foreignPivotKey, $this->relatedPivotKey];
         $aliasedPivotColumns = collect(array_merge($defaults, $this->pivotColumns))->map(function ($column) {
             return $this->table . '.' . $column . ' as pivot_' . $column;
         });
@@ -234,7 +236,7 @@ protected function aliasedPivotColumns()
         $parentKeyName = $this->getParentKeyName();
 
         // Add pivot column for the intermediate relation
-        $aliasedPivotColumns[] = "{$this->intermediateRelation->getQualifiedForeignKeyName()} as pivot_$parentKeyName";
+        $aliasedPivotColumns[] = "{$this->intermediateRelation->getQualifiedForeignPivotKeyName()} as pivot_$parentKeyName";
 
         return $aliasedPivotColumns->unique()->all();
     }
diff --git a/app/sprinkles/core/src/Database/Relations/BelongsToManyUnique.php b/app/sprinkles/core/src/Database/Relations/BelongsToManyUnique.php
index 5c608a966..744d7e265 100644
--- a/app/sprinkles/core/src/Database/Relations/BelongsToManyUnique.php
+++ b/app/sprinkles/core/src/Database/Relations/BelongsToManyUnique.php
@@ -18,7 +18,7 @@
  *
  * @author Alex Weissman (https://alexanderweissman.com)
  *
- * @see https://github.com/laravel/framework/blob/5.4/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
+ * @see https://github.com/laravel/framework/blob/5.8/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
  */
 class BelongsToManyUnique extends BelongsToMany
 {
diff --git a/app/sprinkles/core/src/Database/Relations/Concerns/Unique.php b/app/sprinkles/core/src/Database/Relations/Concerns/Unique.php
index c7b90984c..4884943ed 100644
--- a/app/sprinkles/core/src/Database/Relations/Concerns/Unique.php
+++ b/app/sprinkles/core/src/Database/Relations/Concerns/Unique.php
@@ -198,7 +198,7 @@ public function count()
 
         $constrainedBuilder = $constrainedBuilder->distinct();
 
-        return $constrainedBuilder->count($this->relatedKey);
+        return $constrainedBuilder->count($this->relatedPivotKey);
     }
 
     /**
@@ -216,7 +216,7 @@ public function getRelationExistenceCountQuery(Builder $query, Builder $parentQu
         return $this->getRelationExistenceQuery(
             $query,
             $parentQuery,
-            new Expression("count(distinct {$this->relatedKey})")
+            new Expression("count(distinct {$this->relatedPivotKey})")
         );
     }
 
@@ -232,7 +232,7 @@ public function getRelationExistenceCountQuery(Builder $query, Builder $parentQu
     public function match(array $models, Collection $results, $relation)
     {
         // Build dictionary of parent (e.g. user) to related (e.g. permission) models
-        list($dictionary, $nestedTertiaryDictionary) = $this->buildDictionary($results, $this->foreignKey);
+        list($dictionary, $nestedTertiaryDictionary) = $this->buildDictionary($results, $this->foreignPivotKey);
 
         // Once we have an array dictionary of child objects we can easily match the
         // children back to their parent using the dictionary and the keys on the
@@ -299,12 +299,12 @@ public function getPaginatedQuery(Builder $query, $limit = null, $offset = null)
         // Instead, we perform an additional query with grouping and limit/offset to determine
         // the desired set of unique model _ids_, and then constrain our final query
         // to these models with a whereIn clause.
-        $relatedKeyName = $this->related->getQualifiedKeyName();
+        $relatedPivotKeyName = $this->related->getQualifiedKeyName();
 
         // Apply an additional scope to override any selected columns in other global scopes
-        $uniqueIdScope = function ($subQuery) use ($relatedKeyName) {
-            $subQuery->addSelect($relatedKeyName)
-                     ->groupBy($relatedKeyName);
+        $uniqueIdScope = function ($subQuery) use ($relatedPivotKeyName) {
+            $subQuery->addSelect($relatedPivotKeyName)
+                     ->groupBy($relatedPivotKeyName);
         };
 
         $identifier = spl_object_hash($uniqueIdScope);
@@ -323,7 +323,7 @@ public function getPaginatedQuery(Builder $query, $limit = null, $offset = null)
         $modelIds = $constrainedBuilder->get()->pluck($primaryKeyName)->toArray();
 
         // Modify the unconstrained query to limit to these models
-        return $query->whereIn($relatedKeyName, $modelIds);
+        return $query->whereIn($relatedPivotKeyName, $modelIds);
     }
 
     /**
@@ -524,7 +524,7 @@ protected function transferPivotsToTertiary($model, $tertiaryModel)
             unset($model->pivot->$column);
         }
         // Copy the related key pivot as well, but don't unset on the related model
-        $pivotAttributes[$this->relatedKey] = $model->pivot->{$this->relatedKey};
+        $pivotAttributes[$this->relatedPivotKey] = $model->pivot->{$this->relatedPivotKey};
 
         // Set the tertiary key pivot as well
         $pivotAttributes[$this->tertiaryKey] = $tertiaryModel->getKey();
diff --git a/app/sprinkles/core/src/Database/Relations/HasManySyncable.php b/app/sprinkles/core/src/Database/Relations/HasManySyncable.php
index 215fc6ad2..c7d4aedbb 100644
--- a/app/sprinkles/core/src/Database/Relations/HasManySyncable.php
+++ b/app/sprinkles/core/src/Database/Relations/HasManySyncable.php
@@ -18,7 +18,7 @@
  *
  * @author Alex Weissman (https://alexanderweissman.com)
  *
- * @see https://github.com/laravel/framework/blob/5.4/src/Illuminate/Database/Eloquent/Relations/HasMany.php
+ * @see https://github.com/laravel/framework/blob/5.8/src/Illuminate/Database/Eloquent/Relations/HasMany.php
  */
 class HasManySyncable extends HasMany
 {
diff --git a/app/sprinkles/core/src/Database/Relations/MorphManySyncable.php b/app/sprinkles/core/src/Database/Relations/MorphManySyncable.php
index 502e91858..c9a0239c0 100644
--- a/app/sprinkles/core/src/Database/Relations/MorphManySyncable.php
+++ b/app/sprinkles/core/src/Database/Relations/MorphManySyncable.php
@@ -18,7 +18,7 @@
  *
  * @author Alex Weissman (https://alexanderweissman.com)
  *
- * @see https://github.com/laravel/framework/blob/5.4/src/Illuminate/Database/Eloquent/Relations/MorphMany.php
+ * @see https://github.com/laravel/framework/blob/5.8/src/Illuminate/Database/Eloquent/Relations/MorphMany.php
  */
 class MorphManySyncable extends MorphMany
 {
diff --git a/app/sprinkles/core/src/Database/Relations/MorphToManyUnique.php b/app/sprinkles/core/src/Database/Relations/MorphToManyUnique.php
index ad0085c55..77f375921 100644
--- a/app/sprinkles/core/src/Database/Relations/MorphToManyUnique.php
+++ b/app/sprinkles/core/src/Database/Relations/MorphToManyUnique.php
@@ -18,7 +18,7 @@
  *
  * @author Alex Weissman (https://alexanderweissman.com)
  *
- * @see https://github.com/laravel/framework/blob/5.4/src/Illuminate/Database/Eloquent/Relations/MorphToMany.php
+ * @see https://github.com/laravel/framework/blob/5.8/src/Illuminate/Database/Eloquent/Relations/MorphToMany.php
  */
 class MorphToManyUnique extends MorphToMany
 {
diff --git a/app/sprinkles/core/tests/Integration/Database/DatabaseTests.php b/app/sprinkles/core/tests/Integration/Database/DatabaseTests.php
index c498e5a30..47e28b051 100644
--- a/app/sprinkles/core/tests/Integration/Database/DatabaseTests.php
+++ b/app/sprinkles/core/tests/Integration/Database/DatabaseTests.php
@@ -132,7 +132,7 @@ public function tearDown()
     }
 
     /**
-     * Tests...
+     * testOneToManyRelationship
      */
     public function testOneToManyRelationship()
     {
@@ -292,6 +292,7 @@ public function testBelongsToManyUnique()
 
     /**
      * testMorphsToManyUnique
+     * @depends testBelongsToManyUnique
      */
     public function testMorphsToManyUnique()
     {
@@ -307,16 +308,18 @@ public function testMorphsToManyUnique()
                 'id'    => 2,
                 'name'  => 'Chopping',
                 'pivot' => [
-                    'assignable_id' => 1,
-                    'task_id'       => 2,
+                    'assignable_id'   => 1,
+                    'task_id'         => 2,
+                    'assignable_type' => EloquentTestUser::class,
                 ],
             ],
             [
                 'id'    => 3,
                 'name'  => 'Baleing',
                 'pivot' => [
-                    'assignable_id' => 1,
-                    'task_id'       => 3,
+                    'assignable_id'   => 1,
+                    'task_id'         => 3,
+                    'assignable_type' => EloquentTestUser::class,
                 ],
             ],
         ];
@@ -331,6 +334,7 @@ public function testMorphsToManyUnique()
 
     /**
      * testMorphsToManyUniqueWithTertiary
+     * @depends testMorphsToManyUnique
      */
     public function testMorphsToManyUniqueWithTertiary()
     {
@@ -346,8 +350,9 @@ public function testMorphsToManyUniqueWithTertiary()
                 'id'    => 2,
                 'name'  => 'Chopping',
                 'pivot' => [
-                    'assignable_id' => 1,
-                    'task_id'       => 2,
+                    'assignable_id'   => 1,
+                    'task_id'         => 2,
+                    'assignable_type' => EloquentTestUser::class,
                 ],
                 'locations' => [
                     [
@@ -372,8 +377,9 @@ public function testMorphsToManyUniqueWithTertiary()
                 'id'    => 3,
                 'name'  => 'Baleing',
                 'pivot' => [
-                    'assignable_id' => 1,
-                    'task_id'       => 3,
+                    'assignable_id'   => 1,
+                    'task_id'         => 3,
+                    'assignable_type' => EloquentTestUser::class,
                 ],
                 'locations' => [
                     [
@@ -398,6 +404,7 @@ public function testMorphsToManyUniqueWithTertiary()
 
     /**
      * testBelongsToManyUniqueWithTertiary
+     * @depends testBelongsToManyUnique
      */
     public function testBelongsToManyUniqueWithTertiary()
     {
@@ -470,6 +477,7 @@ public function testBelongsToManyUniqueWithTertiary()
 
     /**
      * testBelongsToManyUniqueWithTertiaryEagerLoad
+     * @depends testBelongsToManyUniqueWithTertiary
      */
     public function testBelongsToManyUniqueWithTertiaryEagerLoad()
     {
@@ -572,6 +580,7 @@ public function testBelongsToManyThrough()
         $user->roles()->attach([1, 2]);
 
         // Test retrieval of via models as well
+        // This user won't have `uri_royal_jelly` slug
         $this->assertEquals([
             [
                 'id'    => 1,
@@ -648,6 +657,7 @@ public function testBelongsToManyThrough()
 
     /**
      * Test the ability of a BelongsToManyThrough relationship to retrieve and count paginated queries.
+     * @depends testBelongsToManyThrough
      */
     public function testBelongsToManyThroughPaginated()
     {
@@ -684,6 +694,7 @@ public function testBelongsToManyThroughPaginated()
     /**
      * Test the ability of a BelongsToManyThrough relationship to retrieve and count paginated queries,
      * when we need to reference a virtual/computed column (for example in a sort).
+     * @depends testBelongsToManyThrough
      */
     public function testBelongsToManyThroughPaginatedWithOrderByAggregateColumn()
     {
@@ -713,6 +724,7 @@ public function testBelongsToManyThroughPaginatedWithOrderByAggregateColumn()
     /**
      * Test the ability of a BelongsToManyThrough relationship to retrieve structured data on a single model or set of models,
      * eager loading the "via" models at the same time.
+     * @depends testBelongsToManyThrough
      */
     public function testBelongsToManyThroughWithVia()
     {
@@ -759,6 +771,7 @@ public function testQueryExclude()
 
     /**
      * testQueryExcludeOnJoinedTable
+     * @depends testQueryExclude
      */
     public function testQueryExcludeOnJoinedTable()
     {
@@ -805,6 +818,7 @@ public function testQueryExcludeOnJoinedTable()
 
     /**
      * testQueryExcludeUseQualifiedNamesOnJoinedTable
+     * @depends testQueryExclude
      */
     public function testQueryExcludeUseQualifiedNamesOnJoinedTable()
     {
@@ -847,6 +861,7 @@ public function testQueryExcludeUseQualifiedNamesOnJoinedTable()
 
     /**
      * testQueryExcludeWildcard
+     * @depends testQueryExclude
      */
     public function testQueryExcludeWildcard()
     {
diff --git a/app/sprinkles/core/tests/Integration/Session/SessionDatabaseHandlerTest.php b/app/sprinkles/core/tests/Integration/Session/SessionDatabaseHandlerTest.php
index 17726de83..0fd47fb93 100644
--- a/app/sprinkles/core/tests/Integration/Session/SessionDatabaseHandlerTest.php
+++ b/app/sprinkles/core/tests/Integration/Session/SessionDatabaseHandlerTest.php
@@ -71,15 +71,15 @@ public function testSessionWrite()
         $handler = new DatabaseSessionHandler($connection, $config['session.database.table'], $config['session.minutes']);
 
         // Write session
-        // https://github.com/laravel/framework/blob/5.4/src/Illuminate/Session/DatabaseSessionHandler.php#L132
+        // https://github.com/laravel/framework/blob/5.8/src/Illuminate/Session/DatabaseSessionHandler.php#L132
         $this->assertTrue($handler->write($session_id, 'foo'));
 
         // Closing the handler does nothing anyway
-        // https://github.com/laravel/framework/blob/5.4/src/Illuminate/Session/DatabaseSessionHandler.php#L78
+        // https://github.com/laravel/framework/blob/5.8/src/Illuminate/Session/DatabaseSessionHandler.php#L78
         $this->assertTrue($handler->close());
 
         // Read session
-        // https://github.com/laravel/framework/blob/5.4/src/Illuminate/Session/DatabaseSessionHandler.php#L86-L101
+        // https://github.com/laravel/framework/blob/5.8/src/Illuminate/Session/DatabaseSessionHandler.php#L86-L101
         $this->assertSame('foo', $handler->read($session_id));
 
         // Check manually that the file has been written
@@ -88,7 +88,7 @@ public function testSessionWrite()
         $this->assertSame(base64_encode('foo'), SessionTable::find($session_id)->payload);
 
         // Destroy session
-        // https://github.com/laravel/framework/blob/5.4/src/Illuminate/Session/DatabaseSessionHandler.php#L256
+        // https://github.com/laravel/framework/blob/5.8/src/Illuminate/Session/DatabaseSessionHandler.php#L256
         $this->assertTrue($handler->destroy($session_id));
 
         // Check db to make sure it's gone
diff --git a/app/sprinkles/core/tests/Integration/Session/SessionFileHandlerTest.php b/app/sprinkles/core/tests/Integration/Session/SessionFileHandlerTest.php
index a90ef5ddf..cd6575a38 100644
--- a/app/sprinkles/core/tests/Integration/Session/SessionFileHandlerTest.php
+++ b/app/sprinkles/core/tests/Integration/Session/SessionFileHandlerTest.php
@@ -44,17 +44,17 @@ public function testSessionWrite()
         $handler = new FileSessionHandler($fs, $session_dir, 120);
 
         // Write session
-        // https://github.com/laravel/framework/blob/5.4/src/Illuminate/Session/FileSessionHandler.php#L83
+        // https://github.com/laravel/framework/blob/5.8/src/Illuminate/Session/FileSessionHandler.php#L83
         // write() ==> $this->files->put($this->path.'/'.$sessionId, $data, true);
         $this->assertTrue($handler->write($session_id, 'foo'));
 
         // Closing the handler does nothing anyway
-        // https://github.com/laravel/framework/blob/5.4/src/Illuminate/Session/FileSessionHandler.php#L61
+        // https://github.com/laravel/framework/blob/5.8/src/Illuminate/Session/FileSessionHandler.php#L61
         // close() ==> return true;
         $this->assertTrue($handler->close());
 
         // Read session
-        // https://github.com/laravel/framework/blob/5.4/src/Illuminate/Session/FileSessionHandler.php#L71
+        // https://github.com/laravel/framework/blob/5.8/src/Illuminate/Session/FileSessionHandler.php#L71
         // read() ==> return $this->files->get($path, true);
         $this->assertSame('foo', $handler->read($session_id));
 
@@ -63,7 +63,7 @@ public function testSessionWrite()
         $this->assertSame('foo', $fs->get($session_file));
 
         // Destroy session
-        // https://github.com/laravel/framework/blob/5.4/src/Illuminate/Session/FileSessionHandler.php#L93
+        // https://github.com/laravel/framework/blob/5.8/src/Illuminate/Session/FileSessionHandler.php#L93
         // destroy() ==> $this->files->delete($this->path.'/'.$sessionId);
         $this->assertTrue($handler->destroy($session_id));
 
diff --git a/app/sprinkles/core/tests/Unit/Database/Relations/BelongsToManyThroughTest.php b/app/sprinkles/core/tests/Unit/Database/Relations/BelongsToManyThroughTest.php
index 200f475d3..a343fd435 100644
--- a/app/sprinkles/core/tests/Unit/Database/Relations/BelongsToManyThroughTest.php
+++ b/app/sprinkles/core/tests/Unit/Database/Relations/BelongsToManyThroughTest.php
@@ -76,7 +76,7 @@ protected function getRelation()
         // Mock the intermediate role->permission BelongsToMany relation
         $intermediateRelationship = m::mock(BelongsToMany::class);
         $intermediateRelationship->shouldReceive('getTable')->once()->andReturn('permission_roles');
-        $intermediateRelationship->shouldReceive('getQualifiedRelatedKeyName')->once()->andReturn('permission_roles.role_id');
+        $intermediateRelationship->shouldReceive('getQualifiedRelatedPivotKeyName')->once()->andReturn('permission_roles.role_id');
         // Crazy pivot query stuff
         $newPivot = m::mock('\Illuminate\Database\Eloquent\Relations\Pivot');
         $newPivot->shouldReceive('getForeignKey')->andReturn('permission_id');
@@ -97,7 +97,8 @@ protected function getRelation()
             'role_users',
             'role_id',
             'user_id',
-            'relation_name'
+            'relation_name',
+            'id'
         );
     }
 }
diff --git a/build/before_install.sh b/build/before_install.sh
index 90b3730f7..637b54eac 100644
--- a/build/before_install.sh
+++ b/build/before_install.sh
@@ -35,7 +35,7 @@ fi
 if [ "$DB" == "sqlite" ] ; then
     echo "Setting up sqlite ..."
     touch userfrosting.db
-    printf "UF_MODE=\"debug\"\nDB_DRIVER=\"sqlite\"\nDB_NAME=\"userfrosting.db\"\nTEST_DB=\"default\"\n" > app/.env
+    printf "UF_MODE=\"debug\"\nDB_DRIVER=\"sqlite\"\nDB_HOST=127.0.0.1\nDB_NAME=\"userfrosting.db\"\nTEST_DB=\"default\"\n" > app/.env
 fi
 
 #