diff --git a/bonfire/Libraries/Widgets/Charts/ChartsItem.php b/bonfire/Libraries/Widgets/Charts/ChartsItem.php
index 038fd719..810b0b8d 100644
--- a/bonfire/Libraries/Widgets/Charts/ChartsItem.php
+++ b/bonfire/Libraries/Widgets/Charts/ChartsItem.php
@@ -274,14 +274,14 @@ public function getScript(): string
         }
 
         return '
-			const data_' . $this->chartName() . ' = ' . json_encode($this->data()) . ';
-			const labels_' . $this->chartName() . ' = ' . json_encode($this->label()) . ';
-			' . $backgroundColor . '
-			' . $borderColor . '
-			const Chart_' . $this->chartName() . " = new Chart(
-				document.getElementById('" . $this->chartName() . "'),
-				drawChart( data_" . $this->chartName() . ', labels_' . $this->chartName() . ", '" . $this->title() . "', '" . $this->type() . "', " . $line_tension . ', backgroundColor_' . $this->chartName() . ' , borderColor_' . $this->chartName() . ', ' . $borderWidth . ', ' . $enableAnimation . ', ' . $showTitle . ',	' . $showSubTitle . ',	' . $showLegend . ',  ' . $legendPosition . ')
-			);';
+            const data_' . $this->chartName() . ' = ' . json_encode($this->data()) . ';
+            const labels_' . $this->chartName() . ' = ' . json_encode($this->label()) . ';
+            ' . $backgroundColor . '
+            ' . $borderColor . '
+            const Chart_' . $this->chartName() . " = new Chart(
+                document.getElementById('" . $this->chartName() . "'),
+                drawChart( data_" . $this->chartName() . ', labels_' . $this->chartName() . ", '" . $this->title() . "', '" . $this->type() . "', " . $line_tension . ', backgroundColor_' . $this->chartName() . ' , borderColor_' . $this->chartName() . ', ' . $borderWidth . ', ' . $enableAnimation . ', ' . $showTitle . ',	' . $showSubTitle . ',	' . $showLegend . ',  ' . $legendPosition . ')
+            );';
     }
 
     /**
diff --git a/bonfire/Modules/Users/Controllers/UserSettingsController.php b/bonfire/Modules/Users/Controllers/UserSettingsController.php
index b7360d09..63b00d97 100644
--- a/bonfire/Modules/Users/Controllers/UserSettingsController.php
+++ b/bonfire/Modules/Users/Controllers/UserSettingsController.php
@@ -61,25 +61,25 @@ public function save()
             return redirect()->back()->withInput()->with('errors', $this->validator->getErrors());
         }
 
-        setting('Auth.allowRegistration', $this->request->getPost('allowRegistration') === 1);
+        setting('Auth.allowRegistration', $this->request->getPost('allowRegistration') ?? false);
         setting('Auth.minimumPasswordLength', (int) $this->request->getPost('minimumPasswordLength'));
         setting('Auth.passwordValidators', $this->request->getPost('validators'));
         setting('AuthGroups.defaultGroup', $this->request->getPost('defaultGroup'));
 
         // Actions
         $actions             = setting('Auth.actions');
-        $actions['login']    = (bool) $this->request->getPost('email2FA');
-        $actions['register'] = (bool) $this->request->getPost('emailActivation');
+        $actions['login']    = $this->request->getPost('email2FA') ?? false;
+        $actions['register'] = $this->request->getPost('emailActivation') ?? false;
         setting('Auth.actions', $actions);
 
         // Remember Me
         $sessionConfig                     = setting('Auth.sessionConfig');
-        $sessionConfig['allowRemembering'] = $this->request->getPost('allowRemember') === 1;
+        $sessionConfig['allowRemembering'] = $this->request->getPost('allowRemember') ?? false;
         $sessionConfig['rememberLength']   = $this->request->getPost('rememberLength');
         setting('Auth.sessionConfig', $sessionConfig);
 
         // Avatars
-        setting('Users.useGravatar', $this->request->getPost('useGravatar') === 1);
+        setting('Users.useGravatar', $this->request->getPost('useGravatar') ?? false);
         setting('Users.gravatarDefault', $this->request->getPost('gravatarDefault'));
 
         alert('success', lang('Bonfire.resourcesSaved', ['settings']));
diff --git a/bonfire/Modules/Users/Views/user_settings.php b/bonfire/Modules/Users/Views/user_settings.php
index f8e4b1fc..71d1b19b 100644
--- a/bonfire/Modules/Users/Views/user_settings.php
+++ b/bonfire/Modules/Users/Views/user_settings.php
@@ -39,7 +39,7 @@
                                     checked
                                 <?php endif ?>
                             >
-                            <label class="form-check-label" for="allow-registration">
+                            <label class="form-check-label" for="email-activation">
                                 Force email verification after registration?
                             </label>
                         </div>
@@ -89,7 +89,7 @@
                                 <?php if (old('allowRemember', setting('Auth.sessionConfig')['allowRemembering'])) : ?> checked <?php endif ?>
                                    x-on:click="remember = ! remember"
                             >
-                            <label class="form-check-label" for="allow-registration">
+                            <label class="form-check-label" for="allow-remember">
                                 Allow users to be "remembered"
                             </label>
                         </div>
@@ -106,7 +106,7 @@
                             <?php if (isset($rememberOptions) && count($rememberOptions)) : ?>
                                 <?php foreach ($rememberOptions as $title => $seconds) : ?>
                                     <option value="<?= $seconds ?>"
-                                        <?php if (old('rememberDuration', setting('Auth.sessionConfig')['rememberLength']) === $seconds) : ?> selected <?php endif?>
+                                        <?php if (old('rememberLength', setting('Auth.sessionConfig')['rememberLength']) === (string) $seconds) : ?> selected <?php endif?>
                                     >
                                         <?= $title ?>
                                     </option>
@@ -120,12 +120,12 @@
                     <div class="col-12 col-sm-4">
                         <div class="form-check">
                             <input class="form-check-input" type="checkbox" name="email2FA"
-                                   value="Shield\Authentication\Actions\Email2FA" id="email-activation"
+                                   value="Shield\Authentication\Actions\Email2FA" id="email-2fa"
                                 <?php if (old('email2FA', setting('Auth.actions')['login']) === 'Shield\Authentication\Actions\Email2FA') : ?>
                                     checked
                                 <?php endif ?>
                             >
-                            <label class="form-check-label" for="allow-registration">
+                            <label class="form-check-label" for="email-2fa">
                                 Force 2FA check after login?
                             </label>
                         </div>
@@ -309,4 +309,4 @@
 <script>
 
 </script>
-<?php $this->endSection() ?>
+<?php $this->endSection() ?>
\ No newline at end of file
diff --git a/tests/Bonfire/Widgets/ChartsCollectionTest.php b/tests/Bonfire/Widgets/ChartsCollectionTest.php
index bd13c66d..471236eb 100644
--- a/tests/Bonfire/Widgets/ChartsCollectionTest.php
+++ b/tests/Bonfire/Widgets/ChartsCollectionTest.php
@@ -1,79 +1,91 @@
 <?php
 
+/**
+ * This file is part of Bonfire.
+ *
+ * (c) Lonnie Ezell <lonnieje@gmail.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Bonfire\Widgets;
 
-use Bonfire\Libraries\Widgets\Charts\ChartsItem;
 use Bonfire\Libraries\Widgets\Charts\ChartsCollection;
+use Bonfire\Libraries\Widgets\Charts\ChartsItem;
 use Tests\Support\TestCase;
 
-class ChartsCollectionTest extends TestCase
+/**
+ * @internal
+ */
+final class ChartsCollectionTest extends TestCase
 {
-	public function testExtendsChartsItem()
-	{
-		$item = new ChartsCollection([
-				'title' => 'Item A',
-				'type' => 'line',
-				'cssClass' => 'col-3',
-			]);
+    public function testExtendsChartsItem()
+    {
+        $item = new ChartsCollection([
+            'title'    => 'Item A',
+            'type'     => 'line',
+            'cssClass' => 'col-3',
+        ]);
 
-		$this->assertEquals('Item A', $item->title());
-		$this->assertEquals('line', $item->type());
-		$this->assertEquals('col-3', $item->cssClass());
-	}
+        $this->assertSame('Item A', $item->title());
+        $this->assertSame('line', $item->type());
+        $this->assertSame('col-3', $item->cssClass());
+    }
 
-	public function testTitles()
-	{
-		$collection = new ChartsCollection();
-		$this->assertNull($collection->title());
+    public function testTitles()
+    {
+        $collection = new ChartsCollection();
+        $this->assertNull($collection->title());
 
-		$collection = new ChartsCollection(['title' => 'Foo']);
-		$this->assertEquals('Foo', $collection->title());
+        $collection = new ChartsCollection(['title' => 'Foo']);
+        $this->assertSame('Foo', $collection->title());
 
-		$collection = new ChartsCollection();
-		$collection->setTitle('Foo');
-		$this->assertEquals('Foo', $collection->title());
-	}
+        $collection = new ChartsCollection();
+        $collection->setTitle('Foo');
+        $this->assertSame('Foo', $collection->title());
+    }
 
-	public function testWithItem()
-	{
-		$collection = new ChartsCollection(['name' => 'Foo']);
-		$item1 = new ChartsItem(['title' => 'Item 1']);
-		$item2 = new ChartsItem(['title' => 'Item 2']);
+    public function testWithItem()
+    {
+        $chart_collection = new ChartsCollection(['name' => 'Foo']);
+        $item1            = new ChartsItem(['title' => 'Item 1']);
+        $item2            = new ChartsItem(['title' => 'Item 2']);
 
-		$collection->addItem($item1);
-		$collection->addItem($item2);
+        $chart_collection->addItem($item1);
+        $chart_collection->addItem($item2);
 
-		$items = $collection->items();
+        $items = $chart_collection->items();
 
-		$this->assertCount(2, $items);
-		$this->assertEquals('Item 1', $items[0]->title());
-		$this->assertEquals('Item 2', $items[1]->title());
+        $this->assertCount(2, $items);
+        $this->assertSame('Item 1', $items[0]->title());
+        $this->assertSame('Item 2', $items[1]->title());
 
-		$collection->removeItem('Item 1');
+        $chart_collection->removeItem('Item 1');
 
-		$items = $collection->items();
+        $items = $chart_collection->items();
 
-		$this->assertCount(1, $items);
-		$this->assertEquals('Item 2', $items[0]->title());
+        $this->assertCount(1, $items);
+        $this->assertSame('Item 2', $items[0]->title());
 
-		$collection->removeAllItems();
+        $chart_collection->removeAllItems();
 
-		$items = $collection->items();
-		$this->assertEquals([], $items);
-	}
+        $items = $chart_collection->items();
+        $this->assertSame([], $items);
+    }
 
-	public function testAddItems()
-	{
-		$collection = new ChartsCollection(['name' => 'Foo']);
-		$item1 = new ChartsItem(['title' => 'Item 1']);
-		$item2 = new ChartsItem(['title' => 'Item 2']);
+    public function testAddItems()
+    {
+        $chart_collection = new ChartsCollection(['name' => 'Foo']);
+        $item1            = new ChartsItem(['title' => 'Item 1']);
+        $item2            = new ChartsItem(['title' => 'Item 2']);
 
-		$collection->addItems([$item1, $item2]);
+        $chart_collection->addItems([$item1, $item2]);
 
-		$items = $collection->items();
+        $items = $chart_collection->items();
 
-		$this->assertCount(2, $items);
-		$this->assertEquals('Item 1', $items[0]->title());
-		$this->assertEquals('Item 2', $items[1]->title());
-	}
+        $this->assertCount(2, $items);
+        $this->assertSame('Item 1', $items[0]->title());
+        $this->assertSame('Item 2', $items[1]->title());
+    }
 }
