diff --git a/composer.json b/composer.json
index 265f24d..d8adb48 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "codeigniter4/framework",
+    "name": "codeigniter4/codeigniter4",
     "type": "project",
     "description": "The CodeIgniter framework v4",
     "homepage": "https://codeigniter.com",
@@ -8,14 +8,15 @@
         "php": ">=7.2",
         "ext-curl": "*",
         "ext-intl": "*",
+        "ext-json": "*",
         "kint-php/kint": "^3.3",
         "psr/log": "^1.1",
-        "zendframework/zend-escaper": "^2.5"
+        "laminas/laminas-escaper": "^2.6"
     },
     "require-dev": {
         "codeigniter4/codeigniter4-standard": "^1.0",
         "mikey179/vfsstream": "1.6.*",
-        "phpunit/phpunit": "^7.0",
+        "phpunit/phpunit": "^8.5",
         "squizlabs/php_codesniffer": "^3.3"
     },
     "autoload": {
@@ -26,7 +27,8 @@
     "scripts": {
         "post-update-cmd": [
             "@composer dump-autoload",
-            "CodeIgniter\\ComposerScripts::postUpdate"
+            "CodeIgniter\\ComposerScripts::postUpdate",
+            "bash admin/setup.sh"
         ]
     },
     "support": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 795b563..88aca1f 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,22 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="tests/_support/_bootstrap.php"
-        backupGlobals="false"
-        colors="true"
-        convertErrorsToExceptions="true"
-        convertNoticesToExceptions="true"
-        convertWarningsToExceptions="true"
-        stopOnError="false"
-        stopOnFailure="false"
-        stopOnIncomplete="false"
-        stopOnSkipped="false">
-    <testsuites>
-        <testsuite name="app">
-            <directory>./tests</directory>
-        </testsuite>
-    </testsuites>
-    
-    <php>
-        <env name="app.baseURL" value="http://example.com"/>
-    </php>
+<phpunit bootstrap="system/Test/bootstrap.php"
+		backupGlobals="false"
+		colors="true"
+		convertErrorsToExceptions="true"
+		convertNoticesToExceptions="true"
+		convertWarningsToExceptions="true"
+		stopOnError="false"
+		stopOnFailure="false"
+		stopOnIncomplete="false"
+		stopOnSkipped="false">
+	<testsuites>
+		<testsuite name="app">
+			<directory>./tests</directory>
+		</testsuite>
+	</testsuites>
 
+	<filter>
+		<whitelist addUncoveredFilesFromWhitelist="true" processUncoveredFilesFromWhitelist="true">
+			<directory suffix=".php">./app</directory>
+			<exclude>
+				<directory suffix=".php">./app/Views</directory>
+				<file>./app/Config/Routes.php</file>
+			</exclude>
+		</whitelist>
+	</filter>
+
+	<logging>
+		<log type="coverage-html" target="build/logs/html"/>
+		<log type="coverage-clover" target="build/logs/clover.xml"/>
+		<log type="coverage-php" target="build/logs/coverage.serialized"/>
+		<log type="coverage-text" target="php://stdout" showUncoveredFiles="false"/>
+		<log type="testdox-html" target="build/logs/testdox.html"/>
+		<log type="testdox-text" target="build/logs/testdox.txt"/>
+		<log type="junit" target="build/logs/logfile.xml"/>
+	</logging>
+
+	<php>
+		<server name="app.baseURL" value="http://example.com"/>
+
+		<!-- Directory containing phpunit.xml -->
+		<const name="HOMEPATH" value="./"/>
+
+		<!-- Directory containing the Paths config file -->
+		<const name="CONFIGPATH" value="./app/Config/"/>
+
+		<!-- Directory containing the front controller (index.php) -->
+		<const name="PUBLICPATH" value="./public/"/>
+
+		<!-- Database configuration -->
+<!--	<env name="database.tests.hostname" value="localhost"/>  -->
+<!--	<env name="database.tests.database" value="tests"/>	     -->
+<!--	<env name="database.tests.username" value="tests_user"/> -->
+<!--	<env name="database.tests.password" value=""/>		     -->
+<!--	<env name="database.tests.DBDriver" value="MySQLi"/>	 -->
+<!--	<env name="database.tests.DBPrefix" value="tests_"/>	 -->
+		<env name="database.tests.database" value=":memory:"/>
+		<env name="database.tests.DBDriver" value="SQLite3"/>
+	</php>
 </phpunit>
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index f5bedc9..f9a8f6c 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -66,7 +66,7 @@
 	/**
 	 * The current version of CodeIgniter Framework
 	 */
-	const CI_VERSION = '4.0.0';
+	const CI_VERSION = '4.0.1';
 
 	/**
 	 * App startup time.