diff --git a/.gitignore b/.gitignore
index 63a1b61d72..0a2a3393b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,6 @@ _ide_helper.php
 .DS_Store
 package-lock.json
 /node_modules
+
+# Ignore generated public directory from `winter:mirror public`
+public
\ No newline at end of file
diff --git a/config/app.php b/config/app.php
index a05ae4f3b6..f1526be092 100644
--- a/config/app.php
+++ b/config/app.php
@@ -110,13 +110,13 @@
     | from your proxy when rewriting the request. This is an integer map value
     | so you may specify more than one value.
     |
-    | Possible values (prepended with `Illuminate\Http\Request::`)
-    |   - HEADER_X_FORWARDED_ALL - trust all forwarded headers
-    |   - HEADER_X_FORWARDED_FOR - trust only the proxy IP
-    |   - HEADER_X_FORWARDED_HOST - trust only the proxy hostname
-    |   - HEADER_X_FORWARDED_PORT - trust only the proxy port
-    |   - HEADER_X_FORWARDED_PROTO - trust only the proxy protocol
-    |   - HEADER_X_FORWARDED_AWS_ELB - trust Amazon Elastic Load Balancing header
+    | Possible values:
+    |   - 'HEADER_X_FORWARDED_ALL' - trust all forwarded headers
+    |   - Illuminate\Http\Request::HEADER_X_FORWARDED_FOR - trust only the proxy IP
+    |   - Illuminate\Http\Request::HEADER_X_FORWARDED_HOST - trust only the proxy hostname
+    |   - Illuminate\Http\Request::HEADER_X_FORWARDED_PORT - trust only the proxy port
+    |   - Illuminate\Http\Request::HEADER_X_FORWARDED_PROTO - trust only the proxy protocol
+    |   - Illuminate\Http\Request::HEADER_X_FORWARDED_AWS_ELB - trust Amazon Elastic Load Balancing headers
     |
     | Examples:
     |   - To trust only the hostname, use the following:
@@ -132,7 +132,7 @@
     |   - Amazon ELB users should always use the "HEADER_X_FORWARDED_AWS_ELB" option.
     */
 
-    'trustedProxyHeaders' => Illuminate\Http\Request::HEADER_X_FORWARDED_ALL,
+    'trustedProxyHeaders' => 'HEADER_X_FORWARDED_ALL',
 
     /*
     |--------------------------------------------------------------------------
diff --git a/config/database.php b/config/database.php
index c866db25ed..ab04e6c28f 100644
--- a/config/database.php
+++ b/config/database.php
@@ -143,21 +143,4 @@
 
     ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | Use DB configuration for testing
-    |--------------------------------------------------------------------------
-    |
-    | When running plugin tests Winter CMS by default uses SQLite in memory.
-    | You can override this behavior by setting `useConfigForTesting` to true.
-    |
-    | After that Winter CMS will take DB parameters from the config.
-    | If file `/config/testing/database.php` exists, config will be read from it,
-    | but remember that when not specified it will use parameters specified in
-    | `/config/database.php`.
-    |
-    */
-
-    'useConfigForTesting' => false,
-
 ];
diff --git a/modules/system/console/WinterTest.php b/modules/system/console/WinterTest.php
index 29934c9484..c8c9f6b994 100644
--- a/modules/system/console/WinterTest.php
+++ b/modules/system/console/WinterTest.php
@@ -141,6 +141,9 @@ protected function execPhpUnit(string $config, array $args): int
             null
         );
 
+        // Set an unlimited timeout
+        $process->setTimeout(0);
+
         // Attempt to set tty mode, catch and warn with the exception message if unsupported
         try {
             $process->setTty(true);