diff --git a/tests/Bonfire/Widgets/ChartsItemTest.php b/tests/Bonfire/Widgets/ChartsItemTest.php
index 846161ff..a37f17ed 100644
--- a/tests/Bonfire/Widgets/ChartsItemTest.php
+++ b/tests/Bonfire/Widgets/ChartsItemTest.php
@@ -1,35 +1,46 @@
 <?php
 
-namespace Tests\Bonfire\Widgets;
+/**
+ * This file is part of Bonfire.
+ *
+ * (c) Lonnie Ezell <lonnieje@gmail.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
 
+namespace Tests\Bonfire\Widgets;
 
 use Bonfire\Libraries\Widgets\Charts\ChartsItem;
 use Tests\Support\TestCase;
 
-class ChartsItemTest extends TestCase
+/**
+ * @internal
+ */
+final class ChartsItemTest extends TestCase
 {
     public function testBasicDetails()
     {
         $item = new ChartsItem();
         $item->setTitle('Item A')
-			->setType('line')
+            ->setType('line')
             ->setCssclass('col-3');
 
-        $this->assertEquals('Item A', $item->title());
-		$this->assertEquals('line', $item->type());
-		$this->assertEquals('col-3', $item->cssClass());
+        $this->assertSame('Item A', $item->title());
+        $this->assertSame('line', $item->type());
+        $this->assertSame('col-3', $item->cssClass());
     }
 
     public function testConstructorFill()
     {
         $item = new ChartsItem([
-			'title' => 'Item A',
-			'type' => 'line',
-			'cssClass' => 'col-3',
-		]);
+            'title'    => 'Item A',
+            'type'     => 'line',
+            'cssClass' => 'col-3',
+        ]);
 
