diff --git a/app/Http/Controllers/Admin/ComponentController.php b/app/Http/Controllers/Admin/ComponentController.php
index a38436d3..95b17118 100644
--- a/app/Http/Controllers/Admin/ComponentController.php
+++ b/app/Http/Controllers/Admin/ComponentController.php
@@ -58,9 +58,9 @@ class ComponentController extends AbstractController
         $this->subMenu['components']['active'] = true;
 
         return View::make('dashboard.components.index')->with([
-            'page_title'  => trans_choice('dashboard.components.components', 2).' - '.trans('dashboard.dashboard'),
+            'page_title' => trans_choice('dashboard.components.components', 2).' - '.trans('dashboard.dashboard'),
             'components' => $components,
-            'sub_menu'    => $this->subMenu,
+            'sub_menu'   => $this->subMenu,
         ]);
     }
 
@@ -75,7 +75,7 @@ class ComponentController extends AbstractController
 
         return View::make('dashboard.components.groups.index')->with([
             'page_title' => trans_choice('dashboard.components.groups.groups', 2).' - '.trans('dashboard.dashboard'),
-            'groups'    => ComponentGroup::orderBy('order')->get(),
+            'groups'     => ComponentGroup::orderBy('order')->get(),
             'sub_menu'   => $this->subMenu,
         ]);
     }
@@ -100,8 +100,8 @@ class ComponentController extends AbstractController
 
         return View::make('dashboard.components.edit')->with([
             'page_title' => $pageTitle,
-            'component' => $component,
-            'groups'    => $groups,
+            'component'  => $component,
+            'groups'     => $groups,
         ]);
     }
 
@@ -171,7 +171,7 @@ class ComponentController extends AbstractController
 
         return View::make('dashboard.components.add')->with([
             'page_title' => trans('dashboard.components.add.title').' - '.trans('dashboard.dashboard'),
-            'groups'    => $groups,
+            'groups'     => $groups,
         ]);
     }
 
@@ -294,7 +294,7 @@ class ComponentController extends AbstractController
     {
         return View::make('dashboard.components.groups.edit')->with([
             'page_title' => trans('dashboard.components.groups.edit.title').' - '.trans('dashboard.dashboard'),
-            'group'     => $group,
+            'group'      => $group,
         ]);
     }
 
diff --git a/app/Http/Controllers/Admin/IncidentController.php b/app/Http/Controllers/Admin/IncidentController.php
index 78b9ab60..838e3f6c 100644
--- a/app/Http/Controllers/Admin/IncidentController.php
+++ b/app/Http/Controllers/Admin/IncidentController.php
@@ -70,7 +70,7 @@ class IncidentController extends AbstractController
 
         return View::make('dashboard.incidents.index')->with([
             'page_title' => trans('dashboard.incidents.incidents').' - '.trans('dashboard.dashboard'),
-            'incidents' => $incidents,
+            'incidents'  => $incidents,
         ]);
     }
 
