diff --git a/app/Models/Component.php b/app/Models/Component.php
index 98f5c899..d488f9c3 100644
--- a/app/Models/Component.php
+++ b/app/Models/Component.php
@@ -75,9 +75,12 @@ class Component extends Model implements HasPresenter
      * @var string[]
      */
     public $rules = [
-        'name'   => 'required|string',
-        'status' => 'int|required',
-        'link'   => 'url',
+        'name'     => 'required|string',
+        'status'   => 'required|int',
+        'order'    => 'nullable|int',
+        'group_id' => 'nullable|int',
+        'link'     => 'nullable|url',
+        'enabled'  => 'required|bool',
     ];
 
     /**
@@ -148,7 +151,7 @@ class Component extends Model implements HasPresenter
      */
     public function scopeStatus(Builder $query, $status)
     {
-        return $query->where('status', $status);
+        return $query->where('status', '=', $status);
     }
 
     /**
@@ -173,7 +176,7 @@ class Component extends Model implements HasPresenter
      */
     public function scopeEnabled(Builder $query)
     {
-        return $query->where('enabled', true);
+        return $query->where('enabled', '=', true);
     }
 
     /**
@@ -185,7 +188,7 @@ class Component extends Model implements HasPresenter
      */
     public function scopeDisabled(Builder $query)
     {
-        return $query->where('enabled', false);
+        return $query->where('enabled', '=', false);
     }
 
     /**
@@ -198,7 +201,7 @@ class Component extends Model implements HasPresenter
     public function scopeUngrouped(Builder $query)
     {
         return $query->enabled()
-            ->where('group_id', 0)
+            ->where('group_id', '=', 0)
             ->orderBy('order')
             ->orderBy('created_at');
     }
diff --git a/app/Models/ComponentGroup.php b/app/Models/ComponentGroup.php
index 5f881dbd..f6691f63 100644
--- a/app/Models/ComponentGroup.php
+++ b/app/Models/ComponentGroup.php
@@ -75,9 +75,9 @@ class ComponentGroup extends Model implements HasPresenter
      */
     public $rules = [
         'name'      => 'required|string',
-        'order'     => 'int',
-        'collapsed' => 'int',
-        'visible'   => 'bool',
+        'order'     => 'required|int',
+        'collapsed' => 'required|int',
+        'visible'   => 'required|bool',
     ];
 
     /**
@@ -172,7 +172,7 @@ class ComponentGroup extends Model implements HasPresenter
      */
     public function scopeVisible(Builder $query)
     {
-        return $query->where('visible', self::VISIBLE_GUEST);
+        return $query->where('visible', '=', self::VISIBLE_GUEST);
     }
 
     /**
diff --git a/app/Models/Incident.php b/app/Models/Incident.php
index bebf4316..10ff79b1 100644
--- a/app/Models/Incident.php
+++ b/app/Models/Incident.php
@@ -69,7 +69,7 @@ class Incident extends Model implements HasPresenter
      */
     protected $casts = [
         'visible'      => 'int',
-        'stickied'     => 'int',
+        'stickied'     => 'bool',
         'scheduled_at' => 'date',
         'deleted_at'   => 'date',
     ];
@@ -97,12 +97,12 @@ class Incident extends Model implements HasPresenter
      * @var string[]
      */
     public $rules = [
-        'component_id' => 'int',
-        'name'         => 'required',
+        'component_id' => 'nullable|int',
+        'name'         => 'required|string',
         'status'       => 'required|int',
         'visible'      => 'required|bool',
-        'stickied'     => 'bool',
-        'message'      => 'required',
+        'stickied'     => 'required|bool',
+        'message'      => 'required|string',
     ];
 
     /**
@@ -169,7 +169,7 @@ class Incident extends Model implements HasPresenter
      */
     public function scopeVisible(Builder $query)
     {
-        return $query->where('visible', 1);
+        return $query->where('visible', '=', 1);
     }
 
     /**
@@ -181,7 +181,7 @@ class Incident extends Model implements HasPresenter
      */
     public function scopeStickied(Builder $query)
     {
-        return $query->where('stickied', true);
+        return $query->where('stickied', '=', true);
     }
 
     /**
@@ -193,7 +193,7 @@ class Incident extends Model implements HasPresenter
      */
     public function scopeScheduled(Builder $query)
     {
-        return $query->where('status', 0)->where('scheduled_at', '>=', Carbon::now());
+        return $query->where('status', '=', 0)->where('scheduled_at', '>=', Carbon::now());
     }
 
     /**
@@ -206,7 +206,7 @@ class Incident extends Model implements HasPresenter
     public function scopeNotScheduled(Builder $query)
     {
         return $query->where('status', '>', 0)->orWhere(function ($query) {
-            $query->where('status', 0)->where(function ($query) {
+            $query->where('status', '=', 0)->where(function ($query) {
                 $query->whereNull('scheduled_at')->orWhere('scheduled_at', '<=', Carbon::now());
             });
         });
diff --git a/app/Models/IncidentTemplate.php b/app/Models/IncidentTemplate.php
index b5b9bf51..b5ded450 100644
--- a/app/Models/IncidentTemplate.php
+++ b/app/Models/IncidentTemplate.php
@@ -44,7 +44,7 @@ class IncidentTemplate extends Model
      */
     public $rules = [
         'name'     => 'required|string',
-        'slug'     => 'string',
+        'slug'     => 'required|string',
         'template' => 'required|string',
     ];
 
