diff --git a/tests/system/Helpers/CookieHelperTest.php b/tests/system/Helpers/CookieHelperTest.php
index e1ae2dfc02..b8d75ad578 100755
--- a/tests/system/Helpers/CookieHelperTest.php
+++ b/tests/system/Helpers/CookieHelperTest.php
@@ -1,7 +1,11 @@
-<?php namespace CodeIgniter\HTTP;
+<?php
+namespace CodeIgniter\Helpers;
 
 use Config\App;
 use CodeIgniter\Config\Services;
+use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\HTTP\URI;
+use CodeIgniter\HTTP\UserAgent;
 use Tests\Support\HTTP\MockResponse;
 
 final class CookieHelperTest extends \CIUnitTestCase
diff --git a/tests/system/Helpers/DateHelperTest.php b/tests/system/Helpers/DateHelperTest.php
index bb6bea584b..3dde3beb1b 100644
--- a/tests/system/Helpers/DateHelperTest.php
+++ b/tests/system/Helpers/DateHelperTest.php
@@ -1,4 +1,5 @@
-<?php namespace CodeIgniter\HTTP;
+<?php
+namespace CodeIgniter\Helpers;
 
 use Config\App;
 use CodeIgniter\Config\Services;
@@ -31,7 +32,7 @@ final class DateHelperTest extends \CIUnitTestCase
 	public function testNowSpecific()
 	{
 		// Chicago should be two hours ahead of Vancouver
-		$this->assertEquals(7200,now('America/Chicago')-now('America/Vancouver'));
+		$this->assertEquals(7200, now('America/Chicago') - now('America/Vancouver'));
 	}
 
 }
diff --git a/tests/system/Helpers/HTMLHelperTest.php b/tests/system/Helpers/HTMLHelperTest.php
index 671406c9db..d07b075e7f 100755
--- a/tests/system/Helpers/HTMLHelperTest.php
+++ b/tests/system/Helpers/HTMLHelperTest.php
@@ -1,4 +1,5 @@
-<?php namespace CodeIgniter\HTTP;
+<?php
+namespace CodeIgniter\Helpers;
 
 final class HTMLHelperTest extends \CIUnitTestCase
 {
diff --git a/tests/system/Helpers/InflectorHelperTest.php b/tests/system/Helpers/InflectorHelperTest.php
index 410a14a341..740e6daa92 100755
--- a/tests/system/Helpers/InflectorHelperTest.php
+++ b/tests/system/Helpers/InflectorHelperTest.php
@@ -1,5 +1,5 @@
-<?php namespace CodeIgniter\HTTP;
-
+<?php
+namespace CodeIgniter\Helpers;
 
 final class InflectorHelperTest extends \CIUnitTestCase
 {
diff --git a/tests/system/Helpers/NumberHelperTest.php b/tests/system/Helpers/NumberHelperTest.php
index 4c5b437a4d..7f76859786 100755
--- a/tests/system/Helpers/NumberHelperTest.php
+++ b/tests/system/Helpers/NumberHelperTest.php
@@ -1,6 +1,7 @@
-<?php namespace CodeIgniter\HTTP;
+<?php
+namespace CodeIgniter\Helpers;
 
-class numberHelperTest extends \CIUnitTestCase
+final class NumberHelperTest extends \CIUnitTestCase
 {
 
 	public function setUp()