-		$this->assertEquals('Item A', $item->title());
-		$this->assertEquals('line', $item->type());
-		$this->assertEquals('col-3', $item->cssClass());
+        $this->assertSame('Item A', $item->title());
+        $this->assertSame('line', $item->type());
+        $this->assertSame('col-3', $item->cssClass());
     }
 }
diff --git a/tests/Bonfire/Widgets/ChartsTest.php b/tests/Bonfire/Widgets/ChartsTest.php
index 4e657362..370e729b 100644
--- a/tests/Bonfire/Widgets/ChartsTest.php
+++ b/tests/Bonfire/Widgets/ChartsTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of Bonfire.
+ *
+ * (c) Lonnie Ezell <lonnieje@gmail.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Bonfire\Widgets;
 
 use Bonfire\Libraries\Widgets\Charts\Charts;
@@ -7,70 +16,73 @@
 use Bonfire\Libraries\Widgets\Charts\ChartsItem;
 use Tests\Support\TestCase;
 
-class ChartsTest extends TestCase
+/**
+ * @internal
+ */
+final class ChartsTest extends TestCase
 {
     public function testWithItems()
     {
         $widget = new Charts();
-        $item1 = new ChartsItem(['title' => 'Item 1']);
-        $item2 = new ChartsItem(['title' => 'Item 2']);
+        $item1  = new ChartsItem(['title' => 'Item 1']);
+        $item2  = new ChartsItem(['title' => 'Item 2']);
 
-		$widget->addItem($item1)
+        $widget->addItem($item1)
             ->addItem($item2);
 
         $items = $widget->items();
 
         $this->assertCount(2, $items);
-        $this->assertEquals('Item 1', $items[0]->title());
-        $this->assertEquals('Item 2', $items[1]->title());
+        $this->assertSame('Item 1', $items[0]->title());
+        $this->assertSame('Item 2', $items[1]->title());
     }
 
-	public function testCreateCollection()
-	{
-		$menu = new Charts();
+    public function testCreateCollection()
+    {
+        $menu = new Charts();
 
-		$collection = $menu->createCollection('test');
+        $collection = $menu->createCollection('test');
 
-		$this->assertInstanceOf(ChartsCollection::class, $collection);
-		$this->assertEquals('test', $collection->name);
-		$this->assertEquals('test', $collection->name());
-	}
+        $this->assertInstanceOf(ChartsCollection::class, $collection);
+        $this->assertSame('test', $collection->name);
+        $this->assertSame('test', $collection->name());
+    }
 
-	public function testCollectCreatesNewCollection()
-	{
-		$widget = new Charts();
-		$item1 = new ChartsItem(['title' => 'Item 1']);
-		$item2 = new ChartsItem(['title' => 'Item 2']);
+    public function testCollectCreatesNewCollection()
+    {
+        $widget = new Charts();
+        $item1  = new ChartsItem(['title' => 'Item 1']);
+        $item2  = new ChartsItem(['title' => 'Item 2']);
 
-		$collection = $widget->collect('test', [$item1, $item2]);
+        $collection = $widget->collect('test', [$item1, $item2]);
 
-		$this->assertInstanceOf(ChartsCollection::class, $collection);
-		$this->assertCount(2, $collection->items());
-	}
+        $this->assertInstanceOf(ChartsCollection::class, $collection);
+        $this->assertCount(2, $collection->items());
+    }
 
-	public function testCollectUsesExistingCollection()
-	{
-		$widget = new Charts();
-		$item1 = new ChartsItem(['title' => 'Item 1']);
-		$item2 = new ChartsItem(['title' => 'Item 2']);
-		$collect1 = $widget->createCollection('test');
+    public function testCollectUsesExistingCollection()
+    {
+        $widget   = new Charts();
+        $item1    = new ChartsItem(['title' => 'Item 1']);
+        $item2    = new ChartsItem(['title' => 'Item 2']);
+        $collect1 = $widget->createCollection('test');
 
-		$collection = $widget->collect('test', [$item1, $item2]);
+        $collection = $widget->collect('test', [$item1, $item2]);
 
-		$this->assertInstanceOf(ChartsCollection::class, $collection);
-		$this->assertSame($collection, $collect1);
-		$this->assertCount(2, $collection->items());
-	}
+        $this->assertInstanceOf(ChartsCollection::class, $collection);
+        $this->assertSame($collection, $collect1);
+        $this->assertCount(2, $collection->items());
+    }
 
-	public function testGetCollection()
-	{
-		$widget = new Charts();
-		$collect1 = $widget->createCollection('test1');
-		$collect2 = $widget->createCollection('test2');
+    public function testGetCollection()
+    {
+        $widget   = new Charts();
+        $collect1 = $widget->createCollection('test1');
+        $collect2 = $widget->createCollection('test2');
 
-		$found = $widget->collection('test2');
+        $found = $widget->collection('test2');
 
-		$this->assertInstanceOf(ChartsCollection::class, $found);
-		$this->assertSame($collect2, $found);
-	}
+        $this->assertInstanceOf(ChartsCollection::class, $found);
+        $this->assertSame($collect2, $found);
+    }
 }
