diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 464a64e..baa4b95 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -18,6 +18,9 @@ use Modules\Exchange\Models\ExchangeLogMapper;
 use Modules\Exchange\Models\InterfaceManager;
 use Modules\Exchange\Models\InterfaceManagerMapper;
 use Modules\Media\Models\UploadFile;
+use phpOMS\Autoloader;
+use phpOMS\DataStorage\Database\Connection\NullConnection;
+use phpOMS\Localization\L11nManager;
 use phpOMS\Message\Http\HttpResponse;
 use phpOMS\Message\Http\RequestStatusCode;
 use phpOMS\Message\NotificationLevel;
@@ -26,9 +29,6 @@ use phpOMS\Message\ResponseAbstract;
 use phpOMS\Model\Message\FormValidation;
 use phpOMS\System\File\Local\Directory;
 use phpOMS\System\MimeType;
-use phpOMS\Autoloader;
-use phpOMS\Localization\L11nManager;
-use phpOMS\DataStorage\Database\Connection\NullConnection;
 
 /**
  * Exchange controller class.
diff --git a/Models/ExchangeLog.php b/Models/ExchangeLog.php
index 5d3cf4b..8fff598 100755
--- a/Models/ExchangeLog.php
+++ b/Models/ExchangeLog.php
@@ -173,10 +173,10 @@ class ExchangeLog implements \JsonSerializable, ArrayableInterface
     public function toArray() : array
     {
         return [
-            'id'       => $this->id,
-            'message'  => $this->message,
-            'type'     => $this->type,
-            'fields'   => $this->fields,
+            'id'        => $this->id,
+            'message'   => $this->message,
+            'type'      => $this->type,
+            'fields'    => $this->fields,
             'createdAt' => $this->createdAt,
         ];
     }
diff --git a/Models/NullExchangeLog.php b/Models/NullExchangeLog.php
index 3692849..ea1dade 100755
--- a/Models/NullExchangeLog.php
+++ b/Models/NullExchangeLog.php
@@ -24,7 +24,7 @@ namespace Modules\Exchange\Models;
  */
 final class NullExchangeLog extends ExchangeLog
 {
-	/**
+    /**
      * Constructor
      *
      * @param int $id Model id
diff --git a/Models/NullInterfaceManager.php b/Models/NullInterfaceManager.php
index 4d4c55a..a6cdb3e 100755
--- a/Models/NullInterfaceManager.php
+++ b/Models/NullInterfaceManager.php
@@ -24,7 +24,7 @@ namespace Modules\Exchange\Models;
  */
 final class NullInterfaceManager extends InterfaceManager
 {
-	/**
+    /**
      * Constructor
      *
      * @param int $id Model id
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
index 051ac7e..f5fc99c 100755
--- a/tests/Bootstrap.php
+++ b/tests/Bootstrap.php
@@ -392,4 +392,4 @@ function phpServe() : void
     });
 }
 
-phpServe();
+\phpServe();
diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php
index 9d5d717..d0e6f0f 100644
--- a/tests/Controller/ApiControllerTest.php
+++ b/tests/Controller/ApiControllerTest.php
@@ -16,22 +16,21 @@ namespace Modules\Exchange\tests\Controller;
 
 use Model\CoreSettings;
 use Modules\Admin\Models\AccountPermission;
-use phpOMS\DataStorage\Session\HttpSession;
 use phpOMS\Account\Account;
 use phpOMS\Account\AccountManager;
 use phpOMS\Account\PermissionType;
 use phpOMS\Application\ApplicationAbstract;
+use phpOMS\DataStorage\Session\HttpSession;
 use phpOMS\Dispatcher\Dispatcher;
 use phpOMS\Event\EventManager;
-use phpOMS\Module\ModuleAbstract;
-use phpOMS\Module\ModuleManager;
-use phpOMS\Router\WebRouter;
-use phpOMS\Utils\TestUtils;
 use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\HttpResponse;
 use phpOMS\Message\Http\RequestStatusCode;
+use phpOMS\Module\ModuleAbstract;
+use phpOMS\Module\ModuleManager;
+use phpOMS\Router\WebRouter;
 use phpOMS\Uri\HttpUri;
-use phpOMS\System\MimeType;
+use phpOMS\Utils\TestUtils;
 
 /**
  * @testdox Modules\Exchange\tests\Controller\ApiControllerTest: Exchange api controller
diff --git a/tests/Interfaces/OMS/ExporterTest.php b/tests/Interfaces/OMS/ExporterTest.php
index c087da1..fa678e0 100644
--- a/tests/Interfaces/OMS/ExporterTest.php
+++ b/tests/Interfaces/OMS/ExporterTest.php
@@ -15,10 +15,10 @@ declare(strict_types=1);
 namespace Modules\Exchange\tests\Interfacs\OMS;
 
 use Modules\Exchange\Interfaces\OMS\Exporter;
-use phpOMS\Localization\L11nManager;
 use phpOMS\DataStorage\Database\Connection\NullConnection;
-use phpOMS\Uri\HttpUri;
+use phpOMS\Localization\L11nManager;
 use phpOMS\Message\Http\HttpRequest;
+use phpOMS\Uri\HttpUri;
 
 /**
  * @internal
diff --git a/tests/Interfaces/OMS/ImporterTest.php b/tests/Interfaces/OMS/ImporterTest.php
index fb28191..22e3e43 100644
--- a/tests/Interfaces/OMS/ImporterTest.php
+++ b/tests/Interfaces/OMS/ImporterTest.php
@@ -15,10 +15,10 @@ declare(strict_types=1);
 namespace Modules\Exchange\tests\Interfacs\OMS;
 
 use Modules\Exchange\Interfaces\OMS\Importer;
-use phpOMS\Localization\L11nManager;
 use phpOMS\DataStorage\Database\Connection\NullConnection;
-use phpOMS\Uri\HttpUri;
+use phpOMS\Localization\L11nManager;
 use phpOMS\Message\Http\HttpRequest;
+use phpOMS\Uri\HttpUri;
 use phpOMS\Utils\TestUtils;
 
 /**
diff --git a/tests/Models/ExchangeLogTest.php b/tests/Models/ExchangeLogTest.php
index 7c4aa46..d613443 100644
--- a/tests/Models/ExchangeLogTest.php
+++ b/tests/Models/ExchangeLogTest.php
@@ -64,7 +64,7 @@ final class ExchangeLogTest extends \PHPUnit\Framework\TestCase
     public function testFieldsInputOutput() : void
     {
         $this->log->setFields($fields = [
-            'name' => 'test',
+            'name'  => 'test',
             'start' => 'now',
         ]);
         self::assertEquals($fields, $this->log->getFields());
@@ -84,10 +84,10 @@ final class ExchangeLogTest extends \PHPUnit\Framework\TestCase
 
         self::assertEquals(
             [
-                'id'    => 0,
+                'id'      => 0,
                 'message' => '123456',
-                'type' => ExchangeType::EXPORT,
-                'fields' => [],
+                'type'    => ExchangeType::EXPORT,
+                'fields'  => [],
             ],
             $serialized
         );
diff --git a/tests/Models/ExporterAbstractTest.php b/tests/Models/ExporterAbstractTest.php
index 4ab13c5..4317d99 100644
--- a/tests/Models/ExporterAbstractTest.php
+++ b/tests/Models/ExporterAbstractTest.php
@@ -15,11 +15,11 @@ declare(strict_types=1);
 namespace Modules\Exchange\tests\Models;
 
 use Modules\Exchange\Models\ExporterAbstract;
-use phpOMS\Message\RequestAbstract;
-use phpOMS\Message\Http\HttpRequest;
 use phpOMS\DataStorage\Database\Connection\SQLiteConnection;
-use phpOMS\Uri\HttpUri;
 use phpOMS\Localization\L11nManager;
+use phpOMS\Message\Http\HttpRequest;
+use phpOMS\Message\RequestAbstract;
+use phpOMS\Uri\HttpUri;
 
 /**
  * @internal
diff --git a/tests/Models/ImporterAbstractTest.php b/tests/Models/ImporterAbstractTest.php
index 5365020..46dd3a2 100644
--- a/tests/Models/ImporterAbstractTest.php
+++ b/tests/Models/ImporterAbstractTest.php
@@ -15,12 +15,12 @@ declare(strict_types=1);
 namespace Modules\Exchange\tests\Models;
 
 use Modules\Exchange\Models\ImporterAbstract;
-use phpOMS\Message\RequestAbstract;
-use phpOMS\Message\Http\HttpRequest;
-use phpOMS\DataStorage\Database\Connection\SQLiteConnection;
 use phpOMS\DataStorage\Database\Connection\NullConnection;
-use phpOMS\Uri\HttpUri;
+use phpOMS\DataStorage\Database\Connection\SQLiteConnection;
 use phpOMS\Localization\L11nManager;
+use phpOMS\Message\Http\HttpRequest;
+use phpOMS\Message\RequestAbstract;
+use phpOMS\Uri\HttpUri;
 
 /**
  * @internal
diff --git a/tests/Models/InterfaceManagerTest.php b/tests/Models/InterfaceManagerTest.php
index d918009..e270f24 100644
--- a/tests/Models/InterfaceManagerTest.php
+++ b/tests/Models/InterfaceManagerTest.php
@@ -15,7 +15,6 @@ declare(strict_types=1);
 namespace Modules\Exchange\tests\Models;
 
 use Modules\Exchange\Models\InterfaceManager;
-use Modules\Exchange\Models\ExchangeType;
 
 /**
  * @internal