diff --git a/System/File/Ftp/FtpStorage.php b/System/File/Ftp/FtpStorage.php
index fd8cca4d8..ff2c32ec9 100644
--- a/System/File/Ftp/FtpStorage.php
+++ b/System/File/Ftp/FtpStorage.php
@@ -31,7 +31,7 @@ class FtpStorage extends StorageAbstract
 {
     private static $con = null;
 
-    public static function with($con)
+    public static function with($con) : void
     {
         self::$con = $con;
     }
diff --git a/tests/Module/ModuleManagerTest.php b/tests/Module/ModuleManagerTest.php
index 215873189..6dc31c2a5 100644
--- a/tests/Module/ModuleManagerTest.php
+++ b/tests/Module/ModuleManagerTest.php
@@ -20,7 +20,6 @@ use phpOMS\Dispatcher\Dispatcher;
 use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Module\ModuleManager;
 use phpOMS\Router\WebRouter;
-use phpOMS\System\File\Local\Directory;
 use phpOMS\Uri\HttpUri;
 
 require_once __DIR__ . '/../Autoloader.php';
diff --git a/tests/System/File/Ftp/DirectoryTest.php b/tests/System/File/Ftp/DirectoryTest.php
index 83ee29668..006c78501 100644
--- a/tests/System/File/Ftp/DirectoryTest.php
+++ b/tests/System/File/Ftp/DirectoryTest.php
@@ -44,7 +44,7 @@ class DirectoryTest extends \PHPUnit\Framework\TestCase
 
     public function testConnection() : void
     {
-        self::assertNotEquals(false, Directory::ftpConnect(new HttpUri(self::BASE . '/test')));
+        self::assertNotFalse(Directory::ftpConnect(new HttpUri(self::BASE . '/test')));
     }
 
     public function testInvalidConnection() : void
@@ -503,18 +503,18 @@ class DirectoryTest extends \PHPUnit\Framework\TestCase
     public function testList() : void
     {
         $dirTestPath = __DIR__ . '/dirtest';
-        $dir = new Directory(new HttpUri(self::BASE . $dirTestPath), '*', true, self::$con);
+        $dir         = new Directory(new HttpUri(self::BASE . $dirTestPath), '*', true, self::$con);
 
         self::assertEquals([
             'sub',
-            'test.txt'
+            'test.txt',
         ], $dir->getList());
     }
 
     public function testNodeOutput() : void
     {
         $dirTestPath = __DIR__ . '/dirtest';
-        $dir = new Directory(new HttpUri(self::BASE . $dirTestPath), '*', true, self::$con);
+        $dir         = new Directory(new HttpUri(self::BASE . $dirTestPath), '*', true, self::$con);
 
         self::assertInstanceOf(Directory::class, $dir->getNode('sub'));
     }
@@ -616,7 +616,7 @@ class DirectoryTest extends \PHPUnit\Framework\TestCase
 
     public function testNodeArraySet() : void
     {
-        $dir = new Directory(new HttpUri(self::BASE . __DIR__), '*', true, self::$con);
+        $dir   = new Directory(new HttpUri(self::BASE . __DIR__), '*', true, self::$con);
         $dir[] = new Directory(new HttpUri(self::BASE . __DIR__ . '/nodedir'));
 
         self::assertTrue(\file_exists(__DIR__ . '/nodedir'));
@@ -649,7 +649,7 @@ class DirectoryTest extends \PHPUnit\Framework\TestCase
     public function testNodeCreatedAt() : void
     {
         $dirPath = __DIR__ . '/test';
-        $dir = new Directory(new HttpUri(self::BASE . $dirPath), '*', true, self::$con);
+        $dir     = new Directory(new HttpUri(self::BASE . $dirPath), '*', true, self::$con);
 
         self::assertTrue($dir->createNode());
 
@@ -662,7 +662,7 @@ class DirectoryTest extends \PHPUnit\Framework\TestCase
     public function testNodeChangedAt() : void
     {
         $dirPath = __DIR__ . '/test';
-        $dir = new Directory(new HttpUri(self::BASE . $dirPath), '*', true, self::$con);
+        $dir     = new Directory(new HttpUri(self::BASE . $dirPath), '*', true, self::$con);
 
         self::assertTrue($dir->createNode());
 
diff --git a/tests/System/File/Ftp/FileTest.php b/tests/System/File/Ftp/FileTest.php
index 7336ec8b6..eedc27052 100644
--- a/tests/System/File/Ftp/FileTest.php
+++ b/tests/System/File/Ftp/FileTest.php
@@ -46,7 +46,7 @@ class FileTest extends \PHPUnit\Framework\TestCase
 
     public function testConnection() : void
     {
-        self::assertNotEquals(false, File::ftpConnect(new HttpUri(self::BASE . '/test')));
+        self::assertNotFalse(File::ftpConnect(new HttpUri(self::BASE . '/test')));
     }
 
     public function testInvalidConnection() : void
diff --git a/tests/System/File/Ftp/FtpStorageTest.php b/tests/System/File/Ftp/FtpStorageTest.php
index 16abb5288..856152851 100644
--- a/tests/System/File/Ftp/FtpStorageTest.php
+++ b/tests/System/File/Ftp/FtpStorageTest.php
@@ -15,10 +15,10 @@ declare(strict_types=1);
 namespace phpOMS\tests\System\File\Ftp;
 
 use phpOMS\System\File\ContentPutMode;
-use phpOMS\System\File\Ftp\FtpStorage;
-use phpOMS\Uri\HttpUri;
 use phpOMS\System\File\Ftp\Directory;
 use phpOMS\System\File\Ftp\File;
+use phpOMS\System\File\Ftp\FtpStorage;
+use phpOMS\Uri\HttpUri;
 
 /**
  * @testdox phpOMS\tests\System\File\Ftp\FtpStorageTest: Directory & File handler for local file system
diff --git a/tests/System/File/Local/DirectoryTest.php b/tests/System/File/Local/DirectoryTest.php
index 04ed2894e..f1aedfd75 100644
--- a/tests/System/File/Local/DirectoryTest.php
+++ b/tests/System/File/Local/DirectoryTest.php
@@ -514,18 +514,18 @@ class DirectoryTest extends \PHPUnit\Framework\TestCase
     public function testList() : void
     {
         $dirTestPath = __DIR__ . '/dirtest';
-        $dir = new Directory($dirTestPath);
+        $dir         = new Directory($dirTestPath);
 
         self::assertEquals([
             'sub',
-            'test.txt'
+            'test.txt',
         ], $dir->getList());
     }
 
     public function testNodeOutput() : void
     {
         $dirTestPath = __DIR__ . '/dirtest';
-        $dir = new Directory($dirTestPath);
+        $dir         = new Directory($dirTestPath);
 
         self::assertInstanceOf(Directory::class, $dir->getNode('sub'));
     }
@@ -627,7 +627,7 @@ class DirectoryTest extends \PHPUnit\Framework\TestCase
 
     public function testNodeArraySet() : void
     {
-        $dir = new Directory(__DIR__);
+        $dir   = new Directory(__DIR__);
         $dir[] = new Directory(__DIR__ . '/nodedir');
 
         self::assertTrue(\file_exists(__DIR__ . '/nodedir'));
@@ -660,7 +660,7 @@ class DirectoryTest extends \PHPUnit\Framework\TestCase
     public function testNodeCreatedAt() : void
     {
         $dirPath = __DIR__ . '/test';
-        $dir = new Directory($dirPath);
+        $dir     = new Directory($dirPath);
 
         self::assertTrue($dir->createNode());
 
@@ -673,7 +673,7 @@ class DirectoryTest extends \PHPUnit\Framework\TestCase
     public function testNodeChangedAt() : void
     {
         $dirPath = __DIR__ . '/test';
-        $dir = new Directory($dirPath);
+        $dir     = new Directory($dirPath);
 
         self::assertTrue($dir->createNode());
 
diff --git a/tests/System/File/Local/FileTest.php b/tests/System/File/Local/FileTest.php
index 567883697..d8e3b047a 100644
--- a/tests/System/File/Local/FileTest.php
+++ b/tests/System/File/Local/FileTest.php
@@ -483,9 +483,9 @@ class FileTest extends \PHPUnit\Framework\TestCase
     {
         $testFile = __DIR__ . '/test.txt';
         self::assertEquals([
-                'dirname' => __DIR__,
-                'basename' => 'test.txt',
-                'filename' => 'test',
+                'dirname'   => __DIR__,
+                'basename'  => 'test.txt',
+                'filename'  => 'test',
                 'extension' => 'txt',
             ],
             File::pathInfo($testFile)
diff --git a/tests/Utils/Converter/CurrencyTest.php b/tests/Utils/Converter/CurrencyTest.php
index bf70b39ca..2e681190a 100644
--- a/tests/Utils/Converter/CurrencyTest.php
+++ b/tests/Utils/Converter/CurrencyTest.php
@@ -15,11 +15,11 @@ declare(strict_types=1);
 namespace phpOMS\tests\Utils\Converter;
 
 use phpOMS\Localization\ISO4217CharEnum;
-use phpOMS\Utils\Converter\Currency;
 use phpOMS\Message\Http\HttpRequest;
-use phpOMS\Uri\HttpUri;
 use phpOMS\Message\Http\RequestMethod;
 use phpOMS\Message\Http\Rest;
+use phpOMS\Uri\HttpUri;
+use phpOMS\Utils\Converter\Currency;
 
 /**
  * @testdox phpOMS\tests\Utils\Converter\CurrencyTest: Currency converter