diff --git a/src/App/Router.php b/src/App/Router.php
index 6ae42bb141..450822cf86 100644
--- a/src/App/Router.php
+++ b/src/App/Router.php
@@ -8,7 +8,7 @@ use FastRoute\Dispatcher;
 use FastRoute\RouteCollector;
 use FastRoute\RouteParser\Std;
 use Friendica\Core\Hook;
-use Friendica\DI;
+use Friendica\Core\L10n;
 use Friendica\Network\HTTPException;
 
 /**
@@ -44,12 +44,18 @@ class Router
 	 */
 	private $parameters = [];
 
+	/** @var L10n */
+	private $l10n;
+
 	/**
 	 * @param array $server The $_SERVER variable
+	 * @param L10n  $l10n
 	 * @param RouteCollector|null $routeCollector Optional the loaded Route collector
 	 */
-	public function __construct(array $server, RouteCollector $routeCollector = null)
+	public function __construct(array $server, L10n $l10n, RouteCollector $routeCollector = null)
 	{
+		$this->l10n = $l10n;
+
 		$httpMethod = $server['REQUEST_METHOD'] ?? self::GET;
 		$this->httpMethod = in_array($httpMethod, self::ALLOWED_METHODS) ? $httpMethod : self::GET;
 
@@ -181,9 +187,9 @@ class Router
 			$moduleClass = $routeInfo[1];
 			$this->parameters = $routeInfo[2];
 		} elseif ($routeInfo[0] === Dispatcher::METHOD_NOT_ALLOWED) {
-			throw new HTTPException\MethodNotAllowedException(DI::l10n()->t('Method not allowed for this module. Allowed method(s): %s', implode(', ', $routeInfo[1])));
+			throw new HTTPException\MethodNotAllowedException($this->l10n->t('Method not allowed for this module. Allowed method(s): %s', implode(', ', $routeInfo[1])));
 		} else {
-			throw new HTTPException\NotFoundException(DI::l10n()->t('Page not found.'));
+			throw new HTTPException\NotFoundException($this->l10n->t('Page not found.'));
 		}
 
 		return $moduleClass;
diff --git a/tests/src/App/ModuleTest.php b/tests/src/App/ModuleTest.php
index f76d51843c..5b8bdcd3d6 100644
--- a/tests/src/App/ModuleTest.php
+++ b/tests/src/App/ModuleTest.php
@@ -4,6 +4,7 @@ namespace Friendica\Test\src\App;
 
 use Friendica\App;
 use Friendica\Core\Config\IConfig;
+use Friendica\Core\L10n;
 use Friendica\LegacyModule;
 use Friendica\Module\HTTPException\PageNotFound;
 use Friendica\Module\WellKnown\HostMeta;
@@ -152,7 +153,10 @@ class ModuleTest extends DatabaseTest
 		$config = \Mockery::mock(IConfig::class);
 		$config->shouldReceive('get')->with('config', 'private_addons', false)->andReturn($privAdd)->atMost()->once();
 
-		$router = (new App\Router([]))->loadRoutes(include __DIR__ . '/../../../static/routes.config.php');
+		$l10n = \Mockery::mock(L10n::class);
+		$l10n->shouldReceive('t')->andReturnUsing(function ($args) { return $args; });
+
+		$router = (new App\Router([], $l10n))->loadRoutes(include __DIR__ . '/../../../static/routes.config.php');
 
 		$module = (new App\Module($name))->determineClass(new App\Arguments('', $command), $router, $config);
 
diff --git a/tests/src/App/RouterTest.php b/tests/src/App/RouterTest.php
index 102808f6ac..fc34df9575 100644
--- a/tests/src/App/RouterTest.php
+++ b/tests/src/App/RouterTest.php
@@ -3,16 +3,29 @@
 namespace Friendica\Test\src\App;
 
 use Friendica\App\Router;
+use Friendica\Core\L10n;
 use Friendica\Module;
 use Friendica\Network\HTTPException\MethodNotAllowedException;
 use Friendica\Network\HTTPException\NotFoundException;