@@ -72,7 +72,7 @@ class IncidentTemplate extends Model
      */
     public static function forSlug($slug, $columns = ['*'])
     {
-        $template = static::where('slug', $slug)->firstOrFail($columns);
+        $template = static::where('slug', '=', $slug)->firstOrFail($columns);
 
         return $template;
     }
diff --git a/app/Models/IncidentUpdate.php b/app/Models/IncidentUpdate.php
index d905fb9c..207e129e 100644
--- a/app/Models/IncidentUpdate.php
+++ b/app/Models/IncidentUpdate.php
@@ -56,7 +56,7 @@ class IncidentUpdate extends Model implements HasPresenter
      * @var string[]
      */
     public $rules = [
-        'incident_id' => 'int',
+        'incident_id' => 'required|int',
         'status'      => 'required|int',
         'message'     => 'required|string',
         'user_id'     => 'required|int',
diff --git a/app/Models/Metric.php b/app/Models/Metric.php
index db594c35..1e467028 100644
--- a/app/Models/Metric.php
+++ b/app/Models/Metric.php
@@ -94,12 +94,11 @@ class Metric extends Model implements HasPresenter
     public $rules = [
         'name'          => 'required',
         'suffix'        => 'required',
-        'display_chart' => 'bool',
-        'default_value' => 'numeric',
-        'places'        => 'numeric|between:0,4',
-        'default_view'  => 'numeric|between:0,3',
-        'threshold'     => 'numeric|between:0,10',
-        'threshold'     => 'int',
+        'display_chart' => 'required|bool',
+        'default_value' => 'required|numeric',
+        'places'        => 'required|numeric|between:0,4',
+        'default_view'  => 'required|numeric|between:0,3',
+        'threshold'     => 'required|numeric|between:0,10',
     ];
 
     /**
@@ -135,7 +134,7 @@ class Metric extends Model implements HasPresenter
      */
     public function scopeDisplayable(Builder $query)
     {
-        return $query->where('display_chart', 1);
+        return $query->where('display_chart', '=', true);
     }
 
     /**
@@ -145,7 +144,7 @@ class Metric extends Model implements HasPresenter
      */
     public function getShouldDisplayAttribute()
     {
-        return $this->display_chart === 1;
+        return $this->display_chart;
     }
 
     /**
diff --git a/app/Models/MetricPoint.php b/app/Models/MetricPoint.php
index 2fbd0248..db0daf37 100644
--- a/app/Models/MetricPoint.php
+++ b/app/Models/MetricPoint.php
@@ -59,7 +59,7 @@ class MetricPoint extends Model implements HasPresenter
      * @var string[]
      */
     public $rules = [
-        'value' => 'numeric|required',
+        'value' => 'required|numeric',
     ];
 
     /**
diff --git a/app/Models/Subscriber.php b/app/Models/Subscriber.php
index e2f3fe4b..b2ff5391 100644
--- a/app/Models/Subscriber.php
+++ b/app/Models/Subscriber.php
@@ -101,7 +101,7 @@ class Subscriber extends Model implements HasPresenter
      */
     public function scopeIsGlobal(Builder $query)
     {
-        return $query->where('global', true);
+        return $query->where('global', '=', true);
     }
 
     /**
@@ -116,7 +116,7 @@ class Subscriber extends Model implements HasPresenter
     {
         return $query->select('subscribers.*')
             ->join('subscriptions', 'subscribers.id', '=', 'subscriptions.subscriber_id')
-            ->where('subscriptions.component_id', $component_id);
+            ->where('subscriptions.component_id', '=', $component_id);
     }
 
     /**
diff --git a/app/Models/Subscription.php b/app/Models/Subscription.php
index fb7872a3..c878c3c2 100644
--- a/app/Models/Subscription.php
+++ b/app/Models/Subscription.php
@@ -45,8 +45,8 @@ class Subscription extends Model
      * @var string[]
      */
     public $rules = [
-        'subscriber_id' => 'int|required',
-        'component_id'  => 'int',
+        'subscriber_id' => 'required|int',
+        'component_id'  => 'nullable|int',
     ];
 
     /**
@@ -79,7 +79,7 @@ class Subscription extends Model
      */
     public function scopeForSubscriber(Builder $query, $subscriber_id)
     {
-        return $query->where('subscriber_id', $subscriber_id);
+        return $query->where('subscriber_id', '=', $subscriber_id);
     }
 
     /**
@@ -92,7 +92,7 @@ class Subscription extends Model
      */
     public function scopeForComponent(Builder $query, $component_id)
     {
-        return $query->where('component_id', $component_id);
+        return $query->where('component_id', '=', $component_id);
     }
 
     /**
@@ -108,7 +108,7 @@ class Subscription extends Model
         return $query->select('subscriptions.*')
             ->join('subscribers', 'subscriptions.subscriber_id', '=', 'subscribers.id')
             ->where(function ($query) {
-                $query->where('subscriptions.component_id', $component_id)
+                $query->where('subscriptions.component_id', '=', $component_id)
                     ->orWhere('subscribers.global');
             })
             ->whereNotNull('subscribers.verified_at');
diff --git a/app/Models/User.php b/app/Models/User.php
index 68a02984..3cebb4f1 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -12,10 +12,8 @@
 namespace CachetHQ\Cachet\Models;
 
 use AltThree\Validator\ValidatingTrait;
-use Illuminate\Auth\Authenticatable;
-use Illuminate\Auth\Passwords\CanResetPassword;
-use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
-use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
+use Illuminate\Notifications\Notifiable;
+use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Hash;
@@ -25,10 +23,9 @@ use Illuminate\Support\Facades\Hash;
  *
  * @author James Brooks <james@alt-three.com>
  */
-class User extends Model implements AuthenticatableContract, CanResetPasswordContract
+class User extends Authenticatable
 {
-    use Notifiable;
-    use Authenticatable, CanResetPassword, ValidatingTrait;
+    use Notifiable, ValidatingTrait;
 
     /**
      * The admin level of user.
@@ -134,7 +131,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      */
     public function scopeAdmins(Builder $query)
     {
-        return $query->where('level', self::LEVEL_ADMIN);
+        return $query->where('level', '=', self::LEVEL_ADMIN);
     }
 
     /**
@@ -146,7 +143,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      */
     public function scopeActive(Builder $query)
     {
-        return $query->where('active', true);
+        return $query->where('active', '=', true);
     }
 
     /**
diff --git a/tests/AbstractTestCase.php b/tests/AbstractTestCase.php
index 5901a1e6..5c95a54c 100644
--- a/tests/AbstractTestCase.php
+++ b/tests/AbstractTestCase.php
@@ -34,7 +34,7 @@ abstract class AbstractTestCase extends TestCase
     /**
      * Test actor.
      *
-     * @var User
+     * @var \CachetHQ\Cachet\Models\User
      */
     protected $user;
 
@@ -57,7 +57,7 @@ abstract class AbstractTestCase extends TestCase
      *
      * @param User|null $user
      *
-     * @return AbstractTestCase
+     * @return \CachetHQ\Tests\Cachet\AbstractTestCase
      */
     protected function signIn(User $user = null)
     {
@@ -73,7 +73,7 @@ abstract class AbstractTestCase extends TestCase
      *
      * @param array $properties
      *
-     * @return User
+     * @return \CachetHQ\Cachet\Models\User
      */
     protected function createUser($properties = [])
     {
@@ -83,7 +83,7 @@ abstract class AbstractTestCase extends TestCase
     /**
      * Set up the needed configuration to be able to run the tests.
      *
-     * @return AbstractTestCase
+     * @return \CachetHQ\Tests\Cachet\AbstractTestCase
      */
     protected function setupConfig()
     {
diff --git a/tests/Services/Modules/ManagerTest.php b/tests/Services/Modules/ManagerTest.php
index c4a5e08e..d5b66199 100644
--- a/tests/Services/Modules/ManagerTest.php
+++ b/tests/Services/Modules/ManagerTest.php
@@ -46,7 +46,7 @@ class ManagerTest extends AbstractTestCase
         $manager = m::mock('CachetHQ\Cachet\Services\Modules\Manager[groupModules]');
         $manager->shouldReceive('groupModules')->once()->passthru();
 
-        $grouped = $manager->groupModules($this->getModules(), $this->getGroups());
+        $grouped = $manager->groupModules($this->getModules(), $this->getModuleGroups());
 
         $this->assertSame($this->getGroupedModulesWithOrders(), $grouped);
     }
@@ -84,7 +84,7 @@ class ManagerTest extends AbstractTestCase
         ];
     }
 
-    protected function getGroups()
+    protected function getModuleGroups()
     {
         return [
             'one' => 1,