diff --git a/tests/Bonfire/Widgets/StatsCollectionTest.php b/tests/Bonfire/Widgets/StatsCollectionTest.php
index 35357d6d..fdfac10e 100644
--- a/tests/Bonfire/Widgets/StatsCollectionTest.php
+++ b/tests/Bonfire/Widgets/StatsCollectionTest.php
@@ -1,83 +1,95 @@
 <?php
 
+/**
+ * This file is part of Bonfire.
+ *
+ * (c) Lonnie Ezell <lonnieje@gmail.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Bonfire\Widgets;
 
 use Bonfire\Libraries\Widgets\Stats\StatsCollection;
 use Bonfire\Libraries\Widgets\Stats\StatsItem;
 use Tests\Support\TestCase;
 
-class StatsCollectionTest extends TestCase
+/**
+ * @internal
+ */
+final class StatsCollectionTest extends TestCase
 {
-	public function testExtendsStatsItem()
-	{
-		$item = new StatsCollection([
-			'bgColor' => 'bg-blue',
-			'title' => 'Item A',
-			'value' => 15,
-			'url' => '/example/foo',
-			'faIcon' => 'fa fa-users',
-		]);
-
-		$this->assertEquals('bg-blue', $item->bgColor());
-		$this->assertEquals('ITEM A', $item->title());
-		$this->assertEquals(15, $item->value());
-		$this->assertEquals('/example/foo', $item->url());
-		$this->assertEquals('fa fa-users', $item->faIcon());
-	}
-
-	public function testNames()
-	{
-		$collection = new StatsCollection();
-		$this->assertNull($collection->name());
-
-		$collection = new StatsCollection(['name' => 'Foo']);
-		$this->assertEquals('Foo', $collection->name());
-
-		$collection = new StatsCollection();
-		$collection->setName('Foo');
-		$this->assertEquals('Foo', $collection->name());
-	}
-
-	public function testWithItem()
-	{
-		$collection = new StatsCollection(['name' => 'Foo']);
-		$item1 = new StatsItem(['title' => 'Item 1']);
-		$item2 = new StatsItem(['title' => 'Item 2']);
-
-		$collection->addItem($item1);
-		$collection->addItem($item2);
-
-		$items = $collection->items();
-
-		$this->assertCount(2, $items);
-		$this->assertEquals('ITEM 1', $items[0]->title);
-		$this->assertEquals('ITEM 2', $items[1]->title);
-
-		$collection->removeItem('ITEM 1');
-
-		$items = $collection->items();
-
-		$this->assertCount(1, $items);
-		$this->assertEquals('ITEM 2', $items[0]->title);
-
-		$collection->removeAllItems();
-
-		$items = $collection->items();
-		$this->assertEquals([], $items);
-	}
-
-	public function testAddItems()
-	{
-		$collection = new StatsCollection(['name' => 'Foo']);
-		$item1 = new StatsItem(['title' => 'Item 1']);
-		$item2 = new StatsItem(['title' => 'Item 2']);
-
-		$collection->addItems([$item1, $item2]);
-
-		$items = $collection->items();
-
-		$this->assertCount(2, $items);
-		$this->assertEquals('ITEM 1', $items[0]->title);
-		$this->assertEquals('ITEM 2', $items[1]->title);
-	}
+    public function testExtendsStatsItem()
+    {
+        $item = new StatsCollection([
+            'bgColor' => 'bg-blue',
+            'title'   => 'Item A',
+            'value'   => 15,
+            'url'     => '/example/foo',
+            'faIcon'  => 'fa fa-users',
+        ]);
+
+        $this->assertSame('bg-blue', $item->bgColor());
+        $this->assertSame('ITEM A', $item->title());
+        $this->assertSame(15, $item->value());
+        $this->assertSame('/example/foo', $item->url());
+        $this->assertSame('fa fa-users', $item->faIcon());
+    }
+
+    public function testNames()
+    {
+        $collection = new StatsCollection();
+        $this->assertNull($collection->name());
+
+        $collection = new StatsCollection(['name' => 'Foo']);
+        $this->assertSame('Foo', $collection->name());
+
+        $collection = new StatsCollection();
+        $collection->setName('Foo');
+        $this->assertSame('Foo', $collection->name());
+    }
+
+    public function testWithItem()
+    {
+        $collection = new StatsCollection(['name' => 'Foo']);
+        $item1      = new StatsItem(['title' => 'Item 1']);
+        $item2      = new StatsItem(['title' => 'Item 2']);
+
+        $collection->addItem($item1);
+        $collection->addItem($item2);
+
+        $items = $collection->items();
+
+        $this->assertCount(2, $items);
+        $this->assertSame('ITEM 1', $items[0]->title);
+        $this->assertSame('ITEM 2', $items[1]->title);
+
+        $collection->removeItem('ITEM 1');
+
+        $items = $collection->items();
+
+        $this->assertCount(1, $items);
+        $this->assertSame('ITEM 2', $items[0]->title);
+
+        $collection->removeAllItems();
+
+        $items = $collection->items();
+        $this->assertSame([], $items);
+    }
+
+    public function testAddItems()
+    {
+        $collection = new StatsCollection(['name' => 'Foo']);
+        $item1      = new StatsItem(['title' => 'Item 1']);
+        $item2      = new StatsItem(['title' => 'Item 2']);
+
+        $collection->addItems([$item1, $item2]);
+
+        $items = $collection->items();
+
+        $this->assertCount(2, $items);
+        $this->assertSame('ITEM 1', $items[0]->title);
+        $this->assertSame('ITEM 2', $items[1]->title);
+    }
 }