+use Mockery\MockInterface;
 use PHPUnit\Framework\TestCase;
 
 class RouterTest extends TestCase
 {
+	/** @var L10n|MockInterface */
+	private $l10n;
+
+	protected function setUp()
+	{
+		parent::setUp();
+
+		$this->l10n = \Mockery::mock(L10n::class);
+		$this->l10n->shouldReceive('t')->andReturnUsing(function ($args) { return $args; });
+	}
+
 	public function testGetModuleClass()
 	{
-		$router = new Router(['REQUEST_METHOD' => Router::GET]);
+		$router = new Router(['REQUEST_METHOD' => Router::GET], $this->l10n);
 
 		$routeCollector = $router->getRouteCollector();
 		$routeCollector->addRoute([Router::GET], '/', 'IndexModuleClassName');
@@ -36,7 +49,7 @@ class RouterTest extends TestCase
 
 	public function testPostModuleClass()
 	{
-		$router = new Router(['REQUEST_METHOD' => Router::POST]);
+		$router = new Router(['REQUEST_METHOD' => Router::POST], $this->l10n);
 
 		$routeCollector = $router->getRouteCollector();
 		$routeCollector->addRoute([Router::POST], '/', 'IndexModuleClassName');
@@ -62,7 +75,7 @@ class RouterTest extends TestCase
 	{
 		$this->expectException(NotFoundException::class);
 
-		$router = new Router(['REQUEST_METHOD' => Router::GET]);
+		$router = new Router(['REQUEST_METHOD' => Router::GET], $this->l10n);
 
 		$router->getModuleClass('/unsupported');
 	}
@@ -71,7 +84,7 @@ class RouterTest extends TestCase
 	{
 		$this->expectException(NotFoundException::class);
 
-		$router = new Router(['REQUEST_METHOD' => Router::GET]);
+		$router = new Router(['REQUEST_METHOD' => Router::GET], $this->l10n);
 
 		$routeCollector = $router->getRouteCollector();
 		$routeCollector->addRoute([Router::GET], '/test', 'TestModuleClassName');
@@ -83,7 +96,7 @@ class RouterTest extends TestCase
 	{
 		$this->expectException(NotFoundException::class);
 
-		$router = new Router(['REQUEST_METHOD' => Router::GET]);
+		$router = new Router(['REQUEST_METHOD' => Router::GET], $this->l10n);
 
 		$routeCollector = $router->getRouteCollector();
 		$routeCollector->addRoute([Router::GET], '/optional[/option]', 'OptionalModuleClassName');
@@ -95,7 +108,7 @@ class RouterTest extends TestCase
 	{
 		$this->expectException(NotFoundException::class);
 
-		$router = new Router(['REQUEST_METHOD' => Router::GET]);
+		$router = new Router(['REQUEST_METHOD' => Router::GET], $this->l10n);
 
 		$routeCollector = $router->getRouteCollector();
 		$routeCollector->addRoute([Router::GET], '/variable/{var}', 'VariableModuleClassName');
@@ -107,7 +120,7 @@ class RouterTest extends TestCase
 	{
 		$this->expectException(MethodNotAllowedException::class);
 
-		$router = new Router(['REQUEST_METHOD' => Router::POST]);
+		$router = new Router(['REQUEST_METHOD' => Router::POST], $this->l10n);
 
 		$routeCollector = $router->getRouteCollector();
 		$routeCollector->addRoute([Router::GET], '/test', 'TestModuleClassName');
@@ -119,7 +132,7 @@ class RouterTest extends TestCase
 	{
 		$this->expectException(MethodNotAllowedException::class);
 
-		$router = new Router(['REQUEST_METHOD' => Router::GET]);
+		$router = new Router(['REQUEST_METHOD' => Router::GET], $this->l10n);
 
 		$routeCollector = $router->getRouteCollector();
 		$routeCollector->addRoute([Router::POST], '/test', 'TestModuleClassName');
@@ -159,7 +172,7 @@ class RouterTest extends TestCase
 	{
 		$router = (new Router([
 			'REQUEST_METHOD' => Router::GET
-		]))->loadRoutes($routes);
+		], $this->l10n))->loadRoutes($routes);
 
 		$this->assertEquals(Module\Home::class, $router->getModuleClass('/'));
 		$this->assertEquals(Module\Friendica::class, $router->getModuleClass('/group/route'));
@@ -174,7 +187,7 @@ class RouterTest extends TestCase
 	{
 		$router = (new Router([
 			'REQUEST_METHOD' => Router::POST
-		]))->loadRoutes($routes);
+		], $this->l10n))->loadRoutes($routes);
 
 		// Don't find GET
 		$this->assertEquals(Module\NodeInfo::class, $router->getModuleClass('/post/it'));
diff --git a/tests/src/Core/Config/Cache/ConfigCacheTest.php b/tests/src/Core/Config/CacheTest.php
similarity index 98%
rename from tests/src/Core/Config/Cache/ConfigCacheTest.php
rename to tests/src/Core/Config/CacheTest.php
index 6d0b045db4..9a398f5d5d 100644
--- a/tests/src/Core/Config/Cache/ConfigCacheTest.php
+++ b/tests/src/Core/Config/CacheTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Friendica\Test\src\Core\Config\Cache;
+namespace Friendica\Test\src\Core\Config;
 
 use Friendica\Core\Config\Cache;
 use Friendica\Test\MockedTest;
 use ParagonIE\HiddenString\HiddenString;
 
-class ConfigCacheTest extends MockedTest
+class CacheTest extends MockedTest
 {
 	public function dataTests()
 	{
diff --git a/tests/src/Core/Config/ConfigurationTest.php b/tests/src/Core/Config/ConfigTest.php
similarity index 99%
rename from tests/src/Core/Config/ConfigurationTest.php
rename to tests/src/Core/Config/ConfigTest.php
index b36d0ac31e..c67f930a4a 100644
--- a/tests/src/Core/Config/ConfigurationTest.php
+++ b/tests/src/Core/Config/ConfigTest.php
@@ -9,7 +9,7 @@ use Friendica\Test\MockedTest;
 use Mockery\MockInterface;
 use Mockery;
 
-abstract class ConfigurationTest extends MockedTest
+abstract class ConfigTest extends MockedTest
 {
 	/** @var ConfigModel|MockInterface */
 	protected $configModel;
diff --git a/tests/src/Core/Config/JitConfigurationTest.php b/tests/src/Core/Config/JitConfigTest.php
similarity index 98%
rename from tests/src/Core/Config/JitConfigurationTest.php
rename to tests/src/Core/Config/JitConfigTest.php
index 520dcc2ef1..28aee30170 100644
--- a/tests/src/Core/Config/JitConfigurationTest.php
+++ b/tests/src/Core/Config/JitConfigTest.php
@@ -4,7 +4,7 @@ namespace Friendica\Test\src\Core\Config;
 
 use Friendica\Core\Config\JitConfig;
 
-class JitConfigurationTest extends ConfigurationTest
+class JitConfigTest extends ConfigTest
 {
 	public function getInstance()
 	{
diff --git a/tests/src/Core/Config/PreloadConfigurationTest.php b/tests/src/Core/Config/PreloadConfigTest.php
similarity index 98%
rename from tests/src/Core/Config/PreloadConfigurationTest.php
rename to tests/src/Core/Config/PreloadConfigTest.php
index 1325afefb5..68db7c6f8a 100644
--- a/tests/src/Core/Config/PreloadConfigurationTest.php
+++ b/tests/src/Core/Config/PreloadConfigTest.php
@@ -4,7 +4,7 @@ namespace Friendica\Test\src\Core\Config;
 
 use Friendica\Core\Config\PreloadConfig;
 
-class PreloadConfigurationTest extends ConfigurationTest
+class PreloadConfigTest extends ConfigTest
 {
 	public function getInstance()
 	{
diff --git a/tests/src/Core/Lock/SemaphoreLockTest.php b/tests/src/Core/Lock/SemaphoreLockTest.php
index ab4f98c63e..aec4d0fd61 100644
--- a/tests/src/Core/Lock/SemaphoreLockTest.php
+++ b/tests/src/Core/Lock/SemaphoreLockTest.php
@@ -24,7 +24,7 @@ class SemaphoreLockTest extends LockTest
 		$configMock = \Mockery::mock(JitConfig::class);
 		$configMock
 			->shouldReceive('get')
-			->with('system', 'temppath', NULL, false)
+			->with('system', 'temppath')
 			->andReturn('/tmp/');
 		$dice->shouldReceive('create')->with(IConfig::class)->andReturn($configMock);
 
diff --git a/tests/src/Core/Config/Cache/PConfigCacheTest.php b/tests/src/Core/PConfig/CacheTest.php
similarity index 98%
rename from tests/src/Core/Config/Cache/PConfigCacheTest.php
rename to tests/src/Core/PConfig/CacheTest.php
index 1d5a96f695..62f6d22dfa 100644
--- a/tests/src/Core/Config/Cache/PConfigCacheTest.php
+++ b/tests/src/Core/PConfig/CacheTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Friendica\Test\src\Core\Config\Cache;
+namespace Friendica\Test\src\Core\PConfig;
 
 use Friendica\Core\PConfig\Cache;
 use Friendica\Test\MockedTest;
 
-class PConfigCacheTest extends MockedTest
+class CacheTest extends MockedTest
 {
 	public function dataTests()
 	{
diff --git a/tests/src/Core/Config/JitPConfigurationTest.php b/tests/src/Core/PConfig/JitPConfigTest.php
similarity index 96%
rename from tests/src/Core/Config/JitPConfigurationTest.php
rename to tests/src/Core/PConfig/JitPConfigTest.php
index c45584f137..b19317144b 100644
--- a/tests/src/Core/Config/JitPConfigurationTest.php
+++ b/tests/src/Core/PConfig/JitPConfigTest.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace Friendica\Test\src\Core\Config;
+namespace Friendica\Test\src\Core\PConfig;
 
 use Friendica\Core\PConfig\JitPConfig;
+use Friendica\Test\src\Core\PConfig\PConfigTest;
 
-class JitPConfigurationTest extends PConfigurationTest
+class JitPConfigTest extends PConfigTest
 {
 	public function getInstance()
 	{
diff --git a/tests/src/Core/Config/PConfigurationTest.php b/tests/src/Core/PConfig/PConfigTest.php
similarity index 99%
rename from tests/src/Core/Config/PConfigurationTest.php
rename to tests/src/Core/PConfig/PConfigTest.php
index c8429b2d00..e6f0326cb1 100644
--- a/tests/src/Core/Config/PConfigurationTest.php
+++ b/tests/src/Core/PConfig/PConfigTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Test\src\Core\Config;
+namespace Friendica\Test\src\Core\PConfig;
 
 use Friendica\Core\PConfig\Cache;
 use Friendica\Core\BasePConfig;
@@ -9,7 +9,7 @@ use Friendica\Test\MockedTest;
 use Mockery;
 use Mockery\MockInterface;
 
-abstract class PConfigurationTest extends MockedTest
+abstract class PConfigTest extends MockedTest
 {
 	/** @var PConfigModel|MockInterface */
 	protected $configModel;
diff --git a/tests/src/Core/Config/PreloadPConfigurationTest.php b/tests/src/Core/PConfig/PreloadPConfigTest.php
similarity index 96%
rename from tests/src/Core/Config/PreloadPConfigurationTest.php
rename to tests/src/Core/PConfig/PreloadPConfigTest.php
index 79d0d49db3..60d62938eb 100644
--- a/tests/src/Core/Config/PreloadPConfigurationTest.php
+++ b/tests/src/Core/PConfig/PreloadPConfigTest.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace Friendica\Test\src\Core\Config;
+namespace Friendica\Test\src\Core\PConfig;
 
 use Friendica\Core\PConfig\PreloadPConfig;
+use Friendica\Test\src\Core\PConfig\PConfigTest;
 
-class PreloadPConfigurationTest extends PConfigurationTest
+class PreloadPConfigTest extends PConfigTest
 {
 	public function getInstance()
 	{