diff --git a/config/config.php b/config/config.php
index 812d7653..f5010bd0 100644
--- a/config/config.php
+++ b/config/config.php
@@ -15,14 +15,10 @@ use Zend\Expressive\ConfigManager\ZendConfigProvider;
  * Obviously, if you use closures in your config you can't cache it.
  */
 
-return call_user_func(function () {
-    $configManager = new ConfigManager([
-        Common\ConfigProvider::class,
-        Core\ConfigProvider::class,
-        CLI\ConfigProvider::class,
-        Rest\ConfigProvider::class,
-        new ZendConfigProvider('config/autoload/{{,*.}global,{,*.}local}.php'),
-    ], 'data/cache/app_config.php');
-
-    return $configManager->getMergedConfig();
-});
+return (new ConfigManager([
+    Common\ConfigProvider::class,
+    Core\ConfigProvider::class,
+    CLI\ConfigProvider::class,
+    Rest\ConfigProvider::class,
+    new ZendConfigProvider('config/autoload/{{,*.}global,{,*.}local}.php'),
+], 'data/cache/app_config.php'))->getMergedConfig();
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 65d36865..06e1e939 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -16,7 +16,10 @@
 
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src</directory>
+            <directory suffix=".php">./module/Common/src</directory>
+            <directory suffix=".php">./module/Core/src</directory>
+            <directory suffix=".php">./module/Rest/src</directory>
+            <directory suffix=".php">./module/CLI/src</directory>
         </whitelist>
     </filter>
 </phpunit>