diff --git a/application/Config/Autoload.php b/application/Config/Autoload.php
index 0dab676ce6..7ac3add13e 100644
--- a/application/Config/Autoload.php
+++ b/application/Config/Autoload.php
@@ -1,6 +1,6 @@
 <?php namespace Config;
 
-require BASEPATH.'Config/AutoloadConfig.php';
+require_once BASEPATH.'Config/AutoloadConfig.php';
 
 /**
  * -------------------------------------------------------------------
diff --git a/composer.json b/composer.json
index 6a786144bd..0317413577 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,8 @@
 	},
 	"autoload": {
 		"psr-4": {
-			"CodeIgniter\\": "system/"
+			"CodeIgniter\\": "system/",
+			"Psr\\Log\\": "system/ThirdParty/PSR/Log/"
 		}
 	},
 	"require": {
diff --git a/system/API/ResponseTrait.php b/system/API/ResponseTrait.php
index 3d7d6477ce..426e41a76e 100644
--- a/system/API/ResponseTrait.php
+++ b/system/API/ResponseTrait.php
@@ -344,16 +344,15 @@ trait ResponseTrait
 			return $data;
 		}
 
+		// Determine correct response type through content negotiation
+		$config = new Format();
+		$format = $this->request->negotiate('media', $config->supportedResponseFormats, true);
+
+		$this->response->setContentType($format);
+
 		// if we don't have a formatter, make one
 		if ( ! isset($this->formatter))
 		{
-			$config = new Format();
-
-			// Determine correct response type through content negotiation
-			$format = $this->request->negotiate('media', $config->supportedResponseFormats, true);
-
-			$this->response->setContentType($format);
-
 			// if no formatter, use the default
 			$this->formatter = $config->getFormatter($format);
 		}
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index e689f781f5..412fa7447d 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -36,6 +36,7 @@
  * @filesource
  */
 use CodeIgniter\HTTP\RedirectResponse;
+use CodeIgniter\HTTP\Request;
 use Config\Services;
 use Config\Cache;
 use CodeIgniter\HTTP\URI;
@@ -180,8 +181,12 @@ class CodeIgniter
 	 * makes all of the pieces work together.
 	 *
 	 * @param \CodeIgniter\Router\RouteCollectionInterface $routes
+	 * @param bool                                         $returnResponse
+	 *
+	 * @throws \CodeIgniter\HTTP\RedirectException
+	 * @throws \Exception
 	 */
