diff --git a/src/Console/ServerBlock.php b/src/Console/ServerBlock.php
index 38ae35d10..c25b57ae7 100644
--- a/src/Console/ServerBlock.php
+++ b/src/Console/ServerBlock.php
@@ -118,6 +118,9 @@ HELP;
 		foreach ($blocklist as $domain) {
 			fputcsv($fp, $domain);
 		}
+
+		// Success
+		return 0;
 	}
 	/**
 	 * Imports a list of domains and a reason for the block from a CSV
@@ -130,6 +133,7 @@ HELP;
 		$filename = $this->getArgument(1);
 		$currBlockList = $config->get('system', 'blocklist', []);
 		$newBlockList = [];
+
 		if (($fp = fopen($filename, 'r')) !== false) {
 			while (($data = fgetcsv($fp, 1000, ',')) !== false) {
 				$domain = $data[0];
@@ -146,11 +150,13 @@ HELP;
 					$newBlockList[] = $data;
 				}
 			}
+
 			foreach ($currBlockList as $blocked) {
 				if (!in_array($blocked, $newBlockList)) {
 					$newBlockList[] = $blocked;
 				}
 			}
+
 			if ($config->set('system', 'blocklist', $newBlockList)) {
 				$this->out(sprintf("Entries from %s that were not blocked before are now blocked", $filename));
 				return 0;
@@ -158,7 +164,6 @@ HELP;
 				$this->out(sprintf("Couldn't save '%s' as blocked server", $domain));
 				return 1;
 			}
-
 		} else {
 			throw new Exception(sprintf('The file "%s" could not be opened for importing', $filename));
 		}
@@ -178,6 +183,9 @@ HELP;
 			$table->addRow($domain);
 		}
 		$this->out($table->getTable());
+
+		// Success
+		return 0;
 	}
 
 	/**
diff --git a/tests/src/Core/Config/Cache/ConfigFileLoaderTest.php b/tests/src/Core/Config/Cache/ConfigFileLoaderTest.php
index b956e558e..43decf105 100644
--- a/tests/src/Core/Config/Cache/ConfigFileLoaderTest.php
+++ b/tests/src/Core/Config/Cache/ConfigFileLoaderTest.php
@@ -174,7 +174,7 @@ class ConfigFileLoaderTest extends MockedTest
 			->at($this->root)
 			->setContent(file_get_contents($file));
 
-		$configFileLoader = new \Friendica\Core\Config\Util\ConfigFileLoader(
+		$configFileLoader = new ConfigFileLoader(
 			$this->root->url(),
 			$this->root->url() . DIRECTORY_SEPARATOR . Config::CONFIG_DIR,
 			$this->root->url() . DIRECTORY_SEPARATOR . Config::STATIC_DIR
@@ -228,7 +228,7 @@ class ConfigFileLoaderTest extends MockedTest
 			->at($this->root->getChild('addon')->getChild('test')->getChild('config'))
 			->setContent(file_get_contents($file));
 
-		$configFileLoader = new \Friendica\Core\Config\Util\ConfigFileLoader(
+		$configFileLoader = new ConfigFileLoader(
 			$this->root->url(),
 			$this->root->url() . DIRECTORY_SEPARATOR . Config::CONFIG_DIR,
 			$this->root->url() . DIRECTORY_SEPARATOR . Config::STATIC_DIR
@@ -265,7 +265,7 @@ class ConfigFileLoaderTest extends MockedTest
 				->at($this->root->getChild('config'))
 		         ->setContent(file_get_contents($fileDir . 'B.config.php'));
 
-		$configFileLoader = new \Friendica\Core\Config\Util\ConfigFileLoader(
+		$configFileLoader = new ConfigFileLoader(
 			$this->root->url(),
 			$this->root->url() . DIRECTORY_SEPARATOR . Config::CONFIG_DIR,
 			$this->root->url() . DIRECTORY_SEPARATOR . Config::STATIC_DIR
@@ -299,7 +299,7 @@ class ConfigFileLoaderTest extends MockedTest
 		         ->at($this->root->getChild('config'))
 		         ->setContent(file_get_contents($fileDir . 'B.ini.php'));
 
-		$configFileLoader = new \Friendica\Core\Config\Util\ConfigFileLoader(
+		$configFileLoader = new ConfigFileLoader(
 			$this->root->url(),
 			$this->root->url() . DIRECTORY_SEPARATOR . Config::CONFIG_DIR,
 			$this->root->url() . DIRECTORY_SEPARATOR . Config::STATIC_DIR
@@ -333,7 +333,7 @@ class ConfigFileLoaderTest extends MockedTest
 		         ->at($this->root->getChild('config'))
 		         ->setContent(file_get_contents($fileDir . 'B.ini.php'));
 
-		$configFileLoader = new \Friendica\Core\Config\Util\ConfigFileLoader(
+		$configFileLoader = new ConfigFileLoader(
 			$this->root->url(),
 			$this->root->url() . DIRECTORY_SEPARATOR . Config::CONFIG_DIR,
 			$this->root->url() . DIRECTORY_SEPARATOR . Config::STATIC_DIR