diff --git a/.php_cs.dist b/.php_cs.dist
index a8fc27d..2fca0ef 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -5,6 +5,7 @@ $finder = \PhpCsFixer\Finder::create()
     ->exclude('docker')
     ->exclude('frontend')
     ->notPath('common/emails/views')
+    ->notPath('common/mail/layouts')
     ->notPath('/.*\/runtime/')
     ->notPath('autocompletion.php')
     ->notPath('tests/codeception/_output')
diff --git a/api/tests/functional/LoginCest.php b/api/tests/functional/LoginCest.php
index e92573a..f1abfe7 100644
--- a/api/tests/functional/LoginCest.php
+++ b/api/tests/functional/LoginCest.php
@@ -1,9 +1,9 @@
 <?php
 namespace api\tests\functional;
 
+use api\tests\_pages\AuthenticationRoute;
 use api\tests\FunctionalTester;
 use OTPHP\TOTP;
-use api\tests\_pages\AuthenticationRoute;
 
 class LoginCest {
 
diff --git a/api/tests/functional/RegisterCest.php b/api/tests/functional/RegisterCest.php
index 6b91942..f8b1883 100644
--- a/api/tests/functional/RegisterCest.php
+++ b/api/tests/functional/RegisterCest.php
@@ -1,9 +1,9 @@
 <?php
 namespace api\tests\functional;
 
-use Codeception\Example;
 use api\tests\_pages\SignupRoute;
 use api\tests\FunctionalTester;
+use Codeception\Example;
 
 class RegisterCest {
 
diff --git a/api/tests/functional/_steps/AuthserverSteps.php b/api/tests/functional/_steps/AuthserverSteps.php
index 2a37492..84102a8 100644
--- a/api/tests/functional/_steps/AuthserverSteps.php
+++ b/api/tests/functional/_steps/AuthserverSteps.php
@@ -3,9 +3,9 @@ declare(strict_types=1);
 
 namespace api\tests\functional\_steps;
 
-use Ramsey\Uuid\Uuid;
 use api\tests\_pages\AuthserverRoute;
 use api\tests\FunctionalTester;
+use Ramsey\Uuid\Uuid;
 
 class AuthserverSteps extends FunctionalTester {
 
diff --git a/api/tests/functional/_steps/SessionServerSteps.php b/api/tests/functional/_steps/SessionServerSteps.php
index c4b8e2e..503320c 100644
--- a/api/tests/functional/_steps/SessionServerSteps.php
+++ b/api/tests/functional/_steps/SessionServerSteps.php
@@ -1,10 +1,10 @@
 <?php
 namespace api\tests\functional\_steps;
 
-use common\rbac\Permissions as P;
-use Faker\Provider\Uuid;
 use api\tests\_pages\SessionServerRoute;
 use api\tests\FunctionalTester;
+use common\rbac\Permissions as P;
+use Faker\Provider\Uuid;
 
 class SessionServerSteps extends FunctionalTester {
 
diff --git a/api/tests/functional/accounts/BanCest.php b/api/tests/functional/accounts/BanCest.php
index 25bc991..ade1c53 100644
--- a/api/tests/functional/accounts/BanCest.php
+++ b/api/tests/functional/accounts/BanCest.php
@@ -1,10 +1,10 @@
 <?php
 namespace api\tests\functional\accounts;
 
-use common\rbac\Permissions as P;
 use api\tests\_pages\AccountsRoute;
 use api\tests\functional\_steps\OauthSteps;
 use api\tests\FunctionalTester;
+use common\rbac\Permissions as P;
 
 class BanCest {
 
diff --git a/api/tests/functional/accounts/ChangePasswordCest.php b/api/tests/functional/accounts/ChangePasswordCest.php
index aa77e60..cb8125c 100644
--- a/api/tests/functional/accounts/ChangePasswordCest.php
+++ b/api/tests/functional/accounts/ChangePasswordCest.php
@@ -1,11 +1,11 @@
 <?php
 namespace api\tests\functional\accounts;
 
-use common\models\Account;
 use api\tests\_pages\AccountsRoute;
 use api\tests\_pages\AuthenticationRoute;
 use api\tests\functional\_steps\OauthSteps;
 use api\tests\FunctionalTester;
+use common\models\Account;
 
 class ChangePasswordCest {
 
diff --git a/api/tests/functional/accounts/ChangeUsernameCest.php b/api/tests/functional/accounts/ChangeUsernameCest.php
index ef304c6..f183d4f 100644
--- a/api/tests/functional/accounts/ChangeUsernameCest.php
+++ b/api/tests/functional/accounts/ChangeUsernameCest.php
@@ -1,10 +1,10 @@
 <?php
 namespace api\tests\functional\accounts;
 
-use common\models\Account;
 use api\tests\_pages\AccountsRoute;
 use api\tests\functional\_steps\OauthSteps;
 use api\tests\FunctionalTester;
+use common\models\Account;
 
 class ChangeUsernameCest {
 
diff --git a/api/tests/functional/accounts/DisableTwoFactorAuthCest.php b/api/tests/functional/accounts/DisableTwoFactorAuthCest.php
index 06bea61..6ee9a16 100644
--- a/api/tests/functional/accounts/DisableTwoFactorAuthCest.php
+++ b/api/tests/functional/accounts/DisableTwoFactorAuthCest.php
@@ -1,9 +1,9 @@
 <?php
 namespace api\tests\functional\accounts;
 
-use OTPHP\TOTP;
 use api\tests\_pages\AccountsRoute;
 use api\tests\FunctionalTester;
+use OTPHP\TOTP;
 
 class DisableTwoFactorAuthCest {
 
diff --git a/api/tests/functional/accounts/EnableTwoFactorAuthCest.php b/api/tests/functional/accounts/EnableTwoFactorAuthCest.php
index 007a790..e400bec 100644
--- a/api/tests/functional/accounts/EnableTwoFactorAuthCest.php
+++ b/api/tests/functional/accounts/EnableTwoFactorAuthCest.php
@@ -1,9 +1,9 @@
 <?php
 namespace api\tests\functional\accounts;
 
-use OTPHP\TOTP;
 use api\tests\_pages\AccountsRoute;
 use api\tests\FunctionalTester;
+use OTPHP\TOTP;
 
 class EnableTwoFactorAuthCest {
 
diff --git a/api/tests/functional/accounts/PardonCest.php b/api/tests/functional/accounts/PardonCest.php
index d802c60..79a6ab7 100644
--- a/api/tests/functional/accounts/PardonCest.php
+++ b/api/tests/functional/accounts/PardonCest.php
@@ -1,10 +1,10 @@
 <?php
 namespace api\tests\functional\accounts;
 
-use common\rbac\Permissions as P;
 use api\tests\_pages\AccountsRoute;
 use api\tests\functional\_steps\OauthSteps;
 use api\tests\FunctionalTester;
+use common\rbac\Permissions as P;
 
 class PardonCest {
 
diff --git a/api/tests/functional/authserver/AuthorizationCest.php b/api/tests/functional/authserver/AuthorizationCest.php
index b1d533e..f64cd25 100644
--- a/api/tests/functional/authserver/AuthorizationCest.php
+++ b/api/tests/functional/authserver/AuthorizationCest.php
@@ -1,9 +1,9 @@
 <?php
 namespace api\tests\functional\authserver;
 
-use Ramsey\Uuid\Uuid;
 use api\tests\_pages\AuthserverRoute;
 use api\tests\FunctionalTester;
+use Ramsey\Uuid\Uuid;
 
 class AuthorizationCest {
 
diff --git a/api/tests/functional/authserver/InvalidateCest.php b/api/tests/functional/authserver/InvalidateCest.php
index 9776b9b..46db699 100644
--- a/api/tests/functional/authserver/InvalidateCest.php
+++ b/api/tests/functional/authserver/InvalidateCest.php
@@ -1,9 +1,9 @@
 <?php
 namespace api\tests\functional\authserver;
 
-use Ramsey\Uuid\Uuid;
 use api\tests\_pages\AuthserverRoute;
 use api\tests\functional\_steps\AuthserverSteps;
+use Ramsey\Uuid\Uuid;
 
 class InvalidateCest {
 
diff --git a/api/tests/functional/authserver/RefreshCest.php b/api/tests/functional/authserver/RefreshCest.php
index 0153269..9877bc6 100644
--- a/api/tests/functional/authserver/RefreshCest.php
+++ b/api/tests/functional/authserver/RefreshCest.php
@@ -1,9 +1,9 @@
 <?php
 namespace api\tests\functional\authserver;
 
-use Ramsey\Uuid\Uuid;
 use api\tests\_pages\AuthserverRoute;
 use api\tests\functional\_steps\AuthserverSteps;
+use Ramsey\Uuid\Uuid;
 
 class RefreshCest {
 
diff --git a/api/tests/functional/authserver/ValidateCest.php b/api/tests/functional/authserver/ValidateCest.php
index 5aafe4d..14cd4f6 100644
--- a/api/tests/functional/authserver/ValidateCest.php
+++ b/api/tests/functional/authserver/ValidateCest.php
@@ -1,9 +1,9 @@
 <?php
 namespace api\tests\functional\authserver;
 
-use Ramsey\Uuid\Uuid;
 use api\tests\_pages\AuthserverRoute;
 use api\tests\functional\_steps\AuthserverSteps;
+use Ramsey\Uuid\Uuid;
 
 class ValidateCest {
 
diff --git a/api/tests/functional/mojang/UuidToUsernamesHistoryCest.php b/api/tests/functional/mojang/UuidToUsernamesHistoryCest.php
index 61fcc51..6459176 100644
--- a/api/tests/functional/mojang/UuidToUsernamesHistoryCest.php
+++ b/api/tests/functional/mojang/UuidToUsernamesHistoryCest.php
@@ -1,9 +1,9 @@
 <?php
 namespace api\tests\functional\authserver;
 
-use Faker\Provider\Uuid;
 use api\tests\_pages\MojangApiRoute;
 use api\tests\FunctionalTester;
+use Faker\Provider\Uuid;
 
 class UuidToUsernamesHistoryCest {
 
diff --git a/api/tests/functional/oauth/AuthCodeCest.php b/api/tests/functional/oauth/AuthCodeCest.php
index e0093c2..9ee501d 100644
--- a/api/tests/functional/oauth/AuthCodeCest.php
+++ b/api/tests/functional/oauth/AuthCodeCest.php
@@ -1,9 +1,9 @@
 <?php
 namespace api\tests\functional\oauth;
 
-use common\rbac\Permissions as P;
 use api\tests\_pages\OauthRoute;
 use api\tests\FunctionalTester;
+use common\rbac\Permissions as P;
 
 class AuthCodeCest {
 
diff --git a/api/tests/functional/oauth/RefreshTokenCest.php b/api/tests/functional/oauth/RefreshTokenCest.php
index 16bd6c2..6bc4051 100644
--- a/api/tests/functional/oauth/RefreshTokenCest.php
+++ b/api/tests/functional/oauth/RefreshTokenCest.php
@@ -2,10 +2,10 @@
 namespace api\tests\functional\oauth;
 
 use api\components\OAuth2\Storage\ScopeStorage as S;
-use common\rbac\Permissions as P;
 use api\tests\_pages\OauthRoute;
 use api\tests\functional\_steps\OauthSteps;
 use api\tests\FunctionalTester;
+use common\rbac\Permissions as P;
 
 class RefreshTokenCest {
 
diff --git a/api/tests/functional/sessionserver/HasJoinedCest.php b/api/tests/functional/sessionserver/HasJoinedCest.php
index f6361fb..0bb3d1c 100644
--- a/api/tests/functional/sessionserver/HasJoinedCest.php
+++ b/api/tests/functional/sessionserver/HasJoinedCest.php
@@ -1,10 +1,10 @@
 <?php
 namespace api\tests\functional\sessionserver;
 
-use Faker\Provider\Uuid;
 use api\tests\_pages\SessionServerRoute;
 use api\tests\functional\_steps\SessionServerSteps;
 use api\tests\FunctionalTester;
+use Faker\Provider\Uuid;
 
 class HasJoinedCest {
 
diff --git a/api/tests/functional/sessionserver/HasJoinedLegacyCest.php b/api/tests/functional/sessionserver/HasJoinedLegacyCest.php
index 055d442..7f7d1d6 100644
--- a/api/tests/functional/sessionserver/HasJoinedLegacyCest.php
+++ b/api/tests/functional/sessionserver/HasJoinedLegacyCest.php
@@ -1,10 +1,10 @@
 <?php
 namespace api\tests\functional\sessionserver;
 
-use Faker\Provider\Uuid;
 use api\tests\_pages\SessionServerRoute;
 use api\tests\functional\_steps\SessionServerSteps;
 use api\tests\FunctionalTester;
+use Faker\Provider\Uuid;
 
 class HasJoinedLegacyCest {
 
diff --git a/api/tests/functional/sessionserver/JoinCest.php b/api/tests/functional/sessionserver/JoinCest.php
index 25f4c93..4f44262 100644
--- a/api/tests/functional/sessionserver/JoinCest.php
+++ b/api/tests/functional/sessionserver/JoinCest.php
@@ -1,12 +1,12 @@
 <?php
 namespace api\tests\functional\sessionserver;
 
-use common\rbac\Permissions as P;
-use Faker\Provider\Uuid;
 use api\tests\_pages\SessionServerRoute;
 use api\tests\functional\_steps\AuthserverSteps;
 use api\tests\functional\_steps\OauthSteps;
 use api\tests\FunctionalTester;
+use common\rbac\Permissions as P;
+use Faker\Provider\Uuid;
 
 class JoinCest {
 
diff --git a/api/tests/functional/sessionserver/JoinLegacyCest.php b/api/tests/functional/sessionserver/JoinLegacyCest.php
index 69cf079..f5e8b71 100644
--- a/api/tests/functional/sessionserver/JoinLegacyCest.php
+++ b/api/tests/functional/sessionserver/JoinLegacyCest.php
@@ -1,12 +1,12 @@
 <?php
 namespace api\tests\functional\sessionserver;
 
-use common\rbac\Permissions as P;
-use Faker\Provider\Uuid;
 use api\tests\_pages\SessionServerRoute;
 use api\tests\functional\_steps\AuthserverSteps;
 use api\tests\functional\_steps\OauthSteps;
 use api\tests\FunctionalTester;
+use common\rbac\Permissions as P;
+use Faker\Provider\Uuid;
 
 class JoinLegacyCest {
 
diff --git a/api/tests/functional/sessionserver/ProfileCest.php b/api/tests/functional/sessionserver/ProfileCest.php
index 68b97b4..8d7bd1a 100644
--- a/api/tests/functional/sessionserver/ProfileCest.php
+++ b/api/tests/functional/sessionserver/ProfileCest.php
@@ -1,10 +1,10 @@
 <?php
 namespace api\tests\functional\sessionserver;
 
-use Faker\Provider\Uuid;
 use api\tests\_pages\SessionServerRoute;
 use api\tests\functional\_steps\SessionServerSteps;
 use api\tests\FunctionalTester;
+use Faker\Provider\Uuid;
 
 class ProfileCest {
 
diff --git a/api/tests/unit/components/ReCaptcha/ValidatorTest.php b/api/tests/unit/components/ReCaptcha/ValidatorTest.php
index bc0bdb7..dc9fc08 100644
--- a/api/tests/unit/components/ReCaptcha/ValidatorTest.php
+++ b/api/tests/unit/components/ReCaptcha/ValidatorTest.php
@@ -2,12 +2,12 @@
 namespace codeception\api\unit\components\ReCaptcha;
 
 use api\components\ReCaptcha\Validator;
+use api\tests\unit\TestCase;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\ConnectException;
 use GuzzleHttp\Psr7\Response;
 use phpmock\mockery\PHPMockery;
 use ReflectionClass;
-use api\tests\unit\TestCase;
 
 class ValidatorTest extends TestCase {
 
diff --git a/api/tests/unit/components/User/ComponentTest.php b/api/tests/unit/components/User/ComponentTest.php
index 05654ca..6998df3 100644
--- a/api/tests/unit/components/User/ComponentTest.php
+++ b/api/tests/unit/components/User/ComponentTest.php
@@ -4,16 +4,16 @@ namespace codeception\api\unit\components\User;
 use api\components\User\AuthenticationResult;
 use api\components\User\Component;
 use api\components\User\Identity;
+use api\tests\unit\TestCase;
 use common\models\Account;
 use common\models\AccountSession;
-use Emarref\Jwt\Claim;
-use Emarref\Jwt\Jwt;
-use Emarref\Jwt\Token;
-use api\tests\unit\TestCase;
 use common\tests\_support\ProtectedCaller;
 use common\tests\fixtures\AccountFixture;
 use common\tests\fixtures\AccountSessionFixture;
 use common\tests\fixtures\MinecraftAccessKeyFixture;
+use Emarref\Jwt\Claim;
+use Emarref\Jwt\Jwt;
+use Emarref\Jwt\Token;
 use Yii;
 use yii\web\Request;
 
diff --git a/api/tests/unit/components/User/JwtAuthenticationResultTest.php b/api/tests/unit/components/User/JwtAuthenticationResultTest.php
index 59627ec..7e029d4 100644
--- a/api/tests/unit/components/User/JwtAuthenticationResultTest.php
+++ b/api/tests/unit/components/User/JwtAuthenticationResultTest.php
@@ -2,6 +2,7 @@
 namespace api\tests\unit\components\User;
 
 use api\components\User\AuthenticationResult;
+use api\tests\unit\TestCase;
 use common\models\Account;
 use common\models\AccountSession;
 use Emarref\Jwt\Algorithm\Hs256;
@@ -9,7 +10,6 @@ use Emarref\Jwt\Claim\Expiration;
 use Emarref\Jwt\Encryption\Factory as EncryptionFactory;
 use Emarref\Jwt\Jwt;
 use Emarref\Jwt\Token;
-use api\tests\unit\TestCase;
 
 class JwtAuthenticationResultTest extends TestCase {
 
diff --git a/api/tests/unit/models/FeedbackFormTest.php b/api/tests/unit/models/FeedbackFormTest.php
index b34f1ec..06f2f06 100644
--- a/api/tests/unit/models/FeedbackFormTest.php
+++ b/api/tests/unit/models/FeedbackFormTest.php
@@ -2,8 +2,8 @@
 namespace codeception\api\unit\models;
 
 use api\models\FeedbackForm;
-use common\models\Account;
 use api\tests\unit\TestCase;
+use common\models\Account;
 use yii\swiftmailer\Message;
 
 class FeedbackFormTest extends TestCase {
diff --git a/api/tests/unit/models/JwtIdentityTest.php b/api/tests/unit/models/JwtIdentityTest.php
index de2a136..432f37d 100644
--- a/api/tests/unit/models/JwtIdentityTest.php
+++ b/api/tests/unit/models/JwtIdentityTest.php
@@ -4,13 +4,13 @@ namespace codeception\api\unit\models;
 use api\components\User\IdentityInterface;
 use api\components\User\Jwt;
 use api\components\User\JwtIdentity;
+use api\tests\unit\TestCase;
 use Codeception\Specify;
+use common\tests\_support\ProtectedCaller;
+use common\tests\fixtures\AccountFixture;
 use Emarref\Jwt\Claim;
 use Emarref\Jwt\Encryption\Factory as EncryptionFactory;
 use Emarref\Jwt\Token;
-use api\tests\unit\TestCase;
-use common\tests\_support\ProtectedCaller;
-use common\tests\fixtures\AccountFixture;
 use Yii;
 
 class JwtIdentityTest extends TestCase {
diff --git a/api/tests/unit/models/authentication/ConfirmEmailFormTest.php b/api/tests/unit/models/authentication/ConfirmEmailFormTest.php
index 0e4d7d0..534d13e 100644
--- a/api/tests/unit/models/authentication/ConfirmEmailFormTest.php
+++ b/api/tests/unit/models/authentication/ConfirmEmailFormTest.php
@@ -3,10 +3,10 @@ namespace api\tests\_support\models\authentication;
 
 use api\components\User\AuthenticationResult;
 use api\models\authentication\ConfirmEmailForm;
+use api\tests\unit\TestCase;
 use common\models\Account;
 use common\models\AccountSession;
 use common\models\EmailActivation;
-use api\tests\unit\TestCase;
 use common\tests\fixtures\EmailActivationFixture;
 
 class ConfirmEmailFormTest extends TestCase {
diff --git a/api/tests/unit/models/authentication/ForgotPasswordFormTest.php b/api/tests/unit/models/authentication/ForgotPasswordFormTest.php
index f741c43..1a4caf1 100644
--- a/api/tests/unit/models/authentication/ForgotPasswordFormTest.php
+++ b/api/tests/unit/models/authentication/ForgotPasswordFormTest.php
@@ -3,14 +3,14 @@ namespace codeception\api\unit\models\authentication;
 
 use api\components\ReCaptcha\Validator as ReCaptchaValidator;
 use api\models\authentication\ForgotPasswordForm;
+use api\tests\unit\TestCase;
 use Codeception\Specify;
 use common\models\Account;
 use common\models\EmailActivation;
 use common\tasks\SendPasswordRecoveryEmail;
-use GuzzleHttp\ClientInterface;
-use api\tests\unit\TestCase;
 use common\tests\fixtures\AccountFixture;
 use common\tests\fixtures\EmailActivationFixture;
+use GuzzleHttp\ClientInterface;
 use Yii;
 
 class ForgotPasswordFormTest extends TestCase {
diff --git a/api/tests/unit/models/authentication/LoginFormTest.php b/api/tests/unit/models/authentication/LoginFormTest.php
index 87fa432..a5b32d2 100644
--- a/api/tests/unit/models/authentication/LoginFormTest.php
+++ b/api/tests/unit/models/authentication/LoginFormTest.php
@@ -3,11 +3,11 @@ namespace api\tests\_support\models\authentication;
 
 use api\components\User\AuthenticationResult;
 use api\models\authentication\LoginForm;
+use api\tests\unit\TestCase;
 use Codeception\Specify;
 use common\models\Account;
-use OTPHP\TOTP;
-use api\tests\unit\TestCase;
 use common\tests\fixtures\AccountFixture;
+use OTPHP\TOTP;
 
 class LoginFormTest extends TestCase {
     use Specify;
diff --git a/api/tests/unit/models/authentication/LogoutFormTest.php b/api/tests/unit/models/authentication/LogoutFormTest.php
index 809c655..1a3d9af 100644
--- a/api/tests/unit/models/authentication/LogoutFormTest.php
+++ b/api/tests/unit/models/authentication/LogoutFormTest.php
@@ -4,9 +4,9 @@ namespace api\tests\_support\models\authentication;
 use api\components\User\Component;
 use api\components\User\Identity;
 use api\models\authentication\LogoutForm;
+use api\tests\unit\TestCase;
 use Codeception\Specify;
 use common\models\AccountSession;
-use api\tests\unit\TestCase;
 use Yii;
 
 class LogoutFormTest extends TestCase {
diff --git a/api/tests/unit/models/authentication/RecoverPasswordFormTest.php b/api/tests/unit/models/authentication/RecoverPasswordFormTest.php
index 83c1c35..1029d96 100644
--- a/api/tests/unit/models/authentication/RecoverPasswordFormTest.php
+++ b/api/tests/unit/models/authentication/RecoverPasswordFormTest.php
@@ -3,10 +3,10 @@ namespace api\tests\_support\models\authentication;
 
 use api\components\User\AuthenticationResult;
 use api\models\authentication\RecoverPasswordForm;
+use api\tests\unit\TestCase;
 use Codeception\Specify;
 use common\models\Account;
 use common\models\EmailActivation;
-use api\tests\unit\TestCase;
 use common\tests\fixtures\EmailActivationFixture;
 
 class RecoverPasswordFormTest extends TestCase {
diff --git a/api/tests/unit/models/authentication/RefreshTokenFormTest.php b/api/tests/unit/models/authentication/RefreshTokenFormTest.php
index e5cb8e7..16308a4 100644
--- a/api/tests/unit/models/authentication/RefreshTokenFormTest.php
+++ b/api/tests/unit/models/authentication/RefreshTokenFormTest.php
@@ -3,9 +3,9 @@ namespace codeception\api\unit\models\authentication;
 
 use api\components\User\AuthenticationResult;
 use api\models\authentication\RefreshTokenForm;
+use api\tests\unit\TestCase;
 use Codeception\Specify;
 use common\models\AccountSession;
-use api\tests\unit\TestCase;
 use common\tests\fixtures\AccountSessionFixture;
 
 class RefreshTokenFormTest extends TestCase {
diff --git a/api/tests/unit/models/authentication/RegistrationFormTest.php b/api/tests/unit/models/authentication/RegistrationFormTest.php
index 67918a6..f1939d5 100644
--- a/api/tests/unit/models/authentication/RegistrationFormTest.php
+++ b/api/tests/unit/models/authentication/RegistrationFormTest.php
@@ -3,16 +3,16 @@ namespace api\tests\_support\models\authentication;
 
 use api\components\ReCaptcha\Validator as ReCaptchaValidator;
 use api\models\authentication\RegistrationForm;
+use api\tests\unit\TestCase;
 use common\models\Account;
 use common\models\EmailActivation;
 use common\models\UsernameHistory;
 use common\tasks\SendRegistrationEmail;
-use GuzzleHttp\ClientInterface;
-use api\tests\unit\TestCase;
 use common\tests\fixtures\AccountFixture;
 use common\tests\fixtures\EmailActivationFixture;
 use common\tests\fixtures\UsernameHistoryFixture;
 use common\tests\helpers\Mock;
+use GuzzleHttp\ClientInterface;
 use Yii;
 use yii\validators\EmailValidator;
 use yii\web\Request;
diff --git a/api/tests/unit/models/authentication/RepeatAccountActivationFormTest.php b/api/tests/unit/models/authentication/RepeatAccountActivationFormTest.php
index 5c1a254..3a6162b 100644
--- a/api/tests/unit/models/authentication/RepeatAccountActivationFormTest.php
+++ b/api/tests/unit/models/authentication/RepeatAccountActivationFormTest.php
@@ -3,13 +3,13 @@ namespace api\tests\_support\models\authentication;
 
 use api\components\ReCaptcha\Validator as ReCaptchaValidator;
 use api\models\authentication\RepeatAccountActivationForm;
+use api\tests\unit\TestCase;
 use Codeception\Specify;
 use common\models\EmailActivation;
 use common\tasks\SendRegistrationEmail;
-use GuzzleHttp\ClientInterface;
-use api\tests\unit\TestCase;
 use common\tests\fixtures\AccountFixture;
 use common\tests\fixtures\EmailActivationFixture;
+use GuzzleHttp\ClientInterface;
 use Yii;
 
 class RepeatAccountActivationFormTest extends TestCase {
diff --git a/api/tests/unit/modules/accounts/models/AcceptRulesFormTest.php b/api/tests/unit/modules/accounts/models/AcceptRulesFormTest.php
index 0de25df..c354cef 100644
--- a/api/tests/unit/modules/accounts/models/AcceptRulesFormTest.php
+++ b/api/tests/unit/modules/accounts/models/AcceptRulesFormTest.php
@@ -2,8 +2,8 @@
 namespace api\tests\unit\modules\accounts\models;
 
 use api\modules\accounts\models\AcceptRulesForm;
-use common\models\Account;
 use api\tests\unit\TestCase;
+use common\models\Account;
 use const common\LATEST_RULES_VERSION;
 
 class AcceptRulesFormTest extends TestCase {
diff --git a/api/tests/unit/modules/accounts/models/ChangeEmailFormTest.php b/api/tests/unit/modules/accounts/models/ChangeEmailFormTest.php
index f655e1e..a8f7c14 100644
--- a/api/tests/unit/modules/accounts/models/ChangeEmailFormTest.php
+++ b/api/tests/unit/modules/accounts/models/ChangeEmailFormTest.php
@@ -2,9 +2,9 @@
 namespace api\tests\unit\modules\accounts\models;
 
 use api\modules\accounts\models\ChangeEmailForm;
+use api\tests\unit\TestCase;
 use common\models\Account;
 use common\models\EmailActivation;
-use api\tests\unit\TestCase;
 use common\tests\fixtures\AccountFixture;
 use common\tests\fixtures\EmailActivationFixture;
 
diff --git a/api/tests/unit/modules/accounts/models/ChangeLanguageFormTest.php b/api/tests/unit/modules/accounts/models/ChangeLanguageFormTest.php
index 0ca9fe0..890aa17 100644
--- a/api/tests/unit/modules/accounts/models/ChangeLanguageFormTest.php
+++ b/api/tests/unit/modules/accounts/models/ChangeLanguageFormTest.php
@@ -2,8 +2,8 @@
 namespace api\tests\unit\modules\accounts\models;
 
 use api\modules\accounts\models\ChangeLanguageForm;
-use common\models\Account;
 use api\tests\unit\TestCase;
+use common\models\Account;
 
 class ChangeLanguageFormTest extends TestCase {
 
diff --git a/api/tests/unit/modules/accounts/models/ChangePasswordFormTest.php b/api/tests/unit/modules/accounts/models/ChangePasswordFormTest.php
index 1725829..36dc32c 100644
--- a/api/tests/unit/modules/accounts/models/ChangePasswordFormTest.php
+++ b/api/tests/unit/modules/accounts/models/ChangePasswordFormTest.php
@@ -4,10 +4,10 @@ namespace api\tests\unit\modules\accounts\models;
 use api\components\User\Component;
 use api\components\User\Identity;
 use api\modules\accounts\models\ChangePasswordForm;
+use api\tests\unit\TestCase;
 use common\components\UserPass;
 use common\helpers\Error as E;
 use common\models\Account;
-use api\tests\unit\TestCase;
 use Yii;
 use yii\db\Transaction;
 
diff --git a/api/tests/unit/modules/accounts/models/ChangeUsernameFormTest.php b/api/tests/unit/modules/accounts/models/ChangeUsernameFormTest.php
index f29b3cc..fad9db4 100644
--- a/api/tests/unit/modules/accounts/models/ChangeUsernameFormTest.php
+++ b/api/tests/unit/modules/accounts/models/ChangeUsernameFormTest.php
@@ -2,10 +2,10 @@
 namespace api\tests\unit\modules\accounts\models;
 
 use api\modules\accounts\models\ChangeUsernameForm;
+use api\tests\unit\TestCase;
 use common\models\Account;
 use common\models\UsernameHistory;
 use common\tasks\PullMojangUsername;
-use api\tests\unit\TestCase;
 use common\tests\fixtures\AccountFixture;
 use common\tests\fixtures\UsernameHistoryFixture;
 
diff --git a/api/tests/unit/modules/accounts/models/DisableTwoFactorAuthFormTest.php b/api/tests/unit/modules/accounts/models/DisableTwoFactorAuthFormTest.php
index 29bd6f0..618c53d 100644
--- a/api/tests/unit/modules/accounts/models/DisableTwoFactorAuthFormTest.php
+++ b/api/tests/unit/modules/accounts/models/DisableTwoFactorAuthFormTest.php
@@ -2,9 +2,9 @@
 namespace api\tests\unit\modules\accounts\models;
 
 use api\modules\accounts\models\DisableTwoFactorAuthForm;
+use api\tests\unit\TestCase;
 use common\helpers\Error as E;
 use common\models\Account;
-use api\tests\unit\TestCase;
 
 class DisableTwoFactorAuthFormTest extends TestCase {
 
diff --git a/api/tests/unit/modules/accounts/models/EnableTwoFactorAuthFormTest.php b/api/tests/unit/modules/accounts/models/EnableTwoFactorAuthFormTest.php
index 0790e26..4bacfe4 100644
--- a/api/tests/unit/modules/accounts/models/EnableTwoFactorAuthFormTest.php
+++ b/api/tests/unit/modules/accounts/models/EnableTwoFactorAuthFormTest.php
@@ -4,9 +4,9 @@ namespace api\tests\unit\modules\accounts\models;
 use api\components\User\Component;
 use api\components\User\Identity;
 use api\modules\accounts\models\EnableTwoFactorAuthForm;
+use api\tests\unit\TestCase;
 use common\helpers\Error as E;
 use common\models\Account;
-use api\tests\unit\TestCase;
 use Yii;
 
 class EnableTwoFactorAuthFormTest extends TestCase {
diff --git a/api/tests/unit/modules/accounts/models/SendEmailVerificationFormTest.php b/api/tests/unit/modules/accounts/models/SendEmailVerificationFormTest.php
index 770c7a9..52ed48c 100644
--- a/api/tests/unit/modules/accounts/models/SendEmailVerificationFormTest.php
+++ b/api/tests/unit/modules/accounts/models/SendEmailVerificationFormTest.php
@@ -2,11 +2,11 @@
 namespace api\tests\unit\modules\accounts\models;
 
 use api\modules\accounts\models\SendEmailVerificationForm;
+use api\tests\unit\TestCase;
 use common\models\Account;
 use common\models\confirmations\CurrentEmailConfirmation;
 use common\models\EmailActivation;
 use common\tasks\SendCurrentEmailConfirmation;
-use api\tests\unit\TestCase;
 use common\tests\fixtures\AccountFixture;
 use common\tests\fixtures\EmailActivationFixture;
 
diff --git a/api/tests/unit/modules/accounts/models/SendNewEmailVerificationFormTest.php b/api/tests/unit/modules/accounts/models/SendNewEmailVerificationFormTest.php
index 8e1437a..aaaa1b5 100644
--- a/api/tests/unit/modules/accounts/models/SendNewEmailVerificationFormTest.php
+++ b/api/tests/unit/modules/accounts/models/SendNewEmailVerificationFormTest.php
@@ -2,11 +2,11 @@
 namespace api\tests\unit\modules\accounts\models;
 
 use api\modules\accounts\models\SendNewEmailVerificationForm;
+use api\tests\unit\TestCase;
 use common\models\Account;
 use common\models\confirmations\NewEmailConfirmation;
 use common\models\EmailActivation;
 use common\tasks\SendNewEmailConfirmation;
-use api\tests\unit\TestCase;
 use common\tests\fixtures\AccountFixture;
 use common\tests\fixtures\EmailActivationFixture;
 use common\tests\helpers\Mock;
diff --git a/api/tests/unit/modules/accounts/models/TwoFactorAuthInfoTest.php b/api/tests/unit/modules/accounts/models/TwoFactorAuthInfoTest.php
index 41188c3..ee5d455 100644
--- a/api/tests/unit/modules/accounts/models/TwoFactorAuthInfoTest.php
+++ b/api/tests/unit/modules/accounts/models/TwoFactorAuthInfoTest.php
@@ -2,8 +2,8 @@
 namespace api\tests\unit\modules\accounts\models;
 
 use api\modules\accounts\models\TwoFactorAuthInfo;
-use common\models\Account;
 use api\tests\unit\TestCase;
+use common\models\Account;
 
 class TwoFactorAuthInfoTest extends TestCase {
 
diff --git a/api/tests/unit/modules/authserver/models/AuthenticationFormTest.php b/api/tests/unit/modules/authserver/models/AuthenticationFormTest.php
index b9300df..5395a86 100644
--- a/api/tests/unit/modules/authserver/models/AuthenticationFormTest.php
+++ b/api/tests/unit/modules/authserver/models/AuthenticationFormTest.php
@@ -4,13 +4,13 @@ namespace codeception\api\unit\modules\authserver\models;
 use api\models\authentication\LoginForm;
 use api\modules\authserver\models\AuthenticateData;
 use api\modules\authserver\models\AuthenticationForm;
+use api\tests\unit\TestCase;
 use common\models\Account;
 use common\models\MinecraftAccessKey;
-use Ramsey\Uuid\Uuid;
-use api\tests\unit\TestCase;
 use common\tests\_support\ProtectedCaller;
 use common\tests\fixtures\AccountFixture;
 use common\tests\fixtures\MinecraftAccessKeyFixture;
+use Ramsey\Uuid\Uuid;
 
 class AuthenticationFormTest extends TestCase {
     use ProtectedCaller;
diff --git a/api/tests/unit/modules/internal/models/BanFormTest.php b/api/tests/unit/modules/internal/models/BanFormTest.php
index d955ff1..48f53dd 100644
--- a/api/tests/unit/modules/internal/models/BanFormTest.php
+++ b/api/tests/unit/modules/internal/models/BanFormTest.php
@@ -3,9 +3,9 @@ namespace api\tests\unit\modules\internal\models;
 
 use api\modules\accounts\models\BanAccountForm;
 use api\modules\internal\helpers\Error as E;
+use api\tests\unit\TestCase;
 use common\models\Account;
 use common\tasks\ClearAccountSessions;
-use api\tests\unit\TestCase;
 
 class BanFormTest extends TestCase {
 
diff --git a/api/tests/unit/modules/internal/models/PardonFormTest.php b/api/tests/unit/modules/internal/models/PardonFormTest.php
index d7b874e..4ae4438 100644
--- a/api/tests/unit/modules/internal/models/PardonFormTest.php
+++ b/api/tests/unit/modules/internal/models/PardonFormTest.php
@@ -3,8 +3,8 @@ namespace api\tests\unit\modules\internal\models;
 
 use api\modules\accounts\models\PardonAccountForm;
 use api\modules\internal\helpers\Error as E;
-use common\models\Account;
 use api\tests\unit\TestCase;
+use common\models\Account;
 
 class PardonFormTest extends TestCase {
 
diff --git a/api/tests/unit/modules/oauth/models/ApplicationTypeTest.php b/api/tests/unit/modules/oauth/models/ApplicationTypeTest.php
index 648132f..6d0c8b0 100644
--- a/api/tests/unit/modules/oauth/models/ApplicationTypeTest.php
+++ b/api/tests/unit/modules/oauth/models/ApplicationTypeTest.php
@@ -2,8 +2,8 @@
 namespace api\tests\unit\modules\oauth\models;
 
 use api\modules\oauth\models\ApplicationType;
-use common\models\OauthClient;
 use api\tests\unit\TestCase;
+use common\models\OauthClient;
 
 class ApplicationTypeTest extends TestCase {
 
diff --git a/api/tests/unit/modules/oauth/models/BaseOauthClientTypeTest.php b/api/tests/unit/modules/oauth/models/BaseOauthClientTypeTest.php
index cb12201..43e83e4 100644
--- a/api/tests/unit/modules/oauth/models/BaseOauthClientTypeTest.php
+++ b/api/tests/unit/modules/oauth/models/BaseOauthClientTypeTest.php
@@ -2,8 +2,8 @@
 namespace api\tests\unit\modules\oauth\models;
 
 use api\modules\oauth\models\BaseOauthClientType;
-use common\models\OauthClient;
 use api\tests\unit\TestCase;
+use common\models\OauthClient;
 
 class BaseOauthClientTypeTest extends TestCase {
 
diff --git a/api/tests/unit/modules/oauth/models/MinecraftServerTypeTest.php b/api/tests/unit/modules/oauth/models/MinecraftServerTypeTest.php
index 29f4b4f..0d69718 100644
--- a/api/tests/unit/modules/oauth/models/MinecraftServerTypeTest.php
+++ b/api/tests/unit/modules/oauth/models/MinecraftServerTypeTest.php
@@ -2,8 +2,8 @@
 namespace api\tests\unit\modules\oauth\models;
 
 use api\modules\oauth\models\MinecraftServerType;
-use common\models\OauthClient;
 use api\tests\unit\TestCase;
+use common\models\OauthClient;
 
 class MinecraftServerTypeTest extends TestCase {
 
diff --git a/api/tests/unit/modules/oauth/models/OauthClientFormFactoryTest.php b/api/tests/unit/modules/oauth/models/OauthClientFormFactoryTest.php
index 27ceac4..2b26b2f 100644
--- a/api/tests/unit/modules/oauth/models/OauthClientFormFactoryTest.php
+++ b/api/tests/unit/modules/oauth/models/OauthClientFormFactoryTest.php
@@ -4,8 +4,8 @@ namespace api\tests\unit\modules\oauth\models;
 use api\modules\oauth\models\ApplicationType;
 use api\modules\oauth\models\MinecraftServerType;
 use api\modules\oauth\models\OauthClientFormFactory;
-use common\models\OauthClient;
 use api\tests\unit\TestCase;
+use common\models\OauthClient;
 
 class OauthClientFormFactoryTest extends TestCase {
 
diff --git a/api/tests/unit/modules/oauth/models/OauthClientFormTest.php b/api/tests/unit/modules/oauth/models/OauthClientFormTest.php
index 0d683c1..58820db 100644
--- a/api/tests/unit/modules/oauth/models/OauthClientFormTest.php
+++ b/api/tests/unit/modules/oauth/models/OauthClientFormTest.php
@@ -3,9 +3,9 @@ namespace api\tests\unit\modules\oauth\models;
 
 use api\modules\oauth\models\OauthClientForm;
 use api\modules\oauth\models\OauthClientTypeForm;
+use api\tests\unit\TestCase;
 use common\models\OauthClient;
 use common\tasks\ClearOauthSessions;
-use api\tests\unit\TestCase;
 
 class OauthClientFormTest extends TestCase {
 
diff --git a/api/tests/unit/modules/session/filters/RateLimiterTest.php b/api/tests/unit/modules/session/filters/RateLimiterTest.php
index 5743b0e..2860059 100644
--- a/api/tests/unit/modules/session/filters/RateLimiterTest.php
+++ b/api/tests/unit/modules/session/filters/RateLimiterTest.php
@@ -4,9 +4,9 @@ declare(strict_types=1);
 namespace api\tests\unit\modules\session\filters;
 
 use api\modules\session\filters\RateLimiter;
+use api\tests\unit\TestCase;
 use common\models\OauthClient;
 use Faker\Provider\Internet;
-use api\tests\unit\TestCase;
 use Yii;
 use yii\redis\Connection;
 use yii\web\Request;
diff --git a/api/tests/unit/traits/AccountFinderTest.php b/api/tests/unit/traits/AccountFinderTest.php
index 39dc097..967a4c0 100644
--- a/api/tests/unit/traits/AccountFinderTest.php
+++ b/api/tests/unit/traits/AccountFinderTest.php
@@ -1,10 +1,10 @@
 <?php
 namespace api\tests\_support\traits;
 
+use api\tests\unit\TestCase;
 use api\traits\AccountFinder;
 use Codeception\Specify;
 use common\models\Account;
-use api\tests\unit\TestCase;
 use common\tests\fixtures\AccountFixture;
 
 class AccountFinderTest extends TestCase {
diff --git a/api/tests/unit/validators/EmailActivationKeyValidatorTest.php b/api/tests/unit/validators/EmailActivationKeyValidatorTest.php
index a5e68a7..6467851 100644
--- a/api/tests/unit/validators/EmailActivationKeyValidatorTest.php
+++ b/api/tests/unit/validators/EmailActivationKeyValidatorTest.php
@@ -1,12 +1,12 @@
 <?php
 namespace codeception\api\unit\validators;
 
+use api\tests\unit\TestCase;
 use api\validators\EmailActivationKeyValidator;
 use Codeception\Specify;
 use common\helpers\Error as E;
 use common\models\confirmations\ForgotPassword;
 use common\models\EmailActivation;
-use api\tests\unit\TestCase;
 use common\tests\_support\ProtectedCaller;
 use common\tests\fixtures\EmailActivationFixture;
 use yii\base\Model;
diff --git a/api/tests/unit/validators/PasswordRequiredValidatorTest.php b/api/tests/unit/validators/PasswordRequiredValidatorTest.php
index 93fab17..aaffc40 100644
--- a/api/tests/unit/validators/PasswordRequiredValidatorTest.php
+++ b/api/tests/unit/validators/PasswordRequiredValidatorTest.php
@@ -1,11 +1,11 @@
 <?php
 namespace codeception\api\unit\validators;
 
+use api\tests\unit\TestCase;
 use api\validators\PasswordRequiredValidator;
 use common\helpers\Error as E;
 use common\models\Account;
 use common\rbac\Permissions as P;
-use api\tests\unit\TestCase;
 use common\tests\_support\ProtectedCaller;
 use yii\web\User;
 
diff --git a/api/tests/unit/validators/TotpValidatorTest.php b/api/tests/unit/validators/TotpValidatorTest.php
index 26738b6..b234892 100644
--- a/api/tests/unit/validators/TotpValidatorTest.php
+++ b/api/tests/unit/validators/TotpValidatorTest.php
@@ -1,12 +1,12 @@
 <?php
 namespace api\tests\unit\validators;
 
+use api\tests\unit\TestCase;
 use api\validators\TotpValidator;
 use common\helpers\Error as E;
 use common\models\Account;
-use OTPHP\TOTP;
-use api\tests\unit\TestCase;
 use common\tests\_support\ProtectedCaller;
+use OTPHP\TOTP;
 
 class TotpValidatorTest extends TestCase {
     use ProtectedCaller;
diff --git a/common/tests/unit/components/Mojang/ApiTest.php b/common/tests/unit/components/Mojang/ApiTest.php
index 4dd3ab3..62bf1db 100644
--- a/common/tests/unit/components/Mojang/ApiTest.php
+++ b/common/tests/unit/components/Mojang/ApiTest.php
@@ -3,11 +3,11 @@ namespace common\tests\unit\components\Mojang;
 
 use common\components\Mojang\Api;
 use common\components\Mojang\response\UsernameToUUIDResponse;
+use common\tests\unit\TestCase;
 use GuzzleHttp\Client as GuzzleClient;
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
-use common\tests\unit\TestCase;
 use Yii;
 
 class ApiTest extends TestCase {
diff --git a/common/tests/unit/emails/TemplateWithRendererTest.php b/common/tests/unit/emails/TemplateWithRendererTest.php
index 4a505cb..0ed2971 100644
--- a/common/tests/unit/emails/TemplateWithRendererTest.php
+++ b/common/tests/unit/emails/TemplateWithRendererTest.php
@@ -3,9 +3,9 @@ namespace common\tests\unit\emails;
 
 use common\components\EmailRenderer;
 use common\emails\TemplateWithRenderer;
-use Ely\Email\TemplateBuilder;
 use common\tests\_support\ProtectedCaller;
 use common\tests\unit\TestCase;
+use Ely\Email\TemplateBuilder;
 use yii\mail\MailerInterface;
 use yii\mail\MessageInterface;
 
diff --git a/common/tests/unit/tasks/DeliveryWebHookTest.php b/common/tests/unit/tasks/DeliveryWebHookTest.php
index ef36456..1a002f9 100644
--- a/common/tests/unit/tasks/DeliveryWebHookTest.php
+++ b/common/tests/unit/tasks/DeliveryWebHookTest.php
@@ -4,6 +4,7 @@ declare(strict_types=1);
 namespace common\tests\unit\tasks;
 
 use common\tasks\DeliveryWebHook;
+use common\tests\unit\TestCase;
 use GuzzleHttp\Exception\ConnectException;
 use GuzzleHttp\Exception\ServerException;
 use GuzzleHttp\Handler\MockHandler;
@@ -11,7 +12,6 @@ use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Middleware;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
-use common\tests\unit\TestCase;
 use yii\queue\Queue;
 
 /**
diff --git a/common/tests/unit/validators/EmailValidatorTest.php b/common/tests/unit/validators/EmailValidatorTest.php
index 52c54cf..b9f985e 100644
--- a/common/tests/unit/validators/EmailValidatorTest.php
+++ b/common/tests/unit/validators/EmailValidatorTest.php
@@ -1,10 +1,10 @@
 <?php
 namespace common\tests\unit\validators;
 
-use common\validators\EmailValidator;
 use common\tests\fixtures\AccountFixture;
 use common\tests\helpers\Mock;
 use common\tests\unit\TestCase;
+use common\validators\EmailValidator;
 use yii\base\Model;
 use yii\validators\EmailValidator as YiiEmailValidator;
 
diff --git a/common/tests/unit/validators/LanguageValidatorTest.php b/common/tests/unit/validators/LanguageValidatorTest.php
index ce3771c..b11bd6f 100644
--- a/common/tests/unit/validators/LanguageValidatorTest.php
+++ b/common/tests/unit/validators/LanguageValidatorTest.php
@@ -3,8 +3,8 @@ declare(strict_types=1);
 
 namespace common\tests\unit\validators;
 
-use common\validators\LanguageValidator;
 use common\tests\unit\TestCase;
+use common\validators\LanguageValidator;
 
 /**
  * @covers \common\validators\LanguageValidator
diff --git a/common/tests/unit/validators/MinecraftServerAddressValidatorTest.php b/common/tests/unit/validators/MinecraftServerAddressValidatorTest.php
index ea4c30e..914dd3b 100644
--- a/common/tests/unit/validators/MinecraftServerAddressValidatorTest.php
+++ b/common/tests/unit/validators/MinecraftServerAddressValidatorTest.php
@@ -1,8 +1,8 @@
 <?php
 namespace common\tests\unit\validators;
 
-use common\validators\MinecraftServerAddressValidator;
 use common\tests\unit\TestCase;
+use common\validators\MinecraftServerAddressValidator;
 
 class MinecraftServerAddressValidatorTest extends TestCase {
 
diff --git a/common/tests/unit/validators/UsernameValidatorTest.php b/common/tests/unit/validators/UsernameValidatorTest.php
index 9138060..7328943 100644
--- a/common/tests/unit/validators/UsernameValidatorTest.php
+++ b/common/tests/unit/validators/UsernameValidatorTest.php
@@ -1,9 +1,9 @@
 <?php
 namespace common\tests\unit\validators;
 
-use common\validators\UsernameValidator;
 use common\tests\fixtures\AccountFixture;
 use common\tests\unit\TestCase;
+use common\validators\UsernameValidator;
 use yii\base\Model;
 
 class UsernameValidatorTest extends TestCase {
diff --git a/common/tests/unit/validators/UuidValidatorTest.php b/common/tests/unit/validators/UuidValidatorTest.php
index 2b23fa7..d45cc19 100644
--- a/common/tests/unit/validators/UuidValidatorTest.php
+++ b/common/tests/unit/validators/UuidValidatorTest.php
@@ -2,9 +2,9 @@
 namespace common\tests\unit\validators;
 
 use Codeception\Specify;
+use common\tests\unit\TestCase;
 use common\validators\UuidValidator;
 use Faker\Provider\Uuid;
-use common\tests\unit\TestCase;
 use yii\base\Model;
 
 class UuidValidatorTest extends TestCase {