diff --git a/tests/Bonfire/Widgets/StatsItemTest.php b/tests/Bonfire/Widgets/StatsItemTest.php
index d398dc43..86aed409 100644
--- a/tests/Bonfire/Widgets/StatsItemTest.php
+++ b/tests/Bonfire/Widgets/StatsItemTest.php
@@ -1,42 +1,54 @@
 <?php
 
+/**
+ * This file is part of Bonfire.
+ *
+ * (c) Lonnie Ezell <lonnieje@gmail.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Bonfire\Widgets;
 
 use Bonfire\Libraries\Widgets\Stats\StatsItem;
 use Tests\Support\TestCase;
 
-class StatsItemTest extends TestCase
+/**
+ * @internal
+ */
+final class StatsItemTest extends TestCase
 {
     public function testBasicDetails()
     {
         $item = new StatsItem();
         $item->setTitle('Item A')
-			->setBgColor('bg-blue')
-			->setFaIcon('fa fa-users')
+            ->setBgColor('bg-blue')
+            ->setFaIcon('fa fa-users')
             ->setUrl('/example/foo')
-			->setValue(5);
+            ->setValue(5);
 
-        $this->assertEquals('ITEM A', $item->title());
-		$this->assertEquals('bg-blue', $item->bgColor());
-		$this->assertEquals('fa fa-users', $item->faIcon());
-		$this->assertEquals('/example/foo', $item->url());
-        $this->assertEquals(5, $item->value());
+        $this->assertSame('ITEM A', $item->title());
+        $this->assertSame('bg-blue', $item->bgColor());
+        $this->assertSame('fa fa-users', $item->faIcon());
+        $this->assertSame('/example/foo', $item->url());
+        $this->assertSame(5, $item->value());
     }
 
     public function testConstructorFill()
     {
         $item = new StatsItem([
-			'title' => 'Item A',
-			'bgColor' => 'bg-blue',
-			'faIcon' => 'fa fa-users',
-			'url' => '/example/foo',
-			'value' => 5,
-		]);
+            'title'   => 'Item A',
+            'bgColor' => 'bg-blue',
+            'faIcon'  => 'fa fa-users',
+            'url'     => '/example/foo',
+            'value'   => 5,
+        ]);
 
