diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 86904a0..4b2d014 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,22 +1,9 @@
 <?php declare(strict_types=1);
 
+use h4kuna\Ares\Tests\UseStoredFile;
+
 require_once __DIR__ . '/../vendor/autoload.php';
 
 date_default_timezone_set('Europe/Prague');
 
-function loadResult(string $name, object $save = null): \stdClass
-{
-	$file = __DIR__ . "/fixtures/$name.json";
-	if ($save !== null) {
-		file_put_contents($file, json_encode($save, JSON_PRETTY_PRINT));
-	}
-
-	return json_decode(file_get_contents($file));
-}
-
-
 Tracy\Debugger::enable(false);
-
-if (!defined('__PHPSTAN_RUNNING__')) {
-	Tester\Environment::setup();
-}
diff --git a/tests/fixtures/adis/CZ27082440.json b/tests/fixtures/adis/CZ27082440.json
index be110a2..86e5610 100644
--- a/tests/fixtures/adis/CZ27082440.json
+++ b/tests/fixtures/adis/CZ27082440.json
@@ -6,10 +6,10 @@
     "isVatPayer": true,
     "taxOfficeNumber": "13",
     "address": {
-        "uliceCislo": "Jankovcova 1522\/53",
-        "castObce": "HOLE\u0160OVICE (PRAHA 7)",
+        "uliceCislo": "Jankovcova 1522/53",
+        "castObce": "HOLEŠOVICE (PRAHA 7)",
         "mesto": "PRAHA 7",
         "psc": "17000",
-        "stat": "\u010cesk\u00e1 republika"
+        "stat": "Česká republika"
     }
 }
\ No newline at end of file
diff --git a/tests/fixtures/adis/CZ8612301071.json b/tests/fixtures/adis/CZ8612301071.json
index 3e89523..94b04f5 100644
--- a/tests/fixtures/adis/CZ8612301071.json
+++ b/tests/fixtures/adis/CZ8612301071.json
@@ -6,10 +6,10 @@
     "isVatPayer": true,
     "taxOfficeNumber": "452",
     "address": {
-        "uliceCislo": "Dubov\u00e1 765",
-        "castObce": "DOLN\u00cd BOUSOV",
-        "mesto": "DOLN\u00cd BOUSOV",
+        "uliceCislo": "Dubová 765",
+        "castObce": "DOLNÍ BOUSOV",
+        "mesto": "DOLNÍ BOUSOV",
         "psc": "29404",
-        "stat": "\u010cesk\u00e1 republika"
+        "stat": "Česká republika"
     }
 }
\ No newline at end of file
diff --git a/tests/fixtures/adis/CZ8702080024.json b/tests/fixtures/adis/CZ8702080024.json
index c33bc98..cef5ab1 100644
--- a/tests/fixtures/adis/CZ8702080024.json
+++ b/tests/fixtures/adis/CZ8702080024.json
@@ -6,10 +6,10 @@
     "isVatPayer": false,
     "taxOfficeNumber": "452",
     "address": {
-        "uliceCislo": "Na Dlaskov\u011b 94",
+        "uliceCislo": "Na Dlaskově 94",
         "castObce": "BRTNICE",
-        "mesto": "VELK\u00c9 POPOVICE",
+        "mesto": "VELKÉ POPOVICE",
         "psc": "25169",
-        "stat": "\u010cesk\u00e1 republika"
+        "stat": "Česká republika"
     }
 }
\ No newline at end of file
diff --git a/tests/fixtures/ares/02445344.json b/tests/fixtures/ares/02445344.json
index b7f73b8..2050960 100644
--- a/tests/fixtures/ares/02445344.json
+++ b/tests/fixtures/ares/02445344.json
@@ -4,18 +4,18 @@
     "company": "Skanska Residential a.s.",
     "created": "2014-01-01T00:00:00+01:00",
     "dissolved": null,
-    "city_district": "Karl\u00edn",
+    "city_district": "Karlín",
     "city_post": "Praha 8",
     "in": "02445344",
     "is_person": false,
     "legal_form_code": 121,
-    "house_number": "682\/34a",
-    "street": "K\u0159i\u017e\u00edkova",
+    "house_number": "682/34a",
+    "street": "Křižíkova",
     "district": null,
     "tin": "CZ699004845",
     "vat_payer": true,
     "zip": "18600",