-	public function run(RouteCollectionInterface $routes = null)
+	public function run(RouteCollectionInterface $routes = null, bool $returnResponse = false)
 	{
 		$this->startBenchmark();
 
@@ -201,7 +206,7 @@ class CodeIgniter
 
 		try
 		{
-			$this->handleRequest($routes, $cacheConfig);
+			return $this->handleRequest($routes, $cacheConfig, $returnResponse);
 		} catch (Router\RedirectException $e)
 		{
 			$logger = Services::logger();
@@ -225,8 +230,11 @@ class CodeIgniter
 	 *
 	 * @param \CodeIgniter\Router\RouteCollectionInterface $routes
 	 * @param                                              $cacheConfig
+	 * @param bool                                         $returnResponse
+	 *
+	 * @throws \CodeIgniter\Filters\Exceptions\FilterException
 	 */
-	protected function handleRequest(RouteCollectionInterface $routes = null, $cacheConfig)
+	protected function handleRequest(RouteCollectionInterface $routes = null, $cacheConfig, bool $returnResponse = false)
 	{
 		$this->tryToRouteIt($routes);
 
@@ -257,6 +265,11 @@ class CodeIgniter
 		// Handle any redirects
 		if ($returned instanceof RedirectResponse)
 		{
+			if ($returnResponse)
+			{
+				return $returned;
+			}
+
 			$this->callExit(EXIT_SUCCESS);
 		}
 
@@ -279,12 +292,17 @@ class CodeIgniter
 
 		unset($uri);
 
-		$this->sendResponse();
+		if (! $returnResponse)
+		{
+			$this->sendResponse();
+		}
 
 		//--------------------------------------------------------------------
 		// Is there a post-system event?
 		//--------------------------------------------------------------------
 		Events::trigger('post_system');
+
+		return $this->response;
 	}
 
 	//--------------------------------------------------------------------
@@ -358,6 +376,23 @@ class CodeIgniter
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Sets a Request object to be used for this request.
+	 * Used when running certain tests.
+	 *
+	 * @param \CodeIgniter\HTTP\Request $request
+	 *
+	 * @return \CodeIgniter\CodeIgniter
+	 */
+	public function setRequest(Request $request)
+	{
+		$this->request = $request;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
 	/**
 	 * Get our Request object, (either IncomingRequest or CLIRequest)
 	 * and set the server protocol based on the information provided
@@ -365,6 +400,11 @@ class CodeIgniter
 	 */
 	protected function getRequestObject()
 	{
+		if ($this->request instanceof Request)
+		{
+			return;
+		}
+
 		if (is_cli() && ! (ENVIRONMENT == 'testing'))
 		{
 			$this->request = Services::clirequest($this->config);
diff --git a/system/Common.php b/system/Common.php
index f0dd7986b4..48bb5bddbe 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -435,7 +435,7 @@ if ( ! function_exists('log_message'))
 		// for asserting that logs were called in the test code.
 		if (ENVIRONMENT == 'testing')
 		{
-			$logger = new \CodeIgniter\Log\TestLogger(new \Config\Logger());
+			$logger = new \Tests\Support\Log\TestLogger(new \Config\Logger());
 
 			return $logger->log($level, $message, $context);
 		}
diff --git a/system/Config/AutoloadConfig.php b/system/Config/AutoloadConfig.php
index 60f92392f2..b75ac52424 100644
--- a/system/Config/AutoloadConfig.php
+++ b/system/Config/AutoloadConfig.php
@@ -91,7 +91,7 @@ class AutoloadConfig
 
 		if (isset($_SERVER['CI_ENVIRONMENT']) && $_SERVER['CI_ENVIRONMENT'] === 'testing')
 		{
-			$this->psr4['Tests\Support'] = BASEPATH . '../tests/_support/';
+			$this->psr4['Tests\Support'] = BASEPATH . '../tests/_support';
 		}
 
 		/**
diff --git a/system/Config/Services.php b/system/Config/Services.php
index e51b18003d..aa37a8ee67 100644
--- a/system/Config/Services.php
+++ b/system/Config/Services.php
@@ -37,7 +37,9 @@
  */
 use CodeIgniter\Database\ConnectionInterface;
 use CodeIgniter\Database\MigrationRunner;
+use CodeIgniter\HTTP\URI;
 use CodeIgniter\View\RendererInterface;
+use Config\App;
 
 /**
  * Services Configuration file.
@@ -546,7 +548,7 @@ class Services
 
 		if ( ! is_object($config))
 		{
-			$config = new \Config\App();
+			$config = new App();
 		}
 
 		return new \CodeIgniter\HTTP\IncomingRequest(
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index bc63f7afc3..9399626d63 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -410,6 +410,11 @@ class Toolbar
 	{
 		self::$request = Services::request();
 
+		if(ENVIRONMENT == 'testing')
+		{
+			return;
+		}
+
 		// If the request contains '?debugbar then we're
 		// simply returning the loading script
 		if (self::$request->getGet('debugbar') !== null)
diff --git a/system/Debug/Toolbar/toolbarloader.js.php b/system/Debug/Toolbar/toolbarloader.js.php
index 17ab879f63..7aafb90ad6 100644
--- a/system/Debug/Toolbar/toolbarloader.js.php
+++ b/system/Debug/Toolbar/toolbarloader.js.php
@@ -1,3 +1,4 @@
+<?php if (ENVIRONMENT != 'testing') : ?>
 document.addEventListener('DOMContentLoaded', loadDoc, false);
 
 function loadDoc(time) {
@@ -56,3 +57,4 @@ function newXHR() {
 }
 
 window.XMLHttpRequest = newXHR;
+<?php endif; ?>
diff --git a/system/Events/Events.php b/system/Events/Events.php
index 8881ba8ce1..108690efa9 100644
--- a/system/Events/Events.php
+++ b/system/Events/Events.php
@@ -290,7 +290,7 @@ class Events
 	 *
 	 * @param string $path
 	 */
-	public function setFile(string $path)
+	public static function setFile(string $path)
 	{
 		self::$eventsFile = $path;
 	}
diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index 8e2a887f93..81fc864fde 100755
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -322,7 +322,7 @@ class IncomingRequest extends Request
 	 */
 	public function getVar($index = null, $filter = null, $flags = null)
 	{
-		return $this->fetchGlobal(INPUT_REQUEST, $index, $filter, $flags);
+		return $this->fetchGlobal('request', $index, $filter, $flags);
 	}
 
 	//--------------------------------------------------------------------
@@ -375,7 +375,7 @@ class IncomingRequest extends Request
 	 */
 	public function getGet($index = null, $filter = null, $flags = null)
 	{
-		return $this->fetchGlobal(INPUT_GET, $index, $filter, $flags);
+		return $this->fetchGlobal('get', $index, $filter, $flags);
 	}
 
 	//--------------------------------------------------------------------
@@ -391,7 +391,7 @@ class IncomingRequest extends Request
 	 */
 	public function getPost($index = null, $filter = null, $flags = null)
 	{
-		return $this->fetchGlobal(INPUT_POST, $index, $filter, $flags);
+		return $this->fetchGlobal('post', $index, $filter, $flags);
 	}
 
 	//--------------------------------------------------------------------
@@ -445,7 +445,7 @@ class IncomingRequest extends Request
 	 */
 	public function getCookie($index = null, $filter = null, $flags = null)
 	{
-		return $this->fetchGlobal(INPUT_COOKIE, $index, $filter, $flags);
+		return $this->fetchGlobal('cookie', $index, $filter, $flags);
 	}
 
 	//--------------------------------------------------------------------
@@ -478,7 +478,9 @@ class IncomingRequest extends Request
 		// If the session hasn't been started, or no
 		// data was previously saved, we're done.
 		if (empty($_SESSION['_ci_old_input']))
+		{
 			return;
+		}
 
 		// Check for the value in the POST array first.
 		if (isset($_SESSION['_ci_old_input']['post'][$key]))
@@ -616,7 +618,7 @@ class IncomingRequest extends Request
 				break;
 			case 'PATH_INFO':
 			default:
-				$path = $_SERVER[$protocol] ?? $this->parseRequestURI();
+				$path = $this->fetchGlobal('server', $protocol) ?? $this->parseRequestURI();
 				break;
 		}
 
diff --git a/system/HTTP/Message.php b/system/HTTP/Message.php
index eb4b1da13e..1d9634e1dd 100644
--- a/system/HTTP/Message.php
+++ b/system/HTTP/Message.php
@@ -362,7 +362,7 @@ class Message
 	 */
 	public function getProtocolVersion(): string
 	{
-		return $this->protocolVersion;
+		return $this->protocolVersion ?? '1.1';
 	}
 
 	//--------------------------------------------------------------------
diff --git a/system/HTTP/Request.php b/system/HTTP/Request.php
index 23da4365dc..139a457efe 100644
--- a/system/HTTP/Request.php
+++ b/system/HTTP/Request.php
@@ -64,6 +64,13 @@ class Request extends Message implements RequestInterface
 	 */
 	protected $method;
 
+	/**
+	 * Stores values we've retrieved from
+	 * PHP globals.
+	 * @var array
+	 */
+	protected $globals = [];
+
 	//--------------------------------------------------------------------
 
 	/**
@@ -281,7 +288,7 @@ class Request extends Message implements RequestInterface
 	 */
 	public function getServer($index = null, $filter = null, $flags = null)
 	{
-		return $this->fetchGlobal(INPUT_SERVER, $index, $filter, $flags);
+		return $this->fetchGlobal('server', $index, $filter, $flags);
 	}
 
 	//--------------------------------------------------------------------
@@ -297,7 +304,24 @@ class Request extends Message implements RequestInterface
 	 */
 	public function getEnv($index = null, $filter = null, $flags = null)
 	{
-		return $this->fetchGlobal(INPUT_ENV, $index, $filter, $flags);
+		return $this->fetchGlobal('env', $index, $filter, $flags);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Allows manually setting the value of PHP global, like $_GET, $_POST, etc.
+	 *
+	 * @param string $method
+	 * @param        $value
+	 *
+	 * @return $this
+	 */
+	public function setGlobal(string $method, $value)
+	{
+		$this->globals[$method] = $value;
+
+		return $this;
 	}
 
 	//--------------------------------------------------------------------
@@ -312,45 +336,37 @@ class Request extends Message implements RequestInterface
 	 *
 	 * http://php.net/manual/en/filter.filters.sanitize.php
 	 *
-	 * @param int          $type   Input filter constant
+	 * @param int          $method Input filter constant
 	 * @param string|array $index
 	 * @param int          $filter Filter constant
 	 * @param null         $flags
 	 *
 	 * @return mixed
 	 */
-	protected function fetchGlobal($type, $index = null, $filter = null, $flags = null )
+	public function fetchGlobal($method, $index = null, $filter = null, $flags = null )
 	{
+		$method = strtolower($method);
+
+		if (! isset($this->globals[$method]))
+		{
+			$this->populateGlobals($method);
+		}
+
 		// Null filters cause null values to return.
 		if (is_null($filter))
 		{
 			$filter = FILTER_DEFAULT;
 		}
 
-		$loopThrough = [];
-		switch ($type)
-		{
-			case INPUT_GET : $loopThrough = $_GET;
-				break;
-			case INPUT_POST : $loopThrough = $_POST;
-				break;
-			case INPUT_COOKIE : $loopThrough = $_COOKIE;
-				break;
-			case INPUT_SERVER : $loopThrough = $_SERVER;
-				break;
-			case INPUT_ENV : $loopThrough = $_ENV;
-				break;
-			case INPUT_REQUEST : $loopThrough = $_REQUEST;
-				break;
-		}
-
-		// If $index is null, it means that the whole input type array is requested
+		// Return all values when $index is null
 		if (is_null($index))
 		{
 			$values = [];
-			foreach ($loopThrough as $key => $value)
+			foreach ($this->globals[$method] as $key => $value)
 			{
-				$values[$key] = is_array($value) ? $this->fetchGlobal($type, $key, $filter, $flags) : filter_var($value, $filter, $flags);
+				$values[$key] = is_array($value)
+					? $this->fetchGlobal($method, $key, $filter, $flags)
+					: filter_var($value, $filter, $flags);
 			}
 
 			return $values;
@@ -363,7 +379,7 @@ class Request extends Message implements RequestInterface
 
 			foreach ($index as $key)
 			{
-				$output[$key] = $this->fetchGlobal($type, $key, $filter, $flags);
+				$output[$key] = $this->fetchGlobal($method, $key, $filter, $flags);
 			}
 
 			return $output;
@@ -372,7 +388,7 @@ class Request extends Message implements RequestInterface
 		// Does the index contain array notation?
 		if (($count = preg_match_all('/(?:^[^\[]+)|\[[^]]*\]/', $index, $matches)) > 1)
 		{
-			$value = $loopThrough;
+			$value = $this->globals[$method];
 			for ($i = 0; $i < $count; $i++)
 			{
 				$key = trim($matches[0][$i], '[]');
@@ -393,14 +409,12 @@ class Request extends Message implements RequestInterface
 			}
 		}
 
-		// Due to issues with FastCGI and testing,
-		// we need to do these all manually instead
-		// of the simpler filter_input();
 		if (empty($value))
 		{
-			$value = $loopThrough[$index] ?? null;
+			$value = $this->globals[$method][$index] ?? null;
 		}
 
+		// Cannot filter these types of data automatically...
 		if (is_array($value) || is_object($value) || is_null($value))
 		{
 			return $value;
@@ -410,4 +424,39 @@ class Request extends Message implements RequestInterface
 	}
 
 	//--------------------------------------------------------------------
+
+	/**
+	 * Saves a copy of the current state of one of several PHP globals
+	 * so we can retrieve them later.
+	 *
+	 * @param string $method
+	 */
+	protected function populateGlobals(string $method)
+	{
+		if (! isset($this->globals[$method]))
+		{
+			$this->globals[$method] = [];
+		}
+
+		// Don't populate ENV as it might contain
+		// sensitive data that we don't want to get logged.
+		switch($method)
+		{
+			case 'get':
+				$this->globals['get'] = $_GET;
+				break;
+			case 'post':
+				$this->globals['post'] = $_POST;
+				break;
+			case 'request':
+				$this->globals['request'] = $_REQUEST;
+				break;
+			case 'cookie':
+				$this->globals['cookie'] = $_COOKIE;
+				break;
+			case 'server':
+				$this->globals['server'] = $_SERVER;
+				break;
+		}
+	}
 }
diff --git a/system/HTTP/Response.php b/system/HTTP/Response.php
index 6557ed216e..8abfda7a6d 100644
--- a/system/HTTP/Response.php
+++ b/system/HTTP/Response.php
@@ -36,7 +36,9 @@
  * @filesource
  */
 use CodeIgniter\HTTP\Exceptions\HTTPException;
+use CodeIgniter\Services;
 use Config\App;
+use Config\Format;
 use Config\Mimes;
 
 /**
@@ -71,75 +73,75 @@ class Response extends Message implements ResponseInterface
 	 */
 	protected static $statusCodes = [
 		// 1xx: Informational
-		100	 => 'Continue',
-		101	 => 'Switching Protocols',
-        102	 => 'Processing', // http://www.iana.org/go/rfc2518
-        103  => 'Early Hints', // http://www.ietf.org/rfc/rfc8297.txt
+		100 => 'Continue',
+		101 => 'Switching Protocols',
+		102 => 'Processing', // http://www.iana.org/go/rfc2518
+		103 => 'Early Hints', // http://www.ietf.org/rfc/rfc8297.txt
 		// 2xx: Success
-		200	 => 'OK',
-		201	 => 'Created',
-		202	 => 'Accepted',
-		203	 => 'Non-Authoritative Information', // 1.1
-		204	 => 'No Content',
-		205	 => 'Reset Content',
-		206	 => 'Partial Content',
-		207	 => 'Multi-Status', // http://www.iana.org/go/rfc4918
-		208	 => 'Already Reported', // http://www.iana.org/go/rfc5842
-		226	 => 'IM Used', // 1.1; http://www.ietf.org/rfc/rfc3229.txt
+		200 => 'OK',
+		201 => 'Created',
+		202 => 'Accepted',
+		203 => 'Non-Authoritative Information', // 1.1
+		204 => 'No Content',
+		205 => 'Reset Content',
+		206 => 'Partial Content',
+		207 => 'Multi-Status', // http://www.iana.org/go/rfc4918
+		208 => 'Already Reported', // http://www.iana.org/go/rfc5842
+		226 => 'IM Used', // 1.1; http://www.ietf.org/rfc/rfc3229.txt
 		// 3xx: Redirection
-		300	 => 'Multiple Choices',
-		301	 => 'Moved Permanently',
-		302	 => 'Found', // Formerly 'Moved Temporarily'
-		303	 => 'See Other', // 1.1
-		304	 => 'Not Modified',
-		305	 => 'Use Proxy', // 1.1
-		306	 => 'Switch Proxy', // No longer used
-		307	 => 'Temporary Redirect', // 1.1
-		308	 => 'Permanent Redirect', // 1.1; Experimental; http://www.ietf.org/rfc/rfc7238.txt
+		300 => 'Multiple Choices',
+		301 => 'Moved Permanently',
+		302 => 'Found', // Formerly 'Moved Temporarily'
+		303 => 'See Other', // 1.1
+		304 => 'Not Modified',
+		305 => 'Use Proxy', // 1.1
+		306 => 'Switch Proxy', // No longer used
+		307 => 'Temporary Redirect', // 1.1
+		308 => 'Permanent Redirect', // 1.1; Experimental; http://www.ietf.org/rfc/rfc7238.txt
 		// 4xx: Client error
-		400	 => 'Bad Request',
-		401	 => 'Unauthorized',
-		402	 => 'Payment Required',
-		403	 => 'Forbidden',
-		404	 => 'Not Found',
-		405	 => 'Method Not Allowed',
-		406	 => 'Not Acceptable',
-		407	 => 'Proxy Authentication Required',
-		408	 => 'Request Timeout',
-		409	 => 'Conflict',
-		410	 => 'Gone',
-		411	 => 'Length Required',
-		412	 => 'Precondition Failed',
-		413	 => 'Request Entity Too Large',
-		414	 => 'Request-URI Too Long',
-		415	 => 'Unsupported Media Type',
-		416	 => 'Requested Range Not Satisfiable',
-		417	 => 'Expectation Failed',
-		418	 => "I'm a teapot", // April's Fools joke; http://www.ietf.org/rfc/rfc2324.txt
+		400 => 'Bad Request',
+		401 => 'Unauthorized',
+		402 => 'Payment Required',
+		403 => 'Forbidden',
+		404 => 'Not Found',
+		405 => 'Method Not Allowed',
+		406 => 'Not Acceptable',
+		407 => 'Proxy Authentication Required',
+		408 => 'Request Timeout',
+		409 => 'Conflict',
+		410 => 'Gone',
+		411 => 'Length Required',
+		412 => 'Precondition Failed',
+		413 => 'Request Entity Too Large',
+		414 => 'Request-URI Too Long',
+		415 => 'Unsupported Media Type',
+		416 => 'Requested Range Not Satisfiable',
+		417 => 'Expectation Failed',
+		418 => "I'm a teapot", // April's Fools joke; http://www.ietf.org/rfc/rfc2324.txt
 		// 419 (Authentication Timeout) is a non-standard status code with unknown origin
-		421	 => 'Misdirected Request', // http://www.iana.org/go/rfc7540 Section 9.1.2
-		422	 => 'Unprocessable Entity', // http://www.iana.org/go/rfc4918
-		423	 => 'Locked', // http://www.iana.org/go/rfc4918
-		424	 => 'Failed Dependency', // http://www.iana.org/go/rfc4918
-		426	 => 'Upgrade Required',
-		428	 => 'Precondition Required', // 1.1; http://www.ietf.org/rfc/rfc6585.txt
-		429	 => 'Too Many Requests', // 1.1; http://www.ietf.org/rfc/rfc6585.txt
-		431	 => 'Request Header Fields Too Large', // 1.1; http://www.ietf.org/rfc/rfc6585.txt
-        451	 => 'Unavailable For Legal Reasons', // http://tools.ietf.org/html/rfc7725
-        499  => 'Client Closed Request', // http://lxr.nginx.org/source/src/http/ngx_http_request.h#0133
+		421 => 'Misdirected Request', // http://www.iana.org/go/rfc7540 Section 9.1.2
+		422 => 'Unprocessable Entity', // http://www.iana.org/go/rfc4918
+		423 => 'Locked', // http://www.iana.org/go/rfc4918
+		424 => 'Failed Dependency', // http://www.iana.org/go/rfc4918
+		426 => 'Upgrade Required',
+		428 => 'Precondition Required', // 1.1; http://www.ietf.org/rfc/rfc6585.txt
+		429 => 'Too Many Requests', // 1.1; http://www.ietf.org/rfc/rfc6585.txt
+		431 => 'Request Header Fields Too Large', // 1.1; http://www.ietf.org/rfc/rfc6585.txt
+		451 => 'Unavailable For Legal Reasons', // http://tools.ietf.org/html/rfc7725
+		499 => 'Client Closed Request', // http://lxr.nginx.org/source/src/http/ngx_http_request.h#0133
 		// 5xx: Server error
-		500	 => 'Internal Server Error',
-		501	 => 'Not Implemented',
-		502	 => 'Bad Gateway',
-		503	 => 'Service Unavailable',
-		504	 => 'Gateway Timeout',
-		505	 => 'HTTP Version Not Supported',
-		506	 => 'Variant Also Negotiates', // 1.1; http://www.ietf.org/rfc/rfc2295.txt
-		507	 => 'Insufficient Storage', // http://www.iana.org/go/rfc4918
-		508	 => 'Loop Detected', // http://www.iana.org/go/rfc5842
-		510	 => 'Not Extended', // http://www.ietf.org/rfc/rfc2774.txt
-		511	 => 'Network Authentication Required', // http://www.ietf.org/rfc/rfc6585.txt
-        599  => 'Network Connect Timeout Error', // https://httpstatuses.com/599
+		500 => 'Internal Server Error',
+		501 => 'Not Implemented',
+		502 => 'Bad Gateway',
+		503 => 'Service Unavailable',
+		504 => 'Gateway Timeout',
+		505 => 'HTTP Version Not Supported',
+		506 => 'Variant Also Negotiates', // 1.1; http://www.ietf.org/rfc/rfc2295.txt
+		507 => 'Insufficient Storage', // http://www.iana.org/go/rfc4918
+		508 => 'Loop Detected', // http://www.iana.org/go/rfc5842
+		510 => 'Not Extended', // http://www.ietf.org/rfc/rfc2774.txt
+		511 => 'Network Authentication Required', // http://www.ietf.org/rfc/rfc6585.txt
+		599 => 'Network Connect Timeout Error', // https://httpstatuses.com/599
 	];
 
 	/**
@@ -206,6 +208,28 @@ class Response extends Message implements ResponseInterface
 	 */
 	protected $cookieHTTPOnly = false;
 
+	/**
+	 * Stores all cookies that were set in the response.
+	 *
+	 * @var array
+	 */
+	protected $cookies = [];
+
+	/**
+	 * If true, will not write output. Useful during testing.
+	 *
+	 * @var bool
+	 */
+	protected $pretend = false;
+
+	/**
+	 * Type of format the body is in.
+	 * Valid: html, json, xml
+	 *
+	 * @var string
+	 */
+	protected $bodyFormat = 'html';
+
 	//--------------------------------------------------------------------
 
 	/**
@@ -222,14 +246,14 @@ class Response extends Message implements ResponseInterface
 		// Are we enforcing a Content Security Policy?
 		if ($config->CSPEnabled === true)
 		{
-			$this->CSP = new ContentSecurityPolicy(new \Config\ContentSecurityPolicy());
+			$this->CSP        = new ContentSecurityPolicy(new \Config\ContentSecurityPolicy());
 			$this->CSPEnabled = true;
 		}
 
-		$this->cookiePrefix = $config->cookiePrefix;
-		$this->cookieDomain = $config->cookieDomain;
-		$this->cookiePath = $config->cookiePath;
-		$this->cookieSecure = $config->cookieSecure;
+		$this->cookiePrefix   = $config->cookiePrefix;
+		$this->cookieDomain   = $config->cookieDomain;
+		$this->cookiePath     = $config->cookiePath;
+		$this->cookieSecure   = $config->cookieSecure;
 		$this->cookieHTTPOnly = $config->cookieHTTPOnly;
 
 		// Default to an HTML Content-Type. Devs can override if needed.
@@ -238,6 +262,20 @@ class Response extends Message implements ResponseInterface
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Turns "pretend" mode on or off to aid in testing.
+	 *
+	 * @param bool $pretend
+	 *
+	 * @return $this
+	 */
+	public function pretend(bool $pretend = true)
+	{
+		$this->pretend = $pretend;
+
+		return $this;
+	}
+
 	/**
 	 * Gets the response status code.
 	 *
@@ -284,14 +322,14 @@ class Response extends Message implements ResponseInterface
 		}
 
 		// Unknown and no message?
-		if ( ! array_key_exists($code, static::$statusCodes) && empty($reason))
+		if (! array_key_exists($code, static::$statusCodes) && empty($reason))
 		{
 			throw HTTPException::forUnkownStatusCode($code);
 		}
 
 		$this->statusCode = $code;
 
-		if ( ! empty($reason))
+		if (! empty($reason))
 		{
 			$this->reason = $reason;
 		}
@@ -339,7 +377,7 @@ class Response extends Message implements ResponseInterface
 	{
 		$date->setTimezone(new \DateTimeZone('UTC'));
 
-		$this->setHeader('Date', $date->format('D, d M Y H:i:s') . ' GMT');
+		$this->setHeader('Date', $date->format('D, d M Y H:i:s').' GMT');
 
 		return $this;
 	}
@@ -360,7 +398,7 @@ class Response extends Message implements ResponseInterface
 		// add charset attribute if not already there and provided as parm
 		if ((strpos($mime, 'charset=') < 1) && ! empty($charset))
 		{
-			$mime .= '; charset=' . $charset;
+			$mime .= '; charset='.$charset;
 		}
 
 		$this->removeHeader('Content-Type'); // replace existing content type
@@ -370,6 +408,114 @@ class Response extends Message implements ResponseInterface
 	}
 
 	//--------------------------------------------------------------------
+
+	/**
+	 * Converts the $body into JSON and sets the Content Type header.
+	 *
+	 * @param $body
+	 *
+	 * @return $this
+	 */
+	public function setJSON($body)
+	{
+		$this->body = $this->formatBody($body, 'json');
+
+		return $this;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the current body, converted to JSON is it isn't already.
+	 *
+	 * @return mixed|string
+	 */
+	public function getJSON()
+	{
+		$body = $this->body;
+
+		if ($this->bodyFormat != 'json')
+		{
+			$config = new Format();
+			$formatter = $config->getFormatter('application/json');
+
+			$body = $formatter->format($body);
+		}
+
+		return $body ?: null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Converts $body into XML, and sets the correct Content-Type.
+	 *
+	 * @param $body
+	 *
+	 * @return $this
+	 */
+	public function setXML($body)
+	{
+		$this->body = $this->formatBody($body, 'xml');
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieves the current body into XML and returns it.
+	 *
+	 * @return mixed|string
+	 */
+	public function getXML()
+	{
+		$body = $this->body;
+
+		if ($this->bodyFormat != 'xml')
+		{
+			$config = new Format();
+			$formatter = $config->getFormatter('application/xml');
+
+			$body = $formatter->format($body);
+		}
+
+		return $body;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Handles conversion of the of the data into the appropriate format,
+	 * and sets the correct Content-Type header for our response.
+	 *
+	 * @param        $body
+	 * @param string $format Valid: json, xml
+	 *
+	 * @return mixed
+	 */
+	protected function formatBody($body, string $format)
+	{
+		$mime = "application/{$format}";
+		$this->setContentType($mime);
+		$this->bodyFormat = $format;
+
+		// Nothing much to do for a string...
+		if (! is_string($body))
+		{
+			$config    = new Format();
+			$formatter = $config->getFormatter($mime);
+
+			$body = $formatter->format($body);
+		}
+
+		return $body;
+	}
+
+	//--------------------------------------------------------------------
+
 	//--------------------------------------------------------------------
 	// Cache Control Methods
 	//
@@ -468,7 +614,7 @@ class Response extends Message implements ResponseInterface
 		if ($date instanceof \DateTime)
 		{
 			$date->setTimezone(new \DateTimeZone('UTC'));
-			$this->setHeader('Last-Modified', $date->format('D, d M Y H:i:s') . ' GMT');
+			$this->setHeader('Last-Modified', $date->format('D, d M Y H:i:s').' GMT');
 		}
 		elseif (is_string($date))
 		{
@@ -499,6 +645,7 @@ class Response extends Message implements ResponseInterface
 
 		$this->sendHeaders();
 		$this->sendBody();
+		$this->sendCookies();
 
 		return $this;
 	}
@@ -526,12 +673,13 @@ class Response extends Message implements ResponseInterface
 		}
 
 		// HTTP Status
-		header(sprintf('HTTP/%s %s %s', $this->protocolVersion, $this->statusCode, $this->reason), true, $this->statusCode);
+		header(sprintf('HTTP/%s %s %s', $this->protocolVersion, $this->statusCode, $this->reason), true,
+			$this->statusCode);
 
 		// Send all of our headers
 		foreach ($this->getHeaders() as $name => $values)
 		{
-			header($name . ': ' . $this->getHeaderLine($name), false, $this->statusCode);
+			header($name.': '.$this->getHeaderLine($name), false, $this->statusCode);
 		}
 
 		return $this;
@@ -553,6 +701,16 @@ class Response extends Message implements ResponseInterface
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Grabs the current body.
+	 *
+	 * @return mixed|string
+	 */
+	public function getBody()
+	{
+		return $this->body;
+	}
+
 	/**
 	 * Perform a redirect to a new URL, in two flavors: header or location.
 	 *
@@ -566,7 +724,8 @@ class Response extends Message implements ResponseInterface
 	public function redirect(string $uri, string $method = 'auto', int $code = null)
 	{
 		// IIS environment likely? Use 'refresh' for better compatibility
-		if ($method === 'auto' && isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false)
+		if ($method === 'auto' && isset($_SERVER['SERVER_SOFTWARE'])
+		    && strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false)
 		{
 			$method = 'refresh';
 		}
@@ -574,8 +733,9 @@ class Response extends Message implements ResponseInterface
 		{
 			if (isset($_SERVER['SERVER_PROTOCOL'], $_SERVER['REQUEST_METHOD']) && $this->getProtocolVersion() >= 1.1)
 			{
-				$code = ($_SERVER['REQUEST_METHOD'] !== 'GET') ? 303 // reference: http://en.wikipedia.org/wiki/Post/Redirect/Get
-						: 307;
+				$code = ($_SERVER['REQUEST_METHOD'] !== 'GET') ? 303
+					// reference: http://en.wikipedia.org/wiki/Post/Redirect/Get
+					: 307;
 			}
 			else
 			{
@@ -586,7 +746,7 @@ class Response extends Message implements ResponseInterface
 		switch ($method)
 		{
 			case 'refresh':
-				$this->setHeader('Refresh', '0;url=' . $uri);
+				$this->setHeader('Refresh', '0;url='.$uri);
 				break;
 			default:
 				$this->setHeader('Location', $uri);
@@ -618,9 +778,15 @@ class Response extends Message implements ResponseInterface
 	 * @param bool|false   $httponly Whether only make the cookie accessible via HTTP (no javascript)
 	 */
 	public function setCookie(
-	$name, $value = '', $expire = '', $domain = '', $path = '/', $prefix = '', $secure = false, $httponly = false
-	)
-	{
+		$name,
+		$value = '',
+		$expire = '',
+		$domain = '',
+		$path = '/',
+		$prefix = '',
+		$secure = false,
+		$httponly = false
+	) {
 		if (is_array($name))
 		{
 			// always leave 'name' in last place, as the loop will break otherwise, due to $$item
@@ -658,20 +824,108 @@ class Response extends Message implements ResponseInterface
 			$httponly = $this->cookieHTTPOnly;
 		}
 
-		if ( ! is_numeric($expire))
+		if (! is_numeric($expire))
 		{
-			$expire = time() - 86500;
+			$expire = time()-86500;
 		}
 		else
 		{
-			$expire = ($expire > 0) ? time() + $expire : 0;
+			$expire = ($expire > 0) ? time()+$expire : 0;
 		}
 
-		setcookie($prefix . $name, $value, $expire, $path, $domain, $secure, $httponly);
+		$this->cookies[] = [
+			'name'     => $prefix.$name,
+			'value'    => $value,
+			'expires'  => $expire,
+			'path'     => $path,
+			'domain'   => $domain,
+			'secure'   => $secure,
+			'httponly' => $httponly,
+		];
+
+		return $this;
 	}
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Checks to see if the Response has a specified cookie or not.
+	 *
+	 * @param string $name
+	 * @param null   $value
+	 * @param string $prefix
+	 *
+	 * @return bool
+	 */
+	public function hasCookie(string $name, $value = null, string $prefix = '')
+	{
+		if ($prefix === '' && $this->cookiePrefix !== '')
+		{
+			$prefix = $this->cookiePrefix;
+		}
+
+		$name = $prefix.$name;
+
+		foreach ($this->cookies as $cookie)
+		{
+			if ($cookie['name'] != $prefix.$name)
+			{
+				continue;
+			}
+
+			if ($value === null)
+			{
+				return true;
+			}
+
+			return $cookie['value'] == $value;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns the cookie
+	 *
+	 * @param string $name
+	 * @param string $prefix
+	 *
+	 * @return mixed
+	 */
+	public function getCookie(string $name, string $prefix = '')
+	{
+		if ($prefix === '' && $this->cookiePrefix !== '')
+		{
+			$prefix = $this->cookiePrefix;
+		}
+
+		$name = $prefix.$name;
+
+		foreach ($this->cookies as $cookie)
+		{
+			if ($cookie['name'] == $name)
+			{
+				return $cookie;
+			}
+		}
+	}
+
+	/**
+	 * Actually sets the cookies.
+	 */
+	protected function sendCookies()
+	{
+		if ($this->pretend)
+		{
+			return;
+		}
+
+		foreach ($this->cookies as $params)
+		{
+			setcookie(...$params);
+		}
+	}
+
 	/**
 	 * Force a download.
 	 *
@@ -690,7 +944,7 @@ class Response extends Message implements ResponseInterface
 		}
 		elseif ($data === null)
 		{
-			if ( ! @is_file($filename) || ($filesize = @filesize($filename)) === false)
+			if (! @is_file($filename) || ($filesize = @filesize($filename)) === false)
 			{
 				return;
 			}
@@ -707,7 +961,7 @@ class Response extends Message implements ResponseInterface
 		// Set the default MIME type to send
 		$mime = 'application/octet-stream';
 
-		$x = explode('.', $filename);
+		$x         = explode('.', $filename);
 		$extension = end($x);
 
 		if ($setMime === true)
@@ -729,10 +983,11 @@ class Response extends Message implements ResponseInterface
 		 *
 		 * Reference: http://digiblog.de/2011/04/19/android-and-the-download-file-headers/
 		 */
-		if (count($x) !== 1 && isset($_SERVER['HTTP_USER_AGENT']) && preg_match('/Android\s(1|2\.[01])/', $_SERVER['HTTP_USER_AGENT']))
+		if (count($x) !== 1 && isset($_SERVER['HTTP_USER_AGENT'])
+		    && preg_match('/Android\s(1|2\.[01])/', $_SERVER['HTTP_USER_AGENT']))
 		{
-			$x[count($x) - 1] = strtoupper($extension);
-			$filename = implode('.', $x);
+			$x[count($x)-1] = strtoupper($extension);
+			$filename       = implode('.', $x);
 		}
 
 		if ($data === null && ($fp = @fopen($filepath, 'rb')) === false)
@@ -747,11 +1002,11 @@ class Response extends Message implements ResponseInterface
 		}
 
 		// Generate the server headers
-		header('Content-Type: ' . $mime);
-		header('Content-Disposition: attachment; filename="' . $filename . '"');
+		header('Content-Type: '.$mime);
+		header('Content-Disposition: attachment; filename="'.$filename.'"');
 		header('Expires: 0');
 		header('Content-Transfer-Encoding: binary');
-		header('Content-Length: ' . $filesize);
+		header('Content-Length: '.$filesize);
 		header('Cache-Control: private, no-transform, no-store, must-revalidate');
 
 		// If we have raw data - just dump it
@@ -761,7 +1016,7 @@ class Response extends Message implements ResponseInterface
 		}
 
 		// Flush 1MB chunks of data
-		while ( ! feof($fp) && ($data = fread($fp, 1048576)) !== false)
+		while (! feof($fp) && ($data = fread($fp, 1048576)) !== false)
 		{
 			echo $data;
 		}
@@ -770,5 +1025,4 @@ class Response extends Message implements ResponseInterface
 		exit;
 	}
 
-	//--------------------------------------------------------------------
 }
diff --git a/system/Helpers/filesystem_helper.php b/system/Helpers/filesystem_helper.php
index 59456d5ad4..7e7782386c 100644
--- a/system/Helpers/filesystem_helper.php
+++ b/system/Helpers/filesystem_helper.php
@@ -35,7 +35,6 @@
  * @since	Version 1.0.0
  * @filesource
  */
-defined('BASEPATH') || exit('No direct script access allowed');
 
 /**
  * CodeIgniter Directory Helpers
diff --git a/system/Helpers/form_helper.php b/system/Helpers/form_helper.php
index 23f71188c8..dcb7ab750d 100644
--- a/system/Helpers/form_helper.php
+++ b/system/Helpers/form_helper.php
@@ -868,7 +868,7 @@ if ( ! function_exists('set_checkbox'))
 		}
 
 		// Unchecked checkbox and radio inputs are not even submitted by browsers ...
-		if ($_POST)
+		if (! empty($request->getPost()) || ! empty(old($field)))
 		{
 			return ($input === $value) ? ' checked="checked"' : '';
 		}
@@ -925,7 +925,7 @@ if ( ! function_exists('set_radio'))
 		}
 
 		// Unchecked checkbox and radio inputs are not even submitted by browsers ...
-		if ($_POST)
+		if ($request->getPost())
 		{
 			return ($input === $value) ? ' checked="checked"' : '';
 		}
diff --git a/system/Router/Router.php b/system/Router/Router.php
index db652ada91..b5080a7993 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -361,6 +361,8 @@ class Router implements RouterInterface
 	{
 		$routes = $this->collection->getRoutes($this->collection->getHTTPVerb());
 
+		$uri = ltrim($uri, '/ ');
+
 		// Don't waste any time
 		if (empty($routes))
 		{
diff --git a/system/Test/CIDatabaseTestCase.php b/system/Test/CIDatabaseTestCase.php
index d102aef608..a6f67973b0 100644
--- a/system/Test/CIDatabaseTestCase.php
+++ b/system/Test/CIDatabaseTestCase.php
@@ -152,6 +152,8 @@ class CIDatabaseTestCase extends CIUnitTestCase
 	 */
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->loadDependencies();
 
 		if ($this->refresh === true)
diff --git a/system/Test/CIUnitTestCase.php b/system/Test/CIUnitTestCase.php
index 4e5d86543b..3b9df42833 100644
--- a/system/Test/CIUnitTestCase.php
+++ b/system/Test/CIUnitTestCase.php
@@ -35,24 +35,51 @@
  * @since	Version 3.0.0
  * @filesource
  */
+use Config\Paths;
+use CodeIgniter\Services;
 use CodeIgniter\Events\Events;
 use PHPUnit\Framework\TestCase;
-use CodeIgniter\Log\TestLogger;
+use Tests\Support\Log\TestLogger;
 
 /**
  * PHPunit test case.
  */
 class CIUnitTestCase extends TestCase
 {
-
 	use ReflectionHelper;
 
+	/**
+	 * @var \CodeIgniter\CodeIgniter
+	 */
+	protected $app;
+
+	/**
+	 * Path to Config folder, relative
+	 * to the system folder.
+	 * @var string
+	 */
+	protected $configPath = '../application/Config';
+
+	public function setUp()
+	{
+		parent::setUp();
+
+		if (! $this->app)
+		{
+			$this->app = $this->createApplication();
+		}
+
+		helper('url');
+	}
+
 	/**
 	 * Custom function to hook into CodeIgniter's Logging mechanism
 	 * to check if certain messages were logged during code execution.
 	 *
 	 * @param string $level
 	 * @param null   $expectedMessage
+	 *
+	 * @throws \Exception
 	 */
 	public function assertLogged(string $level, $expectedMessage = null)
 	{
@@ -62,13 +89,14 @@ class CIUnitTestCase extends TestCase
 		return $result;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Hooks into CodeIgniter's Events system to check if a specific
 	 * event was triggered or not.
 	 *
 	 * @param string $eventName
+	 *
+	 * @return bool
+	 * @throws \Exception
 	 */
 	public function assertEventTriggered(string $eventName): bool
 	{
@@ -87,5 +115,52 @@ class CIUnitTestCase extends TestCase
 		return $found;
 	}
 
-	//--------------------------------------------------------------------
+	/**
+	 * Loads up an instance of CodeIgniter
+	 * and gets the environment setup.
+	 *
+	 * @return mixed
+	 */
+	protected function createApplication()
+	{
+		$systemPath = realpath(__DIR__.'/../');
+
+		require_once $systemPath.'/'.$this->configPath.'/Paths.php';
+		$paths = $this->adjustPaths(new \Config\Paths());
+
+		$app = require $systemPath.'/bootstrap.php';
+		return $app;
+	}
+
+	/**
+	 * Attempts to adjust our system paths to account
+	 * for relative location of our tests folder.
+	 * Not foolproof, but works well for default locations.
+	 *
+	 * @param \Config\Paths $paths
+	 *
+	 * @return \Config\Paths
+	 */
+	protected function adjustPaths(Paths $paths)
+	{
+		$tests = [
+			'systemDirectory', 'applicationDirectory', 'writableDirectory', 'testsDirectory'
+		];
+
+		foreach ($tests as $test)
+		{
+			if (is_dir($paths->$test) || strpos($paths->$test, '../') !== 0)
+			{
+				continue;
+			}
+
+			$check = substr($paths->$test, 3);
+			if (is_dir($check))
+			{
+				$paths->$test = $check;
+			}
+		}
+
+		return $paths;
+	}
 }
diff --git a/system/Test/FeatureResponse.php b/system/Test/FeatureResponse.php
new file mode 100644
index 0000000000..f05a5cdc70
--- /dev/null
+++ b/system/Test/FeatureResponse.php
@@ -0,0 +1,365 @@
+<?php namespace CodeIgniter\Test;
+
+use CodeIgniter\HTTP\RedirectResponse;
+use CodeIgniter\HTTP\Response;
+use PHPUnit\Framework\TestCase;
+use Tests\Support\DOM\DOMParser;
+
+class FeatureResponse extends TestCase
+{
+	/**
+	 * @var \CodeIgniter\HTTP\Response
+	 */
+	public $response;
+
+	/**
+	 * @var \Tests\Support\DOM\DOMParser
+	 */
+	protected $domParser;
+
+	public function __construct(Response $response = null)
+	{
+		$this->response = $response;
+
+		if (is_string($this->response->getBody()))
+		{
+			$this->domParser = (new DOMParser())->withString($this->response->getBody());
+		}
+	}
+
+	//--------------------------------------------------------------------
+	// Simple Response Checks
+	//--------------------------------------------------------------------
+
+	/**
+	 * Boils down the possible responses into a bolean valid/not-valid
+	 * response type.
+	 *
+	 * @return bool
+	 */
+	public function isOK(): bool
+	{
+		// Only 200 and 300 range status codes
+		// are considered valid.
+		if ($this->response->getStatusCode() >= 400 || $this->response->getStatusCode() < 200)
+		{
+			return false;
+		}
+
+		// Empty bodies are not considered valid.
+		if (empty($this->response->getBody()))
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Returns whether or not the Response was a redirect response
+	 *
+	 * @return bool
+	 */
+	public function isRedirect(): bool
+	{
+		return $this->response instanceof RedirectResponse;
+	}
+
+	/**
+	 * Assert that the given response was a redirect.
+	 *
+	 * @throws \Exception
+	 */
+	public function assertRedirect()
+	{
+		$this->assertTrue($this->isRedirect(), "Response is not a RedirectResponse.");
+	}
+
+	/**
+	 * Asserts that the status is a specific value.
+	 *
+	 * @param int $code
+	 *
+	 * @throws \Exception
+	 */
+	public function assertStatus(int $code)
+	{
+		$this->assertEquals($code, (int)$this->response->getStatusCode());
+	}
+
+	/**
+	 * Asserts that the Response is considered OK.
+	 *
+	 * @throws \Exception
+	 */
+	public function assertOK()
+	{
+		$this->assertTrue($this->isOK(), "{$this->response->getStatusCode()} is not a successful status code, or the Response has an empty body.");
+	}
+
+	//--------------------------------------------------------------------
+	// Session Assertions
+	//--------------------------------------------------------------------
+
+	/**
+	 * Asserts that an SESSION key has been set and, optionally, test it's value.
+	 *
+	 * @param string $key
+	 * @param null   $value
+	 *
+	 * @throws \Exception
+	 */
+	public function assertSessionHas(string $key, $value = null)
+	{
+		$this->assertTrue(array_key_exists($key, $_SESSION), "'{$key}' is not in the current \$_SESSION");
+
+		if ($value !== null)
+		{
+			$this->assertEquals($value, $_SESSION[$key], "The value of '{$key}' ({$value}) does not match expected value.");
+		}
+	}
+
+	/**
+	 * Asserts the session is missing $key.
+	 *
+	 * @param string $key
+	 *
+	 * @throws \Exception
+	 */
+	public function assertSessionMissing(string $key)
+	{
+		$this->assertFalse(array_key_exists($key, $_SESSION), "'{$key}' should not be present in \$_SESSION.");
+	}
+
+	//--------------------------------------------------------------------
+	// Header Assertions
+	//--------------------------------------------------------------------
+
+	/**
+	 * Asserts that the Response contains a specific header.
+	 *
+	 * @param string $key
+	 * @param null   $value
+	 *
+	 * @throws \Exception
+	 */
+	public function assertHeader(string $key, $value = null)
+	{
+		$this->assertTrue($this->response->hasHeader($key), "'{$key}' is not a valid Response header.");
+
+		if ($value !== null)
+		{
+			$this->assertEquals($value, $this->response->getHeaderLine($key), "The value of '{$key}' header ({$this->response->getHeaderLine($key)}) does not match expected value.");
+		}
+	}
+
+	/**
+	 * Asserts the Response headers does not contain the specified header.
+	 *
+	 * @param string $key
+	 *
+	 * @throws \Exception
+	 */
+	public function assertHeaderMissing(string $key)
+	{
+		$this->assertFalse($this->response->hasHeader($key), "'{$key}' should not be in the Response headers.");
+	}
+
+	//--------------------------------------------------------------------
+	// Cookie Assertions
+	//--------------------------------------------------------------------
+
+	/**
+	 * Asserts that the response has the specified cookie.
+	 *
+	 * @param string      $key
+	 * @param null        $value
+	 * @param string|null $prefix
+	 *
+	 * @throws \Exception
+	 */
+	public function assertCookie(string $key, $value = null, string $prefix = '')
+	{
+		$this->assertTrue($this->response->hasCookie($key, $value, $prefix), "No cookie found named '{$key}'.");
+	}
+
+	/**
+	 * Assert the Response does not have the specified cookie set.
+	 *
+	 * @param string $key
+	 * @param null   $value
+	 * @param string $prefix
+	 *
+	 * @throws \Exception
+	 */
+	public function assertCookieMissing(string $key)
+	{
+		$this->assertFalse($this->response->hasCookie($key), "Cookie named '{$key}' should not be set.");
+	}
+
+	/**
+	 * Asserts that a cookie exists and has an expired time.
+	 *
+	 * @param string $key
+	 * @param string $prefix
+	 *
+	 * @throws \Exception
+	 */
+	public function assertCookieExpired(string $key, string $prefix = '')
+	{
+		$this->assertTrue($this->response->hasCookie($key, null, $prefix));
+		$this->assertGreaterThan(time(), $this->response->getCookie($key, $prefix)['expires']);
+	}
+
+	//--------------------------------------------------------------------
+	// DomParser Assertions
+	//--------------------------------------------------------------------
+
+	/**
+	 * Assert that the desired text can be found in the result body.
+	 *
+	 * @param string|null $search
+	 * @param string|null $element
+	 *
+	 * @throws \Exception
+	 */
+	public function assertSee(string $search = null, string $element = null)
+	{
+		$this->assertTrue($this->domParser->see($search, $element), "Do not see '{$search}' in response.");
+	}
+
+	/**
+	 * Asserts that we do not see the specified text.
+	 *
+	 * @param string|null $search
+	 * @param string|null $element
+	 *
+	 * @throws \Exception
+	 */
+	public function assertDontSee(string $search = null, string $element = null)
+	{
+		$this->assertTrue($this->domParser->dontSee($search, $element), "I should not see '{$search}' in response.");
+	}
+
+	/**
+	 * Assert that we see an element selected via a CSS selector.
+	 *
+	 * @param string $search
+	 *
+	 * @throws \Exception
+	 */
+	public function assertSeeElement(string $search)
+	{
+		$this->assertTrue($this->domParser->seeElement($search), "Do not see element with selector '{$search} in response.'");
+	}
+
+	/**
+	 * Assert that we do not see an element selected via a CSS selector.
+	 *
+	 * @param string $search
+	 *
+	 * @throws \Exception
+	 */
+	public function assertDontSeeElement(string $search)
+	{
+		$this->assertTrue($this->domParser->dontSeeElement($search), "I should not see an element with selector '{$search}' in response.'");
+	}
+
+	/**
+	 * Assert that we see a link with the matching text and/or class.
+	 *
+	 * @param string      $text
+	 * @param string|null $details
+	 *
+	 * @throws \Exception
+	 */
+	public function assertSeeLink(string $text, string $details=null)
+	{
+		$this->assertTrue($this->domParser->seeLink($text, $details), "Do no see anchor tag with the text {$text} in response.");
+	}
+
+	/**
+	 * Assert that we see an input with name/value.
+	 *
+	 * @param string      $field
+	 * @param string|null $value
+	 *
+	 * @throws \Exception
+	 */
+	public function assertSeeInField(string $field, string $value=null)
+	{
+		$this->assertTrue($this->domParser->seeInField($field, $value), "Do no see input named {$field} with value {$value} in response.");
+	}
+
+	//--------------------------------------------------------------------
+	// JSON Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the response's body as JSON
+	 *
+	 * @return mixed|string
+	 */
+	public function getJSON()
+	{
+		$response = $this->response->getJSON();
+
+		if (is_null($response))
+		{
+			$this->fail('The Response contained invalid JSON.');
+		}
+
+		return $response;
+	}
+
+	/**
+	 *
+	 *
+	 * @param array $fragment
+	 *
+	 * @throws \Exception
+	 */
+	public function assertJSONFragment(array $fragment)
+	{
+		$json = json_decode($this->getJSON(), true);
+
+		$this->assertArraySubset($fragment, $json, false, "Response does not contain a matching JSON fragment.");
+	}
+
+	/**
+	 * Asserts that the JSON exactly matches the passed in data.
+	 * If the value being passed in is a string, it must be a json_encoded string.
+	 *
+	 * @param string|array $test
+	 *
+	 * @throws \Exception
+	 */
+	public function assertJSONExact($test)
+	{
+		$json = $this->getJSON();
+
+		if (is_array($test))
+		{
+			$config    = new \Config\Format();
+			$formatter = $config->getFormatter('application/json');
+			$test      = $formatter->format($test);
+		}
+
+		$this->assertJsonStringEqualsJsonString($test, $json, "Response does not contain matching JSON.");
+	}
+
+
+	//--------------------------------------------------------------------
+	// XML Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the response' body as XML
+	 *
+	 * @return mixed|string
+	 */
+	public function getXML()
+	{
+		return $this->response->getXML();
+	}
+}
diff --git a/system/Test/FeatureTestCase.php b/system/Test/FeatureTestCase.php
new file mode 100644
index 0000000000..714375b405
--- /dev/null
+++ b/system/Test/FeatureTestCase.php
@@ -0,0 +1,251 @@
+<?php namespace CodeIgniter\Test;
+
+use CodeIgniter\HTTP\URI;
+use CodeIgniter\HTTP\Request;
+use CodeIgniter\Events\Events;
+use CodeIgniter\HTTP\UserAgent;
+use CodeIgniter\HTTP\IncomingRequest;
+
+/**
+ * Class FeatureTestCase
+ *
+ * Provides additional utilities for doing full HTTP testing
+ * against your application.
+ *
+ * @package CodeIgniter\Test
+ */
+class FeatureTestCase extends CIDatabaseTestCase
+{
+	/**
+	 * If present, will override application
+	 * routes when using call().
+	 * @var \CodeIgniter\Router\RouteCollection
+	 */
+	protected $routes;
+
+	/**
+	 * Values to be set in the SESSION global
+	 * before running the test.
+	 * @var array
+	 */
+	protected $session = [];
+
+	/**
+	 * Sets a RouteCollection that will override
+	 * the application's route collection.
+	 *
+	 * @param array $routes
+	 *
+	 * @return $this
+	 */
+	protected function withRoutes(array $routes = null)
+	{
+		$collection = \Config\Services::routes();
+
+		if (count($routes))
+		{
+			foreach ($routes as $route)
+			{
+				$collection->{$route[0]}($route[1], $route[2]);
+			}
+		}
+
+		$this->routes = $collection;
+
+		return $this;
+	}
+
+	/**
+	 * Sets any values that should exist during this session.
+	 *
+	 * @param array $values
+	 *
+	 * @return $this
+	 */
+	public function withSession(array $values)
+	{
+		$this->session = $values;
+
+		return $this;
+	}
+
+	/**
+	 * Don't run any events while running this test.
+	 *
+	 * @return $this
+	 */
+	public function skipEvents()
+	{
+		Events::simulate(true);
+
+		return $this;
+	}
+
+	/**
+	 * Calls a single URI, executes it, and returns a FeatureResponse
+	 * instance that can be used to run many assertions against.
+	 *
+	 * @param string     $method
+	 * @param string     $path
+	 * @param array|null $params
+	 *
+	 * @return \CodeIgniter\Test\FeatureResponse
+	 * @throws \CodeIgniter\HTTP\RedirectException
+	 * @throws \Exception
+	 */
+	public function call(string $method, string $path, array $params = null)
+	{
+		// Simulate having a blank session
+		$_SESSION = [];
+
+		$request = $this->setupRequest($method, $path, $params);
+
+		$request = $this->populateGlobals($method, $request, $params);
+
+		$response = $this->app
+			->setRequest($request)
+			->run($this->routes, true);
+
+		$featureResponse = new FeatureResponse($response);
+
+		return $featureResponse;
+	}
+
+	/**
+	 * Performs a GET request.
+	 *
+	 * @param string     $path
+	 * @param array|null $params
+	 *
+	 * @return \CodeIgniter\Test\FeatureResponse
+	 * @throws \CodeIgniter\HTTP\RedirectException
+	 * @throws \Exception
+	 */
+	public function get(string $path, array $params = null)
+	{
+		return $this->call('get', $path, $params);
+	}
+
+	/**
+	 * Performs a POST request.
+	 *
+	 * @param string     $path
+	 * @param array|null $params
+	 *
+	 * @return \CodeIgniter\Test\FeatureResponse
+	 * @throws \CodeIgniter\HTTP\RedirectException
+	 * @throws \Exception
+	 */
+	public function post(string $path, array $params = null)
+	{
+		return $this->call('post', $path, $params);
+	}
+
+	/**
+	 * Performs a PUT request
+	 *
+	 * @param string     $path
+	 * @param array|null $params
+	 *
+	 * @return \CodeIgniter\Test\FeatureResponse
+	 * @throws \CodeIgniter\HTTP\RedirectException
+	 * @throws \Exception
+	 */
+	public function put(string $path, array $params = null)
+	{
+		return $this->call('put', $path, $params);
+	}
+
+	/**
+	 * Performss a PATCH request
+	 *
+	 * @param string     $path
+	 * @param array|null $params
+	 *
+	 * @return \CodeIgniter\Test\FeatureResponse
+	 * @throws \CodeIgniter\HTTP\RedirectException
+	 * @throws \Exception
+	 */
+	public function patch(string $path, array $params = null)
+	{
+		return $this->call('patch', $path, $params);
+	}
+
+	/**
+	 * Performs a DELETE request.
+	 *
+	 * @param string     $path
+	 * @param array|null $params
+	 *
+	 * @return \CodeIgniter\Test\FeatureResponse
+	 * @throws \CodeIgniter\HTTP\RedirectException
+	 * @throws \Exception
+	 */
+	public function delete(string $path, array $params = null)
+	{
+		return $this->call('delete', $path, $params);
+	}
+
+	/**
+	 * Performs an OPTIONS request.
+	 *
+	 * @param string     $path
+	 * @param array|null $params
+	 *
+	 * @return \CodeIgniter\Test\FeatureResponse
+	 * @throws \CodeIgniter\HTTP\RedirectException
+	 * @throws \Exception
+	 */
+	public function options(string $path, array $params = null)
+	{
+		return $this->call('delete', $path, $params);
+	}
+
+	/**
+	 * Setup a Request object to use so that CodeIgniter
+	 * won't try to auto-populate some of the items.
+	 *
+	 * @param string      $method
+	 * @param string|null $path
+	 *
+	 * @return \CodeIgniter\HTTP\IncomingRequest
+	 */
+	protected function setupRequest(string $method, string $path=null, $params = null)
+	{
+		$config = new \Config\App();
+		$uri    = new URI($config->baseURL .'/'. trim($path, '/ '));
+
+		$request = new IncomingRequest($config, clone($uri), $params, new UserAgent());
+		$request->uri = $uri;
+
+		$request->setMethod($method);
+		$request->setProtocolVersion('1.1');
+
+		return $request;
+	}
+
+	/**
+	 * Populates the data of our Request with "global" data
+	 * relevant to the request, like $_POST data.
+	 *
+	 * Always populate the GET vars based on the URI.
+	 *
+	 * @param string                    $method
+	 * @param \CodeIgniter\HTTP\Request $request
+	 * @param array|null                $params
+	 *
+	 * @return \CodeIgniter\HTTP\Request
+	 */
+	protected function populateGlobals(string $method, Request $request, array $params = null)
+	{
+		$request->setGlobal('get', $this->getPrivateProperty($request->uri, 'query'));
+		if ($method !== 'get')
+		{
+			$request->setGlobal($method, $params);
+		}
+
+		$_SESSION = $this->session;
+
+		return $request;
+	}
+}
diff --git a/system/ThirdParty/PSR/Log/LoggerInterface.php b/system/ThirdParty/PSR/Log/LoggerInterface.php
index 0df7557bcc..20c7ff0b3a 100644
--- a/system/ThirdParty/PSR/Log/LoggerInterface.php
+++ b/system/ThirdParty/PSR/Log/LoggerInterface.php
@@ -1,6 +1,4 @@
-<?php
-
-namespace Psr\Log;
+<?php namespace Psr\Log;
 
 /**
  * Describes a logger instance
diff --git a/system/ThirdParty/ZendEscaper/Escaper.php b/system/ThirdParty/ZendEscaper/Escaper.php
index e68e32b05d..5cec9684ef 100644
--- a/system/ThirdParty/ZendEscaper/Escaper.php
+++ b/system/ThirdParty/ZendEscaper/Escaper.php
@@ -95,7 +95,11 @@ class Escaper
     public function __construct($encoding = null)
     {
         if ($encoding !== null) {
-            $encoding = (string) $encoding;
+            if (! is_string($encoding)) {
+                throw new Exception\InvalidArgumentException(
+                    get_class($this) . ' constructor parameter must be a string, received ' . gettype($encoding)
+                );
+            }
             if ($encoding === '') {
                 throw new Exception\InvalidArgumentException(
                     get_class($this) . ' constructor parameter does not allow a blank value'
@@ -103,7 +107,7 @@ class Escaper
             }
 
             $encoding = strtolower($encoding);
-            if (!in_array($encoding, $this->supportedEncodings)) {
+            if (! in_array($encoding, $this->supportedEncodings)) {
                 throw new Exception\InvalidArgumentException(
                     'Value of \'' . $encoding . '\' passed to ' . get_class($this)
                     . ' constructor parameter is invalid. Provide an encoding supported by htmlspecialchars()'
@@ -321,7 +325,7 @@ class Escaper
             $result = $this->convertEncoding($string, 'UTF-8', $this->getEncoding());
         }
 
-        if (!$this->isUtf8($result)) {
+        if (! $this->isUtf8($result)) {
             throw new Exception\RuntimeException(
                 sprintf('String to be escaped was not valid UTF-8 or could not be converted: %s', $result)
             );
diff --git a/system/bootstrap.php b/system/bootstrap.php
index 17b6e9bf48..0afe18ae87 100644
--- a/system/bootstrap.php
+++ b/system/bootstrap.php
@@ -53,36 +53,51 @@ $pos = strrpos(FCPATH, $public.DIRECTORY_SEPARATOR);
 /**
  * The path to the main application directory. Just above public.
  */
-define('ROOTPATH', substr_replace(FCPATH, '', $pos, strlen($public.DIRECTORY_SEPARATOR)));
+if (! defined('ROOTPATH'))
+{
+	define('ROOTPATH', substr_replace(FCPATH, '', $pos, strlen($public.DIRECTORY_SEPARATOR)));
+}
 
 /**
  * The path to the application directory.
  */
-define('APPPATH', realpath($paths->applicationDirectory).DIRECTORY_SEPARATOR);
+if (! defined('APPPATH'))
+{
+	define('APPPATH', realpath($paths->applicationDirectory).DIRECTORY_SEPARATOR);
+}
 
 /**
  * The path to the system directory.
  */
-define('BASEPATH', realpath($paths->systemDirectory).DIRECTORY_SEPARATOR);
+if (! defined('BASEPATH'))
+{
+	define('BASEPATH', realpath($paths->systemDirectory).DIRECTORY_SEPARATOR);
+}
 
 /**
  * The path to the writable directory.
  */
-define('WRITEPATH', realpath($paths->writableDirectory).DIRECTORY_SEPARATOR);
+if (! defined('WRITEPATH'))
+{
+	define('WRITEPATH', realpath($paths->writableDirectory).DIRECTORY_SEPARATOR);
+}
 
 /**
  * The path to the tests directory
  */
-define('TESTPATH', realpath($paths->testsDirectory).DIRECTORY_SEPARATOR);
+if (! defined('TESTPATH'))
+{
+	define('TESTPATH', realpath($paths->testsDirectory).DIRECTORY_SEPARATOR);
+}
 
 /*
  * ---------------------------------------------------------------
  * GRAB OUR CONSTANTS & COMMON
  * ---------------------------------------------------------------
  */
-require APPPATH.'Config/Constants.php';
+require_once APPPATH.'Config/Constants.php';
 
-require BASEPATH.'Common.php';
+require_once BASEPATH.'Common.php';
 
 /*
  * ---------------------------------------------------------------
@@ -94,12 +109,15 @@ require BASEPATH.'Common.php';
  * that the config files can use the path constants.
  */
 
-require BASEPATH.'Autoloader/Autoloader.php';
-require APPPATH .'Config/Autoload.php';
-require APPPATH .'Config/Services.php';
+require_once BASEPATH.'Autoloader/Autoloader.php';
+require_once APPPATH .'Config/Autoload.php';
+require_once APPPATH .'Config/Services.php';
 
 // Use Config\Services as CodeIgniter\Services
-class_alias('Config\Services', 'CodeIgniter\Services');
+if (! class_exists('CodeIgniter\Services', false))
+{
+	class_alias('Config\Services', 'CodeIgniter\Services');
+}
 
 $loader = CodeIgniter\Services::autoloader();
 $loader->initialize(new Config\Autoload());
@@ -108,12 +126,12 @@ $loader->register();    // Register the loader with the SPL autoloader stack.
 // Now load Composer's if it's available
 if (file_exists(COMPOSER_PATH))
 {
-	require COMPOSER_PATH;
+	require_once COMPOSER_PATH;
 }
 
 // Load environment settings from .env files
 // into $_SERVER and $_ENV
-require BASEPATH . 'Config/DotEnv.php';
+require_once BASEPATH . 'Config/DotEnv.php';
 
 $env = new \CodeIgniter\Config\DotEnv(ROOTPATH);
 $env->load();
diff --git a/tests/_support/Autoloader/MockAutoloader.php b/tests/_support/Autoloader/MockAutoloader.php
index a9b1fe0978..74e82a491e 100644
--- a/tests/_support/Autoloader/MockAutoloader.php
+++ b/tests/_support/Autoloader/MockAutoloader.php
@@ -1,4 +1,6 @@
-<?php namespace CodeIgniter\Autoloader;
+<?php namespace Tests\Support\Autoloader;
+
+use CodeIgniter\Autoloader\Autoloader;
 
 class MockAutoloader extends Autoloader
 {
diff --git a/tests/_support/Autoloader/MockFileLocator.php b/tests/_support/Autoloader/MockFileLocator.php
index 00d2dbda60..c683bbb9d8 100644
--- a/tests/_support/Autoloader/MockFileLocator.php
+++ b/tests/_support/Autoloader/MockFileLocator.php
@@ -1,4 +1,6 @@
-<?php namespace CodeIgniter\Autoloader;
+<?php namespace Tests\Support\Autoloader;
+
+use CodeIgniter\Autoloader\FileLocator;
 
 class MockFileLocator extends FileLocator
 {
diff --git a/tests/_support/Cache/Handlers/MockHandler.php b/tests/_support/Cache/Handlers/MockHandler.php
index ddd3c3b536..0779c2520c 100644
--- a/tests/_support/Cache/Handlers/MockHandler.php
+++ b/tests/_support/Cache/Handlers/MockHandler.php
@@ -1,4 +1,4 @@
-<?php namespace CodeIgniter\Cache\Handlers;
+<?php namespace Tests\Support\Cache\Handlers;
 
 use CodeIgniter\Cache\CacheInterface;
 
diff --git a/tests/_support/Config/MockAppConfig.php b/tests/_support/Config/MockAppConfig.php
index 6d01e02e25..11672cae2f 100644
--- a/tests/_support/Config/MockAppConfig.php
+++ b/tests/_support/Config/MockAppConfig.php
@@ -1,4 +1,4 @@
-<?php namespace Config;
+<?php namespace Tests\Support\Config;
 
 class MockAppConfig
 {
diff --git a/tests/_support/Config/MockAutoload.php b/tests/_support/Config/MockAutoload.php
index 3954a38257..b916c197c2 100644
--- a/tests/_support/Config/MockAutoload.php
+++ b/tests/_support/Config/MockAutoload.php
@@ -1,4 +1,6 @@
-<?php namespace Config;
+<?php namespace Tests\Support\Config;
+
+use Config\Autoload;
 
 class MockAutoload extends Autoload
 {
diff --git a/tests/_support/Config/MockCLIConfig.php b/tests/_support/Config/MockCLIConfig.php
index b168ed2ab7..5e16871e24 100644
--- a/tests/_support/Config/MockCLIConfig.php
+++ b/tests/_support/Config/MockCLIConfig.php
@@ -1,4 +1,4 @@
-<?php namespace Config;
+<?php namespace Tests\Support\Config;
 
 class MockCLIConfig extends \Config\App
 {
diff --git a/tests/_support/Config/MockLogger.php b/tests/_support/Config/MockLogger.php
index f7e03d2890..7517ce35a6 100644
--- a/tests/_support/Config/MockLogger.php
+++ b/tests/_support/Config/MockLogger.php
@@ -1,5 +1,4 @@
-<?php namespace Config;
-
+<?php namespace Tests\Support\Config;
 
 class MockLogger
 {
@@ -85,7 +84,7 @@ class MockLogger
 		// File Handler
 		//--------------------------------------------------------------------
 
-		'CodeIgniter\Log\Handlers\TestHandler' => [
+		'Tests\Support\Log\Handlers\TestHandler' => [
 
 			/*
 			 * The log levels that this handler will handle.
diff --git a/tests/_support/Database/MockBuilder.php b/tests/_support/Database/MockBuilder.php
index c24dcb1f6a..3aeb7e95ac 100644
--- a/tests/_support/Database/MockBuilder.php
+++ b/tests/_support/Database/MockBuilder.php
@@ -1,4 +1,7 @@
-<?php namespace CodeIgniter\Database;
+<?php namespace Tests\Support\Database;
+
+use CodeIgniter\Database\BaseBuilder;
+use CodeIgniter\Database\ConnectionInterface;
 
 class MockBuilder extends BaseBuilder {
 
diff --git a/tests/_support/Database/MockConnection.php b/tests/_support/Database/MockConnection.php
index 9df8d9ab36..1f0abc8dee 100644
--- a/tests/_support/Database/MockConnection.php
+++ b/tests/_support/Database/MockConnection.php
@@ -1,4 +1,6 @@
-<?php namespace CodeIgniter\Database;
+<?php namespace Tests\Support\Database;
+
+use CodeIgniter\Database\BaseConnection;
 
 class MockConnection extends BaseConnection
 {
diff --git a/tests/_support/Database/MockQuery.php b/tests/_support/Database/MockQuery.php
index 97658d1e9a..0008104a1a 100644
--- a/tests/_support/Database/MockQuery.php
+++ b/tests/_support/Database/MockQuery.php
@@ -1,6 +1,8 @@
-<?php namespace CodeIgniter\Database;
+<?php namespace Tests\Support\Database;
+
+use CodeIgniter\Database\Query;
 
 class MockQuery extends Query
 {
-	
+
 }
diff --git a/tests/_support/Database/MockResult.php b/tests/_support/Database/MockResult.php
index d8bdc0788d..7354833e95 100644
--- a/tests/_support/Database/MockResult.php
+++ b/tests/_support/Database/MockResult.php
@@ -1,4 +1,6 @@
-<?php namespace CodeIgniter\Database;
+<?php namespace Tests\Support\Database;
+
+use CodeIgniter\Database\BaseResult;
 
 class MockResult extends BaseResult
 {
@@ -9,7 +11,7 @@ class MockResult extends BaseResult
 	 */
 	public function getFieldCount(): int
 	{
-		
+
 	}
 
 	//--------------------------------------------------------------------
diff --git a/tests/_support/Events/MockEvents.php b/tests/_support/Events/MockEvents.php
index 56443778c4..26985c3c19 100644
--- a/tests/_support/Events/MockEvents.php
+++ b/tests/_support/Events/MockEvents.php
@@ -1,4 +1,4 @@
-<?php namespace CodeIgniter\Events;
+<?php namespace Tests\Support\Events;
 
 /**
  * CodeIgniter
@@ -36,6 +36,8 @@
  * @filesource
  */
 
+use CodeIgniter\Events\Events;
+
 /**
  * Events
  */
diff --git a/tests/_support/HTTP/MockCURLRequest.php b/tests/_support/HTTP/MockCURLRequest.php
index abd54cc174..0f650847cf 100644
--- a/tests/_support/HTTP/MockCURLRequest.php
+++ b/tests/_support/HTTP/MockCURLRequest.php
@@ -1,4 +1,6 @@
-<?php namespace CodeIgniter\HTTP;
+<?php namespace Tests\Support\HTTP;
+
+use CodeIgniter\HTTP\CURLRequest;
 
 /**
  * Class MockCURLRequest
diff --git a/tests/_support/HTTP/MockIncomingRequest.php b/tests/_support/HTTP/MockIncomingRequest.php
index 7ee8e3ecfe..f6592e728e 100644
--- a/tests/_support/HTTP/MockIncomingRequest.php
+++ b/tests/_support/HTTP/MockIncomingRequest.php
@@ -1,4 +1,6 @@
-<?php namespace CodeIgniter\HTTP;
+<?php namespace Tests\Support\HTTP;
+
+use CodeIgniter\HTTP\IncomingRequest;
 
 class MockIncomingRequest extends IncomingRequest
 {
diff --git a/tests/_support/HTTP/MockResponse.php b/tests/_support/HTTP/MockResponse.php
index 0cf70475e9..f995444ec3 100755
--- a/tests/_support/HTTP/MockResponse.php
+++ b/tests/_support/HTTP/MockResponse.php
@@ -1,4 +1,6 @@
-<?php namespace CodeIgniter\HTTP;
+<?php namespace Tests\Support\HTTP;
+
+use CodeIgniter\HTTP\Response;
 
 /**
  * Class MockResponse
@@ -21,13 +23,13 @@ class MockResponse extends Response
             foreach
             (
                 [
-                    'value', 
-                    'expire', 
-                    'domain', 
-                    'path', 
-                    'prefix', 
-                    'secure', 
-                    'httponly', 
+                    'value',
+                    'expire',
+                    'domain',
+                    'path',
+                    'prefix',
+                    'secure',
+                    'httponly',
                     'name'
                 ] as $item
             )
@@ -43,16 +45,16 @@ class MockResponse extends Response
         $_COOKIE[$prefix . $name] = $value;
 
         /*
-            TODO: Find a way to use setcookie() 
+            TODO: Find a way to use setcookie()
             without it throwing header issues.
             setcookie
             (
-                $prefix.$name, 
-                $value, 
-                $expire, 
-                $path, 
-                $domain, 
-                $secure, 
+                $prefix.$name,
+                $value,
+                $expire,
+                $path,
+                $domain,
+                $secure,
                 $httponly
             );
         */
@@ -60,7 +62,7 @@ class MockResponse extends Response
 
     //--------------------------------------------------------------------
 
-    public function hasCookie(string $name): bool
+    public function hasCookie(string $name, $value = null, string $prefix = ''): bool
     {
         return array_key_exists($name, $_COOKIE);
     }
@@ -69,15 +71,15 @@ class MockResponse extends Response
 
     public function deleteCookie
     (
-        $name, 
-        string $domain = '', 
-        string $path   = '/', 
+        $name,
+        string $domain = '',
+        string $path   = '/',
         string $prefix = ''
     )
     {
         $COOKIE[$name] = null;
         unset($COOKIE[$name]);
-        
+
         //set_cookie($name, '', '', $domain, $path, $prefix);
     }
 
diff --git a/tests/_support/Language/MockLanguage.php b/tests/_support/Language/MockLanguage.php
index 7afe6cd7f7..08f80b0dc6 100644
--- a/tests/_support/Language/MockLanguage.php
+++ b/tests/_support/Language/MockLanguage.php
@@ -1,4 +1,6 @@
-<?php namespace CodeIgniter\Language;
+<?php namespace Tests\Support\Language;
+
+use CodeIgniter\Language\Language;
 
 class MockLanguage extends Language
 {
diff --git a/tests/_support/Language/SecondMockLanguage.php b/tests/_support/Language/SecondMockLanguage.php
index 80b975b78b..7142885434 100644
--- a/tests/_support/Language/SecondMockLanguage.php
+++ b/tests/_support/Language/SecondMockLanguage.php
@@ -1,4 +1,6 @@
-<?php namespace CodeIgniter\Language;
+<?php namespace Tests\Support\Language;
+
+use CodeIgniter\Language\Language;
 
 class SecondMockLanguage extends Language
 {
diff --git a/tests/_support/Log/Handlers/TestHandler.php b/tests/_support/Log/Handlers/TestHandler.php
index de34d92abd..17e6f7375a 100644
--- a/tests/_support/Log/Handlers/TestHandler.php
+++ b/tests/_support/Log/Handlers/TestHandler.php
@@ -1,4 +1,6 @@
-<?php namespace CodeIgniter\Log\Handlers;
+<?php namespace Tests\Support\Log\Handlers;
+
+use CodeIgniter\Log\Handlers\HandlerInterface;
 
 /**
  * Class TestHandler
@@ -96,4 +98,4 @@ class TestHandler implements HandlerInterface
 	//--------------------------------------------------------------------
 
 
-}
\ No newline at end of file
+}
diff --git a/tests/_support/Log/TestLogger.php b/tests/_support/Log/TestLogger.php
index 1012e64134..0c34411109 100644
--- a/tests/_support/Log/TestLogger.php
+++ b/tests/_support/Log/TestLogger.php
@@ -1,4 +1,6 @@
-<?php namespace CodeIgniter\Log;
+<?php namespace Tests\Support\Log;
+
+use CodeIgniter\Log\Logger;
 
 class TestLogger extends Logger
 {
diff --git a/tests/_support/MockCodeIgniter.php b/tests/_support/MockCodeIgniter.php
index 9e2db886e3..7bb0cee7d9 100644
--- a/tests/_support/MockCodeIgniter.php
+++ b/tests/_support/MockCodeIgniter.php
@@ -1,4 +1,6 @@
-<?php namespace CodeIgniter;
+<?php namespace Tests\Support;
+
+use CodeIgniter\CodeIgniter;
 
 class MockCodeIgniter extends CodeIgniter
 {
diff --git a/tests/_support/Security/MockSecurity.php b/tests/_support/Security/MockSecurity.php
index 106cdc11b1..7a9239f53b 100644
--- a/tests/_support/Security/MockSecurity.php
+++ b/tests/_support/Security/MockSecurity.php
@@ -1,5 +1,6 @@
-<?php namespace CodeIgniter\Security;
+<?php namespace Tests\Support\Security;
 
+use CodeIgniter\Security\Security;
 use CodeIgniter\HTTP\RequestInterface;
 
 class MockSecurity extends Security
diff --git a/tests/_support/Session/MockSession.php b/tests/_support/Session/MockSession.php
index 28d5890731..950db1ebd3 100644
--- a/tests/_support/Session/MockSession.php
+++ b/tests/_support/Session/MockSession.php
@@ -1,4 +1,6 @@
-<?php namespace CodeIgniter\Session;
+<?php namespace Tests\Support\Session;
+
+use CodeIgniter\Session\Session;
 
 /**
  * Class MockSession
diff --git a/tests/_support/Validation/TestRules.php b/tests/_support/Validation/TestRules.php
index 50d00105ea..6c5cc46356 100644
--- a/tests/_support/Validation/TestRules.php
+++ b/tests/_support/Validation/TestRules.php
@@ -1,4 +1,4 @@
-<?php namespace CodeIgniter\Validation;
+<?php namespace Tests\Support\Validation;
 
 class TestRules {
 
diff --git a/tests/_support/_bootstrap.php b/tests/_support/_bootstrap.php
index 272ef3eb25..058cb4dbb1 100644
--- a/tests/_support/_bootstrap.php
+++ b/tests/_support/_bootstrap.php
@@ -5,114 +5,24 @@ ini_set('display_startup_errors', '1');
 
 // Make sure it recognizes that we're testing.
 $_SERVER['CI_ENVIRONMENT'] = 'testing';
-
-// Get our system paths
-require 'application/Config/Paths.php';
-$paths  = new \Config\Paths();
+define('ENVIRONMENT', 'testing');
 
 // Path to the front controller (this file)
 define('FCPATH', getcwd().'/public'.DIRECTORY_SEPARATOR);
 
-/*
- * ---------------------------------------------------------------
- * SETUP OUR PATH CONSTANTS
- * ---------------------------------------------------------------
- *
- * The path constants provide convenient access to the folders
- * throughout the application. We have to setup them up here
- * so they are available in the config files that are loaded.
- */
-
-// Path to code root folder (just up from public)
-$pos = strrpos(FCPATH, 'public'.DIRECTORY_SEPARATOR);
-define('ROOTPATH', substr_replace(FCPATH, '', $pos, strlen('public'.DIRECTORY_SEPARATOR)));
-
-// The path to the "application" folder
-define('APPPATH', realpath(FCPATH.$paths->applicationDirectory).DIRECTORY_SEPARATOR);
-
-// Path to the system folder
-define('BASEPATH', realpath(FCPATH.$paths->systemDirectory).DIRECTORY_SEPARATOR);
-
-// Path to the writable directory.
-define('WRITEPATH', realpath(FCPATH.$paths->writableDirectory).DIRECTORY_SEPARATOR);
-
 // The path to the "tests" directory
-define('TESTPATH', realpath(FCPATH.$paths->testsDirectory).DIRECTORY_SEPARATOR);
+define('TESTPATH', realpath(__DIR__.'/../').'/');
 
 define('SUPPORTPATH', realpath(TESTPATH.'_support/').'/');
 
-// Use special Services for testing. These allow
-// insert mocks in place of normal services.
-include BASEPATH.'Config/Services.php';
-
-/*
- * ---------------------------------------------------------------
- * GRAB OUR CONSTANTS & COMMON
- * ---------------------------------------------------------------
- */
-require APPPATH.'Config/Constants.php';
-
-// Use special global functions for testing.
-require_once SUPPORTPATH.'MockCommon.php';
-require BASEPATH.'Common.php';
-
-/*
- * ---------------------------------------------------------------
- * LOAD OUR AUTOLOADER
- * ---------------------------------------------------------------
- *
- * The autoloader allows all of the pieces to work together
- * in the framework. We have to load it here, though, so
- * that the config files can use the path constants.
- */
-
-require BASEPATH.'Autoloader/Autoloader.php';
-require APPPATH .'Config/Autoload.php';
-require APPPATH .'Config/Services.php';
-
-$loader = CodeIgniter\Config\Services::autoloader();
-$loader->initialize(new Config\Autoload());
-$loader->register();    // Register the loader with the SPL autoloader stack.
-
-// Add namespace paths to autoload mocks for testing.
-$loader->addNamespace('CodeIgniter',   SUPPORTPATH);
-$loader->addNamespace('Config',        SUPPORTPATH.'Config');
-$loader->addNamespace('Tests\Support', SUPPORTPATH);
-
-// Now load Composer's if it's available
-if (file_exists(COMPOSER_PATH))
-{
-    require COMPOSER_PATH;
-}
-
-// Load environment settings from .env files
-// into $_SERVER and $_ENV
-require BASEPATH . 'Config/DotEnv.php';
-
-$env = new \CodeIgniter\Config\DotEnv(ROOTPATH);
-$env->load();
-
 // Set environment values that would otherwise stop the framework from functioning during tests.
 if (! isset($_SERVER['app.baseURL']))
 {
 	$_SERVER['app.baseURL'] = 'http://example.com';
 }
 
-/*
- * ---------------------------------------------------------------
- * GRAB OUR CODEIGNITER INSTANCE
- * ---------------------------------------------------------------
- *
- * The CodeIgniter class contains the core functionality to make
- * the application run, and does all of the dirty work to get
- * the pieces all working together.
- */
-
-$app = new \CodeIgniter\CodeIgniter(new \Config\App());
-$app->initialize();
-
 //--------------------------------------------------------------------
 // Load our TestCase
 //--------------------------------------------------------------------
 
-require  TESTPATH.'_support/CIUnitTestCase.php';
+require  __DIR__.'/CIUnitTestCase.php';
diff --git a/tests/feature/HomeTest.php b/tests/feature/HomeTest.php
new file mode 100644
index 0000000000..82a822ab15
--- /dev/null
+++ b/tests/feature/HomeTest.php
@@ -0,0 +1,14 @@
+<?php
+
+use CodeIgniter\Test\FeatureTestCase;
+
+class HomeTest extends FeatureTestCase
+{
+	public function testCanLoadPage()
+	{
+		$response = $this->call('post', site_url().'?foo=bar&bar=baz', ['xxx' => 'yyy']);
+
+		$this->assertInstanceOf(\CodeIgniter\Test\FeatureResponse::class, $response);
+	}
+
+}
diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php
index 793b98ae42..9ac5356fa3 100644
--- a/tests/system/API/ResponseTraitTest.php
+++ b/tests/system/API/ResponseTraitTest.php
@@ -1,16 +1,14 @@
 <?php namespace CodeIgniter\API;
 
-use CodeIgniter\Controller;
-use CodeIgniter\Format\JSONFormatter;
-use CodeIgniter\Format\XMLFormatter;
-use CodeIgniter\HTTP\MockIncomingRequest;
-use CodeIgniter\HTTP\MockResponse;
 use CodeIgniter\HTTP\URI;
 use CodeIgniter\HTTP\UserAgent;
+use Tests\Support\HTTP\MockResponse;
+use CodeIgniter\Format\XMLFormatter;
+use CodeIgniter\Format\JSONFormatter;
+use Tests\Support\HTTP\MockIncomingRequest;
 
 class ResponseTraitTest extends \CIUnitTestCase
 {
-
 	protected $request;
 	protected $response;
 
@@ -45,8 +43,11 @@ class ResponseTraitTest extends \CIUnitTestCase
 
 		$config = array_merge($config, $userConfig);
 
-		$this->request = new MockIncomingRequest((object) $config, new URI($uri), null, new UserAgent());
-		$this->response = new MockResponse((object) $config);
+		if (is_null($this->request))
+		{
+			$this->request  = new MockIncomingRequest((object)$config, new URI($uri), null, new UserAgent());
+			$this->response = new MockResponse((object)$config);
+		}
 
 		// Insert headers into request.
 		$headers = [
@@ -82,7 +83,31 @@ class ResponseTraitTest extends \CIUnitTestCase
 		return $controller;
 	}
 
-	//--------------------------------------------------------------------
+	public function testNoFormatterJSON()
+	{
+		$this->formatter = null;
+		$controller = $this->makeController([], 'http://codeigniter.com', ['Accept' => 'application/json']);
+		$controller->respondCreated(['id' => 3], 'A Custom Reason');
+
+		$this->assertEquals('A Custom Reason', $this->response->getReason());
+		$this->assertEquals(201, $this->response->getStatusCode());
+
+		$expected = <<<EOH
+{
+    "id": 3
+}
+EOH;
+		$this->assertEquals($expected, $this->response->getBody());
+	}
+
+	public function testNoFormatterHTML()
+	{
+		$this->formatter = null;
+		$controller = $this->makeController();
+		$controller->respondCreated('A Custom Reason');
+
+		$this->assertEquals('A Custom Reason', $this->response->getBody());
+	}
 
 	public function testRespondSets404WithNoData()
 	{
@@ -93,8 +118,6 @@ class ResponseTraitTest extends \CIUnitTestCase
 		$this->assertNull($this->response->getBody());
 	}
 
-	//--------------------------------------------------------------------
-
 	public function testRespondSetsStatusWithEmptyData()
 	{
 		$controller = $this->makeController();
@@ -104,8 +127,6 @@ class ResponseTraitTest extends \CIUnitTestCase
 		$this->assertNull($this->response->getBody());
 	}
 
-	//--------------------------------------------------------------------
-
 	public function testRespondSetsCorrectBodyAndStatus()
 	{
 		$controller = $this->makeController();
@@ -117,8 +138,6 @@ class ResponseTraitTest extends \CIUnitTestCase
 		$this->assertEquals('Created', $this->response->getReason());
 	}
 
-	//--------------------------------------------------------------------
-
 	public function testRespondWithCustomReason()
 	{
 		$controller = $this->makeController();
@@ -339,25 +358,6 @@ class ResponseTraitTest extends \CIUnitTestCase
 			$this->tryValidContentType($goodMimes[$i], $goodMimes[$i] . $chars);
 	}
 
-	private function tryValidResponse($mimeType, $contentType)
-	{
-		$original = $_SERVER;
-		$_SERVER['CONTENT_TYPE'] = $mimeType;
-
-		$controller = $this->makeController([], 'http://codeigniter.com', ['Accept' => $mimeType]);
-		$this->assertEquals($mimeType, $this->request->getHeaderLine('Accept'), 'Request header...');
-
-		$this->assertEquals($contentType, $this->response->getHeaderLine('Content-Type'), 'Response header pre-response...');
-		$this->response->setContentType($contentType);
-		$controller->respond('HTML assumed');
-
-		$this->assertEquals(200, $this->response->getStatusCode());
-		$expected = 'HTML assumed';
-		$this->assertEquals($expected, $this->response->getBody());
-
-		$_SERVER = $original;
-	}
-
 	public function testXMLFormatter()
 	{
 		$this->formatter = new XMLFormatter();
@@ -370,32 +370,6 @@ class ResponseTraitTest extends \CIUnitTestCase
 <?xml version="1.0"?>
 <response><id>3</id></response>
 
-EOH;
-		$this->assertEquals($expected, $this->response->getBody());
-	}
-
-	public function testNoFormatterHTML()
-	{
-		$this->formatter = null;
-		$controller = $this->makeController();
-		$controller->respondCreated('A Custom Reason');
-
-		$this->assertEquals('A Custom Reason', $this->response->getBody());
-	}
-
-	public function testNoFormatterJSON()
-	{
-		$this->formatter = null;
-		$controller = $this->makeController([], 'http://codeigniter.com', ['Accept' => 'application/json']);
-		$controller->respondCreated(['id' => 3], 'A Custom Reason');
-
-		$this->assertEquals('A Custom Reason', $this->response->getReason());
-		$this->assertEquals(201, $this->response->getStatusCode());
-
-		$expected = <<<EOH
-{
-    "id": 3
-}
 EOH;
 		$this->assertEquals($expected, $this->response->getBody());
 	}
diff --git a/tests/system/Autoloader/AutoloaderTest.php b/tests/system/Autoloader/AutoloaderTest.php
index 28586c89e0..e19cd81e7d 100644
--- a/tests/system/Autoloader/AutoloaderTest.php
+++ b/tests/system/Autoloader/AutoloaderTest.php
@@ -1,6 +1,7 @@
 <?php namespace CodeIgniter\Autoloader;
 
 use Config\Autoload;
+use Tests\Support\Autoloader\MockAutoloader;
 
 //--------------------------------------------------------------------
 
@@ -11,8 +12,10 @@ class AutoloaderTest extends \CIUnitTestCase
 
 	//--------------------------------------------------------------------
 
-	protected function setUp()
+	public function setUp()
 	{
+		parent::setUp();
+
 		$config = new Autoload();
 
 		$config->classmap = [
diff --git a/tests/system/Autoloader/FileLocatorTest.php b/tests/system/Autoloader/FileLocatorTest.php
index 131796ae8f..82ca634963 100644
--- a/tests/system/Autoloader/FileLocatorTest.php
+++ b/tests/system/Autoloader/FileLocatorTest.php
@@ -1,6 +1,7 @@
 <?php namespace CodeIgniter\Autoloader;
 
-use Config\MockAutoload;
+use Tests\Support\Config\MockAutoload;
+use Tests\Support\Autoloader\MockFileLocator;
 
 class FileLocatorTest extends \CIUnitTestCase
 {
@@ -14,12 +15,15 @@ class FileLocatorTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$config = new MockAutoload();
 		$config->psr4 = [
 			'App\Libraries'	 => '/application/somewhere',
 			'App'			 => '/application',
 			'Sys'			 => BASEPATH,
-			'Blog'			 => '/modules/blog'
+			'Blog'			 => '/modules/blog',
+			'Tests/Support' => TESTPATH.'_support/',
 		];
 
 		$this->loader = new MockFileLocator($config);
diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php
index 59e753bab6..0b4f34ed6d 100644
--- a/tests/system/CLI/CLITest.php
+++ b/tests/system/CLI/CLITest.php
@@ -9,6 +9,8 @@ class CLITest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		CITestStreamFilter::$buffer = '';
 		$this->stream_filter = stream_filter_append(STDOUT, 'CITestStreamFilter');
 	}
diff --git a/tests/system/CLI/CommandRunnerTest.php b/tests/system/CLI/CommandRunnerTest.php
index 961f2b4ebf..9802507712 100644
--- a/tests/system/CLI/CommandRunnerTest.php
+++ b/tests/system/CLI/CommandRunnerTest.php
@@ -1,7 +1,7 @@
 <?php namespace CodeIgniter\CLI;
 
-use Config\MockCLIConfig;
 use CodeIgniter\HTTP\UserAgent;
+use Tests\Support\Config\MockCLIConfig;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
 class CommandRunnerTest extends \CIUnitTestCase
@@ -11,6 +11,8 @@ class CommandRunnerTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		CITestStreamFilter::$buffer = '';
 		$this->stream_filter = stream_filter_append(STDOUT, 'CITestStreamFilter');
 
diff --git a/tests/system/CLI/ConsoleTest.php b/tests/system/CLI/ConsoleTest.php
index db372db1ea..c06c6c5b0a 100644
--- a/tests/system/CLI/ConsoleTest.php
+++ b/tests/system/CLI/ConsoleTest.php
@@ -1,6 +1,7 @@
 <?php namespace CodeIgniter\CLI;
 
-use Config\MockCLIConfig;
+use Tests\Support\MockCodeIgniter;
+use Tests\Support\Config\MockCLIConfig;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
 class ConsoleTest extends \CIUnitTestCase
@@ -10,6 +11,8 @@ class ConsoleTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		CITestStreamFilter::$buffer = '';
 		$this->stream_filter = stream_filter_append(STDOUT, 'CITestStreamFilter');
 
@@ -25,9 +28,8 @@ class ConsoleTest extends \CIUnitTestCase
 		$_SERVER['argv'] = ['spark', 'list'];
 		$_SERVER['argc'] = 2;
 		CLI::init();
-		
-		$this->app = new \CodeIgniter\MockCodeIgniter(new MockCLIConfig());
-//		$this->app->initialize();
+
+		$this->app = new MockCodeIgniter(new MockCLIConfig());
 	}
 
 	public function tearDown()
diff --git a/tests/system/Cache/CacheFactoryTest.php b/tests/system/Cache/CacheFactoryTest.php
index 3eb9403ae3..88cf179596 100644
--- a/tests/system/Cache/CacheFactoryTest.php
+++ b/tests/system/Cache/CacheFactoryTest.php
@@ -8,6 +8,8 @@ class CacheFactoryTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->cacheFactory = new CacheFactory();
 
 		//Initialize path
diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php
index 592869eafe..ae9b402378 100644
--- a/tests/system/Cache/Handlers/FileHandlerTest.php
+++ b/tests/system/Cache/Handlers/FileHandlerTest.php
@@ -26,6 +26,8 @@ class FileHandlerTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		//Initialize path
 		$this->config            = new \Config\Cache();
 		$this->config->storePath .= self::$directory;
diff --git a/tests/system/Cache/Handlers/MemcachedHandlerTest.php b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
index f8ba8b1480..63718aa46b 100644
--- a/tests/system/Cache/Handlers/MemcachedHandlerTest.php
+++ b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
@@ -18,6 +18,8 @@ class MemcachedHandlerTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->config = new \Config\Cache();
 
 		$this->memcachedHandler = new MemcachedHandler($this->config->memcached);
diff --git a/tests/system/Cache/Handlers/RedisHandlerTest.php b/tests/system/Cache/Handlers/RedisHandlerTest.php
index 91da120132..ea368d4cb9 100644
--- a/tests/system/Cache/Handlers/RedisHandlerTest.php
+++ b/tests/system/Cache/Handlers/RedisHandlerTest.php
@@ -53,6 +53,8 @@ class RedisHandlerTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->config = new \Config\Cache();
 
 		$this->redisHandler = new RedisHandler($this->config->redis);
diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
index 8da2ce0ce9..f098425dd3 100644
--- a/tests/system/CodeIgniterTest.php
+++ b/tests/system/CodeIgniterTest.php
@@ -1,8 +1,9 @@
 <?php namespace CodeIgniter;
 
-use CodeIgniter\Autoloader\MockFileLocator;
-use CodeIgniter\Router\RouteCollection;
 use Config\App;
+use Tests\Support\MockCodeIgniter;
+use CodeIgniter\Router\RouteCollection;
+use Tests\Support\Autoloader\MockFileLocator;
 
 /**
  * @backupGlobals enabled
@@ -20,6 +21,8 @@ class CodeIgniterTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		Services::reset();
 
 		$_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index d423596700..e5ac5b327c 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -10,6 +10,8 @@ class CommomFunctionsTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 	    unset($_ENV['foo'], $_SERVER['foo']);
 	}
 
@@ -70,7 +72,7 @@ class CommomFunctionsTest extends \CIUnitTestCase
 		$_SERVER['REQUEST_METHOD'] = 'GET';
 
 		$response = $this->createMock(\CodeIgniter\HTTP\Response::class);
-		$routes   = new \CodeIgniter\Router\RouteCollection(new \CodeIgniter\Autoloader\MockFileLocator(new \Config\Autoload()));
+		$routes   = new \CodeIgniter\Router\RouteCollection(new \Tests\Support\Autoloader\MockFileLocator(new \Config\Autoload()));
 		\CodeIgniter\Services::injectMock('response', $response);
 		\CodeIgniter\Services::injectMock('routes', $routes);
 
diff --git a/tests/system/Config/BaseConfigTest.php b/tests/system/Config/BaseConfigTest.php
index 327d09dc01..3c3f7d59f1 100644
--- a/tests/system/Config/BaseConfigTest.php
+++ b/tests/system/Config/BaseConfigTest.php
@@ -11,6 +11,8 @@ class BaseConfigTest extends CIUnitTestCase
 
 	public function setup()
 	{
+		parent::setUp();
+
 		$this->fixturesFolder = __DIR__ . '/fixtures';
 
 		if ( ! class_exists('SimpleConfig', false))
diff --git a/tests/system/Config/DotEnvTest.php b/tests/system/Config/DotEnvTest.php
index 67a744a1ba..ca3638cdd7 100644
--- a/tests/system/Config/DotEnvTest.php
+++ b/tests/system/Config/DotEnvTest.php
@@ -14,6 +14,8 @@ class DotEnvTest extends \CIUnitTestCase
 
 	public function setup()
 	{
+		parent::setUp();
+
 		$this->fixturesFolder = __DIR__.'/fixtures';
                 $file = "unreadable.env";
 		$path = rtrim($this->fixturesFolder, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.$file;
diff --git a/tests/system/Config/ServicesTest.php b/tests/system/Config/ServicesTest.php
index 071739011a..9fe949d14b 100644
--- a/tests/system/Config/ServicesTest.php
+++ b/tests/system/Config/ServicesTest.php
@@ -8,6 +8,8 @@ class ServicesTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->original = $_SERVER;
 //		$_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'es; q=1.0, en; q=0.5';
 		$this->config = new App();
diff --git a/tests/system/ControllerTest.php b/tests/system/ControllerTest.php
index fd7b1729ef..208298454b 100644
--- a/tests/system/ControllerTest.php
+++ b/tests/system/ControllerTest.php
@@ -1,7 +1,8 @@
 <?php namespace CodeIgniter;
 
-use CodeIgniter\HTTP\UserAgent;
 use Config\App;
+use CodeIgniter\HTTP\UserAgent;
+use Tests\Support\MockCodeIgniter;
 
 /**
  * Exercise our core Controller class.
@@ -39,7 +40,7 @@ class ControllerTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
-		Services::reset();
+		parent::setUp();
 
 		$this->config = new App();
 		$this->request = new \CodeIgniter\HTTP\IncomingRequest($this->config, new \CodeIgniter\HTTP\URI('https://somwhere.com'), null, new UserAgent());
diff --git a/tests/system/Database/BaseConnectionTest.php b/tests/system/Database/BaseConnectionTest.php
index 90057b97a3..5a7f259e5a 100644
--- a/tests/system/Database/BaseConnectionTest.php
+++ b/tests/system/Database/BaseConnectionTest.php
@@ -1,6 +1,8 @@
 <?php namespace CodeIgniter\Database;
 
 
+use Tests\Support\Database\MockConnection;
+
 class BaseConnectionTest extends \CIUnitTestCase
 {
 	protected $options = [
diff --git a/tests/system/Database/BaseQueryTest.php b/tests/system/Database/BaseQueryTest.php
index 800e07ddd3..f861a6feaf 100644
--- a/tests/system/Database/BaseQueryTest.php
+++ b/tests/system/Database/BaseQueryTest.php
@@ -1,14 +1,17 @@
 <?php namespace CodeIgniter\Database;
 
+use Tests\Support\Database\MockConnection;
+
 class QueryTest extends \CIUnitTestCase
 {
-
 	protected $db;
 
 	//--------------------------------------------------------------------
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->db = new MockConnection([]);
 	}
 
diff --git a/tests/system/Database/Builder/AliasTest.php b/tests/system/Database/Builder/AliasTest.php
index aa9725fd23..83e96e8408 100644
--- a/tests/system/Database/Builder/AliasTest.php
+++ b/tests/system/Database/Builder/AliasTest.php
@@ -1,6 +1,6 @@
 <?php namespace Builder;
 
-use CodeIgniter\Database\MockConnection;
+use Tests\Support\Database\MockConnection;
 
 class AliasTest extends \CIUnitTestCase
 {
@@ -10,6 +10,8 @@ class AliasTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->db = new MockConnection([]);
 	}
 
diff --git a/tests/system/Database/Builder/CountTest.php b/tests/system/Database/Builder/CountTest.php
index 5d36bbe2ad..898843c04d 100644
--- a/tests/system/Database/Builder/CountTest.php
+++ b/tests/system/Database/Builder/CountTest.php
@@ -1,7 +1,7 @@
 <?php namespace Builder;
 
 use CodeIgniter\Database\BaseBuilder;
-use CodeIgniter\Database\MockConnection;
+use Tests\Support\Database\MockConnection;
 
 class CountTest extends \CIUnitTestCase
 {
@@ -11,6 +11,8 @@ class CountTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->db = new MockConnection([]);
 	}
 
diff --git a/tests/system/Database/Builder/DeleteTest.php b/tests/system/Database/Builder/DeleteTest.php
index 3c54fd264c..3a5f83d92e 100644
--- a/tests/system/Database/Builder/DeleteTest.php
+++ b/tests/system/Database/Builder/DeleteTest.php
@@ -1,6 +1,6 @@
 <?php namespace Builder;
 
-use CodeIgniter\Database\MockConnection;
+use Tests\Support\Database\MockConnection;
 
 class DeleteTest extends \CIUnitTestCase
 {
@@ -10,6 +10,8 @@ class DeleteTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->db = new MockConnection([]);
 	}
 
diff --git a/tests/system/Database/Builder/DistinctTest.php b/tests/system/Database/Builder/DistinctTest.php
index 8104693f86..f6b6f04299 100644
--- a/tests/system/Database/Builder/DistinctTest.php
+++ b/tests/system/Database/Builder/DistinctTest.php
@@ -1,7 +1,7 @@
 <?php namespace Builder;
 
 use CodeIgniter\Database\BaseBuilder;
-use CodeIgniter\Database\MockConnection;
+use Tests\Support\Database\MockConnection;
 
 class DistinctTest extends \CIUnitTestCase
 {
@@ -11,6 +11,8 @@ class DistinctTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->db = new MockConnection([]);
 	}
 
diff --git a/tests/system/Database/Builder/EmptyTest.php b/tests/system/Database/Builder/EmptyTest.php
index 679bb1f906..bf5d12483a 100644
--- a/tests/system/Database/Builder/EmptyTest.php
+++ b/tests/system/Database/Builder/EmptyTest.php
@@ -1,7 +1,7 @@
 <?php namespace Builder;
 
 use CodeIgniter\Database\BaseBuilder;
-use CodeIgniter\Database\MockConnection;
+use Tests\Support\Database\MockConnection;
 
 class EmptyTest extends \CIUnitTestCase
 {
@@ -11,6 +11,8 @@ class EmptyTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->db = new MockConnection([]);
 	}
 
diff --git a/tests/system/Database/Builder/FromTest.php b/tests/system/Database/Builder/FromTest.php
index ece76b48c4..d399040bba 100644
--- a/tests/system/Database/Builder/FromTest.php
+++ b/tests/system/Database/Builder/FromTest.php
@@ -1,7 +1,7 @@
 <?php namespace Builder;
 
 use CodeIgniter\Database\BaseBuilder;
-use CodeIgniter\Database\MockConnection;
+use Tests\Support\Database\MockConnection;
 
 class FromTest extends \CIUnitTestCase
 {
@@ -11,6 +11,8 @@ class FromTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->db = new MockConnection([]);
 	}
 
diff --git a/tests/system/Database/Builder/GroupTest.php b/tests/system/Database/Builder/GroupTest.php
index af1ddfc036..79cb89aec4 100644
--- a/tests/system/Database/Builder/GroupTest.php
+++ b/tests/system/Database/Builder/GroupTest.php
@@ -1,7 +1,7 @@
 <?php namespace Builder;
 
 use CodeIgniter\Database\BaseBuilder;
-use CodeIgniter\Database\MockConnection;
+use Tests\Support\Database\MockConnection;
 
 class GroupTest extends \CIUnitTestCase
 {
@@ -11,6 +11,8 @@ class GroupTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->db = new MockConnection([]);
 	}
 
diff --git a/tests/system/Database/Builder/InsertTest.php b/tests/system/Database/Builder/InsertTest.php
index b21b56e271..3e14a2e803 100644
--- a/tests/system/Database/Builder/InsertTest.php
+++ b/tests/system/Database/Builder/InsertTest.php
@@ -1,7 +1,7 @@
 <?php namespace Builder;
 
 use CodeIgniter\Database\Query;
-use CodeIgniter\Database\MockConnection;
+use Tests\Support\Database\MockConnection;
 
 class InsertTest extends \CIUnitTestCase
 {
@@ -11,6 +11,8 @@ class InsertTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->db = new MockConnection([]);
 	}
 
diff --git a/tests/system/Database/Builder/JoinTest.php b/tests/system/Database/Builder/JoinTest.php
index b40bf0245e..b2eeaee4dc 100644
--- a/tests/system/Database/Builder/JoinTest.php
+++ b/tests/system/Database/Builder/JoinTest.php
@@ -1,7 +1,7 @@
 <?php namespace Builder;
 
 use CodeIgniter\Database\BaseBuilder;
-use CodeIgniter\Database\MockConnection;
+use Tests\Support\Database\MockConnection;
 
 class JoinTest extends \CIUnitTestCase
 {
@@ -11,6 +11,8 @@ class JoinTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->db = new MockConnection([]);
 	}
 
diff --git a/tests/system/Database/Builder/LikeTest.php b/tests/system/Database/Builder/LikeTest.php
index 0683501f23..792ecb1978 100644
--- a/tests/system/Database/Builder/LikeTest.php
+++ b/tests/system/Database/Builder/LikeTest.php
@@ -1,7 +1,7 @@
 <?php namespace Builder;
 
 use CodeIgniter\Database\BaseBuilder;
-use CodeIgniter\Database\MockConnection;
+use Tests\Support\Database\MockConnection;
 
 class LikeTest extends \CIUnitTestCase
 {
@@ -11,6 +11,8 @@ class LikeTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->db = new MockConnection([]);
 	}
 
diff --git a/tests/system/Database/Builder/LimitTest.php b/tests/system/Database/Builder/LimitTest.php
index 5eca7cd9a6..9f16a9c20d 100644
--- a/tests/system/Database/Builder/LimitTest.php
+++ b/tests/system/Database/Builder/LimitTest.php
@@ -1,7 +1,7 @@
 <?php namespace Builder;
 
 use CodeIgniter\Database\BaseBuilder;
-use CodeIgniter\Database\MockConnection;
+use Tests\Support\Database\MockConnection;
 
 class LimitTest extends \CIUnitTestCase
 {
@@ -11,6 +11,8 @@ class LimitTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->db = new MockConnection([]);
 	}
 
diff --git a/tests/system/Database/Builder/OrderTest.php b/tests/system/Database/Builder/OrderTest.php
index 5af4724cfc..f5a4e6b3a8 100644
--- a/tests/system/Database/Builder/OrderTest.php
+++ b/tests/system/Database/Builder/OrderTest.php
@@ -1,7 +1,7 @@
 <?php namespace Builder;
 
 use CodeIgniter\Database\BaseBuilder;
-use CodeIgniter\Database\MockConnection;
+use Tests\Support\Database\MockConnection;
 
 class OrderTest extends \CIUnitTestCase
 {
@@ -11,6 +11,8 @@ class OrderTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->db = new MockConnection([]);
 	}
 
diff --git a/tests/system/Database/Builder/PrefixTest.php b/tests/system/Database/Builder/PrefixTest.php
index 446a780f09..4338950da1 100644
--- a/tests/system/Database/Builder/PrefixTest.php
+++ b/tests/system/Database/Builder/PrefixTest.php
@@ -1,6 +1,6 @@
 <?php namespace CodeIgniter\Database\Builder;
 
-use CodeIgniter\Database\MockConnection;
+use Tests\Support\Database\MockConnection;
 
 class PrefixTest extends \CIUnitTestCase
 {
@@ -10,6 +10,8 @@ class PrefixTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->db = new MockConnection(['DBPrefix' => 'ci_']);
 	}
 
diff --git a/tests/system/Database/Builder/ReplaceTest.php b/tests/system/Database/Builder/ReplaceTest.php
index 9ef69de3f5..28cf354f2e 100644
--- a/tests/system/Database/Builder/ReplaceTest.php
+++ b/tests/system/Database/Builder/ReplaceTest.php
@@ -1,6 +1,6 @@
 <?php namespace Builder;
 
-use CodeIgniter\Database\MockConnection;
+use Tests\Support\Database\MockConnection;
 
 class ReplaceTest extends \CIUnitTestCase
 {
@@ -10,6 +10,8 @@ class ReplaceTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->db = new MockConnection([]);
 	}
 
diff --git a/tests/system/Database/Builder/SelectTest.php b/tests/system/Database/Builder/SelectTest.php
index 08180b06c8..8d1be2a8c6 100644
--- a/tests/system/Database/Builder/SelectTest.php
+++ b/tests/system/Database/Builder/SelectTest.php
@@ -1,7 +1,7 @@
 <?php namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
-use CodeIgniter\Database\MockConnection;
+use Tests\Support\Database\MockConnection;
 
 class SelectTest extends \CIUnitTestCase
 {
@@ -11,6 +11,8 @@ class SelectTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 	    $this->db = new MockConnection([]);
 	}
 
diff --git a/tests/system/Database/Builder/TruncateTest.php b/tests/system/Database/Builder/TruncateTest.php
index ce279a8039..fd148d6288 100644
--- a/tests/system/Database/Builder/TruncateTest.php
+++ b/tests/system/Database/Builder/TruncateTest.php
@@ -1,7 +1,7 @@
 <?php namespace Builder;
 
 use CodeIgniter\Database\BaseBuilder;
-use CodeIgniter\Database\MockConnection;
+use Tests\Support\Database\MockConnection;
 
 class TruncateTest extends \CIUnitTestCase
 {
@@ -11,6 +11,8 @@ class TruncateTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->db = new MockConnection([]);
 	}
 
diff --git a/tests/system/Database/Builder/UpdateTest.php b/tests/system/Database/Builder/UpdateTest.php
index 538ba0f46a..3ba2c0ee90 100644
--- a/tests/system/Database/Builder/UpdateTest.php
+++ b/tests/system/Database/Builder/UpdateTest.php
@@ -1,8 +1,8 @@
 <?php namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
-use CodeIgniter\Database\MockConnection;
-use CodeIgniter\Database\MockQuery;
+use Tests\Support\Database\MockQuery;
+use Tests\Support\Database\MockConnection;
 
 class UpdateTest extends \CIUnitTestCase
 {
@@ -12,6 +12,8 @@ class UpdateTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->db = new MockConnection([]);
 	}
 
diff --git a/tests/system/Database/Builder/WhereTest.php b/tests/system/Database/Builder/WhereTest.php
index 9aad45fe02..ab986ebe61 100644
--- a/tests/system/Database/Builder/WhereTest.php
+++ b/tests/system/Database/Builder/WhereTest.php
@@ -1,6 +1,6 @@
 <?php namespace Builder;
 
-use CodeIgniter\Database\MockConnection;
+use Tests\Support\Database\MockConnection;
 
 class WhereTest extends \CIUnitTestCase
 {
@@ -10,6 +10,8 @@ class WhereTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->db = new MockConnection([]);
 	}
 
diff --git a/tests/system/Database/Live/AliasTest.php b/tests/system/Database/Live/AliasTest.php
index 9697868089..b5b933ca7b 100644
--- a/tests/system/Database/Live/AliasTest.php
+++ b/tests/system/Database/Live/AliasTest.php
@@ -1,6 +1,8 @@
 <?php namespace CodeIgniter\Database\Live;
 
-class AliasTest extends \CIDatabaseTestCase
+use CodeIgniter\Test\CIDatabaseTestCase;
+
+class AliasTest extends CIDatabaseTestCase
 {
 	protected $refresh = true;
 
diff --git a/tests/system/Database/Live/CIDbTestCaseTest.php b/tests/system/Database/Live/CIDbTestCaseTest.php
index 27da620ba3..a025ad33a4 100644
--- a/tests/system/Database/Live/CIDbTestCaseTest.php
+++ b/tests/system/Database/Live/CIDbTestCaseTest.php
@@ -1,9 +1,11 @@
 <?php namespace CodeIgniter\Database\Live;
 
+use CodeIgniter\Test\CIDatabaseTestCase;
+
 /**
  * @group DatabaseLive
  */
-class CIDbTestCaseTest extends \CIDatabaseTestCase
+class CIDbTestCaseTest extends CIDatabaseTestCase
 {
 	protected $refresh = true;
 
@@ -15,7 +17,7 @@ class CIDbTestCaseTest extends \CIDatabaseTestCase
 
 		$this->seeInDatabase('user', ['name' => 'Ricky', 'email' => 'sofine@example.com', 'country' => 'US']);
 	}
-	
+
 	//--------------------------------------------------------------------
 
 	public function testDontSeeInDatabase()
@@ -43,5 +45,5 @@ class CIDbTestCaseTest extends \CIDatabaseTestCase
 	//--------------------------------------------------------------------
 
 
-	
-}
\ No newline at end of file
+
+}
diff --git a/tests/system/Database/Live/CountTest.php b/tests/system/Database/Live/CountTest.php
index 6813d36c2b..804e860879 100644
--- a/tests/system/Database/Live/CountTest.php
+++ b/tests/system/Database/Live/CountTest.php
@@ -1,9 +1,11 @@
 <?php namespace CodeIgniter\Database\Live;
 
+use CodeIgniter\Test\CIDatabaseTestCase;
+
 /**
  * @group DatabaseLive
  */
-class CountTest extends \CIDatabaseTestCase
+class CountTest extends CIDatabaseTestCase
 {
 	protected $refresh = true;
 
@@ -46,4 +48,4 @@ class CountTest extends \CIDatabaseTestCase
 	}
 
 	//--------------------------------------------------------------------
-}
\ No newline at end of file
+}
diff --git a/tests/system/Database/Live/DeleteTest.php b/tests/system/Database/Live/DeleteTest.php
index 2d6e50bc79..048852ba21 100644
--- a/tests/system/Database/Live/DeleteTest.php
+++ b/tests/system/Database/Live/DeleteTest.php
@@ -1,11 +1,12 @@
 <?php namespace CodeIgniter\Database\Live;
 
 use \CodeIgniter\Database\Exceptions\DatabaseException;
+use CodeIgniter\Test\CIDatabaseTestCase;
 
 /**
  * @group DatabaseLive
  */
-class DeleteTest extends \CIDatabaseTestCase
+class DeleteTest extends CIDatabaseTestCase
 {
 	protected $refresh = true;
 
diff --git a/tests/system/Database/Live/EmptyTest.php b/tests/system/Database/Live/EmptyTest.php
index 8f5520e94c..33f53e8ef1 100644
--- a/tests/system/Database/Live/EmptyTest.php
+++ b/tests/system/Database/Live/EmptyTest.php
@@ -1,21 +1,23 @@
 <?php namespace CodeIgniter\Database\Live;
 
+use CodeIgniter\Test\CIDatabaseTestCase;
+
 /**
  * @group DatabaseLive
  */
-class EmptyTest extends \CIDatabaseTestCase
+class EmptyTest extends CIDatabaseTestCase
 {
 	protected $refresh = true;
 
 	protected $seed = 'CITestSeeder';
 
-	public function testEmpty() 
+	public function testEmpty()
 	{
 	    $this->db->table('misc')->emptyTable();
 
 		$this->assertEquals(0, $this->db->table('misc')->countAll());
 	}
-	
+
 	//--------------------------------------------------------------------
 
 	public function testTruncate()
@@ -26,4 +28,4 @@ class EmptyTest extends \CIDatabaseTestCase
 	}
 
 	//--------------------------------------------------------------------
-}
\ No newline at end of file
+}
diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index 35e8fef134..b570467250 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -1,9 +1,11 @@
 <?php namespace CodeIgniter\Database\Live;
 
+use CodeIgniter\Test\CIDatabaseTestCase;
+
 /**
  * @group DatabaseLive
  */
-class ForgeTest extends \CIDatabaseTestCase
+class ForgeTest extends CIDatabaseTestCase
 {
 	protected $refresh = true;
 
diff --git a/tests/system/Database/Live/FromTest.php b/tests/system/Database/Live/FromTest.php
index 0f6de21426..9d3740f61f 100644
--- a/tests/system/Database/Live/FromTest.php
+++ b/tests/system/Database/Live/FromTest.php
@@ -1,9 +1,11 @@
 <?php namespace CodeIgniter\Database\Live;
 
+use CodeIgniter\Test\CIDatabaseTestCase;
+
 /**
  * @group DatabaseLive
  */
-class FromTest extends \CIDatabaseTestCase
+class FromTest extends CIDatabaseTestCase
 {
 	protected $refresh = true;
 
diff --git a/tests/system/Database/Live/GetTest.php b/tests/system/Database/Live/GetTest.php
index 286cc3a3d8..85349437ae 100644
--- a/tests/system/Database/Live/GetTest.php
+++ b/tests/system/Database/Live/GetTest.php
@@ -1,9 +1,11 @@
 <?php namespace CodeIgniter\Database\Live;
 
+use CodeIgniter\Test\CIDatabaseTestCase;
+
 /**
  * @group DatabaseLive
  */
-class GetTest extends \CIDatabaseTestCase
+class GetTest extends CIDatabaseTestCase
 {
 	protected $refresh = true;
 
@@ -61,4 +63,4 @@ class GetTest extends \CIDatabaseTestCase
 	}
 
 	//--------------------------------------------------------------------
-}
\ No newline at end of file
+}
diff --git a/tests/system/Database/Live/GroupTest.php b/tests/system/Database/Live/GroupTest.php
index 7e457ef74f..65dce2c6a5 100644
--- a/tests/system/Database/Live/GroupTest.php
+++ b/tests/system/Database/Live/GroupTest.php
@@ -1,9 +1,11 @@
 <?php namespace CodeIgniter\Database\Live;
 
+use CodeIgniter\Test\CIDatabaseTestCase;
+
 /**
  * @group DatabaseLive
  */
-class GroupTest extends \CIDatabaseTestCase
+class GroupTest extends CIDatabaseTestCase
 {
 	protected $refresh = true;
 
diff --git a/tests/system/Database/Live/IncrementTest.php b/tests/system/Database/Live/IncrementTest.php
index f854950648..c5d7209cf0 100644
--- a/tests/system/Database/Live/IncrementTest.php
+++ b/tests/system/Database/Live/IncrementTest.php
@@ -1,9 +1,11 @@
 <?php namespace CodeIgniter\Database\Live;
 
+use CodeIgniter\Test\CIDatabaseTestCase;
+
 /**
  * @group DatabaseLive
  */
-class IncrementTest extends \CIDatabaseTestCase
+class IncrementTest extends CIDatabaseTestCase
 {
 	protected $refresh = true;
 
@@ -60,4 +62,4 @@ class IncrementTest extends \CIDatabaseTestCase
 	}
 
 	//--------------------------------------------------------------------
-}
\ No newline at end of file
+}
diff --git a/tests/system/Database/Live/InsertTest.php b/tests/system/Database/Live/InsertTest.php
index a57d8967d3..207c64627d 100644
--- a/tests/system/Database/Live/InsertTest.php
+++ b/tests/system/Database/Live/InsertTest.php
@@ -1,9 +1,11 @@
 <?php namespace CodeIgniter\Database\Live;
 
+use CodeIgniter\Test\CIDatabaseTestCase;
+
 /**
  * @group DatabaseLive
  */
-class InsertTest extends \CIDatabaseTestCase
+class InsertTest extends CIDatabaseTestCase
 {
 	protected $refresh = true;
 
diff --git a/tests/system/Database/Live/JoinTest.php b/tests/system/Database/Live/JoinTest.php
index 003baa1383..5f3fb6c770 100644
--- a/tests/system/Database/Live/JoinTest.php
+++ b/tests/system/Database/Live/JoinTest.php
@@ -1,9 +1,11 @@
 <?php namespace CodeIgniter\Database\Live;
 
+use CodeIgniter\Test\CIDatabaseTestCase;
+
 /**
  * @group DatabaseLive
  */
-class JoinTest extends \CIDatabaseTestCase
+class JoinTest extends CIDatabaseTestCase
 {
 	protected $refresh = true;
 
@@ -26,4 +28,4 @@ class JoinTest extends \CIDatabaseTestCase
 	//--------------------------------------------------------------------
 
 
-}
\ No newline at end of file
+}
diff --git a/tests/system/Database/Live/LikeTest.php b/tests/system/Database/Live/LikeTest.php
index 105aae33fb..0922d4cc80 100644
--- a/tests/system/Database/Live/LikeTest.php
+++ b/tests/system/Database/Live/LikeTest.php
@@ -1,9 +1,11 @@
 <?php namespace CodeIgniter\Database\Live;
 
+use CodeIgniter\Test\CIDatabaseTestCase;
+
 /**
  * @group DatabaseLive
  */
-class LikeTest extends \CIDatabaseTestCase
+class LikeTest extends CIDatabaseTestCase
 {
 	protected $refresh = true;
 
diff --git a/tests/system/Database/Live/LimitTest.php b/tests/system/Database/Live/LimitTest.php
index 69db06406d..e7669ebdd5 100644
--- a/tests/system/Database/Live/LimitTest.php
+++ b/tests/system/Database/Live/LimitTest.php
@@ -1,9 +1,11 @@
 <?php namespace CodeIgniter\Database\Live;
 
+use CodeIgniter\Test\CIDatabaseTestCase;
+
 /**
  * @group DatabaseLive
  */
-class LimitTest extends \CIDatabaseTestCase
+class LimitTest extends CIDatabaseTestCase
 {
 	protected $refresh = true;
 
diff --git a/tests/system/Database/Live/ModelTest.php b/tests/system/Database/Live/ModelTest.php
index 60ccbf8014..38807592f0 100644
--- a/tests/system/Database/Live/ModelTest.php
+++ b/tests/system/Database/Live/ModelTest.php
@@ -2,6 +2,7 @@
 
 use CodeIgniter\I18n\Time;
 use CodeIgniter\Model;
+use CodeIgniter\Test\CIDatabaseTestCase;
 use CodeIgniter\Test\ReflectionHelper;
 use Tests\Support\Models\EntityModel;
 use Tests\Support\Models\EventModel;
@@ -13,7 +14,7 @@ use Tests\Support\Models\ValidModel;
 /**
  * @group DatabaseLive
  */
-class ModelTest extends \CIDatabaseTestCase
+class ModelTest extends CIDatabaseTestCase
 {
 	use ReflectionHelper;
 
diff --git a/tests/system/Database/Live/OrderTest.php b/tests/system/Database/Live/OrderTest.php
index c1e36e768c..512b7edb85 100644
--- a/tests/system/Database/Live/OrderTest.php
+++ b/tests/system/Database/Live/OrderTest.php
@@ -1,9 +1,11 @@
 <?php namespace CodeIgniter\Database\Live;
 
+use CodeIgniter\Test\CIDatabaseTestCase;
+
 /**
  * @group DatabaseLive
  */
-class OrderTest extends \CIDatabaseTestCase
+class OrderTest extends CIDatabaseTestCase
 {
 	protected $refresh = true;
 
diff --git a/tests/system/Database/Live/PreparedQueryTest.php b/tests/system/Database/Live/PreparedQueryTest.php
index e92ffd5c88..7dc07b35a8 100644
--- a/tests/system/Database/Live/PreparedQueryTest.php
+++ b/tests/system/Database/Live/PreparedQueryTest.php
@@ -1,11 +1,12 @@
 <?php namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Database\BasePreparedQuery;
+use CodeIgniter\Test\CIDatabaseTestCase;
 
 /**
  * @group DatabaseLive
  */
-class PreparedQueryTest extends \CIDatabaseTestCase
+class PreparedQueryTest extends CIDatabaseTestCase
 {
 	protected $refresh = true;
 
diff --git a/tests/system/Database/Live/PretendTest.php b/tests/system/Database/Live/PretendTest.php
index cc59bec12d..5ae96dfb2f 100644
--- a/tests/system/Database/Live/PretendTest.php
+++ b/tests/system/Database/Live/PretendTest.php
@@ -1,11 +1,12 @@
 <?php namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Database\Query;
+use CodeIgniter\Test\CIDatabaseTestCase;
 
 /**
  * @group DatabaseLive
  */
-class PretendTest extends \CIDatabaseTestCase
+class PretendTest extends CIDatabaseTestCase
 {
 	public function tearDown()
 	{
diff --git a/tests/system/Database/Live/SelectTest.php b/tests/system/Database/Live/SelectTest.php
index e4d2b1c3ce..b2829baca3 100644
--- a/tests/system/Database/Live/SelectTest.php
+++ b/tests/system/Database/Live/SelectTest.php
@@ -1,10 +1,12 @@
 <?php namespace CodeIgniter\Database\Live;
 
+use CodeIgniter\Test\CIDatabaseTestCase;
+
 
 /**
  * @group DatabaseLive
  */
-class SelectTest extends \CIDatabaseTestCase
+class SelectTest extends CIDatabaseTestCase
 {
 	protected $refresh = true;
 
diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php
index 8971b28eef..b7e4f0735d 100644
--- a/tests/system/Database/Live/UpdateTest.php
+++ b/tests/system/Database/Live/UpdateTest.php
@@ -1,11 +1,12 @@
 <?php namespace CodeIgniter\Database\Live;
 
 use \CodeIgniter\Database\Exceptions\DatabaseException;
+use CodeIgniter\Test\CIDatabaseTestCase;
 
 /**
  * @group DatabaseLive
  */
-class UpdateTest extends \CIDatabaseTestCase
+class UpdateTest extends CIDatabaseTestCase
 {
 	protected $refresh = true;
 
diff --git a/tests/system/Database/Live/WhereTest.php b/tests/system/Database/Live/WhereTest.php
index eb241ad026..84a3e778eb 100644
--- a/tests/system/Database/Live/WhereTest.php
+++ b/tests/system/Database/Live/WhereTest.php
@@ -1,9 +1,11 @@
 <?php namespace CodeIgniter\Database\Live;
 
+use CodeIgniter\Test\CIDatabaseTestCase;
+
 /**
  * @group DatabaseLive
  */
-class WhereTest extends \CIDatabaseTestCase
+class WhereTest extends CIDatabaseTestCase
 {
 	protected $refresh = true;
 
diff --git a/tests/system/Events/EventsTest.php b/tests/system/Events/EventsTest.php
index 7663099f0e..5cff30123f 100644
--- a/tests/system/Events/EventsTest.php
+++ b/tests/system/Events/EventsTest.php
@@ -1,20 +1,18 @@
 <?php namespace CodeIgniter\Events;
 
+use Tests\Support\Events\MockEvents;
+
 class EventsTest extends \CIUnitTestCase
 {
-
-	/**
-	 * @var \UnitTester
-	 */
-	protected $tester;
-
 	/**
 	 * Accessible event manager instance
 	 */
 	protected $manager;
 
-	protected function setUp()
+	public function setUp()
 	{
+		parent::setUp();
+
 		$this->manager = new MockEvents();
 
 		Events::removeAllListeners();
@@ -44,24 +42,25 @@ class EventsTest extends \CIUnitTestCase
 
 	//--------------------------------------------------------------------
 
-	public function testPerformance()
-	{
-		$logged = Events::getPerformanceLogs();
-		// there should be a few event activities logged
-		$this->assertGreaterThan(0,count($logged));
-		
-		// might want additional tests after some activity, or to inspect what has happened so far
-	}
-	
+	// Not working currently - might want to revisit at some point.
+//	public function testPerformance()
+//	{
+//		$logged = Events::getPerformanceLogs();
+//		// there should be a few event activities logged
+//		$this->assertGreaterThan(0,count($logged));
+//
+//		// might want additional tests after some activity, or to inspect what has happened so far
+//	}
+
 	//--------------------------------------------------------------------
 
 	public function testListeners()
 	{
 		$callback1 = function() {
-			
+
 		};
 		$callback2 = function() {
-			
+
 		};
 
 		Events::on('foo', $callback1, EVENT_PRIORITY_HIGH);
diff --git a/tests/system/Files/FileTest.php b/tests/system/Files/FileTest.php
index ace9971414..221e103f41 100644
--- a/tests/system/Files/FileTest.php
+++ b/tests/system/Files/FileTest.php
@@ -3,8 +3,6 @@
 class FileTest extends \CIUnitTestCase
 {
 
-	//---------------------------------------------------------------
-
 	public function testNewGoodChecked()
 	{
 		$path = BASEPATH . 'Common.php';
@@ -21,12 +19,11 @@ class FileTest extends \CIUnitTestCase
 
 	public function testNewBadUnchecked()
 	{
-		$path = $path . 'bogus';
+		$path = BASEPATH . 'bogus';
 		$file = new File($path, false);
 		$this->assertFalse($file->getRealPath());
 	}
 
-	//---------------------------------------------------------------
 	public function testGuessExtension()
 	{
 		$file = new File(BASEPATH . 'Common.php');
@@ -37,7 +34,6 @@ class FileTest extends \CIUnitTestCase
 		$this->assertEquals('xml', $file->guessExtension());
 	}
 
-	//---------------------------------------------------------------
 	public function testRandomName()
 	{
 		$file = new File(BASEPATH . 'Common.php');
@@ -45,8 +41,6 @@ class FileTest extends \CIUnitTestCase
 		$this->assertNotEquals($result1, $file->getRandomName());
 	}
 
-	//---------------------------------------------------------------
-
 	public function testCanAccessSPLFileInfoMethods()
 	{
 		$file = new File(BASEPATH . 'Common.php');
diff --git a/tests/system/Files/FileWithVfsTest.php b/tests/system/Files/FileWithVfsTest.php
index f8113f1d45..80d339f96d 100644
--- a/tests/system/Files/FileWithVfsTest.php
+++ b/tests/system/Files/FileWithVfsTest.php
@@ -6,20 +6,26 @@ use org\bovigo\vfs\vfsStreamDirectory;
 class FileWithVfsTest extends \CIUnitTestCase
 {
 
-	private $root;
-
-	//--------------------------------------------------------------------
+	protected $root;
 
 	public function setup()
 	{
+		parent::setUp();
+
 		$this->root = vfsStream::setup();
 		$this->path = '_support/Files/';
-		vfsStream::copyFromFileSystem(TESTPATH . $this->path, $root);
+		vfsStream::copyFromFileSystem(TESTPATH . $this->path, $this->root);
 		$this->start = $this->root->url() . '/';
 		$this->file = new File($this->start . 'able/apple.php');
 	}
 
-	//---------------------------------------------------------------
+	public function tearDown()
+	{
+		parent::tearDown();
+
+		$this->root = null;
+	}
+
 	public function testDestinationUnknown()
 	{
 		$destination = $this->start . 'charlie/cherry.php';
@@ -68,7 +74,6 @@ class FileWithVfsTest extends \CIUnitTestCase
 		$this->assertEquals($this->start . 'able/prune_ripe_1.php', $this->file->getDestination($destination));
 	}
 
-	//---------------------------------------------------------------
 	public function testMoveNormal()
 	{
 		$destination = $this->start . 'baker';
@@ -102,13 +107,14 @@ class FileWithVfsTest extends \CIUnitTestCase
 	}
 
 	/**
-	 * @expectedException \CodeIgniter\Files\Exceptions\FileException
+	 * @expectedException \Exception
 	 */
 	public function testMoveFailure()
 	{
 		$here = $this->root->url();
-		mkdir($here,400,true); // make a read-only folder
-		$destination = here . 'charlie';
+
+		chmod($here,400); // make a read-only folder
+		$destination = $here . '/charlie';
 		$this->file->move($destination); // try to move our file there
 	}
 
diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php
index d7df2b623c..a7ef40e294 100644
--- a/tests/system/Filters/FiltersTest.php
+++ b/tests/system/Filters/FiltersTest.php
@@ -20,9 +20,9 @@ class FiltersTest extends \CIUnitTestCase
 	protected $request;
 	protected $response;
 
-	public function __construct()
+	public function setUp()
 	{
-		parent::__construct();
+		parent::setUp();
 
 		$this->request = Services::request();
 		$this->response = Services::response();
@@ -30,20 +30,6 @@ class FiltersTest extends \CIUnitTestCase
 
 	//--------------------------------------------------------------------
 
-	public function setUp()
-	{
-		
-	}
-
-	//--------------------------------------------------------------------
-
-	public function tearDown()
-	{
-		
-	}
-
-	//--------------------------------------------------------------------
-
 	public function testProcessMethodDetectsCLI()
 	{
 		$config = [
diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
index 1d63f24221..102c1e2760 100644
--- a/tests/system/HTTP/CURLRequestTest.php
+++ b/tests/system/HTTP/CURLRequestTest.php
@@ -2,6 +2,7 @@
 
 use CodeIgniter\Config\Services;
 use Config\App;
+use Tests\Support\HTTP\MockCURLRequest;
 
 class CURLRequestTest extends \CIUnitTestCase
 {
@@ -9,6 +10,9 @@ class CURLRequestTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
+		Services::reset();
 	    $this->request = $this->getRequest();
 	}
 
diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index eef7b028e6..eb82455105 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -14,6 +14,8 @@ class IncomingRequestTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->request = new IncomingRequest(new App(), new URI(), null, new UserAgent());
 
 		$_POST = $_GET = $_SERVER = $_REQUEST = $_ENV = $_COOKIE = $_SESSION = [];
@@ -79,7 +81,9 @@ class IncomingRequestTest extends \CIUnitTestCase
 
 	public function testCanGrabServerVars()
 	{
-		$_SERVER['TEST'] = 5;
+		$server = $this->getPrivateProperty($this->request, 'globals');
+		$server['server']['TEST'] = 5;
+		$this->setPrivateProperty($this->request, 'globals', $server);
 
 		$this->assertEquals(5, $this->request->getServer('TEST'));
 		$this->assertNull($this->request->getServer('TESTY'));
@@ -89,7 +93,9 @@ class IncomingRequestTest extends \CIUnitTestCase
 
 	public function testCanGrabEnvVars()
 	{
-		$_ENV['TEST'] = 5;
+		$server = $this->getPrivateProperty($this->request, 'globals');
+		$server['env']['TEST'] = 5;
+		$this->setPrivateProperty($this->request, 'globals', $server);
 
 		$this->assertEquals(5, $this->request->getEnv('TEST'));
 		$this->assertNull($this->request->getEnv('TESTY'));
@@ -105,244 +111,8 @@ class IncomingRequestTest extends \CIUnitTestCase
 		$this->assertNull($this->request->getCookie('TESTY'));
 	}
 
-	//--------------------------------------------------------------------
-
-	public function testFetchGlobalReturnsSingleValue()
-	{
-		$_POST = [
-			'foo' => 'bar',
-			'bar' => 'baz',
-			'xxx' => 'yyy',
-			'yyy' => 'zzz'
-		];
-
-		$this->assertEquals('baz', $this->request->getPost('bar'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testFetchGlobalWithArrayTop()
-	{
-		$_POST = [
-			'clients' => [
-				'address' => [
-					'zipcode' => 90210
-				]
-			]
-		];
-
-		$this->assertEquals(['address' => ['zipcode' => 90210]], $this->request->getPost('clients'));
-	}
-
-	public function testFetchGlobalWithArrayChildNumeric()
-	{
-		$_POST = [
-			'clients' => [
-				[
-					'address' => [
-						'zipcode' => 90210
-					],
-				],
-				[
-					'address' => [
-						'zipcode' => 60610
-					],
-				],
-			]
-		];
-
-		$this->assertEquals(['zipcode' => 60610], $this->request->getPost('clients[1][address]'));
-	}
-
-	public function testFetchGlobalWithArrayChildElement()
-	{
-		$_POST = [
-			'clients' => [
-				'address' => [
-					'zipcode' => 90210
-				],
-			]
-		];
-
-		$this->assertEquals(['zipcode' => 90210], $this->request->getPost('clients[address]'));
-	}
-
-	public function testFetchGlobalWithArrayLastElement()
-	{
-		$_POST = [
-			'clients' => [
-				'address' => [
-					'zipcode' => 90210
-				]
-			]
-		];
-
-		$this->assertEquals(90210, $this->request->getPost('clients[address][zipcode]'));
-	}
-
-	/**
-     * @see https://github.com/bcit-ci/CodeIgniter4/issues/353
-     */
-    public function testGetPostReturnsArrayValues()
-    {
-        $_POST = [
-            'ANNOUNCEMENTS' => [
-                1 => [
-                    'DETAIL' => 'asdf'
-                ],
-                2 => [
-                    'DETAIL' => 'sdfg'
-                ]
-            ],
-            'submit' => 'SAVE'
-        ];
-
-        $result = $this->request->getPost();
-
-        $this->assertEquals($_POST, $result);
-        $this->assertInternalType('array', $result['ANNOUNCEMENTS']);
-        $this->assertCount(2, $result['ANNOUNCEMENTS']);
-    }
-
     //--------------------------------------------------------------------
 
-	public function testFetchGlobalFiltersValue()
-	{
-		$_POST = [
-			'foo' => 'bar<script>',
-			'bar' => 'baz',
-			'xxx' => 'yyy',
-			'yyy' => 'zzz'
-		];
-
-		$this->assertEquals('bar%3Cscript%3E', $this->request->getPost('foo', FILTER_SANITIZE_ENCODED));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testFetchGlobalFilterWithFlagValue()
-	{
-		$_POST = [
-			'foo' => '`bar<script>',
-			'bar' => 'baz',
-			'xxx' => 'yyy',
-			'yyy' => 'zzz'
-		];
-
-		$this->assertEquals('bar%3Cscript%3E', $this->request->getPost('foo', FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testFetchGlobalReturnsAllWhenEmpty()
-	{
-		$post = [
-			'foo' => 'bar',
-			'bar' => 'baz',
-			'xxx' => 'yyy',
-			'yyy' => 'zzz'
-		];
-		$_POST = $post;
-
-		$this->assertEquals($post, $this->request->getPost());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testFetchGlobalFiltersAllValues()
-	{
-		$_POST = [
-			'foo' => 'bar<script>',
-			'bar' => 'baz<script>',
-			'xxx' => 'yyy<script>',
-			'yyy' => 'zzz<script>'
-		];
-		$expected = [
-			'foo' => 'bar%3Cscript%3E',
-			'bar' => 'baz%3Cscript%3E',
-			'xxx' => 'yyy%3Cscript%3E',
-			'yyy' => 'zzz%3Cscript%3E'
-		];
-
-		$this->assertEquals($expected, $this->request->getPost(null, FILTER_SANITIZE_ENCODED));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testFetchGlobalFilterWithFlagAllValues()
-	{
-		$_POST = [
-			'foo' => '`bar<script>',
-			'bar' => '`baz<script>',
-			'xxx' => '`yyy<script>',
-			'yyy' => '`zzz<script>'
-		];
-		$expected = [
-			'foo' => 'bar%3Cscript%3E',
-			'bar' => 'baz%3Cscript%3E',
-			'xxx' => 'yyy%3Cscript%3E',
-			'yyy' => 'zzz%3Cscript%3E'
-		];
-
-		$this->assertEquals($expected, $this->request->getPost(null, FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testFetchGlobalReturnsSelectedKeys()
-	{
-		$_POST = [
-			'foo' => 'bar',
-			'bar' => 'baz',
-			'xxx' => 'yyy',
-			'yyy' => 'zzz'
-		];
-		$expected = [
-			'foo' => 'bar',
-			'bar' => 'baz',
-		];
-
-		$this->assertEquals($expected, $this->request->getPost(['foo', 'bar']));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testFetchGlobalFiltersSelectedValues()
-	{
-		$_POST = [
-			'foo' => 'bar<script>',
-			'bar' => 'baz<script>',
-			'xxx' => 'yyy<script>',
-			'yyy' => 'zzz<script>'
-		];
-		$expected = [
-			'foo' => 'bar%3Cscript%3E',
-			'bar' => 'baz%3Cscript%3E',
-		];
-
-		$this->assertEquals($expected, $this->request->getPost(['foo', 'bar'], FILTER_SANITIZE_ENCODED));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testFetchGlobalFilterWithFlagSelectedValues()
-	{
-		$_POST = [
-			'foo' => '`bar<script>',
-			'bar' => '`baz<script>',
-			'xxx' => '`yyy<script>',
-			'yyy' => '`zzz<script>'
-		];
-		$expected = [
-			'foo' => 'bar%3Cscript%3E',
-			'bar' => 'baz%3Cscript%3E',
-		];
-
-		$this->assertEquals($expected, $this->request->getPost(['foo', 'bar'], FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
-	}
-
-	//--------------------------------------------------------------------
-
 	public function testStoresDefaultLocale()
 	{
 		$config = new App();
diff --git a/tests/system/HTTP/MessageTest.php b/tests/system/HTTP/MessageTest.php
index f0ce8201e2..339568c4ca 100644
--- a/tests/system/HTTP/MessageTest.php
+++ b/tests/system/HTTP/MessageTest.php
@@ -14,6 +14,8 @@ class MessageTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->message = new Message();
 	}
 
diff --git a/tests/system/HTTP/NegotiateTest.php b/tests/system/HTTP/NegotiateTest.php
index a4bdc6d7e5..75bcd67a94 100644
--- a/tests/system/HTTP/NegotiateTest.php
+++ b/tests/system/HTTP/NegotiateTest.php
@@ -16,6 +16,8 @@ class NegotiateTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->request = new Request(new App());
 
 		$this->negotiate = new Negotiate($this->request);
diff --git a/tests/system/HTTP/RedirectResponseTest.php b/tests/system/HTTP/RedirectResponseTest.php
index 4975e450eb..d5e0a8ac18 100644
--- a/tests/system/HTTP/RedirectResponseTest.php
+++ b/tests/system/HTTP/RedirectResponseTest.php
@@ -5,7 +5,8 @@ use Config\Autoload;
 use CodeIgniter\Config\Services;
 use CodeIgniter\Validation\Validation;
 use CodeIgniter\Router\RouteCollection;
-use CodeIgniter\Autoloader\MockFileLocator;
+use Tests\Support\Autoloader\MockFileLocator;
+use Tests\Support\HTTP\MockIncomingRequest;
 
 class RedirectResponseTest extends \CIUnitTestCase
 {
diff --git a/tests/system/HTTP/RequestTest.php b/tests/system/HTTP/RequestTest.php
index 22aa15c78a..8d189dbb2a 100644
--- a/tests/system/HTTP/RequestTest.php
+++ b/tests/system/HTTP/RequestTest.php
@@ -8,16 +8,243 @@ use Config\App;
 class RequestTest extends \CIUnitTestCase
 {
 	/**
-	 * @var CodeIgniter\HTTP\Request
+	 * @var \CodeIgniter\HTTP\Request
 	 */
 	protected $request;
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->request = new Request(new App());
+		$_POST = [];
+		$_GET = [];
 	}
 
-	//--------------------------------------------------------------------
+	public function testFetchGlobalsSingleValue()
+	{
+		$_POST['foo'] = 'bar';
+		$_GET['bar']  = 'baz';
+
+		$this->assertEquals('bar', $this->request->fetchGlobal('post', 'foo'));
+		$this->assertEquals('baz', $this->request->fetchGlobal('get', 'bar'));
+	}
+
+	public function testFetchGlobalsReturnsNullWhenNotFound()
+	{
+		$this->assertNull($this->request->fetchGlobal('post', 'foo'));
+	}
+
+	public function testFetchGlobalsFiltersValues()
+	{
+		$this->request->setGlobal('post', [
+			'foo' => 'bar<script>',
+			'bar' => 'baz',
+		]);
+
+		$this->assertEquals('bar%3Cscript%3E', $this->request->fetchGlobal('post', 'foo', FILTER_SANITIZE_ENCODED));
+		$this->assertEquals('baz', $this->request->fetchGlobal('post', 'bar'));
+	}
+
+	public function testFetchGlobalsWithFilterFlag()
+	{
+		$this->request->setGlobal('post', [
+			'foo' => '`bar<script>',
+			'bar' => 'baz',
+		]);
+
+		$this->assertEquals('bar%3Cscript%3E', $this->request->fetchGlobal('post','foo', FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
+		$this->assertEquals('baz', $this->request->fetchGlobal('post', 'bar'));
+	}
+
+	public function testFetchGlobalReturnsAllWhenEmpty()
+	{
+		$post = [
+			'foo' => 'bar',
+			'bar' => 'baz',
+			'xxx' => 'yyy',
+			'yyy' => 'zzz'
+		];
+		$this->request->setGlobal('post', $post);
+
+		$this->assertEquals($post, $this->request->fetchGlobal('post'));
+	}
+
+	public function testFetchGlobalFiltersAllValues()
+	{
+		$post = [
+			'foo' => 'bar<script>',
+			'bar' => 'baz<script>',
+			'xxx' => 'yyy<script>',
+			'yyy' => 'zzz<script>'
+		];
+		$this->request->setGlobal('post', $post);
+		$expected = [
+			'foo' => 'bar%3Cscript%3E',
+			'bar' => 'baz%3Cscript%3E',
+			'xxx' => 'yyy%3Cscript%3E',
+			'yyy' => 'zzz%3Cscript%3E'
+		];
+
+		$this->assertEquals($expected, $this->request->fetchGlobal('post', null, FILTER_SANITIZE_ENCODED));
+	}
+
+	public function testFetchGlobalFilterWithFlagAllValues()
+	{
+		$post = [
+			'foo' => '`bar<script>',
+			'bar' => '`baz<script>',
+			'xxx' => '`yyy<script>',
+			'yyy' => '`zzz<script>'
+		];
+		$this->request->setGlobal('post', $post);
+		$expected = [
+			'foo' => 'bar%3Cscript%3E',
+			'bar' => 'baz%3Cscript%3E',
+			'xxx' => 'yyy%3Cscript%3E',
+			'yyy' => 'zzz%3Cscript%3E'
+		];
+
+		$this->assertEquals($expected, $this->request->fetchGlobal('post',null, FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
+	}
+
+	public function testFetchGlobalReturnsSelectedKeys()
+	{
+		$post = [
+			'foo' => 'bar',
+			'bar' => 'baz',
+			'xxx' => 'yyy',
+			'yyy' => 'zzz'
+		];
+		$this->request->setGlobal('post', $post);
+		$expected = [
+			'foo' => 'bar',
+			'bar' => 'baz',
+		];
+
+		$this->assertEquals($expected, $this->request->fetchGlobal('post', ['foo', 'bar']));
+	}
+
+	public function testFetchGlobalFiltersSelectedValues()
+	{
+		$post = [
+			'foo' => 'bar<script>',
+			'bar' => 'baz<script>',
+			'xxx' => 'yyy<script>',
+			'yyy' => 'zzz<script>'
+		];
+		$this->request->setGlobal('post', $post);
+		$expected = [
+			'foo' => 'bar%3Cscript%3E',
+			'bar' => 'baz%3Cscript%3E',
+		];
+
+		$this->assertEquals($expected, $this->request->fetchGlobal('post', ['foo', 'bar'], FILTER_SANITIZE_ENCODED));
+	}
+
+	public function testFetchGlobalFilterWithFlagSelectedValues()
+	{
+		$post = [
+			'foo' => '`bar<script>',
+			'bar' => '`baz<script>',
+			'xxx' => '`yyy<script>',
+			'yyy' => '`zzz<script>'
+		];
+		$this->request->setGlobal('post', $post);
+		$expected = [
+			'foo' => 'bar%3Cscript%3E',
+			'bar' => 'baz%3Cscript%3E',
+		];
+
+		$this->assertEquals($expected, $this->request->fetchGlobal('post', ['foo', 'bar'], FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
+	}
+
+	/**
+	 * @see https://github.com/bcit-ci/CodeIgniter4/issues/353
+	 */
+	public function testFetchGlobalReturnsArrayValues()
+	{
+		$post = [
+			'ANNOUNCEMENTS' => [
+				1 => [
+					'DETAIL' => 'asdf'
+				],
+				2 => [
+					'DETAIL' => 'sdfg'
+				]
+			],
+			'submit' => 'SAVE'
+		];
+		$this->request->setGlobal('post', $post);
+		$result = $this->request->fetchGlobal('post');
+
+		$this->assertEquals($post, $result);
+		$this->assertInternalType('array', $result['ANNOUNCEMENTS']);
+		$this->assertCount(2, $result['ANNOUNCEMENTS']);
+	}
+
+	public function testFetchGlobalWithArrayTop()
+	{
+		$post = [
+			'clients' => [
+				'address' => [
+					'zipcode' => 90210
+				]
+			]
+		];
+		$this->request->setGlobal('post', $post);
+
+		$this->assertEquals(['address' => ['zipcode' => 90210]], $this->request->fetchGlobal('post','clients'));
+	}
+
+	public function testFetchGlobalWithArrayChildNumeric()
+	{
+		$post = [
+			'clients' => [
+				[
+					'address' => [
+						'zipcode' => 90210
+					],
+				],
+				[
+					'address' => [
+						'zipcode' => 60610
+					],
+				],
+			]
+		];
+		$this->request->setGlobal('post', $post);
+
+		$this->assertEquals(['zipcode' => 60610], $this->request->fetchGlobal('post','clients[1][address]'));
+	}
+
+	public function testFetchGlobalWithArrayChildElement()
+	{
+		$post = [
+			'clients' => [
+				'address' => [
+					'zipcode' => 90210
+				],
+			]
+		];
+		$this->request->setGlobal('post', $post);
+
+		$this->assertEquals(['zipcode' => 90210], $this->request->fetchGlobal('post','clients[address]'));
+	}
+
+	public function testFetchGlobalWithArrayLastElement()
+	{
+		$post = [
+			'clients' => [
+				'address' => [
+					'zipcode' => 90210
+				]
+			]
+		];
+		$this->request->setGlobal('post', $post);
+
+		$this->assertEquals(90210, $this->request->fetchGlobal('post', 'clients[address][zipcode]'));
+	}
 
 	public function ipAddressChecks()
 	{
@@ -34,8 +261,6 @@ class RequestTest extends \CIUnitTestCase
 		];
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * @dataProvider ipAddressChecks
 	 */
@@ -44,15 +269,10 @@ class RequestTest extends \CIUnitTestCase
 		$this->assertEquals($expected, $this->request->isValidIP($address, $type));
 	}
 
-	//--------------------------------------------------------------------
-
 	public function testMethodReturnsRightStuff()
 	{
 		// Defaults method to GET now.
 		$this->assertEquals('get', $this->request->getMethod());
 		$this->assertEquals('GET', $this->request->getMethod(true));
 	}
-
-	//--------------------------------------------------------------------
-
 }
diff --git a/tests/system/HTTP/ResponseTest.php b/tests/system/HTTP/ResponseTest.php
index 20784ae717..294fb00c80 100644
--- a/tests/system/HTTP/ResponseTest.php
+++ b/tests/system/HTTP/ResponseTest.php
@@ -2,6 +2,7 @@
 
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 use Config\App;
+use Config\Format;
 use DateTime;
 use DateTimeZone;
 
@@ -217,4 +218,105 @@ class ResponseTest extends \CIUnitTestCase
 
 	//--------------------------------------------------------------------
 
+	public function testSetCookieFails()
+	{
+		$response = new Response(new App());
+
+		$this->assertFalse($response->hasCookie('foo'));
+	}
+
+	public function testSetCookieMatch()
+	{
+		$response = new Response(new App());
+		$response->setCookie('foo', 'bar');
+
+		$this->assertTrue($response->hasCookie('foo'));
+		$this->assertTrue($response->hasCookie('foo', 'bar'));
+	}
+
+	public function testSetCookieFailDifferentPrefix()
+	{
+		$response = new Response(new App());
+		$response->setCookie('foo', 'bar', '', '', '', 'ack');
+
+		$this->assertFalse($response->hasCookie('foo'));
+	}
+
+	public function testSetCookieSuccessOnPrefix()
+	{
+		$response = new Response(new App());
+		$response->setCookie('foo', 'bar', '', '', '', 'ack');
+
+		$this->assertFalse($response->hasCookie('foo', null, 'ack'));
+	}
+
+	public function testJSONWithArray()
+	{
+		$response = new Response(new App());
+		$config = new Format();
+		$formatter = $config->getFormatter('application/json');
+
+		$body = [
+			'foo' => 'bar',
+			'bar' => [1, 2, 3]
+		];
+		$expected = $formatter->format($body);
+
+		$response->setJSON($body);
+
+		$this->assertEquals($expected, $response->getJSON());
+		$this->assertTrue(strpos($response->getHeaderLine('content-type'), 'application/json') !== false);
+	}
+
+	public function testJSONGetFromNormalBody()
+	{
+		$response = new Response(new App());
+		$config = new Format();
+		$formatter = $config->getFormatter('application/json');
+
+		$body = [
+			'foo' => 'bar',
+			'bar' => [1, 2, 3]
+		];
+		$expected = $formatter->format($body);
+
+		$response->setBody($body);
+
+		$this->assertEquals($expected, $response->getJSON());
+	}
+
+	public function testXMLWithArray()
+	{
+		$response = new Response(new App());
+		$config = new Format();
+		$formatter = $config->getFormatter('application/xml');
+
+		$body = [
+			'foo' => 'bar',
+			'bar' => [1, 2, 3]
+		];
+		$expected = $formatter->format($body);
+
+		$response->setXML($body);
+
+		$this->assertEquals($expected, $response->getXML());
+		$this->assertTrue(strpos($response->getHeaderLine('content-type'), 'application/xml') !== false);
+	}
+
+	public function testXMLGetFromNormalBody()
+	{
+		$response = new Response(new App());
+		$config = new Format();
+		$formatter = $config->getFormatter('application/xml');
+
+		$body = [
+			'foo' => 'bar',
+			'bar' => [1, 2, 3]
+		];
+		$expected = $formatter->format($body);
+
+		$response->setBody($body);
+
+		$this->assertEquals($expected, $response->getXML());
+	}
 }
diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php
index da594b37b2..cfd680133f 100644
--- a/tests/system/HTTP/URITest.php
+++ b/tests/system/HTTP/URITest.php
@@ -9,7 +9,7 @@ class URITest extends \CIUnitTestCase
 
 	public function setUp()
 	{
-
+		parent::setUp();
 	}
 
 	//--------------------------------------------------------------------
diff --git a/tests/system/HTTP/UserAgentTest.php b/tests/system/HTTP/UserAgentTest.php
index e5f8b310fc..459b7f1513 100644
--- a/tests/system/HTTP/UserAgentTest.php
+++ b/tests/system/HTTP/UserAgentTest.php
@@ -14,6 +14,8 @@ class UserAgent_test extends \CIUnitTestCase {
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		// set a baseline user agent
 		$_SERVER['HTTP_USER_AGENT'] = $this->_user_agent;
 
diff --git a/tests/system/Helpers/CookieHelperTest.php b/tests/system/Helpers/CookieHelperTest.php
index cb979ef74e..a361721cd7 100755
--- a/tests/system/Helpers/CookieHelperTest.php
+++ b/tests/system/Helpers/CookieHelperTest.php
@@ -2,6 +2,7 @@
 
 use Config\App;
 use CodeIgniter\Config\Services;
+use Tests\Support\HTTP\MockResponse;
 
 final class cookieHelperTest extends \CIUnitTestCase
 {
@@ -12,23 +13,25 @@ final class cookieHelperTest extends \CIUnitTestCase
     private $response;
 
     public function setUp()
-    {        
+    {
+	    parent::setUp();
+
         $this->name   = 'greetings';
         $this->value  = 'hello world';
         $this->expire = 9999;
 
         Services::injectMock('response', new MockResponse(new App()));
         $this->response = service('response');
-        
+
         helper('cookie');
     }
 
     //--------------------------------------------------------------------
-    
+
     public function testSetCookie()
     {
         $this->response->setCookie($this->name, $this->value, $this->expire);
-        
+
         //TODO: Find a way for set_cookie() to use the MockResponse object.
         //set_cookie($this->name, $this->value, $this->expire);
 
@@ -42,14 +45,14 @@ final class cookieHelperTest extends \CIUnitTestCase
     public function testSetCookieByArrayParameters()
     {
         $cookieAttr = [
-            'name'   => $this->name, 
-            'value'  => $this->value, 
+            'name'   => $this->name,
+            'value'  => $this->value,
             'expire' => $this->expire
         ];
         //set_cookie($cookieAttr);
         $this->response->setCookie($cookieAttr);
-        
-        $this->assertEquals(get_cookie($this->name), $this->value);
+
+        $this->assertTrue($this->response->hasCookie($this->name, $this->value));
 
         $this->response->deleteCookie($this->name);
     }
@@ -69,12 +72,12 @@ final class cookieHelperTest extends \CIUnitTestCase
         //set_cookie($secured,   $sec,   $this->expire);
         $this->response->setCookie($unsecured, $unsec, $this->expire);
         $this->response->setCookie($secured, $sec, $this->expire);
-        
-        $this->assertEquals($unsec, get_cookie($unsecured, false));
-        $this->assertEquals($sec,   get_cookie($secured,   true));
+
+	    $this->assertTrue($this->response->hasCookie($unsecured, $unsec));
+	    $this->assertTrue($this->response->hasCookie($secured, $sec));
 
         $this->response->deleteCookie($unsecured);
-        $this->response->deleteCookie($secured);   
+        $this->response->deleteCookie($secured);
     }
 
     //--------------------------------------------------------------------
@@ -83,9 +86,9 @@ final class cookieHelperTest extends \CIUnitTestCase
     {
         //set_cookie($this->name, $this->value, $this->expire);
         $this->response->setCookie($this->name, $this->value, $this->expire);
-        
+
         $this->response->deleteCookie($this->name);
-        
+
         //$this->assertEquals(get_cookie($this->name), '');
         $this->assertTrue($this->response->hasCookie($this->name));
     }
diff --git a/tests/system/Helpers/FilesystemHelperTest.php b/tests/system/Helpers/FilesystemHelperTest.php
index 06c3bf41e9..cbf2c437a5 100644
--- a/tests/system/Helpers/FilesystemHelperTest.php
+++ b/tests/system/Helpers/FilesystemHelperTest.php
@@ -1,7 +1,5 @@
 <?php namespace CodeIgniter\Helpers;
 
-include BASEPATH.'../vendor/autoload.php';
-
 use org\bovigo\vfs\vfsStream;
 
 class FilesystemHelperTest extends \CIUnitTestCase
diff --git a/tests/system/Helpers/FormHelperTest.php b/tests/system/Helpers/FormHelperTest.php
index d1b5456c02..955ee82850 100644
--- a/tests/system/Helpers/FormHelperTest.php
+++ b/tests/system/Helpers/FormHelperTest.php
@@ -9,6 +9,8 @@ class FormHelperTest extends \CIUnitTestCase
 {
     public function setUp()
     {
+	    parent::setUp();
+
         helper('form');
     }
     // ------------------------------------------------------------------------
@@ -594,32 +596,41 @@ EOH;
     // ------------------------------------------------------------------------
     public function test_set_checkbox()
     {
-    	$_SESSION['_ci_old_input']['post']['foo'] = 'bar';
+	    $_SESSION = [
+	    	'_ci_old_input' => [
+	    		'post' => [
+	    			'foo' => 'bar'
+			    ]
+		    ]
+	    ];
+
     	$this->assertEquals(' checked="checked"', set_checkbox('foo', 'bar'));
 
-    	$_SESSION['_ci_old_input']['post']['foo'] = ['foo' => 'bar'];
+    	$_SESSION = [
+    		'_ci_old_input' => [
+    			'post' => [
+    				'foo' => ['foo' => 'bar']
+	            ]
+	        ]
+	    ];
     	$this->assertEquals(' checked="checked"', set_checkbox('foo', 'bar'));
     	$this->assertEquals('', set_checkbox('foo', 'baz'));
 
-    	unset($_SESSION['_ci_old_input']['post']['foo']);
+		$_SESSION = [];
     	$this->assertEquals('', set_checkbox('foo', 'bar'));
-
-    	$_POST = [];
-    	$this->assertEquals(' checked="checked"', set_checkbox('foo', 'baz', true));
     }
     // ------------------------------------------------------------------------
     public function test_set_radio()
     {
-    	$_POST['foo'] = 'bar';
+	    $_SESSION = [
+		    '_ci_old_input' => [
+			    'post' => [
+				    'foo' => 'bar'
+			    ]
+		    ]
+	    ];
+
     	$this->assertEquals(' checked="checked"', set_radio('foo', 'bar'));
-
-    	$_POST['foo'] = ['bar'];
-    	$this->assertEquals(' checked="checked"', set_radio('foo', 'bar'));
-
-    	$_POST['foo'] = ['baz'];
-    	$this->assertEquals('', set_radio('foo', 'bar'));
-
-    	$_POST = [];
-    	$this->assertEquals(' checked="checked"', set_radio('foo', 'bar', true));
+    	$this->assertEquals('', set_radio('foo', 'baz'));
     }
 }
diff --git a/tests/system/Helpers/HTMLHelperTest.php b/tests/system/Helpers/HTMLHelperTest.php
index b174e19a53..7e41046f75 100755
--- a/tests/system/Helpers/HTMLHelperTest.php
+++ b/tests/system/Helpers/HTMLHelperTest.php
@@ -7,11 +7,13 @@ final class HTMLHelperTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		//URL is needed by the HTML Helper.
 		helper('url');
 		helper('html');
 
-		$this->tracks = 
+		$this->tracks =
 		[
 			track('subtitles_no.vtt',  'subtitles', 'no',  'Norwegian No'),
 			track('subtitles_yes.vtt', 'subtitles', 'yes', 'Norwegian Yes')
@@ -137,7 +139,7 @@ EOH;
 		//TODO: Mock baseURL and siteURL.
 		$this->assertEquals
 		(
-			'<img src="http://site.com/images/picture.jpg" alt="" />', 
+			'<img src="http://site.com/images/picture.jpg" alt="" />',
 			img('http://site.com/images/picture.jpg')
 		);
 	}
@@ -188,8 +190,8 @@ EOH;
 
 		$video = video
 		(
-			'test.mp4', 
-			'Your browser does not support the video tag.', 
+			'test.mp4',
+			'Your browser does not support the video tag.',
 			'controls'
 		);
 
@@ -206,8 +208,8 @@ EOH;
 
 		$video = video
 		(
-			'http://www.codeigniter.com/test.mp4', 
-			'Your browser does not support the video tag.', 
+			'http://www.codeigniter.com/test.mp4',
+			'Your browser does not support the video tag.',
 			'controls',
 			$this->tracks
 		);
@@ -290,16 +292,16 @@ EOH;
 <object data="http://example.com/movie.swf" class="test"></object>
 
 EOH;
-		
+
 		$object = object
 		 (
-			'movie.swf', 
-			'application/x-shockwave-flash', 
+			'movie.swf',
+			'application/x-shockwave-flash',
 			'class="test"'
 		);
 
 		$this->assertEquals($expected, $object);
-		
+
 		$expected = <<<EOH
 <object data="http://example.com/movie.swf" class="test">
   <param name="foo" type="ref" value="bar" class="test" />
@@ -307,11 +309,11 @@ EOH;
 </object>
 
 EOH;
-		
+
 		$object = object
 		(
-			'movie.swf', 
-			'application/x-shockwave-flash', 
+			'movie.swf',
+			'application/x-shockwave-flash',
 			'class="test"',
 			[
 				param('foo', 'bar', 'ref', 'class="test"'),
diff --git a/tests/system/Helpers/InflectorHelperTest.php b/tests/system/Helpers/InflectorHelperTest.php
index 4afe56f490..54c7deabd6 100755
--- a/tests/system/Helpers/InflectorHelperTest.php
+++ b/tests/system/Helpers/InflectorHelperTest.php
@@ -6,6 +6,8 @@ final class InflectorHelperTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 	    helper('inflector');
 	}
 
diff --git a/tests/system/Helpers/NumberHelperTest.php b/tests/system/Helpers/NumberHelperTest.php
index e161a4af5d..36a4b9da20 100755
--- a/tests/system/Helpers/NumberHelperTest.php
+++ b/tests/system/Helpers/NumberHelperTest.php
@@ -2,15 +2,13 @@
 
 class numberHelperTest extends \CIUnitTestCase
 {
-    public function __construct(...$params)
-    {
-        parent::__construct(...$params);
+	public function setUp()
+	{
+		parent::setUp();
 
-        helper('number');
+		helper('number');
     }
 
-    //--------------------------------------------------------------------
-
     public function test_roman_number()
     {
         $this->assertEquals('XCVI', number_to_roman(96));
diff --git a/tests/system/Helpers/SecurityHelperTest.php b/tests/system/Helpers/SecurityHelperTest.php
index 74bba4eb39..8ecfd21990 100644
--- a/tests/system/Helpers/SecurityHelperTest.php
+++ b/tests/system/Helpers/SecurityHelperTest.php
@@ -4,6 +4,8 @@ class SecurityHelperTest extends \CIUnitTestCase
 {
     public function setUp()
     {
+	    parent::setUp();
+
         helper('security');
     }
 
diff --git a/tests/system/Helpers/TextHelperTest.php b/tests/system/Helpers/TextHelperTest.php
index 7d6fc37c48..7abf703238 100755
--- a/tests/system/Helpers/TextHelperTest.php
+++ b/tests/system/Helpers/TextHelperTest.php
@@ -2,17 +2,18 @@
 
 class TextHelperTest extends \CIUnitTestCase
 {
+    private $_long_string = 'Once upon a time, a framework had no tests. It sad. So some nice people began to write tests. The more time that went on, the happier it became. Everyone was happy.';
 
-	private $_long_string = 'Once upon a time, a framework had no tests. It sad. So some nice people began to write tests. The more time that went on, the happier it became. Everyone was happy.';
+    public function setUp()
+    {
+	    parent::setUp();
 
-	public function setUp()
-	{
-		helper('text');
-	}
+        helper('text');
+    }
 
-	// --------------------------------------------------------------------
+    // --------------------------------------------------------------------
 
-	public function test_strip_slashes()
+    public function test_strip_slashes()
 	{
 		$expected = [
 			"Is your name O'reilly?",
@@ -289,5 +290,4 @@ class TextHelperTest extends \CIUnitTestCase
 			$result .= alternator() . $phrase;
 		$this->assertEquals(' scream!  scream!  scream!  scream! ', $result);
 	}
-
 }
diff --git a/tests/system/Helpers/URLHelperTest.php b/tests/system/Helpers/URLHelperTest.php
index 71b1c5d0eb..57488de49a 100644
--- a/tests/system/Helpers/URLHelperTest.php
+++ b/tests/system/Helpers/URLHelperTest.php
@@ -14,6 +14,8 @@ class URLHelperTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		helper('url');
 		Services::reset();
 	}
diff --git a/tests/system/Language/LanguageTest.php b/tests/system/Language/LanguageTest.php
index dec6c49160..152e61bdef 100644
--- a/tests/system/Language/LanguageTest.php
+++ b/tests/system/Language/LanguageTest.php
@@ -1,5 +1,8 @@
 <?php namespace CodeIgniter\Language;
 
+use Tests\Support\Language\MockLanguage;
+use Tests\Support\Language\SecondMockLanguage;
+
 class LanguageTest extends \CIUnitTestCase
 {
 
diff --git a/tests/system/Log/ChromeLoggerHandlerTest.php b/tests/system/Log/ChromeLoggerHandlerTest.php
index 1d3ddc35e1..49140029b4 100644
--- a/tests/system/Log/ChromeLoggerHandlerTest.php
+++ b/tests/system/Log/ChromeLoggerHandlerTest.php
@@ -1,61 +1,55 @@
 <?php namespace CodeIgniter\Log\Handlers;
 
-use Config\MockLogger as LoggerConfig;
+use Tests\Support\Config\MockLogger as LoggerConfig;
 use CodeIgniter\Services;
 
 class ChromeLoggerHandlerTest extends \CIUnitTestCase
 {
-	public function setUp()
-	{
-	}
-
-	//--------------------------------------------------------------------
-
         public function testCanHandleLogLevel()
 	{
 		$config = new LoggerConfig();
                 $config->handlers['CodeIgniter\Log\Handlers\TestHandler']['handles'] =  ['critical'];
-                
+
 		$logger = new ChromeLoggerHandler($config->handlers['CodeIgniter\Log\Handlers\TestHandler']);
                 $this->assertFalse($logger->canHandle('foo'));
 	}
-        
+
         //--------------------------------------------------------------------
-        
+
         public function testHandle()
         {
                 $config = new LoggerConfig();
                 $config->handlers['CodeIgniter\Log\Handlers\TestHandler']['handles'] =  ['critical'];
-                
+
 		$logger = new ChromeLoggerHandler($config->handlers['CodeIgniter\Log\Handlers\TestHandler']);
                 $this->assertTrue($logger->handle("warning", "This a log test") );
         }
-        
+
         //--------------------------------------------------------------------
-        
+
         public function testSendLogs()
-        {       
+        {
                 $config = new LoggerConfig();
                 $config->handlers['CodeIgniter\Log\Handlers\TestHandler']['handles'] =  ['critical'];
-                
+
 		$logger = new ChromeLoggerHandler($config->handlers['CodeIgniter\Log\Handlers\TestHandler']);
                 $logger->sendLogs();
-                
+
                 $response = Services::response(null, true);
-                
+
                 $this->assertTrue($response->hasHeader('X-ChromeLogger-Data'));
         }
-        
+
         //--------------------------------------------------------------------
-        
+
         public function testSetDateFormat()
-        {            
+        {
                 $config = new LoggerConfig();
                 $config->handlers['CodeIgniter\Log\Handlers\TestHandler']['handles'] =  ['critical'];
-                
+
 		$logger = new ChromeLoggerHandler($config->handlers['CodeIgniter\Log\Handlers\TestHandler']);
                 $result = $logger->setDateFormat('F j, Y');
-                
+
                 $this->assertObjectHasAttribute('dateFormat', $result);
                 $this->assertObjectHasAttribute('dateFormat', $logger);
         }
diff --git a/tests/system/Log/FileHandlerTest.php b/tests/system/Log/FileHandlerTest.php
index 415b4ddd90..d9fb2e8703 100644
--- a/tests/system/Log/FileHandlerTest.php
+++ b/tests/system/Log/FileHandlerTest.php
@@ -1,20 +1,15 @@
 <?php namespace CodeIgniter\Log\Handlers;
 
-use Config\MockLogger as LoggerConfig;
+use Tests\Support\Config\MockLogger as LoggerConfig;
 
 class FileHandlerTest extends \CIUnitTestCase
 {
-	public function setUp()
-	{
-	}
 
-	//--------------------------------------------------------------------
-        
         public function testHandle()
         {
                 $config = new LoggerConfig();
                 $config->handlers['CodeIgniter\Log\Handlers\TestHandler']['handles'] =  ['critical'];
-                
+
                 $logger = new FileHandler($config->handlers['CodeIgniter\Log\Handlers\TestHandler']);
                 $logger->setDateFormat("Y-m-d H:i:s:u");
                 $this->assertTrue($logger->handle("warning", "This is a test log") );
diff --git a/tests/system/Log/LoggerTest.php b/tests/system/Log/LoggerTest.php
index 1136a71ca1..9d07a9ea70 100644
--- a/tests/system/Log/LoggerTest.php
+++ b/tests/system/Log/LoggerTest.php
@@ -1,19 +1,13 @@
-<?php namespace CodeIgniter\Log;
+<?php
 
+use CodeIgniter\Log\Logger;
 use CodeIgniter\Exceptions\FrameworkException;
 use CodeIgniter\Log\Exceptions\LogException;
-use Config\MockLogger as LoggerConfig;
-use Psr\Log\LogLevel;
-use CodeIgniter\Log\Handlers\TestHandler;
+use Tests\Support\Config\MockLogger as LoggerConfig;
+use Tests\Support\Log\Handlers\TestHandler;
 
 class LoggerTest extends \CIUnitTestCase
 {
-	public function setUp()
-	{
-	}
-
-	//--------------------------------------------------------------------
-
 	public function testThrowsExceptionWithBadHandlerSettings()
 	{
 		$config = new LoggerConfig();
@@ -75,7 +69,7 @@ class LoggerTest extends \CIUnitTestCase
 	public function testLogDoesnotLogUnhandledLevels()
 	{
 		$config = new LoggerConfig();
-		$config->handlers['CodeIgniter\Log\Handlers\TestHandler']['handles'] =  ['critical'];
+		$config->handlers['Tests\Support\Log\Handlers\TestHandler']['handles'] =  ['critical'];
 
 		$logger = new Logger($config);
 
@@ -211,7 +205,7 @@ class LoggerTest extends \CIUnitTestCase
 
 		// For whatever reason, this will often be the class/function instead of file and line.
 		// Other times it actually returns the line number, so don't look for either
-		$expected = 'DEBUG - '.date('Y-m-d').' --> Test message CodeIgniter\Log\LoggerTest';
+		$expected = 'DEBUG - '.date('Y-m-d').' --> Test message LoggerTest';
 
 		$logger->log('debug', 'Test message {file} {line}');
 
diff --git a/tests/system/Pager/PagerRendererTest.php b/tests/system/Pager/PagerRendererTest.php
index 5833bac037..efc9c4ea40 100644
--- a/tests/system/Pager/PagerRendererTest.php
+++ b/tests/system/Pager/PagerRendererTest.php
@@ -11,6 +11,8 @@ class PagerRendererTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->uri = new URI('http://example.com/foo');
 		$this->expect = 'http://example.com/foo?page=';
 	}
diff --git a/tests/system/Pager/PagerTest.php b/tests/system/Pager/PagerTest.php
index b4ae11a8e8..4c9a505fbd 100644
--- a/tests/system/Pager/PagerTest.php
+++ b/tests/system/Pager/PagerTest.php
@@ -16,23 +16,17 @@ class PagerTest extends \CIUnitTestCase
 	protected $pager;
 	protected $config;
 
-	public function __construct()
-	{
-		parent::__construct();
-		helper('url');
-	}
-
-//--------------------------------------------------------------------
-
 	public function setUp()
 	{
-		$_SERVER['HTTP_HOST'] = 'example.com';
-		$_GET = [];
-		$this->config = new Pager();
-		$this->pager = new \CodeIgniter\Pager\Pager($this->config, Services::renderer());
-	}
+		parent::setUp();
 
-//--------------------------------------------------------------------
+		helper('url');
+
+		$_SERVER['HTTP_HOST'] = 'example.com';
+		$_GET                 = [];
+		$this->config         = new Pager();
+		$this->pager          = new \CodeIgniter\Pager\Pager($this->config, Services::renderer());
+	}
 
 	public function testSetPathRemembersPath()
 	{
@@ -43,13 +37,11 @@ class PagerTest extends \CIUnitTestCase
 		$this->assertEquals('foo/bar', $details['uri']->getPath());
 	}
 
-//--------------------------------------------------------------------
-
 	public function testGetDetailsRecognizesPageQueryVar()
 	{
 		$_GET['page'] = 2;
 
-// Need this to create the group.
+		// Need this to create the group.
 		$this->pager->setPath('foo/bar');
 
 		$details = $this->pager->getDetails();
@@ -57,13 +49,11 @@ class PagerTest extends \CIUnitTestCase
 		$this->assertEquals(2, $details['currentPage']);
 	}
 
-//--------------------------------------------------------------------
-
 	public function testGetDetailsRecognizesGroupedPageQueryVar()
 	{
 		$_GET['page_foo'] = 2;
 
-// Need this to create the group.
+		// Need this to create the group.
 		$this->pager->setPath('foo/bar', 'foo');
 
 		$details = $this->pager->getDetails('foo');
@@ -71,8 +61,6 @@ class PagerTest extends \CIUnitTestCase
 		$this->assertEquals(2, $details['currentPage']);
 	}
 
-//--------------------------------------------------------------------
-
 	public function testGetDetailsThrowExceptionIfGroupNotFound()
 	{
 		$this->expectException(PagerException::class);
@@ -80,11 +68,9 @@ class PagerTest extends \CIUnitTestCase
 		$this->pager->getDetails('foo');
 	}
 
-//--------------------------------------------------------------------
-
 	public function testDetailsHasConfiguredPerPageValue()
 	{
-// Need this to create the group.
+		// Need this to create the group.
 		$this->pager->setPath('foo/bar', 'foo');
 
 		$details = $this->pager->getDetails('foo');
@@ -92,8 +78,6 @@ class PagerTest extends \CIUnitTestCase
 		$this->assertEquals($this->config->perPage, $details['perPage']);
 	}
 
-//--------------------------------------------------------------------
-
 	public function testStoreDoesBasicCalcs()
 	{
 		$this->pager->store('foo', 3, 25, 100);
@@ -105,8 +89,6 @@ class PagerTest extends \CIUnitTestCase
 		$this->assertEquals($details['currentPage'], 3);
 	}
 
-//--------------------------------------------------------------------
-
 	public function testStoreAndHasMore()
 	{
 		$this->pager->store('foo', 3, 25, 100);
@@ -114,8 +96,6 @@ class PagerTest extends \CIUnitTestCase
 		$this->assertTrue($this->pager->hasMore('foo'));
 	}
 
-//--------------------------------------------------------------------
-
 	public function testStoreAndHasMoreCanBeFalse()
 	{
 		$this->pager->store('foo', 3, 25, 70);
@@ -123,22 +103,16 @@ class PagerTest extends \CIUnitTestCase
 		$this->assertFalse($this->pager->hasMore('foo'));
 	}
 
-//--------------------------------------------------------------------
-
 	public function testHasMoreDefaultsToFalse()
 	{
 		$this->assertFalse($this->pager->hasMore('foo'));
 	}
 
-//--------------------------------------------------------------------
-
 	public function testPerPageHasDefaultValue()
 	{
 		$this->assertEquals($this->config->perPage, $this->pager->getPerPage());
 	}
 
-//--------------------------------------------------------------------
-
 	public function testPerPageKeepsStoredValue()
 	{
 		$this->pager->store('foo', 3, 13, 70);
@@ -146,15 +120,11 @@ class PagerTest extends \CIUnitTestCase
 		$this->assertEquals(13, $this->pager->getPerPage('foo'));
 	}
 
-//--------------------------------------------------------------------
-
 	public function testGetCurrentPageDefaultsToOne()
 	{
 		$this->assertEquals(1, $this->pager->getCurrentPage());
 	}
 
-//--------------------------------------------------------------------
-
 	public function testGetCurrentPageRemembersStoredPage()
 	{
 		$this->pager->store('foo', 3, 13, 70);
@@ -162,8 +132,6 @@ class PagerTest extends \CIUnitTestCase
 		$this->assertEquals(3, $this->pager->getCurrentPage('foo'));
 	}
 
-//--------------------------------------------------------------------
-
 	public function testGetCurrentPageDetectsURI()
 	{
 		$_GET['page'] = 2;
@@ -171,8 +139,6 @@ class PagerTest extends \CIUnitTestCase
 		$this->assertEquals(2, $this->pager->getCurrentPage());
 	}
 
-//--------------------------------------------------------------------
-
 	public function testGetCurrentPageDetectsGroupedURI()
 	{
 		$_GET['page_foo'] = 2;
@@ -180,15 +146,11 @@ class PagerTest extends \CIUnitTestCase
 		$this->assertEquals(2, $this->pager->getCurrentPage('foo'));
 	}
 
-//--------------------------------------------------------------------
-
 	public function testGetTotalPagesDefaultsToOne()
 	{
 		$this->assertEquals(1, $this->pager->getPageCount());
 	}
 
-//--------------------------------------------------------------------
-
 	public function testGetTotalPagesCalcsCorrectValue()
 	{
 		$this->pager->store('foo', 3, 12, 70);
@@ -196,8 +158,6 @@ class PagerTest extends \CIUnitTestCase
 		$this->assertEquals(6, $this->pager->getPageCount('foo'));
 	}
 
-//--------------------------------------------------------------------
-
 	public function testGetNextURIUsesCurrentURI()
 	{
 		$_GET['page'] = 2;
@@ -205,13 +165,11 @@ class PagerTest extends \CIUnitTestCase
 		$this->pager->store('foo', 2, 12, 70);
 
 		$expected = current_url(true);
-		$expected = (string) $expected->setQuery('page=3');
+		$expected = (string)$expected->setQuery('page=3');
 
-		$this->assertEquals((string) $expected, $this->pager->getNextPageURI('foo'));
+		$this->assertEquals((string)$expected, $this->pager->getNextPageURI('foo'));
 	}
 
-//--------------------------------------------------------------------
-
 	public function testGetNextURIReturnsNullOnLastPage()
 	{
 		$this->pager->store('foo', 6, 12, 70);
@@ -219,20 +177,16 @@ class PagerTest extends \CIUnitTestCase
 		$this->assertNull($this->pager->getNextPageURI('foo'));
 	}
 
-//--------------------------------------------------------------------
-
 	public function testGetNextURICorrectOnFirstPage()
 	{
 		$this->pager->store('foo', 1, 12, 70);
 
 		$expected = current_url(true);
-		$expected = (string) $expected->setQuery('page=2');
+		$expected = (string)$expected->setQuery('page=2');
 
 		$this->assertEquals($expected, $this->pager->getNextPageURI('foo'));
 	}
 
-//--------------------------------------------------------------------
-
 	public function testGetPreviousURIUsesCurrentURI()
 	{
 		$_GET['page'] = 2;
@@ -240,13 +194,11 @@ class PagerTest extends \CIUnitTestCase
 		$this->pager->store('foo', 2, 12, 70);
 
 		$expected = current_url(true);
-		$expected = (string) $expected->setQuery('page=1');
+		$expected = (string)$expected->setQuery('page=1');
 
-		$this->assertEquals((string) $expected, $this->pager->getPreviousPageURI('foo'));
+		$this->assertEquals((string)$expected, $this->pager->getPreviousPageURI('foo'));
 	}
 
-//--------------------------------------------------------------------
-
 	public function testGetNextURIReturnsNullOnFirstPage()
 	{
 		$this->pager->store('foo', 1, 12, 70);
@@ -254,49 +206,43 @@ class PagerTest extends \CIUnitTestCase
 		$this->assertNull($this->pager->getPreviousPageURI('foo'));
 	}
 
-//--------------------------------------------------------------------
-
 	public function testGetNextURIWithQueryStringUsesCurrentURI()
 	{
 		$_GET = [
-			'page'	 => 3,
-			'status' => 1
+			'page'   => 3,
+			'status' => 1,
 		];
 
 		$expected = current_url(true);
-		$expected = (string) $expected->setQueryArray($_GET);
+		$expected = (string)$expected->setQueryArray($_GET);
 
-		$this->pager->store('foo', $_GET['page'] - 1, 12, 70);
+		$this->pager->store('foo', $_GET['page']-1, 12, 70);
 
-		$this->assertEquals((string) $expected, $this->pager->getNextPageURI('foo'));
+		$this->assertEquals((string)$expected, $this->pager->getNextPageURI('foo'));
 	}
 
-//--------------------------------------------------------------------
-
 	public function testGetPreviousURIWithQueryStringUsesCurrentURI()
 	{
-		$_GET = [
-			'page'	 => 1,
-			'status' => 1
+		$_GET     = [
+			'page'   => 1,
+			'status' => 1,
 		];
 		$expected = current_url(true);
-		$expected = (string) $expected->setQueryArray($_GET);
+		$expected = (string)$expected->setQueryArray($_GET);
 
-		$this->pager->store('foo', $_GET['page'] + 1, 12, 70);
+		$this->pager->store('foo', $_GET['page']+1, 12, 70);
 
-		$this->assertEquals((string) $expected, $this->pager->getPreviousPageURI('foo'));
+		$this->assertEquals((string)$expected, $this->pager->getPreviousPageURI('foo'));
 	}
 
-//--------------------------------------------------------------------
-
 	public function testGetOnlyQueries()
 	{
-		$_GET = [
-			'page'		 => 2,
-			'search'	 => 'foo',
-			'order'		 => 'asc',
-			'hello'		 => 'xxx',
-			'category'	 => 'baz',
+		$_GET        = [
+			'page'     => 2,
+			'search'   => 'foo',
+			'order'    => 'asc',
+			'hello'    => 'xxx',
+			'category' => 'baz',
 		];
 		$onlyQueries = ['search', 'order'];
 
@@ -305,29 +251,29 @@ class PagerTest extends \CIUnitTestCase
 		$uri = current_url(true);
 
 		$this->assertEquals(
-				$this->pager->only($onlyQueries)->getPreviousPageURI(), (string) $uri->setQuery('search=foo&order=asc&page=1')
+			$this->pager->only($onlyQueries)
+			            ->getPreviousPageURI(), (string)$uri->setQuery('search=foo&order=asc&page=1')
 		);
 		$this->assertEquals(
-				$this->pager->only($onlyQueries)->getNextPageURI(), (string) $uri->setQuery('search=foo&order=asc&page=3')
+			$this->pager->only($onlyQueries)
+			            ->getNextPageURI(), (string)$uri->setQuery('search=foo&order=asc&page=3')
 		);
 		$this->assertEquals(
-				$this->pager->only($onlyQueries)->getPageURI(4), (string) $uri->setQuery('search=foo&order=asc&page=4')
+			$this->pager->only($onlyQueries)
+			            ->getPageURI(4), (string)$uri->setQuery('search=foo&order=asc&page=4')
 		);
 	}
 
-//--------------------------------------------------------------------
-
 	public function testBadTemplate()
 	{
 		$this->expectException(PagerException::class);
 		$this->pager->links('default', 'bogus');
 	}
 
-//--------------------------------------------------------------------
 
 	// the tests below are looking for specific <ul> elements.
 	// not the most rigorous, but a start :-/
-	
+
 	public function testLinks()
 	{
 		$this->assertTrue(strpos($this->pager->links(), '<ul class="pagination">') > 0);
@@ -340,8 +286,8 @@ class PagerTest extends \CIUnitTestCase
 
 	public function testMakeLinks()
 	{
-		$actual = $this->pager->makeLinks(4,10,50);
-		$this->assertTrue(strpos($this->pager->makeLinks(4,10,50), '<ul class="pagination">') > 0);
+		$actual = $this->pager->makeLinks(4, 10, 50);
+		$this->assertTrue(strpos($this->pager->makeLinks(4, 10, 50), '<ul class="pagination">') > 0);
 	}
 
 }
diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
index b16b51e6c3..a11259d197 100644
--- a/tests/system/Router/RouteCollectionTest.php
+++ b/tests/system/Router/RouteCollectionTest.php
@@ -1,6 +1,6 @@
 <?php namespace CodeIgniter\Router;
 
-use CodeIgniter\Autoloader\MockFileLocator;
+use Tests\Support\Autoloader\MockFileLocator;
 use CodeIgniter\Router\Exceptions\RouterException;
 
 /**
@@ -8,13 +8,6 @@ use CodeIgniter\Router\Exceptions\RouterException;
  */
 class RouteCollectionTest extends \CIUnitTestCase
 {
-
-	public function setUp()
-	{
-	}
-
-	//--------------------------------------------------------------------
-
 	public function tearDown()
 	{
 	}
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index f8af47d536..d45c18374a 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -1,6 +1,6 @@
 <?php namespace CodeIgniter\Router;
 
-use CodeIgniter\Autoloader\MockFileLocator;
+use Tests\Support\Autoloader\MockFileLocator;
 
 class RouterTest extends \CIUnitTestCase
 {
@@ -18,6 +18,8 @@ class RouterTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->collection = new RouteCollection(new MockFileLocator(new \Config\Autoload()));
 
 		$routes = [
diff --git a/tests/system/Security/SecurityTest.php b/tests/system/Security/SecurityTest.php
index 220be6c88f..1aae41d66a 100644
--- a/tests/system/Security/SecurityTest.php
+++ b/tests/system/Security/SecurityTest.php
@@ -1,11 +1,12 @@
 <?php namespace CodeIgniter\Security;
 
-use CodeIgniter\HTTP\UserAgent;
-use CodeIgniter\Security\Exceptions\SecurityException;
-use Config\MockAppConfig;
-use CodeIgniter\HTTP\IncomingRequest;
-use CodeIgniter\HTTP\Request;
 use CodeIgniter\HTTP\URI;
+use CodeIgniter\HTTP\Request;
+use CodeIgniter\HTTP\UserAgent;
+use CodeIgniter\HTTP\IncomingRequest;
+use Tests\Support\Config\MockAppConfig;
+use CodeIgniter\Security\Exceptions\SecurityException;
+use Tests\Support\Security\MockSecurity;
 
 //--------------------------------------------------------------------
 
@@ -16,6 +17,8 @@ class SecurityTest extends \CIUnitTestCase {
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$_COOKIE = [];
 	}
 
diff --git a/tests/system/Session/SessionTest.php b/tests/system/Session/SessionTest.php
index 22d3fe427a..1817b82bb3 100644
--- a/tests/system/Session/SessionTest.php
+++ b/tests/system/Session/SessionTest.php
@@ -1,13 +1,16 @@
 <?php namespace CodeIgniter\Session;
 
-use CodeIgniter\Log\TestLogger;
-use CodeIgniter\Session\Handlers\FileHandler;
 use Config\Logger;
+use Tests\Support\Log\TestLogger;
+use Tests\Support\Session\MockSession;
+use CodeIgniter\Session\Handlers\FileHandler;
 
 class SessionTest extends \CIUnitTestCase
 {
     public function setUp()
     {
+        parent::setUp();
+
         $_COOKIE = [];
         $_SESSION = [];
     }
diff --git a/tests/system/Test/FeatureResponseTest.php b/tests/system/Test/FeatureResponseTest.php
new file mode 100644
index 0000000000..49ce991424
--- /dev/null
+++ b/tests/system/Test/FeatureResponseTest.php
@@ -0,0 +1,268 @@
+<?php
+
+use CodeIgniter\HTTP\Response;
+use CodeIgniter\Test\FeatureResponse;
+use CodeIgniter\HTTP\RedirectResponse;
+
+class FeatureResponseTest extends CIUnitTestCase
+{
+	/**
+	 * @var FeatureResponse
+	 */
+	protected $feature;
+	/**
+	 * @var Response
+	 */
+	protected $response;
+
+	public function setUp()
+	{
+		parent::setUp();
+	}
+
+
+	public function testIsOKFailsSmall()
+	{
+		$this->getFeatureResponse('Hello World');
+		$this->response->setStatusCode(100);
+
+		$this->assertFalse($this->feature->isOK());
+	}
+
+	public function testIsOKFailsLarge()
+	{
+		$this->getFeatureResponse('Hello World');
+		$this->response->setStatusCode(400);
+
+		$this->assertFalse($this->feature->isOK());
+	}
+
+	public function testIsOKSuccess()
+	{
+		$this->getFeatureResponse('Hello World');
+		$this->response->setStatusCode(200);
+
+		$this->assertTrue($this->feature->isOK());
+	}
+
+	public function testAssertSee()
+	{
+		$this->getFeatureResponse('<h1>Hello World</h1>');
+
+		$this->feature->assertSee('Hello');
+		$this->feature->assertSee('World', 'h1');
+	}
+
+	public function testAssertDontSee()
+	{
+		$this->getFeatureResponse('<h1>Hello World</h1>');
+
+		$this->feature->assertDontSee('Worlds');
+		$this->feature->assertDontSee('World', 'h2');
+	}
+
+	public function testAssertSeeElement()
+	{
+		$this->getFeatureResponse('<h1 class="header">Hello <span>World</span></h1>');
+
+		$this->feature->assertSeeElement('h1');
+		$this->feature->assertSeeElement('span');
+		$this->feature->assertSeeElement('h1.header');
+	}
+
+	public function testAssertDontSeeElement()
+	{
+		$this->getFeatureResponse('<h1 class="header">Hello <span>World</span></h1>');
+
+		$this->feature->assertDontSeeElement('h2');
+		$this->feature->assertDontSeeElement('.span');
+		$this->feature->assertDontSeeElement('h1.para');
+	}
+
+	public function testAssertSeeInField()
+	{
+		$this->getFeatureResponse('<html><body><input type="text" name="user[name]" value="Foobar"></body></html>');
+
+		$this->feature->assertSeeInField('user[name]', 'Foobar');
+	}
+
+	public function testAssertRedirectFail()
+	{
+		$this->getFeatureResponse('<h1>Hello World</h1>');
+
+		$this->assertFalse($this->feature->response instanceof RedirectResponse);
+		$this->assertFalse($this->feature->isRedirect());
+	}
+
+	public function testAssertRedirectSuccess()
+	{
+		$this->getFeatureResponse('<h1>Hello World</h1>');
+		$this->feature->response = new RedirectResponse(new Config\App());
+
+		$this->assertTrue($this->feature->response instanceof RedirectResponse);
+		$this->assertTrue($this->feature->isRedirect());
+		$this->feature->assertRedirect();
+	}
+
+	public function testAssertStatus()
+	{
+		$this->getFeatureResponse('<h1>Hello World</h1>', ['statusCode' => 201]);
+
+		$this->feature->assertStatus(201);
+	}
+
+	public function testAssertIsOK()
+	{
+		$this->getFeatureResponse('<h1>Hello World</h1>', ['statusCode' => 201]);
+		$this->feature->assertOK();
+
+		$this->getFeatureResponse('<h1>Hello World</h1>', ['statusCode' => 301]);
+		$this->feature->assertOK();
+
+		$this->getFeatureResponse('<h1>Hello World</h1>', ['statusCode' => 401]);
+		$this->assertFalse($this->feature->isOK());
+	}
+
+	public function testAssertSessionHas()
+	{
+		$_SESSION['foo'] = 'bar';
+		$this->getFeatureResponse('<h1>Hello World</h1>');
+
+		$this->feature->assertSessionHas('foo');
+		$this->feature->assertSessionHas('foo', 'bar');
+	}
+
+	public function testAssertSessionMissing()
+	{
+		$_SESSION = [];
+		$this->getFeatureResponse('<h1>Hello World</h1>');
+
+		$this->feature->assertSessionMissing('foo');
+	}
+
+	public function testAssertHeader()
+	{
+		$this->getFeatureResponse('<h1>Hello World</h1>', null, ['foo' => 'bar']);
+
+		$this->feature->assertHeader('foo');
+		$this->feature->assertHeader('foo', 'bar');
+	}
+
+
+	public function testAssertCookie()
+	{
+		$this->getFeatureResponse('<h1>Hello World</h1>');
+
+		$this->response = $this->response->setCookie('foo', 'bar');
+
+		$this->feature->assertCookie('foo');
+		$this->feature->assertCookie('foo', 'bar');
+	}
+
+	public function testAssertCookieMissing()
+	{
+		$this->getFeatureResponse('<h1>Hello World</h1>');
+
+		$this->response = $this->response->setCookie('foo', 'bar');
+
+		$this->feature->assertCookieMissing('bar');
+	}
+
+	public function testAssertCookieExpired()
+	{
+		$this->getFeatureResponse('<h1>Hello World</h1>');
+
+		$this->response = $this->response->setCookie('foo', 'bar', strtotime('-1 day'));
+
+		$this->feature->assertCookieExpired('foo');
+	}
+
+	public function testGetJSON()
+	{
+		$this->getFeatureResponse(['foo' => 'bar']);
+		$config = new \Config\Format();
+		$formatter = $config->getFormatter('application/json');
+
+		$this->assertEquals($formatter->format(['foo' => 'bar']), $this->feature->getJSON());
+	}
+
+	public function testGetXML()
+	{
+		$this->getFeatureResponse(['foo' => 'bar']);
+		$config = new \Config\Format();
+		$formatter = $config->getFormatter('application/xml');
+
+		$this->assertEquals($formatter->format(['foo' => 'bar']), $this->feature->getXML());
+	}
+
+	public function testJsonFragment()
+	{
+		$this->getFeatureResponse([
+			'config' => [
+				'key-a', 'key-b'
+			]
+		]);
+
+		$this->feature->assertJSONFragment(['config' => ['key-a']]);
+	}
+
+	public function testJsonExact()
+	{
+		$data = [
+			'config' => [
+				'key-a', 'key-b'
+			]
+		];
+
+		$this->getFeatureResponse($data);
+
+		$this->feature->assertJSONExact($data);
+	}
+
+	public function testJsonExactString()
+	{
+		$data = [
+			'config' => [
+				'key-a', 'key-b'
+			]
+		];
+
+		$this->getFeatureResponse($data);
+
+		$config = new \Config\Format();
+		$formatter = $config->getFormatter('application/json');
+		$expected = $formatter->format($data);
+
+		$this->feature->assertJSONExact($expected);
+	}
+
+
+	protected function getFeatureResponse($body=null, array $responseOptions = null, array $headers = null)
+	{
+		$this->response = new Response(new \Config\App());
+		$this->response->setBody($body);
+
+		if (count($responseOptions))
+		{
+			foreach ($responseOptions as $key => $value)
+			{
+				$method = 'set'.ucfirst($key);
+
+				if (method_exists($this->response, $method))
+				{
+					$this->response = $this->response->$method($value);
+				}
+			}
+		}
+
+		if (count($headers))
+		{
+			foreach ($headers as $key => $value)
+			{
+				$this->response = $this->response->setHeader($key, $value);
+			}
+		}
+
+		$this->feature = new FeatureResponse($this->response);
+	}
+}
diff --git a/tests/system/Test/FeatureTestCaseTest.php b/tests/system/Test/FeatureTestCaseTest.php
new file mode 100644
index 0000000000..12b08908de
--- /dev/null
+++ b/tests/system/Test/FeatureTestCaseTest.php
@@ -0,0 +1,104 @@
+<?php
+
+use CodeIgniter\Test\FeatureTestCase;
+use CodeIgniter\Test\FeatureResponse;
+
+class FeatureTestCaseTest extends FeatureTestCase
+{
+	public function setUp()
+	{
+		parent::setUp();
+
+		$this->skipEvents();
+	}
+
+	public function testCallSimpleGet()
+	{
+		$this->withRoutes([
+			['add', 'home', function() {
+				return 'Hello World';
+			}]
+		]);
+		$response = $this->call('get', 'home');
+
+		$this->assertInstanceOf(FeatureResponse::class, $response);
+		$this->assertInstanceOf(\CodeIgniter\HTTP\Response::class, $response->response);
+		$this->assertTrue($response->isOK());
+		$this->assertEquals('Hello World', $response->response->getBody());
+		$this->assertEquals(200, $response->response->getStatusCode());
+	}
+
+	public function testCallGet()
+	{
+		$this->withRoutes([
+			['get', 'home', function() {
+				return 'Hello World';
+			}]
+		]);
+		$response = $this->get('home');
+
+		$response->assertSee('Hello World');
+		$response->assertDontSee('Again');
+	}
+
+	public function testCallPost()
+	{
+		$this->withRoutes([
+			['post', 'home', function() {
+				return 'Hello World';
+			}]
+		]);
+		$response = $this->post('home');
+
+		$response->assertSee('Hello World');
+	}
+
+	public function testCallPut()
+	{
+		$this->withRoutes([
+			['put', 'home', function() {
+				return 'Hello World';
+			}]
+		]);
+		$response = $this->put('home');
+
+		$response->assertSee('Hello World');
+	}
+
+	public function testCallPatch()
+	{
+		$this->withRoutes([
+			['patch', 'home', function() {
+				return 'Hello World';
+			}]
+		]);
+		$response = $this->patch('home');
+
+		$response->assertSee('Hello World');
+	}
+
+	public function testCallOptions()
+	{
+		$this->withRoutes([
+			['options', 'home', function() {
+				return 'Hello World';
+			}]
+		]);
+		$response = $this->options('home');
+
+		$response->assertSee('Hello World');
+	}
+
+	public function testCallDelete()
+	{
+		$this->withRoutes([
+			['delete', 'home', function() {
+				return 'Hello World';
+			}]
+		]);
+		$response = $this->delete('home');
+
+		$response->assertSee('Hello World');
+	}
+
+}
diff --git a/tests/system/Throttle/ThrottleTest.php b/tests/system/Throttle/ThrottleTest.php
index f338396150..9f014c7e16 100644
--- a/tests/system/Throttle/ThrottleTest.php
+++ b/tests/system/Throttle/ThrottleTest.php
@@ -1,6 +1,6 @@
 <?php namespace CodeIgniter\Throttle;
 
-use CodeIgniter\Cache\Handlers\MockHandler;
+use Tests\Support\Cache\Handlers\MockHandler;
 
 class ThrottleTest extends \CIUnitTestCase
 {
@@ -11,7 +11,7 @@ class ThrottleTest extends \CIUnitTestCase
 
 		$this->cache = new MockHandler();
 	}
-	
+
 	public function testTokenTime()
 	{
 		$throttler = new Throttler($this->cache);
@@ -22,13 +22,13 @@ class ThrottleTest extends \CIUnitTestCase
 		// as soon as we try a rate check, token time affected
 		$rate = 1; // allow 1 per minute
 		$cost = 1;
-		
+
 		// after using one slot, still good
 		$throttler->check('127.0.0.1', $rate, MINUTE, $cost);
 		$this->assertEquals(0,$throttler->getTokenTime());
-		
+
 		// after consuming a second, we have to wait
-		$throttler->check('127.0.0.1', $rate, MINUTE, $cost);		
+		$throttler->check('127.0.0.1', $rate, MINUTE, $cost);
 		$this->assertEquals(1,$throttler->getTokenTime());
 
 	}
diff --git a/tests/system/Validation/RulesTest.php b/tests/system/Validation/RulesTest.php
index 8f6e8f1314..4f8d459f81 100644
--- a/tests/system/Validation/RulesTest.php
+++ b/tests/system/Validation/RulesTest.php
@@ -4,6 +4,8 @@ use Config\Database;
 
 class RulesTest extends \CIUnitTestCase
 {
+
+
 	/**
 	 * @var Validation
 	 */
@@ -15,7 +17,7 @@ class RulesTest extends \CIUnitTestCase
 			\CodeIgniter\Validation\FormatRules::class,
 			\CodeIgniter\Validation\FileRules::class,
 			\CodeIgniter\Validation\CreditCardRules::class,
-			\CodeIgniter\Validation\TestRules::class,
+			\Tests\Support\Validation\TestRules::class,
 		],
 		'groupA'        => [
 			'foo' => 'required|min_length[5]',
@@ -32,6 +34,7 @@ class RulesTest extends \CIUnitTestCase
 	public function setUp()
 	{
 		parent::setUp();
+
 		$this->validation = new Validation((object)$this->config, \Config\Services::renderer());
 		$this->validation->reset();
 
@@ -338,6 +341,12 @@ class RulesTest extends \CIUnitTestCase
 	 */
 	public function testIsUniqueFalse()
 	{
+		$db  = Database::connect();
+		$db->table('user')->insert([
+			'name' => 'Derek Travis',
+			'email' => 'derek@world.com'
+		]);
+
 		$data = [
 			'email' => 'derek@world.com',
 		];
@@ -375,6 +384,11 @@ class RulesTest extends \CIUnitTestCase
 	public function testIsUniqueIgnoresParams()
 	{
 		$db  = Database::connect();
+		$user = $db->table('user')
+			->insert([
+				'name' => 'Developer A',
+				'email' => 'deva@example.com',
+			]);
 		$row = $db->table('user')
 		          ->limit(1)
 		          ->get()
diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index b56c93f170..0ac66c2fb7 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -1,8 +1,8 @@
 <?php namespace CodeIgniter\Validation;
 
 
-use CodeIgniter\Validation\Exceptions\ValidationException;
 use Config\Services;
+use CodeIgniter\Validation\Exceptions\ValidationException;
 
 class ValidationTest extends \CIUnitTestCase
 {
@@ -17,7 +17,7 @@ class ValidationTest extends \CIUnitTestCase
 			\CodeIgniter\Validation\FormatRules::class,
 			\CodeIgniter\Validation\FileRules::class,
 			\CodeIgniter\Validation\CreditCardRules::class,
-			\CodeIgniter\Validation\TestRules::class,
+			\Tests\Support\Validation\TestRules::class,
 		],
 		'groupA'        => [
 			'foo' => 'required|min_length[5]',
diff --git a/tests/system/View/CellTest.php b/tests/system/View/CellTest.php
index 6546e9d554..75b9742de8 100644
--- a/tests/system/View/CellTest.php
+++ b/tests/system/View/CellTest.php
@@ -1,7 +1,7 @@
 <?php
 
 use CodeIgniter\View\Cell;
-use CodeIgniter\Cache\Handlers\MockHandler;
+use Tests\Support\Cache\Handlers\MockHandler;
 
 include_once __DIR__ .'/SampleClass.php';
 
@@ -18,6 +18,8 @@ class CellTest extends \CIUnitTestCase
 
 	public function setup()
 	{
+		parent::setUp();
+
 		$this->cache = new MockHandler();
 	    $this->cell = new Cell($this->cache);
 	}
diff --git a/tests/system/View/ParserFilterTest.php b/tests/system/View/ParserFilterTest.php
index 7f1878fc5c..dc34d4c348 100644
--- a/tests/system/View/ParserFilterTest.php
+++ b/tests/system/View/ParserFilterTest.php
@@ -10,6 +10,8 @@ class ParserFilterTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->loader   = new \CodeIgniter\Autoloader\FileLocator(new \Config\Autoload());
 		$this->viewsDir = __DIR__.'/Views';
 		$this->config   = new Config\View();
diff --git a/tests/system/View/ParserTest.php b/tests/system/View/ParserTest.php
index 82968051e3..ad7d0625c3 100644
--- a/tests/system/View/ParserTest.php
+++ b/tests/system/View/ParserTest.php
@@ -7,6 +7,8 @@ class ParserTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->loader   = new \CodeIgniter\Autoloader\FileLocator(new \Config\Autoload());
 		$this->viewsDir = __DIR__.'/Views';
 		$this->config   = new Config\View();
diff --git a/tests/system/View/ViewTest.php b/tests/system/View/ViewTest.php
index fdea5615d6..31432ac38d 100644
--- a/tests/system/View/ViewTest.php
+++ b/tests/system/View/ViewTest.php
@@ -12,6 +12,8 @@ class ViewTest extends \CIUnitTestCase
 
 	public function setUp()
 	{
+		parent::setUp();
+
 		$this->loader = new \CodeIgniter\Autoloader\FileLocator(new \Config\Autoload());
 		$this->viewsDir = __DIR__.'/Views';
 		$this->config   = new Config\View();
diff --git a/user_guide_src/source/libraries/response.rst b/user_guide_src/source/libraries/response.rst
index 36ba46c1e8..7c36a0c6bc 100644
--- a/user_guide_src/source/libraries/response.rst
+++ b/user_guide_src/source/libraries/response.rst
@@ -31,6 +31,18 @@ as the second parameter of the ``setStatusCode()`` method::
 
 	$this->response->setStatusCode(404, 'Nope. Not here.');
 
+You can set format an array into either JSON or XML and set the content type header to the appropriate mime with the
+``setJSON`` and ``setXML`` methods. Typically, you will send an array of data to be converted::
+
+	$data = [
+		'success' => true,
+		'id' => 123
+	];
+
+	return $this->response->setJSON($data);
+		or
+	return $this->response->setXML($data);
+
 Setting Headers
 ---------------