@@ -85,7 +85,7 @@ class IncidentController extends AbstractController
         $componentsOutGroups = Component::where('group_id', 0)->get();
 
         return View::make('dashboard.incidents.add')->with([
-            'page_title'           => trans('dashboard.incidents.add.title').' - '.trans('dashboard.dashboard'),
+            'page_title'          => trans('dashboard.incidents.add.title').' - '.trans('dashboard.dashboard'),
             'componentsInGroups'  => $componentsInGroups,
             'componentsOutGroups' => $componentsOutGroups,
             'incidentTemplates'   => IncidentTemplate::all(),
@@ -100,7 +100,7 @@ class IncidentController extends AbstractController
     public function showTemplates()
     {
         return View::make('dashboard.incidents.templates.index')->with([
-            'page_title'         => trans('dashboard.incidents.templates.title').' - '.trans('dashboard.dashboard'),
+            'page_title'        => trans('dashboard.incidents.templates.title').' - '.trans('dashboard.dashboard'),
             'incidentTemplates' => IncidentTemplate::all(),
         ]);
     }
@@ -193,7 +193,7 @@ class IncidentController extends AbstractController
     {
         return View::make('dashboard.incidents.templates.edit')->with([
             'page_title' => trans('dashboard.incidents.templates.edit.title').' - '.trans('dashboard.dashboard'),
-            'template'  => $template,
+            'template'   => $template,
         ]);
     }
 
@@ -285,7 +285,7 @@ class IncidentController extends AbstractController
         $componentsOutGroups = Component::where('group_id', 0)->get();
 
         return View::make('dashboard.incidents.edit')->with([
-            'page_title'           => trans('dashboard.incidents.edit.title').' - '.trans('dashboard.dashboard'),
+            'page_title'          => trans('dashboard.incidents.edit.title').' - '.trans('dashboard.dashboard'),
             'incident'            => $incident,
             'componentsInGroups'  => $componentsInGroups,
             'componentsOutGroups' => $componentsOutGroups,
diff --git a/app/Http/Controllers/Admin/MetricController.php b/app/Http/Controllers/Admin/MetricController.php
index 88f1b11f..ceb478bf 100644
--- a/app/Http/Controllers/Admin/MetricController.php
+++ b/app/Http/Controllers/Admin/MetricController.php
@@ -31,7 +31,7 @@ class MetricController extends AbstractController
 
         return View::make('dashboard.metrics.index')->with([
             'page_title' => trans('dashboard.metrics.metrics').' - '.trans('dashboard.dashboard'),
-            'metrics'   => $metrics,
+            'metrics'    => $metrics,
         ]);
     }
 
@@ -43,7 +43,7 @@ class MetricController extends AbstractController
     public function showAddMetric()
     {
         return View::make('dashboard.metrics.add')->with([
-            'page_title'          => trans('dashboard.metrics.add.title').' - '.trans('dashboard.dashboard'),
+            'page_title'         => trans('dashboard.metrics.add.title').' - '.trans('dashboard.dashboard'),
             'metricMetricPoints' => MetricPoint::all(),
         ]);
     }
@@ -56,7 +56,7 @@ class MetricController extends AbstractController
     public function showMetricPoints()
     {
         return View::make('dashboard.metrics.points.index')->with([
-            'page_title'          => trans('dashboard.metrics.points.title').' - '.trans('dashboard.dashboard'),
+            'page_title'         => trans('dashboard.metrics.points.title').' - '.trans('dashboard.dashboard'),
             'metricMetricPoints' => MetricPoint::all(),
         ]);
     }
@@ -166,7 +166,7 @@ class MetricController extends AbstractController
     {
         return View::make('dashboard.metrics.edit')->with([
             'page_title' => trans('dashboard.metrics.edit.title').' - '.trans('dashboard.dashboard'),
-            'metric'    => $metric,
+            'metric'     => $metric,
         ]);
     }
 
diff --git a/app/Http/Controllers/Admin/SettingsController.php b/app/Http/Controllers/Admin/SettingsController.php
index 9c1890b1..1565c9a2 100644
--- a/app/Http/Controllers/Admin/SettingsController.php
+++ b/app/Http/Controllers/Admin/SettingsController.php
@@ -101,8 +101,8 @@ class SettingsController extends AbstractController
         $unsecureUsers = User::whereNull('google_2fa_secret')->orWhere('google_2fa_secret', '')->get();
 
         return View::make('dashboard.settings.security')->with([
-            'page_title'     => 'Security - Dashboard',
-            'sub_menu'       => $this->subMenu,
+            'page_title'    => 'Security - Dashboard',
+            'sub_menu'      => $this->subMenu,
             'unsecureUsers' => $unsecureUsers,
         ]);
     }
diff --git a/app/Http/Controllers/Admin/TeamController.php b/app/Http/Controllers/Admin/TeamController.php
index 09905536..c9bf68f3 100644
--- a/app/Http/Controllers/Admin/TeamController.php
+++ b/app/Http/Controllers/Admin/TeamController.php
@@ -29,7 +29,7 @@ class TeamController extends AbstractController
         $team = User::all();
 
         return View::make('dashboard.team.index')->with([
-            'page_title'   => trans('dashboard.team.team').' - '.trans('dashboard.dashboard'),
+            'page_title'  => trans('dashboard.team.team').' - '.trans('dashboard.dashboard'),
             'teamMembers' => $team,
         ]);
     }
@@ -43,7 +43,7 @@ class TeamController extends AbstractController
     {
         return View::make('dashboard.team.edit')->with([
             'page_title' => trans('dashboard.team.edit.title').' - '.trans('dashboard.dashboard'),
-            'user'      => $user,
+            'user'       => $user,
         ]);
     }
 
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 52d37907..98b3d847 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -112,7 +112,7 @@ class HomeController extends AbstractController
             'canPageBackward'      => $canPageBackward,
             'previousDate'         => $startDate->copy()->subDays($daysToShow)->toDateString(),
             'nextDate'             => $startDate->copy()->addDays($daysToShow)->toDateString(),
-            'page_title'            => Setting::get('app_name').' Status',
+            'page_title'           => Setting::get('app_name').' Status',
         ]);
     }
 }
diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php
index 03d74fbe..e688b6e2 100644
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -59,7 +59,7 @@ class SetupController extends AbstractController
         }
 
         return View::make('setup')->with([
-            'page_title'    => trans('setup.setup'),
+            'page_title'   => trans('setup.setup'),
             'cacheDrivers' => $this->cacheDrivers,
             'appUrl'       => Request::root(),
         ]);
diff --git a/app/Http/Controllers/SubscribeController.php b/app/Http/Controllers/SubscribeController.php
index 848b5536..56b2d04e 100644
--- a/app/Http/Controllers/SubscribeController.php
+++ b/app/Http/Controllers/SubscribeController.php
@@ -32,7 +32,7 @@ class SubscribeController extends AbstractController
     {
         return View::make('subscribe', [
             'page_title' => Setting::get('app_name'),
-            'aboutApp'  => Markdown::convertToHtml(Setting::get('app_about')),
+            'aboutApp'   => Markdown::convertToHtml(Setting::get('app_about')),
         ]);
     }
 
diff --git a/tests/AbstractTestCase.php b/tests/AbstractTestCase.php
index b41e59e0..6251429b 100644
--- a/tests/AbstractTestCase.php
+++ b/tests/AbstractTestCase.php
@@ -40,8 +40,6 @@ abstract class AbstractTestCase extends TestCase
 
     /**
      * Become a user.
-     *
-     * @return void
      */
     protected function beUser()
     {