-    "country": "\u010cesk\u00e1 republika",
+    "country": "Česká republika",
     "country_code": "CZ",
     "nace": [
         "431",
diff --git a/tests/fixtures/ares/02491427.json b/tests/fixtures/ares/02491427.json
index 8ea0a1f..d8b92a0 100644
--- a/tests/fixtures/ares/02491427.json
+++ b/tests/fixtures/ares/02491427.json
@@ -1,21 +1,21 @@
 {
     "active": true,
-    "city": "P\u00edsek",
-    "company": "Z\u00e1pado\u010desk\u00e1 spole\u010dnost, o.s.",
+    "city": "Písek",
+    "company": "Západočeská společnost, o.s.",
     "created": "2013-12-27T00:00:00+01:00",
     "dissolved": null,
-    "city_district": "Bud\u011bjovick\u00e9 P\u0159edm\u011bst\u00ed",
+    "city_district": "Budějovické Předměstí",
     "city_post": null,
     "in": "02491427",
     "is_person": false,
     "legal_form_code": 706,
-    "house_number": "105\/4",
+    "house_number": "105/4",
     "street": "Budovcova",
-    "district": "P\u00edsek",
+    "district": "Písek",
     "tin": null,
     "vat_payer": false,
     "zip": "39701",
-    "country": "\u010cesk\u00e1 republika",
+    "country": "Česká republika",
     "country_code": "CZ",
     "nace": [
         "9499"
diff --git a/tests/fixtures/ares/05560438.json b/tests/fixtures/ares/05560438.json
index 2b85624..ca478bd 100644
--- a/tests/fixtures/ares/05560438.json
+++ b/tests/fixtures/ares/05560438.json
@@ -1,7 +1,7 @@
 {
     "active": true,
-    "city": "Velk\u00e9 Popovice",
-    "company": "Ond\u0159ej Soch\u016frek",
+    "city": "Velké Popovice",
+    "company": "Ondřej Sochůrek",
     "created": "2016-11-11T00:00:00+01:00",
     "dissolved": null,
     "city_district": "Brtnice",
@@ -10,12 +10,12 @@
     "is_person": true,
     "legal_form_code": 101,
     "house_number": "94",
-    "street": "Na Dlaskov\u011b",
-    "district": "Praha-v\u00fdchod",
+    "street": "Na Dlaskově",
+    "district": "Praha-východ",
     "tin": "CZ8702080024",
     "vat_payer": false,
     "zip": "25169",
-    "country": "\u010cesk\u00e1 republika",
+    "country": "Česká republika",
     "country_code": "CZ",
     "nace": [
         "620",
diff --git a/tests/fixtures/ares/08975884.json b/tests/fixtures/ares/08975884.json
index 26458a8..cdcfecd 100644
--- a/tests/fixtures/ares/08975884.json
+++ b/tests/fixtures/ares/08975884.json
@@ -1,21 +1,21 @@
 {
     "active": true,
     "city": "Liberec",
-    "company": "Martin Proch\u00e1zka",
+    "company": "Martin Procházka",
     "created": "2020-02-21T00:00:00+01:00",
     "dissolved": null,
-    "city_district": "Liberec XII-Star\u00e9 Pavlovice",
-    "city_post": "Liberec (ne\u010dlen\u011bn\u00e9 m\u011bsto)",
+    "city_district": "Liberec XII-Staré Pavlovice",
+    "city_post": "Liberec (nečleněné město)",
     "in": "08975884",
     "is_person": true,
     "legal_form_code": 101,
-    "house_number": "530\/41",
-    "street": "Letn\u00e1",
+    "house_number": "530/41",
+    "street": "Letná",
     "district": "Liberec",
     "tin": null,
     "vat_payer": false,
     "zip": "46001",
-    "country": "\u010cesk\u00e1 republika",
+    "country": "Česká republika",
     "country_code": "CZ",
     "nace": [
         "620"
diff --git a/tests/fixtures/ares/16415345.json b/tests/fixtures/ares/16415345.json
index 52c550e..565f36c 100644
--- a/tests/fixtures/ares/16415345.json
+++ b/tests/fixtures/ares/16415345.json
@@ -1,21 +1,21 @@
 {
     "active": true,
     "city": "Liberec",
-    "company": "Roman Koreck\u00fd",
+    "company": "Roman Korecký",
     "created": "1993-02-18T00:00:00+01:00",
     "dissolved": null,
-    "city_district": "Liberec I-Star\u00e9 M\u011bsto",
-    "city_post": "Liberec (ne\u010dlen\u011bn\u00e9 m\u011bsto)",
+    "city_district": "Liberec I-Staré Město",
+    "city_post": "Liberec (nečleněné město)",
     "in": "16415345",
     "is_person": true,
     "legal_form_code": 101,
-    "house_number": "319\/16a",
-    "street": "Ruprechtick\u00e1",
+    "house_number": "319/16a",
+    "street": "Ruprechtická",
     "district": "Liberec",
     "tin": "CZ6207141193",
     "vat_payer": false,
     "zip": "46001",
-    "country": "\u010cesk\u00e1 republika",
+    "country": "Česká republika",
     "country_code": "CZ",
     "nace": [
         "55",
diff --git a/tests/fixtures/ares/25110161.json b/tests/fixtures/ares/25110161.json
index 4aa5e95..3dfba75 100644
--- a/tests/fixtures/ares/25110161.json
+++ b/tests/fixtures/ares/25110161.json
@@ -1,21 +1,21 @@
 {
     "active": true,
     "city": "Praha",
-    "company": "Kaufland \u010cesk\u00e1 republika v.o.s.",
+    "company": "Kaufland Česká republika v.o.s.",
     "created": "1997-03-10T00:00:00+01:00",
     "dissolved": null,
-    "city_district": "B\u0159evnov",
+    "city_district": "Břevnov",
     "city_post": "Praha 6",
     "in": "25110161",
     "is_person": false,
     "legal_form_code": 111,
-    "house_number": "2428\/203",
-    "street": "B\u011blohorsk\u00e1",
+    "house_number": "2428/203",
+    "street": "Bělohorská",
     "district": null,
     "tin": "CZ25110161",
     "vat_payer": true,
     "zip": "16900",
-    "country": "\u010cesk\u00e1 republika",
+    "country": "Česká republika",
     "country_code": "CZ",
     "nace": [
         "74",
diff --git a/tests/fixtures/ares/25596641.json b/tests/fixtures/ares/25596641.json
deleted file mode 100644
index e835179..0000000
--- a/tests/fixtures/ares/25596641.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "active": false,
-    "city": "Brno",
-    "company": "ZERO Brno s.r.o.",
-    "created": "2000-04-13T00:00:00+02:00",
-    "dissolved": "2009-05-26T00:00:00+02:00",
-    "city_district": null,
-    "city_post": null,
-    "in": "25596641",
-    "is_person": false,
-    "legal_form_code": 112,
-    "house_number": "24a",
-    "street": "K\u0159\u00eddlovick\u00e1",
-    "tin": null,
-    "vat_payer": false,
-    "zip": "60300",
-    "country": null,
-    "country_code": null,
-    "nace": [
-        "620"
-    ],
-    "sources": {
-        "stavZdrojeVr": "NEEXISTUJICI",
-        "stavZdrojeRes": "NEEXISTUJICI",
-        "stavZdrojeRzp": "NEEXISTUJICI",
-        "stavZdrojeNrpzs": "NEEXISTUJICI",
-        "stavZdrojeRcns": "NEEXISTUJICI",
-        "stavZdrojeRpsh": "NEEXISTUJICI",
-        "stavZdrojeRs": "NEEXISTUJICI",
-        "stavZdrojeSzr": "NEEXISTUJICI",
-        "stavZdrojeCeu": "NEEXISTUJICI",
-        "stavZdrojeDph": "NEEXISTUJICI",
-        "stavZdrojeIr": "NEEXISTUJICI",
-        "stavZdrojeRed": "NEEXISTUJICI"
-    }
-}
\ No newline at end of file
diff --git a/tests/fixtures/ares/26713250.json b/tests/fixtures/ares/26713250.json
index 956369e..130812d 100644
--- a/tests/fixtures/ares/26713250.json
+++ b/tests/fixtures/ares/26713250.json
@@ -4,18 +4,18 @@
     "company": "BARVY FRAMAR s.r.o.",
     "created": "2002-08-03T00:00:00+02:00",
     "dissolved": null,
-    "city_district": "Mod\u0159any",
+    "city_district": "Modřany",
     "city_post": "Praha 12",
     "in": "26713250",
     "is_person": false,
     "legal_form_code": 112,
-    "house_number": "1213\/4",
+    "house_number": "1213/4",
     "street": "Barrandova",
     "district": null,
     "tin": "CZ26713250",
     "vat_payer": true,
     "zip": "14300",
-    "country": "\u010cesk\u00e1 republika",
+    "country": "Česká republika",
     "country_code": "CZ",
     "nace": [
         "433",
diff --git a/tests/fixtures/ares/27082440.json b/tests/fixtures/ares/27082440.json
index b80df17..f42bb28 100644
--- a/tests/fixtures/ares/27082440.json
+++ b/tests/fixtures/ares/27082440.json
@@ -4,18 +4,18 @@
     "company": "Alza.cz a.s.",
     "created": "2003-08-26T00:00:00+02:00",
     "dissolved": null,
-    "city_district": "Hole\u0161ovice",
+    "city_district": "Holešovice",
     "city_post": "Praha 7",
     "in": "27082440",
     "is_person": false,
     "legal_form_code": 121,
-    "house_number": "1522\/53",
+    "house_number": "1522/53",
     "street": "Jankovcova",
     "district": null,
     "tin": "CZ27082440",
     "vat_payer": true,
     "zip": "17000",
-    "country": "\u010cesk\u00e1 republika",
+    "country": "Česká republika",
     "country_code": "CZ",
     "nace": [
         "461",
diff --git a/tests/fixtures/ares/27735753.json b/tests/fixtures/ares/27735753.json
index a61e599..4da06a7 100644
--- a/tests/fixtures/ares/27735753.json
+++ b/tests/fixtures/ares/27735753.json
@@ -1,21 +1,21 @@
 {
     "active": true,
-    "city": "Plze\u0148",
+    "city": "Plzeň",
     "company": "Yaroslav Boychuk",
     "created": null,
     "dissolved": null,
     "city_district": "Lobzy",
-    "city_post": "Plze\u0148 4",
+    "city_post": "Plzeň 4",
     "in": "27735753",
     "is_person": true,
     "legal_form_code": 101,
-    "house_number": "805\/12",
-    "street": "Partyz\u00e1nsk\u00e1",
-    "district": "Plze\u0148-m\u011bsto",
+    "house_number": "805/12",
+    "street": "Partyzánská",
+    "district": "Plzeň-město",
     "tin": "CZ8305253869",
     "vat_payer": true,
     "zip": "31200",
-    "country": "\u010cesk\u00e1 republika",
+    "country": "Česká republika",
     "country_code": "CZ",
     "nace": [
         "00",
diff --git a/tests/fixtures/ares/49240901.json b/tests/fixtures/ares/49240901.json
index 06e799d..73242e8 100644
--- a/tests/fixtures/ares/49240901.json
+++ b/tests/fixtures/ares/49240901.json
@@ -9,13 +9,13 @@
     "in": "49240901",
     "is_person": false,
     "legal_form_code": 121,
-    "house_number": "1716\/2b",
-    "street": "Hv\u011bzdova",
+    "house_number": "1716/2b",
+    "street": "Hvězdova",
     "district": null,
     "tin": "CZ699003154",
     "vat_payer": true,
     "zip": "14000",
-    "country": "\u010cesk\u00e1 republika",
+    "country": "Česká republika",
     "country_code": "CZ",
     "nace": [
         "64190"
diff --git a/tests/fixtures/ares/49812670.json b/tests/fixtures/ares/49812670.json
index de8c8ac..c823766 100644
--- a/tests/fixtures/ares/49812670.json
+++ b/tests/fixtures/ares/49812670.json
@@ -4,7 +4,7 @@
     "company": "H. A. C. spol. s r.o.",
     "created": "1993-09-06T00:00:00+02:00",
     "dissolved": null,
-    "city_district": "Semt\u00edn",
+    "city_district": "Semtín",
     "city_post": "Pardubice VII",
     "in": "49812670",
     "is_person": false,
@@ -15,7 +15,7 @@
     "tin": "CZ49812670",
     "vat_payer": true,
     "zip": "53353",
-    "country": "\u010cesk\u00e1 republika",
+    "country": "Česká republika",
     "country_code": "CZ",
     "nace": [
         "74",
diff --git a/tests/fixtures/ares/61682039.json b/tests/fixtures/ares/61682039.json
index 3ac0d88..72c131a 100644
--- a/tests/fixtures/ares/61682039.json
+++ b/tests/fixtures/ares/61682039.json
@@ -1,7 +1,7 @@
 {
     "active": true,
-    "city": "Brand\u00fds n\/L. - Star\u00e1 Boleslav",
-    "company": "101 Cestovn\u00ed kancel\u00e1\u0159 Zemek, s.r.o.",
+    "city": "Brandýs n/L. - Stará Boleslav",
+    "company": "101 Cestovní kancelář Zemek, s.r.o.",
     "created": "1995-07-28T00:00:00+02:00",
     "dissolved": null,
     "city_district": null,
@@ -10,12 +10,12 @@
     "is_person": false,
     "legal_form_code": 112,
     "house_number": null,
-    "street": "M\u011blnick\u00e1",
+    "street": "Mělnická",
     "district": null,
     "tin": "CZ61682039",
     "vat_payer": true,
     "zip": null,
-    "country": "\u010cesk\u00e1 republika",
+    "country": "Česká republika",
     "country_code": "CZ",
     "nace": [
         "471",
diff --git a/tests/fixtures/ares/62413686.json b/tests/fixtures/ares/62413686.json
index 1be5a0a..fb63077 100644
--- a/tests/fixtures/ares/62413686.json
+++ b/tests/fixtures/ares/62413686.json
@@ -1,21 +1,21 @@
 {
     "active": true,
     "city": "Praha",
-    "company": "ISMAJLER komanditn\u00ed spole\u010dnost",
+    "company": "ISMAJLER komanditní společnost",
     "created": "1995-10-18T00:00:00+01:00",
     "dissolved": null,
-    "city_district": "Libe\u0148",
+    "city_district": "Libeň",
     "city_post": "Praha 8",
     "in": "62413686",
     "is_person": false,
     "legal_form_code": 113,
-    "house_number": "1609\/2",
+    "house_number": "1609/2",
     "street": "Lindnerova",
     "district": null,
     "tin": null,
     "vat_payer": false,
     "zip": "18000",
-    "country": "\u010cesk\u00e1 republika",
+    "country": "Česká republika",
     "country_code": "CZ",
     "nace": [
         "46",
diff --git a/tests/fixtures/ares/67909442.json b/tests/fixtures/ares/67909442.json
index 36a04a9..3ae06a7 100644
--- a/tests/fixtures/ares/67909442.json
+++ b/tests/fixtures/ares/67909442.json
@@ -1,21 +1,21 @@
 {
     "active": true,
-    "city": "P\u0159\u00edbram",
-    "company": "Natalia \u0160uljakov\u00e1",
+    "city": "Příbram",
+    "company": "Natalia Šuljaková",
     "created": null,
     "dissolved": null,
-    "city_district": "P\u0159\u00edbram VII",
+    "city_district": "Příbram VII",
     "city_post": null,
     "in": "67909442",
     "is_person": true,
     "legal_form_code": 101,
     "house_number": "498",
     "street": "Jana Drdy",
-    "district": "P\u0159\u00edbram",
+    "district": "Příbram",
     "tin": null,
     "vat_payer": false,
     "zip": "26101",
-    "country": "\u010cesk\u00e1 republika",
+    "country": "Česká republika",
     "country_code": "CZ",
     "nace": [
         "00",
diff --git a/tests/fixtures/ares/87744473.json b/tests/fixtures/ares/87744473.json
index 88fd351..9086edd 100644
--- a/tests/fixtures/ares/87744473.json
+++ b/tests/fixtures/ares/87744473.json
@@ -1,21 +1,21 @@
 {
     "active": true,
-    "city": "Doln\u00ed Bousov",
-    "company": "Milan Mat\u011bj\u010dek",
+    "city": "Dolní Bousov",
+    "company": "Milan Matějček",
     "created": "2011-04-04T00:00:00+02:00",
     "dissolved": null,
-    "city_district": "Doln\u00ed Bousov",
+    "city_district": "Dolní Bousov",
     "city_post": null,
     "in": "87744473",
     "is_person": true,
     "legal_form_code": 101,
     "house_number": "765",
-    "street": "Dubov\u00e1",
-    "district": "Mlad\u00e1 Boleslav",
+    "street": "Dubová",
+    "district": "Mladá Boleslav",
     "tin": "CZ8612301071",
     "vat_payer": true,
     "zip": "29404",
-    "country": "\u010cesk\u00e1 republika",
+    "country": "Česká republika",
     "country_code": "CZ",
     "nace": [
         "461",
diff --git a/tests/fixtures/databox/00007064.json b/tests/fixtures/databox/00007064.json
new file mode 100644
index 0000000..80e115c
--- /dev/null
+++ b/tests/fixtures/databox/00007064.json
@@ -0,0 +1,274 @@
+[
+    {
+        "Ico": "00007064",
+        "NazevOsoby": "Ministerstvo vnitra",
+        "ISDS": "6bnaawp",
+        "PDZ": "false",
+        "TypSubjektu": "OVM",
+        "AdresaSidla": {
+            "AdresaTextem": "Nad štolou 936/3, Holešovice, 17000, Praha 7",
+            "OkresNazev": {},
+            "ObecNazev": "Praha 7",
+            "CastObceNazev": "Holešovice",
+            "UliceNazev": "Nad štolou",
+            "PostaKod": "17000",
+            "CisloDomovni": "936",
+            "CisloOrientacni": "3"
+        }
+    },
+    {
+        "Ico": "00007064",
+        "NazevOsoby": "P.O.Box 35, Praha 616 (Ministerstvo vnitra)",
+        "ISDS": "265vfsh",
+        "PDZ": "false",
+        "TypSubjektu": "OVM_REQ",
+        "AdresaSidla": {
+            "AdresaTextem": "Nad štolou 936/3, Holešovice, 17000, Praha 7",
+            "OkresNazev": {},
+            "ObecNazev": "Praha 7",
+            "CastObceNazev": "Holešovice",
+            "UliceNazev": "Nad štolou",
+            "PostaKod": "17000",
+            "CisloDomovni": "936",
+            "CisloOrientacni": "3"
+        }
+    },
+    {
+        "Ico": "00007064",
+        "NazevOsoby": "sekce pro státní službu (Ministerstvo vnitra)",
+        "ISDS": "9iutsan",
+        "PDZ": "false",
+        "TypSubjektu": "OVM_REQ",
+        "AdresaSidla": {
+            "AdresaTextem": "Jindřišská 967/34, Nové Město, 11000, Praha 1",
+            "OkresNazev": {},
+            "ObecNazev": "Praha 1",
+            "CastObceNazev": "Nové Město",
+            "UliceNazev": "Jindřišská",
+            "PostaKod": "11000",
+            "CisloDomovni": "967",
+            "CisloOrientacni": "34"
+        }
+    },
+    {
+        "Ico": "00007064",
+        "NazevOsoby": "sekce státního tajemníka (Ministerstvo vnitra)",
+        "ISDS": "krk34e3",
+        "PDZ": "false",
+        "TypSubjektu": "OVM_REQ",
+        "AdresaSidla": {
+            "AdresaTextem": "Nad štolou 936/3, Holešovice, 17000, Praha 7",
+            "OkresNazev": {},
+            "ObecNazev": "Praha 7",
+            "CastObceNazev": "Holešovice",
+            "UliceNazev": "Nad štolou",
+            "PostaKod": "17000",
+            "CisloDomovni": "936",
+            "CisloOrientacni": "3"
+        }
+    },
+    {
+        "Ico": "00007064",
+        "NazevOsoby": "Komunikace mezi EKIS MV a ISoSS (Ministerstvo vnitra)",
+        "ISDS": "t88358j",
+        "PDZ": "false",
+        "TypSubjektu": "OVM_REQ",
+        "AdresaSidla": {
+            "AdresaTextem": "Na Pankráci 1623/72, 14000, Praha",
+            "OkresNazev": {},
+            "ObecNazev": "Praha",
+            "CastObceNazev": {},
+            "UliceNazev": "Na Pankráci",
+            "PostaKod": "14000",
+            "CisloDomovni": "1623",
+            "CisloOrientacni": "72"
+        }
+    },
+    {
+        "Ico": "00007064",
+        "NazevOsoby": "Odbor provozu a rozvoje EKIS (Ministerstvo vnitra)",
+        "ISDS": "v522hjw",
+        "PDZ": "false",
+        "TypSubjektu": "OVM_REQ",
+        "AdresaSidla": {
+            "AdresaTextem": "Na Pankráci 1623/72, Nusle, 14000, Praha 4",
+            "OkresNazev": {},
+            "ObecNazev": "Praha 4",
+            "CastObceNazev": "Nusle",
+            "UliceNazev": "Na Pankráci",
+            "PostaKod": "14000",
+            "CisloDomovni": "1623",
+            "CisloOrientacni": "72"
+        }
+    },
+    {
+        "Ico": "00007064",
+        "NazevOsoby": "P.O.BOX 69, Praha 4 (Ministerstvo vnitra)",
+        "ISDS": "eck76yk",
+        "PDZ": "false",
+        "TypSubjektu": "OVM_REQ",
+        "AdresaSidla": {
+            "AdresaTextem": "Na strži 1709/42, Krč, 14000, Praha",
+            "OkresNazev": {},
+            "ObecNazev": "Praha",
+            "CastObceNazev": "Krč",
+            "UliceNazev": "Na strži",
+            "PostaKod": "14000",
+            "CisloDomovni": "1709",
+            "CisloOrientacni": "42"
+        }
+    },
+    {
+        "Ico": "00007064",
+        "NazevOsoby": "Centrum zajištěných aktiv Ministerstva vnitra (Ministerstvo vnitra)",
+        "ISDS": "v3p745b",
+        "PDZ": "false",
+        "TypSubjektu": "OVM_REQ",
+        "AdresaSidla": {
+            "AdresaTextem": "Na Pankráci 1623/72, Nusle, 14000, Praha 4",
+            "OkresNazev": {},
+            "ObecNazev": "Praha 4",
+            "CastObceNazev": "Nusle",
+            "UliceNazev": "Na Pankráci",
+            "PostaKod": "14000",
+            "CisloDomovni": "1623",
+            "CisloOrientacni": "72"
+        }
+    },
+    {
+        "Ico": "00007064",
+        "NazevOsoby": "P.O.BOX 92, Praha 74 (Ministerstvo vnitra)",
+        "ISDS": "tvz75mf",
+        "PDZ": "false",
+        "TypSubjektu": "OVM_REQ",
+        "AdresaSidla": {
+            "AdresaTextem": "Dělnická 213/8, Holešovice, 17000, Praha",
+            "OkresNazev": {},
+            "ObecNazev": "Praha",
+            "CastObceNazev": "Holešovice",
+            "UliceNazev": "Dělnická",
+            "PostaKod": "17000",
+            "CisloDomovni": "213",
+            "CisloOrientacni": "8"
+        }
+    },
+    {
+        "Ico": "00007064",
+        "NazevOsoby": "Dotační program na měkké cíle - Odbor bezpečnostní politiky (Ministerstvo vnitra)",
+        "ISDS": "f6wh3w8",
+        "PDZ": "false",
+        "TypSubjektu": "OVM_REQ",
+        "AdresaSidla": {
+            "AdresaTextem": "Nad štolou 936/3, Holešovice, 17000, Praha",
+            "OkresNazev": {},
+            "ObecNazev": "Praha",
+            "CastObceNazev": "Holešovice",
+            "UliceNazev": "Nad štolou",
+            "PostaKod": "17000",
+            "CisloDomovni": "936",
+            "CisloOrientacni": "3"
+        }
+    },
+    {
+        "Ico": "00007064",
+        "NazevOsoby": "Bezpečnostní sbory ČR (Ministerstvo vnitra)",
+        "ISDS": "g2jdsfa",
+        "PDZ": "false",
+        "TypSubjektu": "OVM_REQ",
+        "AdresaSidla": {
+            "AdresaTextem": "Nad štolou 936/3, Holešovice, 17000, Praha 7",
+            "OkresNazev": {},
+            "ObecNazev": "Praha 7",
+            "CastObceNazev": "Holešovice",
+            "UliceNazev": "Nad štolou",
+            "PostaKod": "17000",
+            "CisloDomovni": "936",
+            "CisloOrientacni": "3"
+        }
+    },
+    {
+        "Ico": "00007064",
+        "NazevOsoby": "P.O.Box 36 (Ministerstvo vnitra)",
+        "ISDS": "ujndxxk",
+        "PDZ": "false",
+        "TypSubjektu": "OVM_REQ",
+        "AdresaSidla": {
+            "AdresaTextem": "Nad Štolou 3, 17034, Praha 7",
+            "OkresNazev": {},
+            "ObecNazev": "Praha 7",
+            "CastObceNazev": {},
+            "UliceNazev": "Nad Štolou",
+            "PostaKod": "17034",
+            "CisloDomovni": "3",
+            "CisloOrientacni": {}
+        }
+    },
+    {
+        "Ico": "00007064",
+        "NazevOsoby": "Automat pro Sbírku právních předpisů územních samosprávných celků (Ministerstvo vnitra)",
+        "ISDS": "ci2xihx",
+        "PDZ": "false",
+        "TypSubjektu": "OVM_REQ",
+        "AdresaSidla": {
+            "AdresaTextem": "náměstí Hrdinů 1634/3, Nusle, 14000, Praha 4",
+            "OkresNazev": {},
+            "ObecNazev": "Praha 4",
+            "CastObceNazev": "Nusle",
+            "UliceNazev": "náměstí Hrdinů",
+            "PostaKod": "14000",
+            "CisloDomovni": "1634",
+            "CisloOrientacni": "3"
+        }
+    },
+    {
+        "Ico": "00007064",
+        "NazevOsoby": "P.O.Box 10 (Ministerstvo vnitra)",
+        "ISDS": "wgunyb8",
+        "PDZ": "false",
+        "TypSubjektu": "OVM_REQ",
+        "AdresaSidla": {
+            "AdresaTextem": "Nad Štolou 936/3, 17034, Praha 7",
+            "OkresNazev": {},
+            "ObecNazev": "Praha 7",
+            "CastObceNazev": {},
+            "UliceNazev": "Nad Štolou",
+            "PostaKod": "17034",
+            "CisloDomovni": "936",
+            "CisloOrientacni": "3"
+        }
+    },
+    {
+        "Ico": "00007064",
+        "NazevOsoby": "P.O.Box 2 (Ministerstvo vnitra)",
+        "ISDS": "fxpufij",
+        "PDZ": "false",
+        "TypSubjektu": "OVM_REQ",
+        "AdresaSidla": {
+            "AdresaTextem": "Nad Štolou 936/3, 17031, Praha 7",
+            "OkresNazev": {},
+            "ObecNazev": "Praha 7",
+            "CastObceNazev": {},
+            "UliceNazev": "Nad Štolou",
+            "PostaKod": "17031",
+            "CisloDomovni": "936",
+            "CisloOrientacni": "3"
+        }
+    },
+    {
+        "Ico": "00007064",
+        "NazevOsoby": "přihrádka 21/38 (Ministerstvo vnitra)",
+        "ISDS": "xdaun57",
+        "PDZ": "false",
+        "TypSubjektu": "OVM_REQ",
+        "AdresaSidla": {
+            "AdresaTextem": "Nad štolou 936/3, 17034, Praha 7",
+            "OkresNazev": {},
+            "ObecNazev": "Praha 7",
+            "CastObceNazev": {},
+            "UliceNazev": "Nad štolou",
+            "PostaKod": "17034",
+            "CisloDomovni": "936",
+            "CisloOrientacni": "3"
+        }
+    }
+]
\ No newline at end of file
diff --git a/tests/fixtures/databox/27082440.json b/tests/fixtures/databox/27082440.json
new file mode 100644
index 0000000..ea02de2
--- /dev/null
+++ b/tests/fixtures/databox/27082440.json
@@ -0,0 +1,19 @@
+[
+    {
+        "Ico": "27082440",
+        "NazevOsoby": "Alza.cz a.s.",
+        "ISDS": "xtkcrkz",
+        "PDZ": "true",
+        "TypSubjektu": "PO",
+        "AdresaSidla": {
+            "AdresaTextem": "Jankovcova 1522/53, Holešovice, 17000, Praha 7",
+            "OkresNazev": {},
+            "ObecNazev": "Praha 7",
+            "CastObceNazev": "Holešovice",
+            "UliceNazev": "Jankovcova",
+            "PostaKod": "17000",
+            "CisloDomovni": "1522",
+            "CisloOrientacni": "53"
+        }
+    }
+]
\ No newline at end of file
diff --git a/tests/src/E2E/AdisTest.php b/tests/src/E2E/AdisTest.php
index 230348b..f9ced96 100644
--- a/tests/src/E2E/AdisTest.php
+++ b/tests/src/E2E/AdisTest.php
@@ -5,13 +5,20 @@
 use h4kuna;
 use h4kuna\Ares;
 use h4kuna\Ares\Tests\TestCase;
-use Nette\Utils\Json;
 use Tester\Assert;
 
 require_once __DIR__ . '/../../bootstrap.php';
 
 final class AdisTest extends TestCase
 {
+	use Ares\Tests\UseStoredFile;
+
+	protected static function getMask(): string
+	{
+		return __DIR__ . '/../../fixtures/adis/%file%.json';
+	}
+
+
 	/**
 	 * @return array<mixed>
 	 */
@@ -37,7 +44,7 @@ public function testOneTin(string $tin): void
 
 		$subject = $adis->statusBusinessSubject($tin);
 		Assert::type(Ares\Adis\StatusBusinessSubjects\Subject::class, $subject);
-		Assert::equal(loadResult("adis/$subject->tin"), Json::decode(Json::encode($subject)));
+		$this->assertFile($subject->tin, $subject);
 	}
 
 
@@ -57,7 +64,7 @@ public function testMulti(): void
 		$results = [];
 		foreach ($adis->statusBusinessSubjects($tins) as $name => $subject) {
 			Assert::type(Ares\Adis\StatusBusinessSubjects\Subject::class, $subject);
-			Assert::equal(loadResult("adis/$subject->tin"), Json::decode(Json::encode($subject)));
+			$this->assertFile($subject->tin, $subject);
 			$results[$name] = $subject;
 		}
 
diff --git a/tests/src/E2E/Ares/CoreTest.php b/tests/src/E2E/Ares/CoreTest.php
index ec741db..b1a44e7 100644
--- a/tests/src/E2E/Ares/CoreTest.php
+++ b/tests/src/E2E/Ares/CoreTest.php
@@ -5,7 +5,6 @@
 use h4kuna;
 use h4kuna\Ares;
 use h4kuna\Ares\Tests\TestCase;
-use Nette\Utils\Json;
 use Tester\Assert;
 
 require_once __DIR__ . '/../../../bootstrap.php';
@@ -15,6 +14,14 @@
  */
 final class CoreTest extends TestCase
 {
+	use Ares\Tests\UseStoredFile;
+
+	protected static function getMask(): string
+	{
+		return __DIR__ . '/../../../fixtures/ares/%file%.json';
+	}
+
+
 	/**
 	 * @return array<array<string>>
 	 */
@@ -46,9 +53,8 @@ protected function provideCore(): array
 	public function testCore(string $in): void
 	{
 		$data = (new Ares\AresFactory())->create()->loadBasic($in);
-		$json = Json::decode(Json::encode($data));
-		sort($json->nace, SORT_NUMERIC); // @phpstan-ignore-line
-		Assert::equal(loadResult("ares/$data->in"), $json);
+		sort($data->nace, SORT_NUMERIC); // @phpstan-ignore-line
+		$this->assertFile($data->in, $data);
 	}
 
 
diff --git a/tests/src/E2E/DataBox/00007064.ser b/tests/src/E2E/DataBox/00007064.ser
deleted file mode 100644
index 6de6598..0000000
--- a/tests/src/E2E/DataBox/00007064.ser
+++ /dev/null
@@ -1 +0,0 @@
-a:16:{i:0;O:8:"stdClass":6:{s:3:"Ico";s:8:"00007064";s:10:"NazevOsoby";s:19:"Ministerstvo vnitra";s:4:"ISDS";s:7:"6bnaawp";s:3:"PDZ";s:5:"false";s:11:"TypSubjektu";s:3:"OVM";s:11:"AdresaSidla";O:8:"stdClass":8:{s:12:"AdresaTextem";s:46:"Nad štolou 936/3, Holešovice, 17000, Praha 7";s:10:"OkresNazev";O:8:"stdClass":0:{}s:9:"ObecNazev";s:7:"Praha 7";s:13:"CastObceNazev";s:11:"Holešovice";s:10:"UliceNazev";s:11:"Nad štolou";s:8:"PostaKod";s:5:"17000";s:12:"CisloDomovni";s:3:"936";s:15:"CisloOrientacni";s:1:"3";}}i:1;O:8:"stdClass":6:{s:3:"Ico";s:8:"00007064";s:10:"NazevOsoby";s:43:"P.O.Box 35, Praha 616 (Ministerstvo vnitra)";s:4:"ISDS";s:7:"265vfsh";s:3:"PDZ";s:5:"false";s:11:"TypSubjektu";s:7:"OVM_REQ";s:11:"AdresaSidla";O:8:"stdClass":8:{s:12:"AdresaTextem";s:46:"Nad štolou 936/3, Holešovice, 17000, Praha 7";s:10:"OkresNazev";O:8:"stdClass":0:{}s:9:"ObecNazev";s:7:"Praha 7";s:13:"CastObceNazev";s:11:"Holešovice";s:10:"UliceNazev";s:11:"Nad štolou";s:8:"PostaKod";s:5:"17000";s:12:"CisloDomovni";s:3:"936";s:15:"CisloOrientacni";s:1:"3";}}i:2;O:8:"stdClass":6:{s:3:"Ico";s:8:"00007064";s:10:"NazevOsoby";s:53:"Komunikace mezi EKIS MV a ISoSS (Ministerstvo vnitra)";s:4:"ISDS";s:7:"t88358j";s:3:"PDZ";s:5:"false";s:11:"TypSubjektu";s:7:"OVM_REQ";s:11:"AdresaSidla";O:8:"stdClass":8:{s:12:"AdresaTextem";s:34:"Na Pankráci 1623/72, 14000, Praha";s:10:"OkresNazev";O:8:"stdClass":0:{}s:9:"ObecNazev";s:5:"Praha";s:13:"CastObceNazev";O:8:"stdClass":0:{}s:10:"UliceNazev";s:12:"Na Pankráci";s:8:"PostaKod";s:5:"14000";s:12:"CisloDomovni";s:4:"1623";s:15:"CisloOrientacni";s:2:"72";}}i:3;O:8:"stdClass":6:{s:3:"Ico";s:8:"00007064";s:10:"NazevOsoby";s:50:"Odbor provozu a rozvoje EKIS (Ministerstvo vnitra)";s:4:"ISDS";s:7:"v522hjw";s:3:"PDZ";s:5:"false";s:11:"TypSubjektu";s:7:"OVM_REQ";s:11:"AdresaSidla";O:8:"stdClass":8:{s:12:"AdresaTextem";s:43:"Na Pankráci 1623/72, Nusle, 14000, Praha 4";s:10:"OkresNazev";O:8:"stdClass":0:{}s:9:"ObecNazev";s:7:"Praha 4";s:13:"CastObceNazev";s:5:"Nusle";s:10:"UliceNazev";s:12:"Na Pankráci";s:8:"PostaKod";s:5:"14000";s:12:"CisloDomovni";s:4:"1623";s:15:"CisloOrientacni";s:2:"72";}}i:4;O:8:"stdClass":6:{s:3:"Ico";s:8:"00007064";s:10:"NazevOsoby";s:48:"sekce pro státní službu (Ministerstvo vnitra)";s:4:"ISDS";s:7:"9iutsan";s:3:"PDZ";s:5:"false";s:11:"TypSubjektu";s:7:"OVM_REQ";s:11:"AdresaSidla";O:8:"stdClass":8:{s:12:"AdresaTextem";s:50:"Jindřišská 967/34, Nové Město, 11000, Praha 1";s:10:"OkresNazev";O:8:"stdClass":0:{}s:9:"ObecNazev";s:7:"Praha 1";s:13:"CastObceNazev";s:12:"Nové Město";s:10:"UliceNazev";s:13:"Jindřišská";s:8:"PostaKod";s:5:"11000";s:12:"CisloDomovni";s:3:"967";s:15:"CisloOrientacni";s:2:"34";}}i:5;O:8:"stdClass":6:{s:3:"Ico";s:8:"00007064";s:10:"NazevOsoby";s:49:"sekce státního tajemníka (Ministerstvo vnitra)";s:4:"ISDS";s:7:"krk34e3";s:3:"PDZ";s:5:"false";s:11:"TypSubjektu";s:7:"OVM_REQ";s:11:"AdresaSidla";O:8:"stdClass":8:{s:12:"AdresaTextem";s:46:"Nad štolou 936/3, Holešovice, 17000, Praha 7";s:10:"OkresNazev";O:8:"stdClass":0:{}s:9:"ObecNazev";s:7:"Praha 7";s:13:"CastObceNazev";s:11:"Holešovice";s:10:"UliceNazev";s:11:"Nad štolou";s:8:"PostaKod";s:5:"17000";s:12:"CisloDomovni";s:3:"936";s:15:"CisloOrientacni";s:1:"3";}}i:6;O:8:"stdClass":6:{s:3:"Ico";s:8:"00007064";s:10:"NazevOsoby";s:41:"P.O.BOX 69, Praha 4 (Ministerstvo vnitra)";s:4:"ISDS";s:7:"eck76yk";s:3:"PDZ";s:5:"false";s:11:"TypSubjektu";s:7:"OVM_REQ";s:11:"AdresaSidla";O:8:"stdClass":8:{s:12:"AdresaTextem";s:37:"Na strži 1709/42, Krč, 14000, Praha";s:10:"OkresNazev";O:8:"stdClass":0:{}s:9:"ObecNazev";s:5:"Praha";s:13:"CastObceNazev";s:4:"Krč";s:10:"UliceNazev";s:9:"Na strži";s:8:"PostaKod";s:5:"14000";s:12:"CisloDomovni";s:4:"1709";s:15:"CisloOrientacni";s:2:"42";}}i:7;O:8:"stdClass":6:{s:3:"Ico";s:8:"00007064";s:10:"NazevOsoby";s:70:"Centrum zajištěných aktiv Ministerstva vnitra (Ministerstvo vnitra)";s:4:"ISDS";s:7:"v3p745b";s:3:"PDZ";s:5:"false";s:11:"TypSubjektu";s:7:"OVM_REQ";s:11:"AdresaSidla";O:8:"stdClass":8:{s:12:"AdresaTextem";s:43:"Na Pankráci 1623/72, Nusle, 14000, Praha 4";s:10:"OkresNazev";O:8:"stdClass":0:{}s:9:"ObecNazev";s:7:"Praha 4";s:13:"CastObceNazev";s:5:"Nusle";s:10:"UliceNazev";s:12:"Na Pankráci";s:8:"PostaKod";s:5:"14000";s:12:"CisloDomovni";s:4:"1623";s:15:"CisloOrientacni";s:2:"72";}}i:8;O:8:"stdClass":6:{s:3:"Ico";s:8:"00007064";s:10:"NazevOsoby";s:42:"P.O.BOX 92, Praha 74 (Ministerstvo vnitra)";s:4:"ISDS";s:7:"tvz75mf";s:3:"PDZ";s:5:"false";s:11:"TypSubjektu";s:7:"OVM_REQ";s:11:"AdresaSidla";O:8:"stdClass":8:{s:12:"AdresaTextem";s:43:"Dělnická 213/8, Holešovice, 17000, Praha";s:10:"OkresNazev";O:8:"stdClass":0:{}s:9:"ObecNazev";s:5:"Praha";s:13:"CastObceNazev";s:11:"Holešovice";s:10:"UliceNazev";s:10:"Dělnická";s:8:"PostaKod";s:5:"17000";s:12:"CisloDomovni";s:3:"213";s:15:"CisloOrientacni";s:1:"8";}}i:9;O:8:"stdClass":6:{s:3:"Ico";s:8:"00007064";s:10:"NazevOsoby";s:88:"Dotační program na měkké cíle - Odbor bezpečnostní politiky (Ministerstvo vnitra)";s:4:"ISDS";s:7:"f6wh3w8";s:3:"PDZ";s:5:"false";s:11:"TypSubjektu";s:7:"OVM_REQ";s:11:"AdresaSidla";O:8:"stdClass":8:{s:12:"AdresaTextem";s:44:"Nad štolou 936/3, Holešovice, 17000, Praha";s:10:"OkresNazev";O:8:"stdClass":0:{}s:9:"ObecNazev";s:5:"Praha";s:13:"CastObceNazev";s:11:"Holešovice";s:10:"UliceNazev";s:11:"Nad štolou";s:8:"PostaKod";s:5:"17000";s:12:"CisloDomovni";s:3:"936";s:15:"CisloOrientacni";s:1:"3";}}i:10;O:8:"stdClass":6:{s:3:"Ico";s:8:"00007064";s:10:"NazevOsoby";s:46:"Bezpečnostní sbory ČR (Ministerstvo vnitra)";s:4:"ISDS";s:7:"g2jdsfa";s:3:"PDZ";s:5:"false";s:11:"TypSubjektu";s:7:"OVM_REQ";s:11:"AdresaSidla";O:8:"stdClass":8:{s:12:"AdresaTextem";s:46:"Nad štolou 936/3, Holešovice, 17000, Praha 7";s:10:"OkresNazev";O:8:"stdClass":0:{}s:9:"ObecNazev";s:7:"Praha 7";s:13:"CastObceNazev";s:11:"Holešovice";s:10:"UliceNazev";s:11:"Nad štolou";s:8:"PostaKod";s:5:"17000";s:12:"CisloDomovni";s:3:"936";s:15:"CisloOrientacni";s:1:"3";}}i:11;O:8:"stdClass":6:{s:3:"Ico";s:8:"00007064";s:10:"NazevOsoby";s:32:"P.O.Box 36 (Ministerstvo vnitra)";s:4:"ISDS";s:7:"ujndxxk";s:3:"PDZ";s:5:"false";s:11:"TypSubjektu";s:7:"OVM_REQ";s:11:"AdresaSidla";O:8:"stdClass":8:{s:12:"AdresaTextem";s:29:"Nad Štolou 3, 17034, Praha 7";s:10:"OkresNazev";O:8:"stdClass":0:{}s:9:"ObecNazev";s:7:"Praha 7";s:13:"CastObceNazev";O:8:"stdClass":0:{}s:10:"UliceNazev";s:11:"Nad Štolou";s:8:"PostaKod";s:5:"17034";s:12:"CisloDomovni";s:1:"3";s:15:"CisloOrientacni";O:8:"stdClass":0:{}}}i:12;O:8:"stdClass":6:{s:3:"Ico";s:8:"00007064";s:10:"NazevOsoby";s:97:"Automat pro Sbírku právních předpisů územních samosprávných celků (Ministerstvo vnitra)";s:4:"ISDS";s:7:"ci2xihx";s:3:"PDZ";s:5:"false";s:11:"TypSubjektu";s:7:"OVM_REQ";s:11:"AdresaSidla";O:8:"stdClass":8:{s:12:"AdresaTextem";s:48:"náměstí Hrdinů 1634/3, Nusle, 14000, Praha 4";s:10:"OkresNazev";O:8:"stdClass":0:{}s:9:"ObecNazev";s:7:"Praha 4";s:13:"CastObceNazev";s:5:"Nusle";s:10:"UliceNazev";s:18:"náměstí Hrdinů";s:8:"PostaKod";s:5:"14000";s:12:"CisloDomovni";s:4:"1634";s:15:"CisloOrientacni";s:1:"3";}}i:13;O:8:"stdClass":6:{s:3:"Ico";s:8:"00007064";s:10:"NazevOsoby";s:32:"P.O.Box 10 (Ministerstvo vnitra)";s:4:"ISDS";s:7:"wgunyb8";s:3:"PDZ";s:5:"false";s:11:"TypSubjektu";s:7:"OVM_REQ";s:11:"AdresaSidla";O:8:"stdClass":8:{s:12:"AdresaTextem";s:33:"Nad Štolou 936/3, 17034, Praha 7";s:10:"OkresNazev";O:8:"stdClass":0:{}s:9:"ObecNazev";s:7:"Praha 7";s:13:"CastObceNazev";O:8:"stdClass":0:{}s:10:"UliceNazev";s:11:"Nad Štolou";s:8:"PostaKod";s:5:"17034";s:12:"CisloDomovni";s:3:"936";s:15:"CisloOrientacni";s:1:"3";}}i:14;O:8:"stdClass":6:{s:3:"Ico";s:8:"00007064";s:10:"NazevOsoby";s:31:"P.O.Box 2 (Ministerstvo vnitra)";s:4:"ISDS";s:7:"fxpufij";s:3:"PDZ";s:5:"false";s:11:"TypSubjektu";s:7:"OVM_REQ";s:11:"AdresaSidla";O:8:"stdClass":8:{s:12:"AdresaTextem";s:33:"Nad Štolou 936/3, 17031, Praha 7";s:10:"OkresNazev";O:8:"stdClass":0:{}s:9:"ObecNazev";s:7:"Praha 7";s:13:"CastObceNazev";O:8:"stdClass":0:{}s:10:"UliceNazev";s:11:"Nad Štolou";s:8:"PostaKod";s:5:"17031";s:12:"CisloDomovni";s:3:"936";s:15:"CisloOrientacni";s:1:"3";}}i:15;O:8:"stdClass":6:{s:3:"Ico";s:8:"00007064";s:10:"NazevOsoby";s:39:"přihrádka 21/38 (Ministerstvo vnitra)";s:4:"ISDS";s:7:"xdaun57";s:3:"PDZ";s:5:"false";s:11:"TypSubjektu";s:7:"OVM_REQ";s:11:"AdresaSidla";O:8:"stdClass":8:{s:12:"AdresaTextem";s:33:"Nad štolou 936/3, 17034, Praha 7";s:10:"OkresNazev";O:8:"stdClass":0:{}s:9:"ObecNazev";s:7:"Praha 7";s:13:"CastObceNazev";O:8:"stdClass":0:{}s:10:"UliceNazev";s:11:"Nad štolou";s:8:"PostaKod";s:5:"17034";s:12:"CisloDomovni";s:3:"936";s:15:"CisloOrientacni";s:1:"3";}}}
\ No newline at end of file
diff --git a/tests/src/E2E/DataBox/27082440.ser b/tests/src/E2E/DataBox/27082440.ser
deleted file mode 100644
index 214c1c1..0000000
--- a/tests/src/E2E/DataBox/27082440.ser
+++ /dev/null
@@ -1 +0,0 @@
-a:1:{i:0;O:8:"stdClass":6:{s:3:"Ico";s:8:"27082440";s:10:"NazevOsoby";s:12:"Alza.cz a.s.";s:4:"ISDS";s:7:"xtkcrkz";s:3:"PDZ";s:4:"true";s:11:"TypSubjektu";s:2:"PO";s:11:"AdresaSidla";O:8:"stdClass":8:{s:12:"AdresaTextem";s:47:"Jankovcova 1522/53, Holešovice, 17000, Praha 7";s:10:"OkresNazev";O:8:"stdClass":0:{}s:9:"ObecNazev";s:7:"Praha 7";s:13:"CastObceNazev";s:11:"Holešovice";s:10:"UliceNazev";s:10:"Jankovcova";s:8:"PostaKod";s:5:"17000";s:12:"CisloDomovni";s:4:"1522";s:15:"CisloOrientacni";s:2:"53";}}}
\ No newline at end of file
diff --git a/tests/src/E2E/DataBoxTest.php b/tests/src/E2E/DataBoxTest.php
index 4a6ace0..0a69e0e 100644
--- a/tests/src/E2E/DataBoxTest.php
+++ b/tests/src/E2E/DataBoxTest.php
@@ -4,7 +4,7 @@
 
 use h4kuna\Ares\AresFactory;
 use h4kuna\Ares\Tests\TestCase;
-use Tester\Assert;
+use h4kuna\Ares\Tests\UseStoredFile;
 
 require __DIR__ . '/../../bootstrap.php';
 
@@ -13,6 +13,13 @@
  */
 final class DataBoxTest extends TestCase
 {
+	use UseStoredFile;
+
+	protected static function getMask(): string
+	{
+		return __DIR__ . '/../../fixtures/databox/%file%.json';
+	}
+
 
 	/**
 	 * @dataProvider provideBasic
@@ -21,13 +28,7 @@ public function testBasic(string $in): void
 	{
 		$ares = (new AresFactory())->create();
 		$data = $ares->loadDataBox($in);
-		$file = __DIR__ . "/../E2E/DataBox/$in.ser";
-		$expected = unserialize(trim((string) file_get_contents($file)));
-		assert(is_array($expected));
-		foreach ($expected as $k => $v) {
-			// file_put_contents($file, serialize($data));
-			Assert::equal($v, $data[$k]);
-		}
+		$this->assertFile($in, $data);
 	}
 
 
diff --git a/tests/src/E2E/Vies/ClientTest.php b/tests/src/E2E/Vies/ClientTest.php
index 0a5f971..d0e7a62 100644
--- a/tests/src/E2E/Vies/ClientTest.php
+++ b/tests/src/E2E/Vies/ClientTest.php
@@ -69,7 +69,7 @@ public function assertCheckVat(string|Ares\Vies\ViesEntity $vatNumber, bool|Thro
 		try {
 			$response = $aresFactory->checkVatVies($vatNumber);
 		} catch (Ares\Exceptions\ServerResponseException $e) {
-			Assert::same('MS_UNAVAILABLE', $e->getMessage());
+			Assert::true(in_array($e->getMessage(), ['MS_UNAVAILABLE', 'MS_MAX_CONCURRENT_REQ'], true));
 			Environment::skip('VIES service is unavailable');
 			return;
 		}
diff --git a/tests/src/UseStoredFile.php b/tests/src/UseStoredFile.php
new file mode 100644
index 0000000..0bd3ba2
--- /dev/null
+++ b/tests/src/UseStoredFile.php
@@ -0,0 +1,43 @@
+<?php declare(strict_types=1);
+
+namespace h4kuna\Ares\Tests;
+
+use Nette\Utils\Json;
+use Tester\Assert;
+
+trait UseStoredFile
+{
+
+	protected function assertFile(string $filename, mixed $content): void
+	{
+		$filename = strtr($this->getMask(), ['%file%' => $filename]);
+		$extension = pathinfo($filename, PATHINFO_EXTENSION);
+		if (is_file($filename) === false) {
+			file_put_contents($filename, self::saveContent($content, $extension));
+		}
+
+		Assert::same(file_get_contents($filename), self::saveContent($content, $extension));
+	}
+
+
+	protected static function getMask(): string
+	{
+		return '%file%';
+	}
+
+
+	private static function saveContent(mixed $content, string $extension): string
+	{
+		if (is_string($content)) {
+			return $content;
+		}
+
+		$jsonReflection = new \ReflectionClass(Json::class);
+		$isOld = $jsonReflection->getMethod('encode')->getParameters()[1]->name === 'options';
+
+		return match ($extension) {
+			'json' => $isOld ? strtr(Json::encode($content, Json::PRETTY), ['\\/' => '/']) : Json::encode($content, true),
+			default => throw new \Exception('not implemented'),
+		};
+	}
+}