-		$this->assertEquals('ITEM A', $item->title());
-		$this->assertEquals('bg-blue', $item->bgColor());
-		$this->assertEquals('fa fa-users', $item->faIcon());
-		$this->assertEquals('/example/foo', $item->url());
-		$this->assertEquals(5, $item->value());
+        $this->assertSame('ITEM A', $item->title());
+        $this->assertSame('bg-blue', $item->bgColor());
+        $this->assertSame('fa fa-users', $item->faIcon());
+        $this->assertSame('/example/foo', $item->url());
+        $this->assertSame(5, $item->value());
     }
 }
diff --git a/tests/Bonfire/Widgets/StatsTest.php b/tests/Bonfire/Widgets/StatsTest.php
index 4319dc69..7f47ce82 100644
--- a/tests/Bonfire/Widgets/StatsTest.php
+++ b/tests/Bonfire/Widgets/StatsTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of Bonfire.
+ *
+ * (c) Lonnie Ezell <lonnieje@gmail.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Bonfire\Widgets;
 
 use Bonfire\Libraries\Widgets\Stats\Stats;
@@ -7,70 +16,73 @@
 use Bonfire\Libraries\Widgets\Stats\StatsItem;
 use Tests\Support\TestCase;
 
-class StatsTest extends TestCase
+/**
+ * @internal
+ */
+final class StatsTest extends TestCase
 {
     public function testWithItems()
     {
         $widget = new Stats();
-        $item1 = new StatsItem(['title' => 'Item 1']);
-        $item2 = new StatsItem(['title' => 'Item 2']);
+        $item1  = new StatsItem(['title' => 'Item 1']);
+        $item2  = new StatsItem(['title' => 'Item 2']);
 
-		$widget->addItem($item1)
+        $widget->addItem($item1)
             ->addItem($item2);
 
         $items = $widget->items();
 
         $this->assertCount(2, $items);
-        $this->assertEquals('ITEM 1', $items[0]->title);
-        $this->assertEquals('ITEM 2', $items[1]->title);
+        $this->assertSame('ITEM 1', $items[0]->title);
+        $this->assertSame('ITEM 2', $items[1]->title);
     }
 
-	public function testCreateCollection()
-	{
-		$menu = new Stats();
+    public function testCreateCollection()
+    {
+        $menu = new Stats();
 
-		$collection = $menu->createCollection('test');
+        $collection = $menu->createCollection('test');
 
-		$this->assertInstanceOf(StatsCollection::class, $collection);
-		$this->assertEquals('test', $collection->name);
-		$this->assertEquals('test', $collection->name());
-	}
+        $this->assertInstanceOf(StatsCollection::class, $collection);
+        $this->assertSame('test', $collection->name);
+        $this->assertSame('test', $collection->name());
+    }
 
-	public function testCollectCreatesNewCollection()
-	{
-		$widget = new Stats();
-		$item1 = new StatsItem(['title' => 'Item 1']);
-		$item2 = new StatsItem(['title' => 'Item 2']);
+    public function testCollectCreatesNewCollection()
+    {
+        $widget = new Stats();
+        $item1  = new StatsItem(['title' => 'Item 1']);
+        $item2  = new StatsItem(['title' => 'Item 2']);
 
-		$collection = $widget->collect('test', [$item1, $item2]);
+        $collection = $widget->collect('test', [$item1, $item2]);
 
-		$this->assertInstanceOf(StatsCollection::class, $collection);
-		$this->assertCount(2, $collection->items());
-	}
+        $this->assertInstanceOf(StatsCollection::class, $collection);
+        $this->assertCount(2, $collection->items());
+    }
 
-	public function testCollectUsesExistingCollection()
-	{
-		$widget = new Stats();
-		$item1 = new StatsItem(['title' => 'Item 1']);
-		$item2 = new StatsItem(['title' => 'Item 2']);
-		$collect1 = $widget->createCollection('test');
+    public function testCollectUsesExistingCollection()
+    {
+        $widget   = new Stats();
+        $item1    = new StatsItem(['title' => 'Item 1']);
+        $item2    = new StatsItem(['title' => 'Item 2']);
+        $collect1 = $widget->createCollection('test');
 
-		$collection = $widget->collect('test', [$item1, $item2]);
+        $collection = $widget->collect('test', [$item1, $item2]);
 
-		$this->assertInstanceOf(StatsCollection::class, $collection);
-		$this->assertSame($collection, $collect1);
-		$this->assertCount(2, $collection->items());
-	}
+        $this->assertInstanceOf(StatsCollection::class, $collection);
+        $this->assertSame($collection, $collect1);
+        $this->assertCount(2, $collection->items());
+    }
 
-	public function testGetCollection()
-	{
-		$widget = new Stats();
-		$collect1 = $widget->createCollection('test1');
-		$collect2 = $widget->createCollection('test2');
+    public function testGetCollection()
+    {
+        $widget   = new Stats();
+        $collect1 = $widget->createCollection('test1');
+        $collect2 = $widget->createCollection('test2');
 
-		$found = $widget->collection('test2');
+        $found = $widget->collection('test2');
 
-		$this->assertInstanceOf(StatsCollection::class, $found);
-		$this->assertSame($collect2, $found);
-	}
+        $this->assertInstanceOf(StatsCollection::class, $found);
+        $this->assertSame($collect2, $found);
+    }
 }