diff --git a/tests/API/CacheTraitTest.php b/tests/API/CacheTraitTest.php
index a221e4e4..596d3032 100644
--- a/tests/API/CacheTraitTest.php
+++ b/tests/API/CacheTraitTest.php
@@ -17,8 +17,9 @@
 namespace Aviat\AnimeClient\Tests\API;
 
 use Aviat\AnimeClient\API\CacheTrait;
+use Aviat\AnimeClient\Tests\AnimeClient_TestCase;
 
-class CacheTraitTest extends \AnimeClient_TestCase {
+class CacheTraitTest extends AnimeClient_TestCase {
 	public function setUp()
 	{
 		parent::setUp();
diff --git a/tests/API/Kitsu/Transformer/AnimeListTransformerTest.php b/tests/API/Kitsu/Transformer/AnimeListTransformerTest.php
index a18ace95..357c57d2 100644
--- a/tests/API/Kitsu/Transformer/AnimeListTransformerTest.php
+++ b/tests/API/Kitsu/Transformer/AnimeListTransformerTest.php
@@ -16,8 +16,8 @@
 
 namespace Aviat\AnimeClient\Tests\API\Kitsu\Transformer;
 
-use AnimeClient_TestCase;
 use Aviat\AnimeClient\API\Kitsu\Transformer\AnimeListTransformer;
+use Aviat\AnimeClient\Tests\AnimeClient_TestCase;
 use Aviat\Ion\Friend;
 use Aviat\Ion\Json;
 
diff --git a/tests/API/Kitsu/Transformer/AnimeTransformerTest.php b/tests/API/Kitsu/Transformer/AnimeTransformerTest.php
index a0adae93..9aa74952 100644
--- a/tests/API/Kitsu/Transformer/AnimeTransformerTest.php
+++ b/tests/API/Kitsu/Transformer/AnimeTransformerTest.php
@@ -16,8 +16,8 @@
 
 namespace Aviat\AnimeClient\Tests\API\Kitsu\Transformer;
 
-use AnimeClient_TestCase;
 use Aviat\AnimeClient\API\Kitsu\Transformer\AnimeTransformer;
+use Aviat\AnimeClient\Tests\AnimeClient_TestCase;
 use Aviat\Ion\Friend;
 use Aviat\Ion\Json;
 
diff --git a/tests/API/Kitsu/Transformer/MangaListTransformerTest.php b/tests/API/Kitsu/Transformer/MangaListTransformerTest.php
index 9c229a7a..cb05de12 100644
--- a/tests/API/Kitsu/Transformer/MangaListTransformerTest.php
+++ b/tests/API/Kitsu/Transformer/MangaListTransformerTest.php
@@ -16,9 +16,9 @@
 
 namespace Aviat\AnimeClient\Tests\API\Kitsu\Transformer;
 
-use AnimeClient_TestCase;
 use Aviat\AnimeClient\API\JsonAPI;
 use Aviat\AnimeClient\API\Kitsu\Transformer\MangaListTransformer;
+use Aviat\AnimeClient\Tests\AnimeClient_TestCase;
 use Aviat\Ion\Json;
 
 class MangaListTransformerTest extends AnimeClient_TestCase {
diff --git a/tests/API/Kitsu/Transformer/MangaTransformerTest.php b/tests/API/Kitsu/Transformer/MangaTransformerTest.php
index 1f2df8cd..7be8e844 100644
--- a/tests/API/Kitsu/Transformer/MangaTransformerTest.php
+++ b/tests/API/Kitsu/Transformer/MangaTransformerTest.php
@@ -16,9 +16,9 @@
 
 namespace Aviat\AnimeClient\Tests\API\Kitsu\Transformer;
 
-use AnimeClient_TestCase;
 use Aviat\AnimeClient\API\JsonAPI;
 use Aviat\AnimeClient\API\Kitsu\Transformer\MangaTransformer;
+use Aviat\AnimeClient\Tests\AnimeClient_TestCase;
 use Aviat\Ion\Json;
 
 class MangaTransformerTest extends AnimeClient_TestCase {
diff --git a/tests/AnimeClientTest.php b/tests/AnimeClientTest.php
index 0d75a480..a62c1791 100644
--- a/tests/AnimeClientTest.php
+++ b/tests/AnimeClientTest.php
@@ -1,13 +1,13 @@
 <?php
 
+namespace Aviat\AnimeClient\Tests;
 
 class AnimeClientTest extends AnimeClient_TestCase {
-
 	/**
 	 * Basic sanity test for _dir function
 	 */
 	public function testDir()
 	{
-		$this->assertEquals('foo' . DIRECTORY_SEPARATOR . 'bar', \_dir('foo', 'bar'));
+		$this->assertEquals('foo' . \DIRECTORY_SEPARATOR . 'bar', \_dir('foo', 'bar'));
 	}
 }
diff --git a/tests/AnimeClient_TestCase.php b/tests/AnimeClient_TestCase.php
index 90733e39..3bd39053 100644
--- a/tests/AnimeClient_TestCase.php
+++ b/tests/AnimeClient_TestCase.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Aviat\AnimeClient\Tests;
+
 use const Aviat\AnimeClient\SRC_DIR;
 
 use Aura\Web\WebFactory;
diff --git a/tests/Command/BaseCommandTest.php b/tests/Command/BaseCommandTest.php
index 76b7c91a..317a5a11 100644
--- a/tests/Command/BaseCommandTest.php
+++ b/tests/Command/BaseCommandTest.php
@@ -1,6 +1,9 @@
 <?php
 
+namespace Aviat\AnimeClient\Tests\Command;
+
 use Aviat\AnimeClient\Command\BaseCommand;
+use Aviat\AnimeClient\Tests\AnimeClient_TestCase;
 use Aviat\Ion\Friend;
 use ConsoleKit\Console;
 
diff --git a/tests/ControllerTest.php b/tests/ControllerTest.php
index b63b3598..477ab812 100644
--- a/tests/ControllerTest.php
+++ b/tests/ControllerTest.php
@@ -1,4 +1,7 @@
 <?php declare(strict_types=1);
+
+namespace Aviat\AnimeClient\Tests;
+
 use Aura\Router\RouterFactory;
 use Aura\Web\WebFactory;
 use Aviat\AnimeClient\Controller;
diff --git a/tests/DispatcherTest.php b/tests/DispatcherTest.php
index 5f0e0792..74b74fca 100644
--- a/tests/DispatcherTest.php
+++ b/tests/DispatcherTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Aviat\AnimeClient\Tests;
+
 use Aviat\AnimeClient\Dispatcher;
 use Aviat\AnimeClient\UrlGenerator;
 use Aviat\Ion\Config;
@@ -53,7 +55,7 @@ class DispatcherTest extends AnimeClient_TestCase {
 
 	public function dataRoute()
 	{
-		$default_config = array(
+		$default_config = [
 			'routes' => [
 				'routes' => [
 					'login_form' => [
@@ -88,33 +90,33 @@ class DispatcherTest extends AnimeClient_TestCase {
 					'default_list' => 'anime'
 				]
 			],
-		);
+		];
 
 		$data = [
-			'anime_default_routing_manga' => array(
+			'anime_default_routing_manga' => [
 				'config' => $default_config,
 				'controller' => 'manga',
 				'host' => "localhost",
 				'uri' => "/manga/plan_to_read",
-			),
-			'manga_default_routing_anime' => array(
+			],
+			'manga_default_routing_anime' => [
 				'config' => $default_config,
 				'controller' => 'anime',
 				'host' => "localhost",
 				'uri' => "/anime/watching",
-			),
-			'anime_default_routing_anime' => array(
+			],
+			'anime_default_routing_anime' => [
 				'config' => $default_config,
 				'controller' => 'anime',
 				'host' => 'localhost',
 				'uri' => '/anime/watching',
-			),
-			'manga_default_routing_manga' => array(
+			],
+			'manga_default_routing_manga' => [
 				'config' => $default_config,
 				'controller' => 'manga',
 				'host' => 'localhost',
 				'uri' => '/manga/plan_to_read'
-			)
+			]
 		];
 
 		$data['manga_default_routing_anime']['config']['routes']['route_config']['default_list'] = 'manga';
diff --git a/tests/Helper/MenuHelperTest.php b/tests/Helper/MenuHelperTest.php
index 38740428..bf5c37d0 100644
--- a/tests/Helper/MenuHelperTest.php
+++ b/tests/Helper/MenuHelperTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Aviat\AnimeClient\Tests;
+
 use Aviat\AnimeClient\Helper\Menu as MenuHelper;
 
 class MenuHelperTest extends AnimeClient_TestCase {
diff --git a/tests/MenuGeneratorTest.php b/tests/MenuGeneratorTest.php
index 7bf2e14f..003404b2 100644
--- a/tests/MenuGeneratorTest.php
+++ b/tests/MenuGeneratorTest.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Aviat\AnimeClient\Tests;
+
 use Aviat\AnimeClient\MenuGenerator;
 use Aviat\Ion\Friend;
 
diff --git a/tests/RequirementsTest.php b/tests/RequirementsTest.php
index 9b5ef3e8..620fde17 100644
--- a/tests/RequirementsTest.php
+++ b/tests/RequirementsTest.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Aviat\AnimeClient\Tests;
+
+use PDO;
+
 class RequirementsTest extends AnimeClient_TestCase {
 
 	public function testPHPVersion()
diff --git a/tests/RoutingBaseTest.php b/tests/RoutingBaseTest.php
index dc44ad82..6c6c9e66 100644
--- a/tests/RoutingBaseTest.php
+++ b/tests/RoutingBaseTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Aviat\AnimeClient\Tests;
+
 use Aviat\AnimeClient\RoutingBase;
 
 class RoutingBaseTest extends AnimeClient_TestCase {
diff --git a/tests/TestSessionHandler.php b/tests/TestSessionHandler.php
index 16537a4e..1c439cbd 100644
--- a/tests/TestSessionHandler.php
+++ b/tests/TestSessionHandler.php
@@ -1,6 +1,8 @@
 <?php
 
-class TestSessionHandler implements SessionHandlerInterface {
+namespace Aviat\AnimeClient\Tests;
+
+class TestSessionHandler implements \SessionHandlerInterface {
 	
 	public $data = [];
 	public $save_path = './test_data/sessions';
diff --git a/tests/UrlGeneratorTest.php b/tests/UrlGeneratorTest.php
index efb77a58..6faca7c9 100644
--- a/tests/UrlGeneratorTest.php
+++ b/tests/UrlGeneratorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Aviat\AnimeClient\Tests;
+
 use Aviat\AnimeClient\UrlGenerator;
 use Aviat\Ion\Config;
 
diff --git a/tests/UtilTest.php b/tests/UtilTest.php
index de9e8840..a9e30d88 100644
--- a/tests/UtilTest.php
+++ b/tests/UtilTest.php
@@ -4,7 +4,7 @@ namespace Aviat\AnimeClient\Tests;
 
 use Aviat\AnimeClient\Util;
 
-class UtilTest extends \AnimeClient_TestCase {
+class UtilTest extends AnimeClient_TestCase {
 
 	public function setUp()
 	{
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 95115763..9267755f 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -37,8 +37,8 @@ require _dir(__DIR__, '../vendor/autoload.php');
 // Ini Settings
 // -----------------------------------------------------------------------------
 ini_set('session.use_cookies', 0);
-ini_set("session.use_only_cookies",0);
-ini_set("session.use_trans_sid",1);
+ini_set("session.use_only_cookies", 0);
+ini_set("session.use_trans_sid", 1);
 // Start session here to supress error about headers not sent
 session_start();