diff --git a/app/Makefile b/app/Makefile
index 6acad77..6b81397 100644
--- a/app/Makefile
+++ b/app/Makefile
@@ -60,7 +60,7 @@ test-up: ## Start test containers (keep running)
 	@$(TEST_COMPOSE) up -d
 	@$(TEST_COMPOSE) exec php bin/console d:d:c -n --if-not-exists
 	@$(TEST_COMPOSE) exec php bin/console d:m:m -n
-	@$(TEST_COMPOSE) exec php bin/console app:populate:users -n
+	@$(TEST_COMPOSE) exec php bin/console app:populate:users -n test_user_1 -f Test -l User
 	@$(TEST_COMPOSE) exec php bin/console app:populate:capitals --purge -n
 	@$(TEST_COMPOSE) exec php bin/console app:populate:flags --purge -n
 
diff --git a/app/src/Flags/Controller/FlagsController.php b/app/src/Flags/Controller/FlagsController.php
index 07127f3..10fd428 100644
--- a/app/src/Flags/Controller/FlagsController.php
+++ b/app/src/Flags/Controller/FlagsController.php
@@ -148,8 +148,8 @@ public function getStat(#[CurrentUser] $user, AnswerRepository $repository): Res
         $result = $repository->findAllGuesses($user->getId());
         // TODO move this logic to service
         foreach ($result as $key => $item) {
-            $result[$key]['flag'] = $this->flagsGenerator->getEmojiFlag($item['flagCode']);
-            $result[$key]['country'] = Countries::getName(strtoupper($item['flagCode']));
+            $result[$key]['flag'] = $this->flagsGenerator->getEmojiFlag($item['flagCode'], CodeSet::EXTENDED);
+            $result[$key]['country'] = $this->getCountryName(strtoupper($item['flagCode']));
             foreach ($correctResults as $value) {
                 if ($value['flagCode'] === $result[$key]['flagCode']) {
                     $shown = (int) $result[$key]['times'];
@@ -180,8 +180,8 @@ public function getRight(#[CurrentUser] $user, AnswerRepository $repository): Re
         $result = $repository->findAllGuesses($user->getId());
         // TODO move this logic to service
         foreach ($result as $key => $item) {
-            $result[$key]['flag'] = $this->flagsGenerator->getEmojiFlag($item['flagCode']);
-            $result[$key]['country'] = Countries::getName(strtoupper($item['flagCode']));
+            $result[$key]['flag'] = $this->flagsGenerator->getEmojiFlag($item['flagCode'], CodeSet::EXTENDED);
+            $result[$key]['country'] = $this->getCountryName(strtoupper($item['flagCode']));
             foreach ($correctResults as $value) {
                 if ($value['flagCode'] === $result[$key]['flagCode']) {
                     $shown = (int) $result[$key]['times'];
@@ -199,7 +199,14 @@ public function getRight(#[CurrentUser] $user, AnswerRepository $repository): Re
             }
         }
 
-        array_multisort($result, SORT_DESC, SORT_NUMERIC, array_column($result, 'rate'), SORT_DESC, SORT_NUMERIC);
+        array_multisort(
+            $result,
+            SORT_DESC,
+            SORT_NUMERIC,
+            array_column($result, 'rate'),
+            SORT_DESC,
+            SORT_NUMERIC,
+        );
 
         return $this->json($result);
     }
diff --git a/app/tests/Support/Factory/UserFactory.php b/app/tests/Support/Factory/UserFactory.php
index fa45bc0..2f28914 100644
--- a/app/tests/Support/Factory/UserFactory.php
+++ b/app/tests/Support/Factory/UserFactory.php
@@ -7,7 +7,7 @@
 use App\Flags\Entity\User;
 use Doctrine\ORM\EntityManagerInterface;
 
-final class UserFactory
+class UserFactory
 {
     private int $sequence = 0;
 
diff --git a/app/tests/Unit/Service/CountriesGeneratorTest.php b/app/tests/Unit/Service/CountriesGeneratorTest.php
new file mode 100644
index 0000000..42e6061
--- /dev/null
+++ b/app/tests/Unit/Service/CountriesGeneratorTest.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Tests\Unit\Service;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Intl\Countries;
+
+class CountriesGeneratorTest extends TestCase
+{
+    public function testCountryIsFetched(): void
+    {
+        // TODO move getCountryName to testable unit and update the test
+        $this->assertFalse(Countries::exists('AC'));
+    }
+}