diff --git a/.travis.yml b/.travis.yml
index 52cdc29d..3bf8bcba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,6 @@ language: php
 sudo: false
 
 php:
-  - '7.2'
   - '7.3'
   - '7.4'
 
diff --git a/composer.json b/composer.json
index c0d3f694..96971a35 100644
--- a/composer.json
+++ b/composer.json
@@ -19,18 +19,18 @@
   },
   "require": {
     "roave/security-advisories": "dev-master",
-    "php": "~7.2 || ~7.3 || ~7.4",
+    "php": "~7.3 || ~7.4",
     "defuse/php-encryption": "^2.1",
     "phpmailer/phpmailer": "^6.0",
     "ademarre/binary-to-text-php": "dev-master",
     "phpseclib/phpseclib": "^2.0",
-    "klein/klein": "~2.1",
+    "klein/klein": "^2.1",
     "php-di/php-di": "^6.0",
-    "doctrine/common": "~v2.7",
-    "guzzlehttp/guzzle": "~6.3",
+    "doctrine/common": "^v2.7",
+    "guzzlehttp/guzzle": "^6.3",
     "monolog/monolog": "^1.23",
-    "symfony/debug" : "~v3.4",
-    "vlucas/phpdotenv" : "~v4.1",
+    "symfony/debug" : "^v3.4",
+    "vlucas/phpdotenv" : "^v4.1",
     "ext-pdo": "*",
     "ext-dom": "*",
     "ext-gd": "*",
@@ -43,13 +43,12 @@
     "league/fractal": "^0.18.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^6",
-    "phpunit/dbunit": "^3",
-    "fzaninotto/faker": "~v1.8",
-    "fabpot/goutte": "~v3.2",
+    "phpunit/phpunit": "^9",
+    "fzaninotto/faker": "^v1.8",
+    "fabpot/goutte": "^v3.2",
     "syspass/extension-installer-plugin": "dev-develop",
     "syspass/plugin-authenticator": "dev-develop",
-    "nikic/php-parser": "~v4.1"
+    "nikic/php-parser": "^v4.1"
   },
   "suggest": {
     "syspass/plugin-authenticator": "^v2.1.0",
diff --git a/composer.lock b/composer.lock
index fbe2a135..a7e00864 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d0beb2259037e3877890966f6c84800a",
+    "content-hash": "9a8e71cf09ae131218ea991f02866741",
     "packages": [
         {
             "name": "ademarre/binary-to-text-php",
@@ -3277,28 +3277,29 @@
         },
         {
             "name": "phar-io/manifest",
-            "version": "1.0.1",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/manifest.git",
-                "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0"
+                "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/2df402786ab5368a0169091f61a7c1e0eb6852d0",
-                "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/85265efd3af7ba3ca4b2a2c34dbfc5788dd29133",
+                "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-phar": "*",
-                "phar-io/version": "^1.0.1",
-                "php": "^5.6 || ^7.0"
+                "ext-xmlwriter": "*",
+                "phar-io/version": "^3.0.1",
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
@@ -3332,24 +3333,24 @@
                 "issues": "https://github.com/phar-io/manifest/issues",
                 "source": "https://github.com/phar-io/manifest/tree/master"
             },
-            "time": "2017-03-05T18:14:27+00:00"
+            "time": "2020-06-27T14:33:11+00:00"
         },
         {
             "name": "phar-io/version",
-            "version": "1.0.1",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/version.git",
-                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df"
+                "reference": "726c026815142e4f8677b7cb7f2249c9ffb7ecae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df",
-                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/726c026815142e4f8677b7cb7f2249c9ffb7ecae",
+                "reference": "726c026815142e4f8677b7cb7f2249c9ffb7ecae",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0"
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "autoload": {
@@ -3381,9 +3382,9 @@
             "description": "Library for handling version information and constraints",
             "support": {
                 "issues": "https://github.com/phar-io/version/issues",
-                "source": "https://github.com/phar-io/version/tree/master"
+                "source": "https://github.com/phar-io/version/tree/3.0.3"
             },
-            "time": "2017-03-05T17:38:23+00:00"
+            "time": "2020-11-30T09:21:21+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",
@@ -3545,33 +3546,33 @@
         },
         {
             "name": "phpspec/prophecy",
-            "version": "v1.10.3",
+            "version": "1.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "451c3cd1418cf640de218914901e51b064abb093"
+                "reference": "8ce87516be71aae9b956f81906aaf0338e0d8a2d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093",
-                "reference": "451c3cd1418cf640de218914901e51b064abb093",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/8ce87516be71aae9b956f81906aaf0338e0d8a2d",
+                "reference": "8ce87516be71aae9b956f81906aaf0338e0d8a2d",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0",
-                "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0",
-                "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0"
+                "doctrine/instantiator": "^1.2",
+                "php": "^7.2 || ~8.0, <8.1",
+                "phpdocumentor/reflection-docblock": "^5.2",
+                "sebastian/comparator": "^3.0 || ^4.0",
+                "sebastian/recursion-context": "^3.0 || ^4.0"
             },
             "require-dev": {
-                "phpspec/phpspec": "^2.5 || ^3.2",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
+                "phpspec/phpspec": "^6.0",
+                "phpunit/phpunit": "^8.0 || ^9.0 <9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.10.x-dev"
+                    "dev-master": "1.11.x-dev"
                 }
             },
             "autoload": {
@@ -3606,103 +3607,50 @@
             ],
             "support": {
                 "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/v1.10.3"
+                "source": "https://github.com/phpspec/prophecy/tree/1.12.1"
             },
-            "time": "2020-03-05T15:02:03+00:00"
-        },
-        {
-            "name": "phpunit/dbunit",
-            "version": "3.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/dbunit.git",
-                "reference": "0fa4329e490480ab957fe7b1185ea0996ca11f44"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/dbunit/zipball/0fa4329e490480ab957fe7b1185ea0996ca11f44",
-                "reference": "0fa4329e490480ab957fe7b1185ea0996ca11f44",
-                "shasum": ""
-            },
-            "require": {
-                "ext-pdo": "*",
-                "ext-simplexml": "*",
-                "php": "^7.0",
-                "phpunit/phpunit": "^6.0",
-                "symfony/yaml": "^3.0 || ^4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "PHPUnit extension for database interaction testing",
-            "homepage": "https://github.com/sebastianbergmann/dbunit/",
-            "keywords": [
-                "database",
-                "testing",
-                "xunit"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/dbunit/issues",
-                "source": "https://github.com/sebastianbergmann/dbunit/tree/master"
-            },
-            "abandoned": true,
-            "time": "2018-01-23T13:32:26+00:00"
+            "time": "2020-09-29T09:10:42+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "5.3.2",
+            "version": "9.2.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "c89677919c5dd6d3b3852f230a663118762218ac"
+                "reference": "f3e026641cc91909d421802dd3ac7827ebfd97e1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c89677919c5dd6d3b3852f230a663118762218ac",
-                "reference": "c89677919c5dd6d3b3852f230a663118762218ac",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f3e026641cc91909d421802dd3ac7827ebfd97e1",
+                "reference": "f3e026641cc91909d421802dd3ac7827ebfd97e1",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
+                "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "php": "^7.0",
-                "phpunit/php-file-iterator": "^1.4.2",
-                "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-token-stream": "^2.0.1",
-                "sebastian/code-unit-reverse-lookup": "^1.0.1",
-                "sebastian/environment": "^3.0",
-                "sebastian/version": "^2.0.1",
-                "theseer/tokenizer": "^1.1"
+                "nikic/php-parser": "^4.10.2",
+                "php": ">=7.3",
+                "phpunit/php-file-iterator": "^3.0.3",
+                "phpunit/php-text-template": "^2.0.2",
+                "sebastian/code-unit-reverse-lookup": "^2.0.2",
+                "sebastian/complexity": "^2.0",
+                "sebastian/environment": "^5.1.2",
+                "sebastian/lines-of-code": "^1.0.3",
+                "sebastian/version": "^3.0.1",
+                "theseer/tokenizer": "^1.2.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "suggest": {
-                "ext-xdebug": "^2.5.5"
+                "ext-pcov": "*",
+                "ext-xdebug": "*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.3.x-dev"
+                    "dev-master": "9.2-dev"
                 }
             },
             "autoload": {
@@ -3730,31 +3678,40 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/5.3"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.5"
             },
-            "time": "2018-04-06T15:36:58+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-28T06:44:49+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "1.4.5",
+            "version": "3.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
+                "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
-                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/aa4be8575f26070b100fccb67faabb28f21f66f8",
+                "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4.x-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -3769,7 +3726,7 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
+                    "email": "sebastian@phpunit.de",
                     "role": "lead"
                 }
             ],
@@ -3780,30 +3737,106 @@
                 "iterator"
             ],
             "support": {
-                "irc": "irc://irc.freenode.net/phpunit",
                 "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/1.4.5"
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.5"
             },
-            "time": "2017-11-27T13:52:08+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T05:57:25+00:00"
         },
         {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.1",
+            "name": "phpunit/php-invoker",
+            "version": "3.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+                "url": "https://github.com/sebastianbergmann/php-invoker.git",
+                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
+                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "ext-pcntl": "*",
+                "phpunit/phpunit": "^9.3"
+            },
+            "suggest": {
+                "ext-pcntl": "*"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Invoke callables with a timeout",
+            "homepage": "https://github.com/sebastianbergmann/php-invoker/",
+            "keywords": [
+                "process"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
+                "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T05:58:55+00:00"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "2.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
+                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
             "autoload": {
                 "classmap": [
                     "src/"
@@ -3827,34 +3860,40 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
-                "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1"
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4"
             },
-            "time": "2015-06-21T13:50:34+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T05:33:50+00:00"
         },
         {
             "name": "phpunit/php-timer",
-            "version": "1.0.9",
+            "version": "5.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
+                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
+                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.3 || ^7.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -3869,7 +3908,7 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
+                    "email": "sebastian@phpunit.de",
                     "role": "lead"
                 }
             ],
@@ -3880,113 +3919,67 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-timer/issues",
-                "source": "https://github.com/sebastianbergmann/php-timer/tree/master"
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3"
             },
-            "time": "2017-02-26T11:10:40+00:00"
-        },
-        {
-            "name": "phpunit/php-token-stream",
-            "version": "2.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "791198a2c6254db10131eecfe8c06670700904db"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db",
-                "reference": "791198a2c6254db10131eecfe8c06670700904db",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": "^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.2.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
+            "funding": [
                 {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
                 }
             ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-            "keywords": [
-                "tokenizer"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/php-token-stream/issues",
-                "source": "https://github.com/sebastianbergmann/php-token-stream/tree/master"
-            },
-            "abandoned": true,
-            "time": "2017-11-27T05:48:46+00:00"
+            "time": "2020-10-26T13:16:10+00:00"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "6.5.14",
+            "version": "9.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "bac23fe7ff13dbdb461481f706f0e9fe746334b7"
+                "reference": "8e16c225d57c3d6808014df6b1dd7598d0a5bbbe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bac23fe7ff13dbdb461481f706f0e9fe746334b7",
-                "reference": "bac23fe7ff13dbdb461481f706f0e9fe746334b7",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8e16c225d57c3d6808014df6b1dd7598d0a5bbbe",
+                "reference": "8e16c225d57c3d6808014df6b1dd7598d0a5bbbe",
                 "shasum": ""
             },
             "require": {
+                "doctrine/instantiator": "^1.3.1",
                 "ext-dom": "*",
                 "ext-json": "*",
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
                 "ext-xml": "*",
-                "myclabs/deep-copy": "^1.6.1",
-                "phar-io/manifest": "^1.0.1",
-                "phar-io/version": "^1.0",
-                "php": "^7.0",
-                "phpspec/prophecy": "^1.7",
-                "phpunit/php-code-coverage": "^5.3",
-                "phpunit/php-file-iterator": "^1.4.3",
-                "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-timer": "^1.0.9",
-                "phpunit/phpunit-mock-objects": "^5.0.9",
-                "sebastian/comparator": "^2.1",
-                "sebastian/diff": "^2.0",
-                "sebastian/environment": "^3.1",
-                "sebastian/exporter": "^3.1",
-                "sebastian/global-state": "^2.0",
-                "sebastian/object-enumerator": "^3.0.3",
-                "sebastian/resource-operations": "^1.0",
-                "sebastian/version": "^2.0.1"
-            },
-            "conflict": {
-                "phpdocumentor/reflection-docblock": "3.0.2",
-                "phpunit/dbunit": "<3.0"
+                "ext-xmlwriter": "*",
+                "myclabs/deep-copy": "^1.10.1",
+                "phar-io/manifest": "^2.0.1",
+                "phar-io/version": "^3.0.2",
+                "php": ">=7.3",
+                "phpspec/prophecy": "^1.12.1",
+                "phpunit/php-code-coverage": "^9.2.3",
+                "phpunit/php-file-iterator": "^3.0.5",
+                "phpunit/php-invoker": "^3.1.1",
+                "phpunit/php-text-template": "^2.0.3",
+                "phpunit/php-timer": "^5.0.2",
+                "sebastian/cli-parser": "^1.0.1",
+                "sebastian/code-unit": "^1.0.6",
+                "sebastian/comparator": "^4.0.5",
+                "sebastian/diff": "^4.0.3",
+                "sebastian/environment": "^5.1.3",
+                "sebastian/exporter": "^4.0.3",
+                "sebastian/global-state": "^5.0.1",
+                "sebastian/object-enumerator": "^4.0.3",
+                "sebastian/resource-operations": "^3.0.3",
+                "sebastian/type": "^2.3",
+                "sebastian/version": "^3.0.2"
             },
             "require-dev": {
-                "ext-pdo": "*"
+                "ext-pdo": "*",
+                "phpspec/prophecy-phpunit": "^2.0.1"
             },
             "suggest": {
-                "ext-xdebug": "*",
-                "phpunit/php-invoker": "^1.1"
+                "ext-soap": "*",
+                "ext-xdebug": "*"
             },
             "bin": [
                 "phpunit"
@@ -3994,12 +3987,15 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "6.5.x-dev"
+                    "dev-master": "9.5-dev"
                 }
             },
             "autoload": {
                 "classmap": [
                     "src/"
+                ],
+                "files": [
+                    "src/Framework/Assert/Functions.php"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -4022,43 +4018,44 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/6.5.14"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.0"
             },
-            "time": "2019-02-01T05:22:47+00:00"
+            "funding": [
+                {
+                    "url": "https://phpunit.de/donate.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-12-04T05:05:53+00:00"
         },
         {
-            "name": "phpunit/phpunit-mock-objects",
-            "version": "5.0.10",
+            "name": "sebastian/cli-parser",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f"
+                "url": "https://github.com/sebastianbergmann/cli-parser.git",
+                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/cd1cf05c553ecfec36b170070573e540b67d3f1f",
-                "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2",
+                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.0.5",
-                "php": "^7.0",
-                "phpunit/php-text-template": "^1.2.1",
-                "sebastian/exporter": "^3.1"
-            },
-            "conflict": {
-                "phpunit/phpunit": "<6.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.5.11"
-            },
-            "suggest": {
-                "ext-soap": "*"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0.x-dev"
+                    "dev-master": "1.0-dev"
                 }
             },
             "autoload": {
@@ -4077,43 +4074,100 @@
                     "role": "lead"
                 }
             ],
-            "description": "Mock Object library for PHPUnit",
-            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-            "keywords": [
-                "mock",
-                "xunit"
-            ],
+            "description": "Library for parsing CLI options",
+            "homepage": "https://github.com/sebastianbergmann/cli-parser",
             "support": {
-                "issues": "https://github.com/sebastianbergmann/phpunit-mock-objects/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit-mock-objects/tree/5.0.10"
+                "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1"
             },
-            "abandoned": true,
-            "time": "2018-08-09T05:50:03+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T06:08:49+00:00"
         },
         {
-            "name": "sebastian/code-unit-reverse-lookup",
-            "version": "1.0.2",
+            "name": "sebastian/code-unit",
+            "version": "1.0.8",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619"
+                "url": "https://github.com/sebastianbergmann/code-unit.git",
+                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619",
-                "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120",
+                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.6"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Collection of value objects that represent the PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/code-unit",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/code-unit/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:08:54+00:00"
+        },
+        {
+            "name": "sebastian/code-unit-reverse-lookup",
+            "version": "2.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
+                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
+                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -4135,7 +4189,7 @@
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2"
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3"
             },
             "funding": [
                 {
@@ -4143,34 +4197,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T08:15:22+00:00"
+            "time": "2020-09-28T05:30:19+00:00"
         },
         {
             "name": "sebastian/comparator",
-            "version": "2.1.3",
+            "version": "4.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9"
+                "reference": "55f4261989e546dc112258c7a75935a81a7ce382"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/34369daee48eafb2651bea869b4b15d75ccc35f9",
-                "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382",
+                "reference": "55f4261989e546dc112258c7a75935a81a7ce382",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0",
-                "sebastian/diff": "^2.0 || ^3.0",
-                "sebastian/exporter": "^3.1"
+                "php": ">=7.3",
+                "sebastian/diff": "^4.0",
+                "sebastian/exporter": "^4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.4"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1.x-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -4183,6 +4237,10 @@
                 "BSD-3-Clause"
             ],
             "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
                 {
                     "name": "Jeff Welch",
                     "email": "whatthejeff@gmail.com"
@@ -4194,10 +4252,6 @@
                 {
                     "name": "Bernhard Schussek",
                     "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
                 }
             ],
             "description": "Provides the functionality to compare PHP values for equality",
@@ -4209,29 +4263,36 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/master"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6"
             },
-            "time": "2018-02-01T13:46:46+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T15:49:45+00:00"
         },
         {
-            "name": "sebastian/diff",
-            "version": "2.0.1",
+            "name": "sebastian/complexity",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd"
+                "url": "https://github.com/sebastianbergmann/complexity.git",
+                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
-                "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88",
+                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0"
+                "nikic/php-parser": "^4.7",
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.2"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
@@ -4250,49 +4311,118 @@
             ],
             "authors": [
                 {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for calculating the complexity of PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/complexity",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/complexity/issues",
+                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T15:52:27+00:00"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "4.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d",
+                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3",
+                "symfony/process": "^4.2 || ^5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
                 {
                     "name": "Sebastian Bergmann",
                     "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
                 }
             ],
             "description": "Diff implementation",
             "homepage": "https://github.com/sebastianbergmann/diff",
             "keywords": [
-                "diff"
+                "diff",
+                "udiff",
+                "unidiff",
+                "unified diff"
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/master"
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
             },
-            "time": "2017-08-03T08:09:46+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:10:38+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "3.1.0",
+            "version": "5.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5"
+                "reference": "388b6ced16caa751030f6a69e588299fa09200ac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
-                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/388b6ced16caa751030f6a69e588299fa09200ac",
+                "reference": "388b6ced16caa751030f6a69e588299fa09200ac",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.1"
+                "phpunit/phpunit": "^9.3"
+            },
+            "suggest": {
+                "ext-posix": "*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1.x-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -4319,36 +4449,42 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/master"
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.3"
             },
-            "time": "2017-07-01T08:51:00+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T05:52:38+00:00"
         },
         {
             "name": "sebastian/exporter",
-            "version": "3.1.3",
+            "version": "4.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e"
+                "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/6b853149eab67d4da22291d36f5b0631c0fd856e",
-                "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/d89cc98761b8cb5a1a235a6b703ae50d34080e65",
+                "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0",
-                "sebastian/recursion-context": "^3.0"
+                "php": ">=7.3",
+                "sebastian/recursion-context": "^4.0"
             },
             "require-dev": {
                 "ext-mbstring": "*",
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1.x-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -4390,7 +4526,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.3"
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.3"
             },
             "funding": [
                 {
@@ -4398,27 +4534,30 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:47:53+00:00"
+            "time": "2020-09-28T05:24:23+00:00"
         },
         {
             "name": "sebastian/global-state",
-            "version": "2.0.0",
+            "version": "5.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4"
+                "reference": "a90ccbddffa067b51f574dea6eb25d5680839455"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
-                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/a90ccbddffa067b51f574dea6eb25d5680839455",
+                "reference": "a90ccbddffa067b51f574dea6eb25d5680839455",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0"
+                "php": ">=7.3",
+                "sebastian/object-reflector": "^2.0",
+                "sebastian/recursion-context": "^4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "ext-dom": "*",
+                "phpunit/phpunit": "^9.3"
             },
             "suggest": {
                 "ext-uopz": "*"
@@ -4426,7 +4565,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -4451,36 +4590,99 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/2.0.0"
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.2"
             },
-            "time": "2017-04-27T15:39:26+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T15:55:19+00:00"
         },
         {
-            "name": "sebastian/object-enumerator",
-            "version": "3.0.4",
+            "name": "sebastian/lines-of-code",
+            "version": "1.0.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2"
+                "url": "https://github.com/sebastianbergmann/lines-of-code.git",
+                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2",
-                "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc",
+                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0",
-                "sebastian/object-reflector": "^1.1.1",
-                "sebastian/recursion-context": "^3.0"
+                "nikic/php-parser": "^4.6",
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0.x-dev"
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for counting the lines of code in PHP source code",
+            "homepage": "https://github.com/sebastianbergmann/lines-of-code",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-28T06:42:11+00:00"
+        },
+        {
+            "name": "sebastian/object-enumerator",
+            "version": "4.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
+                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71",
+                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3",
+                "sebastian/object-reflector": "^2.0",
+                "sebastian/recursion-context": "^4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -4502,7 +4704,7 @@
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
-                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4"
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4"
             },
             "funding": [
                 {
@@ -4510,32 +4712,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:40:27+00:00"
+            "time": "2020-10-26T13:12:34+00:00"
         },
         {
             "name": "sebastian/object-reflector",
-            "version": "1.1.2",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d"
+                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d",
-                "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
+                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -4557,7 +4759,7 @@
             "homepage": "https://github.com/sebastianbergmann/object-reflector/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
-                "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2"
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4"
             },
             "funding": [
                 {
@@ -4565,32 +4767,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:37:18+00:00"
+            "time": "2020-10-26T13:14:26+00:00"
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "3.0.1",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb"
+                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb",
-                "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172",
+                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0.x-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -4620,7 +4822,7 @@
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1"
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4"
             },
             "funding": [
                 {
@@ -4628,29 +4830,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:34:24+00:00"
+            "time": "2020-10-26T13:17:30+00:00"
         },
         {
             "name": "sebastian/resource-operations",
-            "version": "1.0.0",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
+                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
+                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.6.0"
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -4672,31 +4877,93 @@
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
-                "source": "https://github.com/sebastianbergmann/resource-operations/tree/master"
+                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
             },
-            "time": "2015-07-28T20:34:47+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T06:45:17+00:00"
         },
         {
-            "name": "sebastian/version",
-            "version": "2.0.1",
+            "name": "sebastian/type",
+            "version": "2.3.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
+                "url": "https://github.com/sebastianbergmann/type.git",
+                "reference": "81cd61ab7bbf2de744aba0ea61fae32f721df3d2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/81cd61ab7bbf2de744aba0ea61fae32f721df3d2",
+                "reference": "81cd61ab7bbf2de744aba0ea61fae32f721df3d2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.6"
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "2.3-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Collection of value objects that represent the types of the PHP type system",
+            "homepage": "https://github.com/sebastianbergmann/type",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/type/issues",
+                "source": "https://github.com/sebastianbergmann/type/tree/2.3.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:18:59+00:00"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "3.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "c6c1022351a901512170118436c764e473f6de8c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c",
+                "reference": "c6c1022351a901512170118436c764e473f6de8c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -4719,9 +4986,15 @@
             "homepage": "https://github.com/sebastianbergmann/version",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/version/issues",
-                "source": "https://github.com/sebastianbergmann/version/tree/master"
+                "source": "https://github.com/sebastianbergmann/version/tree/3.0.2"
             },
-            "time": "2016-10-03T07:35:21+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T06:39:44+00:00"
         },
         {
             "name": "symfony/browser-kit",
@@ -5096,77 +5369,6 @@
             ],
             "time": "2020-10-23T14:02:19+00:00"
         },
-        {
-            "name": "symfony/yaml",
-            "version": "v4.4.17",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "7531361cf38e4816821b4a12a42542b3c6143ad1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/7531361cf38e4816821b4a12a42542b3c6143ad1",
-                "reference": "7531361cf38e4816821b4a12a42542b3c6143ad1",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1.3",
-                "symfony/polyfill-ctype": "~1.8"
-            },
-            "conflict": {
-                "symfony/console": "<3.4"
-            },
-            "require-dev": {
-                "symfony/console": "^3.4|^4.0|^5.0"
-            },
-            "suggest": {
-                "symfony/console": "For validating YAML files using the lint command"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/yaml/tree/v4.4.17"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-11-24T12:28:30+00:00"
-        },
         {
             "name": "syspass/extension-installer-plugin",
             "version": "dev-develop",
@@ -5375,7 +5577,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "~7.2 || ~7.3 || ~7.4",
+        "php": "~7.3 || ~7.4",
         "ext-pdo": "*",
         "ext-dom": "*",
         "ext-gd": "*",
diff --git a/lib/SP/Repositories/PublicLink/PublicLinkRepository.php b/lib/SP/Repositories/PublicLink/PublicLinkRepository.php
index 46a416d2..00499c5a 100644
--- a/lib/SP/Repositories/PublicLink/PublicLinkRepository.php
+++ b/lib/SP/Repositories/PublicLink/PublicLinkRepository.php
@@ -518,7 +518,6 @@ final class PublicLinkRepository extends Repository implements RepositoryItemInt
      * @return QueryResult
      * @throws ConstraintException
      * @throws QueryException
-     * @todo Update tests to include userId
      */
     public function getHashForItem($itemId)
     {
diff --git a/lib/SP/Storage/Database/DatabaseConnectionData.php b/lib/SP/Storage/Database/DatabaseConnectionData.php
index fb5009ef..29f045ae 100644
--- a/lib/SP/Storage/Database/DatabaseConnectionData.php
+++ b/lib/SP/Storage/Database/DatabaseConnectionData.php
@@ -65,7 +65,7 @@ final class DatabaseConnectionData
      */
     public static function getFromConfig(ConfigData $configData)
     {
-        return (new static())
+        return (new DatabaseConnectionData())
             ->setDbHost($configData->getDbHost())
             ->setDbName($configData->getDbName())
             ->setDbUser($configData->getDbUser())
diff --git a/tests/SP/Config/ConfigTest.php b/tests/SP/Config/ConfigTest.php
index 914e9db5..a53397f6 100644
--- a/tests/SP/Config/ConfigTest.php
+++ b/tests/SP/Config/ConfigTest.php
@@ -59,7 +59,7 @@ class ConfigTest extends TestCase
     /**
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         self::$dic = setupContext();
 
@@ -70,7 +70,7 @@ class ConfigTest extends TestCase
     /**
      * This method is called after the last test of this test class is run.
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
         // Restore to the initial state
         saveResource('config', 'config.xml', self::$currentConfig);
diff --git a/tests/SP/Core/Acl/AclTest.php b/tests/SP/Core/Acl/AclTest.php
index ccae5ac8..9d398d89 100644
--- a/tests/SP/Core/Acl/AclTest.php
+++ b/tests/SP/Core/Acl/AclTest.php
@@ -881,7 +881,7 @@ class AclTest extends TestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $dic = setupContext();
 
diff --git a/tests/SP/Core/Crypt/CryptPKITest.php b/tests/SP/Core/Crypt/CryptPKITest.php
index 96fc6cc9..2b3dc490 100644
--- a/tests/SP/Core/Crypt/CryptPKITest.php
+++ b/tests/SP/Core/Crypt/CryptPKITest.php
@@ -103,7 +103,7 @@ class CryptPKITest extends TestCase
 
         $this->assertNotEmpty($key);
 
-        $this->assertRegExp('/^-----BEGIN PUBLIC KEY-----.*/', $key);
+        $this->assertMatchesRegularExpression('/^-----BEGIN PUBLIC KEY-----.*/', $key);
     }
 
     /**
@@ -115,7 +115,7 @@ class CryptPKITest extends TestCase
 
         $this->assertNotEmpty($key);
 
-        $this->assertRegExp('/^-----BEGIN RSA PRIVATE KEY-----.*/', $key);
+        $this->assertMatchesRegularExpression('/^-----BEGIN RSA PRIVATE KEY-----.*/', $key);
     }
 
     /**
@@ -169,7 +169,7 @@ class CryptPKITest extends TestCase
      *
      * @throws SPException
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->cryptPki = new CryptPKI(new RSA());
     }
@@ -178,7 +178,7 @@ class CryptPKITest extends TestCase
      * Tears down the fixture, for example, close a network connection.
      * This method is called after a test is executed.
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         unlink(CryptPKI::PUBLIC_KEY_FILE);
         unlink(CryptPKI::PRIVATE_KEY_FILE);
diff --git a/tests/SP/Core/Crypt/SecureKeyCookieTest.php b/tests/SP/Core/Crypt/SecureKeyCookieTest.php
index fe0b584f..ab3a9f90 100644
--- a/tests/SP/Core/Crypt/SecureKeyCookieTest.php
+++ b/tests/SP/Core/Crypt/SecureKeyCookieTest.php
@@ -64,7 +64,7 @@ class SecureKeyCookieTest extends TestCase
             $data = $this->cookie->sign($text, $cypher);
 
             $this->assertNotEmpty($data);
-            $this->assertContains(';', $data);
+            $this->assertStringContainsString(';', $data);
             $this->assertEquals($text, $this->cookie->getCookieData($data, $cypher));
         }
     }
@@ -94,7 +94,7 @@ class SecureKeyCookieTest extends TestCase
      * Sets up the fixture, for example, open a network connection.
      * This method is called before a test is executed.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->cookie = SecureKeyCookie::factory(new Request(\Klein\Request::createFromGlobals()));
     }
diff --git a/tests/SP/Core/Crypt/VaultTest.php b/tests/SP/Core/Crypt/VaultTest.php
index a58c26c4..ac4b3e76 100644
--- a/tests/SP/Core/Crypt/VaultTest.php
+++ b/tests/SP/Core/Crypt/VaultTest.php
@@ -48,7 +48,7 @@ class VaultTest extends TestCase
      *
      * @throws EnvironmentIsBrokenException
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->key = PasswordUtil::generateRandomBytes();
     }
diff --git a/tests/SP/DatabaseTestCase.php b/tests/SP/DatabaseTestCase.php
index 8e5058f6..819e4e91 100644
--- a/tests/SP/DatabaseTestCase.php
+++ b/tests/SP/DatabaseTestCase.php
@@ -25,12 +25,8 @@
 namespace SP\Tests;
 
 use PDO;
-use PHPUnit\DbUnit\Database\DefaultConnection;
-use PHPUnit\DbUnit\DataSet\IDataSet;
-use PHPUnit\DbUnit\TestCaseTrait;
 use PHPUnit\Framework\TestCase;
-use SP\Core\Exceptions\SPException;
-use SP\Storage\Database\DatabaseConnectionData;
+use SP\Storage\Database\DatabaseException;
 
 /**
  * Class DatabaseBaseTest
@@ -41,51 +37,75 @@ use SP\Storage\Database\DatabaseConnectionData;
  */
 abstract class DatabaseTestCase extends TestCase
 {
-    use TestCaseTrait;
-
     /**
-     * @var DatabaseConnectionData
+     * @var bool
      */
-    protected static $databaseConnectionData;
-    /**
-     * @var string
-     */
-    protected static $dataset = 'syspass.xml';
+    protected static $loadFixtures = false;
     /**
      * @var PDO
      */
-    private static $pdo;
-    /**
-     * @var DefaultConnection
-     */
-    protected $conn;
+    private static $conn;
 
     /**
-     * Returns the test database connection.
+     * @param string $table
      *
-     * @return DefaultConnection
-     * @throws SPException
+     * @return int
      */
-    final public function getConnection()
+    protected static function getRowCount(string $table): int
     {
-        if ($this->conn === null) {
-            if (self::$pdo === null) {
-                self::$pdo = getDbHandler()->getConnection();
-            }
-
-            $this->conn = $this->createDefaultDBConnection(self::$pdo, 'syspass');
+        if (!self::$conn) {
+            return 0;
         }
 
-        return $this->conn;
+        $sql = sprintf('SELECT count(*) FROM `%s`', $table);
+
+        return (int)self::$conn->query($sql)->fetchColumn();
     }
 
-    /**
-     * Returns the test dataset.
-     *
-     * @return IDataSet
-     */
-    protected function getDataSet()
+    protected function setUp(): void
     {
-        return $this->createMySQLXMLDataSet(RESOURCE_DIR . DIRECTORY_SEPARATOR . 'datasets' . DIRECTORY_SEPARATOR . self::$dataset);
+        parent::setUp();
+
+        if (self::$loadFixtures) {
+            self::loadFixtures();
+        }
     }
+
+    protected static function loadFixtures()
+    {
+        foreach (FIXTURE_FILES as $file) {
+            $cmd = sprintf(
+                'mysql -h %s -u %s -p%s %s < %s',
+                getenv('DB_SERVER'),
+                getenv('DB_USER'),
+                getenv('DB_PASS'),
+                getenv('DB_NAME'),
+                $file
+            );
+
+            exec($cmd, $output, $res);
+
+            if ($res !== 0) {
+                error_log(sprintf('Cannot load fixtures from: %s', $file));
+                error_log(sprintf('CMD: %s', $cmd));
+                error_log(print_r($output, true));
+
+                exit(1);
+            }
+
+            printf('Fixtures loaded from: %s' . PHP_EOL, $file);
+        }
+
+        if (!self::$conn) {
+            try {
+                self::$conn = getDbHandler()->getConnection();
+            } catch (DatabaseException $e) {
+                processException($e);
+
+                exit(1);
+            }
+        }
+    }
+
+
 }
\ No newline at end of file
diff --git a/tests/SP/Mvc/Controller/Validators/PasswordValidatorTest.php b/tests/SP/Mvc/Controller/Validators/PasswordValidatorTest.php
index 906b7677..629199b4 100644
--- a/tests/SP/Mvc/Controller/Validators/PasswordValidatorTest.php
+++ b/tests/SP/Mvc/Controller/Validators/PasswordValidatorTest.php
@@ -142,7 +142,7 @@ class PasswordValidatorTest extends TestCase
      * Sets up the fixture, for example, open a network connection.
      * This method is called before a test is executed.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->password = new Password();
         $this->password->setLength(10);
diff --git a/tests/SP/Repositories/AccountFileRepositoryTest.php b/tests/SP/Repositories/AccountFileRepositoryTest.php
index 79e88a22..7f337936 100644
--- a/tests/SP/Repositories/AccountFileRepositoryTest.php
+++ b/tests/SP/Repositories/AccountFileRepositoryTest.php
@@ -33,7 +33,6 @@ use SP\DataModel\FileData;
 use SP\DataModel\FileExtData;
 use SP\DataModel\ItemSearchData;
 use SP\Repositories\Account\AccountFileRepository;
-use SP\Storage\Database\DatabaseConnectionData;
 use SP\Tests\DatabaseTestCase;
 use function SP\Tests\setupContext;
 
@@ -54,14 +53,11 @@ class AccountFileRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_accountFile.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(AccountFileRepository::class);
@@ -77,7 +73,7 @@ class AccountFileRepositoryTest extends DatabaseTestCase
         $this->assertEquals(1, self::$repository->delete(3));
         $this->assertEquals(0, self::$repository->delete(10));
 
-        $this->assertEquals(1, $this->conn->getRowCount('AccountFile'));
+        $this->assertEquals(1, self::getRowCount('AccountFile'));
     }
 
     /**
@@ -89,7 +85,7 @@ class AccountFileRepositoryTest extends DatabaseTestCase
         $this->assertEquals(2, self::$repository->deleteByIdBatch([1, 3, 10]));
         $this->assertEquals(0, self::$repository->deleteByIdBatch([]));
 
-        $this->assertEquals(1, $this->conn->getRowCount('AccountFile'));
+        $this->assertEquals(1, self::getRowCount('AccountFile'));
     }
 
     /**
@@ -193,7 +189,7 @@ class AccountFileRepositoryTest extends DatabaseTestCase
         $this->assertEquals($data->getContent(), $resultData->getContent());
         $this->assertEquals($data->getThumb(), $resultData->getThumb());
 
-        $this->assertEquals(4, $this->conn->getRowCount('AccountFile'));
+        $this->assertEquals(4, self::getRowCount('AccountFile'));
     }
 
     /**
diff --git a/tests/SP/Repositories/AccountHistoryRepositoryTest.php b/tests/SP/Repositories/AccountHistoryRepositoryTest.php
index e4ba914b..41ad7f9c 100644
--- a/tests/SP/Repositories/AccountHistoryRepositoryTest.php
+++ b/tests/SP/Repositories/AccountHistoryRepositoryTest.php
@@ -58,14 +58,11 @@ class AccountHistoryRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_accountHistory.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(AccountHistoryRepository::class);
@@ -81,7 +78,7 @@ class AccountHistoryRepositoryTest extends DatabaseTestCase
         $this->assertEquals(1, self::$repository->delete(3));
         $this->assertEquals(1, self::$repository->delete(4));
 
-        $this->assertEquals(3, $this->conn->getRowCount('AccountHistory'));
+        $this->assertEquals(3, self::getRowCount('AccountHistory'));
     }
 
     /**
@@ -160,7 +157,7 @@ class AccountHistoryRepositoryTest extends DatabaseTestCase
         $result = self::$repository->create(new AccountHistoryCreateDto(10, true, false, PasswordUtil::generateRandomBytes()));
         $this->assertEquals(0, $result);
 
-        $this->assertEquals(7, $this->conn->getRowCount('AccountHistory'));
+        $this->assertEquals(7, self::getRowCount('AccountHistory'));
     }
 
     /**
@@ -195,7 +192,7 @@ class AccountHistoryRepositoryTest extends DatabaseTestCase
         $this->assertEquals(3, self::$repository->deleteByIdBatch([1, 3, 4, 5]));
         $this->assertEquals(0, self::$repository->deleteByIdBatch([]));
 
-        $this->assertEquals(2, $this->conn->getRowCount('AccountHistory'));
+        $this->assertEquals(2, self::getRowCount('AccountHistory'));
     }
 
     /**
@@ -258,6 +255,6 @@ class AccountHistoryRepositoryTest extends DatabaseTestCase
 
         $this->assertEquals(0, self::$repository->deleteByAccountIdBatch([]));
 
-        $this->assertEquals(1, $this->conn->getRowCount('AccountHistory'));
+        $this->assertEquals(1, self::getRowCount('AccountHistory'));
     }
 }
diff --git a/tests/SP/Repositories/AccountRepositoryTest.php b/tests/SP/Repositories/AccountRepositoryTest.php
index 5d3d9b3f..29c00de9 100644
--- a/tests/SP/Repositories/AccountRepositoryTest.php
+++ b/tests/SP/Repositories/AccountRepositoryTest.php
@@ -66,14 +66,11 @@ class AccountRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_account.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(AccountRepository::class);
@@ -87,18 +84,18 @@ class AccountRepositoryTest extends DatabaseTestCase
     public function testDelete()
     {
         // Comprobar registros iniciales
-        $this->assertEquals(2, $this->conn->getRowCount('Account'));
+        $this->assertEquals(4, self::getRowCount('Account'));
 
         // Eliminar un registro y comprobar el total de registros
         $this->assertEquals(1, self::$repository->delete(1));
-        $this->assertEquals(1, $this->conn->getRowCount('Account'));
+        $this->assertEquals(3, self::getRowCount('Account'));
 
         // Eliminar un registro no existente
         $this->assertEquals(0, self::$repository->delete(100));
 
         // Eliminar un registro y comprobar el total de registros
         $this->assertEquals(1, self::$repository->delete(2));
-        $this->assertEquals(0, $this->conn->getRowCount('Account'));
+        $this->assertEquals(2, self::getRowCount('Account'));
     }
 
     /**
@@ -109,7 +106,7 @@ class AccountRepositoryTest extends DatabaseTestCase
     {
         $this->assertTrue(self::$repository->editRestore(3, 1));
 
-        $this->assertEquals(5, $this->conn->getRowCount('AccountHistory'));
+        $this->assertEquals(5, self::getRowCount('AccountHistory'));
 
         $this->assertEquals(0, self::$repository->editRestore(1, 1));
     }
@@ -238,12 +235,12 @@ class AccountRepositoryTest extends DatabaseTestCase
     public function testDeleteByIdBatch()
     {
         // Comprobar registros iniciales
-        $this->assertEquals(2, $this->conn->getRowCount('Account'));
+        $this->assertEquals(4, self::getRowCount('Account'));
 
         $this->assertEquals(2, self::$repository->deleteByIdBatch([1, 2, 100]));
 
         // Comprobar registros tras eliminación
-        $this->assertEquals(0, $this->conn->getRowCount('Account'));
+        $this->assertEquals(2, self::getRowCount('Account'));
     }
 
     /**
@@ -327,16 +324,20 @@ class AccountRepositoryTest extends DatabaseTestCase
     {
         $result = self::$repository->getAll();
 
-        $this->assertEquals(2, $result->getNumRows());
+        $this->assertEquals(4, $result->getNumRows());
 
         /** @var AccountData[] $data */
         $data = $result->getDataAsArray();
 
-        $this->assertCount(2, $data);
+        $this->assertCount(4, $data);
         $this->assertInstanceOf(AccountData::class, $data[0]);
         $this->assertEquals(1, $data[0]->getId());
         $this->assertInstanceOf(AccountData::class, $data[1]);
         $this->assertEquals(2, $data[1]->getId());
+        $this->assertInstanceOf(AccountData::class, $data[2]);
+        $this->assertEquals(3, $data[2]->getId());
+        $this->assertInstanceOf(AccountData::class, $data[3]);
+        $this->assertEquals(4, $data[3]->getId());
     }
 
     /**
@@ -389,7 +390,7 @@ class AccountRepositoryTest extends DatabaseTestCase
      */
     public function testGetTotalNumAccounts()
     {
-        $this->assertEquals(7, self::$repository->getTotalNumAccounts()->num);
+        $this->assertEquals(9, self::$repository->getTotalNumAccounts()->num);
     }
 
     /**
@@ -429,7 +430,7 @@ class AccountRepositoryTest extends DatabaseTestCase
         $queryCondition = new QueryCondition();
         $queryCondition->addFilter('Account.isPrivate = 1');
 
-        $this->assertCount(0, self::$repository->getForUser($queryCondition)->getDataAsArray());
+        $this->assertCount(1, self::$repository->getForUser($queryCondition)->getDataAsArray());
     }
 
     /**
@@ -440,7 +441,7 @@ class AccountRepositoryTest extends DatabaseTestCase
      */
     public function testGetAccountsPassData()
     {
-        $this->assertCount(2, self::$repository->getAccountsPassData());
+        $this->assertCount(4, self::$repository->getAccountsPassData());
     }
 
     /**
@@ -471,12 +472,12 @@ class AccountRepositoryTest extends DatabaseTestCase
         $accountRequest->pass = Crypt::encrypt('1234', $accountRequest->key, self::SECURE_KEY_PASSWORD);
 
         // Comprobar registros iniciales
-        $this->assertEquals(2, $this->conn->getRowCount('Account'));
+        $this->assertEquals(4, self::getRowCount('Account'));
 
         self::$repository->create($accountRequest);
 
         // Comprobar registros finales
-        $this->assertEquals(3, $this->conn->getRowCount('Account'));
+        $this->assertEquals(5, self::getRowCount('Account'));
     }
 
     /**
@@ -591,7 +592,7 @@ class AccountRepositoryTest extends DatabaseTestCase
 
         $response = self::$repository->getByFilter($searchFilter, new QueryCondition());
 
-        $this->assertEquals(0, $response->getNumRows());
+        $this->assertEquals(1, $response->getNumRows());
 
         // Comprobar las etiquetas
         $searchFilter->reset();
@@ -600,12 +601,13 @@ class AccountRepositoryTest extends DatabaseTestCase
 
         $response = self::$repository->getByFilter($searchFilter, new QueryCondition());
 
-        $this->assertEquals(1, $response->getNumRows());
+        $this->assertEquals(2, $response->getNumRows());
 
         /** @var AccountSearchVData[] $data */
         $data = $response->getDataAsArray();
 
-        $this->assertEquals(1, $data[0]->getId());
+        $this->assertEquals(2, $data[0]->getId());
+        $this->assertEquals(1, $data[1]->getId());
     }
 
     /**
diff --git a/tests/SP/Repositories/AccountToFavoriteRepositoryTest.php b/tests/SP/Repositories/AccountToFavoriteRepositoryTest.php
index fb33ee34..f443585a 100644
--- a/tests/SP/Repositories/AccountToFavoriteRepositoryTest.php
+++ b/tests/SP/Repositories/AccountToFavoriteRepositoryTest.php
@@ -51,14 +51,11 @@ class AccountToFavoriteRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_accountFavorite.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(AccountToFavoriteRepository::class);
diff --git a/tests/SP/Repositories/AccountToTagRepositoryTest.php b/tests/SP/Repositories/AccountToTagRepositoryTest.php
index 03849128..34684f7a 100644
--- a/tests/SP/Repositories/AccountToTagRepositoryTest.php
+++ b/tests/SP/Repositories/AccountToTagRepositoryTest.php
@@ -55,14 +55,11 @@ class AccountToTagRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(AccountToTagRepository::class);
@@ -76,7 +73,7 @@ class AccountToTagRepositoryTest extends DatabaseTestCase
      */
     public function testGetTagsByAccountId()
     {
-        $this->assertEquals(1, self::$repository->getTagsByAccountId(1)->getNumRows());
+        $this->assertEquals(2, self::$repository->getTagsByAccountId(1)->getNumRows());
         $this->assertEquals(0, self::$repository->getTagsByAccountId(10)->getNumRows());
     }
 
@@ -90,9 +87,9 @@ class AccountToTagRepositoryTest extends DatabaseTestCase
     {
         $accountRequest = new AccountRequest();
         $accountRequest->id = 1;
-        $accountRequest->tags = [2, 3];
+        $accountRequest->tags = [3];
 
-        $this->assertEquals(2, self::$repository->add($accountRequest));
+        $this->assertEquals(1, self::$repository->add($accountRequest));
 
         $result = self::$repository->getTagsByAccountId($accountRequest->id);
         $data = $result->getDataAsArray();
@@ -122,7 +119,7 @@ class AccountToTagRepositoryTest extends DatabaseTestCase
      */
     public function testDeleteByAccountId()
     {
-        $this->assertEquals(1, self::$repository->deleteByAccountId(1));
+        $this->assertEquals(2, self::$repository->deleteByAccountId(1));
 
         $this->assertEquals(0, self::$repository->getTagsByAccountId(1)->getNumRows());
 
diff --git a/tests/SP/Repositories/AccountToUserGroupRepositoryTest.php b/tests/SP/Repositories/AccountToUserGroupRepositoryTest.php
index ef831ec7..593dc096 100644
--- a/tests/SP/Repositories/AccountToUserGroupRepositoryTest.php
+++ b/tests/SP/Repositories/AccountToUserGroupRepositoryTest.php
@@ -55,14 +55,11 @@ class AccountToUserGroupRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(AccountToUserGroupRepository::class);
@@ -97,14 +94,14 @@ class AccountToUserGroupRepositoryTest extends DatabaseTestCase
         $result = self::$repository->getUserGroupsByAccountId(2);
         $data = $result->getDataAsArray();
 
-        $this->assertEquals(1, $result->getNumRows());
+        $this->assertEquals(2, $result->getNumRows());
         $this->assertInstanceOf(ItemData::class, $data[0]);
 
         $userGroupsView = array_filter($data, function ($user) {
             return (int)$user->isEdit === 0;
         });
 
-        $this->assertCount(1, $userGroupsView);
+        $this->assertCount(2, $userGroupsView);
 
         $userGroupsEdit = array_filter($data, function ($user) {
             return (int)$user->isEdit === 1;
@@ -164,7 +161,7 @@ class AccountToUserGroupRepositoryTest extends DatabaseTestCase
         $accountRequest->id = 2;
         $accountRequest->userGroupsEdit = [2, 3];
 
-        $this->assertEquals(3, self::$repository->updateByType($accountRequest, true));
+        self::$repository->updateByType($accountRequest, true);
 
         $result = self::$repository->getUserGroupsByAccountId($accountRequest->id);
         $data = $result->getDataAsArray();
@@ -197,13 +194,13 @@ class AccountToUserGroupRepositoryTest extends DatabaseTestCase
      */
     public function testViewDeleteByAccountId()
     {
-        $this->assertEquals(1, self::$repository->deleteTypeByAccountId(2, false));
+        $this->assertEquals(2, self::$repository->deleteTypeByAccountId(2, false));
 
         $this->assertEquals(0, self::$repository->getUserGroupsByAccountId(2)->getNumRows());
 
         $this->assertEquals(0, self::$repository->deleteTypeByAccountId(10, false));
 
-        $this->assertEquals(1, $this->conn->getRowCount('AccountToUserGroup'));
+        $this->assertEquals(1, self::getRowCount('AccountToUserGroup'));
     }
 
     /**
@@ -220,7 +217,7 @@ class AccountToUserGroupRepositoryTest extends DatabaseTestCase
 
         $this->assertEquals(0, self::$repository->deleteByAccountId(10));
 
-        $this->assertEquals(1, $this->conn->getRowCount('AccountToUserGroup'));
+        $this->assertEquals(2, self::getRowCount('AccountToUserGroup'));
     }
 
     /**
@@ -311,7 +308,7 @@ class AccountToUserGroupRepositoryTest extends DatabaseTestCase
 
         $this->assertEquals(0, self::$repository->deleteTypeByAccountId(10, true));
 
-        $this->assertEquals(1, $this->conn->getRowCount('AccountToUserGroup'));
+        $this->assertEquals(2, self::getRowCount('AccountToUserGroup'));
     }
 
     /**
@@ -324,7 +321,7 @@ class AccountToUserGroupRepositoryTest extends DatabaseTestCase
     {
         $this->assertEquals(2, self::$repository->getUserGroupsByUserGroupId(2)->getNumRows());
 
-        $this->assertEquals(0, self::$repository->getUserGroupsByUserGroupId(3)->getNumRows());
+        $this->assertEquals(1, self::$repository->getUserGroupsByUserGroupId(3)->getNumRows());
 
         $this->assertEquals(0, self::$repository->getUserGroupsByUserGroupId(10)->getNumRows());
     }
diff --git a/tests/SP/Repositories/AccountToUserRepositoryTest.php b/tests/SP/Repositories/AccountToUserRepositoryTest.php
index 6c6d38ff..a24e5938 100644
--- a/tests/SP/Repositories/AccountToUserRepositoryTest.php
+++ b/tests/SP/Repositories/AccountToUserRepositoryTest.php
@@ -55,14 +55,11 @@ class AccountToUserRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(AccountToUserRepository::class);
@@ -210,7 +207,7 @@ class AccountToUserRepositoryTest extends DatabaseTestCase
 
         $this->assertEquals(0, self::$repository->deleteTypeByAccountId(10, false));
 
-        $this->assertEquals(1, $this->conn->getRowCount('AccountToUser'));
+        $this->assertEquals(1, self::getRowCount('AccountToUser'));
     }
 
     /**
@@ -226,7 +223,7 @@ class AccountToUserRepositoryTest extends DatabaseTestCase
 
         $this->assertEquals(0, self::$repository->deleteByAccountId(10));
 
-        $this->assertEquals(1, $this->conn->getRowCount('AccountToUser'));
+        $this->assertEquals(1, self::getRowCount('AccountToUser'));
     }
 
     /**
@@ -318,6 +315,6 @@ class AccountToUserRepositoryTest extends DatabaseTestCase
 
         $this->assertEquals(0, self::$repository->deleteTypeByAccountId(10, true));
 
-        $this->assertEquals(1, $this->conn->getRowCount('AccountToUser'));
+        $this->assertEquals(1, self::getRowCount('AccountToUser'));
     }
 }
diff --git a/tests/SP/Repositories/AuthTokenRepositoryTest.php b/tests/SP/Repositories/AuthTokenRepositoryTest.php
index f93563a5..171533ac 100644
--- a/tests/SP/Repositories/AuthTokenRepositoryTest.php
+++ b/tests/SP/Repositories/AuthTokenRepositoryTest.php
@@ -66,14 +66,11 @@ class AuthTokenRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(AuthTokenRepository::class);
@@ -93,7 +90,7 @@ class AuthTokenRepositoryTest extends DatabaseTestCase
         $this->assertInstanceOf(AuthTokenData::class, $data);
         $this->assertEquals(1, $data->getId());
         $this->assertEquals(ActionsInterface::ACCOUNT_SEARCH, $data->getActionId());
-        $this->assertEquals(self::AUTH_TOKEN, $data->getToken());
+        $this->assertEquals('12b9027d24efff7bfbaca8bd774a4c34b45de35e033d2b192a88f4dfaee5c233', $data->getToken());
         $this->assertNull($data->getHash());
 
         $result = self::$repository->getById(2);
@@ -116,7 +113,7 @@ class AuthTokenRepositoryTest extends DatabaseTestCase
     {
         $this->assertEquals(self::AUTH_TOKEN, self::$repository->getTokenByUserId(1));
 
-        $this->assertNull(self::$repository->getTokenByUserId(2));
+        $this->assertNull(self::$repository->getTokenByUserId(3));
     }
 
     /**
@@ -184,12 +181,12 @@ class AuthTokenRepositoryTest extends DatabaseTestCase
         $token = PasswordUtil::generateRandomBytes();
 
         // Comprobar actualización con usuario que existe
-        $this->assertEquals(2, self::$repository->refreshTokenByUserId(1, $token));
+        $this->assertEquals(4, self::$repository->refreshTokenByUserId(1, $token));
         $this->assertEquals($token, self::$repository->getTokenByUserId(1));
 
         // Comprobar actualización con usuario que NO existe
-        $this->assertEquals(0, self::$repository->refreshTokenByUserId(2, $token));
-        $this->assertNull(self::$repository->getTokenByUserId(2));
+        $this->assertEquals(0, self::$repository->refreshTokenByUserId(10, $token));
+        $this->assertNull(self::$repository->getTokenByUserId(10));
     }
 
     /**
@@ -248,15 +245,15 @@ class AuthTokenRepositoryTest extends DatabaseTestCase
         $result = self::$repository->search($itemSearchData);
         $data = $result->getDataAsArray();
 
-        $this->assertEquals(2, $result->getNumRows());
-        $this->assertCount(2, $data);
+        $this->assertEquals(4, $result->getNumRows());
+        $this->assertCount(4, $data);
 
         $this->assertInstanceOf(stdClass::class, $data[0]);
         $this->assertEquals(ActionsInterface::ACCOUNT_SEARCH, $data[0]->actionId);
         $this->assertEquals(self::AUTH_TOKEN, $data[0]->token);
 
         $this->assertInstanceOf(stdClass::class, $data[1]);
-        $this->assertEquals(ActionsInterface::ACCOUNT_VIEW_PASS, $data[1]->actionId);
+        $this->assertEquals(ActionsInterface::ACCOUNT_VIEW, $data[1]->actionId);
         $this->assertEquals(self::AUTH_TOKEN, $data[1]->token);
 
         $itemSearchData = new ItemSearchData();
@@ -274,10 +271,11 @@ class AuthTokenRepositoryTest extends DatabaseTestCase
      */
     public function testDeleteByIdBatch()
     {
-        $this->assertEquals(2, $this->conn->getRowCount('AuthToken'));
+        $this->assertEquals(5, self::getRowCount('AuthToken'));
 
-        $this->assertEquals(2, self::$repository->deleteByIdBatch([1, 2, 3]));
-        $this->assertEquals(0, $this->conn->getRowCount('AuthToken'));
+        $this->assertEquals(3, self::$repository->deleteByIdBatch([1, 2, 3]));
+
+        $this->assertEquals(2, self::getRowCount('AuthToken'));
 
         $this->assertEquals(0, self::$repository->deleteByIdBatch([]));
     }
@@ -325,8 +323,8 @@ class AuthTokenRepositoryTest extends DatabaseTestCase
         $authTokenData->setVault($vault);
         $authTokenData->setUserId(2);
 
-        $this->assertEquals(3, self::$repository->create($authTokenData));
-        $this->assertEquals(3, $this->conn->getRowCount('AuthToken'));
+        $this->assertEquals(6, self::$repository->create($authTokenData));
+        $this->assertEquals(6, self::getRowCount('AuthToken'));
 
         $result = self::$repository->getTokenByToken(ActionsInterface::ACCOUNT_CREATE, $token);
         /** @var AuthTokenData $data */
@@ -336,7 +334,7 @@ class AuthTokenRepositoryTest extends DatabaseTestCase
         $this->assertInstanceOf(AuthTokenData::class, $data);
         $this->assertEquals(ActionsInterface::ACCOUNT_CREATE, $data->getActionId());
         $this->assertEquals($hash, $data->getHash());
-        $this->assertEquals(3, $data->getId());
+        $this->assertEquals(6, $data->getId());
         $this->assertEquals(2, $data->getUserId());
         $this->assertEquals($vault->getSerialized(), $data->getVault());
 
diff --git a/tests/SP/Repositories/CategoryRepositoryTest.php b/tests/SP/Repositories/CategoryRepositoryTest.php
index 6f3f66e4..43010cff 100644
--- a/tests/SP/Repositories/CategoryRepositoryTest.php
+++ b/tests/SP/Repositories/CategoryRepositoryTest.php
@@ -58,14 +58,11 @@ class CategoryRepositoryTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(CategoryRepository::class);
@@ -164,7 +161,7 @@ class CategoryRepositoryTest extends DatabaseTestCase
      */
     public function testGetAll()
     {
-        $count = $this->conn->getRowCount('Category');
+        $count = self::getRowCount('Category');
 
         $result = self::$repository->getAll();
         $this->assertEquals($count, $result->getNumRows());
@@ -224,11 +221,11 @@ class CategoryRepositoryTest extends DatabaseTestCase
      */
     public function testDeleteByIdBatch()
     {
-        $countBefore = $this->conn->getRowCount('Category');
+        $countBefore = self::getRowCount('Category');
 
         $this->assertEquals(1, self::$repository->deleteByIdBatch([3]));
 
-        $countAfter = $this->conn->getRowCount('Category');
+        $countAfter = self::getRowCount('Category');
 
         $this->assertEquals($countBefore - 1, $countAfter);
 
@@ -246,7 +243,7 @@ class CategoryRepositoryTest extends DatabaseTestCase
      */
     public function testCreate()
     {
-        $countBefore = $this->conn->getRowCount('Category');
+        $countBefore = self::getRowCount('Category');
 
         $categoryData = new CategoryData();
         $categoryData->name = 'Categoría prueba';
@@ -260,7 +257,7 @@ class CategoryRepositoryTest extends DatabaseTestCase
 
         $this->assertEquals($categoryData->name, $data->getName());
 
-        $countAfter = $this->conn->getRowCount('Category');
+        $countAfter = self::getRowCount('Category');
 
         $this->assertEquals($countBefore + 1, $countAfter);
     }
@@ -273,11 +270,11 @@ class CategoryRepositoryTest extends DatabaseTestCase
      */
     public function testDelete()
     {
-        $countBefore = $this->conn->getRowCount('Category');
+        $countBefore = self::getRowCount('Category');
 
         $this->assertEquals(1, self::$repository->delete(3));
 
-        $countAfter = $this->conn->getRowCount('Category');
+        $countAfter = self::getRowCount('Category');
 
         $this->assertEquals($countBefore - 1, $countAfter);
 
diff --git a/tests/SP/Repositories/ClientRepositoryTest.php b/tests/SP/Repositories/ClientRepositoryTest.php
index 83f4ef7d..c37a080d 100644
--- a/tests/SP/Repositories/ClientRepositoryTest.php
+++ b/tests/SP/Repositories/ClientRepositoryTest.php
@@ -58,14 +58,11 @@ class ClientRepositoryTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(ClientRepository::class);
@@ -79,7 +76,7 @@ class ClientRepositoryTest extends DatabaseTestCase
      */
     public function testGetByName()
     {
-        $this->assertNull(self::$repository->getByName('Amazon')->getData());
+        $this->assertNull(self::$repository->getByName('Spotify')->getData());
 
         $data = self::$repository->getByName('Google')->getData();
 
@@ -158,7 +155,7 @@ class ClientRepositoryTest extends DatabaseTestCase
      */
     public function testGetAll()
     {
-        $count = $this->conn->getRowCount('Client');
+        $count = self::getRowCount('Client');
 
         $results = self::$repository->getAll();
         /** @var ClientData[] $data */
@@ -167,13 +164,16 @@ class ClientRepositoryTest extends DatabaseTestCase
         $this->assertCount($count, $data);
 
         $this->assertInstanceOf(ClientData::class, $data[0]);
-        $this->assertEquals('Apple', $data[0]->getName());
+        $this->assertEquals('Amazon', $data[0]->getName());
 
         $this->assertInstanceOf(ClientData::class, $data[1]);
-        $this->assertEquals('Google', $data[1]->getName());
+        $this->assertEquals('Apple', $data[1]->getName());
 
         $this->assertInstanceOf(ClientData::class, $data[2]);
-        $this->assertEquals('Microsoft', $data[2]->getName());
+        $this->assertEquals('Google', $data[2]->getName());
+
+        $this->assertInstanceOf(ClientData::class, $data[3]);
+        $this->assertEquals('Microsoft', $data[3]->getName());
     }
 
     /**
@@ -216,11 +216,11 @@ class ClientRepositoryTest extends DatabaseTestCase
      */
     public function testDeleteByIdBatch()
     {
-        $countBefore = $this->conn->getRowCount('Client');
+        $countBefore = self::getRowCount('Client');
 
-        $this->assertEquals(1, self::$repository->deleteByIdBatch([3]));
+        $this->assertEquals(1, self::$repository->deleteByIdBatch([4]));
 
-        $countAfter = $this->conn->getRowCount('Client');
+        $countAfter = self::getRowCount('Client');
 
         $this->assertEquals($countBefore - 1, $countAfter);
 
@@ -238,7 +238,7 @@ class ClientRepositoryTest extends DatabaseTestCase
      */
     public function testCreate()
     {
-        $countBefore = $this->conn->getRowCount('Client');
+        $countBefore = self::getRowCount('Client');
 
         $data = new ClientData();
         $data->name = 'Cliente prueba';
@@ -254,7 +254,7 @@ class ClientRepositoryTest extends DatabaseTestCase
         $this->assertEquals($data->name, $result->getName());
         $this->assertEquals($data->isGlobal, $result->getIsGlobal());
 
-        $countAfter = $this->conn->getRowCount('Client');
+        $countAfter = self::getRowCount('Client');
 
         $this->assertEquals($countBefore + 1, $countAfter);
 
@@ -271,11 +271,11 @@ class ClientRepositoryTest extends DatabaseTestCase
      */
     public function testDelete()
     {
-        $countBefore = $this->conn->getRowCount('Client');
+        $countBefore = self::getRowCount('Client');
 
-        $this->assertEquals(1, self::$repository->delete(3));
+        $this->assertEquals(1, self::$repository->delete(4));
 
-        $countAfter = $this->conn->getRowCount('Client');
+        $countAfter = self::getRowCount('Client');
 
         $this->assertEquals($countBefore - 1, $countAfter);
 
@@ -294,7 +294,7 @@ class ClientRepositoryTest extends DatabaseTestCase
     public function testGetByIdBatch()
     {
         $this->assertCount(3, self::$repository->getByIdBatch([1, 2, 3]));
-        $this->assertCount(3, self::$repository->getByIdBatch([1, 2, 3, 4, 5]));
+        $this->assertCount(4, self::$repository->getByIdBatch([1, 2, 3, 4, 5]));
         $this->assertCount(0, self::$repository->getByIdBatch([]));
     }
 
@@ -307,6 +307,6 @@ class ClientRepositoryTest extends DatabaseTestCase
         $filter = new QueryCondition();
         $filter->addFilter('Account.isPrivate = 0');
 
-        $this->assertEquals(3, self::$repository->getAllForFilter($filter)->getNumRows());
+        $this->assertEquals(4, self::$repository->getAllForFilter($filter)->getNumRows());
     }
 }
diff --git a/tests/SP/Repositories/ConfigRepositoryTest.php b/tests/SP/Repositories/ConfigRepositoryTest.php
index f34fc58e..4cc3f674 100644
--- a/tests/SP/Repositories/ConfigRepositoryTest.php
+++ b/tests/SP/Repositories/ConfigRepositoryTest.php
@@ -52,14 +52,11 @@ class ConfigRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_config.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(ConfigRepository::class);
@@ -126,7 +123,7 @@ class ConfigRepositoryTest extends DatabaseTestCase
     {
         $result = self::$repository->getAll();
 
-        $this->assertEquals($this->conn->getRowCount('Config'), $result->getNumRows());
+        $this->assertEquals(self::getRowCount('Config'), $result->getNumRows());
 
         $data = $result->getDataAsArray();
 
diff --git a/tests/SP/Repositories/CustomFieldDefRepositoryTest.php b/tests/SP/Repositories/CustomFieldDefRepositoryTest.php
index 1d2e152a..4506ed77 100644
--- a/tests/SP/Repositories/CustomFieldDefRepositoryTest.php
+++ b/tests/SP/Repositories/CustomFieldDefRepositoryTest.php
@@ -56,14 +56,11 @@ class CustomFieldDefRepositoryTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(CustomFieldDefRepository::class);
@@ -131,7 +128,7 @@ class CustomFieldDefRepositoryTest extends DatabaseTestCase
     public function testDeleteByIdBatch()
     {
         $this->assertEquals(1, self::$repository->deleteByIdBatch([3, 4]));
-        $this->assertEquals(2, $this->conn->getRowCount('CustomFieldDefinition'));
+        $this->assertEquals(2, self::getRowCount('CustomFieldDefinition'));
         $this->assertEquals(0, self::$repository->deleteByIdBatch([]));
 
         $this->expectException(ConstraintException::class);
@@ -257,9 +254,9 @@ class CustomFieldDefRepositoryTest extends DatabaseTestCase
         $result = self::$repository->search($itemSearchData);
         $data = $result->getDataAsArray();
 
-        $this->assertEquals(2, $result->getNumRows());
-        $this->assertEquals(2, $result->getTotalNumRows());
-        $this->assertCount(2, $data);
+        $this->assertEquals(1, $result->getNumRows());
+        $this->assertEquals(1, $result->getTotalNumRows());
+        $this->assertCount(1, $data);
         $this->assertInstanceOf(CustomFieldDefinitionData::class, $data[0]);
         $this->assertEquals(2, $data[0]->id);
         $this->assertEquals('password', $data[0]->typeName);
@@ -280,7 +277,7 @@ class CustomFieldDefRepositoryTest extends DatabaseTestCase
     {
         $this->assertEquals(1, self::$repository->delete(3));
         $this->assertEquals(0, self::$repository->delete(10));
-        $this->assertEquals(2, $this->conn->getRowCount('CustomFieldDefinition'));
+        $this->assertEquals(2, self::getRowCount('CustomFieldDefinition'));
 
         $this->expectException(ConstraintException::class);
 
@@ -290,7 +287,7 @@ class CustomFieldDefRepositoryTest extends DatabaseTestCase
     /**
      * Performs operation returned by getSetUpOperation().
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/SP/Repositories/CustomFieldRepositoryTest.php b/tests/SP/Repositories/CustomFieldRepositoryTest.php
index dc2c2099..f3cff139 100644
--- a/tests/SP/Repositories/CustomFieldRepositoryTest.php
+++ b/tests/SP/Repositories/CustomFieldRepositoryTest.php
@@ -53,14 +53,11 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(CustomFieldRepository::class);
@@ -72,11 +69,11 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
      */
     public function testDeleteCustomFieldDataBatch()
     {
-        $this->assertEquals(1, self::$repository->deleteCustomFieldDataBatch([1, 2, 3], ActionsInterface::ACCOUNT));
+        $this->assertEquals(2, self::$repository->deleteCustomFieldDataBatch([1, 2, 3], ActionsInterface::ACCOUNT));
 
         $this->assertEquals(1, self::$repository->deleteCustomFieldDataBatch([1, 2, 3], ActionsInterface::CATEGORY));
 
-        $this->assertEquals(0, $this->conn->getRowCount('CustomFieldData'));
+        $this->assertEquals(0, self::getRowCount('CustomFieldData'));
 
         $this->assertEquals(0, self::$repository->deleteCustomFieldDataBatch([], ActionsInterface::CATEGORY));
 
@@ -135,12 +132,12 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
     public function testGetAllEncrypted()
     {
         $result = self::$repository->getAllEncrypted();
-        $this->assertEquals(1, $result->getNumRows());
+        $this->assertEquals(2, $result->getNumRows());
 
         /** @var CustomFieldData[] $data */
         $data = $result->getDataAsArray();
 
-        $this->assertCount(1, $data);
+        $this->assertCount(2, $data);
         $this->assertInstanceOf(CustomFieldData::class, $data[0]);
         $this->assertEquals(1, $data[0]->getItemId());
         $this->assertEquals(ActionsInterface::ACCOUNT, $data[0]->getModuleId());
@@ -153,9 +150,9 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
      */
     public function testDeleteCustomFieldDefinitionDataBatch()
     {
-        $this->assertEquals(2, self::$repository->deleteCustomFieldDefinitionDataBatch([1, 2, 3]));
+        $this->assertEquals(3, self::$repository->deleteCustomFieldDefinitionDataBatch([1, 2, 3]));
 
-        $this->assertEquals(0, $this->conn->getRowCount('CustomFieldData'));
+        $this->assertEquals(0, self::getRowCount('CustomFieldData'));
 
         $this->assertEquals(0, self::$repository->deleteCustomFieldDefinitionDataBatch([]));
     }
@@ -167,11 +164,11 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
     public function testGetAll()
     {
         $result = self::$repository->getAll();
-        $this->assertEquals(2, $result->getNumRows());
+        $this->assertEquals(3, $result->getNumRows());
 
         $data = $result->getDataAsArray();
 
-        $this->assertCount(2, $data);
+        $this->assertCount(3, $data);
         $this->assertInstanceOf(CustomFieldData::class, $data[0]);
         $this->assertInstanceOf(CustomFieldData::class, $data[1]);
     }
@@ -185,9 +182,9 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
         $this->assertEquals(1, self::$repository->deleteCustomFieldData(1, ActionsInterface::ACCOUNT));
         $this->assertEquals(1, self::$repository->deleteCustomFieldData(1, ActionsInterface::CATEGORY));
 
-        $this->assertEquals(0, $this->conn->getRowCount('CustomFieldData'));
+        $this->assertEquals(1, self::getRowCount('CustomFieldData'));
 
-        $this->assertEquals(0, self::$repository->deleteCustomFieldData(2, ActionsInterface::ACCOUNT));
+        $this->assertEquals(1, self::$repository->deleteCustomFieldData(2, ActionsInterface::ACCOUNT));
 
         $this->assertEquals(0, self::$repository->deleteCustomFieldData(2, ActionsInterface::CATEGORY));
 
@@ -234,8 +231,8 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
         $this->assertEquals(1, $data[0]->typeId);
         $this->assertEquals('text', $data[0]->typeName);
         $this->assertEquals('Texto', $data[0]->typeText);
-        $this->assertNull($data[0]->data);
-        $this->assertNull($data[0]->key);
+        $this->assertNotNull($data[0]->data);
+        $this->assertNotNull($data[0]->key);
 
         $result = self::$repository->getForModuleAndItemId(ActionsInterface::ACCOUNT, 3);
 
@@ -247,17 +244,17 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
         $data = $result->getDataAsArray();
 
         $this->assertCount(2, $data);
-        $this->assertEquals('RSA', $data[0]->definitionName);
-        $this->assertEquals(2, $data[0]->definitionId);
+        $this->assertEquals('SSL', $data[0]->definitionName);
+        $this->assertEquals(3, $data[0]->definitionId);
         $this->assertEquals(ActionsInterface::CATEGORY, $data[0]->moduleId);
         $this->assertEquals(0, $data[0]->required);
         $this->assertEquals(0, $data[0]->showInList);
         $this->assertEquals(null, $data[0]->help);
-        $this->assertEquals(0, $data[0]->isEncrypted);
-        $this->assertEquals(2, $data[0]->typeId);
-        $this->assertEquals('password', $data[0]->typeName);
-        $this->assertEquals('Clave', $data[0]->typeText);
-        $this->assertNotEmpty($data[0]->data);
+        $this->assertEquals(1, $data[0]->isEncrypted);
+        $this->assertEquals(10, $data[0]->typeId);
+        $this->assertEquals('textarea', $data[0]->typeName);
+        $this->assertEquals('Área de Texto', $data[0]->typeText);
+        $this->assertNull($data[0]->data);
         $this->assertNull($data[0]->key);
 
         $result = self::$repository->getForModuleAndItemId(ActionsInterface::CATEGORY, 2);
@@ -266,16 +263,16 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
         $data = $result->getDataAsArray();
 
         $this->assertCount(2, $data);
-        $this->assertEquals('RSA', $data[0]->definitionName);
-        $this->assertEquals(2, $data[0]->definitionId);
+        $this->assertEquals('SSL', $data[0]->definitionName);
+        $this->assertEquals(3, $data[0]->definitionId);
         $this->assertEquals(ActionsInterface::CATEGORY, $data[0]->moduleId);
         $this->assertEquals(0, $data[0]->required);
         $this->assertEquals(0, $data[0]->showInList);
         $this->assertEquals(null, $data[0]->help);
-        $this->assertEquals(0, $data[0]->isEncrypted);
-        $this->assertEquals(2, $data[0]->typeId);
-        $this->assertEquals('password', $data[0]->typeName);
-        $this->assertEquals('Clave', $data[0]->typeText);
+        $this->assertEquals(1, $data[0]->isEncrypted);
+        $this->assertEquals(10, $data[0]->typeId);
+        $this->assertEquals('textarea', $data[0]->typeName);
+        $this->assertEquals('Área de Texto', $data[0]->typeText);
         $this->assertNull($data[0]->data);
         $this->assertNull($data[0]->key);
 
@@ -299,7 +296,7 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
         $data->setData('cuenta');
         $data->setKey('nan');
 
-        $this->assertEquals(3, self::$repository->create($data));
+        $this->assertEquals(4, self::$repository->create($data));
 
         $data = new CustomFieldData();
         $data->setId(2);
@@ -308,7 +305,7 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
         $data->setData('categoria');
         $data->setKey('nan');
 
-        $this->assertEquals(4, self::$repository->create($data));
+        $this->assertEquals(5, self::$repository->create($data));
 
         $this->expectException(ConstraintException::class);
 
@@ -338,7 +335,7 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
 
         self::$repository->create($data);
 
-        $this->assertEquals(4, $this->conn->getRowCount('CustomFieldData'));
+        $this->assertEquals(4, self::getRowCount('CustomFieldData'));
     }
 
     /**
@@ -347,10 +344,10 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
      */
     public function testDeleteCustomFieldDefinitionData()
     {
-        $this->assertEquals(1, self::$repository->deleteCustomFieldDefinitionData(1));
+        $this->assertEquals(2, self::$repository->deleteCustomFieldDefinitionData(1));
         $this->assertEquals(1, self::$repository->deleteCustomFieldDefinitionData(2));
 
-        $this->assertEquals(0, $this->conn->getRowCount('CustomFieldData'));
+        $this->assertEquals(0, self::getRowCount('CustomFieldData'));
     }
 
     /**
@@ -407,6 +404,6 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
 
         $this->assertEquals(0, self::$repository->update($data));
 
-        $this->assertEquals(2, $this->conn->getRowCount('CustomFieldData'));
+        $this->assertEquals(3, self::getRowCount('CustomFieldData'));
     }
 }
diff --git a/tests/SP/Repositories/CustomFieldTypeRepositoryTest.php b/tests/SP/Repositories/CustomFieldTypeRepositoryTest.php
index 15fce72a..dbe79c2f 100644
--- a/tests/SP/Repositories/CustomFieldTypeRepositoryTest.php
+++ b/tests/SP/Repositories/CustomFieldTypeRepositoryTest.php
@@ -53,14 +53,11 @@ class CustomFieldTypeRepositoryTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(CustomFieldTypeRepository::class);
@@ -72,11 +69,11 @@ class CustomFieldTypeRepositoryTest extends DatabaseTestCase
      */
     public function testDeleteByIdBatch()
     {
-        $countBefore = $this->conn->getRowCount('CustomFieldType');
+        $countBefore = self::getRowCount('CustomFieldType');
 
         $this->assertEquals(2, self::$repository->deleteByIdBatch([3, 4, 100]));
         $this->assertEquals(0, self::$repository->deleteByIdBatch([]));
-        $this->assertEquals($countBefore - 2, $this->conn->getRowCount('CustomFieldType'));
+        $this->assertEquals($countBefore - 2, self::getRowCount('CustomFieldType'));
 
         $this->expectException(ConstraintException::class);
 
@@ -89,11 +86,11 @@ class CustomFieldTypeRepositoryTest extends DatabaseTestCase
      */
     public function testDelete()
     {
-        $countBefore = $this->conn->getRowCount('CustomFieldType');
+        $countBefore = self::getRowCount('CustomFieldType');
 
         $this->assertEquals(1, self::$repository->delete(3));
         $this->assertEquals(0, self::$repository->delete(100));
-        $this->assertEquals($countBefore - 1, $this->conn->getRowCount('CustomFieldType'));
+        $this->assertEquals($countBefore - 1, self::getRowCount('CustomFieldType'));
 
         $this->expectException(ConstraintException::class);
 
diff --git a/tests/SP/Repositories/EventlogRepositoryTest.php b/tests/SP/Repositories/EventlogRepositoryTest.php
index 6d1eb1c5..da10ef94 100644
--- a/tests/SP/Repositories/EventlogRepositoryTest.php
+++ b/tests/SP/Repositories/EventlogRepositoryTest.php
@@ -56,14 +56,11 @@ class EventlogRepositoryTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_eventlog.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(EventlogRepository::class);
@@ -125,7 +122,7 @@ class EventlogRepositoryTest extends DatabaseTestCase
     {
         self::$repository->clear();
 
-        $this->assertEquals(0, $this->conn->getRowCount('EventLog'));
+        $this->assertEquals(0, self::getRowCount('EventLog'));
     }
 
     /**
@@ -144,11 +141,11 @@ class EventlogRepositoryTest extends DatabaseTestCase
         $eventlogData->setIpAddress('127.0.0.1');
         $eventlogData->setDescription('Prueba');
 
-        $countBefore = $this->conn->getRowCount('EventLog');
+        $countBefore = self::getRowCount('EventLog');
 
         self::$repository->create($eventlogData);
 
-        $countAfter = $this->conn->getRowCount('EventLog');
+        $countAfter = self::getRowCount('EventLog');
 
         $this->assertEquals($countBefore + 1, $countAfter);
 
diff --git a/tests/SP/Repositories/ItemPresetRepositoryTest.php b/tests/SP/Repositories/ItemPresetRepositoryTest.php
index 1e44ffb6..15aa7c96 100644
--- a/tests/SP/Repositories/ItemPresetRepositoryTest.php
+++ b/tests/SP/Repositories/ItemPresetRepositoryTest.php
@@ -54,14 +54,11 @@ class ItemPresetRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_itemPreset.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(ItemPresetRepository::class);
@@ -75,7 +72,7 @@ class ItemPresetRepositoryTest extends DatabaseTestCase
     {
         $this->assertEquals(3, self::$repository->deleteByIdBatch([1, 2, 3, 10]));
 
-        $this->assertEquals(2, $this->conn->getRowCount('ItemPreset'));
+        $this->assertEquals(2, self::getRowCount('ItemPreset'));
 
         $this->assertEquals(0, self::$repository->deleteByIdBatch([]));
     }
@@ -92,7 +89,7 @@ class ItemPresetRepositoryTest extends DatabaseTestCase
 
         $this->assertEquals(0, self::$repository->delete(10));
 
-        $this->assertEquals(3, $this->conn->getRowCount('ItemPreset'));
+        $this->assertEquals(3, self::getRowCount('ItemPreset'));
     }
 
     /**
@@ -245,7 +242,7 @@ class ItemPresetRepositoryTest extends DatabaseTestCase
      */
     public function testGetAll()
     {
-        $count = $this->conn->getRowCount('ItemPreset');
+        $count = self::getRowCount('ItemPreset');
 
         $result = self::$repository->getAll();
         $this->assertEquals($count, $result->getNumRows());
diff --git a/tests/SP/Repositories/NotificationRepositoryTest.php b/tests/SP/Repositories/NotificationRepositoryTest.php
index 94aa0b6e..4dac0033 100644
--- a/tests/SP/Repositories/NotificationRepositoryTest.php
+++ b/tests/SP/Repositories/NotificationRepositoryTest.php
@@ -54,14 +54,11 @@ class NotificationRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(NotificationRepository::class);
@@ -73,10 +70,10 @@ class NotificationRepositoryTest extends DatabaseTestCase
      */
     public function testDeleteAdmin()
     {
-        $countBefore = $this->conn->getRowCount('Notification');
+        $countBefore = self::getRowCount('Notification');
 
         $this->assertEquals(1, self::$repository->deleteAdmin(3));
-        $this->assertEquals($countBefore - 1, $this->conn->getRowCount('Notification'));
+        $this->assertEquals($countBefore - 1, self::getRowCount('Notification'));
     }
 
     /**
@@ -86,7 +83,7 @@ class NotificationRepositoryTest extends DatabaseTestCase
     public function testDeleteAdminBatch()
     {
         $this->assertEquals(3, self::$repository->deleteAdminBatch([1, 2, 3, 5]));
-        $this->assertEquals(0, $this->conn->getRowCount('Notification'));
+        $this->assertEquals(0, self::getRowCount('Notification'));
     }
 
     /**
@@ -404,7 +401,7 @@ class NotificationRepositoryTest extends DatabaseTestCase
         $this->assertEquals(2, self::$repository->deleteByIdBatch([1, 2, 3, 4]));
         $this->assertEquals(0, self::$repository->deleteByIdBatch([]));
 
-        $this->assertEquals(1, $this->conn->getRowCount('Notification'));
+        $this->assertEquals(1, self::getRowCount('Notification'));
     }
 
     /**
diff --git a/tests/SP/Repositories/PluginDataRepositoryTest.php b/tests/SP/Repositories/PluginDataRepositoryTest.php
index 1384af77..3bcf360e 100644
--- a/tests/SP/Repositories/PluginDataRepositoryTest.php
+++ b/tests/SP/Repositories/PluginDataRepositoryTest.php
@@ -55,14 +55,11 @@ class PluginDataRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_plugin.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(PluginDataRepository::class);
diff --git a/tests/SP/Repositories/PluginRepositoryTest.php b/tests/SP/Repositories/PluginRepositoryTest.php
index 387d68ef..ec03f029 100644
--- a/tests/SP/Repositories/PluginRepositoryTest.php
+++ b/tests/SP/Repositories/PluginRepositoryTest.php
@@ -55,14 +55,11 @@ class PluginRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_plugin.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(PluginRepository::class);
diff --git a/tests/SP/Repositories/PublicLinkRepositoryTest.php b/tests/SP/Repositories/PublicLinkRepositoryTest.php
index a76ace38..0fa91071 100644
--- a/tests/SP/Repositories/PublicLinkRepositoryTest.php
+++ b/tests/SP/Repositories/PublicLinkRepositoryTest.php
@@ -58,14 +58,11 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(PublicLinkRepository::class);
@@ -82,8 +79,9 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
         $data = $result->getData();
 
         $this->assertEquals(1, $result->getNumRows());
-        $this->assertEquals(1, $data->getId());
-        $this->assertEquals(pack('H*', '646134633934396166303637386334353130313363626137633133626463396137636135383731383034663137343134306636626161653236346464'), $data->getHash());
+        $this->assertEquals(3, $data->getId());
+        $this->assertEquals(1, $data->getUserId());
+        $this->assertEquals(pack('H*', '616337343462363934383832336362303531343534366335363739383163653466653732343064663339363832366439396632346664396131333434'), $data->getHash());
 
         $result = self::$repository->getHashForItem(3);
         $this->assertEquals(0, $result->getNumRows());
@@ -108,13 +106,13 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
         $this->assertInstanceOf(PublicLinkListData::class, $data[0]);
         $this->assertEquals(2, $data[0]->getId());
         $this->assertEquals(1, $data[0]->getItemId());
-        $this->assertEquals(pack('H*', '313065363937306666653833623531393234356635333433333732626366663433376461623565356134386238326131653238636131356235346635'), $data[0]->getHash());
+        $this->assertEquals(pack('H*', '636564333430306561313730363139616437643235383934383862366236303734376561393966313265323230663561393130656465366438333466'), $data[0]->getHash());
         $this->assertNotEmpty($data[0]->getData());
         $this->assertEquals(1, $data[0]->getUserId());
         $this->assertEquals(1, $data[0]->getTypeId());
         $this->assertEquals(0, $data[0]->isNotify());
         $this->assertEquals(1529228863, $data[0]->getDateAdd());
-        $this->assertEquals(1529229463, $data[0]->getDateExpire());
+        $this->assertEquals(1532280825, $data[0]->getDateExpire());
         $this->assertEquals(0, $data[0]->getDateUpdate());
         $this->assertEquals(0, $data[0]->getCountViews());
         $this->assertEquals(3, $data[0]->getMaxCountViews());
@@ -132,7 +130,7 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
         $this->assertEquals(1, $result->getNumRows());
         $this->assertCount(1, $data);
         $this->assertInstanceOf(PublicLinkListData::class, $data[0]);
-        $this->assertEquals(1, $data[0]->getId());
+        $this->assertEquals(3, $data[0]->getId());
         $this->assertEquals(2, $data[0]->getItemId());
 
         $itemSearchData->setSeachString('');
@@ -151,7 +149,7 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
         $this->assertEquals(2, self::$repository->deleteByIdBatch([1, 2, 3]));
         $this->assertEquals(0, self::$repository->deleteByIdBatch([]));
 
-        $this->assertEquals(0, $this->conn->getRowCount('PublicLink'));
+        $this->assertEquals(0, self::getRowCount('PublicLink'));
     }
 
     /**
@@ -176,12 +174,12 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
         $data->setDateAdd(time());
         $data->setMaxCountViews(3);
 
-        $this->assertEquals(3, self::$repository->create($data)->getLastId());
+        $this->assertEquals(4, self::$repository->create($data)->getLastId());
 
         /** @var PublicLinkListData $resultData */
-        $resultData = self::$repository->getById(3)->getData();
+        $resultData = self::$repository->getById(4)->getData();
 
-        $this->assertEquals(3, $resultData->getId());
+        $this->assertEquals(4, $resultData->getId());
         $this->assertEquals($data->getItemId(), $resultData->getItemId());
         $this->assertEquals($data->getHash(), $resultData->getHash());
         $this->assertEquals($data->getData(), $resultData->getData());
@@ -198,7 +196,7 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
 
         $this->expectException(ConstraintException::class);
 
-        $data->setItemId(3);
+        $data->setItemId(10);
 
         self::$repository->create($data);
     }
@@ -217,13 +215,13 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
         $this->assertInstanceOf(PublicLinkListData::class, $data);
         $this->assertEquals(2, $data->getId());
         $this->assertEquals(1, $data->getItemId());
-        $this->assertEquals(pack('H*', '313065363937306666653833623531393234356635333433333732626366663433376461623565356134386238326131653238636131356235346635'), $data->getHash());
+        $this->assertEquals(pack('H*', '636564333430306561313730363139616437643235383934383862366236303734376561393966313265323230663561393130656465366438333466'), $data->getHash());
         $this->assertNotEmpty($data->getData());
         $this->assertEquals(1, $data->getUserId());
         $this->assertEquals(1, $data->getTypeId());
         $this->assertEquals(0, $data->isNotify());
         $this->assertEquals(1529228863, $data->getDateAdd());
-        $this->assertEquals(1529229463, $data->getDateExpire());
+        $this->assertEquals(1532280825, $data->getDateExpire());
         $this->assertEquals(0, $data->getDateUpdate());
         $this->assertEquals(0, $data->getCountViews());
         $this->assertEquals(3, $data->getMaxCountViews());
@@ -232,7 +230,7 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
         $this->assertEquals('Google', $data->getAccountName());
         $this->assertEquals('admin', $data->getUserLogin());
 
-        $this->assertEquals(0, self::$repository->getById(3)->getNumRows());
+        $this->assertEquals(0, self::$repository->getById(10)->getNumRows());
     }
 
     /**
@@ -241,11 +239,11 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
      */
     public function testDelete()
     {
-        $this->assertEquals(1, self::$repository->delete(1));
         $this->assertEquals(1, self::$repository->delete(2));
-        $this->assertEquals(0, self::$repository->delete(3));
+        $this->assertEquals(1, self::$repository->delete(3));
+        $this->assertEquals(0, self::$repository->delete(4));
 
-        $this->assertEquals(0, $this->conn->getRowCount('PublicLink'));
+        $this->assertEquals(0, self::getRowCount('PublicLink'));
     }
 
     /**
@@ -254,7 +252,7 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
      */
     public function testAddLinkView()
     {
-        $hash = pack('H*', '313065363937306666653833623531393234356635333433333732626366663433376461623565356134386238326131653238636131356235346635');
+        $hash = pack('H*', '636564333430306561313730363139616437643235383934383862366236303734376561393966313265323230663561393130656465366438333466');
 
         $useInfo = [
             'who' => SELF_IP_ADDRESS,
@@ -284,7 +282,7 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
      */
     public function testGetByHash()
     {
-        $hash = pack('H*', '313065363937306666653833623531393234356635333433333732626366663433376461623565356134386238326131653238636131356235346635');
+        $hash = pack('H*', '636564333430306561313730363139616437643235383934383862366236303734376561393966313265323230663561393130656465366438333466');
 
         $result = self::$repository->getByHash($hash);
         /** @var PublicLinkData $data */
@@ -300,7 +298,7 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
         $this->assertEquals(1, $data->getTypeId());
         $this->assertEquals(0, $data->isNotify());
         $this->assertEquals(1529228863, $data->getDateAdd());
-        $this->assertEquals(1529229463, $data->getDateExpire());
+        $this->assertEquals(1532280825, $data->getDateExpire());
         $this->assertEquals(0, $data->getDateUpdate());
         $this->assertEquals(0, $data->getCountViews());
         $this->assertEquals(3, $data->getMaxCountViews());
@@ -323,23 +321,17 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
         $data->setDateExpire(time() + 3600);
         $data->setMaxCountViews(6);
         $data->setData('data_new');
-        $data->setId(1);
+        $data->setId(2);
 
         $this->assertEquals(1, self::$repository->refresh($data));
 
         /** @var PublicLinkListData $resultData */
-        $resultData = self::$repository->getById(1)->getData();
+        $resultData = self::$repository->getById(2)->getData();
 
         $this->assertEquals($data->getHash(), $resultData->getHash());
         $this->assertEquals($data->getDateExpire(), $resultData->getDateExpire());
         $this->assertEquals($data->getMaxCountViews(), $resultData->getMaxCountViews());
         $this->assertEquals($data->getData(), $resultData->getData());
-
-        $this->expectException(ConstraintException::class);
-
-        $data->setId(2);
-
-        self::$repository->refresh($data);
     }
 
     /**
@@ -376,24 +368,24 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
         $this->assertEquals(2, $result->getNumRows());
 
         $this->assertInstanceOf(PublicLinkListData::class, $data[0]);
-        $this->assertEquals(1, $data[0]->getId());
+        $this->assertEquals(2, $data[0]->getId());
 
         $this->assertInstanceOf(PublicLinkListData::class, $data[1]);
-        $this->assertEquals(2, $data[1]->getId());
-        $this->assertEquals(1, $data[1]->getItemId());
-        $this->assertEquals(pack('H*', '313065363937306666653833623531393234356635333433333732626366663433376461623565356134386238326131653238636131356235346635'), $data[1]->getHash());
+        $this->assertEquals(3, $data[1]->getId());
+        $this->assertEquals(2, $data[1]->getItemId());
+        $this->assertEquals(pack('H*', '616337343462363934383832336362303531343534366335363739383163653466653732343064663339363832366439396632346664396131333434'), $data[1]->getHash());
         $this->assertNotEmpty($data[1]->getData());
         $this->assertEquals(1, $data[1]->getUserId());
         $this->assertEquals(1, $data[1]->getTypeId());
         $this->assertEquals(0, $data[1]->isNotify());
-        $this->assertEquals(1529228863, $data[1]->getDateAdd());
-        $this->assertEquals(1529229463, $data[1]->getDateExpire());
+        $this->assertEquals(1529276100, $data[1]->getDateAdd());
+        $this->assertEquals(1532280828, $data[1]->getDateExpire());
         $this->assertEquals(0, $data[1]->getDateUpdate());
         $this->assertEquals(0, $data[1]->getCountViews());
         $this->assertEquals(3, $data[1]->getMaxCountViews());
         $this->assertEquals(0, $data[1]->getTotalCountViews());
         $this->assertNull($data[1]->getUseInfo());
-        $this->assertEquals('Google', $data[1]->getAccountName());
+        $this->assertEquals('Apple', $data[1]->getAccountName());
         $this->assertEquals('admin', $data[1]->getUserLogin());
 
         $this->assertEquals(0, self::$repository->getByIdBatch([])->getNumRows());
@@ -412,24 +404,24 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
         $this->assertEquals(2, $result->getNumRows());
 
         $this->assertInstanceOf(PublicLinkListData::class, $data[0]);
-        $this->assertEquals(1, $data[0]->getId());
+        $this->assertEquals(2, $data[0]->getId());
 
         $this->assertInstanceOf(PublicLinkListData::class, $data[1]);
-        $this->assertEquals(2, $data[1]->getId());
-        $this->assertEquals(1, $data[1]->getItemId());
-        $this->assertEquals(pack('H*', '313065363937306666653833623531393234356635333433333732626366663433376461623565356134386238326131653238636131356235346635'), $data[1]->getHash());
+        $this->assertEquals(3, $data[1]->getId());
+        $this->assertEquals(2, $data[1]->getItemId());
+        $this->assertEquals(pack('H*', '616337343462363934383832336362303531343534366335363739383163653466653732343064663339363832366439396632346664396131333434'), $data[1]->getHash());
         $this->assertNotEmpty($data[1]->getData());
         $this->assertEquals(1, $data[1]->getUserId());
         $this->assertEquals(1, $data[1]->getTypeId());
         $this->assertEquals(0, $data[1]->isNotify());
-        $this->assertEquals(1529228863, $data[1]->getDateAdd());
-        $this->assertEquals(1529229463, $data[1]->getDateExpire());
+        $this->assertEquals(1529276100, $data[1]->getDateAdd());
+        $this->assertEquals(1532280828, $data[1]->getDateExpire());
         $this->assertEquals(0, $data[1]->getDateUpdate());
         $this->assertEquals(0, $data[1]->getCountViews());
         $this->assertEquals(3, $data[1]->getMaxCountViews());
         $this->assertEquals(0, $data[1]->getTotalCountViews());
         $this->assertNull($data[1]->getUseInfo());
-        $this->assertEquals('Google', $data[1]->getAccountName());
+        $this->assertEquals('Apple', $data[1]->getAccountName());
         $this->assertEquals('admin', $data[1]->getUserLogin());
     }
 
@@ -442,8 +434,8 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
     public function testUpdate()
     {
         $data = new PublicLinkData();
-        $data->setId(1);
-        $data->setItemId(2);
+        $data->setId(2);
+        $data->setItemId(3);
         $data->setHash(PasswordUtil::generateRandomBytes());
         $data->setData('data');
         $data->setUserId(2);
@@ -456,9 +448,9 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
         $this->assertEquals(1, self::$repository->update($data));
 
         /** @var PublicLinkListData $resultData */
-        $resultData = self::$repository->getById(1)->getData();
+        $resultData = self::$repository->getById(2)->getData();
 
-        $this->assertEquals(1, $resultData->getId());
+        $this->assertEquals(2, $resultData->getId());
         $this->assertEquals($data->getItemId(), $resultData->getItemId());
         $this->assertEquals($data->getHash(), $resultData->getHash());
         $this->assertEquals($data->getData(), $resultData->getData());
@@ -471,7 +463,7 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
 
         $this->expectException(ConstraintException::class);
 
-        $data->setItemId(1);
+        $data->setItemId(2);
 
         self::$repository->update($data);
     }
diff --git a/tests/SP/Repositories/TagRepositoryTest.php b/tests/SP/Repositories/TagRepositoryTest.php
index 3dfb4643..38a34381 100644
--- a/tests/SP/Repositories/TagRepositoryTest.php
+++ b/tests/SP/Repositories/TagRepositoryTest.php
@@ -59,14 +59,11 @@ class TagRepositoryTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(TagRepository::class);
@@ -131,7 +128,7 @@ class TagRepositoryTest extends DatabaseTestCase
      */
     public function testGetAll()
     {
-        $count = $this->conn->getRowCount('Tag');
+        $count = self::getRowCount('Tag');
 
         $results = self::$repository->getAll();
 
@@ -187,7 +184,7 @@ class TagRepositoryTest extends DatabaseTestCase
         $this->assertEquals(0, self::$repository->deleteByIdBatch([4]));
         $this->assertEquals(3, self::$repository->deleteByIdBatch([1, 2, 3]));
 
-        $this->assertEquals(0, $this->conn->getRowCount('Tag'));
+        $this->assertEquals(0, self::getRowCount('Tag'));
     }
 
     /**
@@ -198,7 +195,7 @@ class TagRepositoryTest extends DatabaseTestCase
      */
     public function testCreate()
     {
-        $countBefore = $this->conn->getRowCount('Tag');
+        $countBefore = self::getRowCount('Tag');
 
         $tagData = new TagData();
         $tagData->name = 'Core';
@@ -210,7 +207,7 @@ class TagRepositoryTest extends DatabaseTestCase
 
         $this->assertEquals($tagData->name, $data->getName());
 
-        $countAfter = $this->conn->getRowCount('Tag');
+        $countAfter = self::getRowCount('Tag');
 
         $this->assertEquals($countBefore + 1, $countAfter);
     }
@@ -223,11 +220,11 @@ class TagRepositoryTest extends DatabaseTestCase
      */
     public function testDelete()
     {
-        $countBefore = $this->conn->getRowCount('Tag');
+        $countBefore = self::getRowCount('Tag');
 
         $this->assertEquals(1, self::$repository->delete(3));
 
-        $countAfter = $this->conn->getRowCount('Tag');
+        $countAfter = self::getRowCount('Tag');
 
         $this->assertEquals($countBefore - 1, $countAfter);
 
diff --git a/tests/SP/Repositories/TrackRepositoryTest.php b/tests/SP/Repositories/TrackRepositoryTest.php
index 9df753e2..a14dbcf4 100644
--- a/tests/SP/Repositories/TrackRepositoryTest.php
+++ b/tests/SP/Repositories/TrackRepositoryTest.php
@@ -54,14 +54,11 @@ class TrackRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_track.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(TrackRepository::class);
@@ -75,7 +72,7 @@ class TrackRepositoryTest extends DatabaseTestCase
     {
         $this->assertEquals(1, self::$repository->delete(1));
 
-        $this->assertEquals(5, $this->conn->getRowCount('Track'));
+        $this->assertEquals(5, self::getRowCount('Track'));
 
         $this->assertEquals(0, self::$repository->delete(10));
     }
diff --git a/tests/SP/Repositories/UserGroupRepositoryTest.php b/tests/SP/Repositories/UserGroupRepositoryTest.php
index 5252e4a3..5ea9ecd9 100644
--- a/tests/SP/Repositories/UserGroupRepositoryTest.php
+++ b/tests/SP/Repositories/UserGroupRepositoryTest.php
@@ -57,14 +57,11 @@ class UserGroupRepositoryTestCase extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_userGroup.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(UserGroupRepository::class);
@@ -82,7 +79,7 @@ class UserGroupRepositoryTestCase extends DatabaseTestCase
 
         $this->assertEquals(5, self::$repository->getUsageByUsers(2)->getNumRows());
 
-        $this->assertEquals(0, self::$repository->getUsageByUsers(4)->getNumRows());
+        $this->assertEquals(0, self::$repository->getUsageByUsers(10)->getNumRows());
     }
 
     /**
@@ -128,9 +125,9 @@ class UserGroupRepositoryTestCase extends DatabaseTestCase
      */
     public function testDeleteByIdBatch()
     {
-        $this->assertEquals(2, self::$repository->deleteByIdBatch([4, 5]));
+        $this->assertEquals(2, self::$repository->deleteByIdBatch([5, 6]));
 
-        $this->assertEquals(3, $this->conn->getRowCount('UserGroup'));
+        $this->assertEquals(4, self::getRowCount('UserGroup'));
     }
 
     /**
@@ -151,9 +148,9 @@ class UserGroupRepositoryTestCase extends DatabaseTestCase
      */
     public function testDeleteByIdBatchUnknown()
     {
-        $this->assertEquals(2, self::$repository->deleteByIdBatch([4, 5, 10]));
+        $this->assertEquals(2, self::$repository->deleteByIdBatch([5, 6, 10]));
 
-        $this->assertEquals(3, $this->conn->getRowCount('UserGroup'));
+        $this->assertEquals(4, self::getRowCount('UserGroup'));
     }
 
     /**
@@ -212,7 +209,7 @@ class UserGroupRepositoryTestCase extends DatabaseTestCase
     public function testCreate()
     {
         $data = new UserGroupData();
-        $data->setId(6);
+        $data->setId(7);
         $data->setName('Grupo Prueba');
         $data->setDescription('Grupo de prueba para usuarios');
 
@@ -247,12 +244,12 @@ class UserGroupRepositoryTestCase extends DatabaseTestCase
     {
         $result = self::$repository->getAll();
 
-        $this->assertEquals(5, $result->getNumRows());
+        $this->assertEquals(6, $result->getNumRows());
 
         /** @var UserGroupData[] $data */
         $data = $result->getDataAsArray();
 
-        $this->assertCount(5, $data);
+        $this->assertCount(6, $data);
 
         $this->assertInstanceOf(UserGroupData::class, $data[0]);
         $this->assertEquals('Admins', $data[0]->getName());
@@ -270,9 +267,9 @@ class UserGroupRepositoryTestCase extends DatabaseTestCase
      */
     public function testDelete()
     {
-        $this->assertEquals(1, self::$repository->delete(3));
+        $this->assertEquals(1, self::$repository->delete(5));
 
-        $this->assertEquals(4, $this->conn->getRowCount('UserGroup'));
+        $this->assertEquals(5, self::getRowCount('UserGroup'));
 
         $this->assertEquals(0, self::$repository->delete(10));
     }
@@ -299,9 +296,9 @@ class UserGroupRepositoryTestCase extends DatabaseTestCase
     {
         $this->assertEquals(7, self::$repository->getUsage(2)->getNumRows());
 
-        $this->assertEquals(1, self::$repository->getUsage(3)->getNumRows());
+        $this->assertEquals(3, self::$repository->getUsage(3)->getNumRows());
 
-        $this->assertEquals(0, self::$repository->getUsage(4)->getNumRows());
+        $this->assertEquals(0, self::$repository->getUsage(10)->getNumRows());
     }
 
     /**
diff --git a/tests/SP/Repositories/UserPassRecoverRepositoryTest.php b/tests/SP/Repositories/UserPassRecoverRepositoryTest.php
index 7d99d269..f33202b6 100644
--- a/tests/SP/Repositories/UserPassRecoverRepositoryTest.php
+++ b/tests/SP/Repositories/UserPassRecoverRepositoryTest.php
@@ -54,14 +54,11 @@ class UserPassRecoverRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(UserPassRecoverRepository::class);
diff --git a/tests/SP/Repositories/UserProfileRepositoryTest.php b/tests/SP/Repositories/UserProfileRepositoryTest.php
index 4d78e380..ca7d0ced 100644
--- a/tests/SP/Repositories/UserProfileRepositoryTest.php
+++ b/tests/SP/Repositories/UserProfileRepositoryTest.php
@@ -59,14 +59,11 @@ class UserProfileRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(UserProfileRepository::class);
@@ -159,7 +156,7 @@ class UserProfileRepositoryTest extends DatabaseTestCase
         $result = self::$repository->delete(3);
 
         $this->assertEquals(1, $result);
-        $this->assertEquals(2, $this->conn->getRowCount('UserProfile'));
+        $this->assertEquals(2, self::getRowCount('UserProfile'));
 
         $this->expectException(ConstraintException::class);
 
@@ -201,7 +198,7 @@ class UserProfileRepositoryTest extends DatabaseTestCase
         $result = self::$repository->create($data);
 
         $this->assertEquals($data->getId(), $result);
-        $this->assertEquals(4, $this->conn->getRowCount('UserProfile'));
+        $this->assertEquals(4, self::getRowCount('UserProfile'));
 
         /** @var UserProfileData $resultData */
         $resultData = self::$repository->getById($result)->getData();
diff --git a/tests/SP/Repositories/UserRepositoryTest.php b/tests/SP/Repositories/UserRepositoryTest.php
index 921e9a6d..ad683ab8 100644
--- a/tests/SP/Repositories/UserRepositoryTest.php
+++ b/tests/SP/Repositories/UserRepositoryTest.php
@@ -64,14 +64,11 @@ class UserRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(UserRepository::class);
@@ -149,7 +146,7 @@ class UserRepositoryTest extends DatabaseTestCase
         $this->assertEquals('sysPass demo', $data->getName());
         $this->assertEquals('demo', $data->getLogin());
 
-        $result = self::$repository->getById(5);
+        $result = self::$repository->getById(10);
 
         $this->assertEquals(0, $result->getNumRows());
     }
@@ -212,7 +209,7 @@ class UserRepositoryTest extends DatabaseTestCase
      */
     public function testGetByIdBatch()
     {
-        $users = self::$repository->getByIdBatch([1, 2, 5]);
+        $users = self::$repository->getByIdBatch([1, 2, 10]);
 
         $this->assertCount(2, $users);
         $this->assertInstanceOf(UserData::class, $users[0]);
@@ -230,7 +227,7 @@ class UserRepositoryTest extends DatabaseTestCase
     {
         $users = self::$repository->getAll();
 
-        $this->assertCount(4, $users);
+        $this->assertCount(5, $users);
         $this->assertInstanceOf(UserData::class, $users[0]);
         $this->assertEquals('admin', $users[0]->getLogin());
     }
@@ -301,10 +298,10 @@ class UserRepositoryTest extends DatabaseTestCase
      */
     public function testDelete()
     {
-        $result = self::$repository->delete(3);
+        $result = self::$repository->delete(4);
 
         $this->assertEquals(1, $result);
-        $this->assertEquals(3, $this->conn->getRowCount('User'));
+        $this->assertEquals(4, self::getRowCount('User'));
 
         $this->expectException(ConstraintException::class);
 
@@ -321,11 +318,11 @@ class UserRepositoryTest extends DatabaseTestCase
     {
         $result = self::$repository->getBasicInfo();
 
-        $this->assertEquals(4, $result->getNumRows());
+        $this->assertEquals(5, $result->getNumRows());
 
         $data = $result->getDataAsArray();
 
-        $this->assertCount(4, $data);
+        $this->assertCount(5, $data);
         $this->assertInstanceOf(UserData::class, $data[0]);
     }
 
@@ -418,7 +415,7 @@ class UserRepositoryTest extends DatabaseTestCase
         $userData->setIsLdap(0);
         $userData->setPass(Hash::hashKey('prueba123'));
 
-        $this->assertEquals(5, self::$repository->create($userData));
+        $this->assertEquals(6, self::$repository->create($userData));
 
         $userData->setLogin('demo');
         $userData->setEmail('prueba@syspass.org');
diff --git a/tests/SP/Repositories/UserToUserGroupRepositoryTest.php b/tests/SP/Repositories/UserToUserGroupRepositoryTest.php
index 876015dc..aab4a0ef 100644
--- a/tests/SP/Repositories/UserToUserGroupRepositoryTest.php
+++ b/tests/SP/Repositories/UserToUserGroupRepositoryTest.php
@@ -52,14 +52,11 @@ class UserToUserGroupRepositoryTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_userGroup.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$repository = $dic->get(UserToUserGroupRepository::class);
@@ -82,13 +79,12 @@ class UserToUserGroupRepositoryTest extends DatabaseTestCase
 
         $result = self::$repository->getGroupsForUser(2);
 
-        $this->assertEquals(2, $result->getNumRows());
+        $this->assertEquals(1, $result->getNumRows());
 
         $data = $result->getDataAsArray();
 
-        $this->assertCount(2, $data);
+        $this->assertCount(1, $data);
         $this->assertEquals(1, $data[0]->userGroupId);
-        $this->assertEquals(3, $data[1]->userGroupId);
 
         $this->assertEquals(0, self::$repository->getGroupsForUser(10)->getNumRows());
     }
@@ -146,12 +142,12 @@ class UserToUserGroupRepositoryTest extends DatabaseTestCase
         $this->assertEquals(2, $data[1]->getUserGroupId());
         $this->assertEquals(3, $data[1]->getUserId());
 
-        $data = self::$repository->getById(3)->getDataAsArray();
+        $data = self::$repository->getById(1)->getDataAsArray();
 
         $this->assertCount(1, $data);
 
         $this->assertInstanceOf(UserToUserGroupData::class, $data[0]);
-        $this->assertEquals(3, $data[0]->getUserGroupId());
+        $this->assertEquals(1, $data[0]->getUserGroupId());
         $this->assertEquals(2, $data[0]->getUserId());
 
         $this->assertEquals(0, self::$repository->getById(10)->getNumRows());
diff --git a/tests/SP/Services/Account/AccountAclServiceTest.php b/tests/SP/Services/Account/AccountAclServiceTest.php
index a67c2660..06165e52 100644
--- a/tests/SP/Services/Account/AccountAclServiceTest.php
+++ b/tests/SP/Services/Account/AccountAclServiceTest.php
@@ -89,14 +89,11 @@ class AccountAclServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_accountAcl.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         self::$context = $dic->get(ContextInterface::class);
 
@@ -437,14 +434,15 @@ class AccountAclServiceTest extends DatabaseTestCase
         $this->checkViewFiles($accountAclDto);
 
         $accountAclDto = $this->setUpAccountEnvironment(2, 2, 2);
+        $should = ['view' => true, 'edit' => false];
 
-        $this->checkView($accountAclDto);
-        $this->checkViewPass($accountAclDto);
-        $this->checkDelete($accountAclDto);
-        $this->checkEditPass($accountAclDto);
-        $this->checkEditAndRestore($accountAclDto);
-        $this->checkPermissions($accountAclDto);
-        $this->checkViewFiles($accountAclDto);
+        $this->checkView($accountAclDto, $should);
+        $this->checkViewPass($accountAclDto, $should);
+        $this->checkDelete($accountAclDto, $should);
+        $this->checkEditPass($accountAclDto, $should);
+        $this->checkEditAndRestore($accountAclDto, $should);
+        $this->checkPermissions($accountAclDto, $should);
+        $this->checkViewFiles($accountAclDto, $should);
 
         $accountAclDto = $this->setUpAccountEnvironment(2, 3, 3);
         $should = ['view' => true, 'edit' => false];
diff --git a/tests/SP/Services/Account/AccountCryptServiceTest.php b/tests/SP/Services/Account/AccountCryptServiceTest.php
index cd158772..67079c90 100644
--- a/tests/SP/Services/Account/AccountCryptServiceTest.php
+++ b/tests/SP/Services/Account/AccountCryptServiceTest.php
@@ -64,14 +64,11 @@ class AccountCryptServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_accountCrypt.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(AccountCryptService::class);
diff --git a/tests/SP/Services/Account/AccountFileServiceTest.php b/tests/SP/Services/Account/AccountFileServiceTest.php
index dc6d25a6..bdf84de1 100644
--- a/tests/SP/Services/Account/AccountFileServiceTest.php
+++ b/tests/SP/Services/Account/AccountFileServiceTest.php
@@ -58,14 +58,11 @@ class AccountFileServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_accountFile.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(AccountFileService::class);
@@ -123,7 +120,7 @@ class AccountFileServiceTest extends DatabaseTestCase
         $this->assertEquals($data->getContent(), $resultData->getContent());
         $this->assertEquals('no_thumb', $resultData->getThumb());
 
-        $this->assertEquals(5, $this->conn->getRowCount('AccountFile'));
+        $this->assertEquals(5, self::getRowCount('AccountFile'));
     }
 
     /**
@@ -314,7 +311,7 @@ class AccountFileServiceTest extends DatabaseTestCase
             ->delete(1)
             ->delete(3);
 
-        $this->assertEquals(1, $this->conn->getRowCount('AccountFile'));
+        $this->assertEquals(1, self::getRowCount('AccountFile'));
 
         $this->expectException(NoSuchItemException::class);
 
@@ -331,7 +328,7 @@ class AccountFileServiceTest extends DatabaseTestCase
         $this->assertEquals(2, self::$service->deleteByIdBatch([1, 3]));
         $this->assertEquals(0, self::$service->deleteByIdBatch([]));
 
-        $this->assertEquals(1, $this->conn->getRowCount('AccountFile'));
+        $this->assertEquals(1, self::getRowCount('AccountFile'));
 
         $this->expectException(ServiceException::class);
 
diff --git a/tests/SP/Services/Account/AccountHistoryServiceTest.php b/tests/SP/Services/Account/AccountHistoryServiceTest.php
index 9bb9cc92..9531564e 100644
--- a/tests/SP/Services/Account/AccountHistoryServiceTest.php
+++ b/tests/SP/Services/Account/AccountHistoryServiceTest.php
@@ -60,14 +60,11 @@ class AccountHistoryServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_accountHistory.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(AccountHistoryService::class);
@@ -105,7 +102,7 @@ class AccountHistoryServiceTest extends DatabaseTestCase
         $result = self::$service->create(new AccountHistoryCreateDto(10, true, false, PasswordUtil::generateRandomBytes()));
         $this->assertEquals(0, $result);
 
-        $this->assertEquals(7, $this->conn->getRowCount('AccountHistory'));
+        $this->assertEquals(7, self::getRowCount('AccountHistory'));
     }
 
     /**
@@ -189,7 +186,7 @@ class AccountHistoryServiceTest extends DatabaseTestCase
 
         self::$service->delete(1);
 
-        $this->assertEquals(3, $this->conn->getRowCount('AccountHistory'));
+        $this->assertEquals(3, self::getRowCount('AccountHistory'));
     }
 
     /**
@@ -201,7 +198,7 @@ class AccountHistoryServiceTest extends DatabaseTestCase
         $this->assertEquals(3, self::$service->deleteByIdBatch([1, 3, 4, 5]));
         $this->assertEquals(0, self::$service->deleteByIdBatch([]));
 
-        $this->assertEquals(2, $this->conn->getRowCount('AccountHistory'));
+        $this->assertEquals(2, self::getRowCount('AccountHistory'));
     }
 
     /**
@@ -258,6 +255,6 @@ class AccountHistoryServiceTest extends DatabaseTestCase
 
         $this->assertEquals(0, self::$service->deleteByAccountIdBatch([]));
 
-        $this->assertEquals(1, $this->conn->getRowCount('AccountHistory'));
+        $this->assertEquals(1, self::getRowCount('AccountHistory'));
     }
 }
diff --git a/tests/SP/Services/Account/AccountSearchServiceTest.php b/tests/SP/Services/Account/AccountSearchServiceTest.php
index 82e4749e..91fbbf4c 100644
--- a/tests/SP/Services/Account/AccountSearchServiceTest.php
+++ b/tests/SP/Services/Account/AccountSearchServiceTest.php
@@ -64,14 +64,11 @@ class AccountSearchServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_accountSearch.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(AccountSearchService::class);
diff --git a/tests/SP/Services/Account/AccountServiceTest.php b/tests/SP/Services/Account/AccountServiceTest.php
index 1e7d2e18..f91dc8f0 100644
--- a/tests/SP/Services/Account/AccountServiceTest.php
+++ b/tests/SP/Services/Account/AccountServiceTest.php
@@ -81,17 +81,14 @@ class AccountServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_account.xml';
+        self::$loadFixtures = true;
 
         self::$context = $dic->get(ContextInterface::class);
 
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
-
         // Inicializar el servicio
         self::$service = $dic->get(AccountService::class);
         self::$accountHistoryService = $dic->get(AccountHistoryService::class);
@@ -127,9 +124,11 @@ class AccountServiceTest extends DatabaseTestCase
         $accountRequest->userGroupsView = [2, 3];
         $accountRequest->userGroupsEdit = [2];
 
-        $this->assertEquals(3, self::$service->create($accountRequest));
+        $expectedId = 5;
 
-        $result = self::$service->getById(3);
+        $this->assertEquals($expectedId, self::$service->create($accountRequest));
+
+        $result = self::$service->getById($expectedId);
 
         self::$service->withTagsById($result);
         self::$service->withUsersById($result);
@@ -137,7 +136,7 @@ class AccountServiceTest extends DatabaseTestCase
 
         $data = $result->getAccountVData();
 
-        $this->assertEquals(3, $result->getId());
+        $this->assertEquals($expectedId, $result->getId());
         $this->assertEquals($accountRequest->name, $data->getName());
         $this->assertEquals($accountRequest->login, $data->getLogin());
         $this->assertEquals($accountRequest->url, $data->getUrl());
@@ -173,7 +172,7 @@ class AccountServiceTest extends DatabaseTestCase
         $this->assertEquals(3, $groups[1]->getId());
         $this->assertEquals(0, (int)$groups[1]->isEdit);
 
-        $data = self::$service->getPasswordForId(3);
+        $data = self::$service->getPasswordForId($expectedId);
 
         $this->assertEquals('1234abc', Crypt::decrypt($data->getPass(), $data->getKey(), self::SECURE_KEY_PASSWORD));
     }
@@ -184,13 +183,13 @@ class AccountServiceTest extends DatabaseTestCase
     public function testDelete()
     {
         // Comprobar registros iniciales
-        $this->assertEquals(2, $this->conn->getRowCount('Account'));
+        $this->assertEquals(4, self::getRowCount('Account'));
 
         // Eliminar registros y comprobar el total de registros
         self::$service->delete(1);
         self::$service->delete(2);
 
-        $this->assertEquals(0, $this->conn->getRowCount('Account'));
+        $this->assertEquals(2, self::getRowCount('Account'));
 
         $this->expectException(NoSuchItemException::class);
 
@@ -227,7 +226,7 @@ class AccountServiceTest extends DatabaseTestCase
      */
     public function testGetTotalNumAccounts()
     {
-        $this->assertEquals(7, self::$service->getTotalNumAccounts());
+        $this->assertEquals(9, self::$service->getTotalNumAccounts());
     }
 
     /**
@@ -260,7 +259,7 @@ class AccountServiceTest extends DatabaseTestCase
      */
     public function testGetAccountsPassData()
     {
-        $this->assertCount(2, self::$service->getAccountsPassData());
+        $this->assertCount(4, self::$service->getAccountsPassData());
     }
 
     /**
@@ -275,7 +274,7 @@ class AccountServiceTest extends DatabaseTestCase
         self::$service->editRestore(1, 1);
         self::$service->editRestore(3, 10);
 
-        $this->assertEquals(6, $this->conn->getRowCount('AccountHistory'));
+        $this->assertEquals(6, self::getRowCount('AccountHistory'));
     }
 
     /**
@@ -618,7 +617,7 @@ class AccountServiceTest extends DatabaseTestCase
     public function testUpdateNotFound()
     {
         $accountRequest = new AccountRequest();
-        $accountRequest->id = 3;
+        $accountRequest->id = 10;
 
         $this->expectException(NoSuchItemException::class);
 
@@ -654,12 +653,12 @@ class AccountServiceTest extends DatabaseTestCase
     public function testDeleteByIdBatch()
     {
         // Comprobar registros iniciales
-        $this->assertEquals(2, $this->conn->getRowCount('Account'));
+        $this->assertEquals(4, self::getRowCount('Account'));
 
         self::$service->deleteByIdBatch([1, 2, 100]);
 
         // Comprobar registros tras eliminación
-        $this->assertEquals(0, $this->conn->getRowCount('Account'));
+        $this->assertEquals(2, self::getRowCount('Account'));
 
         $this->expectException(ServiceException::class);
 
@@ -732,7 +731,7 @@ class AccountServiceTest extends DatabaseTestCase
         /** @var AccountSearchVData[] $result */
         $result = self::$service->getByFilter($searchFilter)->getDataAsArray();
 
-        $this->assertCount(0, $result);
+        $this->assertCount(1, $result);
 
         // Comprobar las etiquetas
         $searchFilter->reset();
@@ -742,8 +741,8 @@ class AccountServiceTest extends DatabaseTestCase
         /** @var AccountSearchVData[] $result */
         $result = self::$service->getByFilter($searchFilter)->getDataAsArray();
 
-        $this->assertCount(1, $result);
-        $this->assertEquals(1, $result[0]->getId());
+        $this->assertCount(2, $result);
+        $this->assertEquals(2, $result[0]->getId());
     }
 
     /**
@@ -847,11 +846,15 @@ class AccountServiceTest extends DatabaseTestCase
     {
         $data = self::$service->getAllBasic();
 
-        $this->assertCount(2, $data);
+        $this->assertCount(4, $data);
         $this->assertInstanceOf(AccountData::class, $data[0]);
         $this->assertEquals(1, $data[0]->getId());
         $this->assertInstanceOf(AccountData::class, $data[1]);
         $this->assertEquals(2, $data[1]->getId());
+        $this->assertInstanceOf(AccountData::class, $data[2]);
+        $this->assertEquals(3, $data[2]->getId());
+        $this->assertInstanceOf(AccountData::class, $data[3]);
+        $this->assertEquals(4, $data[3]->getId());
     }
 
     /**
@@ -861,9 +864,11 @@ class AccountServiceTest extends DatabaseTestCase
     {
         $data = self::$accountHistoryService->getById(7);
 
-        $this->assertEquals(3, self::$service->createFromHistory($data));
+        $expectedId = 5;
 
-        $result = self::$service->getById(3);
+        $this->assertEquals($expectedId, self::$service->createFromHistory($data));
+
+        $result = self::$service->getById($expectedId);
         $resultData = $result->getAccountVData();
 
         $this->assertEquals($data->getName(), $resultData->getName());
@@ -879,7 +884,7 @@ class AccountServiceTest extends DatabaseTestCase
         $this->assertEquals($data->getIsPrivate(), $resultData->getIsPrivate());
         $this->assertEquals($data->getIsPrivateGroup(), $resultData->getIsPrivateGroup());
 
-        $resultData = self::$service->getPasswordForId(3);
+        $resultData = self::$service->getPasswordForId($expectedId);
 
         $this->assertEquals($data->getPass(), $resultData->getPass());
         $this->assertEquals($data->getKey(), $resultData->getKey());
diff --git a/tests/SP/Services/Account/AccountToFavoriteServiceTest.php b/tests/SP/Services/Account/AccountToFavoriteServiceTest.php
index c12b1e39..480a130b 100644
--- a/tests/SP/Services/Account/AccountToFavoriteServiceTest.php
+++ b/tests/SP/Services/Account/AccountToFavoriteServiceTest.php
@@ -51,14 +51,11 @@ class AccountToFavoriteServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_accountFavorite.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(AccountToFavoriteService::class);
diff --git a/tests/SP/Services/Account/AccountToTagServiceTest.php b/tests/SP/Services/Account/AccountToTagServiceTest.php
index 8b36501f..f8a241af 100644
--- a/tests/SP/Services/Account/AccountToTagServiceTest.php
+++ b/tests/SP/Services/Account/AccountToTagServiceTest.php
@@ -51,14 +51,11 @@ class AccountToTagServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(AccountToTagService::class);
@@ -70,7 +67,7 @@ class AccountToTagServiceTest extends DatabaseTestCase
      */
     public function testGetTagsByAccountId()
     {
-        $this->assertCount(1, self::$service->getTagsByAccountId(1));
+        $this->assertCount(2, self::$service->getTagsByAccountId(1));
         $this->assertCount(0, self::$service->getTagsByAccountId(10));
     }
 }
diff --git a/tests/SP/Services/Api/ApiServiceTest.php b/tests/SP/Services/Api/ApiServiceTest.php
index 3e44b572..c9bff496 100644
--- a/tests/SP/Services/Api/ApiServiceTest.php
+++ b/tests/SP/Services/Api/ApiServiceTest.php
@@ -63,14 +63,11 @@ class ApiServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_authToken.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(ApiService::class);
diff --git a/tests/SP/Services/AuthToken/AuthTokenServiceTest.php b/tests/SP/Services/AuthToken/AuthTokenServiceTest.php
index f4047beb..514f8d3d 100644
--- a/tests/SP/Services/AuthToken/AuthTokenServiceTest.php
+++ b/tests/SP/Services/AuthToken/AuthTokenServiceTest.php
@@ -68,14 +68,11 @@ class AuthTokenServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_authToken.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(AuthTokenService::class);
@@ -94,7 +91,7 @@ class AuthTokenServiceTest extends DatabaseTestCase
 
         self::$service->delete(10);
 
-        $this->assertEquals(4, $this->conn->getRowCount('AuthToken'));
+        $this->assertEquals(4, self::getRowCount('AuthToken'));
     }
 
     /**
@@ -112,7 +109,7 @@ class AuthTokenServiceTest extends DatabaseTestCase
 
         self::$service->deleteByIdBatch([3, 10]);
 
-        $this->assertEquals(2, $this->conn->getRowCount('AuthToken'));
+        $this->assertEquals(2, self::getRowCount('AuthToken'));
 
     }
 
@@ -284,7 +281,7 @@ class AuthTokenServiceTest extends DatabaseTestCase
         $authTokenData->setUserId(2);
 
         $this->assertEquals(6, self::$service->create($authTokenData));
-        $this->assertEquals(6, $this->conn->getRowCount('AuthToken'));
+        $this->assertEquals(6, self::getRowCount('AuthToken'));
 
         $data = self::$service->getTokenByToken(ActionsInterface::ACCOUNT_CREATE, $authTokenData->getToken());
 
diff --git a/tests/SP/Services/Backup/FileBackupServiceTest.php b/tests/SP/Services/Backup/FileBackupServiceTest.php
index b9548d21..b1b64abd 100644
--- a/tests/SP/Services/Backup/FileBackupServiceTest.php
+++ b/tests/SP/Services/Backup/FileBackupServiceTest.php
@@ -49,9 +49,9 @@ class FileBackupServiceTest extends TestCase
     {
         $dic = setupContext();
         $service = $dic->get(FileBackupService::class);
-        $service->doBackup(RESOURCE_DIR);
+        $service->doBackup(TMP_PATH);
 
-        $this->assertFileExists(FileBackupService::getAppBackupFilename(RESOURCE_DIR, $service->getHash(), true));
-        $this->assertFileExists(FileBackupService::getDbBackupFilename(RESOURCE_DIR, $service->getHash(), true));
+        $this->assertFileExists(FileBackupService::getAppBackupFilename(TMP_PATH, $service->getHash(), true));
+        $this->assertFileExists(FileBackupService::getDbBackupFilename(TMP_PATH, $service->getHash(), true));
     }
 }
diff --git a/tests/SP/Services/Category/CategoryServiceTest.php b/tests/SP/Services/Category/CategoryServiceTest.php
index 93d46646..9cea1345 100644
--- a/tests/SP/Services/Category/CategoryServiceTest.php
+++ b/tests/SP/Services/Category/CategoryServiceTest.php
@@ -58,14 +58,11 @@ class CategoryServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$service = $dic->get(CategoryService::class);
@@ -131,7 +128,7 @@ class CategoryServiceTest extends DatabaseTestCase
      */
     public function testGetAllBasic()
     {
-        $count = $this->conn->getRowCount('Category');
+        $count = self::getRowCount('Category');
 
         $data = self::$service->getAllBasic();
 
@@ -154,11 +151,11 @@ class CategoryServiceTest extends DatabaseTestCase
      */
     public function testDeleteByIdBatch()
     {
-        $countBefore = $this->conn->getRowCount('Category');
+        $countBefore = self::getRowCount('Category');
 
         $this->assertEquals(1, self::$service->deleteByIdBatch([3]));
 
-        $countAfter = $this->conn->getRowCount('Category');
+        $countAfter = self::getRowCount('Category');
 
         $this->assertEquals($countBefore - 1, $countAfter);
 
@@ -177,7 +174,7 @@ class CategoryServiceTest extends DatabaseTestCase
      */
     public function testCreate()
     {
-        $countBefore = $this->conn->getRowCount('Category');
+        $countBefore = self::getRowCount('Category');
 
         $data = new CategoryData();
         $data->name = 'Categoría prueba';
@@ -191,7 +188,7 @@ class CategoryServiceTest extends DatabaseTestCase
         $this->assertEquals($data->name, $result->getName());
         $this->assertEquals($data->description, $result->getDescription());
 
-        $countAfter = $this->conn->getRowCount('Category');
+        $countAfter = self::getRowCount('Category');
 
         $this->assertEquals($countBefore + 1, $countAfter);
 
@@ -259,11 +256,11 @@ class CategoryServiceTest extends DatabaseTestCase
      */
     public function testDelete()
     {
-        $countBefore = $this->conn->getRowCount('Category');
+        $countBefore = self::getRowCount('Category');
 
         self::$service->delete(3);
 
-        $countAfter = $this->conn->getRowCount('Category');
+        $countAfter = self::getRowCount('Category');
 
         $this->assertEquals($countBefore - 1, $countAfter);
 
diff --git a/tests/SP/Services/Client/ClientServiceTest.php b/tests/SP/Services/Client/ClientServiceTest.php
index 1ca5a715..24994c3a 100644
--- a/tests/SP/Services/Client/ClientServiceTest.php
+++ b/tests/SP/Services/Client/ClientServiceTest.php
@@ -64,14 +64,11 @@ class ClientServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(ClientService::class);
@@ -118,20 +115,23 @@ class ClientServiceTest extends DatabaseTestCase
      */
     public function testGetAllBasic()
     {
-        $count = $this->conn->getRowCount('Client');
+        $count = self::getRowCount('Client');
 
         $results = self::$service->getAllBasic();
 
         $this->assertCount($count, $results);
 
         $this->assertInstanceOf(ClientData::class, $results[0]);
-        $this->assertEquals('Apple', $results[0]->getName());
+        $this->assertEquals('Amazon', $results[0]->getName());
 
         $this->assertInstanceOf(ClientData::class, $results[1]);
-        $this->assertEquals('Google', $results[1]->getName());
+        $this->assertEquals('Apple', $results[1]->getName());
 
         $this->assertInstanceOf(ClientData::class, $results[2]);
-        $this->assertEquals('Microsoft', $results[2]->getName());
+        $this->assertEquals('Google', $results[2]->getName());
+
+        $this->assertInstanceOf(ClientData::class, $results[3]);
+        $this->assertEquals('Microsoft', $results[3]->getName());
     }
 
     /**
@@ -162,7 +162,7 @@ class ClientServiceTest extends DatabaseTestCase
      */
     public function testGetAllForUserAdmin()
     {
-        $this->assertCount(3, self::$service->getAllForUser());
+        $this->assertCount(4, self::$service->getAllForUser());
     }
 
     /**
@@ -176,7 +176,7 @@ class ClientServiceTest extends DatabaseTestCase
 
         self::$setupUser->call($this, $userData);
 
-        $this->assertCount(1, self::$service->getAllForUser());
+        $this->assertCount(2, self::$service->getAllForUser());
     }
 
     /**
@@ -200,9 +200,9 @@ class ClientServiceTest extends DatabaseTestCase
         $this->assertEquals($data->name, $result->getName());
         $this->assertEquals($data->isGlobal, $result->getIsGlobal());
 
-        $countAfter = $this->conn->getRowCount('Client');
+        $countAfter = self::getRowCount('Client');
 
-        $this->assertEquals(4, $countAfter);
+        $this->assertEquals(5, $countAfter);
 
         $this->expectException(DuplicatedItemException::class);
 
@@ -216,11 +216,11 @@ class ClientServiceTest extends DatabaseTestCase
      */
     public function testDeleteByIdBatch()
     {
-        $countBefore = $this->conn->getRowCount('Client');
+        $countBefore = self::getRowCount('Client');
 
-        self::$service->deleteByIdBatch([3]);
+        self::$service->deleteByIdBatch([4]);
 
-        $countAfter = $this->conn->getRowCount('Client');
+        $countAfter = self::getRowCount('Client');
 
         $this->assertEquals($countBefore - 1, $countAfter);
 
@@ -259,7 +259,7 @@ class ClientServiceTest extends DatabaseTestCase
 
         $this->expectException(NoSuchItemException::class);
 
-        self::$service->getByName('Amazon');
+        self::$service->getByName('Spotify');
     }
 
     /**
@@ -267,11 +267,11 @@ class ClientServiceTest extends DatabaseTestCase
      */
     public function testDelete()
     {
-        $countBefore = $this->conn->getRowCount('Client');
+        $countBefore = self::getRowCount('Client');
 
-        self::$service->delete(3);
+        self::$service->delete(4);
 
-        $countAfter = $this->conn->getRowCount('Client');
+        $countAfter = self::getRowCount('Client');
 
         $this->assertEquals($countBefore - 1, $countAfter);
 
diff --git a/tests/SP/Services/Config/ConfigBackupServiceTest.php b/tests/SP/Services/Config/ConfigBackupServiceTest.php
index 5a3fb299..5d751b86 100644
--- a/tests/SP/Services/Config/ConfigBackupServiceTest.php
+++ b/tests/SP/Services/Config/ConfigBackupServiceTest.php
@@ -47,7 +47,7 @@ class ConfigBackupServiceTest extends TestCase
 {
     protected static $currentConfig;
 
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         self::$currentConfig = getResource('config', 'config.xml');
     }
@@ -55,7 +55,7 @@ class ConfigBackupServiceTest extends TestCase
     /**
      * This method is called after the last test of this test class is run.
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
         saveResource('config', 'config.xml', self::$currentConfig);
         recreateDir(CACHE_PATH);
diff --git a/tests/SP/Services/Config/ConfigServiceTest.php b/tests/SP/Services/Config/ConfigServiceTest.php
index 559a9c18..a5986a0a 100644
--- a/tests/SP/Services/Config/ConfigServiceTest.php
+++ b/tests/SP/Services/Config/ConfigServiceTest.php
@@ -55,14 +55,11 @@ class ConfigServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_config.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$service = $dic->get(ConfigService::class);
@@ -77,7 +74,7 @@ class ConfigServiceTest extends DatabaseTestCase
     {
         $data = self::$service->getAll();
 
-        $this->assertCount($this->conn->getRowCount('Config'), $data);
+        $this->assertCount(self::getRowCount('Config'), $data);
 
         $this->assertEquals('config_backup', $data[0]->parameter);
         $this->assertEquals('789ca558db6edb3810edb718c5be6c6b88ba4b45814de3a497a48d374e832cb0404191944d589654916a9216f9f71d5292633ba1a4621f628bf11cce68e6cc85bc886d2b9e2ce6ff1e1779ca97edd70c4b3c89c328fe2562c78e272f9e13785197cb0a5376c6ee276f440cdba82f273089d3625ddff2353fc97192313a79c3634b019c21c0d72afb2d0520ff0e0bb68b7107318255bf059863217601d110e00bde305162b2675768426514973396e23a93efaba22e95b710205c6b04625e1529cf588731bf4c591577f7a3e3a1a517acfab1ef2ad42b3f2f2aa9b60eadd01a963e0cc3c0de0731307ab3ac938ce76bf119df5d73762b94414e2f977610577ca35de95bd628c88e3ffbbd8f0929ea5c1eab0fada0d7fbadf439a818de9aac18597f2d29964c6c03db2f9d1792931d6963da13fdf8018bd5a42524b6701a440125a1635386b01721124436b27c9fb1d0775ddb4d9dc8f394bc6d0c124d3e14422a1904968a7b4816215ed3e435653f74788dd4a7c9a2206b2677b8d0a74665a29209b65a86101dd1901f4f2e681cf0facbf787e4e5d9fd59fc6b08db515a6145f9cd4b506061d7717c8cc9a0de36791cc752e4b0cda58f25f5724445659be230dd8dea550911475956dc327a7227c101384661fcabc5c593f9ec74cbc478f269fe5eadec66f5fee3e936c940f28bfecd6d5617b32bb5f2bad5624bfe7832bb3856ab40314baf6e74f1687ebc39d7a251bb5a9c6bf5ad35d78b995eb6e65cdd6825a8b5e77871ad97ad41ef8ecef4b2b5e87236d7cbd6a4b3937ff4b2b5e9f8b2d92a68f57e06bd0f633db7e03f9b426cd96e6f126ad0e8dab1cc8a04670b862bb2da86d2582d792e24ce7637ee6d235df7b481b294bc55ac41afe021ad18e325568f45b5ecef937a1f9ed38efe1e70b7e6f42da61b9ebf22f9db1a7e10eaa12d6ce2d5ff55d56529b4e205231593c87634d2eb43ce9feb3bc60c5288830cb28dad5f091f51311c1f25d8b6f9471b8c0558493fb6611b76054f4db5eba6addfa6a39ca6de1a4b598dd35a2c0fd9697e1f90fdc1f2a666d85dc900064054a0254dbb1d2030ca8e69934fc6eab6c13c3baae58a8d9d5414e0d05823e395f069556cba220d2d53fed53686ad1f7bd1dbf600cefbe3d3cbdbb5fc13fdbd621723906d81b755e5718dfe54a297ec7b0d9689c3fa6d8cb002411ed41597f7a322dc003a5e2957a8ff4c7fcb15bbddee5947fafdef4878c93be2a08e38cf6ff630f42e8f14dceeb44fb83efee412d8961336ec6765d16d51d105cef404e28383528a2c2f24d84a129c467e40ad10852ea3b6cd984d42eaf98107bf92089e228252db09e02f85f19da6fd6eaa9880095f1c89635ced9416a3bc6042f02257436c51cba6253683ac318e824b768e731d2f7030cbfb4771257eb562cd4c851cc51ac92a8eb3d74956b3fe02dccc92d7d009c0c62e851ccb9aa2d0f21c64a181131f7c24d0ac86363006fab9f3a891534af894677264ab684e894b56ef1f5f8dbe50f24d433f400c4ce2f0d84c18f0be8ee7f8be1a795c23a83ba67cdc806d8745d2f8320926ebbafcb6da99fa49845c3b0ac324a211c28e2274e83861905a5ee49000239be1d4c376bf97d85d0935707f633742294e08248b150528f1121b411e3976e0fbd8713d0b0784fa76d2dfe05652964f8aa5d1f95059f61b9cd55b901bf14b68b9928d2ec80de8e901da18aa06d0f5084f4fabe60b80768e52cde8aad0d11d6e940d8316b8b508dca3e7b3fe12c47252dd9772d15496edcdc4d039f7b4ce323de41c1138678a2de78c633486960fa32827072c758df5608b8069a1382f963c3f24f8307456a8ea3feac24988e2b93b1af35dd023e0e08ac69caeadf34eee4a5e3d4957a3a23d547781812cc70f2d28fe0fff0152be6bea', $data[0]->value);
diff --git a/tests/SP/Services/Crypt/MasterPassServiceTest.php b/tests/SP/Services/Crypt/MasterPassServiceTest.php
index e4d93afd..c24d62f1 100644
--- a/tests/SP/Services/Crypt/MasterPassServiceTest.php
+++ b/tests/SP/Services/Crypt/MasterPassServiceTest.php
@@ -68,14 +68,11 @@ class MasterPassServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_accountCrypt.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$service = $dic->get(MasterPassService::class);
diff --git a/tests/SP/Services/Crypt/TemporaryMasterPassServiceTest.php b/tests/SP/Services/Crypt/TemporaryMasterPassServiceTest.php
index c4458dd8..3d3546c0 100644
--- a/tests/SP/Services/Crypt/TemporaryMasterPassServiceTest.php
+++ b/tests/SP/Services/Crypt/TemporaryMasterPassServiceTest.php
@@ -56,7 +56,7 @@ class TemporaryMasterPassServiceTest extends TestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public function setUp()
+    public function setUp(): void
     {
         $dic = setupContext();
 
diff --git a/tests/SP/Services/CustomField/CustomFieldCryptServiceTest.php b/tests/SP/Services/CustomField/CustomFieldCryptServiceTest.php
index 108426e3..bc0f7426 100644
--- a/tests/SP/Services/CustomField/CustomFieldCryptServiceTest.php
+++ b/tests/SP/Services/CustomField/CustomFieldCryptServiceTest.php
@@ -61,14 +61,11 @@ class CustomFieldCryptServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_accountCrypt.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$service = $dic->get(CustomFieldCryptService::class);
diff --git a/tests/SP/Services/CustomField/CustomFieldDefServiceTest.php b/tests/SP/Services/CustomField/CustomFieldDefServiceTest.php
index 567fefe5..5291be11 100644
--- a/tests/SP/Services/CustomField/CustomFieldDefServiceTest.php
+++ b/tests/SP/Services/CustomField/CustomFieldDefServiceTest.php
@@ -56,14 +56,11 @@ class CustomFieldDefServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_customField.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$service = $dic->get(CustomFieldDefService::class);
@@ -84,8 +81,8 @@ class CustomFieldDefServiceTest extends DatabaseTestCase
 
         self::$service->delete(1);
 
-        $this->assertEquals(2, $this->conn->getRowCount('CustomFieldDefinition'));
-        $this->assertEquals(3, $this->conn->getRowCount('CustomFieldData'));
+        $this->assertEquals(2, self::getRowCount('CustomFieldDefinition'));
+        $this->assertEquals(3, self::getRowCount('CustomFieldData'));
     }
 
     /**
@@ -139,8 +136,8 @@ class CustomFieldDefServiceTest extends DatabaseTestCase
 
         self::$service->deleteByIdBatch([1, 2]);
 
-        $this->assertEquals(2, $this->conn->getRowCount('CustomFieldDefinition'));
-        $this->assertEquals(3, $this->conn->getRowCount('CustomFieldData'));
+        $this->assertEquals(2, self::getRowCount('CustomFieldDefinition'));
+        $this->assertEquals(3, self::getRowCount('CustomFieldData'));
     }
 
     /**
@@ -162,7 +159,7 @@ class CustomFieldDefServiceTest extends DatabaseTestCase
 
         $this->assertEquals(4, self::$service->create($data));
 
-        $this->assertEquals(4, $this->conn->getRowCount('CustomFieldDefinition'));
+        $this->assertEquals(4, self::getRowCount('CustomFieldDefinition'));
 
         $this->assertEquals($data, self::$service->getById(4));
 
@@ -216,7 +213,7 @@ class CustomFieldDefServiceTest extends DatabaseTestCase
 
         $this->assertEquals($data, $dataUpdated);
 
-        $this->assertEquals(1, $this->conn->getRowCount('CustomFieldData'));
+        $this->assertEquals(1, self::getRowCount('CustomFieldData'));
 
         $data->setTypeId(100);
 
diff --git a/tests/SP/Services/CustomField/CustomFieldServiceTest.php b/tests/SP/Services/CustomField/CustomFieldServiceTest.php
index be514862..eb2201c2 100644
--- a/tests/SP/Services/CustomField/CustomFieldServiceTest.php
+++ b/tests/SP/Services/CustomField/CustomFieldServiceTest.php
@@ -59,14 +59,11 @@ class CustomFieldServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_customField.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el repositorio
         self::$service = $dic->get(CustomFieldService::class);
@@ -80,7 +77,7 @@ class CustomFieldServiceTest extends DatabaseTestCase
     {
         $this->assertEquals(3, self::$service->deleteCustomFieldDefinitionDataBatch([1, 2, 3]));
 
-        $this->assertEquals(0, $this->conn->getRowCount('CustomFieldData'));
+        $this->assertEquals(0, self::getRowCount('CustomFieldData'));
 
         $this->assertEquals(0, self::$service->deleteCustomFieldDefinitionDataBatch([]));
     }
@@ -132,7 +129,7 @@ class CustomFieldServiceTest extends DatabaseTestCase
 
         $this->assertEquals(1, self::$service->deleteCustomFieldDataBatch([1, 2, 3], ActionsInterface::CATEGORY));
 
-        $this->assertEquals(0, $this->conn->getRowCount('CustomFieldData'));
+        $this->assertEquals(0, self::getRowCount('CustomFieldData'));
 
         $this->assertEquals(0, self::$service->deleteCustomFieldDataBatch([], ActionsInterface::CATEGORY));
 
@@ -189,7 +186,7 @@ class CustomFieldServiceTest extends DatabaseTestCase
 
         $this->assertEquals(true, self::$service->updateOrCreateData($data));
 
-        $this->assertEquals(5, $this->conn->getRowCount('CustomFieldData'));
+        $this->assertEquals(5, self::getRowCount('CustomFieldData'));
     }
 
     /**
@@ -310,7 +307,7 @@ class CustomFieldServiceTest extends DatabaseTestCase
         $this->assertEquals(1, self::$service->deleteCustomFieldData(2, ActionsInterface::ACCOUNT));
         $this->assertEquals(1, self::$service->deleteCustomFieldData(1, ActionsInterface::CATEGORY));
 
-        $this->assertEquals(0, $this->conn->getRowCount('CustomFieldData'));
+        $this->assertEquals(0, self::getRowCount('CustomFieldData'));
 
         $this->assertEquals(0, self::$service->deleteCustomFieldData(2, ActionsInterface::ACCOUNT));
 
@@ -329,7 +326,7 @@ class CustomFieldServiceTest extends DatabaseTestCase
         $this->assertEquals(1, self::$service->deleteCustomFieldDefinitionData(2));
         $this->assertEquals(0, self::$service->deleteCustomFieldDefinitionData(3));
 
-        $this->assertEquals(0, $this->conn->getRowCount('CustomFieldData'));
+        $this->assertEquals(0, self::getRowCount('CustomFieldData'));
     }
 
     /**
@@ -400,6 +397,6 @@ class CustomFieldServiceTest extends DatabaseTestCase
 
         self::$service->create($data);
 
-        $this->assertEquals(4, $this->conn->getRowCount('CustomFieldData'));
+        $this->assertEquals(4, self::getRowCount('CustomFieldData'));
     }
 }
diff --git a/tests/SP/Services/Eventlog/EventlogServiceTest.php b/tests/SP/Services/Eventlog/EventlogServiceTest.php
index 96131d15..42a6d4d7 100644
--- a/tests/SP/Services/Eventlog/EventlogServiceTest.php
+++ b/tests/SP/Services/Eventlog/EventlogServiceTest.php
@@ -55,14 +55,11 @@ class EventlogServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_eventlog.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(EventlogService::class);
@@ -77,7 +74,7 @@ class EventlogServiceTest extends DatabaseTestCase
     {
         self::$service->clear();
 
-        $this->assertEquals(0, $this->conn->getRowCount('EventLog'));
+        $this->assertEquals(0, self::getRowCount('EventLog'));
     }
 
     /**
@@ -138,11 +135,11 @@ class EventlogServiceTest extends DatabaseTestCase
         $eventlogData->setIpAddress('127.0.0.1');
         $eventlogData->setDescription('Prueba');
 
-        $countBefore = $this->conn->getRowCount('EventLog');
+        $countBefore = self::getRowCount('EventLog');
 
         self::$service->create($eventlogData);
 
-        $countAfter = $this->conn->getRowCount('EventLog');
+        $countAfter = self::getRowCount('EventLog');
 
         $this->assertEquals($countBefore + 1, $countAfter);
 
diff --git a/tests/SP/Services/Export/XmlExportServiceTest.php b/tests/SP/Services/Export/XmlExportServiceTest.php
index 13fefeb4..a31b4fac 100644
--- a/tests/SP/Services/Export/XmlExportServiceTest.php
+++ b/tests/SP/Services/Export/XmlExportServiceTest.php
@@ -59,16 +59,14 @@ class XmlExportServiceTest extends DatabaseTestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         array_map('unlink', glob(TMP_PATH . DIRECTORY_SEPARATOR . '*.xml'));
 
         $dic = setupContext();
 
-        self::$dataset = 'syspass_import.xml';
+        self::$loadFixtures = true;
 
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
         self::$xmlExportService = $dic->get(XmlExportService::class);
         self::$xmlVerifyService = $dic->get(XmlVerifyService::class);
     }
@@ -115,9 +113,9 @@ class XmlExportServiceTest extends DatabaseTestCase
         $this->assertArrayHasKey('Category', $nodes);
         $this->assertArrayHasKey('Client', $nodes);
         $this->assertArrayHasKey('Tag', $nodes);
-        $this->assertEquals(2, $nodes['Account']);
+        $this->assertEquals(4, $nodes['Account']);
         $this->assertEquals(3, $nodes['Category']);
-        $this->assertEquals(3, $nodes['Client']);
+        $this->assertEquals(4, $nodes['Client']);
         $this->assertEquals(3, $nodes['Tag']);
     }
 
diff --git a/tests/SP/Services/Export/XmlVerifyServiceTest.php b/tests/SP/Services/Export/XmlVerifyServiceTest.php
index 89167ef8..7c40e005 100644
--- a/tests/SP/Services/Export/XmlVerifyServiceTest.php
+++ b/tests/SP/Services/Export/XmlVerifyServiceTest.php
@@ -53,7 +53,7 @@ class XmlVerifyServiceTest extends TestCase
      * @throws NotFoundException
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
diff --git a/tests/SP/Services/Import/CsvImportTest.php b/tests/SP/Services/Import/CsvImportTest.php
index d693feea..c5f9238d 100644
--- a/tests/SP/Services/Import/CsvImportTest.php
+++ b/tests/SP/Services/Import/CsvImportTest.php
@@ -40,7 +40,6 @@ use SP\Services\Import\CsvImport;
 use SP\Services\Import\FileImport;
 use SP\Services\Import\ImportException;
 use SP\Services\Import\ImportParams;
-use SP\Storage\Database\DatabaseConnectionData;
 use SP\Storage\File\FileException;
 use SP\Tests\DatabaseTestCase;
 use function SP\Tests\setupContext;
@@ -58,18 +57,13 @@ class CsvImportTest extends DatabaseTestCase
     protected static $dic;
 
     /**
-     * @throws NotFoundException
      * @throws ContextException
-     * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         self::$dic = setupContext();
 
-        self::$dataset = 'syspass_import.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = self::$dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
     }
 
     /**
@@ -110,19 +104,20 @@ class CsvImportTest extends DatabaseTestCase
     {
         // Checkout categories
         $this->assertEquals('CSV Category 1', self::$dic->get(CategoryService::class)->getByName('CSV Category 1')->getName());
-        $this->assertEquals(4, $this->conn->getRowCount('Category'));
+        $this->assertEquals(4, self::getRowCount('Category'));
 
         // Checkout clients
         $this->assertEquals('CSV Client 1', self::$dic->get(ClientService::class)->getByName('CSV Client 1')->getName());
-        $this->assertEquals(4, $this->conn->getRowCount('Client'));
+        $this->assertEquals(5, self::getRowCount('Client'));
 
         // Checkout accounts
         $accountService = self::$dic->get(AccountService::class);
 
         // 1st account
-        $data = $accountService->getById(3)->getAccountVData();
+        $expectedId = 5;
+        $data = $accountService->getById($expectedId)->getAccountVData();
 
-        $this->assertEquals(3, $data->getId());
+        $this->assertEquals($expectedId, $data->getId());
         $this->assertEquals('Test CSV 1', $data->getName());
         $this->assertEquals('CSV Client 1', $data->getClientName());
         $this->assertEquals('CSV Category 1', $data->getCategoryName());
@@ -135,10 +130,10 @@ class CsvImportTest extends DatabaseTestCase
         $this->assertEquals('csv_pass1', Crypt::decrypt($pass->getPass(), $pass->getKey(), '12345678900'));
 
         // 2nd account
+        $expectedId = 6;
+        $data = $accountService->getById($expectedId)->getAccountVData();
 
-        $data = $accountService->getById(4)->getAccountVData();
-
-        $this->assertEquals(4, $data->getId());
+        $this->assertEquals($expectedId, $data->getId());
         $this->assertEquals('Test CSV 2', $data->getName());
         $this->assertEquals('Google', $data->getClientName());
         $this->assertEquals('Linux', $data->getCategoryName());
@@ -151,9 +146,10 @@ class CsvImportTest extends DatabaseTestCase
         $this->assertEquals('csv_pass2', Crypt::decrypt($pass->getPass(), $pass->getKey(), '12345678900'));
 
         // 3rd account
-        $data = $accountService->getById(5)->getAccountVData();
+        $expectedId = 7;
+        $data = $accountService->getById($expectedId)->getAccountVData();
 
-        $this->assertEquals(5, $data->getId());
+        $this->assertEquals($expectedId, $data->getId());
         $this->assertEquals('Test CSV 3', $data->getName());
         $this->assertEquals('Apple', $data->getClientName());
         $this->assertEquals('SSH', $data->getCategoryName());
@@ -165,7 +161,7 @@ class CsvImportTest extends DatabaseTestCase
 
         $this->assertEquals('csv_pass3', Crypt::decrypt($pass->getPass(), $pass->getKey(), '12345678900'));
 
-        $this->assertEquals(6, $this->conn->getRowCount('Account'));
+        $this->assertEquals(8, self::getRowCount('Account'));
     }
 
     /**
diff --git a/tests/SP/Services/Import/KeepassImportTest.php b/tests/SP/Services/Import/KeepassImportTest.php
index 1488e7c4..dfb88e2c 100644
--- a/tests/SP/Services/Import/KeepassImportTest.php
+++ b/tests/SP/Services/Import/KeepassImportTest.php
@@ -62,18 +62,13 @@ class KeepassImportTest extends DatabaseTestCase
     protected static $dic;
 
     /**
-     * @throws NotFoundException
      * @throws ContextException
-     * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         self::$dic = setupContext();
 
-        self::$dataset = 'syspass_import.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = self::$dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
     }
 
     /**
@@ -120,14 +115,14 @@ class KeepassImportTest extends DatabaseTestCase
         $this->assertEquals('Servers', $categoryService->getByName('Servers')->getName());
         $this->assertEquals('General', $categoryService->getByName('General')->getName());
 
-        $this->assertEquals(11, $this->conn->getRowCount('Category'));
+        $this->assertEquals(11, self::getRowCount('Category'));
 
         // Checkout clients
         $client = self::$dic->get(ClientService::class)->getByName('KeePass');
 
         $this->assertEquals('KeePass', $client->getName());
 
-        $this->assertEquals(4, $this->conn->getRowCount('Client'));
+        $this->assertEquals(5, self::getRowCount('Client'));
 
         // Checkout accounts
         $accountService = self::$dic->get(AccountService::class);
@@ -141,7 +136,7 @@ class KeepassImportTest extends DatabaseTestCase
 
         $this->assertCount(5, $data);
 
-        $this->assertEquals(3, $data[0]->getId());
+        $this->assertEquals(5, $data[0]->getId());
         $this->assertEquals(1, $data[0]->getUserId());
         $this->assertEquals(2, $data[0]->getUserGroupId());
         $this->assertEquals('DC1', $data[0]->getName());
@@ -157,7 +152,7 @@ class KeepassImportTest extends DatabaseTestCase
 
         // 2nd account
 
-        $this->assertEquals(4, $data[1]->getId());
+        $this->assertEquals(6, $data[1]->getId());
         $this->assertEquals(1, $data[1]->getUserId());
         $this->assertEquals(2, $data[1]->getUserGroupId());
         $this->assertEquals('debian', $data[1]->getName());
@@ -172,7 +167,7 @@ class KeepassImportTest extends DatabaseTestCase
         $this->assertEquals('TKr321zqCZhgbzmmAX13', Crypt::decrypt($pass->getPass(), $pass->getKey(), '12345678900'));
 
         // 3rd account
-        $this->assertEquals(5, $data[2]->getId());
+        $this->assertEquals(7, $data[2]->getId());
         $this->assertEquals(1, $data[2]->getUserId());
         $this->assertEquals(2, $data[2]->getUserGroupId());
         $this->assertEquals('proxy', $data[2]->getName());
@@ -186,18 +181,18 @@ class KeepassImportTest extends DatabaseTestCase
 
         $this->assertEquals('TKr321zqCZhgbzmmAX13', Crypt::decrypt($pass->getPass(), $pass->getKey(), '12345678900'));
 
-        $this->assertEquals(6, $data[3]->getId());
+        $this->assertEquals(8, $data[3]->getId());
         $this->assertEquals(1, $data[3]->getUserId());
         $this->assertEquals(2, $data[3]->getUserGroupId());
         $this->assertEquals('Sample Entry', $data[3]->getName());
         $this->assertEquals('NewDatabase', $data[3]->getCategoryName());
 
-        $this->assertEquals(7, $data[4]->getId());
+        $this->assertEquals(9, $data[4]->getId());
         $this->assertEquals(1, $data[4]->getUserId());
         $this->assertEquals(2, $data[4]->getUserGroupId());
         $this->assertEquals('Sample Entry #2', $data[4]->getName());
         $this->assertEquals('NewDatabase', $data[4]->getCategoryName());
 
-        $this->assertEquals(7, $this->conn->getRowCount('Account'));
+        $this->assertEquals(9, self::getRowCount('Account'));
     }
 }
diff --git a/tests/SP/Services/Import/SyspassImportTest.php b/tests/SP/Services/Import/SyspassImportTest.php
index 1d192ed5..89488104 100644
--- a/tests/SP/Services/Import/SyspassImportTest.php
+++ b/tests/SP/Services/Import/SyspassImportTest.php
@@ -59,18 +59,13 @@ class SyspassImportTest extends DatabaseTestCase
     protected static $dic;
 
     /**
-     * @throws NotFoundException
      * @throws ContextException
-     * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         self::$dic = setupContext();
 
-        self::$dataset = 'syspass_import.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = self::$dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
     }
 
     /**
@@ -110,21 +105,22 @@ class SyspassImportTest extends DatabaseTestCase
         // Checkout categories
         $this->assertEquals('CSV Category 1', self::$dic->get(CategoryService::class)->getByName('CSV Category 1')->getName());
 
-        $this->assertEquals(5, $this->conn->getRowCount('Category'));
+        $this->assertEquals(5, self::getRowCount('Category'));
 
         // Checkout clients
         $this->assertEquals('CSV Client 1', self::$dic->get(ClientService::class)->getByName('CSV Client 1')->getName());
 
-        $this->assertEquals(5, $this->conn->getRowCount('Client'));
+        $this->assertEquals(6, self::getRowCount('Client'));
 
         // Checkout accounts
         $accountService = self::$dic->get(AccountService::class);
 
         // 1st account
-        $result = $accountService->getById(3);
+        $expectedId = 5;
+        $result = $accountService->getById($expectedId);
         $data = $result->getAccountVData();
 
-        $this->assertEquals(3, $data->getId());
+        $this->assertEquals($expectedId, $data->getId());
         $this->assertEquals(1, $data->getUserId());
         $this->assertEquals(2, $data->getUserGroupId());
         $this->assertEquals('Google', $data->getName());
@@ -148,11 +144,12 @@ class SyspassImportTest extends DatabaseTestCase
 
         $this->assertEquals('-{?^··\mjC<c', Crypt::decrypt($pass->getPass(), $pass->getKey(), '12345678900'));
 
-        // 1st account
-        $result = $accountService->getById(4);
+        // 2nd account
+        $expectedId = 6;
+        $result = $accountService->getById($expectedId);
         $data = $result->getAccountVData();
 
-        $this->assertEquals(4, $data->getId());
+        $this->assertEquals($expectedId, $data->getId());
         $this->assertEquals(1, $data->getUserId());
         $this->assertEquals(2, $data->getUserGroupId());
         $this->assertEquals('Google', $data->getName());
@@ -176,11 +173,12 @@ class SyspassImportTest extends DatabaseTestCase
 
         $this->assertEquals('\'ynHRMJy-fRa', Crypt::decrypt($pass->getPass(), $pass->getKey(), '12345678900'));
 
-        // 1st account
-        $result = $accountService->getById(5);
+        // 3rd account
+        $expectedId = 7;
+        $result = $accountService->getById($expectedId);
         $data = $result->getAccountVData();
 
-        $this->assertEquals(5, $data->getId());
+        $this->assertEquals($expectedId, $data->getId());
         $this->assertEquals(1, $data->getUserId());
         $this->assertEquals(2, $data->getUserGroupId());
         $this->assertEquals('Test CSV 1', $data->getName());
@@ -194,11 +192,12 @@ class SyspassImportTest extends DatabaseTestCase
 
         $this->assertEquals('csv_pass1', Crypt::decrypt($pass->getPass(), $pass->getKey(), '12345678900'));
 
-        // 2nd account
-        $result = $accountService->getById(6);
+        // 4th account
+        $expectedId = 8;
+        $result = $accountService->getById($expectedId);
         $data = $result->getAccountVData();
 
-        $this->assertEquals(6, $data->getId());
+        $this->assertEquals($expectedId, $data->getId());
         $this->assertEquals(1, $data->getUserId());
         $this->assertEquals(2, $data->getUserGroupId());
         $this->assertEquals('Test CSV 2', $data->getName());
@@ -212,11 +211,12 @@ class SyspassImportTest extends DatabaseTestCase
 
         $this->assertEquals('csv_pass2', Crypt::decrypt($pass->getPass(), $pass->getKey(), '12345678900'));
 
-        // 3rd account
-        $result = $accountService->getById(7);
+        // 5th account
+        $expectedId = 9;
+        $result = $accountService->getById($expectedId);
         $data = $result->getAccountVData();
 
-        $this->assertEquals(7, $data->getId());
+        $this->assertEquals($expectedId, $data->getId());
         $this->assertEquals(1, $data->getUserId());
         $this->assertEquals(2, $data->getUserGroupId());
         $this->assertEquals('Test CSV 3', $data->getName());
@@ -230,6 +230,6 @@ class SyspassImportTest extends DatabaseTestCase
 
         $this->assertEquals('csv_pass3', Crypt::decrypt($pass->getPass(), $pass->getKey(), '12345678900'));
 
-        $this->assertEquals(7, $this->conn->getRowCount('Account'));
+        $this->assertEquals(9, self::getRowCount('Account'));
     }
 }
diff --git a/tests/SP/Services/Import/XmlImportTest.php b/tests/SP/Services/Import/XmlImportTest.php
index fda6b65c..c8d78a13 100644
--- a/tests/SP/Services/Import/XmlImportTest.php
+++ b/tests/SP/Services/Import/XmlImportTest.php
@@ -52,18 +52,13 @@ class XmlImportTest extends DatabaseTestCase
     protected static $dic;
 
     /**
-     * @throws NotFoundException
      * @throws ContextException
-     * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         self::$dic = setupContext();
 
-        self::$dataset = 'syspass_import.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = self::$dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
     }
 
     /**
diff --git a/tests/SP/Services/Install/InstallerTest.php b/tests/SP/Services/Install/InstallerTest.php
index 6c82be26..8c625c97 100644
--- a/tests/SP/Services/Install/InstallerTest.php
+++ b/tests/SP/Services/Install/InstallerTest.php
@@ -63,7 +63,7 @@ class InstallerTest extends TestCase
     /**
      * @throws ContextException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         self::$dic = setupContext();
 
@@ -73,7 +73,7 @@ class InstallerTest extends TestCase
     /**
      * This method is called after the last test of this test class is run.
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
         saveResource('config', 'config.xml', self::$currentConfig);
         recreateDir(CACHE_PATH);
@@ -306,7 +306,7 @@ class InstallerTest extends TestCase
         DatabaseUtil::dropUser('syspass_user', $host);
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         @unlink(CONFIG_FILE);
     }
diff --git a/tests/SP/Services/ItemPreset/ItemPresetServiceTest.php b/tests/SP/Services/ItemPreset/ItemPresetServiceTest.php
index aeea8a89..5536fe0b 100644
--- a/tests/SP/Services/ItemPreset/ItemPresetServiceTest.php
+++ b/tests/SP/Services/ItemPreset/ItemPresetServiceTest.php
@@ -58,14 +58,11 @@ class ItemPresetServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_itemPreset.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(ItemPresetService::class);
@@ -133,7 +130,7 @@ class ItemPresetServiceTest extends DatabaseTestCase
      */
     public function testGetAll()
     {
-        $count = $this->conn->getRowCount('ItemPreset');
+        $count = self::getRowCount('ItemPreset');
 
         $result = self::$service->getAll();
         $this->assertCount($count, $result);
@@ -221,7 +218,7 @@ class ItemPresetServiceTest extends DatabaseTestCase
             ->delete(3)
             ->delete(4);
 
-        $this->assertEquals(3, $this->conn->getRowCount('ItemPreset'));
+        $this->assertEquals(3, self::getRowCount('ItemPreset'));
     }
 
     /**
diff --git a/tests/SP/Services/Notification/NotificationServiceTest.php b/tests/SP/Services/Notification/NotificationServiceTest.php
index e6156584..a03539a3 100644
--- a/tests/SP/Services/Notification/NotificationServiceTest.php
+++ b/tests/SP/Services/Notification/NotificationServiceTest.php
@@ -62,14 +62,11 @@ class NotificationServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_notification.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         self::$context = $dic->get(ContextInterface::class);
 
@@ -456,7 +453,7 @@ class NotificationServiceTest extends DatabaseTestCase
 
         $this->assertEquals(0, self::$service->deleteAdminBatch([]));
 
-        $this->assertEquals(0, $this->conn->getRowCount('Notification'));
+        $this->assertEquals(0, self::getRowCount('Notification'));
 
         $this->expectException(ServiceException::class);
 
@@ -470,11 +467,11 @@ class NotificationServiceTest extends DatabaseTestCase
      */
     public function testDeleteAdmin()
     {
-        $countBefore = $this->conn->getRowCount('Notification');
+        $countBefore = self::getRowCount('Notification');
 
         self::$service->deleteAdmin(3);
 
-        $this->assertEquals($countBefore - 1, $this->conn->getRowCount('Notification'));
+        $this->assertEquals($countBefore - 1, self::getRowCount('Notification'));
 
         $this->expectException(NoSuchItemException::class);
 
@@ -548,7 +545,7 @@ class NotificationServiceTest extends DatabaseTestCase
     {
         self::$service->delete(3);
 
-        $this->assertEquals(2, $this->conn->getRowCount('Notification'));
+        $this->assertEquals(2, self::getRowCount('Notification'));
 
         $this->expectException(NoSuchItemException::class);
 
@@ -566,7 +563,7 @@ class NotificationServiceTest extends DatabaseTestCase
 
         $this->assertEquals(0, self::$service->deleteByIdBatch([]));
 
-        $this->assertEquals(1, $this->conn->getRowCount('Notification'));
+        $this->assertEquals(1, self::getRowCount('Notification'));
 
         $this->expectException(ServiceException::class);
 
diff --git a/tests/SP/Services/Plugin/PluginDataServiceTest.php b/tests/SP/Services/Plugin/PluginDataServiceTest.php
index 989a98b1..730183f6 100644
--- a/tests/SP/Services/Plugin/PluginDataServiceTest.php
+++ b/tests/SP/Services/Plugin/PluginDataServiceTest.php
@@ -57,14 +57,11 @@ class PluginDataServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_plugin.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(PluginDataService::class);
@@ -143,11 +140,11 @@ class PluginDataServiceTest extends DatabaseTestCase
     {
         self::$service->delete('Authenticator');
 
-        $this->assertTableRowCount('PluginData', 2);
+        $this->assertEquals(2, self::getRowCount('PluginData'));
 
         self::$service->delete('DokuWiki');
 
-        $this->assertTableRowCount('PluginData', 1);
+        $this->assertEquals(1, self::getRowCount('PluginData'));
     }
 
     /**
diff --git a/tests/SP/Services/Plugin/PluginOperationTest.php b/tests/SP/Services/Plugin/PluginOperationTest.php
index 8e31e635..53a14d57 100644
--- a/tests/SP/Services/Plugin/PluginOperationTest.php
+++ b/tests/SP/Services/Plugin/PluginOperationTest.php
@@ -59,14 +59,11 @@ class PluginOperationTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_plugin.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$pluginOperation = function ($name) use ($dic) {
@@ -143,13 +140,13 @@ class PluginOperationTest extends DatabaseTestCase
      */
     public function testDelete()
     {
-        $this->assertTableRowCount('PluginData', 4);
+        $this->assertEquals(4, self::getRowCount('PluginData'));
 
         /** @var PluginOperation $pluginOperation */
         $pluginOperation = self::$pluginOperation->call($this, 'Authenticator');
         $pluginOperation->delete(1);
 
-        $this->assertTableRowCount('PluginData', 3);
+        $this->assertEquals(3, self::getRowCount('PluginData'));
     }
 
     /**
diff --git a/tests/SP/Services/Plugin/PluginServiceTest.php b/tests/SP/Services/Plugin/PluginServiceTest.php
index 2bdb6d78..45de5b2f 100644
--- a/tests/SP/Services/Plugin/PluginServiceTest.php
+++ b/tests/SP/Services/Plugin/PluginServiceTest.php
@@ -57,14 +57,11 @@ class PluginServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_plugin.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(PluginService::class);
@@ -112,7 +109,7 @@ class PluginServiceTest extends DatabaseTestCase
     {
         self::$service->deleteByIdBatch([1, 2]);
 
-        $this->assertEquals(1, $this->conn->getRowCount('Plugin'));
+        $this->assertEquals(1, self::getRowCount('Plugin'));
 
         $this->expectException(ServiceException::class);
 
@@ -185,7 +182,7 @@ class PluginServiceTest extends DatabaseTestCase
     {
         self::$service->delete(1);
 
-        $this->assertEquals(2, $this->conn->getRowCount('Plugin'));
+        $this->assertEquals(2, self::getRowCount('Plugin'));
 
         $this->expectException(NoSuchItemException::class);
 
diff --git a/tests/SP/Services/PublicLink/PublicLinkServiceTest.php b/tests/SP/Services/PublicLink/PublicLinkServiceTest.php
index d66966a0..09203359 100644
--- a/tests/SP/Services/PublicLink/PublicLinkServiceTest.php
+++ b/tests/SP/Services/PublicLink/PublicLinkServiceTest.php
@@ -69,14 +69,11 @@ class PublicLinkServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_publicLink.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(PublicLinkService::class);
@@ -309,7 +306,7 @@ class PublicLinkServiceTest extends DatabaseTestCase
         self::$service->delete(2);
         self::$service->delete(3);
 
-        $this->assertEquals(0, $this->conn->getRowCount('PublicLink'));
+        $this->assertEquals(0, self::getRowCount('PublicLink'));
 
         $this->expectException(NoSuchItemException::class);
 
@@ -346,7 +343,7 @@ class PublicLinkServiceTest extends DatabaseTestCase
     {
         $this->assertEquals(2, self::$service->deleteByIdBatch([2, 3]));
 
-        $this->assertEquals(0, $this->conn->getRowCount('PublicLink'));
+        $this->assertEquals(0, self::getRowCount('PublicLink'));
 
         $this->expectException(ServiceException::class);
 
diff --git a/tests/SP/Services/Tag/TagServiceTest.php b/tests/SP/Services/Tag/TagServiceTest.php
index 91480e2a..d82cb3a3 100644
--- a/tests/SP/Services/Tag/TagServiceTest.php
+++ b/tests/SP/Services/Tag/TagServiceTest.php
@@ -58,14 +58,11 @@ class TagServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_tag.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(TagService::class);
@@ -78,7 +75,7 @@ class TagServiceTest extends DatabaseTestCase
     {
         self::$service->deleteByIdBatch([1, 2, 3]);
 
-        $this->assertEquals(0, $this->conn->getRowCount('Tag'));
+        $this->assertEquals(0, self::getRowCount('Tag'));
 
         $this->expectException(ServiceException::class);
 
@@ -96,7 +93,7 @@ class TagServiceTest extends DatabaseTestCase
 
         self::$service->delete(2);
 
-        $this->assertEquals(1, $this->conn->getRowCount('Tag'));
+        $this->assertEquals(1, self::getRowCount('Tag'));
 
         $this->expectException(NoSuchItemException::class);
 
@@ -218,7 +215,7 @@ class TagServiceTest extends DatabaseTestCase
 
         $this->assertEquals($tagData->name, $data->getName());
 
-        $this->assertEquals(4, $this->conn->getRowCount('Tag'));
+        $this->assertEquals(4, self::getRowCount('Tag'));
     }
 
     /**
diff --git a/tests/SP/Services/Task/TaskServiceTest.php b/tests/SP/Services/Task/TaskServiceTest.php
index 27517a00..1282aa8b 100644
--- a/tests/SP/Services/Task/TaskServiceTest.php
+++ b/tests/SP/Services/Task/TaskServiceTest.php
@@ -26,6 +26,7 @@ namespace SP\Tests\Services\Task;
 
 use PHPUnit\Framework\TestCase;
 use SP\Core\Context\ContextException;
+use SP\Services\ServiceException;
 use SP\Services\Task\Task;
 use SP\Services\Task\TaskFactory;
 use SP\Services\Task\TaskService;
@@ -44,6 +45,7 @@ class TaskServiceTest extends TestCase
     /**
      * @throws FileException
      * @throws ContextException
+     * @throws ServiceException
      */
     public function testTrackStatus()
     {
@@ -97,8 +99,8 @@ class TaskServiceTest extends TestCase
             sleep(1);
         }
 
-        $this->assertFileNotExists($task->getFileTask()->getFile());
-        $this->assertFileNotExists($task->getFileOut()->getFile());
+        $this->assertFileDoesNotExist($task->getFileTask()->getFile());
+        $this->assertFileDoesNotExist($task->getFileOut()->getFile());
     }
 
     /**
diff --git a/tests/SP/Services/Track/TrackServiceTest.php b/tests/SP/Services/Track/TrackServiceTest.php
index 334a0e94..090a4600 100644
--- a/tests/SP/Services/Track/TrackServiceTest.php
+++ b/tests/SP/Services/Track/TrackServiceTest.php
@@ -57,14 +57,11 @@ class TrackServiceTest extends DatabaseTestCase
      * @throws ContextException
      * @throws DependencyException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_track.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(TrackService::class);
@@ -79,7 +76,7 @@ class TrackServiceTest extends DatabaseTestCase
     {
         self::$service->delete(1);
 
-        $this->assertEquals(5, $this->conn->getRowCount('Track'));
+        $this->assertEquals(5, self::getRowCount('Track'));
 
         $this->expectException(NoSuchItemException::class);
 
diff --git a/tests/SP/Services/User/UserPassServiceTest.php b/tests/SP/Services/User/UserPassServiceTest.php
index 1771e871..548ba5df 100644
--- a/tests/SP/Services/User/UserPassServiceTest.php
+++ b/tests/SP/Services/User/UserPassServiceTest.php
@@ -68,14 +68,11 @@ class UserPassServiceTest extends DatabaseTestCase
      * @throws DependencyException
      * @throws SPException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_user.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(UserPassService::class);
diff --git a/tests/SP/Services/User/UserServiceTest.php b/tests/SP/Services/User/UserServiceTest.php
index d68e9eed..3d128c0d 100644
--- a/tests/SP/Services/User/UserServiceTest.php
+++ b/tests/SP/Services/User/UserServiceTest.php
@@ -71,14 +71,11 @@ class UserServiceTest extends DatabaseTestCase
      * @throws DependencyException
      * @throws SPException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_user.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(UserService::class);
@@ -94,7 +91,7 @@ class UserServiceTest extends DatabaseTestCase
     {
         $data = self::$service->getAllBasic();
 
-        $this->assertCount(4, $data);
+        $this->assertCount(5, $data);
         $this->assertInstanceOf(UserData::class, $data[0]);
         $this->assertEquals('admin', $data[0]->getLogin());
     }
@@ -121,7 +118,7 @@ class UserServiceTest extends DatabaseTestCase
 
         $result = self::$service->createOnLogin($data);
 
-        $this->assertEquals(5, $result);
+        $this->assertEquals(6, $result);
 
         /** @var UserData $resultData */
         $resultData = self::$service->getById($result);
@@ -143,7 +140,7 @@ class UserServiceTest extends DatabaseTestCase
 
         $result = self::$service->createOnLogin($data);
 
-        $this->assertEquals(6, $result);
+        $this->assertEquals(7, $result);
 
         /** @var UserData $resultData */
         $resultData = self::$service->getById($result);
@@ -358,7 +355,7 @@ class UserServiceTest extends DatabaseTestCase
      */
     public function testDeleteByIdBatch()
     {
-        $this->assertEquals(2, self::$service->deleteByIdBatch([3, 4]));
+        $this->assertEquals(2, self::$service->deleteByIdBatch([4, 5]));
 
         $this->expectException(ConstraintException::class);
 
@@ -655,9 +652,9 @@ class UserServiceTest extends DatabaseTestCase
      */
     public function testDelete()
     {
-        self::$service->delete(3);
+        self::$service->delete(4);
 
-        $this->assertEquals(3, $this->conn->getRowCount('User'));
+        $this->assertEquals(4, self::getRowCount('User'));
     }
 
     /**
diff --git a/tests/SP/Services/UserGroup/UserGroupServiceTest.php b/tests/SP/Services/UserGroup/UserGroupServiceTest.php
index 96b0e549..a2a972d6 100644
--- a/tests/SP/Services/UserGroup/UserGroupServiceTest.php
+++ b/tests/SP/Services/UserGroup/UserGroupServiceTest.php
@@ -59,14 +59,11 @@ class UserGroupServiceTest extends DatabaseTestCase
      * @throws DependencyException
      * @throws SPException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_userGroup.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(UserGroupService::class);
@@ -80,7 +77,7 @@ class UserGroupServiceTest extends DatabaseTestCase
     {
         $data = self::$service->getAllBasic();
 
-        $this->assertCount(5, $data);
+        $this->assertCount(6, $data);
 
         $this->assertInstanceOf(UserGroupData::class, $data[0]);
         $this->assertEquals('Admins', $data[0]->getName());
@@ -96,9 +93,9 @@ class UserGroupServiceTest extends DatabaseTestCase
      */
     public function testDelete()
     {
-        self::$service->delete(3);
+        self::$service->delete(5);
 
-        $this->assertEquals(4, $this->conn->getRowCount('UserGroup'));
+        $this->assertEquals(5, self::getRowCount('UserGroup'));
     }
 
     /**
@@ -128,9 +125,9 @@ class UserGroupServiceTest extends DatabaseTestCase
      */
     public function testDeleteByIdBatch()
     {
-        $this->assertEquals(2, self::$service->deleteByIdBatch([4, 5]));
+        $this->assertEquals(2, self::$service->deleteByIdBatch([5, 6]));
 
-        $this->assertEquals(3, $this->conn->getRowCount('UserGroup'));
+        $this->assertEquals(4, self::getRowCount('UserGroup'));
     }
 
     /**
@@ -155,7 +152,7 @@ class UserGroupServiceTest extends DatabaseTestCase
     {
         $this->expectException(ServiceException::class);
 
-        self::$service->deleteByIdBatch([4, 5, 10]);
+        self::$service->deleteByIdBatch([5, 6, 10]);
     }
 
     /**
@@ -198,9 +195,11 @@ class UserGroupServiceTest extends DatabaseTestCase
     {
         $this->assertCount(7, self::$service->getUsage(2));
 
-        $this->assertCount(1, self::$service->getUsage(3));
+        $this->assertCount(3, self::$service->getUsage(3));
 
-        $this->assertCount(0, self::$service->getUsage(4));
+        $this->assertCount(1, self::$service->getUsage(4));
+
+        $this->assertCount(0, self::$service->getUsage(5));
     }
 
     /**
@@ -212,7 +211,7 @@ class UserGroupServiceTest extends DatabaseTestCase
     public function testCreate()
     {
         $data = new UserGroupData();
-        $data->setId(6);
+        $data->setId(7);
         $data->setName('Test group');
         $data->setDescription('Group for demo users');
         $data->setUsers([2]);
@@ -262,7 +261,7 @@ class UserGroupServiceTest extends DatabaseTestCase
 
         $result = self::$service->search($itemSearchData);
 
-        $this->assertEquals(2, $result->getNumRows());
+        $this->assertEquals(3, $result->getNumRows());
 
         $itemSearchData = new ItemSearchData();
         $itemSearchData->setLimitCount(10);
@@ -320,6 +319,6 @@ class UserGroupServiceTest extends DatabaseTestCase
 
         $this->assertCount(5, self::$service->getUsageByUsers(2));
 
-        $this->assertCount(0, self::$service->getUsageByUsers(4));
+        $this->assertCount(0, self::$service->getUsageByUsers(5));
     }
 }
diff --git a/tests/SP/Services/UserGroup/UserToUserGroupServiceTest.php b/tests/SP/Services/UserGroup/UserToUserGroupServiceTest.php
index f477f1d7..81984fbd 100644
--- a/tests/SP/Services/UserGroup/UserToUserGroupServiceTest.php
+++ b/tests/SP/Services/UserGroup/UserToUserGroupServiceTest.php
@@ -56,14 +56,11 @@ class UserToUserGroupServiceTest extends DatabaseTestCase
      * @throws DependencyException
      * @throws SPException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass_userGroup.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(UserToUserGroupService::class);
@@ -95,9 +92,8 @@ class UserToUserGroupServiceTest extends DatabaseTestCase
 
         $data = self::$service->getGroupsForUser(2);
 
-        $this->assertCount(2, $data);
+        $this->assertCount(1, $data);
         $this->assertEquals(1, $data[0]->userGroupId);
-        $this->assertEquals(3, $data[1]->userGroupId);
 
         $data = self::$service->getGroupsForUser(10);
 
@@ -170,11 +166,11 @@ class UserToUserGroupServiceTest extends DatabaseTestCase
         $this->assertEquals(2, $data[1]->getUserGroupId());
         $this->assertEquals(3, $data[1]->getUserId());
 
-        $data = self::$service->getById(3);
+        $data = self::$service->getById(1);
 
         $this->assertCount(1, $data);
 
-        $this->assertEquals(3, $data[0]->getUserGroupId());
+        $this->assertEquals(1, $data[0]->getUserGroupId());
         $this->assertEquals(2, $data[0]->getUserId());
 
         $this->expectException(NoSuchItemException::class);
diff --git a/tests/SP/Services/UserPassRecover/UserPassRecoverServiceTest.php b/tests/SP/Services/UserPassRecover/UserPassRecoverServiceTest.php
index e5eaa1bd..0b7e40ca 100644
--- a/tests/SP/Services/UserPassRecover/UserPassRecoverServiceTest.php
+++ b/tests/SP/Services/UserPassRecover/UserPassRecoverServiceTest.php
@@ -56,14 +56,11 @@ class UserPassRecoverServiceTest extends DatabaseTestCase
      * @throws DependencyException
      * @throws SPException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(UserPassRecoverService::class);
diff --git a/tests/SP/Services/UserProfile/UserProfileServiceTest.php b/tests/SP/Services/UserProfile/UserProfileServiceTest.php
index 14604ed7..57d05f10 100644
--- a/tests/SP/Services/UserProfile/UserProfileServiceTest.php
+++ b/tests/SP/Services/UserProfile/UserProfileServiceTest.php
@@ -60,14 +60,11 @@ class UserProfileServiceTest extends DatabaseTestCase
      * @throws DependencyException
      * @throws SPException
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $dic = setupContext();
 
-        self::$dataset = 'syspass.xml';
-
-        // Datos de conexión a la BBDD
-        self::$databaseConnectionData = $dic->get(DatabaseConnectionData::class);
+        self::$loadFixtures = true;
 
         // Inicializar el servicio
         self::$service = $dic->get(UserProfileService::class);
@@ -188,7 +185,7 @@ class UserProfileServiceTest extends DatabaseTestCase
     {
         $this->assertEquals(1, self::$service->deleteByIdBatch([3]));
 
-        $this->assertEquals(2, $this->conn->getRowCount('UserProfile'));
+        $this->assertEquals(2, self::getRowCount('UserProfile'));
     }
 
     /**
@@ -202,7 +199,7 @@ class UserProfileServiceTest extends DatabaseTestCase
 
         self::$service->deleteByIdBatch([1, 2]);
 
-        $this->assertEquals(3, $this->conn->getRowCount('UserProfile'));
+        $this->assertEquals(3, self::getRowCount('UserProfile'));
     }
 
     /**
@@ -216,7 +213,7 @@ class UserProfileServiceTest extends DatabaseTestCase
 
         self::$service->deleteByIdBatch([3, 10]);
 
-        $this->assertEquals(2, $this->conn->getRowCount('UserProfile'));
+        $this->assertEquals(2, self::getRowCount('UserProfile'));
     }
 
     /**
@@ -245,7 +242,7 @@ class UserProfileServiceTest extends DatabaseTestCase
     {
         self::$service->delete(3);
 
-        $this->assertEquals(2, $this->conn->getRowCount('UserProfile'));
+        $this->assertEquals(2, self::getRowCount('UserProfile'));
 
         $this->expectException(ConstraintException::class);
 
@@ -271,7 +268,7 @@ class UserProfileServiceTest extends DatabaseTestCase
 
         $this->assertEquals($data->getId(), $result);
 
-        $this->assertEquals(4, $this->conn->getRowCount('UserProfile'));
+        $this->assertEquals(4, self::getRowCount('UserProfile'));
 
         $this->assertEquals($data, self::$service->getById($result));
     }
diff --git a/tests/SP/Storage/ArchiveHandlerTest.php b/tests/SP/Storage/ArchiveHandlerTest.php
index 1c5ab437..031f2b3e 100644
--- a/tests/SP/Storage/ArchiveHandlerTest.php
+++ b/tests/SP/Storage/ArchiveHandlerTest.php
@@ -101,7 +101,7 @@ class ArchiveHandlerTest extends TestCase
      * Sets up the fixture, for example, open a network connection.
      * This method is called before a test is executed.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         array_map('unlink', glob(TMP_PATH . DIRECTORY_SEPARATOR . 'test_archive_*'));
     }
diff --git a/tests/SP/Storage/FileCachePackedTest.php b/tests/SP/Storage/FileCachePackedTest.php
index 97a4a6ca..16e08561 100644
--- a/tests/SP/Storage/FileCachePackedTest.php
+++ b/tests/SP/Storage/FileCachePackedTest.php
@@ -44,7 +44,7 @@ class FileCachePackedTest extends TestCase
     /**
      * This method is called before the first test of this test class is run.
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         self::$data = [];
         $i = 0;
diff --git a/tests/SP/Storage/FileCacheTest.php b/tests/SP/Storage/FileCacheTest.php
index 2c493c82..0f1aff1e 100644
--- a/tests/SP/Storage/FileCacheTest.php
+++ b/tests/SP/Storage/FileCacheTest.php
@@ -44,7 +44,7 @@ class FileCacheTest extends TestCase
     /**
      * This method is called before the first test of this test class is run.
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         self::$data = [];
         $i = 0;
diff --git a/tests/SP/Storage/FileHandlerTest.php b/tests/SP/Storage/FileHandlerTest.php
index 9eb14219..d44271cc 100644
--- a/tests/SP/Storage/FileHandlerTest.php
+++ b/tests/SP/Storage/FileHandlerTest.php
@@ -96,15 +96,26 @@ class FileHandlerTest extends TestCase
     /**
      * Comprobar un archivo válido
      *
-     * @doesNotPerformAssertions
      * @throws FileException
      */
     public function testCheckFileExists()
     {
+        $this->markTestSkipped();
+
         (new FileHandler(self::$validFile))
             ->clearCache()
             ->checkFileExists();
 
+        $this->assertTrue(true);
+    }
+
+    /**
+     * Comprobar un archivo válido
+     *
+     * @throws FileException
+     */
+    public function testCheckFileDoesNotExists()
+    {
         $this->expectException(FileException::class);
 
         (new FileHandler(self::$missingFile))
@@ -143,7 +154,6 @@ class FileHandlerTest extends TestCase
     /**
      * Comprobar si es posible leer el archivo
      *
-     * @doesNotPerformAssertions
      * @throws FileException
      */
     public function testCheckIsReadable()
@@ -151,6 +161,8 @@ class FileHandlerTest extends TestCase
         (new FileHandler(self::$validFile))
             ->clearCache()
             ->checkIsReadable();
+
+        $this->assertTrue(true);
     }
 
     /**
@@ -162,6 +174,6 @@ class FileHandlerTest extends TestCase
     {
         (new FileHandler(self::$validFile))->delete();
 
-        $this->assertFileNotExists(self::$validFile);
+        $this->assertFileDoesNotExist(self::$validFile);
     }
 }
diff --git a/tests/SP/Storage/XmlHandlerTest.php b/tests/SP/Storage/XmlHandlerTest.php
index 12737e84..da8aa020 100644
--- a/tests/SP/Storage/XmlHandlerTest.php
+++ b/tests/SP/Storage/XmlHandlerTest.php
@@ -53,7 +53,7 @@ class XmlHandlerTest extends TestCase
      */
     protected $items;
 
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $file = RESOURCE_DIR . DIRECTORY_SEPARATOR . 'config.xml';
         self::$xmlHandler = new XmlHandler(new FileHandler($file));
diff --git a/tests/SP/Util/UtilTest.php b/tests/SP/Util/UtilTest.php
index 550f2cde..5b40942e 100644
--- a/tests/SP/Util/UtilTest.php
+++ b/tests/SP/Util/UtilTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\SP\Util;
+namespace SP\Tests\Util;
 
 use PHPUnit\Framework\TestCase;
 use SP\Util\Util;
@@ -37,7 +37,7 @@ class UtilTest extends TestCase
     /**
      * This method is called after the last test of this test class is run.
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
         ini_set('memory_limit', -1);
     }
diff --git a/tests/SP/bootstrap.php b/tests/SP/bootstrap.php
index 4c69a02f..70cc51f1 100644
--- a/tests/SP/bootstrap.php
+++ b/tests/SP/bootstrap.php
@@ -53,6 +53,10 @@ define('TMP_PATH', TEST_ROOT . DIRECTORY_SEPARATOR . 'tmp');
 define('XML_SCHEMA', APP_ROOT . DIRECTORY_SEPARATOR . 'schemas' . DIRECTORY_SEPARATOR . 'syspass.xsd');
 
 define('LOG_FILE', TMP_PATH . DIRECTORY_SEPARATOR . 'test.log');
+define('FIXTURE_FILES', [
+    RESOURCE_DIR . DIRECTORY_SEPARATOR . 'datasets' . DIRECTORY_SEPARATOR . 'truncate.sql',
+    RESOURCE_DIR . DIRECTORY_SEPARATOR . 'datasets' . DIRECTORY_SEPARATOR . 'syspass.sql'
+]);
 define('SELF_IP_ADDRESS', getRealIpAddress());
 define('SELF_HOSTNAME', gethostbyaddr(SELF_IP_ADDRESS));
 
@@ -85,7 +89,7 @@ if (!function_exists('\gettext')) {
      *
      * @return string
      */
-    function gettext($str)
+    function gettext($str): string
     {
         return $str;
     }
@@ -106,7 +110,7 @@ function getRealIpAddress()
  * @throws ContextException
  * @throws Exception
  */
-function setupContext()
+function setupContext(): Container
 {
     // Instancia del contenedor de dependencias con las definiciones de los objetos necesarios
     // para la aplicación
@@ -144,7 +148,7 @@ function setupContext()
  *
  * @return MySQLHandler
  */
-function getDbHandler(DatabaseConnectionData $connectionData = null)
+function getDbHandler(DatabaseConnectionData $connectionData = null): MySQLHandler
 {
     if ($connectionData === null) {
         // Establecer configuración de conexión con la BBDD
@@ -164,7 +168,7 @@ function getDbHandler(DatabaseConnectionData $connectionData = null)
  *
  * @return string
  */
-function getResource($dir, $file)
+function getResource($dir, $file): string
 {
     return file_get_contents(RESOURCE_DIR . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR . $file) ?: '';
 }
@@ -176,7 +180,7 @@ function getResource($dir, $file)
  *
  * @return string
  */
-function saveResource($dir, $file, $data)
+function saveResource($dir, $file, $data): string
 {
     return file_put_contents(RESOURCE_DIR . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR . $file, $data);
 }
diff --git a/tests/res/config/config.xml b/tests/res/config/config.xml
index c52afb5e..e4de0760 100644
--- a/tests/res/config/config.xml
+++ b/tests/res/config/config.xml
@@ -13,8 +13,8 @@
   <authBasicEnabled>1</authBasicEnabled>
   <checkNotices></checkNotices>
   <checkUpdates></checkUpdates>
-  <configDate>1607363733</configDate>
-  <configHash>0384920872756be7d264ec32433e78cef0180442</configHash>
+  <configDate>1607511675</configDate>
+  <configHash>3e1df63a6c16da5b01961dcbb7281b3ebaa3a277</configHash>
   <configSaver>Admin</configSaver>
   <configVersion></configVersion>
   <databaseVersion></databaseVersion>
@@ -33,7 +33,7 @@
   <dokuwikiUrlBase></dokuwikiUrlBase>
   <dokuwikiUser></dokuwikiUser>
   <encryptSession></encryptSession>
-  <export_hash>46aa537c917e043aa59e60d91e7f69aecbf727c7</export_hash>
+  <export_hash>f3b3e5240ad0d36be1b3cde7e471cdcb204216b5</export_hash>
   <filesAllowedMime/>
   <filesAllowedSize>1024</filesAllowedSize>
   <filesEnabled>1</filesEnabled>
diff --git a/tests/res/datasets/syspass.xml b/tests/res/datasets/syspass.xml
index f941c7b5..c003b9ac 100644
--- a/tests/res/datasets/syspass.xml
+++ b/tests/res/datasets/syspass.xml
@@ -1,545 +1,1266 @@
 <?xml version="1.0"?>
 <mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<database name="syspass">
-    <table_data name="UserProfile">
-        <row>
-            <field name="id">1</field>
-            <field name="name">Admin</field>
-            <field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A303B733A31343A22002A006163635669657750617373223B623A303B733A31373A22002A0061636356696577486973746F7279223B623A303B733A31303A22002A0061636345646974223B623A303B733A31343A22002A006163634564697450617373223B623A303B733A393A22002A00616363416464223B623A303B733A31323A22002A0061636344656C657465223B623A303B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A313B733A31383A22002A006163635072697661746547726F7570223B623A313B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="name">Demo</field>
-            <field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A313B733A31343A22002A006163635669657750617373223B623A313B733A31373A22002A0061636356696577486973746F7279223B623A313B733A31303A22002A0061636345646974223B623A313B733A31343A22002A006163634564697450617373223B623A313B733A393A22002A00616363416464223B623A313B733A31323A22002A0061636344656C657465223B623A313B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A303B733A31383A22002A006163635072697661746547726F7570223B623A303B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="name">Usuarios</field>
-            <field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A313B733A31343A22002A006163635669657750617373223B623A313B733A31373A22002A0061636356696577486973746F7279223B623A313B733A31303A22002A0061636345646974223B623A313B733A31343A22002A006163634564697450617373223B623A313B733A393A22002A00616363416464223B623A313B733A31323A22002A0061636344656C657465223B623A313B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A303B733A31383A22002A006163635072697661746547726F7570223B623A303B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
-        </row>
-    </table_data>
-    <table_data name="Category">
-        <row>
-            <field name="id">1</field>
-            <field name="name">Web</field>
-            <field name="description">Web sites</field>
-            <field name="hash" xsi:type="xs:hexBinary">3235363761356563393730356562376163326339383430333365303631383964</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="name">Linux</field>
-            <field name="description">Linux server</field>
-            <field name="hash" xsi:type="xs:hexBinary">6532303661353465393736393063636535306363383732646437306565383936</field>
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="name">SSH</field>
-            <field name="description">SSH access</field>
-            <field name="hash" xsi:type="xs:hexBinary">3137383764373634363330346335643938376366346536346133393733646337</field>
-        </row>
-    </table_data>
-    <table_data name="Client">
-        <row>
-            <field name="id">1</field>
-            <field name="name">Google</field>
-            <field name="hash" xsi:type="xs:hexBinary">6338323263316236333835336564323733623839363837616335303566396661</field>
-            <field name="description">Google Inc.</field>
-            <field name="isGlobal">0</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="name">Apple</field>
-            <field name="hash" xsi:type="xs:hexBinary">3166333837306265323734663663343962336533316130633637323839353766</field>
-            <field name="description">Apple Inc.</field>
-            <field name="isGlobal">0</field>
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="name">Microsoft</field>
-            <field name="hash" xsi:type="xs:hexBinary">3566353332613366633466316561343033663337303730663539613761353361</field>
-            <field name="description">Microsoft Inc.</field>
-            <field name="isGlobal">1</field>
-        </row>
-    </table_data>
-    <table_data name="Tag">
-        <row>
-            <field name="id">1</field>
-            <field name="name">www</field>
-            <field name="hash" xsi:type="xs:hexBinary">3465616533356631623335393737613030656264383038366332353964346339</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="name">windows</field>
-            <field name="hash" xsi:type="xs:hexBinary">3066343133376564313530326235303435643630383361613235386235633432</field>
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="name">Linux</field>
-            <field name="hash" xsi:type="xs:hexBinary">6532303661353465393736393063636535306363383732646437306565383936</field>
-        </row>
-    </table_data>
-    <table_data name="UserGroup">
-        <row>
-            <field name="id">1</field>
-            <field name="name">Admins</field>
-            <field name="description">sysPass Admins</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="name">Demo</field>
-            <field name="description"/>
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="name">Usuarios</field>
-            <field name="description">Grupo Usuarios</field>
-        </row>
-    </table_data>
-    <table_data name="User">
-        <row>
-            <field name="id">1</field>
-            <field name="name">sysPass Admin</field>
-            <field name="userGroupId">1</field>
-            <field name="login">admin</field>
-            <field name="ssoLogin" xsi:nil="true" />
-            <field name="pass" xsi:type="xs:hexBinary">243279243130247635695230547A4933744E3036416A304C4A656B39755371496834356C70575539366E644A71444A704E6969713139306A444A486D</field>
-            <field name="mPass" xsi:type="xs:hexBinary">64656635303230306330383635633335373637316233366261353266333137346134356466333633626135656431613962323261356461353965376134373930356664656239373436356462373934613831373635316133316432626363636266663836626233353235643930333932393734323535663937316261616239656436346637383266363066646465386539336637363164356663633436393031356433363164333234643436633533633138313335613334663739633039</field>
-            <field name="mKey" xsi:type="xs:hexBinary">6465663130303030646566353032303062316163626161346361643036643237386562323533616462643433613966376463636439343063656265313962343061383436643464633035303636306466653630613561653139363433643636353936643733333764646236386536363930336562383031373764356463386430663963623661643361663565643766303936376262393964663530373936316330656132373462663830346333663966373563336538643539396336326231623738333730303963616263373836383637366433636337376162383365386338323335336335626164396534656535333532656132346632653434653663316336656131643162313264393332386335303539623437656235343534666138356435626437343637353333383132636662313230316634633635383733316465323934613664643035396332613362373333613765343462633539306338363337393032306662303263363262303565613030623234646235323566653863303263323138666561356661353139306563396266333461316637613937633733396637343534323333316466323932343965323138656338343233306161623038373336346463353236363935383630656638623232313439626262656636656266373030366638376434343661333535353863323062353462376336623330</field>
-            <field name="email" xsi:nil="true" />
-            <field name="notes" xsi:nil="true" />
-            <field name="loginCount">81</field>
-            <field name="userProfileId">1</field>
-            <field name="lastLogin">2018-04-19 23:46:48</field>
-            <field name="lastUpdate" xsi:nil="true" />
-            <field name="lastUpdateMPass">1521887152</field>
-            <field name="isAdminApp">1</field>
-            <field name="isAdminAcc">0</field>
-            <field name="isLdap">0</field>
-            <field name="isDisabled">0</field>
-            <field name="hashSalt"></field>
-            <field name="isMigrate">0</field>
-            <field name="isChangePass">0</field>
-            <field name="isChangedPass">0</field>
-            <field name="preferences" xsi:type="xs:hexBinary">4F3A33323A2253505C446174614D6F64656C5C55736572507265666572656E63657344617461223A31303A7B733A373A22757365725F6964223B693A313B733A363A22757365324661223B623A303B733A343A226C616E67223B733A353A22656E5F5553223B733A353A227468656D65223B733A31333A226D6174657269616C2D626C7565223B733A31343A22726573756C747350657250616765223B693A34383B733A31313A226163636F756E744C696E6B223B623A313B733A393A22736F72745669657773223B623A303B733A393A22746F704E6176626172223B623A303B733A31353A226F7074696F6E616C416374696F6E73223B623A303B733A31343A22726573756C747341734361726473223B623A303B7D</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="name">sysPass demo</field>
-            <field name="userGroupId">2</field>
-            <field name="login">demo</field>
-            <field name="ssoLogin">demo</field>
-            <field name="pass" xsi:type="xs:hexBinary">2432792431302454726E69756C5763754361433635346F76566F35392E766B4C5433414E31624A6D726A79553462696335325069436A6B5572396669</field>
-            <field name="mPass" xsi:type="xs:hexBinary">64656635303230303231616533353730373263373165626239393534353966366236636164373235336534316336633534353036336339326136653730616366333930393165373934613865376662386662326664333931383932363562396466303133333631623063323732323339653465373165343839313030646534326265633737623966343238396635633936613837646531343864313963653663643338613131343932623163313765653630326430623532343564346566</field>
-            <field name="mKey" xsi:type="xs:hexBinary">6465663130303030646566353032303035643534316262633462653032333563313338626561366561333536626436663037353365313035653030333563653166316235336534663364343565366262353335626163396639646538653131316262356334383865336535633637323333666632626365313837626335386135353839373535373034386564353634366361646638623736396132323164363032353435653034306264613135663138323638383665373536313236353361313037306530333261323365636364336339616438323162306363383962643130333035303931653965626332653935313465656631373462663339343664656132393661346262366264343463646333363361643335623032373561356633323430313936346531633131663937313764313139633130633561373161666332356365346534366661623234646663626362326237303964336335316532623834326464303933653230353965373265356638376363366236626239306231346265376264373637663163303937366231313362393630613265636565336633313131663538656131346139353736623332653163303962636435313366383733656664653062373333366238643464646637616237323333373038613264393965633738356139393036306135643262316366306262663739346262663765</field>
-            <field name="email">demo@syspass.org</field>
-            <field name="notes">aaaa</field>
-            <field name="loginCount">12</field>
-            <field name="userProfileId">2</field>
-            <field name="lastLogin">2018-04-01 21:29:47</field>
-            <field name="lastUpdate">2018-04-14 08:47:43</field>
-            <field name="lastUpdateMPass">1522582852</field>
-            <field name="isAdminApp">0</field>
-            <field name="isAdminAcc">0</field>
-            <field name="isLdap">0</field>
-            <field name="isDisabled">0</field>
-            <field name="hashSalt"></field>
-            <field name="isMigrate">0</field>
-            <field name="isChangePass">0</field>
-            <field name="isChangedPass">0</field>
-            <field name="preferences" xsi:nil="true" />
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="name">User A</field>
-            <field name="userGroupId">2</field>
-            <field name="login">user_a</field>
-            <field name="ssoLogin">user_a</field>
-            <field name="pass" xsi:type="xs:hexBinary">2432792431302469444B442E2F4F624D79742E6F43594F5249514D5065624454783966744D636A703034365A435976662E765479597A594F6A4C472E</field>
-            <field name="mPass" xsi:nil="true" />
-            <field name="mKey" xsi:nil="true" />
-            <field name="email">user_a@syspass.org</field>
-            <field name="notes"></field>
-            <field name="loginCount">0</field>
-            <field name="userProfileId">1</field>
-            <field name="lastLogin" xsi:nil="true" />
-            <field name="lastUpdate">2018-04-14 08:48:08</field>
-            <field name="lastUpdateMPass">0</field>
-            <field name="isAdminApp">0</field>
-            <field name="isAdminAcc">0</field>
-            <field name="isLdap">0</field>
-            <field name="isDisabled">0</field>
-            <field name="hashSalt"></field>
-            <field name="isMigrate">0</field>
-            <field name="isChangePass">0</field>
-            <field name="isChangedPass">0</field>
-            <field name="preferences" xsi:nil="true" />
-        </row>
-        <row>
-            <field name="id">4</field>
-            <field name="name">User B</field>
-            <field name="userGroupId">2</field>
-            <field name="login">user_b</field>
-            <field name="ssoLogin" xsi:nil="true" />
-            <field name="pass" xsi:type="xs:hexBinary">243279243130244C37643658736A663955794F6E583662472E6F384E4F713961674B6F64536B4B5674485350462F6861414E657971517065372E6532</field>
-            <field name="mPass" xsi:nil="true" />
-            <field name="mKey" xsi:nil="true" />
-            <field name="email">user_b@syspass.org</field>
-            <field name="notes"></field>
-            <field name="loginCount">0</field>
-            <field name="userProfileId">1</field>
-            <field name="lastLogin" xsi:nil="true" />
-            <field name="lastUpdate">2018-03-30 18:38:32</field>
-            <field name="lastUpdateMPass">0</field>
-            <field name="isAdminApp">0</field>
-            <field name="isAdminAcc">0</field>
-            <field name="isLdap">0</field>
-            <field name="isDisabled">0</field>
-            <field name="hashSalt"></field>
-            <field name="isMigrate">0</field>
-            <field name="isChangePass">0</field>
-            <field name="isChangedPass">0</field>
-            <field name="preferences" xsi:nil="true" />
-        </row>
-    </table_data>
-	<table_data name="Account">
-	<row>
-		<field name="id">1</field>
-		<field name="userGroupId">1</field>
-		<field name="userId">1</field>
-		<field name="userEditId">1</field>
-		<field name="clientId">1</field>
-		<field name="name">Google</field>
-		<field name="categoryId">1</field>
-		<field name="login">admin</field>
-		<field name="url">http://google.com</field>
-		<field name="pass" xsi:type="xs:hexBinary">6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138</field>
-		<field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432</field>
-		<field name="notes">aaaa</field>
-		<field name="countView">341</field>
-		<field name="countDecrypt">35</field>
-		<field name="dateAdd">2018-03-25 09:54:07</field>
-		<field name="dateEdit">2018-04-02 21:38:25</field>
-		<field name="otherUserGroupEdit">0</field>
-		<field name="otherUserEdit">0</field>
-		<field name="isPrivate">0</field>
-		<field name="isPrivateGroup">0</field>
-		<field name="passDate">1522341709</field>
-		<field name="passDateChange">0</field>
-		<field name="parentId">0</field>
-	</row>
-    <row>
-        <field name="id">2</field>
-        <field name="userGroupId">1</field>
-        <field name="userId">1</field>
-        <field name="userEditId">1</field>
-        <field name="clientId">2</field>
-        <field name="name">Apple</field>
-        <field name="categoryId">2</field>
-        <field name="login">admin</field>
-        <field name="url">http://apple.com</field>
-        <field name="pass" xsi:type="xs:hexBinary">6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138</field>
-        <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432</field>
-        <field name="notes">bbbb</field>
-        <field name="countView">341</field>
-        <field name="countDecrypt">35</field>
-        <field name="dateAdd">2018-03-25 09:54:07</field>
-        <field name="dateEdit">2018-04-02 21:38:25</field>
-        <field name="otherUserGroupEdit">0</field>
-        <field name="otherUserEdit">0</field>
-        <field name="isPrivate">0</field>
-        <field name="isPrivateGroup">0</field>
-        <field name="passDate">1522341709</field>
-        <field name="passDateChange">0</field>
-        <field name="parentId">0</field>
-    </row>
-	</table_data>
-	<table_data name="AccountFile">
-	</table_data>
-	<table_data name="AccountHistory">
-	</table_data>
-	<table_data name="AccountToFavorite">
-	</table_data>
-	<table_data name="AccountToTag">
-	<row>
-		<field name="accountId">1</field>
-		<field name="tagId">1</field>
-	</row>
-	</table_data>
-	<table_data name="AccountToUser">
-	<row>
-		<field name="accountId">1</field>
-		<field name="userId">3</field>
-		<field name="isEdit">1</field>
-	</row>
-    <row>
-        <field name="accountId">2</field>
-        <field name="userId">2</field>
-        <field name="isEdit">0</field>
-    </row>
-	</table_data>
-	<table_data name="AccountToUserGroup">
-        <row>
-            <field name="accountId">1</field>
-            <field name="userGroupId">2</field>
-            <field name="isEdit">1</field>
-        </row>
-        <row>
-            <field name="accountId">2</field>
-            <field name="userGroupId">2</field>
-            <field name="isEdit">0</field>
-        </row>
-	</table_data>
-	<table_data name="Config">
-	<row>
-		<field name="parameter">config_backup</field>
-		<field name="VALUE">789ca5586d6fdb3610ee6f31b67d59ab897a978b024deda46f69e3c569d00dc30a8aa26dc2b2a48a5413b7e87fdf919454c7092515fb628bd23d47f25e9e3bf262ead8d3c972f1cfacc8576cddfccdb1c09369144fbff1a9eb4c278f1e12785497eb0aa7f42ddd4f9ef229a8917f6e68124f8b6d7dc3b6ec34c74946d3c95336b525c01d027ca8b29f9a00e45f604e0f31de2086d3eaa7000bccf921201e02bcc73bca4b4ceeac2b32a1b2149773bac275265e56455d4a6b214078f608c4a22a562ca32dc6bc99b22a6ef7a3fda1a497b4fa72d754a8577e515442aa8eecc81e963e76c380ee231f18ad59d649c6f22d7f876faf19bde172416e6f2c1d20aed84e9932b0ed5190037bf65b1f1352d4b998c91f29ed45bde66fc4cf618e61dd6443c9f64399624179e7d97ee9bc108c1c481bf39ea8c757986f264d4486514a504a91ef077865e3d4a324214e6ca72840b6e77a2875e255ec1029ef18bd9426af0a2ea40c029d7c0fd9c2f9933451be35c67d9a2c0bb2a5e22010faa690692865c26e8621441b6528984efe9efe5b64b35f67fb3f9ecf6f3fc76c08dbc6b3c4f2f2938f93c009f18ab8c9b031dacc715d3b90a266dea349bd1e41a774571ce7ba717ac91ffc24cb8a1b9a9ede0a30009ea270faadc14d278bf9591785d3c99bc54b3972f4e8e5ebb32ec340f2bdfae6e9d1c5fc4a8efc76b454a9a547f38b991c8532aad4e8a3620efdf1e3b9128d9bd1f25c4ddface67a3957c36639571fd524a859cf6c79ad86cd825e9cbc55c3664597f3851a364b7a7bfa971a366b9a5d82aaef634db5645f35edda8ed79b710a349a29d65991e06c497145369def8cdcc8722e7076a8b8b768b4b5d281184dc9331926e8313cac2a4a5989e56351adfbaba2d2c3f2b48d771f82b566e9339cee58fe98e4cf6af8c0e543c362fcf1ff9daa4d4b28bc4b4a2a2a90e32aa4df875c3c54658c2923114729e3180bbd143e49f9b07fa46053d47facc1c8b652fa47d175402b58ca52a6b31abb59a38c26778d85a8c6cd5aac8fa3d3bc1f90fd42734d12b0c086242004c02d5080ac5605bc4969469b373239c1573465c26ae9028c4b6f092d052bf296344086e32f1a23731449eade143756134a962671cd22f73e664db90c9b8fa428f7f790926210188f64906216959b814db57403790123965b1de3e837452d3ad28137a2c2646b75bc037c8149068ecaf71df938720e596b2d4177e53bcc05ad641cdf1455da5192238d725bb28a9aa4a4151c705d452100f8c6dadd1709b4b96bd501e845290b008aed4aa82c960c09fd21d27c5bd5cd0e63ed084ef31454b34c39cb6e4ca48d5b8bcd55b1a5b9a646636592e81390a5635b4c0938ae5146f292c26755b16b0b2cb43ae27953d4bb94e84577a51dccf2db9b5f6eb6e277f4e7865e8c4036c5d991bef08ca921452fe9e71a56c68ff7654c5609024aab2b26f6a39255035a8a90a6906fac9f32c561a7f2a02183fe3d1256b296033a0a7858d9f7a1bdb46c3282a1413c17105e39a1c3862d9b0c59e24cb58b01a88fa807fd95ed9198ac2859a1d023768cbd88068484b117267e902684da61e078714830c5e1ca0f50e2c3c77ebb406ac2598c9ff019ae0eca82519e53ce81f6e471a36516c7eecf00ce043dc7b972105854e6631f514bf1ab0dd50d30726598006f309c3d49b29af6174fddf45f431557d4ac73c6b56d0b45b6ebb8b6337036879f041a8d210546473f7473600c22297cc63231b2ccebf3fc9ad6772f1a8cb690f2ba193b420c1c99e0517787bee3a108a150d604cf086a0f94af77b0b6e36a6cdc4c0255a82e3f6d0e8e6724469e13475112a731c26ee8131cb96e14ae6c3f7649889143f1cac7031e809a04a47757b117a31586a39e43ed3884a4481c9424d875c220c0aee7db382469e024fdcdc94688f21e3b1a8d0f5472b739b17b19588b5f42bb24e86806d6a0fb571d465769405b147c55c7cd57354dfb21abcf55a1bc3b5c1975042d71b322308feaadfb2988e6a4da9762a999a533d6d08dc4599d65aa413d2184ea0e49c59cf10824fb013846307214a59e910f3a04b407c5b9ecae8e037c183a2f24fb8fba1ae4bc78e836cd7c6bf703707499664ed7c678a7aa753bde8d71a23ba8f6aa09d96e10d940fedfff039026f3d1</field>
-	</row>
-	<row>
-		<field name="parameter">config_backup_date</field>
-		<field name="VALUE">1524181202</field>
-	</row>
-	<row>
-		<field name="parameter">lastupdatempass</field>
-		<field name="VALUE">1521887151</field>
-	</row>
-	<row>
-		<field name="parameter">masterPwd</field>
-		<field name="VALUE">$2y$10$p/x8ECCP1Lz/SjbGQy.6/OJ/.OLICBLGkXPiVkaA5Kf1.1HvRQOWG</field>
-	</row>
-	<row>
-		<field name="parameter">version</field>
-		<field name="VALUE">300.18032302</field>
-	</row>
-	</table_data>
-	<table_data name="CustomFieldType">
-	<row>
-		<field name="id">1</field>
-		<field name="name">text</field>
-		<field name="text">Texto</field>
-	</row>
-	<row>
-		<field name="id">2</field>
-		<field name="name">password</field>
-		<field name="text">Clave</field>
-	</row>
-	<row>
-		<field name="id">3</field>
-		<field name="name">date</field>
-		<field name="text">Fecha</field>
-	</row>
-	<row>
-		<field name="id">4</field>
-		<field name="name">number</field>
-		<field name="text">Número</field>
-	</row>
-	<row>
-		<field name="id">5</field>
-		<field name="name">email</field>
-		<field name="text">Email</field>
-	</row>
-	<row>
-		<field name="id">6</field>
-		<field name="name">telephone</field>
-		<field name="text">Teléfono</field>
-	</row>
-	<row>
-		<field name="id">7</field>
-		<field name="name">url</field>
-		<field name="text">URL</field>
-	</row>
-	<row>
-		<field name="id">8</field>
-		<field name="name">color</field>
-		<field name="text">Color</field>
-	</row>
-	<row>
-		<field name="id">9</field>
-		<field name="name">wiki</field>
-		<field name="text">Wiki</field>
-	</row>
-	<row>
-		<field name="id">10</field>
-		<field name="name">textarea</field>
-		<field name="text">Área de Texto</field>
-	</row>
-	</table_data>
-    <table_data name="CustomFieldDefinition">
-        <row>
-            <field name="id">1</field>
-            <field name="name">Prueba</field>
-            <field name="moduleId">1</field>
-            <field name="required">1</field>
-            <field name="help">Ayuda</field>
-            <field name="showInList">0</field>
-            <field name="typeId">1</field>
-            <field name="isEncrypted">1</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="name">RSA</field>
-            <field name="moduleId">101</field>
-            <field name="required">0</field>
-            <field name="help"></field>
-            <field name="showInList">0</field>
-            <field name="typeId">2</field>
-            <field name="isEncrypted">0</field>
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="name">RSA Priv</field>
-            <field name="moduleId">101</field>
-            <field name="required">0</field>
-            <field name="help"></field>
-            <field name="showInList">0</field>
-            <field name="typeId">2</field>
-            <field name="isEncrypted">0</field>
-        </row>
-    </table_data>
-    <table_data name="CustomFieldData">
-        <row>
-            <field name="id">1</field>
-            <field name="moduleId">1</field>
-            <field name="itemId">1</field>
-            <field name="definitionId">1</field>
-            <field name="data" xsi:type="xs:hexBinary">6465663530323030633262353536613539613465333330646461323833363730363462623861326463336630643963386565333935366134326631326135326261323035633036663063313933313263626465353630396562303133356364613461353738636534616263323436343235613739343338663461393231353433623437633062386134363566336466663131373061613162663532356466646434383165613664333763303537396132</field>
-            <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303061356237393366343238663337393936356539393836656663363632396332613462336662323431666131343731326332333138323465376632366639313863383663653164636330393838333735343463326237316232383361663135633731363438326630303863313135326563623238383939313939346139376165613836623432613534333166383261343734343565636336376137643462633266396263343065653162333236343030373163333334386338626331613632323165613534346433396630636537343538356561653432376266373131633864366237336166316561613237623630643863626631643531666636366133366562636364353232643538633734653664626363613534646334366662303739626631653537626530646231643363316464313264303139633665663437633366353431303231633233376639303066333633323838613864346464393463323637306365313239393864626237396235333262623266383330323164663062656631326138363664646132343132653338333535636137646465613364336663366535303532346634653961313435366466313034626238376433633532353837643036613162383066613361613064643330633866356239373338663930336535653432653362363333333739333863</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="moduleId">101</field>
-            <field name="itemId">1</field>
-            <field name="definitionId">2</field>
-            <field name="data" xsi:type="xs:hexBinary">4C6F72656D20697073756D20646F6C6F722073697420616D65742C20636F6E73656374657475722061646970697363696E6720656C69742E205365642075742074696E636964756E74206C6F72656D2E205072616573656E74207665686963756C6120766F6C7574706174206C696265726F2073697420616D65742066617563696275732E2041656E65616E20766974616520617263752071756973206C616375732070756C76696E617220737573636970697420617420656765742074656C6C75732E204E616D2066656C6973207475727069732C207363656C657269737175652075742066656C69732061632C2074696E636964756E74206D6178696D7573206D692E205365642076756C7075746174652076697461652073656D20616320736F6C6C696369747564696E2E20446F6E6563206672696E67696C6C61206C6F626F7274697320657820657520706F72747469746F722E20457469616D2073656D70657220736F6C6C696369747564696E207665686963756C612E20467573636520766172697573206E756C6C61206D657475732C206E65632076697665727261206E696268206469676E697373696D2069642E</field>
-            <field name="key" xsi:nil="true" />
-        </row>
-    </table_data>
-	<table_data name="UserToUserGroup">
-	<row>
-		<field name="userId">1</field>
-		<field name="userGroupId">2</field>
-	</row>
-	<row>
-		<field name="userId">3</field>
-		<field name="userGroupId">2</field>
-	</row>
-	<row>
-		<field name="userId">2</field>
-		<field name="userGroupId">1</field>
-	</row>
-	</table_data>
-    <table_data name="AuthToken">
-        <row>
-            <field name="id">1</field>
-            <field name="userId">1</field>
-            <field name="token" xsi:type="xs:hexBinary">32636565386232323466343865303165663438616331373265383739636337383235383030613964376365336232333738333231326634373538663163313436</field>
-            <field name="actionId">2</field>
-            <field name="createdBy">1</field>
-            <field name="startDate">1528619057</field>
-            <field name="vault" xsi:nil="true" />
-            <field name="hash" xsi:nil="true" />
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="userId">1</field>
-            <field name="token" xsi:type="xs:hexBinary">32636565386232323466343865303165663438616331373265383739636337383235383030613964376365336232333738333231326634373538663163313436</field>
-            <field name="actionId">7</field>
-            <field name="createdBy">1</field>
-            <field name="startDate">1528619077</field>
-            <field name="vault" xsi:type="xs:hexBinary">4F3A31393A2253505C436F72655C43727970745C5661756C74223A343A7B733A32353A220053505C436F72655C43727970745C5661756C740064617461223B733A3139303A2264656635303230306233333662326437343731666333396264336438316465353839343038393761303636393532636338613065326434313730653865653539636631666166343866323866333132653338366136323534333934386530633461613066373235353931363366316265636137353566656430316138353165363338626530666236636230396234653235623539663431333236643766363065363739363765643032613831303965353065343961313166353365653762223B733A32343A220053505C436F72655C43727970745C5661756C74006B6579223B733A3531323A226465663130303030646566353032303035336434633932363065616233643863653961666337313763313964353937363362313235653239623237616462393462333938343035663636373037653165653234313637363762396566383836336334373266653637623033373333656262383565613565636330313963396161323636303231663430306235353661376562663038386563663761613336376637653138383062383431333866623933383832616633663766353131663530653264646539643563626663383361366431336633386335386636663734633063613530383062646437393530656538346265636462316635646131336363386431653566626466616164366437313031333063313232656365333563666239356338646332383362626166303335363030646633343632643635653334653436356435646234396636306266306466636332303761353732643036386162303035333133396661373634356335363733636535613536303236666638663732613034646662356336316230366234303337383432613063663461393664623430336232346333613462303630353434336566363163643265663865316539643766663637656464616237363432323362326664376261333861656132626431663962313432626335356664643230373664386533653562386637636233376262223B733A32383A220053505C436F72655C43727970745C5661756C740074696D65536574223B693A313532383632333036353B733A33323A220053505C436F72655C43727970745C5661756C740074696D6555706461746564223B693A303B7D</field>
-            <field name="hash" xsi:type="xs:hexBinary">2432792431302456425842645839546157334B6146506F38504F7A4C753749412E364D74414A555448633466305A37716A445A664C41416D69795275</field>
-        </row>
-    </table_data>
-    <table_data name="Notification">
-        <row>
-            <field name="id">1</field>
-            <field name="type">Prueba</field>
-            <field name="component">Accounts</field>
-            <field name="description">
-                Notificación de prueba
-            </field>
-            <field name="date">1529145158</field>
-            <field name="checked">0</field>
-            <field name="userId">2</field>
-            <field name="sticky">0</field>
-            <field name="onlyAdmin">0</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="type">Global</field>
-            <field name="component">Accounts</field>
-            <field name="description">
-                test
-            </field>
-            <field name="date">1529145296</field>
-            <field name="checked">0</field>
-            <field name="userId" xsi:nil="true" />
-            <field name="sticky">1</field>
-            <field name="onlyAdmin">0</field>
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="type">Admins</field>
-            <field name="component">Accounts</field>
-            <field name="description">
-                test
-            </field>
-            <field name="date">1529145313</field>
-            <field name="checked">0</field>
-            <field name="userId" xsi:nil="true" />
-            <field name="sticky">0</field>
-            <field name="onlyAdmin">1</field>
-        </row>
-    </table_data>
-    <table_data name="PublicLink">
-        <row>
-            <field name="id">1</field>
-            <field name="itemId">2</field>
-            <field name="hash" xsi:type="xs:hexBinary">646134633934396166303637386334353130313363626137633133626463396137636135383731383034663137343134306636626161653236346464</field>
-            <field name="data" xsi:type="xs:hexBinary">4F3A31393A2253505C436F72655C43727970745C5661756C74223A343A7B733A32353A220053505C436F72655C43727970745C5661756C740064617461223B733A313834343A226465663530323030663736353663393931396532663637643566636463656532343532383066333663633332653766353763616632313135653337656231323131616538636664356132373765363663346336336333336462663032393966393639333436336435353661396531653766623366303730386662373165636136323262643234313061333536663562333561376562326632346366316237663161376637306365313831376235353232636134326564323665656536343533663561336337393261366361373633636631336436643530663161356439623636333662303061663838613465363330376361663235653063336665396631313838336331653766643635343434306564356330363339383438333130396237313361663939636263396565353637646136333966383435643463306534316637356261613261613332306330333235653037653337396230356362326237623337333264306434663863623939333464613935383464623039313433316361623734613634323464373135666664303934353436383062303263343933373732353830633165386237323731363739323466366533616331376239656236353963633137363161613538326564363962636263383161396336633933393336656330653739326439303732363238306364633763386162616366353430643131646163383139663932306439323165323664376134366230663861666433373032633166636139316166333163346136376266633266353533626561323334306365326138653166646666303366663232366164613231626636343166616161353230333630663638653938656161393334353732646337353236643261663238646436626262653130616633656635323730343261366461363535663931386565636232643232343737653630303236373234386432336632633131313537323139313132653138313361653961626361356161393764656431343637613732383737393038666337366565613632383438623036653765636135633937303633383261623632616637656364383131396634373832303664316430366664666535303237613961393434633033636164616539363236336463323364353530383331353462326231636464306233306539333033373638663432666536623237653562646362613237333839373261343138346565363039353337386237353266663532313137353863303130616232623733323066353362363034643364626333336630333862303665623637646266323830633734363533373561376666316238386438303639396330303737373434336432633161646261333235633138363165313632646430393932643137376136333935373134663263326431346265633663666437653966613631393830363239363563633531616132646163656534383636616536636233303961386437366439313535633530393963356465376165663336373633356337306235663131383032386561373538613633363137306639613033353136653130383362623961363664303835343764313436356662386439383366666362366664336238633836323465356639626661663738326565346639383661333534383338613931343562346363633138356238346439346263353730356233616336623966333935366561313133646131353739656339623830343432313035333461353865656432383962393038373736336266316362323136343462333438663237306635333434633837383435323664393832386161303262653762613062656335326531366161613639396261306235663434303739653431303738316636633939633935393931626263336331653834643634326132363933313362343564363262316238623766323535333766623365363462306234643461366363336439346131623536313231333539636532393363636139396364303035346232666563653634643865343363656535366432663531623438376361383166623532303034393232643633363239663964366339363236663236383364653330393132343164653865323166323064613366366438613135623261393536626232613234336365373433366563386130356461333337323964333839633938393133376262396234373061396666393935613265666532306361663536356236613538343964343332393938316262353233663737666265323062646261366236336235626339666433366264393236376533643161316535386666366465373765666564303539343332356661393761323432393234323434336431313738656236353165613431373237633161363661623363333432333165626338623562393439313531353365373532323764646265393762623134373030346561623331383936393364363735383466666337643266353761613932333738303535626565633139326336666464363363393934633032643561343866623262636635326132223B733A32343A220053505C436F72655C43727970745C5661756C74006B6579223B733A3531323A226465663130303030646566353032303065306463383737306634316662396337336564386465363435383536373539393337303264313164663439633639333131303032303637653932633439396139363666383339363362343162633966633962303163646130386237336539343338336539643534626362353139633037623530323234663265303236383931356164346337366232626365303833663331353865383464666236313262316336633036323138333338666634383565306364623337636530366430623831613061636139643934643537633331653232323130656365303132386535626263666433616539623133383932326633363236663232373961326332323464666533393331643932356263353162646137623862396639356337663631373565376565653833336436396338333966396639343739643338353433323131326463313032343863356432323463343131356662643066396533666637653661333464646533643933666630643066343036346661306137353762303936343363636161313531666566633832376436306462613364323634626266666162663763303562646465303637386636333430376338356435613739616436623734333462623032343130313232386565303130306564633833653239626132633966376233613136363430653466643966353064223B733A32383A220053505C436F72655C43727970745C5661756C740074696D65536574223B693A313532393232383835313B733A33323A220053505C436F72655C43727970745C5661756C740074696D6555706461746564223B693A303B7D</field>
-            <field name="userId">1</field>
-            <field name="typeId">1</field>
-            <field name="notify">1</field>
-            <field name="dateAdd">1529228851</field>
-            <field name="dateExpire">1529229451</field>
-            <field name="dateUpdate">0</field>
-            <field name="countViews">0</field>
-            <field name="totalCountViews">0</field>
-            <field name="maxCountViews">3</field>
-            <field name="useinfo" xsi:nil="true" />
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="itemId">1</field>
-            <field name="hash" xsi:type="xs:hexBinary">313065363937306666653833623531393234356635333433333732626366663433376461623565356134386238326131653238636131356235346635</field>
-            <field name="data" xsi:type="xs:hexBinary">4F3A31393A2253505C436F72655C43727970745C5661756C74223A343A7B733A32353A220053505C436F72655C43727970745C5661756C740064617461223B733A313833303A22646566353032303065363536643666336138613463383230623337333834323766373665383835386330346431633835363033343933386239386136643464383861383930376537356166653764636432306162333733393539656265326336376463356533353264663131373561333766353437386461373136383464373032616363336330336430363562383235343031646631343734646364373731633339613464326436656265626339313034356464643963646463643533343165383565653665646664313338376630653532336661623930383966386563656339316662656631656337396636396136376565323930353665646636656330323866376236373836643431313231316238336333656565396332653332393537393662323561633439646339383862623139396232336435356534396638653332313637643637613739356264376632383434346533323336643564626131343665346538316264363633376330396663363265623932643763663161356539393330336634396564316533623738353335666165623163356530656566376161646231303837396639633333666339353432393133363837373762376533626437626664663762656339613664393130656135383234653139353639323365643838616261623338313238643966643161336435323532373034623632633961333839366637326565343030643466623663363662313134356561616665663063353939666561653035313335306264396632316333373764633035323837313063613461333563646634396562383438343165633633393638333633346135623730613839623230663334613534326232613837376561623164623530653561386635613735653835633036306466376233316236626533613231373237333835666265633663613465363265336434636236623133643566313063313035343938336366376131616633636633633133383136393730386364353238306336356530356234363462333461633334303163353963663637623232333330373636613737383537333830346131323563363362373830666165303234396661373635353938323665303861663961623931656665366666383231393065336464343732623634306333336430393035633634663063623864626239333362616663653931613963353830393437356434346266323666303739626239623230636564343030343666663838323766376263323132656438633261613839626564323836383235396539383938643735316361383339643363633162313361306630333866396131636666326636386465663031663036323961336133633237313963663739373965323539356162613230376532653564346566636363613466363130323864303461636463643837396637646564626337393330653564616164353963356436386138366336333562343539613833623931353562623639356335376165656531623665346161353363613832633665393438636563656563366333656263363031393361623764303931346337373335393735653362656166633532653337626664383736656231346261326465323834353838656265313566303032373038343338613234383938653230323032323839313139313136666661343733306333633935326531643031326565323038373930326237373065666239356331643134373530323065393537616666653163616635333539326431646439356532346537663865363939376237633164643434346537323561633432383962396266366664336664353262363134363864393134343864366335356431656631306532333565373330643662643562373835353966636665383561366637653161306533333039666532633236343161653836336665386264393663333161373764323937313639323539363437346331613635613437313861626532323064643933633336323831323362646231336165633437333939316437333866623962666139326230393332363439323962383134346362656366616561363465323966616331626261383562386531396466636261376166306331666537653136626566666531313165383038313063663036393665623464633463303863333165646533306362636232306636353337326139303932326139366130363035353566613834623535333430333637623763323166633835646633666366613162336162643338343866633030393236393566313036356537623130383964663564636331626563396462666463356332613135666231643138333332613364373738343533396565626430333965356265326465626534666262326234386532313237343964633835633137383762353335306137303865633439326665396165646661343566303832626465356166386331636130373531613637393361643332623864643931323035643934666366646136616532343538383466223B733A32343A220053505C436F72655C43727970745C5661756C74006B6579223B733A3531323A226465663130303030646566353032303066316562333864316662623534643861336632653430373034666465656535623262633766656264303238653164383331363131356365616131363938653235386131633765646336623165633536323236663732666239353131623463656137333032633036323738643330613032333762303664353965303534363761333737386364346462373865343066383862613230366666613964643765666638386261636230353939373136343230653763653362323564396433386132306262646161366237623466313362623761653136313564323534656438333463343664623734393464303864353232666632373064336635363462663661636239343231633936346362396536616337336439623664396133653561383234323236653638633561336630653330373738616366316332313561326264663635616538303636616666623133396234383234373635356662373331323164303761366431373631306363626433396331373334626563303938383836616430336165356530613734346363353638313864643836636261306366326136656439376439346665333336386237393533333432636663356135366536333439616663633064323962666362623265636136613038656437663866643466633735313630313634643062646238373062633763223B733A32383A220053505C436F72655C43727970745C5661756C740074696D65536574223B693A313532393232383836323B733A33323A220053505C436F72655C43727970745C5661756C740074696D6555706461746564223B693A303B7D</field>
-            <field name="userId">1</field>
-            <field name="typeId">1</field>
-            <field name="notify">0</field>
-            <field name="dateAdd">1529228863</field>
-            <field name="dateExpire">1529229463</field>
-            <field name="dateUpdate">0</field>
-            <field name="countViews">0</field>
-            <field name="totalCountViews">0</field>
-            <field name="maxCountViews">3</field>
-            <field name="useinfo" xsi:nil="true" />
-        </row>
-    </table_data>
-    <table_data name="UserPassRecover">
-        <row>
-            <field name="id">1</field>
-            <field name="userId">2</field>
-            <field name="hash" xsi:type="xs:hexBinary">3038366162313036303866363838346566383031396134353237333561633066</field>
-            <field name="date">1529275206</field>
-            <field name="used">0</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="userId">2</field>
-            <field name="hash" xsi:type="xs:hexBinary">3532383335346130663366626661376161626538303831373231653065633631</field>
-            <field name="date">1529275330</field>
-            <field name="used">0</field>
-        </row>
-    </table_data>
-    <table_data name="ItemPreset"/>
-</database>
+    <database name="syspass">
+        <table_data name="UserProfile">
+            <row>
+                <field name="id">1</field>
+                <field name="name">Admin</field>
+                <field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A303B733A31343A22002A006163635669657750617373223B623A303B733A31373A22002A0061636356696577486973746F7279223B623A303B733A31303A22002A0061636345646974223B623A303B733A31343A22002A006163634564697450617373223B623A303B733A393A22002A00616363416464223B623A303B733A31323A22002A0061636344656C657465223B623A303B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A313B733A31383A22002A006163635072697661746547726F7570223B623A313B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
+            </row>
+            <row>
+                <field name="id">2</field>
+                <field name="name">Demo</field>
+                <field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A313B733A31343A22002A006163635669657750617373223B623A313B733A31373A22002A0061636356696577486973746F7279223B623A313B733A31303A22002A0061636345646974223B623A313B733A31343A22002A006163634564697450617373223B623A313B733A393A22002A00616363416464223B623A313B733A31323A22002A0061636344656C657465223B623A313B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A303B733A31383A22002A006163635072697661746547726F7570223B623A303B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
+            </row>
+            <row>
+                <field name="id">3</field>
+                <field name="name">Usuarios</field>
+                <field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A313B733A31343A22002A006163635669657750617373223B623A313B733A31373A22002A0061636356696577486973746F7279223B623A313B733A31303A22002A0061636345646974223B623A313B733A31343A22002A006163634564697450617373223B623A313B733A393A22002A00616363416464223B623A313B733A31323A22002A0061636344656C657465223B623A313B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A303B733A31383A22002A006163635072697661746547726F7570223B623A303B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
+            </row>
+        </table_data>
+        <table_data name="Category">
+            <row>
+                <field name="id">1</field>
+                <field name="name">Web</field>
+                <field name="description">Web sites</field>
+                <field name="hash" xsi:type="xs:hexBinary">3235363761356563393730356562376163326339383430333365303631383964</field>
+            </row>
+            <row>
+                <field name="id">2</field>
+                <field name="name">Linux</field>
+                <field name="description">Linux server</field>
+                <field name="hash" xsi:type="xs:hexBinary">6532303661353465393736393063636535306363383732646437306565383936</field>
+            </row>
+            <row>
+                <field name="id">3</field>
+                <field name="name">SSH</field>
+                <field name="description">SSH access</field>
+                <field name="hash" xsi:type="xs:hexBinary">3137383764373634363330346335643938376366346536346133393733646337</field>
+            </row>
+        </table_data>
+        <table_data name="Client">
+            <row>
+                <field name="id">1</field>
+                <field name="name">Google</field>
+                <field name="hash" xsi:type="xs:hexBinary">6338323263316236333835336564323733623839363837616335303566396661</field>
+                <field name="description">Google Inc.</field>
+                <field name="isGlobal">0</field>
+            </row>
+            <row>
+                <field name="id">2</field>
+                <field name="name">Apple</field>
+                <field name="hash" xsi:type="xs:hexBinary">3166333837306265323734663663343962336533316130633637323839353766</field>
+                <field name="description">Apple Inc.</field>
+                <field name="isGlobal">0</field>
+            </row>
+            <row>
+                <field name="id">3</field>
+                <field name="name">Microsoft</field>
+                <field name="hash" xsi:type="xs:hexBinary">3566353332613366633466316561343033663337303730663539613761353361</field>
+                <field name="description">Microsoft Inc.</field>
+                <field name="isGlobal">1</field>
+            </row>
+            <row>
+                <field name="id">4</field>
+                <field name="name">Amazon</field>
+                <field name="hash" xsi:type="xs:hexBinary">3666353332613366633466316561343033663337303730663539613761353361</field>
+                <field name="description">Amazon.com</field>
+                <field name="isGlobal">0</field>
+            </row>
+        </table_data>
+        <table_data name="Tag">
+            <row>
+                <field name="id">1</field>
+                <field name="name">www</field>
+                <field name="hash" xsi:type="xs:hexBinary">3465616533356631623335393737613030656264383038366332353964346339</field>
+            </row>
+            <row>
+                <field name="id">2</field>
+                <field name="name">windows</field>
+                <field name="hash" xsi:type="xs:hexBinary">3066343133376564313530326235303435643630383361613235386235633432</field>
+            </row>
+            <row>
+                <field name="id">3</field>
+                <field name="name">Linux</field>
+                <field name="hash" xsi:type="xs:hexBinary">6532303661353465393736393063636535306363383732646437306565383936</field>
+            </row>
+        </table_data>
+        <table_data name="UserGroup">
+            <row>
+                <field name="id">1</field>
+                <field name="name">Admins</field>
+                <field name="description">sysPass Admins</field>
+            </row>
+            <row>
+                <field name="id">2</field>
+                <field name="name">Demo</field>
+                <field name="description"/>
+            </row>
+            <row>
+                <field name="id">3</field>
+                <field name="name">Usuarios</field>
+                <field name="description">Grupo Usuarios</field>
+            </row>
+            <row>
+                <field name="id">4</field>
+                <field name="name">Test A</field>
+                <field name="description" />
+            </row>
+            <row>
+                <field name="id">5</field>
+                <field name="name">Test B</field>
+                <field name="description" />
+            </row>
+            <row>
+                <field name="id">6</field>
+                <field name="name">Test C</field>
+                <field name="description" />
+            </row>
+        </table_data>
+        <table_data name="UserPassRecover">
+            <row>
+                <field name="id">1</field>
+                <field name="userId">2</field>
+                <field name="hash" xsi:type="xs:hexBinary">3038366162313036303866363838346566383031396134353237333561633066</field>
+                <field name="date">1529275206</field>
+                <field name="used">0</field>
+            </row>
+            <row>
+                <field name="id">2</field>
+                <field name="userId">2</field>
+                <field name="hash" xsi:type="xs:hexBinary">3532383335346130663366626661376161626538303831373231653065633631</field>
+                <field name="date">1529275330</field>
+                <field name="used">0</field>
+            </row>
+        </table_data>
+        <table_data name="User">
+            <row>
+                <field name="id">1</field>
+                <field name="name">sysPass Admin</field>
+                <field name="userGroupId">1</field>
+                <field name="login">admin</field>
+                <field name="ssoLogin" xsi:nil="true" />
+                <field name="pass" xsi:type="xs:hexBinary">2432792431302432584B666F627854545234444E4A7956573748365165774153356E5234434E4B7748746A4A614362545333486D72316B37485A4E4F</field>
+                <field name="mPass" xsi:type="xs:hexBinary">64656635303230306339373130623861363837613161346136323261333134613936303034326531646638643662323838326537383264636261653237326662346562386138326665613134386165666637343132663537363035663034363135623633623961616239303266333933613863323439386539613734343061356337333937326131653663333766326532306136643766356266383137653965376465363438633738663034323333386230303666353461643039363437</field>
+                <field name="mKey" xsi:type="xs:hexBinary">6465663130303030646566353032303033633166653138613634613233646466323436333064626636616335306634376539356630653063303335636231353938343362626638363932323138366536613330333839663735333832376532356464333436633035393730316433303539333531376233633434386535303539356666663630326263373037373564363330623439313539363862333263353262643961366564306165336439623764626564653633633163346536613330383936616230303639613139356431333736623231333232663766663765386632623838336432363062353835666430393133323631346239303266646463393061313532376638313639623138356563666438653130303435393864623134643464666263393232336432653833386665313333626138393761643532383139666264396336326333306637343964333564313236386464663365383137643339333036616365343964636130316531376163306432616161646362346263613439333763386564656261396139313962363433363833616163333234316330393734343962613033383962616238303432653339656666666332316264643163636436343464643362646565346335666564316164616132653537666537656166353964306331303865396664626135323735396366353265306430336536</field>
+                <field name="email" xsi:nil="true" />
+                <field name="notes" xsi:nil="true" />
+                <field name="loginCount">100</field>
+                <field name="userProfileId">1</field>
+                <field name="lastLogin">2018-07-22 22:23:11</field>
+                <field name="lastUpdate" xsi:nil="true" />
+                <field name="lastUpdateMPass">1532297701</field>
+                <field name="isAdminApp">1</field>
+                <field name="isAdminAcc">0</field>
+                <field name="isLdap">0</field>
+                <field name="isDisabled">0</field>
+                <field name="hashSalt">a</field>
+                <field name="isMigrate">0</field>
+                <field name="isChangePass">0</field>
+                <field name="isChangedPass">0</field>
+                <field name="preferences" xsi:type="xs:hexBinary">4F3A33323A2253505C446174614D6F64656C5C55736572507265666572656E63657344617461223A31303A7B733A373A22757365725F6964223B693A313B733A363A22757365324661223B623A303B733A343A226C616E67223B733A353A2265735F4553223B733A353A227468656D65223B733A31333A226D6174657269616C2D626C7565223B733A31343A22726573756C747350657250616765223B693A363B733A31313A226163636F756E744C696E6B223B623A303B733A393A22736F72745669657773223B623A303B733A393A22746F704E6176626172223B623A303B733A31353A226F7074696F6E616C416374696F6E73223B623A303B733A31343A22726573756C747341734361726473223B623A303B7D</field>
+            </row>
+            <row>
+                <field name="id">2</field>
+                <field name="name">sysPass demo</field>
+                <field name="userGroupId">2</field>
+                <field name="login">demo</field>
+                <field name="ssoLogin">demo</field>
+                <field name="pass" xsi:type="xs:hexBinary">2432792431302454726E69756C5763754361433635346F76566F35392E766B4C5433414E31624A6D726A79553462696335325069436A6B5572396669</field>
+                <field name="mPass" xsi:type="xs:hexBinary">64656635303230303231616533353730373263373165626239393534353966366236636164373235336534316336633534353036336339326136653730616366333930393165373934613865376662386662326664333931383932363562396466303133333631623063323732323339653465373165343839313030646534326265633737623966343238396635633936613837646531343864313963653663643338613131343932623163313765653630326430623532343564346566</field>
+                <field name="mKey" xsi:type="xs:hexBinary">6465663130303030646566353032303035643534316262633462653032333563313338626561366561333536626436663037353365313035653030333563653166316235336534663364343565366262353335626163396639646538653131316262356334383865336535633637323333666632626365313837626335386135353839373535373034386564353634366361646638623736396132323164363032353435653034306264613135663138323638383665373536313236353361313037306530333261323365636364336339616438323162306363383962643130333035303931653965626332653935313465656631373462663339343664656132393661346262366264343463646333363361643335623032373561356633323430313936346531633131663937313764313139633130633561373161666332356365346534366661623234646663626362326237303964336335316532623834326464303933653230353965373265356638376363366236626239306231346265376264373637663163303937366231313362393630613265636565336633313131663538656131346139353736623332653163303962636435313366383733656664653062373333366238643464646637616237323333373038613264393965633738356139393036306135643262316366306262663739346262663765</field>
+                <field name="email">demo@syspass.org</field>
+                <field name="notes">aaaa</field>
+                <field name="loginCount">12</field>
+                <field name="userProfileId">2</field>
+                <field name="lastLogin">2018-04-01 21:29:47</field>
+                <field name="lastUpdate">2018-04-14 08:47:43</field>
+                <field name="lastUpdateMPass">1522582852</field>
+                <field name="isAdminApp">0</field>
+                <field name="isAdminAcc">0</field>
+                <field name="isLdap">0</field>
+                <field name="isDisabled">0</field>
+                <field name="hashSalt">a</field>
+                <field name="isMigrate">0</field>
+                <field name="isChangePass">0</field>
+                <field name="isChangedPass">0</field>
+                <field name="preferences" xsi:nil="true" />
+            </row>
+            <row>
+                <field name="id">3</field>
+                <field name="name">User A</field>
+                <field name="userGroupId">2</field>
+                <field name="login">user_a</field>
+                <field name="ssoLogin">user_a</field>
+                <field name="pass" xsi:type="xs:hexBinary">2432792431302469444B442E2F4F624D79742E6F43594F5249514D5065624454783966744D636A703034365A435976662E765479597A594F6A4C472E</field>
+                <field name="mPass" xsi:nil="true" />
+                <field name="mKey" xsi:nil="true" />
+                <field name="email">user_a@syspass.org</field>
+                <field name="notes">a</field>
+                <field name="loginCount">0</field>
+                <field name="userProfileId">1</field>
+                <field name="lastLogin" xsi:nil="true" />
+                <field name="lastUpdate">2018-04-14 08:48:08</field>
+                <field name="lastUpdateMPass">0</field>
+                <field name="isAdminApp">0</field>
+                <field name="isAdminAcc">0</field>
+                <field name="isLdap">0</field>
+                <field name="isDisabled">0</field>
+                <field name="hashSalt">a</field>
+                <field name="isMigrate">0</field>
+                <field name="isChangePass">0</field>
+                <field name="isChangedPass">0</field>
+                <field name="preferences" xsi:nil="true" />
+            </row>
+            <row>
+                <field name="id">4</field>
+                <field name="name">User B</field>
+                <field name="userGroupId">2</field>
+                <field name="login">user_b</field>
+                <field name="ssoLogin" xsi:nil="true" />
+                <field name="pass" xsi:type="xs:hexBinary">243279243130244C37643658736A663955794F6E583662472E6F384E4F713961674B6F64536B4B5674485350462F6861414E657971517065372E6532</field>
+                <field name="mPass" xsi:nil="true" />
+                <field name="mKey" xsi:nil="true" />
+                <field name="email">user_b@syspass.org</field>
+                <field name="notes">a</field>
+                <field name="loginCount">0</field>
+                <field name="userProfileId">1</field>
+                <field name="lastLogin" xsi:nil="true" />
+                <field name="lastUpdate">2018-03-30 18:38:32</field>
+                <field name="lastUpdateMPass">0</field>
+                <field name="isAdminApp">0</field>
+                <field name="isAdminAcc">0</field>
+                <field name="isLdap">0</field>
+                <field name="isDisabled">0</field>
+                <field name="hashSalt">a</field>
+                <field name="isMigrate">0</field>
+                <field name="isChangePass">0</field>
+                <field name="isChangedPass">0</field>
+                <field name="preferences" xsi:nil="true" />
+            </row>
+            <row>
+                <field name="id">5</field>
+                <field name="name">User C</field>
+                <field name="userGroupId">4</field>
+                <field name="login">user_c</field>
+                <field name="ssoLogin" xsi:nil="true"/>
+                <field name="pass" xsi:type="xs:hexBinary">243279243130244C37643658736A663955794F6E583662472E6F384E4F713961674B6F64536B4B5674485350462F6861414E657971517065372E6532</field>
+                <field name="mPass" xsi:nil="true"/>
+                <field name="mKey" xsi:nil="true"/>
+                <field name="email">user_c@syspass.org</field>
+                <field name="notes">user_c</field>
+                <field name="loginCount">0</field>
+                <field name="userProfileId">1</field>
+                <field name="lastLogin" xsi:nil="true"/>
+                <field name="lastUpdate" />
+                <field name="lastUpdateMPass">0</field>
+                <field name="isAdminApp">0</field>
+                <field name="isAdminAcc">1</field>
+                <field name="hashSalt">a</field>
+                <field name="isLdap">0</field>
+                <field name="isDisabled">0</field>
+                <field name="isMigrate">0</field>
+                <field name="isChangePass">0</field>
+                <field name="isChangedPass">0</field>
+                <field name="preferences" xsi:nil="true"/>
+            </row>
+        </table_data>
+        <table_data name="UserToUserGroup">
+            <row>
+                <field name="userId">1</field>
+                <field name="userGroupId">2</field>
+            </row>
+            <row>
+                <field name="userId">3</field>
+                <field name="userGroupId">2</field>
+            </row>
+            <row>
+                <field name="userId">2</field>
+                <field name="userGroupId">1</field>
+            </row>
+        </table_data>
+        <table_data name="Account">
+            <row>
+                <field name="id">1</field>
+                <field name="userGroupId">1</field>
+                <field name="userId">1</field>
+                <field name="userEditId">1</field>
+                <field name="clientId">1</field>
+                <field name="name">Google</field>
+                <field name="categoryId">1</field>
+                <field name="login">admin</field>
+                <field name="url">http://google.com</field>
+                <field name="pass" xsi:type="xs:hexBinary">6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138</field>
+                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432</field>
+                <field name="notes">aaaa</field>
+                <field name="countView">341</field>
+                <field name="countDecrypt">35</field>
+                <field name="dateAdd">2018-03-25 09:54:07</field>
+                <field name="dateEdit">2018-04-02 21:38:25</field>
+                <field name="otherUserGroupEdit">0</field>
+                <field name="otherUserEdit">0</field>
+                <field name="isPrivate">0</field>
+                <field name="isPrivateGroup">0</field>
+                <field name="passDate">1522341709</field>
+                <field name="passDateChange">0</field>
+                <field name="parentId">0</field>
+            </row>
+            <row>
+                <field name="id">2</field>
+                <field name="userGroupId">1</field>
+                <field name="userId">1</field>
+                <field name="userEditId">1</field>
+                <field name="clientId">2</field>
+                <field name="name">Apple</field>
+                <field name="categoryId">2</field>
+                <field name="login">admin</field>
+                <field name="url">http://apple.com</field>
+                <field name="pass" xsi:type="xs:hexBinary">6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138</field>
+                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432</field>
+                <field name="notes">bbbb</field>
+                <field name="countView">341</field>
+                <field name="countDecrypt">35</field>
+                <field name="dateAdd">2018-03-25 09:54:07</field>
+                <field name="dateEdit">2018-04-02 21:38:25</field>
+                <field name="otherUserGroupEdit">0</field>
+                <field name="otherUserEdit">0</field>
+                <field name="isPrivate">0</field>
+                <field name="isPrivateGroup">0</field>
+                <field name="passDate">1522341709</field>
+                <field name="passDateChange">0</field>
+                <field name="parentId">1</field>
+            </row>
+            <row>
+                <field name="id">3</field>
+                <field name="userGroupId">3</field>
+                <field name="userId">3</field>
+                <field name="userEditId">3</field>
+                <field name="clientId">2</field>
+                <field name="name">Github</field>
+                <field name="categoryId">2</field>
+                <field name="login">admin</field>
+                <field name="url">http://github.com</field>
+                <field name="pass" xsi:type="xs:hexBinary">6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138</field>
+                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432</field>
+                <field name="notes">bbbb</field>
+                <field name="countView">341</field>
+                <field name="countDecrypt">35</field>
+                <field name="dateAdd">2018-03-25 09:54:07</field>
+                <field name="dateEdit">2018-04-02 21:38:25</field>
+                <field name="otherUserGroupEdit">0</field>
+                <field name="otherUserEdit">0</field>
+                <field name="isPrivate">1</field>
+                <field name="isPrivateGroup">0</field>
+                <field name="passDate">1522341709</field>
+                <field name="passDateChange">0</field>
+                <field name="parentId">0</field>
+            </row>
+            <row>
+                <field name="id">4</field>
+                <field name="userGroupId">3</field>
+                <field name="userId">3</field>
+                <field name="userEditId">3</field>
+                <field name="clientId">3</field>
+                <field name="name">Slack</field>
+                <field name="categoryId">2</field>
+                <field name="login">admin</field>
+                <field name="url">http://slack.com</field>
+                <field name="pass" xsi:type="xs:hexBinary">6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138</field>
+                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432</field>
+                <field name="notes">bbbb</field>
+                <field name="countView">341</field>
+                <field name="countDecrypt">35</field>
+                <field name="dateAdd">2018-03-25 09:54:07</field>
+                <field name="dateEdit">2018-04-02 21:38:25</field>
+                <field name="otherUserGroupEdit">0</field>
+                <field name="otherUserEdit">0</field>
+                <field name="isPrivate">0</field>
+                <field name="isPrivateGroup">1</field>
+                <field name="passDate">1522341709</field>
+                <field name="passDateChange">0</field>
+                <field name="parentId">0</field>
+            </row>
+        </table_data>
+        <table_data name="AccountToTag">
+            <row>
+                <field name="accountId">1</field>
+                <field name="tagId">1</field>
+            </row>
+            <row>
+                <field name="accountId">1</field>
+                <field name="tagId">2</field>
+            </row>
+            <row>
+                <field name="accountId">2</field>
+                <field name="tagId">3</field>
+            </row>
+            <row>
+                <field name="accountId">2</field>
+                <field name="tagId">1</field>
+            </row>
+        </table_data>
+        <table_data name="AccountToUser">
+            <row>
+                <field name="accountId">1</field>
+                <field name="userId">3</field>
+                <field name="isEdit">1</field>
+            </row>
+            <row>
+                <field name="accountId">2</field>
+                <field name="userId">2</field>
+                <field name="isEdit">0</field>
+            </row>
+        </table_data>
+        <table_data name="AccountToUserGroup">
+            <row>
+                <field name="accountId">1</field>
+                <field name="userGroupId">2</field>
+                <field name="isEdit">1</field>
+            </row>
+            <row>
+                <field name="accountId">2</field>
+                <field name="userGroupId">2</field>
+                <field name="isEdit">0</field>
+            </row>
+            <row>
+                <field name="accountId">2</field>
+                <field name="userGroupId">3</field>
+                <field name="isEdit">0</field>
+            </row>
+        </table_data>
+        <table_data name="AccountToFavorite">
+            <row>
+                <field name="accountId">1</field>
+                <field name="userId">3</field>
+            </row>
+            <row>
+                <field name="accountId">2</field>
+                <field name="userId">3</field>
+            </row>
+            <row>
+                <field name="accountId">1</field>
+                <field name="userId">1</field>
+            </row>
+            <row>
+                <field name="accountId">2</field>
+                <field name="userId">2</field>
+            </row>
+        </table_data>
+        <table_data name="AccountHistory">
+            <row>
+                <field name="id">3</field>
+                <field name="accountId">2</field>
+                <field name="userGroupId">1</field>
+                <field name="userId">1</field>
+                <field name="userEditId">1</field>
+                <field name="clientId">1</field>
+                <field name="name">Google</field>
+                <field name="categoryId">1</field>
+                <field name="login">admin</field>
+                <field name="url">https://google.com</field>
+                <field name="pass" xsi:type="xs:hexBinary">646566353032303064396362643366376662646536326637663732663861383732623430613839386131643134333933663662623033316664343362366461643762626564643634386437363964346634616234386638336636653236396166623734636261383134313363626162326461393733343934613231653934666331616664633637313732316562356666396562646132613665313937626233333563613632383830393934333863643731333230383132316430366433303838</field>
+                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303032636635623034396437656539356531653838663166613438643061616132663133613163663766346238316165663837326134373665316461653661353865316666626438346130383166303062633138646136373265653935643234626564336565303063333262646262303433336633356534323263616337613238363532336233313666316137333462616337343839346631333632643863376430373861373862396135633064396239653061353537626562666336636566623766363166376330393734356461623536373762303436313865343936383434663932666364303634316330303935636239363938336361336631363161623134663339643536636233653938333833613062396464356365383736333334376364363933313563306436343362623937366139383831376632346431303364316533353133306262393862353034353262346334663934663162323531383632356530653331346438343430323362666334306264616265376437386238663632326535353338636537663431626261616461613138646333333662623762636565333030656565333734616537356365303131363731323239383132383964346634383661376635303136303835336138663335653366393230383632386162373332343335633037656432616234</field>
+                <field name="notes">blablacar</field>
+                <field name="countView">7</field>
+                <field name="countDecrypt">1</field>
+                <field name="dateAdd">2018-06-05 22:49:34</field>
+                <field name="dateEdit">2018-06-06 22:20:29</field>
+                <field name="isModify">1</field>
+                <field name="isDeleted">0</field>
+                <field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
+                <field name="otherUserEdit">0</field>
+                <field name="otherUserGroupEdit">0</field>
+                <field name="passDate" xsi:nil="true"/>
+                <field name="passDateChange" xsi:nil="true"/>
+                <field name="parentId" xsi:nil="true"/>
+                <field name="isPrivate">0</field>
+                <field name="isPrivateGroup">0</field>
+            </row>
+            <row>
+                <field name="id">4</field>
+                <field name="accountId">1</field>
+                <field name="userGroupId">1</field>
+                <field name="userId">1</field>
+                <field name="userEditId">1</field>
+                <field name="clientId">1</field>
+                <field name="name">Google</field>
+                <field name="categoryId">1</field>
+                <field name="login">admin</field>
+                <field name="url">https://google.com</field>
+                <field name="pass" xsi:type="xs:hexBinary">64656635303230303864313263313434383662336363353938366164613564643563393465356664353138363635643062626362613938353236646336396662333833366537363635393931353336653262326533336339323232396663636336373139393662316631616432323839326539323332343633656164386262326234363033666565306630643666323364383337363661363363353139356334333330633139636634623664343131396362356136386232636332653465616232393561</field>
+                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303039326134383433323238376332636136626165313731363538316661316663393832356364653733316361623361316661343832646536626336663066646138623133323366396137626666643837386434623862633234653364363731626136613661393631343738633437653864626363656565333136343436346262623235623563633362663935363030653034346636326666636237303635343362333330616561363036336332383433383063303931383533653436616430396131393534653064393233643438313932393532646631353931623031333636356461373337646435653536623436653639396332613165363438653761623736653766383732653566376535623133303838666636663133313461376336353964373561386162323535346635653137626139626266396236363062613735306461313737626339303662316636633766343736383462346638353630356661663863323365646437393766333961303033666137653361366665383631373137613465333037366637393364356135326536646236363032663061373934373930383635336238616437333839646338653738383930303234633561623365336431373836396261626630363234326661306165663138396163376138616636313636323037313930333762666565</field>
+                <field name="notes">notes</field>
+                <field name="countView">11</field>
+                <field name="countDecrypt">0</field>
+                <field name="dateAdd">2018-06-05 22:11:40</field>
+                <field name="dateEdit" xsi:nil="true"/>
+                <field name="isModify">1</field>
+                <field name="isDeleted">0</field>
+                <field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
+                <field name="otherUserEdit">0</field>
+                <field name="otherUserGroupEdit">0</field>
+                <field name="passDate" xsi:nil="true"/>
+                <field name="passDateChange" xsi:nil="true"/>
+                <field name="parentId" xsi:nil="true"/>
+                <field name="isPrivate">0</field>
+                <field name="isPrivateGroup">0</field>
+            </row>
+            <row>
+                <field name="id">5</field>
+                <field name="accountId">1</field>
+                <field name="userGroupId">1</field>
+                <field name="userId">1</field>
+                <field name="userEditId">1</field>
+                <field name="clientId">1</field>
+                <field name="name">Google</field>
+                <field name="categoryId">1</field>
+                <field name="login">admin</field>
+                <field name="url">https://google.com</field>
+                <field name="pass" xsi:type="xs:hexBinary">64656635303230303864313263313434383662336363353938366164613564643563393465356664353138363635643062626362613938353236646336396662333833366537363635393931353336653262326533336339323232396663636336373139393662316631616432323839326539323332343633656164386262326234363033666565306630643666323364383337363661363363353139356334333330633139636634623664343131396362356136386232636332653465616232393561</field>
+                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303039326134383433323238376332636136626165313731363538316661316663393832356364653733316361623361316661343832646536626336663066646138623133323366396137626666643837386434623862633234653364363731626136613661393631343738633437653864626363656565333136343436346262623235623563633362663935363030653034346636326666636237303635343362333330616561363036336332383433383063303931383533653436616430396131393534653064393233643438313932393532646631353931623031333636356461373337646435653536623436653639396332613165363438653761623736653766383732653566376535623133303838666636663133313461376336353964373561386162323535346635653137626139626266396236363062613735306461313737626339303662316636633766343736383462346638353630356661663863323365646437393766333961303033666137653361366665383631373137613465333037366637393364356135326536646236363032663061373934373930383635336238616437333839646338653738383930303234633561623365336431373836396261626630363234326661306165663138396163376138616636313636323037313930333762666565</field>
+                <field name="notes">notes</field>
+                <field name="countView">11</field>
+                <field name="countDecrypt">0</field>
+                <field name="dateAdd">2018-06-05 22:11:40</field>
+                <field name="dateEdit">2018-06-13 20:13:53</field>
+                <field name="isModify">1</field>
+                <field name="isDeleted">0</field>
+                <field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
+                <field name="otherUserEdit">0</field>
+                <field name="otherUserGroupEdit">0</field>
+                <field name="passDate" xsi:nil="true"/>
+                <field name="passDateChange" xsi:nil="true"/>
+                <field name="parentId" xsi:nil="true"/>
+                <field name="isPrivate">0</field>
+                <field name="isPrivateGroup">0</field>
+            </row>
+            <row>
+                <field name="id">6</field>
+                <field name="accountId">1</field>
+                <field name="userGroupId">1</field>
+                <field name="userId">1</field>
+                <field name="userEditId">1</field>
+                <field name="clientId">1</field>
+                <field name="name">Google</field>
+                <field name="categoryId">1</field>
+                <field name="login">admin</field>
+                <field name="url">https://google.com</field>
+                <field name="pass" xsi:type="xs:hexBinary">64656635303230303864313263313434383662336363353938366164613564643563393465356664353138363635643062626362613938353236646336396662333833366537363635393931353336653262326533336339323232396663636336373139393662316631616432323839326539323332343633656164386262326234363033666565306630643666323364383337363661363363353139356334333330633139636634623664343131396362356136386232636332653465616232393561</field>
+                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303039326134383433323238376332636136626165313731363538316661316663393832356364653733316361623361316661343832646536626336663066646138623133323366396137626666643837386434623862633234653364363731626136613661393631343738633437653864626363656565333136343436346262623235623563633362663935363030653034346636326666636237303635343362333330616561363036336332383433383063303931383533653436616430396131393534653064393233643438313932393532646631353931623031333636356461373337646435653536623436653639396332613165363438653761623736653766383732653566376535623133303838666636663133313461376336353964373561386162323535346635653137626139626266396236363062613735306461313737626339303662316636633766343736383462346638353630356661663863323365646437393766333961303033666137653361366665383631373137613465333037366637393364356135326536646236363032663061373934373930383635336238616437333839646338653738383930303234633561623365336431373836396261626630363234326661306165663138396163376138616636313636323037313930333762666565</field>
+                <field name="notes">notes</field>
+                <field name="countView">11</field>
+                <field name="countDecrypt">0</field>
+                <field name="dateAdd">2018-06-05 22:11:40</field>
+                <field name="dateEdit">2018-06-13 20:13:58</field>
+                <field name="isModify">1</field>
+                <field name="isDeleted">0</field>
+                <field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
+                <field name="otherUserEdit">0</field>
+                <field name="otherUserGroupEdit">0</field>
+                <field name="passDate" xsi:nil="true"/>
+                <field name="passDateChange" xsi:nil="true"/>
+                <field name="parentId" xsi:nil="true"/>
+                <field name="isPrivate">0</field>
+                <field name="isPrivateGroup">0</field>
+            </row>
+            <row>
+                <field name="id">7</field>
+                <field name="accountId">1</field>
+                <field name="userGroupId">1</field>
+                <field name="userId">1</field>
+                <field name="userEditId">1</field>
+                <field name="clientId">1</field>
+                <field name="name">Google</field>
+                <field name="categoryId">1</field>
+                <field name="login">admin</field>
+                <field name="url">https://google.com</field>
+                <field name="pass" xsi:type="xs:hexBinary">64656635303230303864313263313434383662336363353938366164613564643563393465356664353138363635643062626362613938353236646336396662333833366537363635393931353336653262326533336339323232396663636336373139393662316631616432323839326539323332343633656164386262326234363033666565306630643666323364383337363661363363353139356334333330633139636634623664343131396362356136386232636332653465616232393561</field>
+                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303039326134383433323238376332636136626165313731363538316661316663393832356364653733316361623361316661343832646536626336663066646138623133323366396137626666643837386434623862633234653364363731626136613661393631343738633437653864626363656565333136343436346262623235623563633362663935363030653034346636326666636237303635343362333330616561363036336332383433383063303931383533653436616430396131393534653064393233643438313932393532646631353931623031333636356461373337646435653536623436653639396332613165363438653761623736653766383732653566376535623133303838666636663133313461376336353964373561386162323535346635653137626139626266396236363062613735306461313737626339303662316636633766343736383462346638353630356661663863323365646437393766333961303033666137653361366665383631373137613465333037366637393364356135326536646236363032663061373934373930383635336238616437333839646338653738383930303234633561623365336431373836396261626630363234326661306165663138396163376138616636313636323037313930333762666565</field>
+                <field name="notes">notes</field>
+                <field name="countView">11</field>
+                <field name="countDecrypt">0</field>
+                <field name="dateAdd">2018-06-05 22:11:40</field>
+                <field name="dateEdit">2018-06-13 20:14:23</field>
+                <field name="isModify">1</field>
+                <field name="isDeleted">0</field>
+                <field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
+                <field name="otherUserEdit">0</field>
+                <field name="otherUserGroupEdit">0</field>
+                <field name="passDate" xsi:nil="true"/>
+                <field name="passDateChange" xsi:nil="true"/>
+                <field name="parentId" xsi:nil="true"/>
+                <field name="isPrivate">0</field>
+                <field name="isPrivateGroup">0</field>
+            </row>
+        </table_data>
+        <table_data name="Config">
+            <row>
+                <field name="parameter">config_backup</field>
+                <field name="VALUE">789ca558db6edb3810edb718c5be6c6b88ba4b45814de3a497a48d374e832cb0404191944d589654916a9216f9f71d5292633ba1a4621f628bf11cce68e6cc85bc886d2b9e2ce6ff1e1779ca97edd70c4b3c89c328fe2562c78e272f9e13785197cb0a5376c6ee276f440cdba82f273089d3625ddff2353fc97192313a79c3634b019c21c0d72afb2d0520ff0e0bb68b7107318255bf059863217601d110e00bde305162b2675768426514973396e23a93efaba22e95b710205c6b04625e1529cf588731bf4c591577f7a3e3a1a517acfab1ef2ad42b3f2f2aa9b60eadd01a963e0cc3c0de0731307ab3ac938ce76bf119df5d73762b94414e2f977610577ca35de95bd628c88e3ffbbd8f0929ea5c1eab0fada0d7fbadf439a818de9aac18597f2d29964c6c03db2f9d1792931d6963da13fdf8018bd5a42524b6701a440125a1635386b01721124436b27c9fb1d0775ddb4d9dc8f394bc6d0c124d3e14422a1904968a7b4816215ed3e435653f74788dd4a7c9a2206b2677b8d0a74665a29209b65a86101dd1901f4f2e681cf0facbf787e4e5d9fd59fc6b08db515a6145f9cd4b506061d7717c8cc9a0de36791cc752e4b0cda58f25f5724445659be230dd8dea550911475956dc327a7227c101384661fcabc5c593f9ec74cbc478f269fe5eadec66f5fee3e936c940f28bfecd6d5617b32bb5f2bad5624bfe7832bb3856ab40314baf6e74f1687ebc39d7a251bb5a9c6bf5ad35d78b995eb6e65cdd6825a8b5e77871ad97ad41ef8ecef4b2b5e87236d7cbd6a4b3937ff4b2b5e9f8b2d92a68f57e06bd0f633db7e03f9b426cd96e6f126ad0e8dab1cc8a04670b862bb2da86d2582d792e24ce7637ee6d235df7b481b294bc55ac41afe021ad18e325568f45b5ecef937a1f9ed38efe1e70b7e6f42da61b9ebf22f9db1a7e10eaa12d6ce2d5ff55d56529b4e205231593c87634d2eb43ce9feb3bc60c5288830cb28dad5f091f51311c1f25d8b6f9471b8c0558493fb6611b76054f4db5eba6addfa6a39ca6de1a4b598dd35a2c0fd9697e1f90fdc1f2a666d85dc900064054a0254dbb1d2030ca8e69934fc6eab6c13c3baae58a8d9d5414e0d05823e395f069556cba220d2d53fed53686ad1f7bd1dbf600cefbe3d3cbdbb5fc13fdbd621723906d81b755e5718dfe54a297ec7b0d9689c3fa6d8cb002411ed41597f7a322dc003a5e2957a8ff4c7fcb15bbddee5947fafdef4878c93be2a08e38cf6ff630f42e8f14dceeb44fb83efee412d8961336ec6765d16d51d105cef404e28383528a2c2f24d84a129c467e40ad10852ea3b6cd984d42eaf98107bf92089e228252db09e02f85f19da6fd6eaa9880095f1c89635ced9416a3bc6042f02257436c51cba6253683ac318e824b768e731d2f7030cbfb4771257eb562cd4c851cc51ac92a8eb3d74956b3fe02dccc92d7d009c0c62e851ccb9aa2d0f21c64a181131f7c24d0ac86363006fab9f3a891534af894677264ab684e894b56ef1f5f8dbe50f24d433f400c4ce2f0d84c18f0be8ee7f8be1a795c23a83ba67cdc806d8745d2f8320926ebbafcb6da99fa49845c3b0ac324a211c28e2274e83861905a5ee49000239be1d4c376bf97d85d0935707f633742294e08248b150528f1121b411e3976e0fbd8713d0b0784fa76d2dfe05652964f8aa5d1f95059f61b9cd55b901bf14b68b9928d2ec80de8e901da18aa06d0f5084f4fabe60b80768e52cde8aad0d11d6e940d8316b8b508dca3e7b3fe12c47252dd9772d15496edcdc4d039f7b4ce323de41c1138678a2de78c633486960fa32827072c758df5608b8069a1382f963c3f24f8307456a8ea3feac24988e2b93b1af35dd023e0e08ac69caeadf34eee4a5e3d4957a3a23d547781812cc70f2d28fe0fff0152be6bea</field>
+            </row>
+            <row>
+                <field name="parameter">config_backup_date</field>
+                <field name="VALUE">1531353681</field>
+            </row>
+            <row>
+                <field name="parameter">lastupdatempass</field>
+                <field name="VALUE">1528236611</field>
+            </row>
+            <row>
+                <field name="parameter">masterPwd</field>
+                <field name="VALUE">$2y$10$xtsuN2PUvgSH/0mrfBlsbOActVgCjYcqDqC6L3T9QraNxZC4RXGYa</field>
+            </row>
+            <row>
+                <field name="parameter">tempmaster_attempts</field>
+                <field name="VALUE">0</field>
+            </row>
+            <row>
+                <field name="parameter">tempmaster_maxtime</field>
+                <field name="VALUE">1531268994</field>
+            </row>
+            <row>
+                <field name="parameter">tempmaster_pass</field>
+                <field name="VALUE">def502004ade49f88af42e50363817fe90be2a5ebe3fc9a390510f2043ea23f231c5e3d31fbdd84ab93634b139a02ae1b005767317602ef093053ed8613bd7ca500c7398b4d600de088a9fa57ccff44480a263a0bb3a250f6430e62c004fbd</field>
+            </row>
+            <row>
+                <field name="parameter">tempmaster_passhash</field>
+                <field name="VALUE">$2y$10$34Kc7lFqwVdjaPCBGLlAC.ZpCL//IaHCodDeEX/fcSPNiOxx.nvhm</field>
+            </row>
+            <row>
+                <field name="parameter">tempmaster_passkey</field>
+                <field name="VALUE">def10000def50200b5b5061cc8abf3cfd7221c92833d0016e65d39c75ccae5410cbb2eaf55ff4c7de04de1754f38480e8f8eb305c552310468fea3d84752e649c867ca16b6ba078c2cc42fdbd0b2dfe1a362fc5cc20599326c9e194b24020b8bdad22940721c6f1e3c29e491057a8323aad9cd265962cca06499e2f59278322ed3f2f909553df0f13be17c2b1650bfbc81057b334caafca8c13d4811c7034737834bc1cad0e763c4bbc34b8af0baa47413971e9e553a8f9642a414d3e2245072b137448083823cf89130796c2ec7a5ecaa346538ed3cbb2112b6c1ca51d732ad8dada7b4a78eedc27748611f51b7edf763a4b21f0f4f5893b3b014f901269b0a</field>
+            </row>
+            <row>
+                <field name="parameter">tempmaster_passtime</field>
+                <field name="VALUE">1531265394</field>
+            </row>
+            <row>
+                <field name="parameter">version</field>
+                <field name="VALUE">300.18053101</field>
+            </row>
+        </table_data>
+        <table_data name="CustomFieldType">
+            <row>
+                <field name="id">1</field>
+                <field name="name">text</field>
+                <field name="text">Texto</field>
+            </row>
+            <row>
+                <field name="id">2</field>
+                <field name="name">password</field>
+                <field name="text">Clave</field>
+            </row>
+            <row>
+                <field name="id">3</field>
+                <field name="name">date</field>
+                <field name="text">Fecha</field>
+            </row>
+            <row>
+                <field name="id">4</field>
+                <field name="name">number</field>
+                <field name="text">Número</field>
+            </row>
+            <row>
+                <field name="id">5</field>
+                <field name="name">email</field>
+                <field name="text">Email</field>
+            </row>
+            <row>
+                <field name="id">6</field>
+                <field name="name">telephone</field>
+                <field name="text">Teléfono</field>
+            </row>
+            <row>
+                <field name="id">7</field>
+                <field name="name">url</field>
+                <field name="text">URL</field>
+            </row>
+            <row>
+                <field name="id">8</field>
+                <field name="name">color</field>
+                <field name="text">Color</field>
+            </row>
+            <row>
+                <field name="id">9</field>
+                <field name="name">wiki</field>
+                <field name="text">Wiki</field>
+            </row>
+            <row>
+                <field name="id">10</field>
+                <field name="name">textarea</field>
+                <field name="text">Área de Texto</field>
+            </row>
+        </table_data>
+        <table_data name="CustomFieldDefinition">
+            <row>
+                <field name="id">1</field>
+                <field name="name">Prueba</field>
+                <field name="moduleId">1</field>
+                <field name="required">1</field>
+                <field name="help">Ayuda</field>
+                <field name="showInList">0</field>
+                <field name="typeId">1</field>
+                <field name="isEncrypted">1</field>
+            </row>
+            <row>
+                <field name="id">2</field>
+                <field name="name">RSA</field>
+                <field name="moduleId">101</field>
+                <field name="required">0</field>
+                <field name="help"/>
+                <field name="showInList">0</field>
+                <field name="typeId">2</field>
+                <field name="isEncrypted">0</field>
+            </row>
+            <row>
+                <field name="id">3</field>
+                <field name="name">SSL</field>
+                <field name="moduleId">101</field>
+                <field name="required">0</field>
+                <field name="help"/>
+                <field name="showInList">0</field>
+                <field name="typeId">10</field>
+                <field name="isEncrypted">1</field>
+            </row>
+        </table_data>
+        <table_data name="CustomFieldData">
+            <row>
+                <field name="id">1</field>
+                <field name="moduleId">1</field>
+                <field name="itemId">1</field>
+                <field name="definitionId">1</field>
+                <field name="data" xsi:type="xs:hexBinary">6465663530323030633262353536613539613465333330646461323833363730363462623861326463336630643963386565333935366134326631326135326261323035633036663063313933313263626465353630396562303133356364613461353738636534616263323436343235613739343338663461393231353433623437633062386134363566336466663131373061613162663532356466646434383165613664333763303537396132</field>
+                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303061356237393366343238663337393936356539393836656663363632396332613462336662323431666131343731326332333138323465376632366639313863383663653164636330393838333735343463326237316232383361663135633731363438326630303863313135326563623238383939313939346139376165613836623432613534333166383261343734343565636336376137643462633266396263343065653162333236343030373163333334386338626331613632323165613534346433396630636537343538356561653432376266373131633864366237336166316561613237623630643863626631643531666636366133366562636364353232643538633734653664626363613534646334366662303739626631653537626530646231643363316464313264303139633665663437633366353431303231633233376639303066333633323838613864346464393463323637306365313239393864626237396235333262623266383330323164663062656631326138363664646132343132653338333535636137646465613364336663366535303532346634653961313435366466313034626238376433633532353837643036613162383066613361613064643330633866356239373338663930336535653432653362363333333739333863</field>
+            </row>
+            <row>
+                <field name="id">2</field>
+                <field name="moduleId">101</field>
+                <field name="itemId">1</field>
+                <field name="definitionId">2</field>
+                <field name="data" xsi:type="xs:hexBinary">4C6F72656D20697073756D20646F6C6F722073697420616D65742C20636F6E73656374657475722061646970697363696E6720656C69742E205365642075742074696E636964756E74206C6F72656D2E205072616573656E74207665686963756C6120766F6C7574706174206C696265726F2073697420616D65742066617563696275732E2041656E65616E20766974616520617263752071756973206C616375732070756C76696E617220737573636970697420617420656765742074656C6C75732E204E616D2066656C6973207475727069732C207363656C657269737175652075742066656C69732061632C2074696E636964756E74206D6178696D7573206D692E205365642076756C7075746174652076697461652073656D20616320736F6C6C696369747564696E2E20446F6E6563206672696E67696C6C61206C6F626F7274697320657820657520706F72747469746F722E20457469616D2073656D70657220736F6C6C696369747564696E207665686963756C612E20467573636520766172697573206E756C6C61206D657475732C206E65632076697665727261206E696268206469676E697373696D2069642E</field>
+                <field name="key" xsi:nil="true"/>
+            </row>
+            <row>
+                <field name="id">3</field>
+                <field name="moduleId">1</field>
+                <field name="itemId">2</field>
+                <field name="definitionId">1</field>
+                <field name="data" xsi:type="xs:hexBinary">646566353032303064656134373466643830666664303264336662323864396566393731653237643161333834353933323463376461353236343466316430316638326335316536623332366533383066353463623235653235613738656637393639643066363465623331313961313731613536353632383439303539633937616561636362653539393030373861393264623262336330363331326534613034363634306435646366643965</field>
+                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303036373464616463613665303139656365643164306230663630643430343635636531373031663039333263653334343563336338383736653362333531373631613939346135306231373962303566343035373936376334613732623165303637646133623137663339623831383339663230613038663139623363356631316531636436323062336564383636626432353433383633326337653365666530393666613736666164336461623832393934646335653037313338623936353761333464373435373733653861323761323036346333313461346335343465376364363333666434353961363935373632663035666466333330323032636430623864316633333835386330313663336431336566376663653866376562633263393938316365616562663737323162346136303137653864336533653762613635623334373031626238306262383565613735356238653166616235316666313839383662663666393861376231323263313934363034333064316262363539346233643439333664303932323066303938333332376437303732653332376462626339323833636134663830666164303063643730326138623031373337366438326138343636643936333330653762646232633637666330373531363434626166623031346564306563353436</field>
+            </row>
+        </table_data>
+        <table_data name="PublicLink">
+            <row>
+                <field name="id">2</field>
+                <field name="itemId">1</field>
+                <field name="hash" xsi:type="xs:hexBinary">636564333430306561313730363139616437643235383934383862366236303734376561393966313265323230663561393130656465366438333466</field>
+                <field name="data" xsi:type="xs:hexBinary">4F3A31393A2253505C436F72655C43727970745C5661756C74223A343A7B733A32353A220053505C436F72655C43727970745C5661756C740064617461223B733A313833303A22646566353032303036636430326564663336666265623963383631616264643662396131373061376432303631323836353435303031666230396664636565663665633264313438623663336334373134643337616239333665353738613763393365333035613663623763396665383438646335626439656630303034323665346631663932653831323330623765616132323564306438303336613139363330656361613561336232626530333236336435353564363234323261323539346234306637623864623863396662316361376232616637313865626338316636356635633432333965663439626563653961643334363861353961613665303336613036663836383261343038376562323261383536373464626264613531623533633738633166333366616161663765383866366561626464666431626636643564653932656138616139376130633466313035373166653637303235313237653139333832623562643835666264366438393235383064653934373832653532343264653338626564613439383063616337306530306335353263343338616166663866343335373665656333356564386561356139643263643736616663316637363233633732323065653663303337623766343264626234393134653532313732373337623936373039333866396230303762353933356637613666393562306332366237663535643132393234316630616339373736356161323134376239363931666666636337356332643734616434323534323030646463346132353535323562356634633866626261363838396233383265366539333462633864363165363036323865366235313864346536613662613837303630626432626465363839366462623431333438313333613039663632363333343365613061353937333739613530393665316263616637356236633365656366326631306230653438376434346333346562323061303133633832656431373662613762316661653465386138313336636131336363363231613538326532303736306166623965616638363262373633373136626330363135303062323766306230626339623436373665393934623666623934356134626439323734393137316265646662306563636166666432646134666137386163376533663036306539313163613366616132616636396338336135363732616237636662636563643162653561336131323134336630346364353061316632383334346535646439396463613862343433383564363362653066393834333236373664313539383761313334313661363637363932333136343733303837663437396532316330633635363164333832623463613830313232613830313035326538643730313336616432353231363035323735333865306666646433353130643337323064656334653631363931666232656635383466636237353736633336303432656566343732633437383431306339393166373964623331353865316232396333633830346462353932323362373534316233376638636430306531393565333332663937306531303038326130613638353236333362373763316133626161623632623332616339646636646138623962333038616137333866616533353765376630356430343963333335653961376533356338623531633863343964653937373031653532323931616135633637356433363134343936326462646437363731656134643037343237646235386366303664666630333964313338643135343732326164313734663865363034663539306562346361633362313263636436626430303261323561653139363234363763386266393733376639666139643031303862306134303439666663633963666562303766323236303838363432313761366339383637633564363331353932616635383135313162393961643335316335333763346262663734383666613964663362633432666565383664393931613233623635306664383837386535346164393932356565653738633638373035323030643861313566383038393331323832666538316634326139326235373933626163353362663462326636316234373238366434343731646662393363383532613534626366633739663264373266376336383064656431663436313431656335366533343034396665636464303538613937613465376664303964616662373632613663656539636637386439343937303434393561333838306233353134386636363238636533363437306337656635613937346335343833656132383963633166333966363635383663373036653032363166626564653763376636616437303234623462663139623333666362653066333763376537363139616637303235336533396163636461353135306161613832326438323238636531336465386432383462326364323466353131643032303435343737663335316632373734646537223B733A32343A220053505C436F72655C43727970745C5661756C74006B6579223B733A3531323A226465663130303030646566353032303037633239663335326261346335623130653135643930386262303734376632373934386433323831306538306266396232303965663835366135303436353762323533393036333834343335623236373537653565376464613662323434303038363131643333396330333266346139363632373765643139363831363330623731373465366232643436376664313137393063343234373634313766656530333338636233303562396431306333653964663733356664633935393366633463653938623137633961373138343337353338326665633335343965326233373232616237386365363537323866323162343336656136326266366437333033656339336432663735316335303661623162306338636238323139656564376435626133363666643961333833383930326333333931626536373436373638613063333137663865363066343463646139653634643737323833373836663664653565653531323932396463313033613131346565343563643363393262323962343463613738363832353264336661323135663961353263303732393034326366333231633231356634633737613733653331396365383835633738333565326332353363656532663736346138393037353035313235393232663130616166623866626666356562633161376332223B733A32383A220053505C436F72655C43727970745C5661756C740074696D65536574223B693A313533323238303232353B733A33323A220053505C436F72655C43727970745C5661756C740074696D6555706461746564223B693A303B7D</field>
+                <field name="userId">1</field>
+                <field name="typeId">1</field>
+                <field name="notify">0</field>
+                <field name="dateAdd">1529228863</field>
+                <field name="dateExpire">1532280825</field>
+                <field name="dateUpdate">0</field>
+                <field name="countViews">0</field>
+                <field name="totalCountViews">0</field>
+                <field name="maxCountViews">3</field>
+                <field name="useinfo" xsi:nil="true" />
+            </row>
+            <row>
+                <field name="id">3</field>
+                <field name="itemId">2</field>
+                <field name="hash" xsi:type="xs:hexBinary">616337343462363934383832336362303531343534366335363739383163653466653732343064663339363832366439396632346664396131333434</field>
+                <field name="data" xsi:type="xs:hexBinary">4F3A31393A2253505C436F72655C43727970745C5661756C74223A343A7B733A32353A220053505C436F72655C43727970745C5661756C740064617461223B733A313834343A226465663530323030376339353039326234633263383533353734663131343039373138363831386435373135656137663734643534393632356136313032616538623262613339636133616365353234656361643466316431616130306262653965643063316331666236303732643062343733333631363637346235646336313231356333666436623335353961666633666639383761353934323966633963313637373462336235613938363265653761636135653137646536313635306132343533653632613261393362613838353764663436656261353138363363663436386336373434643363303633353738643930363965306634313533646163616131376463633465383335626138666430613563363131393734393665306261336264373139633165343664616666636137313430643434326263663965303564663639393434373765353566363536376666366138633265656639313863623863323930653063613762656337376237376335306337303530396638633436653465356130363933663438306137313639393663393331613539353636363663343466633837393862336536323939616638353966623736353233316566363837656665316530316635623065616237636138363465323637366134663533643032313565343731303338353435356634383463366332636663303336386262333330353631666166343162366433333034373533326565303930653434323833386337613835373035633333383136616363376139623433313237363064623332623638363038666432313138616161666631623366323865356635643061663030636532633564633930366662623337626331333863653238656631383262656664356461623037363265623062343932383030363336303263306237333264656364343538386536326331353636353437383037663761343132626532646663633930623638333461336364376165616237363239376364363162366130346436383665303537373936623538626664356361396666333539323939643464333961646339646535393765313839363239343766623366656361376631356365656634343862336335393938623964323032343463393032656263383362646439306637353366653337636638326137613365303664613366646532616138663865613462316535356331393436653861626634306165663936333566313166323264303064626133373662656134333963346532333238303837303165336431346263323761633431623138303966643732626462316638346533343930366233386665316433306461653831623832656133326632316532383663653233373530623430353765643965303463376134623762666261393537333733623236646336663063633939366130396131386538626234343736656263666663616666326437623164326230643466653166323264346262663366373537646631613664393162396564303732313836656138366633346665343238393731663661373732396330353366303266646531343531376166356361386130663233316335383435636564303430306136313134623462353936393564386132623730336562646237643731333539326137356634396532663231326163386231343232646232336464333361373337303362396437363837373830653132643365316439313235313434623062326334613865633237326334373161643763373364356166623735363661663034386130613332633632346163383238336131626466313434363661663538306634346236643934326266643837333663653663323139306431373439643032376533346264356231616231313762353037633237633833353434613661303039326364353039363535323865663964306234386262626138383038313436336666313163303036373932396335363736353435663937616636363039323232373262313762343938313836383530623565376638663230353235383363306235353430313639303165353832613066643164653635336233373035313663653564646330376261313632366335383639306362663832633530346335306635353430373333616164333033656432656133313538656661633966393538316238633166386436396133316631616537616339623337393539363633323834613233316639616633333439623939643630373733383731396561636563326335383466353635383031656532393737653631336437386135636561633036353661346663343133393236613139376430323463303639633762613732366435623938633638343336323765386337373939653961613564333736333035666239303738346363663764643536636632323132386534346537666565333762633461343139326235666332646437386261643336333736313739616335303163343335613336373336393261393531306163326137343961323065663636316564353833223B733A32343A220053505C436F72655C43727970745C5661756C74006B6579223B733A3531323A226465663130303030646566353032303062336137653530303338396635343239663939656266376365366131636534666461656633666236613439366532333739653931643930393335616336353362663239326331353066353233643335326537643463373237643133363365303135396564316333656261386530363065343032646561653838666432323363383433386663373438333436633237356637663536626636306363323033666666373466346665643533623738336662323264376438653838343431303539636332653430616538633066616433326138333534623937396364333439323634336563366130303438353061376135396564316638393364623762356664393865373432653532643630643134346139346332663865646665353834616136646432343831636632616632376662393662376633653437346265313439333363663364313837373230343931316163656438656665353239303361333336656336653138323263326131663539383539313133333830663735376263636432306266653362623631346631333535326535323235316530626436313864333838363030383633376331323262336231303631613061386166396465646138646630393331643463353464313162623632623834613962353534326261303961343938306336613831386230626131336237223B733A32383A220053505C436F72655C43727970745C5661756C740074696D65536574223B693A313533323238303232383B733A33323A220053505C436F72655C43727970745C5661756C740074696D6555706461746564223B693A303B7D</field>
+                <field name="userId">1</field>
+                <field name="typeId">1</field>
+                <field name="notify">0</field>
+                <field name="dateAdd">1529276100</field>
+                <field name="dateExpire">1532280828</field>
+                <field name="dateUpdate">0</field>
+                <field name="countViews">0</field>
+                <field name="totalCountViews">0</field>
+                <field name="maxCountViews">3</field>
+                <field name="useinfo" xsi:nil="true" />
+            </row>
+        </table_data>
+        <table_data name="AccountFile">
+            <row>
+                <field name="id">1</field>
+                <field name="accountId">1</field>
+                <field name="name">sysPass.xml</field>
+                <field name="type">text/xml</field>
+                <field name="size">1312</field>
+                <field name="content" xsi:type="xs:hexBinary">3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A3C526F6F743E0A20203C4D6574613E0A202020203C47656E657261746F723E737973506173733C2F47656E657261746F723E0A202020203C56657273696F6E3E312E322E303C2F56657273696F6E3E0A202020203C54696D653E313433393332353330343C2F54696D653E0A202020203C557365722069643D2231223E61646D696E3C2F557365723E0A202020203C47726F75702069643D2231223E41646D696E733C2F47726F75703E0A202020203C486173683E36646232633238323731393136326630663136316531343731653734636531623C2F486173683E0A20203C2F4D6574613E0A20203C43617465676F726965733E0A202020203C43617465676F72792069643D2231223E0A2020202020203C6E616D653E485454503C2F6E616D653E0A2020202020203C6465736372697074696F6E2F3E0A202020203C2F43617465676F72793E0A20203C2F43617465676F726965733E0A20203C437573746F6D6572733E0A202020203C437573746F6D65722069643D2231223E0A2020202020203C6E616D653E476F6F676C6520496E632E3C2F6E616D653E0A2020202020203C6465736372697074696F6E2F3E0A202020203C2F437573746F6D65723E0A202020203C437573746F6D65722069643D2232223E0A2020202020203C6E616D653E4D6963726F736F667420496E633C2F6E616D653E0A2020202020203C6465736372697074696F6E2F3E0A202020203C2F437573746F6D65723E0A20203C2F437573746F6D6572733E0A20203C4163636F756E74733E0A202020203C4163636F756E742069643D2231223E0A2020202020203C6E616D653E476F6F676C653C2F6E616D653E0A2020202020203C637573746F6D657249643E313C2F637573746F6D657249643E0A2020202020203C63617465676F727949643E313C2F63617465676F727949643E0A2020202020203C6C6F67696E3E61646D696E3C2F6C6F67696E3E0A2020202020203C75726C3E382E382E382E383C2F75726C3E0A2020202020203C6E6F7465732F3E0A2020202020203C706173733E6C4E66513133634B6A384D592B79434F346652536B4773494334357247454C442F424E69345654614671593D3C2F706173733E0A2020202020203C7061737369763E454E6354743338503265346C643350395A553241767939664C466277386C42473947382F75414D785A6D343D3C2F7061737369763E0A202020203C2F4163636F756E743E0A202020203C4163636F756E742069643D2232223E0A2020202020203C6E616D653E4D6963726F736F66743C2F6E616D653E0A2020202020203C637573746F6D657249643E323C2F637573746F6D657249643E0A2020202020203C63617465676F727949643E313C2F63617465676F727949643E0A2020202020203C6C6F67696E3E726F6F743C2F6C6F67696E3E0A2020202020203C75726C3E342E342E342E343C2F75726C3E0A2020202020203C6E6F7465733E4E6F746173206465206D6963726F66736F66743C2F6E6F7465733E0A2020202020203C706173733E3352394F48632B53335A4E56684D795948352F784C476C76625246662F5367573348527261322B325349453D3C2F706173733E0A2020202020203C7061737369763E763637306A596B43547178635332344C4F65453077672B304330376A734C2F4635342B6E56484963544F773D3C2F7061737369763E0A202020203C2F4163636F756E743E0A20203C2F4163636F756E74733E0A3C2F526F6F743E0A</field>
+                <field name="extension">XML</field>
+                <field name="thumb" xsi:type="xs:hexBinary">6E6F5F7468756D62</field>
+            </row>
+            <row>
+                <field name="id">3</field>
+                <field name="accountId">2</field>
+                <field name="name">Clock 3.jpg</field>
+                <field name="type">image/jpeg</field>
+                <field name="size">4273</field>
+                <field name="content" xsi:type="xs:hexBinary">FFD8FFE000104A46494600010100000100010000FFDB0043000A07070807060A0808080B0A0A0B0E18100E0D0D0E1D15161118231F2524221F2221262B372F26293429212230413134393B3E3E3E252E4449433C48373D3E3BFFDB0043010A0B0B0E0D0E1C10101C3B2822283B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3BFFC00011080073007303012200021101031101FFC4001F0000010501010101010100000000000000000102030405060708090A0BFFC400B5100002010303020403050504040000017D01020300041105122131410613516107227114328191A1082342B1C11552D1F02433627282090A161718191A25262728292A3435363738393A434445464748494A535455565758595A636465666768696A737475767778797A838485868788898A92939495969798999AA2A3A4A5A6A7A8A9AAB2B3B4B5B6B7B8B9BAC2C3C4C5C6C7C8C9CAD2D3D4D5D6D7D8D9DAE1E2E3E4E5E6E7E8E9EAF1F2F3F4F5F6F7F8F9FAFFC4001F0100030101010101010101010000000000000102030405060708090A0BFFC400B51100020102040403040705040400010277000102031104052131061241510761711322328108144291A1B1C109233352F0156272D10A162434E125F11718191A262728292A35363738393A434445464748494A535455565758595A636465666768696A737475767778797A82838485868788898A92939495969798999AA2A3A4A5A6A7A8A9AAB2B3B4B5B6B7B8B9BAC2C3C4C5C6C7C8C9CAD2D3D4D5D6D7D8D9DAE2E3E4E5E6E7E8E9EAF2F3F4F5F6F7F8F9FAFFDA000C03010002110311003F00F1C44A9D12BACF86FE12B1F17EBF3E9FA84B711451DAB4CAD032AB6E0E8BDC1E30C6BD2C7C12F0C000FDBB5500F1CCB1F1FF008E500787A254E895EC137C29F09DB90BF6FD50B63BCB1E3FF40AA73FC3AF0D41D2F35138EDE6479FFD0281D8F3244A9D12BB997C1DA0424E2E6F40C1C6F91013FF008ED556F0FE8A84013DDB7246EDE981FA5016672E8953A256F1D1F498B21A69C7A7EF1791F9542B6FA57DA4C6AF70CA7852AEB953EA723A7F9ED82AE87CACCD44A9D12B6B4EB1D0E598C5793DC459C91209515540073BB238E9D7DFB77EA60F0169B23604978BFEF3A8FF00D96AD46EAE886ECEC7068953A2577CFE05D1221C5CDE7E2EBFFC4D2C3E0BD19DB027BCEBFDF4FF00E2693562ACCE1D12A744AEFE3F0168CCA3175779CF4DEBFF00C4D55D6FC23A7697A4CF7704D72D247B76891971CB01FDD1D8D211C784E28A9C271450064FC13017C5F779FF00A07BFF00E8C8EBD86FEF42444062A082339AF1FF0083C7CBF145E1F5B071FF009123AF45D718C876C4FB5D8F504F3DF3FA552571AEE655F6AA88C4EFC633DF9F4FF38AE72F75B9240543003773838ACBD73519AD55A5C79B133E0313D320F07F0CFEB5956167AD7886EA386C6DD9D64380501007A93EC3B9E82A5E9A2354BA9A7FDA924D3C7089BCC9A421515392C4F0001EA4D741A5783B53D59E28E5BCB7B21E63C522C7FE90C85319562A76AB73F74907827B576BE16F06693A069B6D24D6292EA18579669955E44908E42B738C72383F89AE5FC65E2DD1B4ABFBBB0D2E04BBBDBA3B2E859B7D9CC52A7219A540199B2402B9E3675539C9EA4277D8E8A4F87FE1AD8229ADE6B865EA5EE9C16FC88FD07F3AAE7C37A3A46E936956B09CE17C82D961EA4F1CFB74F7AF32D4FC69E24D6AE45C3EA725AE06D16FA73344871D4E4364FE24D64DC5AEA13E6799EEA4719E4CC493F98CD3524BA072F767A3EB9A269B65A734F6DA64B2EC23885D8C817FBC149C3638C8E38C9CF18A5D0EFF00504D303D85E5CEA16800D914D0B46EA0F20A33FDE5C718048E38C6307CDE2BDD5AD98449A9DFDB803210C8D8F5E0719FCAB7AC7C79A9DAC4A751B58AEADD005F3231B24278E4F38F4E303AF5A7CD17BAB1493E8CEE135F0EBF31646FEE30DAC3F02339FF00EB54B69AB02411267273C9C71D7FC2B8BD66E86A96B1EA9A44A9208D8AC9C152401D31F8FEA39F5ABA7F88964216401243C9EC3F3FCE9C9A295AC7AFE9DAB2B3E03A9EDEB9FF0038A7F89984BE1DBA2B9FE0E0741F3AD709A56AE721771C67DEBA6BDBE175A15C26EDD90B8E7FDA159A77339239609C515384E28A641CC7C2F6F27C4374C7FE7C9C7FE3E95D6788EF1E3F2E68E4C79520270718078CFF002AE3FC00DE56B172C0E3368C33FF00034ADBF115D99B4DB800E020DC467D083F8F4FD6A1CF9648DE11BC59CB5E5E99079780CA87A63A1F5FE7D2BD2FE1E6893D8E8F7926A901B77BD508A03324CAA3209CF55CE723041E33E98F30D1A279BC4C891DB8BA11CBBD9791B4671B8903800906BD16DFC6A24D5F5AB1F21A5874F412ACD0AE4B85505D0FFB5B836DF5C1E9B79DA2BAF7329B6F4441F113C5E34BB54F0DE8526C99D7FD22447667863C03B41EECD9EE49C11C65811C0E9FA5C6D6E4CCA5636FB88A705871827F4FE9C7599A39350D6EFAF5A21E6199A568FCE620BE49500E395CE4FE38C56EE8BA7CFA9195A5CA44AD90EC854631DB3E98E4D6136EF6467527CAAC8C2B6BA996ED628ECF6C6CA37F929C2C873C9EE38EB91D6B527D3B519E35104332EE71BCAE54E3D8E3D7F4CD7571580B5B23736D0111821C1050171904B658E147A93CF7F63A90D843241E62C73191B19591CA3020F207B8E71D8FAE306972DCC1BBEA91C29D3AFD6206E2D5C1DB97C2961D39AC2FB3C5A8C456D5D6DE58F21515970F1E7861C1E318FC735E81E2C33C76B6FA158999E5D537A33800AA460FCDB8F5F9B2147A024F6E6FDB681A635B2A0815664528C594292091938C74F9473D7803B5096BA0E2DC55D1E48967A8593B5EDA26C92303CD89548565EE303AF6E3DC1F4AAB72F079A2E6DD888E53C29C6548E307F9D7A06AFA525A4AD3DACB1DC3443FE59B6E7423271B723E6C838CF5E41C026B9BD6B4448DA19E3B79218351195B764E6DE451C8273DF923F1E2ABE2475D3A8A5B95F4AD41D1F05BDB935DFE9F7C6E2C1D3767701DFAF22BCB210D6F3946006D6C0AF4FD00E9EFA5E123FF004908BFBC0C704F1938CFF4A94ED63471BA2C84E28A9C271456A60709E0F668B529D97FE7D9B3FF007D2D5FD6C97B1B80A40CC47A8CFE03F3AABE141B2FE76C6716EDC7AFCCB56756007C99E3695248C8238E3D6B09FC475D27EE18DE149FCBD7C48A18F9B190483DBA93C7B815D26B9345A5787AE174D8961762A1B6E32E4B724FA9233C9F5AE2FC317BF66BE313B6CF3700673CE39C574B1CEDAC6911ACF0B40D2B2175739C6187F4CF5F6AE98BF70C64AD222D122B6B68079930D8A58C8CC4F453B71F98C01EA7DEBAB9F51D3A3B388ADE4769672B32B5C3BA84CC6FB4A61BAE5B2323A81D7BD57D2B4B4BE82789CB44F1CDB448002C854E415ED9CAA904E7A0E0D686A7A2D96A09069B3A36C91A4932589DAF907233EFCE3A707F1C36670BB735D9A7A75D473CB3CD6B7115DDAB287DF03F98030FBC0618E33F2E140EC4924B55F5DAC5C2BAFCBC3E1BEEF1DEB9883C07A34128789668E41C099362B7D72AA2B3FC41E15D43EC05EDB539EEB64AB2C91DCCACE190039072724727E5070413C669DC768B66BE876716ADA9DFEB971133ADCB7976E246253CA5C85214F40465B18EB21EE2B66F0C904C6EA286326300B313CB8C1CA0F43CA91D41EF8C0359FA035EC3A7D9C7E741796CB02076C95983E3E627390F93939F94F5FBD9AD2BD69C2AF9621F236389C312180DBF295C0C1E78EDC1F6C53889BD463E8B6324CD288143BAB2EEC6400D82481D3248049EA48EB5C9EB1671AE87A942CEE5ADD44DB0C646C08416F98F5CA9DBC76EBC9ADB96EB5B86DB4A4B2B4498BC71E7CD942EF22362C8C4E483F748201FBAD9C719A7E275945F6A08AD0FD9DB4D99A4C93E6670C0103A05C0E7BE40FC348EA690D25A1E6FA9DB3978E68D372B7DE715D1784E666B98E3C9DA4118FC0D518E3FF47891C00CA8A0827BE3A55CF07A63518863A0393FF0135125AA3AAFA1DB04E28A9C271455191C0F84E22DA84E07FCFBB7F35A9B538CF23F848E303353782E012EA770A549FF00456E3FE04B5A1ABD8853B994F049C63A0CF5AC66B5B9D149E963CAEDD92D3520CD8D8AC4648E9D466BAD8A78EEAD7FBEB282383D45739ADD93457AD9FE23BBF33EBF5CD555656884447DDE4EF63C607200E858FF00F5BDEAE32E812573D5744D4D1187971F9F35CC241DAB8FDEC6BCEF2385DDD466B56D5EEB55D28B4AD1C72B7EF2DA48D1B0B91953F30EA32467B8F98019C0E0FC2BA87F67CF1ADC305826DA30836F9583F21E4FF0F7FA91CD7A5DACC970AB8910C840390DF2C83FBC9EA0F5A6D7538AA4395E857B79E1B2D3D8AC53280CA0C288CEE3903200C9C720FD2B499D6352CEE14A8E598E001DCFB573735ECD75AD79715ABC535AF90BF3232EFF0033F89581F9828272A54721B046091B53DB5CCF0C96D22412C1226D6CB15CE7AF1838F6EB5266FCC9EE16D43C6F395462E12362DB4963D141F524553BF7B996F5ACA1B8245C28565E3302F24B8E3BF0307232467038365E0BEB95DA4C11AF0CAC3F7877020838207F9FA731691756B2CF2C10C7718015D6EA52196E72A0EE5209246307A01E9C53B0245F86EE16BDFB202C64D8640429DA406DA46EE9907A8EA3F1AC9F103DA4BA45FCCA1A65997C862A41187211B07D8296FA1CD6A9B38E395E6822DB712E43480918C84527382B9C2A751D17F3E3BC5FA844F15BDBB49E798010933F04E47CF230C0033D0638C138E0D6B15646B4E3AA67217C1DB524BA5CBC681891D94E38FE95BBE108C9BE89B6E0053EF9F96B1A43E6C691A9C87E49EBC5759E18B52B3A3E3B1ED8ED59BD59D2F63A709C515384E28AA3238FF87B0F99ADDC02323EC8DFFA125749AC5817048046327803FCF7AC3F875F2EBB3FBDA37FE8495DDDEDB89D58AF6E83DEA64AE8719599E3BE22D1FCC80944CB263803FAD71534263915C0C60FE15ED3AA69BF293D72781906B84D57409BCE0218C9573D1467DBA0E959EC6FCD7D4E7EDEF43210E76B28CFB56FE93E2A9ADAD5AD999E48882A8F1BE2587231FBB639C71ED8ACB97C31A9A056FB148075181CD236977969F2C96CEA18E7705E2AD484E299EB3A55F59EA519B9B2DB70D200B2C80059303270C0F279638038F9B8A9B559A16B54517BF660D345B9CB18C905C7CBBB8DA4F4F53C8182723C6F75C5B7EF632E1BAA953D0FAD6AD9F8BF5F8576AEA33B6C3D1E46603F5AABC5983A1AE87AE59CC2DED6DEDA59D9E458C2199D0AF98CA30493D33D4D538E04B1962BC796778CCCE33733BE22460CDFBB8C020904800E3217233800579ECFE3AF10CB095FB5AC60F24A2E08ACB9751D42FB1E75D4B264E797273EFCD3BC50952EACEE75CF19C30CA6CED1D4C8C7A0072E30072D93853B795E49E327A8AE4E667BC6796E1CBB483E625B939E302A82DAE4A796C43746C13D3B7D6B7EC34D92E6452FD8F1CF007A52736CD5251D86695A7B4CE18A119030A7B0F4AEEB4AB0F2D4498C6D1C67834DD2749DA8BBA31F980738AE8C5A88AD19B1CE001CFB8A4913265309C515384E28AA24E2FC0436EB731FFA766FFD096BD1490A84B0E4F53FD3F4AF1D44A9912811EA3716514EC0608EF8154DF4B8D633B10018E95C0A254E8949AB949B474B7164493F2671541F4F62DCAF1F9D5044A9D12A79116AA3436E3C3F6F70C1A58096EC7241F6E4566DE782D5D09B77287D1FA71F856DA254E894F9439EE7152785EE616FDE424AA9EBB78FE54F87C38E5C7C84AFE35DCA254E894B945CC72D63E1D20062A793926BA8D3B4658994ED23073D38AB08953A25525626E694168B1A804608E7AF14B72C0208C60E4FE9EB54912A744A6210271454E138A2803C95054E828A280274153A0A28A009D054C828A280274153A0A28A009D054E828A280274153A0A28A009D054E828A28025038A28A2803FFFD9</field>
+                <field name="extension">JPG</field>
+                <field name="thumb" xsi:type="xs:hexBinary">6956424F5277304B47676F414141414E53556845556741414144414141414177434149414141445959473751414141414358424957584D41414137454141414F784147564B7734624141415666306C455156525968573135655A4263785A6C6E58692F7A6E58565864565631645864317477375575745553516B4C494C43435075415A387749793932494D78342F44456A4866483242473249326248472B50593849364E675448446D4C553961786A593951786A504D455944474B4E774A4B4D6B4953454C6D6970686270623671377572753771756C36392B37334D2F614E6141724F626B6645694D372B582B66752B373533352B304541414D595959347751516767525168424333524549496235613445657443434645594C666250524A4342415159513449786867686A435547436949515237316F524A4666505277522F424264432B4B48684B34617271332F45495968524678776842416D4747414D49495A4951786C323349454951555177685268416A4443474543434D4D4D59595153774168694169384D686442644258787733415177762B50517867696A4C723443435063726142724A372F6E4C6B486469566569784A674944434742534F4959436777414667684442426C4343474743454D41594C73654D3849666A527768314D345141414B71714F6F346A68416A444545496F6F6F69484955464959557858565955786A484555525977786D544A4B4A454949414142444A41474549674543763731554934494C50325159714B704B466258657367566D455A5145783145494943415959706B716C464B4D6F55796C5A5869455A466B474146424B6C3650536456335474496D4A43636159372F73496F636A7A44634E775864633054646431486365686C46617256644D304B61585430394F47596469323754694F5A375A6973526A6E584167784F7A75627A575A397A3931353438654A6B656D45416B4A49514B52686B452F6C4F5139643135595643634151516B45564755446344517768464962684530383859566B57516F674141494967694D5669375861376978514577616C335476712B4C306D53626475753638374F7A6761324B387379353978313365726C537231657A365354776A4F584B706664774738326D3771757A3039645242536548447333622F4B7666754F766659396E456B592B6D374D5736314555324536724454676D5846616F4564636A69636D7954436C315854654B6F6A414D7530384D41527748516453796243617A304138554153616E7A6F64684F444F7A6D4D3455466970566E544A3773575746456247386A746C362F384C35754B48303950524D545A795078395471596D33733341544168464A3565505849334E523466332B2F455A72502F4F32332F2F36787836737A732B5A6C732B474C754B5A3347715A45674354446D474534485A2B4C534769526E474B55534654582F6443544D455549775777366879527963576F536363463962326C3230576F765872773037666E63744E7A7164435879484E2F74544338754A524B785671746C3650727073366341414C46343874396566736B4C6845546736564D586137563665576756513871424E31376676577648497A2F3472696244587A372F33434F5050426147724A67765745733133335545436A675778564B76704D69534A47554B50597168516F7A2B2B3850665A35684143416B695741676877716A6562494A41324C5937666D4561516C79647230494136725535456269755A78454D4636707A5446626650487A34794B6D546F5276366E4C64394D44646253796653505957424B4D5368467930734C4D5269785A646650666A63433638382B65516A4F322F5A3838797A7A2B37617548747870707050784A724E52697975757046587734744B5573336E3836357245346F526C55515549596B69684169456B45645236495775375446434B2F4F4C515167765430336154736578326F734C73776F6A3758617A326D354E546C796956486C3337494C56736F3464503737377874327A315A7056582B684C4A707432533865384D312B4A584B6551566A30622F396B58372B2F50447752635050535662357737636562797859744C3035646432787063325363416D4845374D5665504971385844776752616647456F656C434349515151515253716E67644A36576E357564723538636E48624E6A57316174576945673470357A63757969485556364C6E506830755577354B6256486C6B396375726B6D614D4844763779756165662F70382F47786B5A615457616E757643434E7268596952414A705676742F774E4136566B496D6645556E356B78314C362F6C2B2F74483739326F5861504B52493057522F735331454B4B445145366D5936366D7935766F4F516F68416A4B484150416A727A627272654652524B5A454F376E2F464E757432732B3447586D5675726E2F316D6E2F6639317045704368776F7969616E71396B644C32334A796454365934372F7242536D653759566A4B546A714A676668707347393059656C463549506E31723339355A586E566E6C74765435524B576B4B5A6D4C353471664C2B3374763241416D3656536554316E7A66783552426A414641504F444C4C386C454B6F6B452B734A6E37304F637A387A4D4A5850464934634F5A424C7971524F48472F58617262642B636D6A313269656666737142414746693170755A544737372B68474B306562524C5133664F5463396C52726F586231315932486C594C62634F37686D744E70794A2B626D34746C4578366E6E3872463976336E706A554F48392B7935325967706C646E4C5A3836646E462B63615A7431585655416849684948624D6A49467873744968454D4561346B4D31684C4833366A6F3854332B4B2B642B444947486343486C527A655533563439556D2F642F2F2F757A41794D70503358336E594B483433452B656676432B2B316173585233727A5A79382B4E3767396A56626274346570556B4C6D6A694758746E2F713535317658712F556C706455464A7133456A57466C76706548476F742F636E503370792F647131726D655A6474313157345A424C64734E50637835704D566C706A48486878414B68434153516B4149513939627246595735325A714335584636757A4D7A4777515163666E69567771516D44693876546F2B6F314167502F323362385A584456674132763170705533376231786462482F7163642F5244302B6D4F75566F6252373534316A37353648484E75324379483644376665736E727A4F704A6737312B6579425A79547A373150375A763334354372694257583168717439764E5A724E56623752625463647341383658503659397552344D344A3764312B48514E56754E6F366650616A4B5A6D726F5943445466736E3778386F74766A3431444146565878413331766A2B3535304A6C664D334F6B5259303230366E4D6C347039665578576130336D6F7970415166583762795253537244557131572B39584C4C2F61552B7A503978556172766D513274322B35397456662F337237356932316D546D644B5A62765330685756556F676C79534D69534A5243524E4D4141435951416B4B78327A4564616E5471414A50625A6A32597364373843742F63664C4D61543256786B4436307938386941462B2F63303374742B386E53626B38636E7056444B584C4D654C78654B32585476634D446A7A337275796F5A574C77785343466558537A68336279304F4476336A7868552F632F636E684461734551344F72563754716A544E6E78726A506137576D6E4461616A6157597967674F6B366C3455736B43684342435247464D2B5035536256614C3749356C6163516E737554346771724A524B4A34312B31372F2B56666E6B2B56312B58792B542F3637443072746730634F58764D7432524D6A5778706150654F33662F387A4D2F763668743048436564375930497468744E344676486A78363761646675622F335674774E4D6C737A572B544E486567614C382B5056762F7A72627A3377366339634E377046384743364D706C4E3646616E66646664747779557937566D32415A515945774141454949536E426C636A4949677637656E454E78504A30424A4B6D704D642B323737337A376B4B716248767A6D335A73454A636D6F5552506E5237376A352F2F59716C2F344B6D6E2F756C502F2B514C332F757633336E306B622B374F446E5A6B386A6A624370307248747675767476482F6D62356D4A7278343033313531324D6B6C614E625056332F7A53562F373858312F38315A667566324437746B32567555735151736835665846685957472B504C53525549566A6A50734B52537A436E65745742335A4C4346467232664F4E70564E6E4A78392F2F4B66315A7550745977642F2B67395068726148644C356F31704C6C62456A525066666570387278343064502F5045396E3234754E6B362B66584C4E716D73555251746366334770636E3773374F42772B5937623730676B736B654F6E7641432F38632F66664C7734534F7052505A546E3767485258442F622F5A763237706C5958595763554B516947436F475570506F642F48456B4159442F623371647A6675583745626C6D746C72327755482F33334C6A72686F6C4D4B706E4D66767175507A49626A526465664B62426137662F385A32344A3737336B352B773273375969544F725375572B664738716C377668443234574B72573442346A6F5564543976396E2F6E372F32746162726851424A434B744D766557574F7A5A7676693566365065443848657648586A344F3938396565776452592F626475684746714B69347764724E6D7A6E694343436B53524A49592F6137626171716F68675256465557564555356443426737376E596F784E713933756D506C5372326D61567174646D35326E45526A4D3934364F724E2F2F7969736149644433686550514D4749524A3451777869596D4A70724E5A6841454F376465507A6B3532617857657849704A74484B7A4E7A3944333478674F4463784153563161625A6C706B612B47455552554B4937673838436E6D6B716D6F51685A626A71495A752B39373035495368304F4742667176644F6E72735451476956447139373958587079767A4C7A7A2F776875762F4A2B4549762F38365A3964662B3232672F746671382F4E47555371585A706575446970412F54352B2B36372B654E374A46564F5A644B546C3662657533514F4931424D706A7A5431425332642B2F65695A6C70505A6439363852785052626664634E757073684F45484942676D683538304D496F384A7830396E4D5971555368554C544E4D473532577A6D63316E624D6C565678526A6E532F6D4837766F6D704D44697A73306632373169316644366A6573793666544B56617565654F4B4A366C4C743757504837762F63357A397A3132654241695247687761484B67734C4E2B32355A587071326A544E77506351464C4645676B666F705A64656470754F45553848667368446B532B57356D74546F51437171766F51516F51497768676778446B48474B6D4B50444E335371464D414467394F64472F517056564E6A352B626E683432424F7776332B673762526C52576C5A6E573033587238775739327A5A302B375937712B4E33626D336151525378574D6444477A652F75757438362B492B764736644F6E6E332F752B56747632744D796D792F74657A57654B39792B3977386E33703963315475637A2B615A496F637568354152516F6A45424D4959515941674868346555676A6F7A36556B684E6F6473394732706935633449444E4C7A5A36536E3142464749556C51594B2B77362B735762746D6B2F642B386B41686A577A5757307537666A59446331324D7744635343564B2F61566B4B766E464278344977754148662F39444E776F765835363262573930644F76737A4D796D7A57734756677958683165346C686559337567314734373837733159497136704769584137445145416C75762F526A6F377051343577684256566638304175436746494B6D537045564A3264575A7166636379573554722F3849382F32374C6A2B6D4D6E54312B596E414163796F4B654F6E686343316E6C2F4B574D6B6B4368384C30414B584B67796E642B396A4D585A365A506E446A525738787632546769754C33556D702B757A396D754252464E46764D62726833744C52576E78736542487834392F4959516E7170714D53504A675958773875634D63516742496F524B62617444434D6B584336324F6D636B6B4173634B5041744473587658445866397757336D556B4F5856646479445433322B632F642F2B6A66505A624B5A6E7A6674396F574A5178794F446333427941756C34654768316647395467506F3330762F58706B3754554359744D3063366C3047504B7457376357436A33662F4D593343424B64646D752B4D714D6F436D4D4D6F797337656F77786B5352464E7A43544E6331676A4F5A797558684363367732526D4555324A32326154566144332F374F772F652B7A6B464B652B666E366A576C67435448766A796C3377654B6F626D4F45376F2B34486A4A685174644C31476F3947547959364E6A645557466F61476869696D756836666E706F64663239635A396F766E6E752B302B6E59646B66544E4633585779327A302B6C4555615449326F636F41304B4A706F63436133704D59637A33335344775659322B64666851344E754F32557A704D65614C3939352B527A6A52632F2F7258354F4A395078433151324438596D4C683438635361625447475048737575314A6359555864462F38494E4868387244592B2B64662F766F3856517938384E4866376835342B624230754454502F6E48766266732B65337262307850583571364E4C466C64424F45554658315643704479504C4F46572F63734A357A7357313031484D39332F4E4634454F4A4C74587274745042465069656C30316E6A78342B7967435871567865755762546C6C47662B37463444414E2B7A5971566A4E497743457A545A4C4B635343616154624E52623237644E48726F774B473171306475335874624745596A367A62466163797574622F3139572F742B64684E646D4E706476715370697351524A35727062495A4935346F443635457545746445434C4C436D55714A504C673042434530506639564471683651794B494A314D76507A6969344D442F5738645039707574567A547163347372426759386B314C59395333585631574E55334C35484C502F7650506E3376683339342B66767A566C2F6531577531644F33635669373067457051796D656D61724A30374D7A5A322B75787658332F7472626665676842434B45797A58536755597246597A45674163495634324C422B4863526B7A3032334A493359557130715378424266486273585533584D4D62546C7976705A4E7033676D4A7645565035304E476A70303664797154546A74555A366974585A69714B716D58794F5968526558686F614869346C4D766663503275644371645343555048446977734C44516B793171657170634B475A6A7557662F365A6D46536B5742344E4162723563473870314F57395856644337666B792F30447051354242686A4648455568427779436C556C5779704A4D5532343375357431314569573035495A61585A72464D4A61504659454471793448474A46497A3032744C61623337317632543668744B6C67616E5A6559425250704E2B39736B66762F7A384C7948676C753830374D37576E54752F2F4F662F4B6642424B5A4F666E624F2F2F2B686A4B71565774576F744E54535A6463796C574D4A49396D546A32545452354C6256584C3648526B625745454C757550504F77484F67434232726A5156756455776E44415341416949496B6563365951526B52596B4556356879384F416845595A66652B69685938666636532F31527A78714E557864316C565A5033506D76577533373242556B5342316D75376A333373306F63596231665A7666374D766C7A44654F766836777442383331367A646D5862627658323957667A5066464555704B56516D385264636D71545673324D366273336274586C6D565A6C7350414A5578756457773948676349746C7074414469474D41723832767838544E554378347272366F57787364646532646562376830716C74382F663747514B545A7172554B32744758307567766E4A35754C35736A516D6F756E7A712F734866726864782F576766664577392B724C3077724649626347526A75727A55584337333973566938314665574E62322F584462695363454678686876324C685259764A74742B324E4F4D6353616A6271495263536B384D776B6D576C756A43587A5757623758626B2B34784A6C74554A50432B4B4969595245496E78735176486A787A4A462F4C5872466931636330364263757857484C316974584470584A6F32624F545538642B392B6234653266662F7433727A635A435479344C494A633175645A596C46557445552F32395A665450626D2B636C6D6973682B4542474F4545494545526F4C37454F7170314F4C63544B7051557549646A344D656947525A3372527077376E78383747304151506832513643556852464B73574152304B456A414F375076757A7837372F38782F2F534664303133626B54456149435068683644724A5A4E774C50535A5434446E72316C31546139527A78594A6D71427253436F5865766D49356E6333324476525456564D3076565A764969675167496751776A6B584844702B6F4D5869696D35344559386C6B6C526D45714F5A54435A58794B31594E527850786E4B39505A4A434234624C6C6D755A5A6B7557695351465044414A394B48664158346E70387243625273557154694B713053456C6D5951676278344A6B466A69703649637941776C677146336D4B78704F7136466A4D7331324E4D6B56585644344E6C4B68636846455952674E7932585A30787968524D4661594169536D4633704B6D4B55526D3563462B585645447A323831326B3748345745304F546E5A617256637A2B3559446954594E4530512B5977614D55494375363270386B4A3173545251616E5361795A34734A6D786D626A61565343645336554B6846492F485A61624655386C454D68314C4A7067737937494D42554149495969494C4D6B71517A674D64556C4B78524E4C556252327A645A61645A374A426B564151694C794864653165656A346E71664C696D733767575558556873464A4A3741555251356F5438784E546C312B584B74767152706A41464A4348484E78765763637A3252544B52546264636547436F726371797672367872436361556F6546683256416F70595A6841414334482B517A616464316C336C7141454155525971696D4231545552513363505634544E456F41634B7A7A634254776959494173493545514557424167465530786B796E774F624E66783275307457362F64734758307A4A6B7A746D64626C6755415949785253714D6F536D65794B597154696252684A4250785A4B485178366969615270545A555652776A446B6E47756156712F5844634E596471684C4350752B54796B31545A504B71753237717377596B7752425571527A4B7275754A376D65344E7931624D4146414142774556655945414A41614E7432504237764C362B676A4C6D42303271314B70574B726D714D4D6162496765444A5A466F69564E646A6955534B55535543776A434D494169694B464A5664585A324E70564B63633452517643725833766F4B68486570666A425666596641776E684B2B77345151684A2B414E7041554F494D53514959774A4A56336A41464244512F61583551454C41424F447546416C6A33483337495951672F71687730473254712F7A2B565359624959515275754969687667444D6141724D48545641344151774668674C4341537147736E41674F4549567857476A44434742494A4C6D736979386F4975684C382F79747064444E43507049684367424742434D73494D5249776B68434747494945454B59454C67634C685951416F6B4369424443585869414D4D5141454177786867677452344951776D785A57634467436A444156314B316E426843727567544548587263683968434248454742434D594E636D384A58304C6973794547474941494959434978414E316B51413441412F4542522B564342455559414934546773752F646648346B51387558714B764241414141414D74744241474356377458793464484141414977473739594158306579662F33706F664B682F70666D546B2F774A4A373144734E344A75626741414141424A52553545726B4A6767673D3D</field>
+            </row>
+            <row>
+                <field name="id">4</field>
+                <field name="accountId">1</field>
+                <field name="name">android.png</field>
+                <field name="type">image/png</field>
+                <field name="size">4295</field>
+                <field name="content" xsi:type="xs:hexBinary">89504E470D0A1A0A0000000D4948445200000080000000800806000000C33E61CB00000006624B474400FF00FF00FFA0BDA793000000097048597300000B1300000B1301009A9C180000000774494D4507DD011D0E180BE2306F78000010544944415478DAED5D6B745CD575FEBE7DEFC8961F3C0C01EC45480C2B8B0026A1D4206B2CB9C27181F208D074816D59069A16280B92A6246D42520A252D210FD2248426818418C9C63CD264C182BAE1154B1A4960CAB35E506A1E5D26501C9E768464CDDCF3F5C7BDA31796A59135F28CE66C2D594B9A19DF73F7FECEB71F67DF7388329096CCC293C1E997845174D1F2FACE374B7DBCCD1B17CF0F42DDDB1BED58F2E74B9E7DBB94C76AE5000069DA05A2CE8CA8EF94FA587FF6507D1503D71A018757D9EC334A7DBC650100B2E79F4C70B0E0336B338BFEA494C75A352DF70D1AE71AB8F9A5F51DCD1E001320AB163FB159C2CD12663A58D35D1DE9D9A538CE350F351C65C6931D1038B9CBAFBA11F200983016705F96DC9B3077CE4EC7926481B0BAF7F208760C22AD69AAEBEC2A07BD960D001AD39DBF27832F986C3A694DEBDA4F9A5352816A5BC332293CD790450AE115E5A2D7B201000050D10310FE57CC9DEAD47342A98CEBB6473E5585A0F72C3077805C78EDF2FAB6B7CA46A7283359DB9E5E2D6A0DA42E9B3E73C9CA850F6547FBCCBAB69A1991719E219C0146F38420A07400E40218009102BA01F70E2D34C1BD48177457F76CDFF6A7CB9ECE8D9AF6B5A76B403C4CEA8528179D76FE92C75E2F177D86E5060089F793DC08CBFD91EBED5905E0D6E1EFB9E7D7A7A5B6CFD85E47BAE3011C23E02002F300CD00381750086086C86133C0DE8364005E045C774FF5CCDFB574A4B7105107A2E0A5C6FA8EA7771D9FE07A11339C70533919BF2C1900009ADBEACE27A31F928E3DCF1FB5EF5F7CF6E7B907375F17BCF6EE7D75845B29E3498110413A5C4415101B5A1020825072E79404821093BF0CFC4100084A10F09E889728E668EE2E58EFFAC69A27B702C0DAAE450B11059B003D09F0338D8B332F7B004C46D09549B782564FD7773314DE01E3B7441C09A91A04094862FC1322C971F14DE21E10A3062024800ECEDD1B657139A6A183C0C141C4BF5B59DFF1BD72D3A3952B00E8EC3B0E511616FCA5026D70D47110A69348883DB139314EE327E44E80313DC43F6240848E38C7A6BB570D3CCCC4E742CDBCBB2CF5586E035ED75A77906374BA8C5F20B9801A740F1404F6D379516290D871C47048CA3CA2EBA37827841FCEDEE785473FFD8937E5015014DAAF3D9BB02F89AA0110304FC87BF12E84FC10040ADB40AC0F72D13F2F5FF2E81B1E0013286B3A177D3E10AF226C7FF4CF7A09E4DEBD07C59C80981048E07527BD2EBAAFAF4E77FDD203604F23FE478EFF10AAAAEE27834F00AAA228F183095C09E5A94E8441B683DCF9DDC6F4A67FF000182FE5B72F3A8EC0DD8E7604291156168C250146413038E46E545FF4E5D50D9BBA7D1650C8CC6FAF6D20C33B6176841162A2D2B2F0AB141C28C081B2CB2C0C7FBCB6ADE610CF00632EF4D42E03ED76331D085122588E050B498A07EE08173E9072D59F3D77C9035B3D03EC2ED8EB38611189663377A0627F3AC4F8FD2CA0815F94285B93481071553119811497103198A394142008C004BA3FDE99DA7E434BF3D98107C0483EBFB5EEE32985FF06E21080026803D9769EB20827C9D14114639A158C2439192088314711A2E8E020231C1947A7FDC3CDC3564412B352C1593AFCB59B3C007635F3DB3FB91F037C3F6270485C6461BE82C7FE843B9E66204593DD41B15E2E3C09D4CD4E8AE2A430FFAEE2794D4104B25BA19D17059C51A75C7635113DDBBFA4306400C99F62F0A608BB706D7BFA2B3E06F84091E7C46B81F06BCC2B99C290544F8098706EE4AE6BAA7FF4CA217143E6842B89F01A9261D18286643549E4EB51A4D3CEAFEF782AFFD2ADBF39E1A3A954F84B92C78DA45AE54B46D2FF98B4AAB1AEF331CF00009A338B9792C165C984573C69862A50042882C2CBA4EEFAC08D38B600F6BC8A896AC6CB4C14EEDA27D5F7CCE0972E6CD8F40AC9FB04E634E20808023D240E75C0579B5B97CCAE7800AC6B4FCF32E03A80FB4914A8DD509500E27D67DA39FCF569E1F6B71DD58D64E1B758819F20107CF59C458FBBE1AF3BB93700971DF1FA94245553ACA6F1D316642FA8780038D829803B7160E68E40DEFD457FCE35D841C35FEEC91E7244001DC4A252401E08EE9896F6F4B45D14001680563DD200E28549E66F0620AE696E3D69DF8A060019FD24B1B9304A7D3751DB1CCABED9D2567F707FFCB0B1617F0BB2D70236BFA8E19F986F275949E8ACC1AFDD96492F03B814D27BA351D0C00206F767D0FDAD8A0D029B330B2F37567D7FA0B83FDAF41506DE1BBDE5E0EE320494AC01D491717C56D4D5E0A4B813E7F764EE61297C4EEA3B9808FE0CB4FEE2C4686B15493E03D04541943A74457DEBFFED0D1B847B177DC15730A4238BA37E228EC1242A3C80D4250E02E3926BB15B0112C62263E34952B014744B8500A425FD64635B9E8C7B952081E6D8FB8F002EAA2817D0D256BB4AC6B990A9309B09042926052011A42545A1C921B498004832C69CD1125B16967C8A202588567767DBA70EACAC1820D05F518100C74279A33FA1E280CD277B7998838A3CFDDC349EFF8324611FC95ACFD9150380B5AD4B3F02D961B1439F84B0BD644549A518331CDD49150300A57A1B44EE17F75C56AAF1630E50E24688E0D0E6CE051FAA1017A005046654B2E9070702A000B92318EDBF60CA03E017FF716695938E066028970E8FE2C612F1CA91611E2D9AFA0CD03B63DB7E06CC2A853A44E96000824888C7ADED4807531A001686F3011E36100555BA07102832E92F98A149AECD4C7A2128723A90B039A050AEAD5E139E4E524999DB8E256C5F00DBA62C009227B7025478FC3FC2F430208B29CD0002B611F8B58499A477018366468A0A36050A764E6900107A42C205F404F0C1A9A1E939B959EF4FBA0B1AAF34676AE691566F48D508EE9DC8E9A954F7EC8D2B4ED9B0DD1BB438D29CA9F918192E31040B1DDC13514EAF9CBF24F3C0A402E0F68DB587E542DE48E014C6FE3CDFB02331474655B734D6B75DECCD3571B2AE75D127A330F839A5A3498679CE889BA4A26E44A9ABB163EBF71A4F7FC51515002D99DAD341DD06700E6183D6C7014870341111216D0E34FDBC1575BFD93CE4463A6A0E92C27B00D5F81CE003723380CF35A633BD43667DC7A28B41DE4467963C953E68E9537020880890D6079AF6D72BEA5AC7FC6472417580E6B69A1300FE2BC53954DC843F78F95B244C8E94810C8E7196BDBBA5BDF6C8A1AE4E7301DB4FCCB779FBAF415FBDC38BA32DED8B9AA8E0BB2658BE6A3878DD5B204C1211880C973B8BD6B4B4D7CD9A700034671A029A7D9BD487018BA7FDB0199C2C6FF6F7650AEEE3802E5DBB71516AD09B1C2097BC3F590EF25F498A3C24396E6E5F7C04C8AB49552BE993E72EEB08A424C6CF26B953A05CD3C43380BAEB9D6909644967EC983C8C447E2E0A73733DBB17E86A371E1FC8B26788383CAE9891BB2B9C924C1E5931C0ECEB130E005AEA6B26CB33FD989D374104ACBA6C70B6E3650CC158387D9621BC3451B546EF978C275CBCEF19E74C3C00C423FB2D3A16FB73A00D5AD2511393784EE92AC050C3C8428AF30BD43959605F9A1500D143C7B37C1B03D20EF3262E500C018854B197CC0B5B0D1C4FF52E0E08236FD1717242912BA6616103E29EDC8A977169ADB83ED30A9BCA1310DC78348C514FC464044C361938E69EE3A8E282C0C9D29379D5577AACE9C50360D2E9CD4BE500C00781A5AD27EF023C03F82CC067015E3C031417DDDEF157781AE879BF5453279F05946A16E083401F04FA20D08B07809729910578A95800F820B0B4F5E483401F047AF12EC08B07800F023D007C10E883402F9E017C16E0B3002F9E012618DDDEF157781AE879BF5453279F05946A16E083401F04961E00343E64FB495FBAAEA0803D82149F9B5CE8F8E39391426FC98215376E9D178901F842FE1C6C150A5FD9666FD142273E7300DFDFC571E4A3E75C2A0600A8479C84E470BEB182588C8F4369F74160614120C93E119D89CE59B0CE271A0074A95FC5C7DE8E313C91440674CAED10ED1E1F0416E8EAA3AA5E8A1B2C7FA450413AEFDB32E10050D0FD2085F6FCE9DEA3108DE2CD0B2384A8FA494AF686377161B2B2FEE11CADF75780B62001C16E483F09B748288714A65D3FE10068AC7D3C47049713B655D26E0F4A14C47833496D702E77FD7975AD7DDEA4E30041EDE35B8C760DA077F346DEB5778ECF1F4D7692BD75F9E2CC2D454903572E6E7B8AD0192032FD916A12AFF6EF6528C45182C32F9C729736D677FDCE9B72FCB2A236D302B87341BC0A80BBD0B980E4CC6C871B2297FB62510B412BD399670CC1994ED94B1CB955122947894E7410B545C0AA200A2F6CAADBF4F264E7B55325081CC2BEE9AE07082E72CA5EE5C8ED8374DE2B3A8AEC14706A900BBFBABA7ED3DB1375DDDDCA6DED7F405AB585C25CC7F0A326CD065C67CEB4A3A9B663C47D01D7654E3C56A8BA437447D14785C366067F00E06F876F17DFAFF3CC1F32642A05051F1683434DAA8E987B5030D794CEB8F15C75DC059AD5754F0A4004E0D5E47BEC90F32CB06BF38FA6F3C5FF29007D005E4CBE27B310E4652ACA5E0280A7FDCA05804830B2F8D21E0815070029F50E8077095750CD7AEAFA7E258513029069AA03C0FD7EF61B0ED816073D1E01C999C17454CEC936AE1A2103983200683AF5DFFB10F17E38F478F303B1FD01839E03DDD3151104EE089EFF1903BE3470D85C654241884F550201133734A53B5EA808005C9A7EABCF145C02302B89042B120194E448C0D96381E1DB159406022BD2ADED705806228B7C8D5B82244DCD4AD1209E4BFA3BE266293E196571DAB9B51DDBF60A08F7B65A9A1F699887AA9DFF02DA1924AAA87C7E38BC3696EF2E62D29352C0D0E3E316C7F639E52F81E458CC424E4AD1C0F8767529451028D144A72CA52F35D677FE60AFB250A9CC8FE6F68663C0F79752C1C930CC27866544F16F1F1335AD20FB4BC9D1C602C4A74104A3CC53519C25623E871DD23A46A70E88DB40BD81E14BE69203AA9E72DAB921E776DC77E192FFDAEB876C975525666D7BDDB330B7000503C000E4D098EE1AD3A7D6B52D5BE8C2DE4D540E5050200144809B76E5AABA8DD7F942D0441ABFAD9EC0EE67EF44615D8CF619FF550850D5E5A2D78A590CF235870A0780970A07805F76F20CE0C503C08B0780179F0578F141A017EF02BC780078F100F000F041A007800F023D00CA62066B4F66BFA780F20600A9713D56986F3F5701144044C975A67EE37A1901C040322C7432934CFA0C830240D3174285870E713323813D78E8D60360448920445D85FB732528C83D53006CBA18F7111674A97827172188824D1E00132C2B1767E4C88D4326DB581120C031BA77CC1F30ED10A2FFD69877C4CA030D800867D97B3C008A2081C3060AEF8820C4E489128D6475411044120E556EDF9BC67A9D55E92E19F023CA90B40703BB799251F90EE6785FC79F8239E701500479FDB73B5F8BA42B81C8C5BBE7891A21BACB3F73176F5785BF5F5EF7E06B05390EA5D608783ADE0E2BDE7D6FF71C0300DAE622BBA17171973C008A20579CF7B864582F879BD11FA727F6C2E07DB4D4FF9280DB65F6CD42AFB5AAAEED1D0997027815200752102529699E7F92A707A45E29FA22DC2BCFF92CA088727EBAF35DF5CCBA42C87E03021C92FD11E3CDD2E418EF4F2C3AC0E1A786E06F9A6A33E3DAA62E65DD5D70D17952EE29C9C131796A20F9D7E59F0171EE2D38AD9866B6AEA9E1B7659539966D816C4DE7B166D1CCA369EE6263D525CEB9300E0DF43E94BDC55C6AFD4EC3A3172EEED8637FBCA67D416A9AED7F7AD6B9CF9BB98678DE0812B790EE6A396E5855D7F15639EAF1FF015841FD48A44C570F0000000049454E44AE426082</field>
+                <field name="extension">PNG</field>
+                <field name="thumb" xsi:type="xs:hexBinary">6956424F5277304B47676F414141414E53556845556741414144414141414177434149414141445959473751414141414358424957584D41414137454141414F784147564B7734624141414470556C45515652596865315A585567555552512B5A39646358624E4E4C4C4D314E6247303341724B4A585533677167484B336F776968376336442B71682F372F33346F67736A434C364B45777A622B4B54497A6F77536853574E63734C4E61734B4372536367304E79705A437935335477395934732B73366439787252505539444C4E7A7633504F64382B636D5876504C494161584B7A4C557355767461766A44775737387449596D535A7A5645526B6946722F7167316D576730614C516F65387634634636654C546441626F6B4A36653451334C37353075586F453453647A7837475539664D623166704874515941554F6159302F72636E5A67614159546F36344149554F696A72546B504D75614E71616E7347485A424A66597372556244776953674C597675662F37557038712F566857377543354C47344C494E673045584A7762682B423539736A4E5835444A6243696F544E64714E597871524531545A6F354F6D54374B58745046614D4B55665031497A5948544A67414541674C68304B5A6D6A3063676F6B4238416A702F39486E624B7A635149654B30444D4D5357787850515158583072324A49595344713577766D7430376C6A554E6B7171614B7832314E7A3463574E6C4D6941434167446E72346E5868544C48594D685135776E7543524276324A515041366C334A6741457A744742704C4143597A416278536D696F39734B64544A5A59796756523270437049586D7045524743556A455267597844414A7358336E6433667838386E454B476F6D4E304B5068786B4F5642382B55676B4731376F704B566B71425665796571657177474256717A78797153464A614F71544E47457849765253416F65314951394C53704F7A534D7166425A6F4E47716E467030544768786257617033624A323979526549675A4551724B2B31473470735675796C78743968766F6C49304B5A33537065494242736C6F626A35624F4D53574644573450395155413269324F735558667961727033575361696F7279586436353369707A2B3237482F564A723831634B74636E773837733150452F6349694C686D3332517070372B4770706D6A354D623842586D6E61307A512B367355776131676565486646735253424C3956554D445657494C2F47564C43763133554C506866513072346B7A4D55754B3368425749493143386F622B657A51454E385558476D5661724939625A37344B6A4F786F3969373064417A676257586C4D74626C357142306D6750537461704B4F794C617A4E366B434547624F6A6E49306668304F4B57454D327179504771427366722F6350354C756E4A674935696565755348716E4F6C32396E613565663435436F587A392B6F33344E5230732F5975436F4D4F62483250676C6C6B56434F426D7854744647745073432B396D68656B3076397A4B7251676B66514835665650374F64776E55486E2B36317456372F6B496B714B3833696F3338755261376E6E506B6C496A6A78535A704E2B634C703974753148325670582F594638324A464558487548372B57734954576177677269334A73466E6944502B75677878423839626875496843415172714C71345454782F38764354764B536F7172423132415864726E5942454146356A35586E3271576A687A613267446474424C3039777642767351414159454A5365466D397862597477652B504467414138397A6F636F6631784A565A5133502B4138457749412B7133696A634141414141456C46546B5375516D4343</field>
+            </row>
+        </table_data>
+        <table_data name="AuthToken">
+            <row>
+                <field name="id">1</field>
+                <field name="userId">2</field>
+                <field name="token" xsi:type="xs:hexBinary">31326239303237643234656666663762666261636138626437373461346333346234356465333565303333643262313932613838663464666165653563323333</field>
+                <field name="actionId">2</field>
+                <field name="createdBy">1</field>
+                <field name="startDate">1530745272</field>
+                <field name="vault" xsi:nil="true" />
+                <field name="hash" xsi:nil="true" />
+            </row>
+            <row>
+                <field name="id">2</field>
+                <field name="userId">1</field>
+                <field name="token" xsi:type="xs:hexBinary">32636565386232323466343865303165663438616331373265383739636337383235383030613964376365336232333738333231326634373538663163313436</field>
+                <field name="actionId">7</field>
+                <field name="createdBy">1</field>
+                <field name="startDate">1530829026</field>
+                <field name="vault" xsi:type="xs:hexBinary">4F3A31393A2253505C436F72655C43727970745C5661756C74223A343A7B733A32353A220053505C436F72655C43727970745C5661756C740064617461223B733A3139303A2264656635303230303432636161656630303536346330653132343136383261366464643565383064643962656430393164393434383866383234623366333862663139383537633238393433373636653931346164336432396337393638613163376162353738663565306634396666646231653762616565306334383932303862343838393239323662656536376363653538323865376239363439326261383634306662613761626461656366363734643034646331613833373261223B733A32343A220053505C436F72655C43727970745C5661756C74006B6579223B733A3531323A226465663130303030646566353032303032303963343139663738326462383466316664653432623536303836383637653165323766613032663666663737306631343834613532343530653435613464343433383762323962323563313162663932666666633766346435336132326331353930383134623239313962613261363433393932306462666164643466323339373733326661326635353035376666626132373361613433363630383331626235346336616163356135633762383963636139313064356539316638613364616464633832393139323666316562623362343835653366316165353731623731636365383031343461393464666431333361366232346331616665636366616663316364306439366631383862623730613864326639356365616131373137346565323636353234363661313432633332373935343062346233343066633230373063373634383034313835343930363163303063313433323164356436306636396337376636326536366465383135396538336534643161653437653765366434663532633364623166663836633465306463313131393734323535336630313933646263323764373835346139363735646465613862303765663266363365383666343963323336373839323335396234303939626630303430643763643934623935616431616430613237223B733A32383A220053505C436F72655C43727970745C5661756C740074696D65536574223B693A313533303832393032363B733A33323A220053505C436F72655C43727970745C5661756C740074696D6555706461746564223B693A303B7D</field>
+                <field name="hash" xsi:type="xs:hexBinary">24327924313024434936705834636646516B56432E56426F3373784E652F6D7271486C6E584550546439625A2F7164454271584468472F634D416865</field>
+            </row>
+            <row>
+                <field name="id">3</field>
+                <field name="userId">1</field>
+                <field name="token" xsi:type="xs:hexBinary">32636565386232323466343865303165663438616331373265383739636337383235383030613964376365336232333738333231326634373538663163313436</field>
+                <field name="actionId">2</field>
+                <field name="createdBy">1</field>
+                <field name="startDate">1530824672</field>
+                <field name="vault" xsi:nil="true" />
+                <field name="hash" xsi:nil="true" />
+            </row>
+            <row>
+                <field name="id">4</field>
+                <field name="userId">1</field>
+                <field name="token" xsi:type="xs:hexBinary">32636565386232323466343865303165663438616331373265383739636337383235383030613964376365336232333738333231326634373538663163313436</field>
+                <field name="actionId">3</field>
+                <field name="createdBy">1</field>
+                <field name="startDate">1530824680</field>
+                <field name="vault" xsi:nil="true" />
+                <field name="hash" xsi:nil="true" />
+            </row>
+            <row>
+                <field name="id">5</field>
+                <field name="userId">1</field>
+                <field name="token" xsi:type="xs:hexBinary">32636565386232323466343865303165663438616331373265383739636337383235383030613964376365336232333738333231326634373538663163313436</field>
+                <field name="actionId">6</field>
+                <field name="createdBy">1</field>
+                <field name="startDate">1530824689</field>
+                <field name="vault" xsi:nil="true" />
+                <field name="hash" xsi:nil="true" />
+            </row>
+        </table_data>
+        <table_data name="EventLog">
+            <row>
+                <field name="id">1</field>
+                <field name="date">1527720052</field>
+                <field name="login">-</field>
+                <field name="userId" xsi:nil="true"/>
+                <field name="ipAddress">172.19.0.1</field>
+                <field name="action">login.auth.database</field>
+                <field name="description">
+                    Tipo : authDatabase
+                    Usuario : admin
+                </field>
+                <field name="level">INFO</field>
+            </row>
+            <row>
+                <field name="id">2</field>
+                <field name="date">1527720053</field>
+                <field name="login">admin</field>
+                <field name="userId">1</field>
+                <field name="ipAddress">172.19.0.1</field>
+                <field name="action">login.session.load</field>
+                <field name="description">
+                    Usuario : admin
+                </field>
+                <field name="level">INFO</field>
+            </row>
+            <row>
+                <field name="id">3</field>
+                <field name="date">1527720053</field>
+                <field name="login">admin</field>
+                <field name="userId">1</field>
+                <field name="ipAddress">172.19.0.1</field>
+                <field name="action">login.preferences.load</field>
+                <field name="description" xsi:nil="true"/>
+                <field name="level">INFO</field>
+            </row>
+            <row>
+                <field name="id">4</field>
+                <field name="date">1527723866</field>
+                <field name="login">admin</field>
+                <field name="userId">1</field>
+                <field name="ipAddress">172.19.0.1</field>
+                <field name="action">logout</field>
+                <field name="description">Finalizar sesión
+                    Usuario : admin
+                    Tiempo inactivo : 0.02 min.
+                    Tiempo total : 63.72 min.
+                </field>
+                <field name="level">INFO</field>
+            </row>
+            <row>
+                <field name="id">5</field>
+                <field name="date">1527796875</field>
+                <field name="login">-</field>
+                <field name="userId" xsi:nil="true"/>
+                <field name="ipAddress">172.19.0.1</field>
+                <field name="action">login.auth.database</field>
+                <field name="description">
+                    Tipo : authDatabase
+                    Usuario : admin
+                </field>
+                <field name="level">INFO</field>
+            </row>
+            <row>
+                <field name="id">6</field>
+                <field name="date">1527796876</field>
+                <field name="login">admin</field>
+                <field name="userId">1</field>
+                <field name="ipAddress">172.19.0.1</field>
+                <field name="action">login.session.load</field>
+                <field name="description">
+                    Usuario : admin
+                </field>
+                <field name="level">INFO</field>
+            </row>
+            <row>
+                <field name="id">7</field>
+                <field name="date">1527796876</field>
+                <field name="login">admin</field>
+                <field name="userId">1</field>
+                <field name="ipAddress">172.19.0.1</field>
+                <field name="action">login.preferences.load</field>
+                <field name="description" xsi:nil="true"/>
+                <field name="level">INFO</field>
+            </row>
+            <row>
+                <field name="id">8</field>
+                <field name="date">1527800242</field>
+                <field name="login">-</field>
+                <field name="userId" xsi:nil="true"/>
+                <field name="ipAddress">172.19.0.1</field>
+                <field name="action">login.auth.database</field>
+                <field name="description">
+                    Tipo : authDatabase
+                    Usuario : admin
+                </field>
+                <field name="level">INFO</field>
+            </row>
+            <row>
+                <field name="id">9</field>
+                <field name="date">1527800243</field>
+                <field name="login">admin</field>
+                <field name="userId">1</field>
+                <field name="ipAddress">172.19.0.1</field>
+                <field name="action">login.session.load</field>
+                <field name="description">
+                    Usuario : admin
+                </field>
+                <field name="level">INFO</field>
+            </row>
+            <row>
+                <field name="id">10</field>
+                <field name="date">1527800243</field>
+                <field name="login">admin</field>
+                <field name="userId">1</field>
+                <field name="ipAddress">172.19.0.1</field>
+                <field name="action">login.preferences.load</field>
+                <field name="description" xsi:nil="true"/>
+                <field name="level">INFO</field>
+            </row>
+            <row>
+                <field name="id">11</field>
+                <field name="date">1527807482</field>
+                <field name="login">-</field>
+                <field name="userId" xsi:nil="true"/>
+                <field name="ipAddress">172.19.0.1</field>
+                <field name="action">login.auth.database</field>
+                <field name="description">
+                    Tipo : authDatabase
+                    Usuario : admin
+                </field>
+                <field name="level">INFO</field>
+            </row>
+            <row>
+                <field name="id">12</field>
+                <field name="date">1527807483</field>
+                <field name="login">admin</field>
+                <field name="userId">1</field>
+                <field name="ipAddress">172.19.0.1</field>
+                <field name="action">login.session.load</field>
+                <field name="description">
+                    Usuario : admin
+                </field>
+                <field name="level">INFO</field>
+            </row>
+            <row>
+                <field name="id">13</field>
+                <field name="date">1527807483</field>
+                <field name="login">admin</field>
+                <field name="userId">1</field>
+                <field name="ipAddress">172.19.0.1</field>
+                <field name="action">login.preferences.load</field>
+                <field name="description" xsi:nil="true"/>
+                <field name="level">INFO</field>
+            </row>
+            <row>
+                <field name="id">14</field>
+                <field name="date">1527807531</field>
+                <field name="login">admin</field>
+                <field name="userId">1</field>
+                <field name="ipAddress">172.19.0.1</field>
+                <field name="action">logout</field>
+                <field name="description">Finalizar sesión
+                    Usuario : admin
+                    Tiempo inactivo : 0 min.
+                    Tiempo total : 0.92 min.
+                </field>
+                <field name="level">INFO</field>
+            </row>
+        </table_data>
+        <table_data name="ItemPreset">
+            <row>
+                <field name="id">1</field>
+                <field name="userId">1</field>
+                <field name="userGroupId" xsi:nil="true"/>
+                <field name="userProfileId" xsi:nil="true"/>
+                <field name="fixed">0</field>
+                <field name="priority">0</field>
+                <field name="data" xsi:nil="true"/>
+                <field name="type">permission</field>
+                <field name="hash">284985459df4616aa682a6de4c4994a9fedf164d</field>
+            </row>
+            <row>
+                <field name="id">2</field>
+                <field name="userId" xsi:nil="true"/>
+                <field name="userGroupId">1</field>
+                <field name="userProfileId" xsi:nil="true"/>
+                <field name="fixed">0</field>
+                <field name="priority">10</field>
+                <field name="data" xsi:nil="true"/>
+                <field name="type">permission</field>
+                <field name="hash">ac1de29cfbc9db8c63b3b109c899148e904ccced</field>
+            </row>
+            <row>
+                <field name="id">3</field>
+                <field name="userId" xsi:nil="true"/>
+                <field name="userGroupId" xsi:nil="true"/>
+                <field name="userProfileId">1</field>
+                <field name="fixed">0</field>
+                <field name="priority">20</field>
+                <field name="data" xsi:nil="true"/>
+                <field name="type">permission</field>
+                <field name="hash">3ec16d2bece6de02ed9423f98fcaaba260ffd36b</field>
+            </row>
+            <row>
+                <field name="id">4</field>
+                <field name="userId">2</field>
+                <field name="userGroupId" xsi:nil="true"/>
+                <field name="userProfileId" xsi:nil="true"/>
+                <field name="fixed">0</field>
+                <field name="priority">0</field>
+                <field name="data" xsi:nil="true"/>
+                <field name="type">permission</field>
+                <field name="hash">8eca5d3518e5531aa968ce0d5a7221f659f5d0ee</field>
+            </row>
+            <row>
+                <field name="id">5</field>
+                <field name="userId" xsi:nil="true"/>
+                <field name="userGroupId" xsi:nil="true"/>
+                <field name="userProfileId">3</field>
+                <field name="fixed">0</field>
+                <field name="priority">10</field>
+                <field name="data" xsi:nil="true"/>
+                <field name="type">permission</field>
+                <field name="hash">fa66da8c08bf2728dfa90bb0682494a763dc0c11</field>
+            </row>
+        </table_data>
+        <table_data name="Notification">
+            <row>
+                <field name="id">1</field>
+                <field name="type">Prueba</field>
+                <field name="component">Accounts</field>
+                <field name="description">Notificación de prueba</field>
+                <field name="date">1529145158</field>
+                <field name="checked">0</field>
+                <field name="userId">2</field>
+                <field name="sticky">0</field>
+                <field name="onlyAdmin">0</field>
+            </row>
+            <row>
+                <field name="id">2</field>
+                <field name="type">Global</field>
+                <field name="component">Accounts</field>
+                <field name="description">test</field>
+                <field name="date">1529145296</field>
+                <field name="checked">0</field>
+                <field name="userId" xsi:nil="true"/>
+                <field name="sticky">1</field>
+                <field name="onlyAdmin">0</field>
+            </row>
+            <row>
+                <field name="id">3</field>
+                <field name="type">Admins</field>
+                <field name="component">Accounts</field>
+                <field name="description">test</field>
+                <field name="date">1529145313</field>
+                <field name="checked">0</field>
+                <field name="userId" xsi:nil="true"/>
+                <field name="sticky">0</field>
+                <field name="onlyAdmin">1</field>
+            </row>
+        </table_data>
+        <table_data name="Plugin">
+            <row>
+                <field name="id">1</field>
+                <field name="name">Authenticator</field>
+                <field name="data" xsi:nil="true"/>
+                <field name="enabled">0</field>
+                <field name="available">1</field>
+            </row>
+            <row>
+                <field name="id">2</field>
+                <field name="name">XML Exporter</field>
+                <field name="data">data</field>
+                <field name="enabled">1</field>
+                <field name="available">1</field>
+            </row>
+            <row>
+                <field name="id">3</field>
+                <field name="name">DokuWiki</field>
+                <field name="data" xsi:nil="true"/>
+                <field name="enabled">1</field>
+                <field name="available">0</field>
+            </row>
+        </table_data>
+        <table_data name="PluginData">
+            <row>
+                <field name="itemId">1</field>
+                <field name="name">Authenticator</field>
+                <field name="data">def502003606d6eb85aebcb1d9e635f0e6f969d05f064ffb719769a8a91864f0d094ff84674746f6c81ef122d04049fec4682337bada1d2ea272705d2631be4245d3c3dec2c341c5b6b7f0406f7cc9296740132e691c2b96b66057f54e27</field>
+                <field name="key">def10000def50200c35308f24d1f3b0501a873018043ca9c05762039fab3b3a9fdb6574cfecec65e2ec833a33c5b7698e37ce8e9b28fe371251b2b6513dfad95dbed69cc27e15c934b63951bce9649d42ca3c9e85e273c32583dad12653cf3ebb0f8b39bafeba085d04c62577ecad4229d91328caf8071e4a94fca947c1a3e5a9f13f7e32d80691e9f55f1779f8db85fb7b9ba463d5571904954df65ce9d7b7c4eb6c16066fd4dc79881c37f065ee656668695cee1f4649ac98f3530706649a5956a9dc5aa4e6a32870478b29ef6563551f5fbff7800c58e030774cd379f9144cd1cca85dd8620078fefe0d3d2a62feb81654d9dd5fc8638bd2c8a2dab01a4a5</field>
+            </row>
+            <row>
+                <field name="itemId">2</field>
+                <field name="name">Authenticator</field>
+                <field name="data">def50200290e0767802bb0cf1304efb2b9900da6676d51ee1c7a7538e05ebd10a5d9af1fcf658322274a8b906efd2411d71c1e38df3ac68ac6c7e21263aad2bef48aaf719f1c43b369d773cd30087eaa168b26114c2097dff9763295d2d1d7</field>
+                <field name="key">def10000def50200235f986cd31997981128329a2a327416007538a5457b30360632a734469faf5247927f223ed2470f6ee4e8687bfafc44cb6cbc9f292aaaaf4adb73bc09cf189502f778ad20e9d55fbda905da11c9f39d51aff7da4c1c36c26676c53b482a96274e868448ff8f924605b87f0079f42934d51838677a368dde2bf0b994708b6181afd7e86ac5f856d25aac5ba9602fb4cd383f6d5cff0417764eabeeb61e615856ad6a424dd65c95805c51e1ceccee3470f0a488dae36157fb33bf115bc7d7e3a5a6fc9a9dc62926737bbea1fff509b0761cd56062d4f8cbe999182b0dccd6e2595a87ec626b315d1cfa4b32f62fb11b81ea6af45d8215203f</field>
+            </row>
+            <row>
+                <field name="itemId">2</field>
+                <field name="name">XML Exporter</field>
+                <field name="data">def502004f363167a52704815e58bebb593b0be863052bbafac43bef4388a4692c124bf45f8968a5be7ce7f1b90a693f79d2f9147ed352334709b629297c34c432f986ff465033e899cddf80282fee6179124ebc12bb3a82</field>
+                <field name="key">def10000def50200a5e70a393f85c0bc81ee4a8555d14ca50d1845549e7851dd5e0b75695603819de6ac4f8860bc26b4b9432a9f6c0587f6e3f1b7081d528c7e9422ad7c52fd02be6772955ec0ba9dc3f83e644e8bc9e72e61039703ae17874066443f192d8c0840e13cf7f19d21c495ff81984bd3a2377893e8e5caf99aa25b529ff1fc264002f2372e7bc2ecf824865e7830af1aac2c344798c380cd071eee1d4e5bcd1633a2a9b308620a2136285e247f7b31a406074c858e3f9eaa5e3b3a44af41b02425790ec95f170ab7780f75cdbf448a513dfec71071700b4586b3384911f0ae8a7764076f98fbf5ed63e1b9651f73f6b73675a855a6d02693d3560c</field>
+            </row>
+            <row>
+                <field name="itemId">3</field>
+                <field name="name">DokuWiki</field>
+                <field name="data">def502009fdf89235fd6c084779a79d720b9fd657ba9563d738cc64ad11f4074f674a79dba7a798c89f250243beae86fb7e7b0d67e57349b6eff051ee26662b297f9efaf572779ac96ee567cbb85d1c77a7197054111eb108da82c6a09da</field>
+                <field name="key">def10000def50200ac689f83389580d9934abe4109a85f789c64ab443e182d0946fe55ba2a2b77b03227983d4eca8cd2abfa48f94e1752b435c5b70805ee1cbe0198fc5293f2a43098bdbf81ca1436f1b519b3159906ed4db45cd00774c935aeda4cd6cced42b5ad6df3da161a57d31ac46e6c3007dc4c3de7d19a6f11b949c1a09c98f1143c74dd006ecde5285f7b613cb18ce4c1e99d5accce12164d8d6e86e06529fd236091b7340b7a797a88b36b9b517c0b070e91977210153b2b82a2b253c4245b168a95e6238fb7c28bfca523013e0d1093d1b0c3f3e7b185cc12ec7df804c1370b2ea02977d17423433ebc8e38dad674a3d62f106a669f1df093c921</field>
+            </row>
+        </table_data>
+        <table_data name="PublicLink">
+            <row>
+                <field name="id">2</field>
+                <field name="itemId">1</field>
+                <field name="hash" xsi:type="xs:hexBinary">636564333430306561313730363139616437643235383934383862366236303734376561393966313265323230663561393130656465366438333466</field>
+                <field name="data" xsi:type="xs:hexBinary">4F3A31393A2253505C436F72655C43727970745C5661756C74223A343A7B733A32353A220053505C436F72655C43727970745C5661756C740064617461223B733A313833303A22646566353032303036636430326564663336666265623963383631616264643662396131373061376432303631323836353435303031666230396664636565663665633264313438623663336334373134643337616239333665353738613763393365333035613663623763396665383438646335626439656630303034323665346631663932653831323330623765616132323564306438303336613139363330656361613561336232626530333236336435353564363234323261323539346234306637623864623863396662316361376232616637313865626338316636356635633432333965663439626563653961643334363861353961613665303336613036663836383261343038376562323261383536373464626264613531623533633738633166333366616161663765383866366561626464666431626636643564653932656138616139376130633466313035373166653637303235313237653139333832623562643835666264366438393235383064653934373832653532343264653338626564613439383063616337306530306335353263343338616166663866343335373665656333356564386561356139643263643736616663316637363233633732323065653663303337623766343264626234393134653532313732373337623936373039333866396230303762353933356637613666393562306332366237663535643132393234316630616339373736356161323134376239363931666666636337356332643734616434323534323030646463346132353535323562356634633866626261363838396233383265366539333462633864363165363036323865366235313864346536613662613837303630626432626465363839366462623431333438313333613039663632363333343365613061353937333739613530393665316263616637356236633365656366326631306230653438376434346333346562323061303133633832656431373662613762316661653465386138313336636131336363363231613538326532303736306166623965616638363262373633373136626330363135303062323766306230626339623436373665393934623666623934356134626439323734393137316265646662306563636166666432646134666137386163376533663036306539313163613366616132616636396338336135363732616237636662636563643162653561336131323134336630346364353061316632383334346535646439396463613862343433383564363362653066393834333236373664313539383761313334313661363637363932333136343733303837663437396532316330633635363164333832623463613830313232613830313035326538643730313336616432353231363035323735333865306666646433353130643337323064656334653631363931666232656635383466636237353736633336303432656566343732633437383431306339393166373964623331353865316232396333633830346462353932323362373534316233376638636430306531393565333332663937306531303038326130613638353236333362373763316133626161623632623332616339646636646138623962333038616137333866616533353765376630356430343963333335653961376533356338623531633863343964653937373031653532323931616135633637356433363134343936326462646437363731656134643037343237646235386366303664666630333964313338643135343732326164313734663865363034663539306562346361633362313263636436626430303261323561653139363234363763386266393733376639666139643031303862306134303439666663633963666562303766323236303838363432313761366339383637633564363331353932616635383135313162393961643335316335333763346262663734383666613964663362633432666565383664393931613233623635306664383837386535346164393932356565653738633638373035323030643861313566383038393331323832666538316634326139326235373933626163353362663462326636316234373238366434343731646662393363383532613534626366633739663264373266376336383064656431663436313431656335366533343034396665636464303538613937613465376664303964616662373632613663656539636637386439343937303434393561333838306233353134386636363238636533363437306337656635613937346335343833656132383963633166333966363635383663373036653032363166626564653763376636616437303234623462663139623333666362653066333763376537363139616637303235336533396163636461353135306161613832326438323238636531336465386432383462326364323466353131643032303435343737663335316632373734646537223B733A32343A220053505C436F72655C43727970745C5661756C74006B6579223B733A3531323A226465663130303030646566353032303037633239663335326261346335623130653135643930386262303734376632373934386433323831306538306266396232303965663835366135303436353762323533393036333834343335623236373537653565376464613662323434303038363131643333396330333266346139363632373765643139363831363330623731373465366232643436376664313137393063343234373634313766656530333338636233303562396431306333653964663733356664633935393366633463653938623137633961373138343337353338326665633335343965326233373232616237386365363537323866323162343336656136326266366437333033656339336432663735316335303661623162306338636238323139656564376435626133363666643961333833383930326333333931626536373436373638613063333137663865363066343463646139653634643737323833373836663664653565653531323932396463313033613131346565343563643363393262323962343463613738363832353264336661323135663961353263303732393034326366333231633231356634633737613733653331396365383835633738333565326332353363656532663736346138393037353035313235393232663130616166623866626666356562633161376332223B733A32383A220053505C436F72655C43727970745C5661756C740074696D65536574223B693A313533323238303232353B733A33323A220053505C436F72655C43727970745C5661756C740074696D6555706461746564223B693A303B7D</field>
+                <field name="userId">1</field>
+                <field name="typeId">1</field>
+                <field name="notify">0</field>
+                <field name="dateAdd">1529228863</field>
+                <field name="dateExpire">1532280825</field>
+                <field name="dateUpdate">0</field>
+                <field name="countViews">0</field>
+                <field name="totalCountViews">0</field>
+                <field name="maxCountViews">3</field>
+                <field name="useinfo" xsi:nil="true" />
+            </row>
+            <row>
+                <field name="id">3</field>
+                <field name="itemId">2</field>
+                <field name="hash" xsi:type="xs:hexBinary">616337343462363934383832336362303531343534366335363739383163653466653732343064663339363832366439396632346664396131333434</field>
+                <field name="data" xsi:type="xs:hexBinary">4F3A31393A2253505C436F72655C43727970745C5661756C74223A343A7B733A32353A220053505C436F72655C43727970745C5661756C740064617461223B733A313834343A226465663530323030376339353039326234633263383533353734663131343039373138363831386435373135656137663734643534393632356136313032616538623262613339636133616365353234656361643466316431616130306262653965643063316331666236303732643062343733333631363637346235646336313231356333666436623335353961666633666639383761353934323966633963313637373462336235613938363265653761636135653137646536313635306132343533653632613261393362613838353764663436656261353138363363663436386336373434643363303633353738643930363965306634313533646163616131376463633465383335626138666430613563363131393734393665306261336264373139633165343664616666636137313430643434326263663965303564663639393434373765353566363536376666366138633265656639313863623863323930653063613762656337376237376335306337303530396638633436653465356130363933663438306137313639393663393331613539353636363663343466633837393862336536323939616638353966623736353233316566363837656665316530316635623065616237636138363465323637366134663533643032313565343731303338353435356634383463366332636663303336386262333330353631666166343162366433333034373533326565303930653434323833386337613835373035633333383136616363376139623433313237363064623332623638363038666432313138616161666631623366323865356635643061663030636532633564633930366662623337626331333863653238656631383262656664356461623037363265623062343932383030363336303263306237333264656364343538386536326331353636353437383037663761343132626532646663633930623638333461336364376165616237363239376364363162366130346436383665303537373936623538626664356361396666333539323939643464333961646339646535393765313839363239343766623366656361376631356365656634343862336335393938623964323032343463393032656263383362646439306637353366653337636638326137613365303664613366646532616138663865613462316535356331393436653861626634306165663936333566313166323264303064626133373662656134333963346532333238303837303165336431346263323761633431623138303966643732626462316638346533343930366233386665316433306461653831623832656133326632316532383663653233373530623430353765643965303463376134623762666261393537333733623236646336663063633939366130396131386538626234343736656263666663616666326437623164326230643466653166323264346262663366373537646631613664393162396564303732313836656138366633346665343238393731663661373732396330353366303266646531343531376166356361386130663233316335383435636564303430306136313134623462353936393564386132623730336562646237643731333539326137356634396532663231326163386231343232646232336464333361373337303362396437363837373830653132643365316439313235313434623062326334613865633237326334373161643763373364356166623735363661663034386130613332633632346163383238336131626466313434363661663538306634346236643934326266643837333663653663323139306431373439643032376533346264356231616231313762353037633237633833353434613661303039326364353039363535323865663964306234386262626138383038313436336666313163303036373932396335363736353435663937616636363039323232373262313762343938313836383530623565376638663230353235383363306235353430313639303165353832613066643164653635336233373035313663653564646330376261313632366335383639306362663832633530346335306635353430373333616164333033656432656133313538656661633966393538316238633166386436396133316631616537616339623337393539363633323834613233316639616633333439623939643630373733383731396561636563326335383466353635383031656532393737653631336437386135636561633036353661346663343133393236613139376430323463303639633762613732366435623938633638343336323765386337373939653961613564333736333035666239303738346363663764643536636632323132386534346537666565333762633461343139326235666332646437386261643336333736313739616335303163343335613336373336393261393531306163326137343961323065663636316564353833223B733A32343A220053505C436F72655C43727970745C5661756C74006B6579223B733A3531323A226465663130303030646566353032303062336137653530303338396635343239663939656266376365366131636534666461656633666236613439366532333739653931643930393335616336353362663239326331353066353233643335326537643463373237643133363365303135396564316333656261386530363065343032646561653838666432323363383433386663373438333436633237356637663536626636306363323033666666373466346665643533623738336662323264376438653838343431303539636332653430616538633066616433326138333534623937396364333439323634336563366130303438353061376135396564316638393364623762356664393865373432653532643630643134346139346332663865646665353834616136646432343831636632616632376662393662376633653437346265313439333363663364313837373230343931316163656438656665353239303361333336656336653138323263326131663539383539313133333830663735376263636432306266653362623631346631333535326535323235316530626436313864333838363030383633376331323262336231303631613061386166396465646138646630393331643463353464313162623632623834613962353534326261303961343938306336613831386230626131336237223B733A32383A220053505C436F72655C43727970745C5661756C740074696D65536574223B693A313533323238303232383B733A33323A220053505C436F72655C43727970745C5661756C740074696D6555706461746564223B693A303B7D</field>
+                <field name="userId">1</field>
+                <field name="typeId">1</field>
+                <field name="notify">0</field>
+                <field name="dateAdd">1529276100</field>
+                <field name="dateExpire">1532280828</field>
+                <field name="dateUpdate">0</field>
+                <field name="countViews">0</field>
+                <field name="totalCountViews">0</field>
+                <field name="maxCountViews">3</field>
+                <field name="useinfo" xsi:nil="true" />
+            </row>
+        </table_data>
+        <table_data name="Track">
+            <row>
+                <field name="id">1</field>
+                <field name="userId" xsi:nil="true" />
+                <field name="source">login</field>
+                <field name="time">1529145183</field>
+                <field name="ipv4" xsi:type="xs:hexBinary">AC160001</field>
+                <field name="ipv6" xsi:nil="true" />
+            </row>
+            <row>
+                <field name="id">2</field>
+                <field name="userId" xsi:nil="true" />
+                <field name="source">login</field>
+                <field name="time">1529145189</field>
+                <field name="ipv4" xsi:type="xs:hexBinary">AC160001</field>
+                <field name="ipv6" xsi:nil="true" />
+            </row>
+            <row>
+                <field name="id">3</field>
+                <field name="userId" xsi:nil="true" />
+                <field name="source">login</field>
+                <field name="time">1529145194</field>
+                <field name="ipv4" xsi:type="xs:hexBinary">AC160001</field>
+                <field name="ipv6" xsi:nil="true" />
+            </row>
+            <row>
+                <field name="id">4</field>
+                <field name="userId" xsi:nil="true" />
+                <field name="source">login</field>
+                <field name="time">1529272367</field>
+                <field name="ipv4" xsi:type="xs:hexBinary">AC160001</field>
+                <field name="ipv6" xsi:nil="true" />
+            </row>
+            <row>
+                <field name="id">5</field>
+                <field name="userId" xsi:nil="true" />
+                <field name="source">login</field>
+                <field name="time">1529272372</field>
+                <field name="ipv4" xsi:type="xs:hexBinary">AC160001</field>
+                <field name="ipv6" xsi:nil="true" />
+            </row>
+            <row>
+                <field name="id">6</field>
+                <field name="userId" xsi:nil="true" />
+                <field name="source">login</field>
+                <field name="time">1529272376</field>
+                <field name="ipv4" xsi:type="xs:hexBinary">AC160001</field>
+                <field name="ipv6" xsi:nil="true" />
+            </row>
+        </table_data>
+    </database>
 </mysqldump>
diff --git a/tests/res/datasets/syspass_account.xml b/tests/res/datasets/syspass_account.xml
deleted file mode 100644
index 6763c26a..00000000
--- a/tests/res/datasets/syspass_account.xml
+++ /dev/null
@@ -1,437 +0,0 @@
-<?xml version="1.0"?>
-<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<database name="syspass">
-	<table_data name="UserProfile">
-		<row>
-			<field name="id">1</field>
-			<field name="name">Admin</field>
-			<field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A303B733A31343A22002A006163635669657750617373223B623A303B733A31373A22002A0061636356696577486973746F7279223B623A303B733A31303A22002A0061636345646974223B623A303B733A31343A22002A006163634564697450617373223B623A303B733A393A22002A00616363416464223B623A303B733A31323A22002A0061636344656C657465223B623A303B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A313B733A31383A22002A006163635072697661746547726F7570223B623A313B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
-		</row>
-		<row>
-			<field name="id">2</field>
-			<field name="name">Demo</field>
-			<field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A313B733A31343A22002A006163635669657750617373223B623A313B733A31373A22002A0061636356696577486973746F7279223B623A313B733A31303A22002A0061636345646974223B623A313B733A31343A22002A006163634564697450617373223B623A313B733A393A22002A00616363416464223B623A313B733A31323A22002A0061636344656C657465223B623A313B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A303B733A31383A22002A006163635072697661746547726F7570223B623A303B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
-		</row>
-		<row>
-			<field name="id">3</field>
-			<field name="name">Usuarios</field>
-			<field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A313B733A31343A22002A006163635669657750617373223B623A313B733A31373A22002A0061636356696577486973746F7279223B623A313B733A31303A22002A0061636345646974223B623A313B733A31343A22002A006163634564697450617373223B623A313B733A393A22002A00616363416464223B623A313B733A31323A22002A0061636344656C657465223B623A313B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A303B733A31383A22002A006163635072697661746547726F7570223B623A303B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
-		</row>
-	</table_data>
-	<table_data name="Category">
-		<row>
-			<field name="id">1</field>
-			<field name="name">Web</field>
-			<field name="description">Web sites</field>
-			<field name="hash" xsi:type="xs:hexBinary">3235363761356563393730356562376163326339383430333365303631383964</field>
-		</row>
-		<row>
-			<field name="id">2</field>
-			<field name="name">Linux</field>
-			<field name="description">Linux server</field>
-			<field name="hash" xsi:type="xs:hexBinary">6532303661353465393736393063636535306363383732646437306565383936</field>
-		</row>
-		<row>
-			<field name="id">3</field>
-			<field name="name">SSH</field>
-			<field name="description">SSH access</field>
-			<field name="hash" xsi:type="xs:hexBinary">3137383764373634363330346335643938376366346536346133393733646337</field>
-		</row>
-	</table_data>
-	<table_data name="Client">
-		<row>
-			<field name="id">1</field>
-			<field name="name">Google</field>
-			<field name="hash" xsi:type="xs:hexBinary">6338323263316236333835336564323733623839363837616335303566396661</field>
-			<field name="description">Google Inc.</field>
-			<field name="isGlobal">0</field>
-		</row>
-		<row>
-			<field name="id">2</field>
-			<field name="name">Apple</field>
-			<field name="hash" xsi:type="xs:hexBinary">3166333837306265323734663663343962336533316130633637323839353766</field>
-			<field name="description">Apple Inc.</field>
-			<field name="isGlobal">0</field>
-		</row>
-		<row>
-			<field name="id">3</field>
-			<field name="name">Microsoft</field>
-			<field name="hash" xsi:type="xs:hexBinary">3566353332613366633466316561343033663337303730663539613761353361</field>
-			<field name="description">Microsoft Inc.</field>
-			<field name="isGlobal">1</field>
-		</row>
-	</table_data>
-	<table_data name="Tag">
-		<row>
-			<field name="id">1</field>
-			<field name="name">www</field>
-			<field name="hash" xsi:type="xs:hexBinary">3465616533356631623335393737613030656264383038366332353964346339</field>
-		</row>
-		<row>
-			<field name="id">2</field>
-			<field name="name">windows</field>
-			<field name="hash" xsi:type="xs:hexBinary">3066343133376564313530326235303435643630383361613235386235633432</field>
-		</row>
-		<row>
-			<field name="id">3</field>
-			<field name="name">Linux</field>
-			<field name="hash" xsi:type="xs:hexBinary">6532303661353465393736393063636535306363383732646437306565383936</field>
-		</row>
-	</table_data>
-	<table_data name="UserGroup">
-		<row>
-			<field name="id">1</field>
-			<field name="name">Admins</field>
-			<field name="description">sysPass Admins</field>
-		</row>
-		<row>
-			<field name="id">2</field>
-			<field name="name">Demo</field>
-			<field name="description"/>
-		</row>
-		<row>
-			<field name="id">3</field>
-			<field name="name">Usuarios</field>
-			<field name="description">Grupo Usuarios</field>
-		</row>
-	</table_data>
-	<table_data name="User">
-		<row>
-			<field name="id">1</field>
-			<field name="name">sysPass Admin</field>
-			<field name="userGroupId">1</field>
-			<field name="login">admin</field>
-			<field name="ssoLogin" xsi:nil="true" />
-			<field name="pass" xsi:type="xs:hexBinary">243279243130247635695230547A4933744E3036416A304C4A656B39755371496834356C70575539366E644A71444A704E6969713139306A444A486D</field>
-			<field name="mPass" xsi:type="xs:hexBinary">64656635303230306330383635633335373637316233366261353266333137346134356466333633626135656431613962323261356461353965376134373930356664656239373436356462373934613831373635316133316432626363636266663836626233353235643930333932393734323535663937316261616239656436346637383266363066646465386539336637363164356663633436393031356433363164333234643436633533633138313335613334663739633039</field>
-			<field name="mKey" xsi:type="xs:hexBinary">6465663130303030646566353032303062316163626161346361643036643237386562323533616462643433613966376463636439343063656265313962343061383436643464633035303636306466653630613561653139363433643636353936643733333764646236386536363930336562383031373764356463386430663963623661643361663565643766303936376262393964663530373936316330656132373462663830346333663966373563336538643539396336326231623738333730303963616263373836383637366433636337376162383365386338323335336335626164396534656535333532656132346632653434653663316336656131643162313264393332386335303539623437656235343534666138356435626437343637353333383132636662313230316634633635383733316465323934613664643035396332613362373333613765343462633539306338363337393032306662303263363262303565613030623234646235323566653863303263323138666561356661353139306563396266333461316637613937633733396637343534323333316466323932343965323138656338343233306161623038373336346463353236363935383630656638623232313439626262656636656266373030366638376434343661333535353863323062353462376336623330</field>
-			<field name="email" xsi:nil="true" />
-			<field name="notes" xsi:nil="true" />
-			<field name="loginCount">81</field>
-			<field name="userProfileId">1</field>
-			<field name="lastLogin">2018-04-19 23:46:48</field>
-			<field name="lastUpdate" xsi:nil="true" />
-			<field name="lastUpdateMPass">1521887152</field>
-			<field name="isAdminApp">1</field>
-			<field name="isAdminAcc">0</field>
-			<field name="isLdap">0</field>
-			<field name="isDisabled">0</field>
-			<field name="hashSalt"></field>
-			<field name="isMigrate">0</field>
-			<field name="isChangePass">0</field>
-			<field name="isChangedPass">0</field>
-			<field name="preferences" xsi:type="xs:hexBinary">4F3A33323A2253505C446174614D6F64656C5C55736572507265666572656E63657344617461223A31303A7B733A373A22757365725F6964223B693A313B733A363A22757365324661223B623A303B733A343A226C616E67223B733A353A22656E5F5553223B733A353A227468656D65223B733A31333A226D6174657269616C2D626C7565223B733A31343A22726573756C747350657250616765223B693A34383B733A31313A226163636F756E744C696E6B223B623A313B733A393A22736F72745669657773223B623A303B733A393A22746F704E6176626172223B623A303B733A31353A226F7074696F6E616C416374696F6E73223B623A303B733A31343A22726573756C747341734361726473223B623A303B7D</field>
-		</row>
-		<row>
-			<field name="id">2</field>
-			<field name="name">sysPass demo</field>
-			<field name="userGroupId">2</field>
-			<field name="login">demo</field>
-			<field name="ssoLogin">demo</field>
-			<field name="pass" xsi:type="xs:hexBinary">2432792431302454726E69756C5763754361433635346F76566F35392E766B4C5433414E31624A6D726A79553462696335325069436A6B5572396669</field>
-			<field name="mPass" xsi:type="xs:hexBinary">64656635303230303231616533353730373263373165626239393534353966366236636164373235336534316336633534353036336339326136653730616366333930393165373934613865376662386662326664333931383932363562396466303133333631623063323732323339653465373165343839313030646534326265633737623966343238396635633936613837646531343864313963653663643338613131343932623163313765653630326430623532343564346566</field>
-			<field name="mKey" xsi:type="xs:hexBinary">6465663130303030646566353032303035643534316262633462653032333563313338626561366561333536626436663037353365313035653030333563653166316235336534663364343565366262353335626163396639646538653131316262356334383865336535633637323333666632626365313837626335386135353839373535373034386564353634366361646638623736396132323164363032353435653034306264613135663138323638383665373536313236353361313037306530333261323365636364336339616438323162306363383962643130333035303931653965626332653935313465656631373462663339343664656132393661346262366264343463646333363361643335623032373561356633323430313936346531633131663937313764313139633130633561373161666332356365346534366661623234646663626362326237303964336335316532623834326464303933653230353965373265356638376363366236626239306231346265376264373637663163303937366231313362393630613265636565336633313131663538656131346139353736623332653163303962636435313366383733656664653062373333366238643464646637616237323333373038613264393965633738356139393036306135643262316366306262663739346262663765</field>
-			<field name="email">demo@syspass.org</field>
-			<field name="notes">aaaa</field>
-			<field name="loginCount">12</field>
-			<field name="userProfileId">2</field>
-			<field name="lastLogin">2018-04-01 21:29:47</field>
-			<field name="lastUpdate">2018-04-14 08:47:43</field>
-			<field name="lastUpdateMPass">1522582852</field>
-			<field name="isAdminApp">0</field>
-			<field name="isAdminAcc">0</field>
-			<field name="isLdap">0</field>
-			<field name="isDisabled">0</field>
-			<field name="hashSalt"></field>
-			<field name="isMigrate">0</field>
-			<field name="isChangePass">0</field>
-			<field name="isChangedPass">0</field>
-			<field name="preferences" xsi:nil="true" />
-		</row>
-		<row>
-			<field name="id">3</field>
-			<field name="name">User A</field>
-			<field name="userGroupId">2</field>
-			<field name="login">user_a</field>
-			<field name="ssoLogin">user_a</field>
-			<field name="pass" xsi:type="xs:hexBinary">2432792431302469444B442E2F4F624D79742E6F43594F5249514D5065624454783966744D636A703034365A435976662E765479597A594F6A4C472E</field>
-			<field name="mPass" xsi:nil="true" />
-			<field name="mKey" xsi:nil="true" />
-			<field name="email">user_a@syspass.org</field>
-			<field name="notes"></field>
-			<field name="loginCount">0</field>
-			<field name="userProfileId">1</field>
-			<field name="lastLogin" xsi:nil="true" />
-			<field name="lastUpdate">2018-04-14 08:48:08</field>
-			<field name="lastUpdateMPass">0</field>
-			<field name="isAdminApp">0</field>
-			<field name="isAdminAcc">0</field>
-			<field name="isLdap">0</field>
-			<field name="isDisabled">0</field>
-			<field name="hashSalt"></field>
-			<field name="isMigrate">0</field>
-			<field name="isChangePass">0</field>
-			<field name="isChangedPass">0</field>
-			<field name="preferences" xsi:nil="true" />
-		</row>
-		<row>
-			<field name="id">4</field>
-			<field name="name">User B</field>
-			<field name="userGroupId">2</field>
-			<field name="login">user_b</field>
-			<field name="ssoLogin" xsi:nil="true" />
-			<field name="pass" xsi:type="xs:hexBinary">243279243130244C37643658736A663955794F6E583662472E6F384E4F713961674B6F64536B4B5674485350462F6861414E657971517065372E6532</field>
-			<field name="mPass" xsi:nil="true" />
-			<field name="mKey" xsi:nil="true" />
-			<field name="email">user_b@syspass.org</field>
-			<field name="notes"></field>
-			<field name="loginCount">0</field>
-			<field name="userProfileId">1</field>
-			<field name="lastLogin" xsi:nil="true" />
-			<field name="lastUpdate">2018-03-30 18:38:32</field>
-			<field name="lastUpdateMPass">0</field>
-			<field name="isAdminApp">0</field>
-			<field name="isAdminAcc">0</field>
-			<field name="isLdap">0</field>
-			<field name="isDisabled">0</field>
-			<field name="hashSalt"></field>
-			<field name="isMigrate">0</field>
-			<field name="isChangePass">0</field>
-			<field name="isChangedPass">0</field>
-			<field name="preferences" xsi:nil="true" />
-		</row>
-	</table_data>
-	<table_data name="Account">
-	<row>
-		<field name="id">1</field>
-		<field name="userGroupId">1</field>
-		<field name="userId">1</field>
-		<field name="userEditId">1</field>
-		<field name="clientId">1</field>
-		<field name="name">Google</field>
-		<field name="categoryId">1</field>
-		<field name="login">admin</field>
-		<field name="url">http://google.com</field>
-		<field name="pass" xsi:type="xs:hexBinary">6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138</field>
-		<field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432</field>
-		<field name="notes">aaaa</field>
-		<field name="countView">341</field>
-		<field name="countDecrypt">35</field>
-		<field name="dateAdd">2018-03-25 09:54:07</field>
-		<field name="dateEdit">2018-04-02 21:38:25</field>
-		<field name="otherUserGroupEdit">0</field>
-		<field name="otherUserEdit">0</field>
-		<field name="isPrivate">0</field>
-		<field name="isPrivateGroup">0</field>
-		<field name="passDate">1522341709</field>
-		<field name="passDateChange">0</field>
-		<field name="parentId">0</field>
-	</row>
-    <row>
-        <field name="id">2</field>
-        <field name="userGroupId">1</field>
-        <field name="userId">1</field>
-        <field name="userEditId">1</field>
-        <field name="clientId">2</field>
-        <field name="name">Apple</field>
-        <field name="categoryId">2</field>
-        <field name="login">admin</field>
-        <field name="url">http://apple.com</field>
-        <field name="pass" xsi:type="xs:hexBinary">6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138</field>
-        <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432</field>
-        <field name="notes">bbbb</field>
-        <field name="countView">341</field>
-        <field name="countDecrypt">35</field>
-        <field name="dateAdd">2018-03-25 09:54:07</field>
-        <field name="dateEdit">2018-04-02 21:38:25</field>
-        <field name="otherUserGroupEdit">0</field>
-        <field name="otherUserEdit">0</field>
-        <field name="isPrivate">0</field>
-        <field name="isPrivateGroup">0</field>
-        <field name="passDate">1522341709</field>
-        <field name="passDateChange">0</field>
-        <field name="parentId">1</field>
-    </row>
-	</table_data>
-	<table_data name="AccountToFavorite">
-	</table_data>
-	<table_data name="AccountToTag">
-	<row>
-		<field name="accountId">1</field>
-		<field name="tagId">1</field>
-	</row>
-	</table_data>
-	<table_data name="AccountToUser">
-	<row>
-		<field name="accountId">1</field>
-		<field name="userId">3</field>
-		<field name="isEdit">1</field>
-	</row>
-    <row>
-        <field name="accountId">2</field>
-        <field name="userId">2</field>
-        <field name="isEdit">0</field>
-    </row>
-	</table_data>
-	<table_data name="AccountToUserGroup">
-        <row>
-            <field name="accountId">1</field>
-            <field name="userGroupId">2</field>
-            <field name="isEdit">1</field>
-        </row>
-        <row>
-            <field name="accountId">2</field>
-            <field name="userGroupId">2</field>
-            <field name="isEdit">0</field>
-        </row>
-	</table_data>
-	<table_data name="AccountHistory">
-		<row>
-			<field name="id">3</field>
-			<field name="accountId">2</field>
-			<field name="userGroupId">1</field>
-			<field name="userId">1</field>
-			<field name="userEditId">1</field>
-			<field name="clientId">1</field>
-			<field name="name">Google</field>
-			<field name="categoryId">1</field>
-			<field name="login">admin</field>
-			<field name="url">https://google.com</field>
-			<field name="pass" xsi:type="xs:hexBinary">646566353032303064396362643366376662646536326637663732663861383732623430613839386131643134333933663662623033316664343362366461643762626564643634386437363964346634616234386638336636653236396166623734636261383134313363626162326461393733343934613231653934666331616664633637313732316562356666396562646132613665313937626233333563613632383830393934333863643731333230383132316430366433303838</field>
-			<field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303032636635623034396437656539356531653838663166613438643061616132663133613163663766346238316165663837326134373665316461653661353865316666626438346130383166303062633138646136373265653935643234626564336565303063333262646262303433336633356534323263616337613238363532336233313666316137333462616337343839346631333632643863376430373861373862396135633064396239653061353537626562666336636566623766363166376330393734356461623536373762303436313865343936383434663932666364303634316330303935636239363938336361336631363161623134663339643536636233653938333833613062396464356365383736333334376364363933313563306436343362623937366139383831376632346431303364316533353133306262393862353034353262346334663934663162323531383632356530653331346438343430323362666334306264616265376437386238663632326535353338636537663431626261616461613138646333333662623762636565333030656565333734616537356365303131363731323239383132383964346634383661376635303136303835336138663335653366393230383632386162373332343335633037656432616234</field>
-			<field name="notes">blablacar</field>
-			<field name="countView">7</field>
-			<field name="countDecrypt">1</field>
-			<field name="dateAdd">2018-06-05 22:49:34</field>
-			<field name="dateEdit">2018-06-06 22:20:29</field>
-			<field name="isModify">1</field>
-			<field name="isDeleted">0</field>
-			<field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
-			<field name="otherUserEdit">0</field>
-			<field name="otherUserGroupEdit">0</field>
-			<field name="passDate" xsi:nil="true" />
-			<field name="passDateChange" xsi:nil="true" />
-			<field name="parentId" xsi:nil="true" />
-			<field name="isPrivate">0</field>
-			<field name="isPrivateGroup">0</field>
-		</row>
-		<row>
-			<field name="id">4</field>
-			<field name="accountId">1</field>
-			<field name="userGroupId">1</field>
-			<field name="userId">1</field>
-			<field name="userEditId">1</field>
-			<field name="clientId">1</field>
-			<field name="name">Google</field>
-			<field name="categoryId">1</field>
-			<field name="login">admin</field>
-			<field name="url">https://google.com</field>
-			<field name="pass" xsi:type="xs:hexBinary">64656635303230303864313263313434383662336363353938366164613564643563393465356664353138363635643062626362613938353236646336396662333833366537363635393931353336653262326533336339323232396663636336373139393662316631616432323839326539323332343633656164386262326234363033666565306630643666323364383337363661363363353139356334333330633139636634623664343131396362356136386232636332653465616232393561</field>
-			<field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303039326134383433323238376332636136626165313731363538316661316663393832356364653733316361623361316661343832646536626336663066646138623133323366396137626666643837386434623862633234653364363731626136613661393631343738633437653864626363656565333136343436346262623235623563633362663935363030653034346636326666636237303635343362333330616561363036336332383433383063303931383533653436616430396131393534653064393233643438313932393532646631353931623031333636356461373337646435653536623436653639396332613165363438653761623736653766383732653566376535623133303838666636663133313461376336353964373561386162323535346635653137626139626266396236363062613735306461313737626339303662316636633766343736383462346638353630356661663863323365646437393766333961303033666137653361366665383631373137613465333037366637393364356135326536646236363032663061373934373930383635336238616437333839646338653738383930303234633561623365336431373836396261626630363234326661306165663138396163376138616636313636323037313930333762666565</field>
-			<field name="notes"></field>
-			<field name="countView">11</field>
-			<field name="countDecrypt">0</field>
-			<field name="dateAdd">2018-06-05 22:11:40</field>
-			<field name="dateEdit" xsi:nil="true" />
-			<field name="isModify">1</field>
-			<field name="isDeleted">0</field>
-			<field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
-			<field name="otherUserEdit">0</field>
-			<field name="otherUserGroupEdit">0</field>
-			<field name="passDate" xsi:nil="true" />
-			<field name="passDateChange" xsi:nil="true" />
-			<field name="parentId" xsi:nil="true" />
-			<field name="isPrivate">0</field>
-			<field name="isPrivateGroup">0</field>
-		</row>
-		<row>
-			<field name="id">5</field>
-			<field name="accountId">1</field>
-			<field name="userGroupId">1</field>
-			<field name="userId">1</field>
-			<field name="userEditId">1</field>
-			<field name="clientId">1</field>
-			<field name="name">Google</field>
-			<field name="categoryId">1</field>
-			<field name="login">admin</field>
-			<field name="url">https://google.com</field>
-			<field name="pass" xsi:type="xs:hexBinary">64656635303230303864313263313434383662336363353938366164613564643563393465356664353138363635643062626362613938353236646336396662333833366537363635393931353336653262326533336339323232396663636336373139393662316631616432323839326539323332343633656164386262326234363033666565306630643666323364383337363661363363353139356334333330633139636634623664343131396362356136386232636332653465616232393561</field>
-			<field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303039326134383433323238376332636136626165313731363538316661316663393832356364653733316361623361316661343832646536626336663066646138623133323366396137626666643837386434623862633234653364363731626136613661393631343738633437653864626363656565333136343436346262623235623563633362663935363030653034346636326666636237303635343362333330616561363036336332383433383063303931383533653436616430396131393534653064393233643438313932393532646631353931623031333636356461373337646435653536623436653639396332613165363438653761623736653766383732653566376535623133303838666636663133313461376336353964373561386162323535346635653137626139626266396236363062613735306461313737626339303662316636633766343736383462346638353630356661663863323365646437393766333961303033666137653361366665383631373137613465333037366637393364356135326536646236363032663061373934373930383635336238616437333839646338653738383930303234633561623365336431373836396261626630363234326661306165663138396163376138616636313636323037313930333762666565</field>
-			<field name="notes"></field>
-			<field name="countView">11</field>
-			<field name="countDecrypt">0</field>
-			<field name="dateAdd">2018-06-05 22:11:40</field>
-			<field name="dateEdit">2018-06-13 20:13:53</field>
-			<field name="isModify">1</field>
-			<field name="isDeleted">0</field>
-			<field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
-			<field name="otherUserEdit">0</field>
-			<field name="otherUserGroupEdit">0</field>
-			<field name="passDate" xsi:nil="true" />
-			<field name="passDateChange" xsi:nil="true" />
-			<field name="parentId" xsi:nil="true" />
-			<field name="isPrivate">0</field>
-			<field name="isPrivateGroup">0</field>
-		</row>
-		<row>
-			<field name="id">6</field>
-			<field name="accountId">1</field>
-			<field name="userGroupId">1</field>
-			<field name="userId">1</field>
-			<field name="userEditId">1</field>
-			<field name="clientId">1</field>
-			<field name="name">Google</field>
-			<field name="categoryId">1</field>
-			<field name="login">admin</field>
-			<field name="url">https://google.com</field>
-			<field name="pass" xsi:type="xs:hexBinary">64656635303230303864313263313434383662336363353938366164613564643563393465356664353138363635643062626362613938353236646336396662333833366537363635393931353336653262326533336339323232396663636336373139393662316631616432323839326539323332343633656164386262326234363033666565306630643666323364383337363661363363353139356334333330633139636634623664343131396362356136386232636332653465616232393561</field>
-			<field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303039326134383433323238376332636136626165313731363538316661316663393832356364653733316361623361316661343832646536626336663066646138623133323366396137626666643837386434623862633234653364363731626136613661393631343738633437653864626363656565333136343436346262623235623563633362663935363030653034346636326666636237303635343362333330616561363036336332383433383063303931383533653436616430396131393534653064393233643438313932393532646631353931623031333636356461373337646435653536623436653639396332613165363438653761623736653766383732653566376535623133303838666636663133313461376336353964373561386162323535346635653137626139626266396236363062613735306461313737626339303662316636633766343736383462346638353630356661663863323365646437393766333961303033666137653361366665383631373137613465333037366637393364356135326536646236363032663061373934373930383635336238616437333839646338653738383930303234633561623365336431373836396261626630363234326661306165663138396163376138616636313636323037313930333762666565</field>
-			<field name="notes"></field>
-			<field name="countView">11</field>
-			<field name="countDecrypt">0</field>
-			<field name="dateAdd">2018-06-05 22:11:40</field>
-			<field name="dateEdit">2018-06-13 20:13:58</field>
-			<field name="isModify">1</field>
-			<field name="isDeleted">0</field>
-			<field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
-			<field name="otherUserEdit">0</field>
-			<field name="otherUserGroupEdit">0</field>
-			<field name="passDate" xsi:nil="true" />
-			<field name="passDateChange" xsi:nil="true" />
-			<field name="parentId" xsi:nil="true" />
-			<field name="isPrivate">0</field>
-			<field name="isPrivateGroup">0</field>
-		</row>
-		<row>
-			<field name="id">7</field>
-			<field name="accountId">1</field>
-			<field name="userGroupId">1</field>
-			<field name="userId">1</field>
-			<field name="userEditId">1</field>
-			<field name="clientId">1</field>
-			<field name="name">Google</field>
-			<field name="categoryId">1</field>
-			<field name="login">admin</field>
-			<field name="url">https://google.com</field>
-			<field name="pass" xsi:type="xs:hexBinary">64656635303230303864313263313434383662336363353938366164613564643563393465356664353138363635643062626362613938353236646336396662333833366537363635393931353336653262326533336339323232396663636336373139393662316631616432323839326539323332343633656164386262326234363033666565306630643666323364383337363661363363353139356334333330633139636634623664343131396362356136386232636332653465616232393561</field>
-			<field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303039326134383433323238376332636136626165313731363538316661316663393832356364653733316361623361316661343832646536626336663066646138623133323366396137626666643837386434623862633234653364363731626136613661393631343738633437653864626363656565333136343436346262623235623563633362663935363030653034346636326666636237303635343362333330616561363036336332383433383063303931383533653436616430396131393534653064393233643438313932393532646631353931623031333636356461373337646435653536623436653639396332613165363438653761623736653766383732653566376535623133303838666636663133313461376336353964373561386162323535346635653137626139626266396236363062613735306461313737626339303662316636633766343736383462346638353630356661663863323365646437393766333961303033666137653361366665383631373137613465333037366637393364356135326536646236363032663061373934373930383635336238616437333839646338653738383930303234633561623365336431373836396261626630363234326661306165663138396163376138616636313636323037313930333762666565</field>
-			<field name="notes"></field>
-			<field name="countView">11</field>
-			<field name="countDecrypt">0</field>
-			<field name="dateAdd">2018-06-05 22:11:40</field>
-			<field name="dateEdit">2018-06-13 20:14:23</field>
-			<field name="isModify">1</field>
-			<field name="isDeleted">0</field>
-			<field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
-			<field name="otherUserEdit">0</field>
-			<field name="otherUserGroupEdit">0</field>
-			<field name="passDate" xsi:nil="true" />
-			<field name="passDateChange" xsi:nil="true" />
-			<field name="parentId" xsi:nil="true" />
-			<field name="isPrivate">0</field>
-			<field name="isPrivateGroup">0</field>
-		</row>
-	</table_data>
-	<table_data name="ItemPreset"/>
-</database>
-</mysqldump>
diff --git a/tests/res/datasets/syspass_accountAcl.xml b/tests/res/datasets/syspass_accountAcl.xml
deleted file mode 100644
index 59d0db8b..00000000
--- a/tests/res/datasets/syspass_accountAcl.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0"?>
-<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <database name="syspass">
-        <table_data name="UserGroup">
-            <row>
-                <field name="id">1</field>
-                <field name="name">Admins</field>
-                <field name="description">sysPass Admins</field>
-            </row>
-            <row>
-                <field name="id">2</field>
-                <field name="name">Demo</field>
-                <field name="description"/>
-            </row>
-            <row>
-                <field name="id">3</field>
-                <field name="name">Usuarios</field>
-                <field name="description">Grupo Usuarios</field>
-            </row>
-            <row>
-                <field name="id">4</field>
-                <field name="name">Operadores</field>
-                <field name="description">Grupo Operadores</field>
-            </row>
-        </table_data>
-        <table_data name="User">
-            <row>
-                <field name="id">1</field>
-                <field name="name">sysPass Admin</field>
-                <field name="userGroupId">1</field>
-                <field name="login">admin</field>
-                <field name="ssoLogin" xsi:nil="true" />
-                <field name="pass" xsi:type="xs:hexBinary">243279243130247635695230547A4933744E3036416A304C4A656B39755371496834356C70575539366E644A71444A704E6969713139306A444A486D</field>
-                <field name="mPass" xsi:type="xs:hexBinary">64656635303230306330383635633335373637316233366261353266333137346134356466333633626135656431613962323261356461353965376134373930356664656239373436356462373934613831373635316133316432626363636266663836626233353235643930333932393734323535663937316261616239656436346637383266363066646465386539336637363164356663633436393031356433363164333234643436633533633138313335613334663739633039</field>
-                <field name="mKey" xsi:type="xs:hexBinary">6465663130303030646566353032303062316163626161346361643036643237386562323533616462643433613966376463636439343063656265313962343061383436643464633035303636306466653630613561653139363433643636353936643733333764646236386536363930336562383031373764356463386430663963623661643361663565643766303936376262393964663530373936316330656132373462663830346333663966373563336538643539396336326231623738333730303963616263373836383637366433636337376162383365386338323335336335626164396534656535333532656132346632653434653663316336656131643162313264393332386335303539623437656235343534666138356435626437343637353333383132636662313230316634633635383733316465323934613664643035396332613362373333613765343462633539306338363337393032306662303263363262303565613030623234646235323566653863303263323138666561356661353139306563396266333461316637613937633733396637343534323333316466323932343965323138656338343233306161623038373336346463353236363935383630656638623232313439626262656636656266373030366638376434343661333535353863323062353462376336623330</field>
-                <field name="email" xsi:nil="true" />
-                <field name="loginCount">81</field>
-                <field name="userProfileId">1</field>
-                <field name="lastLogin">2018-04-19 23:46:48</field>
-                <field name="lastUpdateMPass">1521887152</field>
-                <field name="isAdminApp">1</field>
-                <field name="isAdminAcc">0</field>
-                <field name="hashSalt"></field>
-            </row>
-            <row>
-                <field name="id">2</field>
-                <field name="name">sysPass demo</field>
-                <field name="userGroupId">2</field>
-                <field name="login">demo</field>
-                <field name="ssoLogin">demo</field>
-                <field name="pass" xsi:type="xs:hexBinary">2432792431302454726E69756C5763754361433635346F76566F35392E766B4C5433414E31624A6D726A79553462696335325069436A6B5572396669</field>
-                <field name="mPass" xsi:type="xs:hexBinary">64656635303230303231616533353730373263373165626239393534353966366236636164373235336534316336633534353036336339326136653730616366333930393165373934613865376662386662326664333931383932363562396466303133333631623063323732323339653465373165343839313030646534326265633737623966343238396635633936613837646531343864313963653663643338613131343932623163313765653630326430623532343564346566</field>
-                <field name="mKey" xsi:type="xs:hexBinary">6465663130303030646566353032303035643534316262633462653032333563313338626561366561333536626436663037353365313035653030333563653166316235336534663364343565366262353335626163396639646538653131316262356334383865336535633637323333666632626365313837626335386135353839373535373034386564353634366361646638623736396132323164363032353435653034306264613135663138323638383665373536313236353361313037306530333261323365636364336339616438323162306363383962643130333035303931653965626332653935313465656631373462663339343664656132393661346262366264343463646333363361643335623032373561356633323430313936346531633131663937313764313139633130633561373161666332356365346534366661623234646663626362326237303964336335316532623834326464303933653230353965373265356638376363366236626239306231346265376264373637663163303937366231313362393630613265636565336633313131663538656131346139353736623332653163303962636435313366383733656664653062373333366238643464646637616237323333373038613264393965633738356139393036306135643262316366306262663739346262663765</field>
-                <field name="email">demo@syspass.org</field>
-                <field name="loginCount">12</field>
-                <field name="userProfileId">2</field>
-                <field name="lastLogin">2018-04-01 21:29:47</field>
-                <field name="lastUpdateMPass">1522582852</field>
-                <field name="isAdminApp">0</field>
-                <field name="isAdminAcc">0</field>
-                <field name="hashSalt"></field>
-            </row>
-            <row>
-                <field name="id">3</field>
-                <field name="name">User A</field>
-                <field name="userGroupId">3</field>
-                <field name="login">user_a</field>
-                <field name="ssoLogin">user_a</field>
-                <field name="pass" xsi:type="xs:hexBinary">2432792431302469444B442E2F4F624D79742E6F43594F5249514D5065624454783966744D636A703034365A435976662E765479597A594F6A4C472E</field>
-                <field name="mPass" xsi:nil="true" />
-                <field name="mKey" xsi:nil="true" />
-                <field name="email">user_a@syspass.org</field>
-                <field name="loginCount">0</field>
-                <field name="userProfileId">1</field>
-                <field name="lastLogin" xsi:nil="true" />
-                <field name="lastUpdateMPass">0</field>
-                <field name="isAdminApp">0</field>
-                <field name="isAdminAcc">0</field>
-                <field name="hashSalt"></field>
-            </row>
-            <row>
-                <field name="id">4</field>
-                <field name="name">User B</field>
-                <field name="userGroupId">3</field>
-                <field name="login">user_b</field>
-                <field name="ssoLogin" xsi:nil="true" />
-                <field name="pass" xsi:type="xs:hexBinary">243279243130244C37643658736A663955794F6E583662472E6F384E4F713961674B6F64536B4B5674485350462F6861414E657971517065372E6532</field>
-                <field name="mPass" xsi:nil="true" />
-                <field name="mKey" xsi:nil="true" />
-                <field name="email">user_b@syspass.org</field>
-                <field name="loginCount">0</field>
-                <field name="userProfileId">1</field>
-                <field name="lastLogin" xsi:nil="true" />
-                <field name="lastUpdateMPass">0</field>
-                <field name="isAdminApp">0</field>
-                <field name="isAdminAcc">0</field>
-                <field name="hashSalt"></field>
-            </row>
-            <row>
-                <field name="id">5</field>
-                <field name="name">User C</field>
-                <field name="userGroupId">4</field>
-                <field name="login">user_c</field>
-                <field name="ssoLogin" xsi:nil="true" />
-                <field name="pass" xsi:type="xs:hexBinary">243279243130244C37643658736A663955794F6E583662472E6F384E4F713961674B6F64536B4B5674485350462F6861414E657971517065372E6532</field>
-                <field name="mPass" xsi:nil="true" />
-                <field name="mKey" xsi:nil="true" />
-                <field name="email">user_c@syspass.org</field>
-                <field name="loginCount">0</field>
-                <field name="userProfileId">1</field>
-                <field name="lastLogin" xsi:nil="true" />
-                <field name="lastUpdateMPass">0</field>
-                <field name="isAdminApp">0</field>
-                <field name="isAdminAcc">1</field>
-                <field name="hashSalt"></field>
-            </row>
-        </table_data>
-        <table_data name="Account">
-            <row>
-                <field name="id">1</field>
-                <field name="userGroupId">1</field>
-                <field name="userId">1</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">1</field>
-                <field name="name">Google</field>
-                <field name="categoryId">1</field>
-                <field name="login">admin</field>
-                <field name="url">http://google.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432</field>
-                <field name="notes">aaaa</field>
-                <field name="countView">341</field>
-                <field name="countDecrypt">35</field>
-                <field name="dateAdd">2018-03-25 09:54:07</field>
-                <field name="dateEdit">2018-04-02 21:38:25</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="otherUserEdit">0</field>
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-                <field name="passDate">1522341709</field>
-                <field name="passDateChange">0</field>
-                <field name="parentId">0</field>
-            </row>
-            <row>
-                <field name="id">2</field>
-                <field name="userGroupId">2</field>
-                <field name="userId">2</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">2</field>
-                <field name="name">Apple</field>
-                <field name="categoryId">2</field>
-                <field name="login">admin</field>
-                <field name="url">http://apple.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432</field>
-                <field name="notes">bbbb</field>
-                <field name="countView">341</field>
-                <field name="countDecrypt">35</field>
-                <field name="dateAdd">2018-03-25 09:54:07</field>
-                <field name="dateEdit">2018-04-02 21:38:25</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="otherUserEdit">0</field>
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-                <field name="passDate">1522341709</field>
-                <field name="passDateChange">0</field>
-                <field name="parentId">0</field>
-            </row>
-        </table_data>
-        <table_data name="AccountToUser">
-            <row>
-                <field name="accountId">1</field>
-                <field name="userId">3</field>
-                <field name="isEdit">1</field>
-            </row>
-            <row>
-                <field name="accountId">2</field>
-                <field name="userId">3</field>
-                <field name="isEdit">0</field>
-            </row>
-        </table_data>
-        <table_data name="AccountToUserGroup">
-            <row>
-                <field name="accountId">1</field>
-                <field name="userGroupId">2</field>
-                <field name="isEdit">1</field>
-            </row>
-            <row>
-                <field name="accountId">2</field>
-                <field name="userGroupId">3</field>
-                <field name="isEdit">0</field>
-            </row>
-        </table_data>
-        <table_data name="UserToUserGroup">
-            <row>
-                <field name="userId">1</field>
-                <field name="userGroupId">2</field>
-            </row>
-            <row>
-                <field name="userId">3</field>
-                <field name="userGroupId">2</field>
-            </row>
-            <row>
-                <field name="userId">2</field>
-                <field name="userGroupId">1</field>
-            </row>
-        </table_data>
-    </database>
-</mysqldump>
diff --git a/tests/res/datasets/syspass_accountCrypt.xml b/tests/res/datasets/syspass_accountCrypt.xml
deleted file mode 100644
index 4de243c7..00000000
--- a/tests/res/datasets/syspass_accountCrypt.xml
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0"?>
-<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <database name="syspass">
-        <table_data name="Account">
-            <row>
-                <field name="id">1</field>
-                <field name="userGroupId">1</field>
-                <field name="userId">1</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">1</field>
-                <field name="name">Google</field>
-                <field name="categoryId">1</field>
-                <field name="login">admin</field>
-                <field name="url">http://google.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432</field>
-                <field name="notes">aaaa</field>
-                <field name="countView">341</field>
-                <field name="countDecrypt">35</field>
-                <field name="dateAdd">2018-03-25 09:54:07</field>
-                <field name="dateEdit">2018-04-02 21:38:25</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="otherUserEdit">0</field>
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-                <field name="passDate">1522341709</field>
-                <field name="passDateChange">0</field>
-                <field name="parentId">0</field>
-            </row>
-            <row>
-                <field name="id">2</field>
-                <field name="userGroupId">2</field>
-                <field name="userId">2</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">2</field>
-                <field name="name">Apple</field>
-                <field name="categoryId">2</field>
-                <field name="login">admin</field>
-                <field name="url">http://apple.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432</field>
-                <field name="notes">bbbb</field>
-                <field name="countView">341</field>
-                <field name="countDecrypt">35</field>
-                <field name="dateAdd">2018-03-25 09:54:07</field>
-                <field name="dateEdit">2018-04-02 21:38:25</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="otherUserEdit">0</field>
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-                <field name="passDate">1522341709</field>
-                <field name="passDateChange">0</field>
-                <field name="parentId">0</field>
-            </row>
-        </table_data>
-        <table_data name="AccountHistory">
-            <row>
-                <field name="id">3</field>
-                <field name="accountId">2</field>
-                <field name="userGroupId">1</field>
-                <field name="userId">1</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">1</field>
-                <field name="name">Google</field>
-                <field name="categoryId">1</field>
-                <field name="login">admin</field>
-                <field name="url">https://google.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">646566353032303064396362643366376662646536326637663732663861383732623430613839386131643134333933663662623033316664343362366461643762626564643634386437363964346634616234386638336636653236396166623734636261383134313363626162326461393733343934613231653934666331616664633637313732316562356666396562646132613665313937626233333563613632383830393934333863643731333230383132316430366433303838</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303032636635623034396437656539356531653838663166613438643061616132663133613163663766346238316165663837326134373665316461653661353865316666626438346130383166303062633138646136373265653935643234626564336565303063333262646262303433336633356534323263616337613238363532336233313666316137333462616337343839346631333632643863376430373861373862396135633064396239653061353537626562666336636566623766363166376330393734356461623536373762303436313865343936383434663932666364303634316330303935636239363938336361336631363161623134663339643536636233653938333833613062396464356365383736333334376364363933313563306436343362623937366139383831376632346431303364316533353133306262393862353034353262346334663934663162323531383632356530653331346438343430323362666334306264616265376437386238663632326535353338636537663431626261616461613138646333333662623762636565333030656565333734616537356365303131363731323239383132383964346634383661376635303136303835336138663335653366393230383632386162373332343335633037656432616234</field>
-                <field name="notes">blablacar</field>
-                <field name="countView">7</field>
-                <field name="countDecrypt">1</field>
-                <field name="dateAdd">2018-06-05 22:49:34</field>
-                <field name="dateEdit">2018-06-06 22:20:29</field>
-                <field name="isModify">1</field>
-                <field name="isDeleted">0</field>
-                <field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
-                <field name="otherUserEdit">0</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="passDate" xsi:nil="true" />
-                <field name="passDateChange" xsi:nil="true" />
-                <field name="parentId" xsi:nil="true" />
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-            </row>
-            <row>
-                <field name="id">4</field>
-                <field name="accountId">1</field>
-                <field name="userGroupId">1</field>
-                <field name="userId">1</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">1</field>
-                <field name="name">Google</field>
-                <field name="categoryId">1</field>
-                <field name="login">admin</field>
-                <field name="url">https://google.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">64656635303230303864313263313434383662336363353938366164613564643563393465356664353138363635643062626362613938353236646336396662333833366537363635393931353336653262326533336339323232396663636336373139393662316631616432323839326539323332343633656164386262326234363033666565306630643666323364383337363661363363353139356334333330633139636634623664343131396362356136386232636332653465616232393561</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303039326134383433323238376332636136626165313731363538316661316663393832356364653733316361623361316661343832646536626336663066646138623133323366396137626666643837386434623862633234653364363731626136613661393631343738633437653864626363656565333136343436346262623235623563633362663935363030653034346636326666636237303635343362333330616561363036336332383433383063303931383533653436616430396131393534653064393233643438313932393532646631353931623031333636356461373337646435653536623436653639396332613165363438653761623736653766383732653566376535623133303838666636663133313461376336353964373561386162323535346635653137626139626266396236363062613735306461313737626339303662316636633766343736383462346638353630356661663863323365646437393766333961303033666137653361366665383631373137613465333037366637393364356135326536646236363032663061373934373930383635336238616437333839646338653738383930303234633561623365336431373836396261626630363234326661306165663138396163376138616636313636323037313930333762666565</field>
-                <field name="notes"></field>
-                <field name="countView">11</field>
-                <field name="countDecrypt">0</field>
-                <field name="dateAdd">2018-06-05 22:11:40</field>
-                <field name="dateEdit" xsi:nil="true" />
-                <field name="isModify">1</field>
-                <field name="isDeleted">0</field>
-                <field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
-                <field name="otherUserEdit">0</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="passDate" xsi:nil="true" />
-                <field name="passDateChange" xsi:nil="true" />
-                <field name="parentId" xsi:nil="true" />
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-            </row>
-            <row>
-                <field name="id">5</field>
-                <field name="accountId">1</field>
-                <field name="userGroupId">1</field>
-                <field name="userId">1</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">1</field>
-                <field name="name">Google</field>
-                <field name="categoryId">1</field>
-                <field name="login">admin</field>
-                <field name="url">https://google.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">64656635303230303864313263313434383662336363353938366164613564643563393465356664353138363635643062626362613938353236646336396662333833366537363635393931353336653262326533336339323232396663636336373139393662316631616432323839326539323332343633656164386262326234363033666565306630643666323364383337363661363363353139356334333330633139636634623664343131396362356136386232636332653465616232393561</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303039326134383433323238376332636136626165313731363538316661316663393832356364653733316361623361316661343832646536626336663066646138623133323366396137626666643837386434623862633234653364363731626136613661393631343738633437653864626363656565333136343436346262623235623563633362663935363030653034346636326666636237303635343362333330616561363036336332383433383063303931383533653436616430396131393534653064393233643438313932393532646631353931623031333636356461373337646435653536623436653639396332613165363438653761623736653766383732653566376535623133303838666636663133313461376336353964373561386162323535346635653137626139626266396236363062613735306461313737626339303662316636633766343736383462346638353630356661663863323365646437393766333961303033666137653361366665383631373137613465333037366637393364356135326536646236363032663061373934373930383635336238616437333839646338653738383930303234633561623365336431373836396261626630363234326661306165663138396163376138616636313636323037313930333762666565</field>
-                <field name="notes"></field>
-                <field name="countView">11</field>
-                <field name="countDecrypt">0</field>
-                <field name="dateAdd">2018-06-05 22:11:40</field>
-                <field name="dateEdit">2018-06-13 20:13:53</field>
-                <field name="isModify">1</field>
-                <field name="isDeleted">0</field>
-                <field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
-                <field name="otherUserEdit">0</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="passDate" xsi:nil="true" />
-                <field name="passDateChange" xsi:nil="true" />
-                <field name="parentId" xsi:nil="true" />
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-            </row>
-            <row>
-                <field name="id">6</field>
-                <field name="accountId">1</field>
-                <field name="userGroupId">1</field>
-                <field name="userId">1</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">1</field>
-                <field name="name">Google</field>
-                <field name="categoryId">1</field>
-                <field name="login">admin</field>
-                <field name="url">https://google.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">64656635303230303864313263313434383662336363353938366164613564643563393465356664353138363635643062626362613938353236646336396662333833366537363635393931353336653262326533336339323232396663636336373139393662316631616432323839326539323332343633656164386262326234363033666565306630643666323364383337363661363363353139356334333330633139636634623664343131396362356136386232636332653465616232393561</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303039326134383433323238376332636136626165313731363538316661316663393832356364653733316361623361316661343832646536626336663066646138623133323366396137626666643837386434623862633234653364363731626136613661393631343738633437653864626363656565333136343436346262623235623563633362663935363030653034346636326666636237303635343362333330616561363036336332383433383063303931383533653436616430396131393534653064393233643438313932393532646631353931623031333636356461373337646435653536623436653639396332613165363438653761623736653766383732653566376535623133303838666636663133313461376336353964373561386162323535346635653137626139626266396236363062613735306461313737626339303662316636633766343736383462346638353630356661663863323365646437393766333961303033666137653361366665383631373137613465333037366637393364356135326536646236363032663061373934373930383635336238616437333839646338653738383930303234633561623365336431373836396261626630363234326661306165663138396163376138616636313636323037313930333762666565</field>
-                <field name="notes"></field>
-                <field name="countView">11</field>
-                <field name="countDecrypt">0</field>
-                <field name="dateAdd">2018-06-05 22:11:40</field>
-                <field name="dateEdit">2018-06-13 20:13:58</field>
-                <field name="isModify">1</field>
-                <field name="isDeleted">0</field>
-                <field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
-                <field name="otherUserEdit">0</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="passDate" xsi:nil="true" />
-                <field name="passDateChange" xsi:nil="true" />
-                <field name="parentId" xsi:nil="true" />
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-            </row>
-            <row>
-                <field name="id">7</field>
-                <field name="accountId">1</field>
-                <field name="userGroupId">1</field>
-                <field name="userId">1</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">1</field>
-                <field name="name">Google</field>
-                <field name="categoryId">1</field>
-                <field name="login">admin</field>
-                <field name="url">https://google.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">64656635303230303864313263313434383662336363353938366164613564643563393465356664353138363635643062626362613938353236646336396662333833366537363635393931353336653262326533336339323232396663636336373139393662316631616432323839326539323332343633656164386262326234363033666565306630643666323364383337363661363363353139356334333330633139636634623664343131396362356136386232636332653465616232393561</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303039326134383433323238376332636136626165313731363538316661316663393832356364653733316361623361316661343832646536626336663066646138623133323366396137626666643837386434623862633234653364363731626136613661393631343738633437653864626363656565333136343436346262623235623563633362663935363030653034346636326666636237303635343362333330616561363036336332383433383063303931383533653436616430396131393534653064393233643438313932393532646631353931623031333636356461373337646435653536623436653639396332613165363438653761623736653766383732653566376535623133303838666636663133313461376336353964373561386162323535346635653137626139626266396236363062613735306461313737626339303662316636633766343736383462346638353630356661663863323365646437393766333961303033666137653361366665383631373137613465333037366637393364356135326536646236363032663061373934373930383635336238616437333839646338653738383930303234633561623365336431373836396261626630363234326661306165663138396163376138616636313636323037313930333762666565</field>
-                <field name="notes"></field>
-                <field name="countView">11</field>
-                <field name="countDecrypt">0</field>
-                <field name="dateAdd">2018-06-05 22:11:40</field>
-                <field name="dateEdit">2018-06-13 20:14:23</field>
-                <field name="isModify">1</field>
-                <field name="isDeleted">0</field>
-                <field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
-                <field name="otherUserEdit">0</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="passDate" xsi:nil="true" />
-                <field name="passDateChange" xsi:nil="true" />
-                <field name="parentId" xsi:nil="true" />
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-            </row>
-        </table_data>
-        <table_data name="CustomFieldData">
-            <row>
-                <field name="id">1</field>
-                <field name="moduleId">10</field>
-                <field name="itemId">1</field>
-                <field name="definitionId">1</field>
-                <field name="data" xsi:type="xs:hexBinary">6465663530323030633262353536613539613465333330646461323833363730363462623861326463336630643963386565333935366134326631326135326261323035633036663063313933313263626465353630396562303133356364613461353738636534616263323436343235613739343338663461393231353433623437633062386134363566336466663131373061613162663532356466646434383165613664333763303537396132</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303061356237393366343238663337393936356539393836656663363632396332613462336662323431666131343731326332333138323465376632366639313863383663653164636330393838333735343463326237316232383361663135633731363438326630303863313135326563623238383939313939346139376165613836623432613534333166383261343734343565636336376137643462633266396263343065653162333236343030373163333334386338626331613632323165613534346433396630636537343538356561653432376266373131633864366237336166316561613237623630643863626631643531666636366133366562636364353232643538633734653664626363613534646334366662303739626631653537626530646231643363316464313264303139633665663437633366353431303231633233376639303066333633323838613864346464393463323637306365313239393864626237396235333262623266383330323164663062656631326138363664646132343132653338333535636137646465613364336663366535303532346634653961313435366466313034626238376433633532353837643036613162383066613361613064643330633866356239373338663930336535653432653362363333333739333863</field>
-            </row>
-            <row>
-                <field name="id">2</field>
-                <field name="moduleId">61</field>
-                <field name="itemId">1</field>
-                <field name="definitionId">2</field>
-                <field name="data" xsi:type="xs:hexBinary">4C6F72656D20697073756D20646F6C6F722073697420616D65742C20636F6E73656374657475722061646970697363696E6720656C69742E205365642075742074696E636964756E74206C6F72656D2E205072616573656E74207665686963756C6120766F6C7574706174206C696265726F2073697420616D65742066617563696275732E2041656E65616E20766974616520617263752071756973206C616375732070756C76696E617220737573636970697420617420656765742074656C6C75732E204E616D2066656C6973207475727069732C207363656C657269737175652075742066656C69732061632C2074696E636964756E74206D6178696D7573206D692E205365642076756C7075746174652076697461652073656D20616320736F6C6C696369747564696E2E20446F6E6563206672696E67696C6C61206C6F626F7274697320657820657520706F72747469746F722E20457469616D2073656D70657220736F6C6C696369747564696E207665686963756C612E20467573636520766172697573206E756C6C61206D657475732C206E65632076697665727261206E696268206469676E697373696D2069642E</field>
-                <field name="key" xsi:nil="true" />
-            </row>
-        </table_data>
-        <table_data name="Config">
-            <row>
-                <field name="parameter">lastupdatempass</field>
-                <field name="VALUE">1528236611</field>
-            </row>
-            <row>
-                <field name="parameter">masterPwd</field>
-                <field name="VALUE">$2y$10$xtsuN2PUvgSH/0mrfBlsbOActVgCjYcqDqC6L3T9QraNxZC4RXGYa</field>
-            </row>
-        </table_data>
-    </database>
-</mysqldump>
diff --git a/tests/res/datasets/syspass_accountFavorite.xml b/tests/res/datasets/syspass_accountFavorite.xml
deleted file mode 100644
index 39be382e..00000000
--- a/tests/res/datasets/syspass_accountFavorite.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<mysqldump>
-<database name="syspass">
-    <table_data name="User">
-        <row>
-            <field name="id">1</field>
-            <field name="name">sysPass Admin</field>
-            <field name="userGroupId">1</field>
-            <field name="login">admin</field>
-            <field name="ssoLogin" xsi:nil="true" />
-            <field name="pass" xsi:type="xs:hexBinary">243279243130247635695230547A4933744E3036416A304C4A656B39755371496834356C70575539366E644A71444A704E6969713139306A444A486D</field>
-            <field name="mPass" xsi:type="xs:hexBinary">64656635303230306330383635633335373637316233366261353266333137346134356466333633626135656431613962323261356461353965376134373930356664656239373436356462373934613831373635316133316432626363636266663836626233353235643930333932393734323535663937316261616239656436346637383266363066646465386539336637363164356663633436393031356433363164333234643436633533633138313335613334663739633039</field>
-            <field name="mKey" xsi:type="xs:hexBinary">6465663130303030646566353032303062316163626161346361643036643237386562323533616462643433613966376463636439343063656265313962343061383436643464633035303636306466653630613561653139363433643636353936643733333764646236386536363930336562383031373764356463386430663963623661643361663565643766303936376262393964663530373936316330656132373462663830346333663966373563336538643539396336326231623738333730303963616263373836383637366433636337376162383365386338323335336335626164396534656535333532656132346632653434653663316336656131643162313264393332386335303539623437656235343534666138356435626437343637353333383132636662313230316634633635383733316465323934613664643035396332613362373333613765343462633539306338363337393032306662303263363262303565613030623234646235323566653863303263323138666561356661353139306563396266333461316637613937633733396637343534323333316466323932343965323138656338343233306161623038373336346463353236363935383630656638623232313439626262656636656266373030366638376434343661333535353863323062353462376336623330</field>
-            <field name="email" xsi:nil="true" />
-            <field name="notes" xsi:nil="true" />
-            <field name="loginCount">81</field>
-            <field name="userProfileId">1</field>
-            <field name="lastLogin">2018-04-19 23:46:48</field>
-            <field name="lastUpdate">2018-04-19 23:46:48</field>
-            <field name="lastUpdateMPass">1521887152</field>
-            <field name="isAdminApp">1</field>
-            <field name="isAdminAcc">0</field>
-            <field name="isLdap">0</field>
-            <field name="isDisabled">0</field>
-            <field name="hashSalt"></field>
-            <field name="isMigrate">0</field>
-            <field name="isChangePass">0</field>
-            <field name="isChangedPass">0</field>
-            <field name="preferences" xsi:type="xs:hexBinary">4F3A33323A2253505C446174614D6F64656C5C55736572507265666572656E63657344617461223A31303A7B733A373A22757365725F6964223B693A313B733A363A22757365324661223B623A303B733A343A226C616E67223B733A353A22656E5F5553223B733A353A227468656D65223B733A31333A226D6174657269616C2D626C7565223B733A31343A22726573756C747350657250616765223B693A34383B733A31313A226163636F756E744C696E6B223B623A313B733A393A22736F72745669657773223B623A303B733A393A22746F704E6176626172223B623A303B733A31353A226F7074696F6E616C416374696F6E73223B623A303B733A31343A22726573756C747341734361726473223B623A303B7D</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="name">sysPass demo</field>
-            <field name="userGroupId">2</field>
-            <field name="login">demo</field>
-            <field name="ssoLogin">demo</field>
-            <field name="pass" xsi:type="xs:hexBinary">2432792431302454726E69756C5763754361433635346F76566F35392E766B4C5433414E31624A6D726A79553462696335325069436A6B5572396669</field>
-            <field name="mPass" xsi:type="xs:hexBinary">64656635303230303231616533353730373263373165626239393534353966366236636164373235336534316336633534353036336339326136653730616366333930393165373934613865376662386662326664333931383932363562396466303133333631623063323732323339653465373165343839313030646534326265633737623966343238396635633936613837646531343864313963653663643338613131343932623163313765653630326430623532343564346566</field>
-            <field name="mKey" xsi:type="xs:hexBinary">6465663130303030646566353032303035643534316262633462653032333563313338626561366561333536626436663037353365313035653030333563653166316235336534663364343565366262353335626163396639646538653131316262356334383865336535633637323333666632626365313837626335386135353839373535373034386564353634366361646638623736396132323164363032353435653034306264613135663138323638383665373536313236353361313037306530333261323365636364336339616438323162306363383962643130333035303931653965626332653935313465656631373462663339343664656132393661346262366264343463646333363361643335623032373561356633323430313936346531633131663937313764313139633130633561373161666332356365346534366661623234646663626362326237303964336335316532623834326464303933653230353965373265356638376363366236626239306231346265376264373637663163303937366231313362393630613265636565336633313131663538656131346139353736623332653163303962636435313366383733656664653062373333366238643464646637616237323333373038613264393965633738356139393036306135643262316366306262663739346262663765</field>
-            <field name="email">demo@syspass.org</field>
-            <field name="notes">aaaa</field>
-            <field name="loginCount">12</field>
-            <field name="userProfileId">2</field>
-            <field name="lastLogin">2018-04-01 21:29:47</field>
-            <field name="lastUpdate">2018-04-14 08:47:43</field>
-            <field name="lastUpdateMPass">1522582852</field>
-            <field name="isAdminApp">0</field>
-            <field name="isAdminAcc">0</field>
-            <field name="isLdap">0</field>
-            <field name="isDisabled">0</field>
-            <field name="hashSalt"></field>
-            <field name="isMigrate">0</field>
-            <field name="isChangePass">0</field>
-            <field name="isChangedPass">0</field>
-            <field name="preferences" xsi:nil="true" />
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="name">User A</field>
-            <field name="userGroupId">2</field>
-            <field name="login">user_a</field>
-            <field name="ssoLogin">user_a</field>
-            <field name="pass" xsi:type="xs:hexBinary">2432792431302469444B442E2F4F624D79742E6F43594F5249514D5065624454783966744D636A703034365A435976662E765479597A594F6A4C472E</field>
-            <field name="mPass" xsi:nil="true" />
-            <field name="mKey" xsi:nil="true" />
-            <field name="email">user_a@syspass.org</field>
-            <field name="notes"></field>
-            <field name="loginCount">0</field>
-            <field name="userProfileId">1</field>
-            <field name="lastLogin">2018-04-14 08:48:08</field>
-            <field name="lastUpdate">2018-04-14 08:48:08</field>
-            <field name="lastUpdateMPass">0</field>
-            <field name="isAdminApp">0</field>
-            <field name="isAdminAcc">0</field>
-            <field name="isLdap">0</field>
-            <field name="isDisabled">0</field>
-            <field name="hashSalt"></field>
-            <field name="isMigrate">0</field>
-            <field name="isChangePass">0</field>
-            <field name="isChangedPass">0</field>
-            <field name="preferences" xsi:nil="true" />
-        </row>
-        <row>
-            <field name="id">4</field>
-            <field name="name">User B</field>
-            <field name="userGroupId">2</field>
-            <field name="login">user_b</field>
-            <field name="ssoLogin" xsi:nil="true" />
-            <field name="pass" xsi:type="xs:hexBinary">243279243130244C37643658736A663955794F6E583662472E6F384E4F713961674B6F64536B4B5674485350462F6861414E657971517065372E6532</field>
-            <field name="mPass" xsi:nil="true" />
-            <field name="mKey" xsi:nil="true" />
-            <field name="email">user_b@syspass.org</field>
-            <field name="notes"></field>
-            <field name="loginCount">0</field>
-            <field name="userProfileId">1</field>
-            <field name="lastLogin">2018-03-30 18:38:32</field>
-            <field name="lastUpdate">2018-03-30 18:38:32</field>
-            <field name="lastUpdateMPass">0</field>
-            <field name="isAdminApp">0</field>
-            <field name="isAdminAcc">0</field>
-            <field name="isLdap">0</field>
-            <field name="isDisabled">0</field>
-            <field name="hashSalt"></field>
-            <field name="isMigrate">0</field>
-            <field name="isChangePass">0</field>
-            <field name="isChangedPass">0</field>
-            <field name="preferences" xsi:nil="true" />
-        </row>
-    </table_data>
-    <table_data name="Account">
-        <row>
-            <field name="id">1</field>
-            <field name="userGroupId">1</field>
-            <field name="userId">1</field>
-            <field name="userEditId">1</field>
-            <field name="clientId">1</field>
-            <field name="name">Google</field>
-            <field name="categoryId">1</field>
-            <field name="login">admin</field>
-            <field name="url">http://google.com</field>
-            <field name="pass" xsi:type="xs:hexBinary">6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138</field>
-            <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432</field>
-            <field name="notes">aaaa</field>
-            <field name="countView">341</field>
-            <field name="countDecrypt">35</field>
-            <field name="dateAdd">2018-03-25 09:54:07</field>
-            <field name="dateEdit">2018-04-02 21:38:25</field>
-            <field name="otherUserGroupEdit">0</field>
-            <field name="otherUserEdit">0</field>
-            <field name="isPrivate">0</field>
-            <field name="isPrivateGroup">0</field>
-            <field name="passDate">1522341709</field>
-            <field name="passDateChange">0</field>
-            <field name="parentId">0</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="userGroupId">1</field>
-            <field name="userId">1</field>
-            <field name="userEditId">1</field>
-            <field name="clientId">2</field>
-            <field name="name">Apple</field>
-            <field name="categoryId">2</field>
-            <field name="login">admin</field>
-            <field name="url">http://apple.com</field>
-            <field name="pass" xsi:type="xs:hexBinary">6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138</field>
-            <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432</field>
-            <field name="notes">bbbb</field>
-            <field name="countView">341</field>
-            <field name="countDecrypt">35</field>
-            <field name="dateAdd">2018-03-25 09:54:07</field>
-            <field name="dateEdit">2018-04-02 21:38:25</field>
-            <field name="otherUserGroupEdit">0</field>
-            <field name="otherUserEdit">0</field>
-            <field name="isPrivate">0</field>
-            <field name="isPrivateGroup">0</field>
-            <field name="passDate">1522341709</field>
-            <field name="passDateChange">0</field>
-            <field name="parentId">1</field>
-        </row>
-    </table_data>
-	<table_data name="AccountToFavorite">
-        <row>
-            <field name="accountId">1</field>
-            <field name="userId">3</field>
-        </row>
-        <row>
-            <field name="accountId">2</field>
-            <field name="userId">3</field>
-        </row>
-        <row>
-            <field name="accountId">1</field>
-            <field name="userId">1</field>
-        </row>
-        <row>
-            <field name="accountId">2</field>
-            <field name="userId">2</field>
-        </row>
-	</table_data>
-</database>
-</mysqldump>
diff --git a/tests/res/datasets/syspass_accountFile.xml b/tests/res/datasets/syspass_accountFile.xml
deleted file mode 100644
index 8f487831..00000000
--- a/tests/res/datasets/syspass_accountFile.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<database name="syspass">
-    <table_data name="UserProfile">
-        <row>
-            <field name="id">1</field>
-            <field name="name">Admin</field>
-            <field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A303B733A31343A22002A006163635669657750617373223B623A303B733A31373A22002A0061636356696577486973746F7279223B623A303B733A31303A22002A0061636345646974223B623A303B733A31343A22002A006163634564697450617373223B623A303B733A393A22002A00616363416464223B623A303B733A31323A22002A0061636344656C657465223B623A303B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A313B733A31383A22002A006163635072697661746547726F7570223B623A313B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="name">Demo</field>
-            <field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A313B733A31343A22002A006163635669657750617373223B623A313B733A31373A22002A0061636356696577486973746F7279223B623A313B733A31303A22002A0061636345646974223B623A313B733A31343A22002A006163634564697450617373223B623A313B733A393A22002A00616363416464223B623A313B733A31323A22002A0061636344656C657465223B623A313B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A303B733A31383A22002A006163635072697661746547726F7570223B623A303B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="name">Usuarios</field>
-            <field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A313B733A31343A22002A006163635669657750617373223B623A313B733A31373A22002A0061636356696577486973746F7279223B623A313B733A31303A22002A0061636345646974223B623A313B733A31343A22002A006163634564697450617373223B623A313B733A393A22002A00616363416464223B623A313B733A31323A22002A0061636344656C657465223B623A313B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A303B733A31383A22002A006163635072697661746547726F7570223B623A303B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
-        </row>
-    </table_data>
-    <table_data name="UserGroup">
-        <row>
-            <field name="id">1</field>
-            <field name="name">Admins</field>
-            <field name="description">sysPass Admins</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="name">Demo</field>
-            <field name="description"/>
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="name">Usuarios</field>
-            <field name="description">Grupo Usuarios</field>
-        </row>
-    </table_data>
-    <table_data name="User">
-        <row>
-            <field name="id">1</field>
-            <field name="name">sysPass Admin</field>
-            <field name="userGroupId">1</field>
-            <field name="login">admin</field>
-            <field name="ssoLogin" xsi:nil="true" />
-            <field name="pass" xsi:type="xs:hexBinary">243279243130247635695230547A4933744E3036416A304C4A656B39755371496834356C70575539366E644A71444A704E6969713139306A444A486D</field>
-            <field name="mPass" xsi:type="xs:hexBinary">64656635303230306330383635633335373637316233366261353266333137346134356466333633626135656431613962323261356461353965376134373930356664656239373436356462373934613831373635316133316432626363636266663836626233353235643930333932393734323535663937316261616239656436346637383266363066646465386539336637363164356663633436393031356433363164333234643436633533633138313335613334663739633039</field>
-            <field name="mKey" xsi:type="xs:hexBinary">6465663130303030646566353032303062316163626161346361643036643237386562323533616462643433613966376463636439343063656265313962343061383436643464633035303636306466653630613561653139363433643636353936643733333764646236386536363930336562383031373764356463386430663963623661643361663565643766303936376262393964663530373936316330656132373462663830346333663966373563336538643539396336326231623738333730303963616263373836383637366433636337376162383365386338323335336335626164396534656535333532656132346632653434653663316336656131643162313264393332386335303539623437656235343534666138356435626437343637353333383132636662313230316634633635383733316465323934613664643035396332613362373333613765343462633539306338363337393032306662303263363262303565613030623234646235323566653863303263323138666561356661353139306563396266333461316637613937633733396637343534323333316466323932343965323138656338343233306161623038373336346463353236363935383630656638623232313439626262656636656266373030366638376434343661333535353863323062353462376336623330</field>
-            <field name="email" xsi:nil="true" />
-            <field name="notes" xsi:nil="true" />
-            <field name="loginCount">81</field>
-            <field name="userProfileId">1</field>
-            <field name="lastLogin">2018-04-19 23:46:48</field>
-            <field name="lastUpdate" xsi:nil="true" />
-            <field name="lastUpdateMPass">1521887152</field>
-            <field name="isAdminApp">1</field>
-            <field name="isAdminAcc">0</field>
-            <field name="isLdap">0</field>
-            <field name="isDisabled">0</field>
-            <field name="hashSalt"></field>
-            <field name="isMigrate">0</field>
-            <field name="isChangePass">0</field>
-            <field name="isChangedPass">0</field>
-            <field name="preferences" xsi:type="xs:hexBinary">4F3A33323A2253505C446174614D6F64656C5C55736572507265666572656E63657344617461223A31303A7B733A373A22757365725F6964223B693A313B733A363A22757365324661223B623A303B733A343A226C616E67223B733A353A22656E5F5553223B733A353A227468656D65223B733A31333A226D6174657269616C2D626C7565223B733A31343A22726573756C747350657250616765223B693A34383B733A31313A226163636F756E744C696E6B223B623A313B733A393A22736F72745669657773223B623A303B733A393A22746F704E6176626172223B623A303B733A31353A226F7074696F6E616C416374696F6E73223B623A303B733A31343A22726573756C747341734361726473223B623A303B7D</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="name">sysPass demo</field>
-            <field name="userGroupId">2</field>
-            <field name="login">demo</field>
-            <field name="ssoLogin">demo</field>
-            <field name="pass" xsi:type="xs:hexBinary">2432792431302454726E69756C5763754361433635346F76566F35392E766B4C5433414E31624A6D726A79553462696335325069436A6B5572396669</field>
-            <field name="mPass" xsi:type="xs:hexBinary">64656635303230303231616533353730373263373165626239393534353966366236636164373235336534316336633534353036336339326136653730616366333930393165373934613865376662386662326664333931383932363562396466303133333631623063323732323339653465373165343839313030646534326265633737623966343238396635633936613837646531343864313963653663643338613131343932623163313765653630326430623532343564346566</field>
-            <field name="mKey" xsi:type="xs:hexBinary">6465663130303030646566353032303035643534316262633462653032333563313338626561366561333536626436663037353365313035653030333563653166316235336534663364343565366262353335626163396639646538653131316262356334383865336535633637323333666632626365313837626335386135353839373535373034386564353634366361646638623736396132323164363032353435653034306264613135663138323638383665373536313236353361313037306530333261323365636364336339616438323162306363383962643130333035303931653965626332653935313465656631373462663339343664656132393661346262366264343463646333363361643335623032373561356633323430313936346531633131663937313764313139633130633561373161666332356365346534366661623234646663626362326237303964336335316532623834326464303933653230353965373265356638376363366236626239306231346265376264373637663163303937366231313362393630613265636565336633313131663538656131346139353736623332653163303962636435313366383733656664653062373333366238643464646637616237323333373038613264393965633738356139393036306135643262316366306262663739346262663765</field>
-            <field name="email">demo@syspass.org</field>
-            <field name="notes">aaaa</field>
-            <field name="loginCount">12</field>
-            <field name="userProfileId">2</field>
-            <field name="lastLogin">2018-04-01 21:29:47</field>
-            <field name="lastUpdate">2018-04-14 08:47:43</field>
-            <field name="lastUpdateMPass">1522582852</field>
-            <field name="isAdminApp">0</field>
-            <field name="isAdminAcc">0</field>
-            <field name="isLdap">0</field>
-            <field name="isDisabled">0</field>
-            <field name="hashSalt"></field>
-            <field name="isMigrate">0</field>
-            <field name="isChangePass">0</field>
-            <field name="isChangedPass">0</field>
-            <field name="preferences" xsi:nil="true" />
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="name">User A</field>
-            <field name="userGroupId">2</field>
-            <field name="login">user_a</field>
-            <field name="ssoLogin">user_a</field>
-            <field name="pass" xsi:type="xs:hexBinary">2432792431302469444B442E2F4F624D79742E6F43594F5249514D5065624454783966744D636A703034365A435976662E765479597A594F6A4C472E</field>
-            <field name="mPass" xsi:nil="true" />
-            <field name="mKey" xsi:nil="true" />
-            <field name="email">user_a@syspass.org</field>
-            <field name="notes"></field>
-            <field name="loginCount">0</field>
-            <field name="userProfileId">1</field>
-            <field name="lastLogin" xsi:nil="true" />
-            <field name="lastUpdate">2018-04-14 08:48:08</field>
-            <field name="lastUpdateMPass">0</field>
-            <field name="isAdminApp">0</field>
-            <field name="isAdminAcc">0</field>
-            <field name="isLdap">0</field>
-            <field name="isDisabled">0</field>
-            <field name="hashSalt"></field>
-            <field name="isMigrate">0</field>
-            <field name="isChangePass">0</field>
-            <field name="isChangedPass">0</field>
-            <field name="preferences" xsi:nil="true" />
-        </row>
-        <row>
-            <field name="id">4</field>
-            <field name="name">User B</field>
-            <field name="userGroupId">2</field>
-            <field name="login">user_b</field>
-            <field name="ssoLogin" xsi:nil="true" />
-            <field name="pass" xsi:type="xs:hexBinary">243279243130244C37643658736A663955794F6E583662472E6F384E4F713961674B6F64536B4B5674485350462F6861414E657971517065372E6532</field>
-            <field name="mPass" xsi:nil="true" />
-            <field name="mKey" xsi:nil="true" />
-            <field name="email">user_b@syspass.org</field>
-            <field name="notes"></field>
-            <field name="loginCount">0</field>
-            <field name="userProfileId">1</field>
-            <field name="lastLogin" xsi:nil="true" />
-            <field name="lastUpdate">2018-03-30 18:38:32</field>
-            <field name="lastUpdateMPass">0</field>
-            <field name="isAdminApp">0</field>
-            <field name="isAdminAcc">0</field>
-            <field name="isLdap">0</field>
-            <field name="isDisabled">0</field>
-            <field name="hashSalt"></field>
-            <field name="isMigrate">0</field>
-            <field name="isChangePass">0</field>
-            <field name="isChangedPass">0</field>
-            <field name="preferences" xsi:nil="true" />
-        </row>
-    </table_data>
-	<table_data name="Client">
-		<row>
-			<field name="id">1</field>
-			<field name="name">Google</field>
-			<field name="hash" xsi:type="xs:hexBinary">6338323263316236333835336564323733623839363837616335303566396661</field>
-			<field name="description">Google Inc.</field>
-			<field name="isGlobal">0</field>
-		</row>
-		<row>
-			<field name="id">2</field>
-			<field name="name">Apple</field>
-			<field name="hash" xsi:type="xs:hexBinary">3166333837306265323734663663343962336533316130633637323839353766</field>
-			<field name="description">Apple Inc.</field>
-			<field name="isGlobal">0</field>
-		</row>
-		<row>
-			<field name="id">3</field>
-			<field name="name">Microsoft</field>
-			<field name="hash" xsi:type="xs:hexBinary">3566353332613366633466316561343033663337303730663539613761353361</field>
-			<field name="description">Microsoft Inc.</field>
-			<field name="isGlobal">1</field>
-		</row>
-	</table_data>
-    <table_data name="Category">
-        <row>
-            <field name="id">1</field>
-            <field name="name">Web</field>
-            <field name="description">Web sites</field>
-            <field name="hash" xsi:type="xs:hexBinary">3235363761356563393730356562376163326339383430333365303631383964</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="name">Linux</field>
-            <field name="description">Linux server</field>
-            <field name="hash" xsi:type="xs:hexBinary">6532303661353465393736393063636535306363383732646437306565383936</field>
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="name">SSH</field>
-            <field name="description">SSH access</field>
-            <field name="hash" xsi:type="xs:hexBinary">3137383764373634363330346335643938376366346536346133393733646337</field>
-        </row>
-    </table_data>
-	<table_data name="Account">
-		<row>
-			<field name="id">1</field>
-			<field name="userGroupId">1</field>
-			<field name="userId">1</field>
-			<field name="userEditId">1</field>
-			<field name="clientId">1</field>
-			<field name="name">Google</field>
-			<field name="categoryId">1</field>
-			<field name="login">admin</field>
-			<field name="url">http://google.com</field>
-			<field name="pass" xsi:type="xs:hexBinary">6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138</field>
-			<field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432</field>
-			<field name="notes">aaaa</field>
-			<field name="countView">341</field>
-			<field name="countDecrypt">35</field>
-			<field name="dateAdd">2018-03-25 09:54:07</field>
-			<field name="dateEdit">2018-04-02 21:38:25</field>
-			<field name="otherUserGroupEdit">0</field>
-			<field name="otherUserEdit">0</field>
-			<field name="isPrivate">0</field>
-			<field name="isPrivateGroup">0</field>
-			<field name="passDate">1522341709</field>
-			<field name="passDateChange">0</field>
-			<field name="parentId">0</field>
-		</row>
-		<row>
-			<field name="id">2</field>
-			<field name="userGroupId">1</field>
-			<field name="userId">1</field>
-			<field name="userEditId">1</field>
-			<field name="clientId">2</field>
-			<field name="name">Apple</field>
-			<field name="categoryId">2</field>
-			<field name="login">admin</field>
-			<field name="url">http://apple.com</field>
-			<field name="pass" xsi:type="xs:hexBinary">6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138</field>
-			<field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432</field>
-			<field name="notes">bbbb</field>
-			<field name="countView">341</field>
-			<field name="countDecrypt">35</field>
-			<field name="dateAdd">2018-03-25 09:54:07</field>
-			<field name="dateEdit">2018-04-02 21:38:25</field>
-			<field name="otherUserGroupEdit">0</field>
-			<field name="otherUserEdit">0</field>
-			<field name="isPrivate">0</field>
-			<field name="isPrivateGroup">0</field>
-			<field name="passDate">1522341709</field>
-			<field name="passDateChange">0</field>
-			<field name="parentId">1</field>
-		</row>
-	</table_data>
-	<table_data name="AccountFile">
-	<row>
-		<field name="id">1</field>
-		<field name="accountId">1</field>
-		<field name="name">sysPass.xml</field>
-		<field name="type">text/xml</field>
-		<field name="size">1312</field>
-		<field name="content" xsi:type="xs:hexBinary">3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A3C526F6F743E0A20203C4D6574613E0A202020203C47656E657261746F723E737973506173733C2F47656E657261746F723E0A202020203C56657273696F6E3E312E322E303C2F56657273696F6E3E0A202020203C54696D653E313433393332353330343C2F54696D653E0A202020203C557365722069643D2231223E61646D696E3C2F557365723E0A202020203C47726F75702069643D2231223E41646D696E733C2F47726F75703E0A202020203C486173683E36646232633238323731393136326630663136316531343731653734636531623C2F486173683E0A20203C2F4D6574613E0A20203C43617465676F726965733E0A202020203C43617465676F72792069643D2231223E0A2020202020203C6E616D653E485454503C2F6E616D653E0A2020202020203C6465736372697074696F6E2F3E0A202020203C2F43617465676F72793E0A20203C2F43617465676F726965733E0A20203C437573746F6D6572733E0A202020203C437573746F6D65722069643D2231223E0A2020202020203C6E616D653E476F6F676C6520496E632E3C2F6E616D653E0A2020202020203C6465736372697074696F6E2F3E0A202020203C2F437573746F6D65723E0A202020203C437573746F6D65722069643D2232223E0A2020202020203C6E616D653E4D6963726F736F667420496E633C2F6E616D653E0A2020202020203C6465736372697074696F6E2F3E0A202020203C2F437573746F6D65723E0A20203C2F437573746F6D6572733E0A20203C4163636F756E74733E0A202020203C4163636F756E742069643D2231223E0A2020202020203C6E616D653E476F6F676C653C2F6E616D653E0A2020202020203C637573746F6D657249643E313C2F637573746F6D657249643E0A2020202020203C63617465676F727949643E313C2F63617465676F727949643E0A2020202020203C6C6F67696E3E61646D696E3C2F6C6F67696E3E0A2020202020203C75726C3E382E382E382E383C2F75726C3E0A2020202020203C6E6F7465732F3E0A2020202020203C706173733E6C4E66513133634B6A384D592B79434F346652536B4773494334357247454C442F424E69345654614671593D3C2F706173733E0A2020202020203C7061737369763E454E6354743338503265346C643350395A553241767939664C466277386C42473947382F75414D785A6D343D3C2F7061737369763E0A202020203C2F4163636F756E743E0A202020203C4163636F756E742069643D2232223E0A2020202020203C6E616D653E4D6963726F736F66743C2F6E616D653E0A2020202020203C637573746F6D657249643E323C2F637573746F6D657249643E0A2020202020203C63617465676F727949643E313C2F63617465676F727949643E0A2020202020203C6C6F67696E3E726F6F743C2F6C6F67696E3E0A2020202020203C75726C3E342E342E342E343C2F75726C3E0A2020202020203C6E6F7465733E4E6F746173206465206D6963726F66736F66743C2F6E6F7465733E0A2020202020203C706173733E3352394F48632B53335A4E56684D795948352F784C476C76625246662F5367573348527261322B325349453D3C2F706173733E0A2020202020203C7061737369763E763637306A596B43547178635332344C4F65453077672B304330376A734C2F4635342B6E56484963544F773D3C2F7061737369763E0A202020203C2F4163636F756E743E0A20203C2F4163636F756E74733E0A3C2F526F6F743E0A</field>
-		<field name="extension">XML</field>
-		<field name="thumb" xsi:type="xs:hexBinary">6E6F5F7468756D62</field>
-	</row>
-	<row>
-		<field name="id">3</field>
-		<field name="accountId">2</field>
-		<field name="name">Clock 3.jpg</field>
-		<field name="type">image/jpeg</field>
-		<field name="size">4273</field>
-		<field name="content" xsi:type="xs:hexBinary">FFD8FFE000104A46494600010100000100010000FFDB0043000A07070807060A0808080B0A0A0B0E18100E0D0D0E1D15161118231F2524221F2221262B372F26293429212230413134393B3E3E3E252E4449433C48373D3E3BFFDB0043010A0B0B0E0D0E1C10101C3B2822283B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3BFFC00011080073007303012200021101031101FFC4001F0000010501010101010100000000000000000102030405060708090A0BFFC400B5100002010303020403050504040000017D01020300041105122131410613516107227114328191A1082342B1C11552D1F02433627282090A161718191A25262728292A3435363738393A434445464748494A535455565758595A636465666768696A737475767778797A838485868788898A92939495969798999AA2A3A4A5A6A7A8A9AAB2B3B4B5B6B7B8B9BAC2C3C4C5C6C7C8C9CAD2D3D4D5D6D7D8D9DAE1E2E3E4E5E6E7E8E9EAF1F2F3F4F5F6F7F8F9FAFFC4001F0100030101010101010101010000000000000102030405060708090A0BFFC400B51100020102040403040705040400010277000102031104052131061241510761711322328108144291A1B1C109233352F0156272D10A162434E125F11718191A262728292A35363738393A434445464748494A535455565758595A636465666768696A737475767778797A82838485868788898A92939495969798999AA2A3A4A5A6A7A8A9AAB2B3B4B5B6B7B8B9BAC2C3C4C5C6C7C8C9CAD2D3D4D5D6D7D8D9DAE2E3E4E5E6E7E8E9EAF2F3F4F5F6F7F8F9FAFFDA000C03010002110311003F00F1C44A9D12BACF86FE12B1F17EBF3E9FA84B711451DAB4CAD032AB6E0E8BDC1E30C6BD2C7C12F0C000FDBB5500F1CCB1F1FF008E500787A254E895EC137C29F09DB90BF6FD50B63BCB1E3FF40AA73FC3AF0D41D2F35138EDE6479FFD0281D8F3244A9D12BB997C1DA0424E2E6F40C1C6F91013FF008ED556F0FE8A84013DDB7246EDE981FA5016672E8953A256F1D1F498B21A69C7A7EF1791F9542B6FA57DA4C6AF70CA7852AEB953EA723A7F9ED82AE87CACCD44A9D12B6B4EB1D0E598C5793DC459C91209515540073BB238E9D7DFB77EA60F0169B23604978BFEF3A8FF00D96AD46EAE886ECEC7068953A2577CFE05D1221C5CDE7E2EBFFC4D2C3E0BD19DB027BCEBFDF4FF00E2693562ACCE1D12A744AEFE3F0168CCA3175779CF4DEBFF00C4D55D6FC23A7697A4CF7704D72D247B76891971CB01FDD1D8D211C784E28A9C271450064FC13017C5F779FF00A07BFF00E8C8EBD86FEF42444062A082339AF1FF0083C7CBF145E1F5B071FF009123AF45D718C876C4FB5D8F504F3DF3FA552571AEE655F6AA88C4EFC633DF9F4FF38AE72F75B9240543003773838ACBD73519AD55A5C79B133E0313D320F07F0CFEB5956167AD7886EA386C6DD9D64380501007A93EC3B9E82A5E9A2354BA9A7FDA924D3C7089BCC9A421515392C4F0001EA4D741A5783B53D59E28E5BCB7B21E63C522C7FE90C85319562A76AB73F74907827B576BE16F06693A069B6D24D6292EA18579669955E44908E42B738C72383F89AE5FC65E2DD1B4ABFBBB0D2E04BBBDBA3B2E859B7D9CC52A7219A540199B2402B9E3675539C9EA4277D8E8A4F87FE1AD8229ADE6B865EA5EE9C16FC88FD07F3AAE7C37A3A46E936956B09CE17C82D961EA4F1CFB74F7AF32D4FC69E24D6AE45C3EA725AE06D16FA73344871D4E4364FE24D64DC5AEA13E6799EEA4719E4CC493F98CD3524BA072F767A3EB9A269B65A734F6DA64B2EC23885D8C817FBC149C3638C8E38C9CF18A5D0EFF00504D303D85E5CEA16800D914D0B46EA0F20A33FDE5C718048E38C6307CDE2BDD5AD98449A9DFDB803210C8D8F5E0719FCAB7AC7C79A9DAC4A751B58AEADD005F3231B24278E4F38F4E303AF5A7CD17BAB1493E8CEE135F0EBF31646FEE30DAC3F02339FF00EB54B69AB02411267273C9C71D7FC2B8BD66E86A96B1EA9A44A9208D8AC9C152401D31F8FEA39F5ABA7F88964216401243C9EC3F3FCE9C9A295AC7AFE9DAB2B3E03A9EDEB9FF0038A7F89984BE1DBA2B9FE0E0741F3AD709A56AE721771C67DEBA6BDBE175A15C26EDD90B8E7FDA159A77339239609C515384E28A641CC7C2F6F27C4374C7FE7C9C7FE3E95D6788EF1E3F2E68E4C79520270718078CFF002AE3FC00DE56B172C0E3368C33FF00034ADBF115D99B4DB800E020DC467D083F8F4FD6A1CF9648DE11BC59CB5E5E99079780CA87A63A1F5FE7D2BD2FE1E6893D8E8F7926A901B77BD508A03324CAA3209CF55CE723041E33E98F30D1A279BC4C891DB8BA11CBBD9791B4671B8903800906BD16DFC6A24D5F5AB1F21A5874F412ACD0AE4B85505D0FFB5B836DF5C1E9B79DA2BAF7329B6F4441F113C5E34BB54F0DE8526C99D7FD22447667863C03B41EECD9EE49C11C65811C0E9FA5C6D6E4CCA5636FB88A705871827F4FE9C7599A39350D6EFAF5A21E6199A568FCE620BE49500E395CE4FE38C56EE8BA7CFA9195A5CA44AD90EC854631DB3E98E4D6136EF6467527CAAC8C2B6BA996ED628ECF6C6CA37F929C2C873C9EE38EB91D6B527D3B519E35104332EE71BCAE54E3D8E3D7F4CD7571580B5B23736D0111821C1050171904B658E147A93CF7F63A90D843241E62C73191B19591CA3020F207B8E71D8FAE306972DCC1BBEA91C29D3AFD6206E2D5C1DB97C2961D39AC2FB3C5A8C456D5D6DE58F21515970F1E7861C1E318FC735E81E2C33C76B6FA158999E5D537A33800AA460FCDB8F5F9B2147A024F6E6FDB681A635B2A0815664528C594292091938C74F9473D7803B5096BA0E2DC55D1E48967A8593B5EDA26C92303CD89548565EE303AF6E3DC1F4AAB72F079A2E6DD888E53C29C6548E307F9D7A06AFA525A4AD3DACB1DC3443FE59B6E7423271B723E6C838CF5E41C026B9BD6B4448DA19E3B79218351195B764E6DE451C8273DF923F1E2ABE2475D3A8A5B95F4AD41D1F05BDB935DFE9F7C6E2C1D3767701DFAF22BCB210D6F3946006D6C0AF4FD00E9EFA5E123FF004908BFBC0C704F1938CFF4A94ED63471BA2C84E28A9C271456A60709E0F668B529D97FE7D9B3FF007D2D5FD6C97B1B80A40CC47A8CFE03F3AABE141B2FE76C6716EDC7AFCCB56756007C99E3695248C8238E3D6B09FC475D27EE18DE149FCBD7C48A18F9B190483DBA93C7B815D26B9345A5787AE174D8961762A1B6E32E4B724FA9233C9F5AE2FC317BF66BE313B6CF3700673CE39C574B1CEDAC6911ACF0B40D2B2175739C6187F4CF5F6AE98BF70C64AD222D122B6B68079930D8A58C8CC4F453B71F98C01EA7DEBAB9F51D3A3B388ADE4769672B32B5C3BA84CC6FB4A61BAE5B2323A81D7BD57D2B4B4BE82789CB44F1CDB448002C854E415ED9CAA904E7A0E0D686A7A2D96A09069B3A36C91A4932589DAF907233EFCE3A707F1C36670BB735D9A7A75D473CB3CD6B7115DDAB287DF03F98030FBC0618E33F2E140EC4924B55F5DAC5C2BAFCBC3E1BEEF1DEB9883C07A34128789668E41C099362B7D72AA2B3FC41E15D43EC05EDB539EEB64AB2C91DCCACE190039072724727E5070413C669DC768B66BE876716ADA9DFEB971133ADCB7976E246253CA5C85214F40465B18EB21EE2B66F0C904C6EA286326300B313CB8C1CA0F43CA91D41EF8C0359FA035EC3A7D9C7E741796CB02076C95983E3E627390F93939F94F5FBD9AD2BD69C2AF9621F236389C312180DBF295C0C1E78EDC1F6C53889BD463E8B6324CD288143BAB2EEC6400D82481D3248049EA48EB5C9EB1671AE87A942CEE5ADD44DB0C646C08416F98F5CA9DBC76EBC9ADB96EB5B86DB4A4B2B4498BC71E7CD942EF22362C8C4E483F748201FBAD9C719A7E275945F6A08AD0FD9DB4D99A4C93E6670C0103A05C0E7BE40FC348EA690D25A1E6FA9DB3978E68D372B7DE715D1784E666B98E3C9DA4118FC0D518E3FF47891C00CA8A0827BE3A55CF07A63518863A0393FF0135125AA3AAFA1DB04E28A9C271455191C0F84E22DA84E07FCFBB7F35A9B538CF23F848E303353782E012EA770A549FF00456E3FE04B5A1ABD8853B994F049C63A0CF5AC66B5B9D149E963CAEDD92D3520CD8D8AC4648E9D466BAD8A78EEAD7FBEB282383D45739ADD93457AD9FE23BBF33EBF5CD555656884447DDE4EF63C607200E858FF00F5BDEAE32E812573D5744D4D1187971F9F35CC241DAB8FDEC6BCEF2385DDD466B56D5EEB55D28B4AD1C72B7EF2DA48D1B0B91953F30EA32467B8F98019C0E0FC2BA87F67CF1ADC305826DA30836F9583F21E4FF0F7FA91CD7A5DACC970AB8910C840390DF2C83FBC9EA0F5A6D7538AA4395E857B79E1B2D3D8AC53280CA0C288CEE3903200C9C720FD2B499D6352CEE14A8E598E001DCFB573735ECD75AD79715ABC535AF90BF3232EFF0033F89581F9828272A54721B046091B53DB5CCF0C96D22412C1226D6CB15CE7AF1838F6EB5266FCC9EE16D43C6F395462E12362DB4963D141F524553BF7B996F5ACA1B8245C28565E3302F24B8E3BF0307232467038365E0BEB95DA4C11AF0CAC3F7877020838207F9FA731691756B2CF2C10C7718015D6EA52196E72A0EE5209246307A01E9C53B0245F86EE16BDFB202C64D8640429DA406DA46EE9907A8EA3F1AC9F103DA4BA45FCCA1A65997C862A41187211B07D8296FA1CD6A9B38E395E6822DB712E43480918C84527382B9C2A751D17F3E3BC5FA844F15BDBB49E798010933F04E47CF230C0033D0638C138E0D6B15646B4E3AA67217C1DB524BA5CBC681891D94E38FE95BBE108C9BE89B6E0053EF9F96B1A43E6C691A9C87E49EBC5759E18B52B3A3E3B1ED8ED59BD59D2F63A709C515384E28AA3238FF87B0F99ADDC02323EC8DFFA125749AC5817048046327803FCF7AC3F875F2EBB3FBDA37FE8495DDDEDB89D58AF6E83DEA64AE8719599E3BE22D1FCC80944CB263803FAD71534263915C0C60FE15ED3AA69BF293D72781906B84D57409BCE0218C9573D1467DBA0E959EC6FCD7D4E7EDEF43210E76B28CFB56FE93E2A9ADAD5AD999E48882A8F1BE2587231FBB639C71ED8ACB97C31A9A056FB148075181CD236977969F2C96CEA18E7705E2AD484E299EB3A55F59EA519B9B2DB70D200B2C80059303270C0F279638038F9B8A9B559A16B54517BF660D345B9CB18C905C7CBBB8DA4F4F53C8182723C6F75C5B7EF632E1BAA953D0FAD6AD9F8BF5F8576AEA33B6C3D1E46603F5AABC5983A1AE87AE59CC2DED6DEDA59D9E458C2199D0AF98CA30493D33D4D538E04B1962BC796778CCCE33733BE22460CDFBB8C020904800E3217233800579ECFE3AF10CB095FB5AC60F24A2E08ACB9751D42FB1E75D4B264E797273EFCD3BC50952EACEE75CF19C30CA6CED1D4C8C7A0072E30072D93853B795E49E327A8AE4E667BC6796E1CBB483E625B939E302A82DAE4A796C43746C13D3B7D6B7EC34D92E6452FD8F1CF007A52736CD5251D86695A7B4CE18A119030A7B0F4AEEB4AB0F2D4498C6D1C67834DD2749DA8BBA31F980738AE8C5A88AD19B1CE001CFB8A4913265309C515384E28AA24E2FC0436EB731FFA766FFD096BD1490A84B0E4F53FD3F4AF1D44A9912811EA3716514EC0608EF8154DF4B8D633B10018E95C0A254E8949AB949B474B7164493F2671541F4F62DCAF1F9D5044A9D12A79116AA3436E3C3F6F70C1A58096EC7241F6E4566DE782D5D09B77287D1FA71F856DA254E894F9439EE7152785EE616FDE424AA9EBB78FE54F87C38E5C7C84AFE35DCA254E894B945CC72D63E1D20062A793926BA8D3B4658994ED23073D38AB08953A25525626E694168B1A804608E7AF14B72C0208C60E4FE9EB54912A744A6210271454E138A2803C95054E828A280274153A0A28A009D054C828A280274153A0A28A009D054E828A280274153A0A28A009D054E828A28025038A28A2803FFFD9</field>
-		<field name="extension">JPG</field>
-		<field name="thumb" xsi:type="xs:hexBinary">6956424F5277304B47676F414141414E53556845556741414144414141414177434149414141445959473751414141414358424957584D41414137454141414F784147564B7734624141415666306C455156525968573135655A4263785A6C6E58692F7A6E58565864565631645864317477375575745553516B4C494C43435075415A387749793932494D78342F44456A4866483242473249326248472B50593849364E675448446D4C553961786A593951786A504D455944474B4E774A4B4D6B4953454C6D6970686270623671377572753771756C36392B37334D2F614E6141724F626B6645694D372B582B66752B373533352B304541414D595959347751516767525168424333524549496235613445657443434645594C666250524A4342415159513449786867686A435547436949515237316F524A4666505277522F424264432B4B48684B34617271332F45495968524678776842416D4747414D49495A4951786C323349454951555177685268416A4443474543434D4D4D59595153774168694169384D686442644258787733415177762B50517867696A4C723443435063726142724A372F6E4C6B486469566569784A674944434742534F4959436777414667684442426C4343474743454D41594C73654D3849666A527768314D345141414B71714F6F346A68416A444545496F6F6F69484955464959557858565955786A484555525977786D544A4B4A454949414142444A41474549674543763731554934494C50325159714B704B466258657367566D455A5145783145494943415959706B716C464B4D6F55796C5A5869455A466B474146424B6C3650536456335474496D4A43636159372F73496F636A7A44634E775864633054646431486365686C46617256644D304B61585430394F47596469323754694F5A375A6973526A6E584167784F7A75627A575A397A3931353438654A6B656D45416B4A49514B52686B452F6C4F5139643135595643634151516B45564755446344517768464962684530383859566B57516F674141494967694D5669375861376978514577616C335476712B4C306D53626475753638374F7A6761324B387379353978313365726C537231657A365354776A4F584B706664774738326D3771757A3039645242536548447333622F4B7666754F766659396E456B592B6D374D5736314555324536724454676D5846616F4564636A69636D7954436C315854654B6F6A414D7530384D41527748516453796243617A304138554153616E7A6F64684F444F7A6D4D3455466970566E544A3773575746456247386A746C362F384C35754B48303950524D545A795078395471596D33733341544168464A3565505849334E523466332B2F455A72502F4F32332F2F36787836737A732B5A6C732B474C754B5A3347715A45674354446D474534485A2B4C534769526E474B55534654582F6443544D455549775777366879527963576F536363463962326C3230576F765872773037666E63744E7A7164435879484E2F74544338754A524B785671746C3650727073366341414C46343874396566736B4C6845546736564D586137563665576756513871424E31376676577648497A2F3472696244587A372F33434F5050426147724A67765745733133335545436A675778564B76704D69534A47554B50597168516F7A2B2B3850665A35684143416B695741676877716A6562494A41324C5937666D4561516C79647230494136725535456269755A78454D4636707A5446626650487A34794B6D546F5276366E4C64394D44646253796653505957424B4D5368467930734C4D5269785A646650666A63433638382B65516A4F322F5A3838797A7A2B37617548747870707050784A724E52697975757046587734744B5573336E3836357245346F526C55515549596B69684169456B45645236495775375446434B2F4F4C515167765430336154736578326F734C73776F6A3758617A326D354E546C796956486C3337494C56736F3464503737377874327A315A7056582B684C4A707432533865384D312B4A584B6551566A30622F396B58372B2F50447752635050535662357737636562797859744C3035646432787063325363416D4845374D5665504971385844776752616647456F656C434349515151515253716E67644A36576E357564723538636E48624E6A57316174576945673470357A63757969485556364C6E506830755577354B6256486C6B396375726B6D614D4844763779756165662F70382F47786B5A615457616E757643434E7268596952414A705676742F774E4136566B496D6645556E356B78314C362F6C2B2F74483739326F5861504B52493057522F735331454B4B445145366D5936366D7935766F4F516F68416A4B484150416A727A627272654652524B5A454F376E2F464E757432732B3447586D5675726E2F316D6E2F6639317045704368776F7969616E71396B644C32334A796454365934372F7242536D653759566A4B546A714A676668707347393059656C463549506E31723339355A586E566E6C74765435524B576B4B5A6D4C353471664C2B3374763241416D3656536554316E7A66783552426A414641504F444C4C386C454B6F6B452B734A6E37304F637A387A4D4A5850464934634F5A424C7971524F48472F58617262642B636D6A313269656666737142414746693170755A544737372B68474B306562524C5133664F5463396C52726F586231315932486C594C62634F37686D744E70794A2B626D34746C4578366E6E3872463976336E706A554F48392B7935325967706C646E4C5A3836646E462B63615A7431585655416849684948624D6A49467873744968454D4561346B4D31684C4833366A6F3854332B4B2B642B444947486343486C527A655533563439556D2F642F2F2F757A41794D70503358336E594B483433452B656676432B2B316173585233727A5A79382B4E3767396A56626274346570556B4C6D6A694758746E2F713535317658712F556C706455464A7133456A57466C76706548476F742F636E503370792F647131726D655A6474313157345A424C64734E50637835704D566C706A48486878414B68434153516B4149513939627246595735325A714335584636757A4D7A4777515163666E69567771516D44693876546F2B6F314167502F323362385A584456674132763170705533376231786462482F7163642F5244302B6D4F75566F6252373534316A37353648484E75324379483644376665736E727A4F704A6737312B6579425A79547A373150375A763334354372694257583168717439764E5A724E56623752625463647341383658503659397552344D344A3764312B48514E56754E6F366650616A4B5A6D726F5943445466736E3778386F74766A3431444146565878413331766A2B3535304A6C664D334F6B5259303230366E4D6C347039665578576130336D6F7970415166583762795253537244557131572B39584C4C2F61552B7A503978556172766D513274322B35397456662F337237356932316D546D644B5A62765330685756556F676C79534D69534A5243524E4D4141435951416B4B78327A4564616E5471414A50625A6A32597364373843742F63664C4D61543256786B4436307938386941462B2F63303374742B386E53626B38636E7056444B584C4D654C78654B32585476634D446A7A337275796F5A574C77785343466558537A68336279304F4476336A7868552F632F636E684461734551344F72563754716A544E6E78726A506137576D6E4461616A6157597967674F6B366C3455736B43684342435247464D2B5035536256614C3749356C6163516E737554346771724A524B4A34312B31372F2B56666E6B2B56312B58792B542F3637443072746730634F58764D7432524D6A5778706150654F33662F387A4D2F763668743048436564375930497468744E344676486A78363761646675622F335674774E4D6C737A572B544E486567614C382B5056762F7A72627A3377366339634E377046384743364D706C4E3646616E66646664747779557937566D32415A515945774141454949536E426C636A4949677637656E454E78504A30424A4B6D704D642B323737337A376B4B716248767A6D335A73454A636D6F5552506E5237376A352F2F59716C2F344B6D6E2F756C502F2B514C332F757633336E306B622B374F446E5A6B386A6A624370307248747675767476482F6D62356D4A7278343033313531324D6B6C614E625056332F7A53562F373858312F38315A667566324437746B32567555735151736835665846685957472B504C53525549566A6A50734B52537A436E65745742335A4C4346467232664F4E70564E6E4A78392F2F4B66315A7550745977642F2B67395068726148644C356F31704C6C62456A525066666570387278343064502F5045396E3234754E6B362B66584C4E716D73555251746366334770636E3773374F42772B5937623730676B736B654F6E7641432F38632F66664C7734534F7052505A546E3767485258442F622F5A763237706C5958595763554B516947436F475570506F642F48456B4159442F623371647A6675583745626C6D746C72327755482F33334C6A72686F6C4D4B706E4D66767175507A49626A526465664B62426137662F385A32344A3737336B352B773273375969544F725375572B664738716C377668443234574B72573442346A6F5564543976396E2F6E372F32746162726851424A434B744D766557574F7A5A7676693566365065443848657648586A344F3938396565776452592F626475684746714B69347764724E6D7A6E694343436B53524A49592F6137626171716F68675256465557564555356443426737376E596F784E713933756D506C5372326D61567174646D35326E45526A4D3934364F724E2F2F7969736149644433686550514D4749524A3451777869596D4A70724E5A6841454F376465507A6B3532617857657849704A74484B7A4E7A3944333478674F4463784153563161625A6C706B612B47455552554B4937673838436E6D6B716D6F51685A626A71495A752B39373035495368304F4742667176644F6E72735451476956447139373958587079767A4C7A7A2F776875762F4A2B4549762F38365A3964662B3232672F746671382F4E47555371585A706575446970412F54352B2B36372B654E374A46564F5A644B546C3662657533514F4931424D706A7A5431425332642B2F65695A6C70505A6439363852785052626664634E757073684F45484942676D683538304D496F384A7830396E4D5971555368554C544E4D473532577A6D63316E624D6C565678526A6E532F6D4837766F6D704D44697A73306632373169316644366A6573793666544B56617565654F4B4A366C4C743757504837762F63357A397A3132654241695247687761484B67734C4E2B32355A587071326A544E77506351464C4645676B666F705A64656470754F45553848667368446B532B57356D74546F51437171766F51516F51497768676778446B48474B6D4B50444E335371464D414467394F64472F517056564E6A352B626E683432424F7776332B673762526C52576C5A6E573033587238775739327A5A302B375937712B4E33626D336151525378574D6444477A652F75757438362B492B764736644F6E6E332F752B56747632744D796D792F74657A57654B39792B3977386E33703963315475637A2B615A496F637568354152516F6A45424D4959515941674868346555676A6F7A36556B684E6F6473394732706935633449444E4C7A5A36536E3142464749556C51594B2B77362B735762746D6B2F642B386B41686A577A5757307537666A59446331324D7744635343564B2F61566B4B766E464278344977754148662F39444E776F765835363262573930644F76737A4D796D7A57734756677958683165346C686559337567314734373837733159497136704769584137445145416C75762F526A6F377051343577684256566638304175436746494B6D537045564A3264575A7166636379573554722F3849382F32374C6A2B6D4D6E54312B596E414163796F4B654F6E686343316E6C2F4B574D6B6B4368384C30414B584B67796E642B396A4D585A365A506E446A525738787632546769754C33556D702B757A396D754252464E46764D62726833744C52576E78736542487834392F4959516E7170714D53504A675958773875634D63516742496F524B62617444434D6B584336324F6D636B6B4173634B5041744473587658445866397757336D556B4F5856646479445433322B632F642F2B6A66505A624B5A6E7A6674396F574A5178794F446333427941756C34654768316647395467506F3330762F58706B3754554359744D3063366C3047504B7457376357436A33662F4D593343424B64646D752B4D714D6F436D4D4D6F797337656F77786B5352464E7A43544E6331676A4F5A797558684363367732526D4555324A32326154566144332F374F772F652B7A6B464B652B666E366A576C67435448766A796C3377654B6F626D4F45376F2B34486A4A685174644C31476F3947547959364E6A645557466F61476869696D756836666E706F64663239635A396F766E6E752B302B6E59646B66544E4633585779327A302B6C4555615449326F636F41304B4A706F63436133704D59637A33335344775659322B64666851344E754F32557A704D65614C3939352B527A6A52632F2F7258354F4A395078433151324438596D4C683438635361625447475048737575314A6359555864462F38494E4868387244592B2B64662F766F3856517938384E4866376835342B624230754454502F6E48766266732B65337262307850583571364E4C466C64424F45554658315643704479504C4F46572F63734A357A7357313031484D39332F4E4634454F4A4C74587274745042465069656C30316E6A78342B7967435871567865755762546C6C47662B37463444414E2B7A5971566A4E497743457A545A4C4B635343616154624E52623237644E48726F774B473171306475335874624745596A367A62466163797574622F3139572F742B64684E646D4E706476715370697351524A35727062495A4935346F443635457545746445434C4C436D55714A504C673042434530506639564471683651794B494A314D76507A6969344D442F5738645039707574567A547163347372426759386B314C59395333585631574E55334C35484C502F7650506E3376683339342B66767A566C2F6531577531644F33635669373067457051796D656D61724A30374D7A5A322B75787658332F7472626665676842434B45797A58536755597246597A45674163495634324C422B4863526B7A3032334A493359557130715378424266486273585533584D4D62546C7976705A4E7033676D4A7645565035304E476A70303664797154546A74555A366974585A69714B716D58794F5968526558686F614869346C4D766663503275644371645343555048446977734C44516B793171657170634B475A6A7557662F365A6D46536B5742344E4162723563473870314F57395856644337666B792F30447051354242686A4648455568427779436C556C5779704A4D5532343375357431314569573035495A61585A72464D4A61504659454471793448474A46497A3032744C61623337317632543668744B6C67616E5A6559425250704E2B39736B66762F7A384C7948676C753830374D37576E54752F2F4F662F4B6642424B5A4F666E624F2F2F2B686A4B71565774576F744E54535A6463796C574D4A49396D546A32545452354C6256584C3648526B625745454C757550504F77484F67434232726A5156756455776E44415341416949496B6563365951526B52596B4556356879384F416845595A66652B69685938666636532F31527A78714E557864316C565A5033506D76577533373242556B5342316D75376A333373306F63596231665A7666374D766C7A44654F766836777442383331367A646D5862627658323957667A5066464555704B56516D385264636D71545673324D366273336274586C6D565A6C7350414A5578756457773948676349746C7074414469474D41723832767838544E554378347272366F57787364646532646562376830716C74382F663747514B545A7172554B32744758307567766E4A35754C35736A516D6F756E7A712F734866726864782F576766664577392B724C3077724649626347526A75727A55584337333973566938314665574E62322F584462695363454678686876324C685259764A74742B324E4F4D6353616A6271495263536B384D776B6D576C756A43587A5757623758626B2B34784A6C74554A50432B4B4969595245496E78735176486A787A4A462F4C5872466931636330364263757857484C316974584470584A6F32624F545538642B392B6234653266662F7433727A635A435479344C494A633175645A596C46557445552F32395A665450626D2B636C6D6973682B4542474F4545494545526F4C37454F7170314F4C63544B7051557549646A344D656947525A3372527077376E78383747304151506832513643556852464B73574152304B456A414F375076757A7837372F38782F2F534664303133626B54456149435068683644724A5A4E774C50535A5434446E72316C31546139527A78594A6D71427253436F5865766D49356E6333324476525456564D3076565A764969675167496751776A6B584844702B6F4D5869696D35344559386C6B6C526D45714F5A54435A58794B31594E527850786E4B39505A4A434234624C6C6D755A5A6B7557695351465044414A394B48664158346E70387243625273557154694B713053456C6D5951676278344A6B466A69703649637941776C677146336D4B78704F7136466A4D7331324E4D6B56585644344E6C4B68636846455952674E7932585A30787968524D4661594169536D4633704B6D4B55526D3563462B585645447A323831326B3748345745304F546E5A617256637A2B3559446954594E4530512B5977614D55494375363270386B4A3173545251616E5361795A34734A6D786D626A61565343645336554B6846492F485A61624655386C454D68314C4A7067737937494D42554149495969494C4D6B71517A674D64556C4B78524E4C556252327A645A61645A374A426B564151694C794864653165656A346E71664C696D733767575558556873464A4A3741555251356F5438784E546C312B584B74767152706A41464A4348484E78765763637A3252544B52546264636547436F726371797672367872436361556F6546683256416F70595A6841414334482B517A616464316C336C7141454155525971696D4231545552513363505634544E456F41634B7A7A634254776959494173493545514557424167465530786B796E774F624E66783275307457362F64734758307A4A6B7A746D64626C6755415949785253714D6F536D65794B597154696252684A4250785A4B485178366969615270545A555652776A446B6E47756156712F5844634E596471684C4350752B54796B31545A504B71753237717377596B7752425571527A4B7275754A376D65344E7931624D4146414142774556655945414A41614E7432504237764C362B676A4C6D42303271314B70574B726D714D4D6162496765444A5A466F69564E646A6955534B55535543776A434D494169694B464A5664585A324E70564B63633452517643725833766F4B68486570666A425666596641776E684B2B77345151684A2B414E7041554F494D53514959774A4A56336A41464244512F61583551454C41424F447546416C6A33483337495951672F71687730473254712F7A2B565359624959515275754969687667444D6141724D48545641344151774668674C4341537147736E41674F4549567857476A44434742494A4C6D736979386F4975684C382F79747064444E43507049684367424742434D73494D5249776B68434747494945454B59454C67634C685951416F6B4369424443585869414D4D5141454177786867677452344951776D785A57634467436A444156314B316E426843727567544548587263683968434248454742434D594E636D384A58304C6973794547474941494959434978414E316B51413441412F4542522B564342455559414934546773752F646648346B51387558714B764241414141414D74744241474356377458793464484141414977473739594158306579662F33706F664B682F70666D546B2F774A4A373144734E344A75626741414141424A52553545726B4A6767673D3D</field>
-	</row>
-	<row>
-		<field name="id">4</field>
-		<field name="accountId">1</field>
-		<field name="name">android.png</field>
-		<field name="type">image/png</field>
-		<field name="size">4295</field>
-		<field name="content" xsi:type="xs:hexBinary">89504E470D0A1A0A0000000D4948445200000080000000800806000000C33E61CB00000006624B474400FF00FF00FFA0BDA793000000097048597300000B1300000B1301009A9C180000000774494D4507DD011D0E180BE2306F78000010544944415478DAED5D6B745CD575FEBE7DEFC8961F3C0C01EC45480C2B8B0026A1D4206B2CB9C27181F208D074816D59069A16280B92A6246D42520A252D210FD2248426818418C9C63CD264C182BAE1154B1A4960CAB35E506A1E5D26501C9E768464CDDCF3F5C7BDA31796A59135F28CE66C2D594B9A19DF73F7FECEB71F67DF7388329096CCC293C1E997845174D1F2FACE374B7DBCCD1B17CF0F42DDDB1BED58F2E74B9E7DBB94C76AE5000069DA05A2CE8CA8EF94FA587FF6507D1503D71A018757D9EC334A7DBC650100B2E79F4C70B0E0336B338BFEA494C75A352DF70D1AE71AB8F9A5F51DCD1E001320AB163FB159C2CD12663A58D35D1DE9D9A538CE350F351C65C6931D1038B9CBAFBA11F200983016705F96DC9B3077CE4EC7926481B0BAF7F208760C22AD69AAEBEC2A07BD960D001AD39DBF27832F986C3A694DEBDA4F9A5352816A5BC332293CD790450AE115E5A2D7B201000050D10310FE57CC9DEAD47342A98CEBB6473E5585A0F72C3077805C78EDF2FAB6B7CA46A7283359DB9E5E2D6A0DA42E9B3E73C9CA850F6547FBCCBAB69A1991719E219C0146F38420A07400E40218009102BA01F70E2D34C1BD48177457F76CDFF6A7CB9ECE8D9AF6B5A76B403C4CEA8528179D76FE92C75E2F177D86E5060089F793DC08CBFD91EBED5905E0D6E1EFB9E7D7A7A5B6CFD85E47BAE3011C23E02002F300CD00381750086086C86133C0DE8364005E045C774FF5CCDFB574A4B7105107A2E0A5C6FA8EA7771D9FE07A11339C70533919BF2C1900009ADBEACE27A31F928E3DCF1FB5EF5F7CF6E7B907375F17BCF6EE7D75845B29E3498110413A5C4415101B5A1020825072E79404821093BF0CFC4100084A10F09E889728E668EE2E58EFFAC69A27B702C0DAAE450B11059B003D09F0338D8B332F7B004C46D09549B782564FD7773314DE01E3B7441C09A91A04094862FC1322C971F14DE21E10A3062024800ECEDD1B657139A6A183C0C141C4BF5B59DFF1BD72D3A3952B00E8EC3B0E511616FCA5026D70D47110A69348883DB139314EE327E44E80313DC43F6240848E38C7A6BB570D3CCCC4E742CDBCBB2CF5586E035ED75A77906374BA8C5F20B9801A740F1404F6D379516290D871C47048CA3CA2EBA37827841FCEDEE785473FFD8937E5015014DAAF3D9BB02F89AA0110304FC87BF12E84FC10040ADB40AC0F72D13F2F5FF2E81B1E0013286B3A177D3E10AF226C7FF4CF7A09E4DEBD07C59C80981048E07527BD2EBAAFAF4E77FDD203604F23FE478EFF10AAAAEE27834F00AAA228F183095C09E5A94E8441B683DCF9DDC6F4A67FF000182FE5B72F3A8EC0DD8E7604291156168C250146413038E46E545FF4E5D50D9BBA7D1650C8CC6FAF6D20C33B6176841162A2D2B2F0AB141C28C081B2CB2C0C7FBCB6ADE610CF00632EF4D42E03ED76331D085122588E050B498A07EE08173E9072D59F3D77C9035B3D03EC2ED8EB38611189663377A0627F3AC4F8FD2CA0815F94285B93481071553119811497103198A394142008C004BA3FDE99DA7E434BF3D98107C0483EBFB5EEE32985FF06E21080026803D9769EB20827C9D14114639A158C2439192088314711A2E8E020231C1947A7FDC3CDC3564412B352C1593AFCB59B3C007635F3DB3FB91F037C3F6270485C6461BE82C7FE843B9E66204593DD41B15E2E3C09D4CD4E8AE2A430FFAEE2794D4104B25BA19D17059C51A75C7635113DDBBFA4306400C99F62F0A608BB706D7BFA2B3E06F84091E7C46B81F06BCC2B99C290544F8098706EE4AE6BAA7FF4CA217143E6842B89F01A9261D18286643549E4EB51A4D3CEAFEF782AFFD2ADBF39E1A3A954F84B92C78DA45AE54B46D2FF98B4AAB1AEF331CF00009A338B9792C165C984573C69862A50042882C2CBA4EEFAC08D38B600F6BC8A896AC6CB4C14EEDA27D5F7CCE0972E6CD8F40AC9FB04E634E20808023D240E75C0579B5B97CCAE7800AC6B4FCF32E03A80FB4914A8DD509500E27D67DA39FCF569E1F6B71DD58D64E1B758819F20107CF59C458FBBE1AF3BB93700971DF1FA94245553ACA6F1D316642FA8780038D829803B7160E68E40DEFD457FCE35D841C35FEEC91E7244001DC4A252401E08EE9896F6F4B45D14001680563DD200E28549E66F0620AE696E3D69DF8A060019FD24B1B9304A7D3751DB1CCABED9D2567F707FFCB0B1617F0BB2D70236BFA8E19F986F275949E8ACC1AFDD96492F03B814D27BA351D0C00206F767D0FDAD8A0D029B330B2F37567D7FA0B83FDAF41506DE1BBDE5E0EE320494AC01D491717C56D4D5E0A4B813E7F764EE61297C4EEA3B9808FE0CB4FEE2C4686B15493E03D04541943A74457DEBFFED0D1B847B177DC15730A4238BA37E228EC1242A3C80D4250E02E3926BB15B0112C62263E34952B014744B8500A425FD64635B9E8C7B952081E6D8FB8F002EAA2817D0D256BB4AC6B990A9309B09042926052011A42545A1C921B498004832C69CD1125B16967C8A202588567767DBA70EACAC1820D05F518100C74279A33FA1E280CD277B7998838A3CFDDC349EFF8324611FC95ACFD9150380B5AD4B3F02D961B1439F84B0BD644549A518331CDD49150300A57A1B44EE17F75C56AAF1630E50E24688E0D0E6CE051FAA1017A005046654B2E9070702A000B92318EDBF60CA03E017FF716695938E066028970E8FE2C612F1CA91611E2D9AFA0CD03B63DB7E06CC2A853A44E96000824888C7ADED4807531A001686F3011E36100555BA07102832E92F98A149AECD4C7A2128723A90B039A050AEAD5E139E4E524999DB8E256C5F00DBA62C009227B7025478FC3FC2F430208B29CD0002B611F8B58499A477018366468A0A36050A764E6900107A42C205F404F0C1A9A1E939B959EF4FBA0B1AAF34676AE691566F48D508EE9DC8E9A954F7EC8D2B4ED9B0DD1BB438D29CA9F918192E31040B1DDC13514EAF9CBF24F3C0A402E0F68DB587E542DE48E014C6FE3CDFB02331474655B734D6B75DECCD3571B2AE75D127A330F839A5A3498679CE889BA4A26E44A9ABB163EBF71A4F7FC51515002D99DAD341DD06700E6183D6C7014870341111216D0E34FDBC1575BFD93CE4463A6A0E92C27B00D5F81CE003723380CF35A633BD43667DC7A28B41DE4467963C953E68E9537020880890D6079AF6D72BEA5AC7FC6472417580E6B69A1300FE2BC53954DC843F78F95B244C8E94810C8E7196BDBBA5BDF6C8A1AE4E7301DB4FCCB779FBAF415FBDC38BA32DED8B9AA8E0BB2658BE6A3878DD5B204C1211880C973B8BD6B4B4D7CD9A700034671A029A7D9BD487018BA7FDB0199C2C6FF6F7650AEEE3802E5DBB71516AD09B1C2097BC3F590EF25F498A3C24396E6E5F7C04C8AB49552BE993E72EEB08A424C6CF26B953A05CD3C43380BAEB9D6909644967EC983C8C447E2E0A73733DBB17E86A371E1FC8B26788383CAE9891BB2B9C924C1E5931C0ECEB130E005AEA6B26CB33FD989D374104ACBA6C70B6E3650CC158387D9621BC3451B546EF978C275CBCEF19E74C3C00C423FB2D3A16FB73A00D5AD2511393784EE92AC050C3C8428AF30BD43959605F9A1500D143C7B37C1B03D20EF3262E500C018854B197CC0B5B0D1C4FF52E0E08236FD1717242912BA6616103E29EDC8A977169ADB83ED30A9BCA1310DC78348C514FC464044C361938E69EE3A8E282C0C9D29379D5577AACE9C50360D2E9CD4BE500C00781A5AD27EF023C03F82CC067015E3C031417DDDEF157781AE879BF5453279F05946A16E083401F04FA20D08B07809729910578A95800F820B0B4F5E483401F047AF12EC08B07800F023D007C10E883402F9E017C16E0B3002F9E012618DDDEF157781AE879BF5453279F05946A16E083401F04961E00343E64FB495FBAAEA0803D82149F9B5CE8F8E39391426FC98215376E9D178901F842FE1C6C150A5FD9666FD142273E7300DFDFC571E4A3E75C2A0600A8479C84E470BEB182588C8F4369F74160614120C93E119D89CE59B0CE271A0074A95FC5C7DE8E313C91440674CAED10ED1E1F0416E8EAA3AA5E8A1B2C7FA450413AEFDB32E10050D0FD2085F6FCE9DEA3108DE2CD0B2384A8FA494AF686377161B2B2FEE11CADF75780B62001C16E483F09B748288714A65D3FE10068AC7D3C47049713B655D26E0F4A14C47833496D702E77FD7975AD7DDEA4E30041EDE35B8C760DA077F346DEB5778ECF1F4D7692BD75F9E2CC2D454903572E6E7B8AD0192032FD916A12AFF6EF6528C45182C32F9C729736D677FDCE9B72FCB2A236D302B87341BC0A80BBD0B980E4CC6C871B2297FB62510B412BD399670CC1994ED94B1CB955122947894E7410B545C0AA200A2F6CAADBF4F264E7B55325081CC2BEE9AE07082E72CA5EE5C8ED8374DE2B3A8AEC14706A900BBFBABA7ED3DB1375DDDDCA6DED7F405AB585C25CC7F0A326CD065C67CEB4A3A9B663C47D01D7654E3C56A8BA437447D14785C366067F00E06F876F17DFAFF3CC1F32642A05051F1683434DAA8E987B5030D794CEB8F15C75DC059AD5754F0A4004E0D5E47BEC90F32CB06BF38FA6F3C5FF29007D005E4CBE27B310E4652ACA5E0280A7FDCA05804830B2F8D21E0815070029F50E8077095750CD7AEAFA7E258513029069AA03C0FD7EF61B0ED816073D1E01C999C17454CEC936AE1A2103983200683AF5DFFB10F17E38F478F303B1FD01839E03DDD3151104EE089EFF1903BE3470D85C654241884F550201133734A53B5EA808005C9A7EABCF145C02302B89042B120194E448C0D96381E1DB159406022BD2ADED705806228B7C8D5B82244DCD4AD1209E4BFA3BE266293E196571DAB9B51DDBF60A08F7B65A9A1F699887AA9DFF02DA1924AAA87C7E38BC3696EF2E62D29352C0D0E3E316C7F639E52F81E458CC424E4AD1C0F8767529451028D144A72CA52F35D677FE60AFB250A9CC8FE6F68663C0F79752C1C930CC27866544F16F1F1335AD20FB4BC9D1C602C4A74104A3CC53519C25623E871DD23A46A70E88DB40BD81E14BE69203AA9E72DAB921E776DC77E192FFDAEB876C975525666D7BDDB330B7000503C000E4D098EE1AD3A7D6B52D5BE8C2DE4D540E5050200144809B76E5AABA8DD7F942D0441ABFAD9EC0EE67EF44615D8CF619FF550850D5E5A2D78A590CF235870A0780970A07805F76F20CE0C503C08B0780179F0578F141A017EF02BC780078F100F000F041A007800F023D00CA62066B4F66BFA780F20600A9713D56986F3F5701144044C975A67EE37A1901C040322C7432934CFA0C830240D3174285870E713323813D78E8D60360448920445D85FB732528C83D53006CBA18F7111674A97827172188824D1E00132C2B1767E4C88D4326DB581120C031BA77CC1F30ED10A2FFD69877C4CA030D800867D97B3C008A2081C3060AEF8820C4E489128D6475411044120E556EDF9BC67A9D55E92E19F023CA90B40703BB799251F90EE6785FC79F8239E701500479FDB73B5F8BA42B81C8C5BBE7891A21BACB3F73176F5785BF5F5EF7E06B05390EA5D608783ADE0E2BDE7D6FF71C0300DAE622BBA17171973C008A20579CF7B864582F879BD11FA727F6C2E07DB4D4FF9280DB65F6CD42AFB5AAAEED1D0997027815200752102529699E7F92A707A45E29FA22DC2BCFF92CA088727EBAF35DF5CCBA42C87E03021C92FD11E3CDD2E418EF4F2C3AC0E1A786E06F9A6A33E3DAA62E65DD5D70D17952EE29C9C131796A20F9D7E59F0171EE2D38AD9866B6AEA9E1B7659539966D816C4DE7B166D1CCA369EE6263D525CEB9300E0DF43E94BDC55C6AFD4EC3A3172EEED8637FBCA67D416A9AED7F7AD6B9CF9BB98678DE0812B790EE6A396E5855D7F15639EAF1FF015841FD48A44C570F0000000049454E44AE426082</field>
-		<field name="extension">PNG</field>
-		<field name="thumb" xsi:type="xs:hexBinary">6956424F5277304B47676F414141414E53556845556741414144414141414177434149414141445959473751414141414358424957584D41414137454141414F784147564B7734624141414470556C45515652596865315A585567555552512B5A39646358624E4E4C4C4D314E6247303341724B4A585533677167484B336F776968376336442B71682F372F33346F67736A434C364B45777A622B4B54497A6F77536853574E63734C4E61734B4372536367304E79705A437935335477395934732B73366439787252505539444C4E7A7633504F64382B636D5876504C494161584B7A4C557355767461766A44775737387449596D535A7A5645526B6946722F7167316D576730614C516F65387634634636654C546441626F6B4A36653451334C37353075586F453453647A7837475539664D623166704874515941554F6159302F72636E5A67614159546F36344149554F696A72546B504D75614E71616E7347485A424A66597372556244776953674C597675662F37557038712F566857377543354C47344C494E673045584A7762682B423539736A4E5835444A6243696F544E64714E597871524531545A6F354F6D54374B58745046614D4B55665031497A5948544A67414541674C68304B5A6D6A3063676F6B4238416A702F39486E624B7A635149654B30444D4D5357787850515158583072324A49595344713577766D7430376C6A554E6B7171614B7832314E7A3463574E6C4D6941434167446E72346E5868544C48594D685135776E7543524276324A515041366C334A6741457A744742704C4143597A416278536D696F39734B64544A5A59796756523270437049586D7045524743556A455267597844414A7358336E6433667838386E454B476F6D4E304B5068786B4F5642382B55676B4731376F704B566B71425665796571657177474256717A78797153464A614F71544E47457849765253416F65314951394C53704F7A534D7166425A6F4E47716E467030544768786257617033624A323979526549675A4551724B2B31473470735675796C78743968766F6C49304B5A33537065494242736C6F626A35624F4D53574644573450395155413269324F735558667961727033575361696F7279586436353369707A2B3237482F564A723831634B74636E773837733150452F6349694C686D3332517070372B4770706D6A354D623842586D6E61307A512B367355776131676565486646735253424C3956554D445657494C2F47564C43763133554C506866513072346B7A4D55754B3368425749493143386F622B657A51454E385558476D5661724939625A37344B6A4F786F3969373064417A676257586C4D74626C357142306D6750537461704B4F794C617A4E366B434547624F6A6E49306668304F4B57454D327179504771427366722F6350354C756E4A674935696565755348716E4F6C32396E613565663435436F587A392B6F33344E5230732F5975436F4D4F62483250676C6C6B56434F426D7854744647745073432B396D68656B3076397A4B7251676B66514835665650374F64776E55486E2B36317456372F6B496B714B3833696F3338755261376E6E506B6C496A6A78535A704E2B634C703974753148325670582F594638324A464558487548372B57734954576177677269334A73466E6944502B75677878423839626875496843415172714C71345454782F38764354764B536F7172423132415864726E5942454146356A35586E3271576A687A613267446474424C3039777642767351414159454A5365466D397862597477652B504467414138397A6F636F6631784A565A5133502B4138457749412B7133696A634141414141456C46546B5375516D4343</field>
-	</row>
-	</table_data>
-</database>
-</mysqldump>
diff --git a/tests/res/datasets/syspass_accountHistory.xml b/tests/res/datasets/syspass_accountHistory.xml
deleted file mode 100644
index bd2b3e28..00000000
--- a/tests/res/datasets/syspass_accountHistory.xml
+++ /dev/null
@@ -1,387 +0,0 @@
-<?xml version="1.0"?>
-<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <database name="syspass">
-        <table_data name="Client">
-            <row>
-                <field name="id">1</field>
-                <field name="name">Google</field>
-                <field name="hash" xsi:type="xs:hexBinary">6338323263316236333835336564323733623839363837616335303566396661</field>
-                <field name="description">Google Inc.</field>
-                <field name="isGlobal">0</field>
-            </row>
-            <row>
-                <field name="id">2</field>
-                <field name="name">Apple</field>
-                <field name="hash" xsi:type="xs:hexBinary">3166333837306265323734663663343962336533316130633637323839353766</field>
-                <field name="description">Apple Inc.</field>
-                <field name="isGlobal">0</field>
-            </row>
-            <row>
-                <field name="id">3</field>
-                <field name="name">Microsoft</field>
-                <field name="hash" xsi:type="xs:hexBinary">3566353332613366633466316561343033663337303730663539613761353361</field>
-                <field name="description">Microsoft Inc.</field>
-                <field name="isGlobal">1</field>
-            </row>
-        </table_data>
-        <table_data name="Category">
-            <row>
-                <field name="id">1</field>
-                <field name="name">Web</field>
-                <field name="description">Web sites</field>
-                <field name="hash" xsi:type="xs:hexBinary">3235363761356563393730356562376163326339383430333365303631383964</field>
-            </row>
-            <row>
-                <field name="id">2</field>
-                <field name="name">Linux</field>
-                <field name="description">Linux server</field>
-                <field name="hash" xsi:type="xs:hexBinary">6532303661353465393736393063636535306363383732646437306565383936</field>
-            </row>
-            <row>
-                <field name="id">3</field>
-                <field name="name">SSH</field>
-                <field name="description">SSH access</field>
-                <field name="hash" xsi:type="xs:hexBinary">3137383764373634363330346335643938376366346536346133393733646337</field>
-            </row>
-        </table_data>
-        <table_data name="UserGroup">
-            <row>
-                <field name="id">1</field>
-                <field name="name">Admins</field>
-                <field name="description">sysPass Admins</field>
-            </row>
-            <row>
-                <field name="id">2</field>
-                <field name="name">Demo</field>
-                <field name="description"/>
-            </row>
-            <row>
-                <field name="id">3</field>
-                <field name="name">Usuarios</field>
-                <field name="description">Grupo Usuarios</field>
-            </row>
-        </table_data>
-        <table_data name="UserProfile">
-            <row>
-                <field name="id">1</field>
-                <field name="name">Admin</field>
-                <field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A303B733A31343A22002A006163635669657750617373223B623A303B733A31373A22002A0061636356696577486973746F7279223B623A303B733A31303A22002A0061636345646974223B623A303B733A31343A22002A006163634564697450617373223B623A303B733A393A22002A00616363416464223B623A303B733A31323A22002A0061636344656C657465223B623A303B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A313B733A31383A22002A006163635072697661746547726F7570223B623A313B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
-            </row>
-            <row>
-                <field name="id">2</field>
-                <field name="name">Demo</field>
-                <field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A313B733A31343A22002A006163635669657750617373223B623A313B733A31373A22002A0061636356696577486973746F7279223B623A313B733A31303A22002A0061636345646974223B623A313B733A31343A22002A006163634564697450617373223B623A313B733A393A22002A00616363416464223B623A313B733A31323A22002A0061636344656C657465223B623A313B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A303B733A31383A22002A006163635072697661746547726F7570223B623A303B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
-            </row>
-            <row>
-                <field name="id">3</field>
-                <field name="name">Usuarios</field>
-                <field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A313B733A31343A22002A006163635669657750617373223B623A313B733A31373A22002A0061636356696577486973746F7279223B623A313B733A31303A22002A0061636345646974223B623A313B733A31343A22002A006163634564697450617373223B623A313B733A393A22002A00616363416464223B623A313B733A31323A22002A0061636344656C657465223B623A313B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A303B733A31383A22002A006163635072697661746547726F7570223B623A303B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
-            </row>
-        </table_data>
-        <table_data name="User">
-            <row>
-                <field name="id">1</field>
-                <field name="name">sysPass Admin</field>
-                <field name="userGroupId">1</field>
-                <field name="login">admin</field>
-                <field name="ssoLogin" xsi:nil="true" />
-                <field name="pass" xsi:type="xs:hexBinary">243279243130247635695230547A4933744E3036416A304C4A656B39755371496834356C70575539366E644A71444A704E6969713139306A444A486D</field>
-                <field name="mPass" xsi:type="xs:hexBinary">64656635303230306330383635633335373637316233366261353266333137346134356466333633626135656431613962323261356461353965376134373930356664656239373436356462373934613831373635316133316432626363636266663836626233353235643930333932393734323535663937316261616239656436346637383266363066646465386539336637363164356663633436393031356433363164333234643436633533633138313335613334663739633039</field>
-                <field name="mKey" xsi:type="xs:hexBinary">6465663130303030646566353032303062316163626161346361643036643237386562323533616462643433613966376463636439343063656265313962343061383436643464633035303636306466653630613561653139363433643636353936643733333764646236386536363930336562383031373764356463386430663963623661643361663565643766303936376262393964663530373936316330656132373462663830346333663966373563336538643539396336326231623738333730303963616263373836383637366433636337376162383365386338323335336335626164396534656535333532656132346632653434653663316336656131643162313264393332386335303539623437656235343534666138356435626437343637353333383132636662313230316634633635383733316465323934613664643035396332613362373333613765343462633539306338363337393032306662303263363262303565613030623234646235323566653863303263323138666561356661353139306563396266333461316637613937633733396637343534323333316466323932343965323138656338343233306161623038373336346463353236363935383630656638623232313439626262656636656266373030366638376434343661333535353863323062353462376336623330</field>
-                <field name="email" xsi:nil="true" />
-                <field name="notes" xsi:nil="true" />
-                <field name="loginCount">81</field>
-                <field name="userProfileId">1</field>
-                <field name="lastLogin">2018-04-19 23:46:48</field>
-                <field name="lastUpdate" xsi:nil="true" />
-                <field name="lastUpdateMPass">1521887152</field>
-                <field name="isAdminApp">1</field>
-                <field name="isAdminAcc">0</field>
-                <field name="isLdap">0</field>
-                <field name="isDisabled">0</field>
-                <field name="hashSalt"></field>
-                <field name="isMigrate">0</field>
-                <field name="isChangePass">0</field>
-                <field name="isChangedPass">0</field>
-                <field name="preferences" xsi:type="xs:hexBinary">4F3A33323A2253505C446174614D6F64656C5C55736572507265666572656E63657344617461223A31303A7B733A373A22757365725F6964223B693A313B733A363A22757365324661223B623A303B733A343A226C616E67223B733A353A22656E5F5553223B733A353A227468656D65223B733A31333A226D6174657269616C2D626C7565223B733A31343A22726573756C747350657250616765223B693A34383B733A31313A226163636F756E744C696E6B223B623A313B733A393A22736F72745669657773223B623A303B733A393A22746F704E6176626172223B623A303B733A31353A226F7074696F6E616C416374696F6E73223B623A303B733A31343A22726573756C747341734361726473223B623A303B7D</field>
-            </row>
-            <row>
-                <field name="id">2</field>
-                <field name="name">sysPass demo</field>
-                <field name="userGroupId">2</field>
-                <field name="login">demo</field>
-                <field name="ssoLogin">demo</field>
-                <field name="pass" xsi:type="xs:hexBinary">2432792431302454726E69756C5763754361433635346F76566F35392E766B4C5433414E31624A6D726A79553462696335325069436A6B5572396669</field>
-                <field name="mPass" xsi:type="xs:hexBinary">64656635303230303231616533353730373263373165626239393534353966366236636164373235336534316336633534353036336339326136653730616366333930393165373934613865376662386662326664333931383932363562396466303133333631623063323732323339653465373165343839313030646534326265633737623966343238396635633936613837646531343864313963653663643338613131343932623163313765653630326430623532343564346566</field>
-                <field name="mKey" xsi:type="xs:hexBinary">6465663130303030646566353032303035643534316262633462653032333563313338626561366561333536626436663037353365313035653030333563653166316235336534663364343565366262353335626163396639646538653131316262356334383865336535633637323333666632626365313837626335386135353839373535373034386564353634366361646638623736396132323164363032353435653034306264613135663138323638383665373536313236353361313037306530333261323365636364336339616438323162306363383962643130333035303931653965626332653935313465656631373462663339343664656132393661346262366264343463646333363361643335623032373561356633323430313936346531633131663937313764313139633130633561373161666332356365346534366661623234646663626362326237303964336335316532623834326464303933653230353965373265356638376363366236626239306231346265376264373637663163303937366231313362393630613265636565336633313131663538656131346139353736623332653163303962636435313366383733656664653062373333366238643464646637616237323333373038613264393965633738356139393036306135643262316366306262663739346262663765</field>
-                <field name="email">demo@syspass.org</field>
-                <field name="notes">aaaa</field>
-                <field name="loginCount">12</field>
-                <field name="userProfileId">2</field>
-                <field name="lastLogin">2018-04-01 21:29:47</field>
-                <field name="lastUpdate">2018-04-14 08:47:43</field>
-                <field name="lastUpdateMPass">1522582852</field>
-                <field name="isAdminApp">0</field>
-                <field name="isAdminAcc">0</field>
-                <field name="isLdap">0</field>
-                <field name="isDisabled">0</field>
-                <field name="hashSalt"></field>
-                <field name="isMigrate">0</field>
-                <field name="isChangePass">0</field>
-                <field name="isChangedPass">0</field>
-                <field name="preferences" xsi:nil="true" />
-            </row>
-            <row>
-                <field name="id">3</field>
-                <field name="name">User A</field>
-                <field name="userGroupId">2</field>
-                <field name="login">user_a</field>
-                <field name="ssoLogin">user_a</field>
-                <field name="pass" xsi:type="xs:hexBinary">2432792431302469444B442E2F4F624D79742E6F43594F5249514D5065624454783966744D636A703034365A435976662E765479597A594F6A4C472E</field>
-                <field name="mPass" xsi:nil="true" />
-                <field name="mKey" xsi:nil="true" />
-                <field name="email">user_a@syspass.org</field>
-                <field name="notes"></field>
-                <field name="loginCount">0</field>
-                <field name="userProfileId">1</field>
-                <field name="lastLogin" xsi:nil="true" />
-                <field name="lastUpdate">2018-04-14 08:48:08</field>
-                <field name="lastUpdateMPass">0</field>
-                <field name="isAdminApp">0</field>
-                <field name="isAdminAcc">0</field>
-                <field name="isLdap">0</field>
-                <field name="isDisabled">0</field>
-                <field name="hashSalt"></field>
-                <field name="isMigrate">0</field>
-                <field name="isChangePass">0</field>
-                <field name="isChangedPass">0</field>
-                <field name="preferences" xsi:nil="true" />
-            </row>
-            <row>
-                <field name="id">4</field>
-                <field name="name">User B</field>
-                <field name="userGroupId">2</field>
-                <field name="login">user_b</field>
-                <field name="ssoLogin" xsi:nil="true" />
-                <field name="pass" xsi:type="xs:hexBinary">243279243130244C37643658736A663955794F6E583662472E6F384E4F713961674B6F64536B4B5674485350462F6861414E657971517065372E6532</field>
-                <field name="mPass" xsi:nil="true" />
-                <field name="mKey" xsi:nil="true" />
-                <field name="email">user_b@syspass.org</field>
-                <field name="notes"></field>
-                <field name="loginCount">0</field>
-                <field name="userProfileId">1</field>
-                <field name="lastLogin" xsi:nil="true" />
-                <field name="lastUpdate">2018-03-30 18:38:32</field>
-                <field name="lastUpdateMPass">0</field>
-                <field name="isAdminApp">0</field>
-                <field name="isAdminAcc">0</field>
-                <field name="isLdap">0</field>
-                <field name="isDisabled">0</field>
-                <field name="hashSalt"></field>
-                <field name="isMigrate">0</field>
-                <field name="isChangePass">0</field>
-                <field name="isChangedPass">0</field>
-                <field name="preferences" xsi:nil="true" />
-            </row>
-        </table_data>
-        <table_data name="Account">
-            <row>
-                <field name="id">1</field>
-                <field name="userGroupId">1</field>
-                <field name="userId">1</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">1</field>
-                <field name="name">Google</field>
-                <field name="categoryId">1</field>
-                <field name="login">admin</field>
-                <field name="url">http://google.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432</field>
-                <field name="notes">aaaa</field>
-                <field name="countView">341</field>
-                <field name="countDecrypt">35</field>
-                <field name="dateAdd">2018-03-25 09:54:07</field>
-                <field name="dateEdit">2018-04-02 21:38:25</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="otherUserEdit">0</field>
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-                <field name="passDate">1522341709</field>
-                <field name="passDateChange">0</field>
-                <field name="parentId">0</field>
-            </row>
-            <row>
-                <field name="id">2</field>
-                <field name="userGroupId">1</field>
-                <field name="userId">1</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">2</field>
-                <field name="name">Apple</field>
-                <field name="categoryId">2</field>
-                <field name="login">admin</field>
-                <field name="url">http://apple.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432</field>
-                <field name="notes">bbbb</field>
-                <field name="countView">341</field>
-                <field name="countDecrypt">35</field>
-                <field name="dateAdd">2018-03-25 09:54:07</field>
-                <field name="dateEdit">2018-04-02 21:38:25</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="otherUserEdit">0</field>
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-                <field name="passDate">1522341709</field>
-                <field name="passDateChange">0</field>
-                <field name="parentId">0</field>
-            </row>
-        </table_data>
-        <table_data name="AccountHistory">
-            <row>
-                <field name="id">3</field>
-                <field name="accountId">2</field>
-                <field name="userGroupId">1</field>
-                <field name="userId">1</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">1</field>
-                <field name="name">Google</field>
-                <field name="categoryId">1</field>
-                <field name="login">admin</field>
-                <field name="url">https://google.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">646566353032303064396362643366376662646536326637663732663861383732623430613839386131643134333933663662623033316664343362366461643762626564643634386437363964346634616234386638336636653236396166623734636261383134313363626162326461393733343934613231653934666331616664633637313732316562356666396562646132613665313937626233333563613632383830393934333863643731333230383132316430366433303838</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303032636635623034396437656539356531653838663166613438643061616132663133613163663766346238316165663837326134373665316461653661353865316666626438346130383166303062633138646136373265653935643234626564336565303063333262646262303433336633356534323263616337613238363532336233313666316137333462616337343839346631333632643863376430373861373862396135633064396239653061353537626562666336636566623766363166376330393734356461623536373762303436313865343936383434663932666364303634316330303935636239363938336361336631363161623134663339643536636233653938333833613062396464356365383736333334376364363933313563306436343362623937366139383831376632346431303364316533353133306262393862353034353262346334663934663162323531383632356530653331346438343430323362666334306264616265376437386238663632326535353338636537663431626261616461613138646333333662623762636565333030656565333734616537356365303131363731323239383132383964346634383661376635303136303835336138663335653366393230383632386162373332343335633037656432616234</field>
-                <field name="notes">blablacar</field>
-                <field name="countView">7</field>
-                <field name="countDecrypt">1</field>
-                <field name="dateAdd">2018-06-05 22:49:34</field>
-                <field name="dateEdit">2018-06-06 22:20:29</field>
-                <field name="isModify">1</field>
-                <field name="isDeleted">0</field>
-                <field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
-                <field name="otherUserEdit">0</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="passDate" xsi:nil="true" />
-                <field name="passDateChange" xsi:nil="true" />
-                <field name="parentId" xsi:nil="true" />
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-            </row>
-            <row>
-                <field name="id">4</field>
-                <field name="accountId">1</field>
-                <field name="userGroupId">1</field>
-                <field name="userId">1</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">1</field>
-                <field name="name">Google</field>
-                <field name="categoryId">1</field>
-                <field name="login">admin</field>
-                <field name="url">https://google.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">64656635303230303864313263313434383662336363353938366164613564643563393465356664353138363635643062626362613938353236646336396662333833366537363635393931353336653262326533336339323232396663636336373139393662316631616432323839326539323332343633656164386262326234363033666565306630643666323364383337363661363363353139356334333330633139636634623664343131396362356136386232636332653465616232393561</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303039326134383433323238376332636136626165313731363538316661316663393832356364653733316361623361316661343832646536626336663066646138623133323366396137626666643837386434623862633234653364363731626136613661393631343738633437653864626363656565333136343436346262623235623563633362663935363030653034346636326666636237303635343362333330616561363036336332383433383063303931383533653436616430396131393534653064393233643438313932393532646631353931623031333636356461373337646435653536623436653639396332613165363438653761623736653766383732653566376535623133303838666636663133313461376336353964373561386162323535346635653137626139626266396236363062613735306461313737626339303662316636633766343736383462346638353630356661663863323365646437393766333961303033666137653361366665383631373137613465333037366637393364356135326536646236363032663061373934373930383635336238616437333839646338653738383930303234633561623365336431373836396261626630363234326661306165663138396163376138616636313636323037313930333762666565</field>
-                <field name="notes"></field>
-                <field name="countView">11</field>
-                <field name="countDecrypt">0</field>
-                <field name="dateAdd">2018-06-05 22:11:40</field>
-                <field name="dateEdit" xsi:nil="true" />
-                <field name="isModify">1</field>
-                <field name="isDeleted">0</field>
-                <field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
-                <field name="otherUserEdit">0</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="passDate" xsi:nil="true" />
-                <field name="passDateChange" xsi:nil="true" />
-                <field name="parentId" xsi:nil="true" />
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-            </row>
-            <row>
-                <field name="id">5</field>
-                <field name="accountId">1</field>
-                <field name="userGroupId">1</field>
-                <field name="userId">1</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">1</field>
-                <field name="name">Google</field>
-                <field name="categoryId">1</field>
-                <field name="login">admin</field>
-                <field name="url">https://google.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">64656635303230303864313263313434383662336363353938366164613564643563393465356664353138363635643062626362613938353236646336396662333833366537363635393931353336653262326533336339323232396663636336373139393662316631616432323839326539323332343633656164386262326234363033666565306630643666323364383337363661363363353139356334333330633139636634623664343131396362356136386232636332653465616232393561</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303039326134383433323238376332636136626165313731363538316661316663393832356364653733316361623361316661343832646536626336663066646138623133323366396137626666643837386434623862633234653364363731626136613661393631343738633437653864626363656565333136343436346262623235623563633362663935363030653034346636326666636237303635343362333330616561363036336332383433383063303931383533653436616430396131393534653064393233643438313932393532646631353931623031333636356461373337646435653536623436653639396332613165363438653761623736653766383732653566376535623133303838666636663133313461376336353964373561386162323535346635653137626139626266396236363062613735306461313737626339303662316636633766343736383462346638353630356661663863323365646437393766333961303033666137653361366665383631373137613465333037366637393364356135326536646236363032663061373934373930383635336238616437333839646338653738383930303234633561623365336431373836396261626630363234326661306165663138396163376138616636313636323037313930333762666565</field>
-                <field name="notes"></field>
-                <field name="countView">11</field>
-                <field name="countDecrypt">0</field>
-                <field name="dateAdd">2018-06-05 22:11:40</field>
-                <field name="dateEdit">2018-06-13 20:13:53</field>
-                <field name="isModify">1</field>
-                <field name="isDeleted">0</field>
-                <field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
-                <field name="otherUserEdit">0</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="passDate" xsi:nil="true" />
-                <field name="passDateChange" xsi:nil="true" />
-                <field name="parentId" xsi:nil="true" />
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-            </row>
-            <row>
-                <field name="id">6</field>
-                <field name="accountId">1</field>
-                <field name="userGroupId">1</field>
-                <field name="userId">1</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">1</field>
-                <field name="name">Google</field>
-                <field name="categoryId">1</field>
-                <field name="login">admin</field>
-                <field name="url">https://google.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">64656635303230303864313263313434383662336363353938366164613564643563393465356664353138363635643062626362613938353236646336396662333833366537363635393931353336653262326533336339323232396663636336373139393662316631616432323839326539323332343633656164386262326234363033666565306630643666323364383337363661363363353139356334333330633139636634623664343131396362356136386232636332653465616232393561</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303039326134383433323238376332636136626165313731363538316661316663393832356364653733316361623361316661343832646536626336663066646138623133323366396137626666643837386434623862633234653364363731626136613661393631343738633437653864626363656565333136343436346262623235623563633362663935363030653034346636326666636237303635343362333330616561363036336332383433383063303931383533653436616430396131393534653064393233643438313932393532646631353931623031333636356461373337646435653536623436653639396332613165363438653761623736653766383732653566376535623133303838666636663133313461376336353964373561386162323535346635653137626139626266396236363062613735306461313737626339303662316636633766343736383462346638353630356661663863323365646437393766333961303033666137653361366665383631373137613465333037366637393364356135326536646236363032663061373934373930383635336238616437333839646338653738383930303234633561623365336431373836396261626630363234326661306165663138396163376138616636313636323037313930333762666565</field>
-                <field name="notes"></field>
-                <field name="countView">11</field>
-                <field name="countDecrypt">0</field>
-                <field name="dateAdd">2018-06-05 22:11:40</field>
-                <field name="dateEdit">2018-06-13 20:13:58</field>
-                <field name="isModify">1</field>
-                <field name="isDeleted">0</field>
-                <field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
-                <field name="otherUserEdit">0</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="passDate" xsi:nil="true" />
-                <field name="passDateChange" xsi:nil="true" />
-                <field name="parentId" xsi:nil="true" />
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-            </row>
-            <row>
-                <field name="id">7</field>
-                <field name="accountId">1</field>
-                <field name="userGroupId">1</field>
-                <field name="userId">1</field>
-                <field name="userEditId">1</field>
-                <field name="clientId">1</field>
-                <field name="name">Google</field>
-                <field name="categoryId">1</field>
-                <field name="login">admin</field>
-                <field name="url">https://google.com</field>
-                <field name="pass" xsi:type="xs:hexBinary">64656635303230303864313263313434383662336363353938366164613564643563393465356664353138363635643062626362613938353236646336396662333833366537363635393931353336653262326533336339323232396663636336373139393662316631616432323839326539323332343633656164386262326234363033666565306630643666323364383337363661363363353139356334333330633139636634623664343131396362356136386232636332653465616232393561</field>
-                <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303039326134383433323238376332636136626165313731363538316661316663393832356364653733316361623361316661343832646536626336663066646138623133323366396137626666643837386434623862633234653364363731626136613661393631343738633437653864626363656565333136343436346262623235623563633362663935363030653034346636326666636237303635343362333330616561363036336332383433383063303931383533653436616430396131393534653064393233643438313932393532646631353931623031333636356461373337646435653536623436653639396332613165363438653761623736653766383732653566376535623133303838666636663133313461376336353964373561386162323535346635653137626139626266396236363062613735306461313737626339303662316636633766343736383462346638353630356661663863323365646437393766333961303033666137653361366665383631373137613465333037366637393364356135326536646236363032663061373934373930383635336238616437333839646338653738383930303234633561623365336431373836396261626630363234326661306165663138396163376138616636313636323037313930333762666565</field>
-                <field name="notes"></field>
-                <field name="countView">11</field>
-                <field name="countDecrypt">0</field>
-                <field name="dateAdd">2018-06-05 22:11:40</field>
-                <field name="dateEdit">2018-06-13 20:14:23</field>
-                <field name="isModify">1</field>
-                <field name="isDeleted">0</field>
-                <field name="mPassHash" xsi:type="xs:hexBinary">24327924313024787473754E325055766753482F306D7266426C73624F4163745667436A596371447143364C3354395172614E785A43345258475961</field>
-                <field name="otherUserEdit">0</field>
-                <field name="otherUserGroupEdit">0</field>
-                <field name="passDate" xsi:nil="true" />
-                <field name="passDateChange" xsi:nil="true" />
-                <field name="parentId" xsi:nil="true" />
-                <field name="isPrivate">0</field>
-                <field name="isPrivateGroup">0</field>
-            </row>
-        </table_data>
-    </database>
-</mysqldump>
diff --git a/tests/res/datasets/syspass_accountSearch.xml b/tests/res/datasets/syspass_accountSearch.xml
deleted file mode 100644
index c2692e4b..00000000
--- a/tests/res/datasets/syspass_accountSearch.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0"?>
-<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<database name="syspass">
-    <table_data name="Account">
-        <row>
-            <field name="id">1</field>
-            <field name="userGroupId">1</field>
-            <field name="userId">1</field>
-            <field name="userEditId">1</field>
-            <field name="clientId">1</field>
-            <field name="name">Google</field>
-            <field name="categoryId">1</field>
-            <field name="login">admin</field>
-            <field name="url">http://google.com</field>
-            <field name="pass" xsi:type="xs:hexBinary">a</field>
-            <field name="key" xsi:type="xs:hexBinary">a</field>
-            <field name="notes">aaaa</field>
-            <field name="countView">341</field>
-            <field name="countDecrypt">35</field>
-            <field name="dateAdd">2018-03-25 09:54:07</field>
-            <field name="dateEdit">2018-04-02 21:38:25</field>
-            <field name="otherUserGroupEdit">0</field>
-            <field name="otherUserEdit">0</field>
-            <field name="isPrivate">0</field>
-            <field name="isPrivateGroup">0</field>
-            <field name="passDate">1522341709</field>
-            <field name="passDateChange">0</field>
-            <field name="parentId">0</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="userGroupId">1</field>
-            <field name="userId">1</field>
-            <field name="userEditId">1</field>
-            <field name="clientId">2</field>
-            <field name="name">Apple</field>
-            <field name="categoryId">2</field>
-            <field name="login">admin</field>
-            <field name="url">http://apple.com</field>
-            <field name="pass" xsi:type="xs:hexBinary">a</field>
-            <field name="key" xsi:type="xs:hexBinary">a</field>
-            <field name="notes">bbbb</field>
-            <field name="countView">341</field>
-            <field name="countDecrypt">35</field>
-            <field name="dateAdd">2018-03-25 09:54:07</field>
-            <field name="dateEdit">2018-04-02 21:38:25</field>
-            <field name="otherUserGroupEdit">0</field>
-            <field name="otherUserEdit">0</field>
-            <field name="isPrivate">0</field>
-            <field name="isPrivateGroup">0</field>
-            <field name="passDate">1522341709</field>
-            <field name="passDateChange">0</field>
-            <field name="parentId">0</field>
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="userGroupId">3</field>
-            <field name="userId">3</field>
-            <field name="userEditId">3</field>
-            <field name="clientId">2</field>
-            <field name="name">Github</field>
-            <field name="categoryId">2</field>
-            <field name="login">admin</field>
-            <field name="url">http://github.com</field>
-            <field name="pass" xsi:type="xs:hexBinary">a</field>
-            <field name="key" xsi:type="xs:hexBinary">a</field>
-            <field name="notes">bbbb</field>
-            <field name="countView">341</field>
-            <field name="countDecrypt">35</field>
-            <field name="dateAdd">2018-03-25 09:54:07</field>
-            <field name="dateEdit">2018-04-02 21:38:25</field>
-            <field name="otherUserGroupEdit">0</field>
-            <field name="otherUserEdit">0</field>
-            <field name="isPrivate">1</field>
-            <field name="isPrivateGroup">0</field>
-            <field name="passDate">1522341709</field>
-            <field name="passDateChange">0</field>
-            <field name="parentId">0</field>
-        </row>
-        <row>
-            <field name="id">4</field>
-            <field name="userGroupId">3</field>
-            <field name="userId">3</field>
-            <field name="userEditId">3</field>
-            <field name="clientId">3</field>
-            <field name="name">Slack</field>
-            <field name="categoryId">2</field>
-            <field name="login">admin</field>
-            <field name="url">http://slack.com</field>
-            <field name="pass" xsi:type="xs:hexBinary">a</field>
-            <field name="key" xsi:type="xs:hexBinary">a</field>
-            <field name="notes">bbbb</field>
-            <field name="countView">341</field>
-            <field name="countDecrypt">35</field>
-            <field name="dateAdd">2018-03-25 09:54:07</field>
-            <field name="dateEdit">2018-04-02 21:38:25</field>
-            <field name="otherUserGroupEdit">0</field>
-            <field name="otherUserEdit">0</field>
-            <field name="isPrivate">0</field>
-            <field name="isPrivateGroup">1</field>
-            <field name="passDate">1522341709</field>
-            <field name="passDateChange">0</field>
-            <field name="parentId">0</field>
-        </row>
-    </table_data>
-    <table_data name="AccountFile">
-        <row>
-            <field name="id">1</field>
-            <field name="accountId">1</field>
-            <field name="name">sysPass.xml</field>
-            <field name="type">text/xml</field>
-            <field name="size">1312</field>
-            <field name="content" xsi:type="xs:hexBinary">a</field>
-            <field name="extension">XML</field>
-            <field name="thumb" xsi:type="xs:hexBinary">6E6F5F7468756D62</field>
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="accountId">2</field>
-            <field name="name">Clock 3.jpg</field>
-            <field name="type">image/jpeg</field>
-            <field name="size">4273</field>
-            <field name="content" xsi:type="xs:hexBinary">a</field>
-            <field name="extension">JPG</field>
-            <field name="thumb" xsi:type="xs:hexBinary">a</field>
-        </row>
-        <row>
-            <field name="id">4</field>
-            <field name="accountId">1</field>
-            <field name="name">android.png</field>
-            <field name="type">image/png</field>
-            <field name="size">4295</field>
-            <field name="content" xsi:type="xs:hexBinary">a</field>
-            <field name="extension">PNG</field>
-            <field name="thumb" xsi:type="xs:hexBinary">a</field>
-        </row>
-    </table_data>
-    <table_data name="AccountToFavorite">
-        <row>
-            <field name="accountId">1</field>
-            <field name="userId">3</field>
-        </row>
-        <row>
-            <field name="accountId">2</field>
-            <field name="userId">3</field>
-        </row>
-        <row>
-            <field name="accountId">1</field>
-            <field name="userId">1</field>
-        </row>
-        <row>
-            <field name="accountId">2</field>
-            <field name="userId">2</field>
-        </row>
-    </table_data>
-	<table_data name="AccountToTag">
-        <row>
-            <field name="accountId">1</field>
-            <field name="tagId">1</field>
-        </row>
-        <row>
-            <field name="accountId">1</field>
-            <field name="tagId">2</field>
-        </row>
-        <row>
-            <field name="accountId">2</field>
-            <field name="tagId">3</field>
-        </row>
-        <row>
-            <field name="accountId">2</field>
-            <field name="tagId">1</field>
-        </row>
-	</table_data>
-	<table_data name="AccountToUser">
-        <row>
-            <field name="accountId">1</field>
-            <field name="userId">3</field>
-            <field name="isEdit">1</field>
-        </row>
-        <row>
-            <field name="accountId">2</field>
-            <field name="userId">3</field>
-            <field name="isEdit">0</field>
-        </row>
-	</table_data>
-	<table_data name="AccountToUserGroup">
-        <row>
-            <field name="accountId">1</field>
-            <field name="userGroupId">2</field>
-            <field name="isEdit">1</field>
-        </row>
-        <row>
-            <field name="accountId">2</field>
-            <field name="userGroupId">3</field>
-            <field name="isEdit">0</field>
-        </row>
-	</table_data>
-	<table_data name="UserToUserGroup">
-        <row>
-            <field name="userId">1</field>
-            <field name="userGroupId">2</field>
-        </row>
-        <row>
-            <field name="userId">3</field>
-            <field name="userGroupId">2</field>
-        </row>
-        <row>
-            <field name="userId">2</field>
-            <field name="userGroupId">1</field>
-        </row>
-	</table_data>
-</database>
-</mysqldump>
diff --git a/tests/res/datasets/syspass_authToken.xml b/tests/res/datasets/syspass_authToken.xml
deleted file mode 100644
index 10e4d94d..00000000
--- a/tests/res/datasets/syspass_authToken.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<database name="syspass">
-	<table_data name="AuthToken">
-	<row>
-		<field name="id">1</field>
-		<field name="userId">2</field>
-		<field name="token" xsi:type="xs:hexBinary">31326239303237643234656666663762666261636138626437373461346333346234356465333565303333643262313932613838663464666165653563323333</field>
-		<field name="actionId">2</field>
-		<field name="createdBy">1</field>
-		<field name="startDate">1530745272</field>
-		<field name="vault" xsi:nil="true" />
-		<field name="hash" xsi:nil="true" />
-	</row>
-	<row>
-		<field name="id">2</field>
-		<field name="userId">1</field>
-		<field name="token" xsi:type="xs:hexBinary">32636565386232323466343865303165663438616331373265383739636337383235383030613964376365336232333738333231326634373538663163313436</field>
-		<field name="actionId">7</field>
-		<field name="createdBy">1</field>
-		<field name="startDate">1530829026</field>
-		<field name="vault" xsi:type="xs:hexBinary">4F3A31393A2253505C436F72655C43727970745C5661756C74223A343A7B733A32353A220053505C436F72655C43727970745C5661756C740064617461223B733A3139303A2264656635303230303432636161656630303536346330653132343136383261366464643565383064643962656430393164393434383866383234623366333862663139383537633238393433373636653931346164336432396337393638613163376162353738663565306634396666646231653762616565306334383932303862343838393239323662656536376363653538323865376239363439326261383634306662613761626461656366363734643034646331613833373261223B733A32343A220053505C436F72655C43727970745C5661756C74006B6579223B733A3531323A226465663130303030646566353032303032303963343139663738326462383466316664653432623536303836383637653165323766613032663666663737306631343834613532343530653435613464343433383762323962323563313162663932666666633766346435336132326331353930383134623239313962613261363433393932306462666164643466323339373733326661326635353035376666626132373361613433363630383331626235346336616163356135633762383963636139313064356539316638613364616464633832393139323666316562623362343835653366316165353731623731636365383031343461393464666431333361366232346331616665636366616663316364306439366631383862623730613864326639356365616131373137346565323636353234363661313432633332373935343062346233343066633230373063373634383034313835343930363163303063313433323164356436306636396337376636326536366465383135396538336534643161653437653765366434663532633364623166663836633465306463313131393734323535336630313933646263323764373835346139363735646465613862303765663266363365383666343963323336373839323335396234303939626630303430643763643934623935616431616430613237223B733A32383A220053505C436F72655C43727970745C5661756C740074696D65536574223B693A313533303832393032363B733A33323A220053505C436F72655C43727970745C5661756C740074696D6555706461746564223B693A303B7D</field>
-		<field name="hash" xsi:type="xs:hexBinary">24327924313024434936705834636646516B56432E56426F3373784E652F6D7271486C6E584550546439625A2F7164454271584468472F634D416865</field>
-	</row>
-	<row>
-		<field name="id">3</field>
-		<field name="userId">1</field>
-		<field name="token" xsi:type="xs:hexBinary">32636565386232323466343865303165663438616331373265383739636337383235383030613964376365336232333738333231326634373538663163313436</field>
-		<field name="actionId">2</field>
-		<field name="createdBy">1</field>
-		<field name="startDate">1530824672</field>
-		<field name="vault" xsi:nil="true" />
-		<field name="hash" xsi:nil="true" />
-	</row>
-	<row>
-		<field name="id">4</field>
-		<field name="userId">1</field>
-		<field name="token" xsi:type="xs:hexBinary">32636565386232323466343865303165663438616331373265383739636337383235383030613964376365336232333738333231326634373538663163313436</field>
-		<field name="actionId">3</field>
-		<field name="createdBy">1</field>
-		<field name="startDate">1530824680</field>
-		<field name="vault" xsi:nil="true" />
-		<field name="hash" xsi:nil="true" />
-	</row>
-	<row>
-		<field name="id">5</field>
-		<field name="userId">1</field>
-		<field name="token" xsi:type="xs:hexBinary">32636565386232323466343865303165663438616331373265383739636337383235383030613964376365336232333738333231326634373538663163313436</field>
-		<field name="actionId">6</field>
-		<field name="createdBy">1</field>
-		<field name="startDate">1530824689</field>
-		<field name="vault" xsi:nil="true" />
-		<field name="hash" xsi:nil="true" />
-	</row>
-	</table_data>
-</database>
-</mysqldump>
diff --git a/tests/res/datasets/syspass_config.xml b/tests/res/datasets/syspass_config.xml
deleted file mode 100644
index fa6cd73f..00000000
--- a/tests/res/datasets/syspass_config.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<mysqldump>
-<database name="syspass">
-	<table_data name="Config">
-	<row>
-		<field name="parameter">config_backup</field>
-		<field name="VALUE">789ca558db6edb3810edb718c5be6c6b88ba4b45814de3a497a48d374e832cb0404191944d589654916a9216f9f71d5292633ba1a4621f628bf11cce68e6cc85bc886d2b9e2ce6ff1e1779ca97edd70c4b3c89c328fe2562c78e272f9e13785197cb0a5376c6ee276f440cdba82f273089d3625ddff2353fc97192313a79c3634b019c21c0d72afb2d0520ff0e0bb68b7107318255bf059863217601d110e00bde305162b2675768426514973396e23a93efaba22e95b710205c6b04625e1529cf588731bf4c591577f7a3e3a1a517acfab1ef2ad42b3f2f2aa9b60eadd01a963e0cc3c0de0731307ab3ac938ce76bf119df5d73762b94414e2f977610577ca35de95bd628c88e3ffbbd8f0929ea5c1eab0fada0d7fbadf439a818de9aac18597f2d29964c6c03db2f9d1792931d6963da13fdf8018bd5a42524b6701a440125a1635386b01721124436b27c9fb1d0775ddb4d9dc8f394bc6d0c124d3e14422a1904968a7b4816215ed3e435653f74788dd4a7c9a2206b2677b8d0a74665a29209b65a86101dd1901f4f2e681cf0facbf787e4e5d9fd59fc6b08db515a6145f9cd4b506061d7717c8cc9a0de36791cc752e4b0cda58f25f5724445659be230dd8dea550911475956dc327a7227c101384661fcabc5c593f9ec74cbc478f269fe5eadec66f5fee3e936c940f28bfecd6d5617b32bb5f2bad5624bfe7832bb3856ab40314baf6e74f1687ebc39d7a251bb5a9c6bf5ad35d78b995eb6e65cdd6825a8b5e77871ad97ad41ef8ecef4b2b5e87236d7cbd6a4b3937ff4b2b5e9f8b2d92a68f57e06bd0f633db7e03f9b426cd96e6f126ad0e8dab1cc8a04670b862bb2da86d2582d792e24ce7637ee6d235df7b481b294bc55ac41afe021ad18e325568f45b5ecef937a1f9ed38efe1e70b7e6f42da61b9ebf22f9db1a7e10eaa12d6ce2d5ff55d56529b4e205231593c87634d2eb43ce9feb3bc60c5288830cb28dad5f091f51311c1f25d8b6f9471b8c0558493fb6611b76054f4db5eba6addfa6a39ca6de1a4b598dd35a2c0fd9697e1f90fdc1f2a666d85dc900064054a0254dbb1d2030ca8e69934fc6eab6c13c3baae58a8d9d5414e0d05823e395f069556cba220d2d53fed53686ad1f7bd1dbf600cefbe3d3cbdbb5fc13fdbd621723906d81b755e5718dfe54a297ec7b0d9689c3fa6d8cb002411ed41597f7a322dc003a5e2957a8ff4c7fcb15bbddee5947fafdef4878c93be2a08e38cf6ff630f42e8f14dceeb44fb83efee412d8961336ec6765d16d51d105cef404e28383528a2c2f24d84a129c467e40ad10852ea3b6cd984d42eaf98107bf92089e228252db09e02f85f19da6fd6eaa9880095f1c89635ced9416a3bc6042f02257436c51cba6253683ac318e824b768e731d2f7030cbfb4771257eb562cd4c851cc51ac92a8eb3d74956b3fe02dccc92d7d009c0c62e851ccb9aa2d0f21c64a181131f7c24d0ac86363006fab9f3a891534af894677264ab684e894b56ef1f5f8dbe50f24d433f400c4ce2f0d84c18f0be8ee7f8be1a795c23a83ba67cdc806d8745d2f8320926ebbafcb6da99fa49845c3b0ac324a211c28e2274e83861905a5ee49000239be1d4c376bf97d85d0935707f633742294e08248b150528f1121b411e3976e0fbd8713d0b0784fa76d2dfe05652964f8aa5d1f95059f61b9cd55b901bf14b68b9928d2ec80de8e901da18aa06d0f5084f4fabe60b80768e52cde8aad0d11d6e940d8316b8b508dca3e7b3fe12c47252dd9772d15496edcdc4d039f7b4ce323de41c1138678a2de78c633486960fa32827072c758df5608b8069a1382f963c3f24f8307456a8ea3feac24988e2b93b1af35dd023e0e08ac69caeadf34eee4a5e3d4957a3a23d547781812cc70f2d28fe0fff0152be6bea</field>
-	</row>
-	<row>
-		<field name="parameter">config_backup_date</field>
-		<field name="VALUE">1531353681</field>
-	</row>
-	<row>
-		<field name="parameter">lastupdatempass</field>
-		<field name="VALUE">1528236611</field>
-	</row>
-	<row>
-		<field name="parameter">masterPwd</field>
-		<field name="VALUE">$2y$10$xtsuN2PUvgSH/0mrfBlsbOActVgCjYcqDqC6L3T9QraNxZC4RXGYa</field>
-	</row>
-	<row>
-		<field name="parameter">tempmaster_attempts</field>
-		<field name="VALUE">0</field>
-	</row>
-	<row>
-		<field name="parameter">tempmaster_maxtime</field>
-		<field name="VALUE">1531268994</field>
-	</row>
-	<row>
-		<field name="parameter">tempmaster_pass</field>
-		<field name="VALUE">def502004ade49f88af42e50363817fe90be2a5ebe3fc9a390510f2043ea23f231c5e3d31fbdd84ab93634b139a02ae1b005767317602ef093053ed8613bd7ca500c7398b4d600de088a9fa57ccff44480a263a0bb3a250f6430e62c004fbd</field>
-	</row>
-	<row>
-		<field name="parameter">tempmaster_passhash</field>
-		<field name="VALUE">$2y$10$34Kc7lFqwVdjaPCBGLlAC.ZpCL//IaHCodDeEX/fcSPNiOxx.nvhm</field>
-	</row>
-	<row>
-		<field name="parameter">tempmaster_passkey</field>
-		<field name="VALUE">def10000def50200b5b5061cc8abf3cfd7221c92833d0016e65d39c75ccae5410cbb2eaf55ff4c7de04de1754f38480e8f8eb305c552310468fea3d84752e649c867ca16b6ba078c2cc42fdbd0b2dfe1a362fc5cc20599326c9e194b24020b8bdad22940721c6f1e3c29e491057a8323aad9cd265962cca06499e2f59278322ed3f2f909553df0f13be17c2b1650bfbc81057b334caafca8c13d4811c7034737834bc1cad0e763c4bbc34b8af0baa47413971e9e553a8f9642a414d3e2245072b137448083823cf89130796c2ec7a5ecaa346538ed3cbb2112b6c1ca51d732ad8dada7b4a78eedc27748611f51b7edf763a4b21f0f4f5893b3b014f901269b0a</field>
-	</row>
-	<row>
-		<field name="parameter">tempmaster_passtime</field>
-		<field name="VALUE">1531265394</field>
-	</row>
-	<row>
-		<field name="parameter">version</field>
-		<field name="VALUE">300.18053101</field>
-	</row>
-	</table_data>
-</database>
-</mysqldump>
diff --git a/tests/res/datasets/syspass_customField.xml b/tests/res/datasets/syspass_customField.xml
deleted file mode 100644
index aaa62357..00000000
--- a/tests/res/datasets/syspass_customField.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0"?>
-<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<database name="syspass">
-	<table_data name="CustomFieldDefinition">
-		<row>
-			<field name="id">1</field>
-			<field name="name">Prueba</field>
-			<field name="moduleId">1</field>
-			<field name="required">1</field>
-			<field name="help">Ayuda</field>
-			<field name="showInList">0</field>
-			<field name="typeId">1</field>
-			<field name="isEncrypted">1</field>
-		</row>
-		<row>
-			<field name="id">2</field>
-			<field name="name">RSA</field>
-			<field name="moduleId">101</field>
-			<field name="required">0</field>
-			<field name="help"/>
-			<field name="showInList">0</field>
-			<field name="typeId">2</field>
-			<field name="isEncrypted">0</field>
-		</row>
-		<row>
-			<field name="id">3</field>
-			<field name="name">SSL</field>
-			<field name="moduleId">101</field>
-			<field name="required">0</field>
-			<field name="help"/>
-			<field name="showInList">0</field>
-			<field name="typeId">10</field>
-			<field name="isEncrypted">1</field>
-		</row>
-	</table_data>
-	<table_data name="CustomFieldData">
-		<row>
-			<field name="id">1</field>
-			<field name="moduleId">1</field>
-			<field name="itemId">1</field>
-			<field name="definitionId">1</field>
-			<field name="data" xsi:type="xs:hexBinary">6465663530323030633262353536613539613465333330646461323833363730363462623861326463336630643963386565333935366134326631326135326261323035633036663063313933313263626465353630396562303133356364613461353738636534616263323436343235613739343338663461393231353433623437633062386134363566336466663131373061613162663532356466646434383165613664333763303537396132</field>
-			<field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303061356237393366343238663337393936356539393836656663363632396332613462336662323431666131343731326332333138323465376632366639313863383663653164636330393838333735343463326237316232383361663135633731363438326630303863313135326563623238383939313939346139376165613836623432613534333166383261343734343565636336376137643462633266396263343065653162333236343030373163333334386338626331613632323165613534346433396630636537343538356561653432376266373131633864366237336166316561613237623630643863626631643531666636366133366562636364353232643538633734653664626363613534646334366662303739626631653537626530646231643363316464313264303139633665663437633366353431303231633233376639303066333633323838613864346464393463323637306365313239393864626237396235333262623266383330323164663062656631326138363664646132343132653338333535636137646465613364336663366535303532346634653961313435366466313034626238376433633532353837643036613162383066613361613064643330633866356239373338663930336535653432653362363333333739333863</field>
-		</row>
-		<row>
-			<field name="id">2</field>
-			<field name="moduleId">101</field>
-			<field name="itemId">1</field>
-			<field name="definitionId">2</field>
-			<field name="data" xsi:type="xs:hexBinary">4C6F72656D20697073756D20646F6C6F722073697420616D65742C20636F6E73656374657475722061646970697363696E6720656C69742E205365642075742074696E636964756E74206C6F72656D2E205072616573656E74207665686963756C6120766F6C7574706174206C696265726F2073697420616D65742066617563696275732E2041656E65616E20766974616520617263752071756973206C616375732070756C76696E617220737573636970697420617420656765742074656C6C75732E204E616D2066656C6973207475727069732C207363656C657269737175652075742066656C69732061632C2074696E636964756E74206D6178696D7573206D692E205365642076756C7075746174652076697461652073656D20616320736F6C6C696369747564696E2E20446F6E6563206672696E67696C6C61206C6F626F7274697320657820657520706F72747469746F722E20457469616D2073656D70657220736F6C6C696369747564696E207665686963756C612E20467573636520766172697573206E756C6C61206D657475732C206E65632076697665727261206E696268206469676E697373696D2069642E</field>
-			<field name="key" xsi:nil="true" />
-		</row>
-		<row>
-			<field name="id">3</field>
-			<field name="moduleId">1</field>
-			<field name="itemId">2</field>
-			<field name="definitionId">1</field>
-			<field name="data" xsi:type="xs:hexBinary">646566353032303064656134373466643830666664303264336662323864396566393731653237643161333834353933323463376461353236343466316430316638326335316536623332366533383066353463623235653235613738656637393639643066363465623331313961313731613536353632383439303539633937616561636362653539393030373861393264623262336330363331326534613034363634306435646366643965</field>
-			<field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303036373464616463613665303139656365643164306230663630643430343635636531373031663039333263653334343563336338383736653362333531373631613939346135306231373962303566343035373936376334613732623165303637646133623137663339623831383339663230613038663139623363356631316531636436323062336564383636626432353433383633326337653365666530393666613736666164336461623832393934646335653037313338623936353761333464373435373733653861323761323036346333313461346335343465376364363333666434353961363935373632663035666466333330323032636430623864316633333835386330313663336431336566376663653866376562633263393938316365616562663737323162346136303137653864336533653762613635623334373031626238306262383565613735356238653166616235316666313839383662663666393861376231323263313934363034333064316262363539346233643439333664303932323066303938333332376437303732653332376462626339323833636134663830666164303063643730326138623031373337366438326138343636643936333330653762646232633637666330373531363434626166623031346564306563353436</field>
-		</row>
-	</table_data>
-</database>
-</mysqldump>
diff --git a/tests/res/datasets/syspass_eventlog.xml b/tests/res/datasets/syspass_eventlog.xml
deleted file mode 100644
index 87207aea..00000000
--- a/tests/res/datasets/syspass_eventlog.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0"?>
-<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <database name="syspass">
-        <table_data name="EventLog">
-            <row>
-                <field name="id">1</field>
-                <field name="date">1527720052</field>
-                <field name="login">-</field>
-                <field name="userId" xsi:nil="true"/>
-                <field name="ipAddress">172.19.0.1</field>
-                <field name="action">login.auth.database</field>
-                <field name="description">
-                    Tipo : authDatabase
-                    Usuario : admin
-                </field>
-                <field name="level">INFO</field>
-            </row>
-            <row>
-                <field name="id">2</field>
-                <field name="date">1527720053</field>
-                <field name="login">admin</field>
-                <field name="userId">1</field>
-                <field name="ipAddress">172.19.0.1</field>
-                <field name="action">login.session.load</field>
-                <field name="description">
-                    Usuario : admin
-                </field>
-                <field name="level">INFO</field>
-            </row>
-            <row>
-                <field name="id">3</field>
-                <field name="date">1527720053</field>
-                <field name="login">admin</field>
-                <field name="userId">1</field>
-                <field name="ipAddress">172.19.0.1</field>
-                <field name="action">login.preferences.load</field>
-                <field name="description" xsi:nil="true"/>
-                <field name="level">INFO</field>
-            </row>
-            <row>
-                <field name="id">4</field>
-                <field name="date">1527723866</field>
-                <field name="login">admin</field>
-                <field name="userId">1</field>
-                <field name="ipAddress">172.19.0.1</field>
-                <field name="action">logout</field>
-                <field name="description">Finalizar sesión
-                    Usuario : admin
-                    Tiempo inactivo : 0.02 min.
-                    Tiempo total : 63.72 min.
-                </field>
-                <field name="level">INFO</field>
-            </row>
-            <row>
-                <field name="id">5</field>
-                <field name="date">1527796875</field>
-                <field name="login">-</field>
-                <field name="userId" xsi:nil="true"/>
-                <field name="ipAddress">172.19.0.1</field>
-                <field name="action">login.auth.database</field>
-                <field name="description">
-                    Tipo : authDatabase
-                    Usuario : admin
-                </field>
-                <field name="level">INFO</field>
-            </row>
-            <row>
-                <field name="id">6</field>
-                <field name="date">1527796876</field>
-                <field name="login">admin</field>
-                <field name="userId">1</field>
-                <field name="ipAddress">172.19.0.1</field>
-                <field name="action">login.session.load</field>
-                <field name="description">
-                    Usuario : admin
-                </field>
-                <field name="level">INFO</field>
-            </row>
-            <row>
-                <field name="id">7</field>
-                <field name="date">1527796876</field>
-                <field name="login">admin</field>
-                <field name="userId">1</field>
-                <field name="ipAddress">172.19.0.1</field>
-                <field name="action">login.preferences.load</field>
-                <field name="description" xsi:nil="true"/>
-                <field name="level">INFO</field>
-            </row>
-            <row>
-                <field name="id">8</field>
-                <field name="date">1527800242</field>
-                <field name="login">-</field>
-                <field name="userId" xsi:nil="true"/>
-                <field name="ipAddress">172.19.0.1</field>
-                <field name="action">login.auth.database</field>
-                <field name="description">
-                    Tipo : authDatabase
-                    Usuario : admin
-                </field>
-                <field name="level">INFO</field>
-            </row>
-            <row>
-                <field name="id">9</field>
-                <field name="date">1527800243</field>
-                <field name="login">admin</field>
-                <field name="userId">1</field>
-                <field name="ipAddress">172.19.0.1</field>
-                <field name="action">login.session.load</field>
-                <field name="description">
-                    Usuario : admin
-                </field>
-                <field name="level">INFO</field>
-            </row>
-            <row>
-                <field name="id">10</field>
-                <field name="date">1527800243</field>
-                <field name="login">admin</field>
-                <field name="userId">1</field>
-                <field name="ipAddress">172.19.0.1</field>
-                <field name="action">login.preferences.load</field>
-                <field name="description" xsi:nil="true"/>
-                <field name="level">INFO</field>
-            </row>
-            <row>
-                <field name="id">11</field>
-                <field name="date">1527807482</field>
-                <field name="login">-</field>
-                <field name="userId" xsi:nil="true"/>
-                <field name="ipAddress">172.19.0.1</field>
-                <field name="action">login.auth.database</field>
-                <field name="description">
-                    Tipo : authDatabase
-                    Usuario : admin
-                </field>
-                <field name="level">INFO</field>
-            </row>
-            <row>
-                <field name="id">12</field>
-                <field name="date">1527807483</field>
-                <field name="login">admin</field>
-                <field name="userId">1</field>
-                <field name="ipAddress">172.19.0.1</field>
-                <field name="action">login.session.load</field>
-                <field name="description">
-                    Usuario : admin
-                </field>
-                <field name="level">INFO</field>
-            </row>
-            <row>
-                <field name="id">13</field>
-                <field name="date">1527807483</field>
-                <field name="login">admin</field>
-                <field name="userId">1</field>
-                <field name="ipAddress">172.19.0.1</field>
-                <field name="action">login.preferences.load</field>
-                <field name="description" xsi:nil="true"/>
-                <field name="level">INFO</field>
-            </row>
-            <row>
-                <field name="id">14</field>
-                <field name="date">1527807531</field>
-                <field name="login">admin</field>
-                <field name="userId">1</field>
-                <field name="ipAddress">172.19.0.1</field>
-                <field name="action">logout</field>
-                <field name="description">Finalizar sesión
-                    Usuario : admin
-                    Tiempo inactivo : 0 min.
-                    Tiempo total : 0.92 min.
-                </field>
-                <field name="level">INFO</field>
-            </row>
-        </table_data>
-    </database>
-</mysqldump>
diff --git a/tests/res/datasets/syspass_import.xml b/tests/res/datasets/syspass_import.xml
deleted file mode 100644
index 9a5616e6..00000000
--- a/tests/res/datasets/syspass_import.xml
+++ /dev/null
@@ -1,263 +0,0 @@
-<?xml version="1.0"?>
-<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<database name="syspass">
-    <table_data name="UserGroup">
-        <row>
-            <field name="id">1</field>
-            <field name="name">Admins</field>
-            <field name="description">sysPass Admins</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="name">Demo</field>
-            <field name="description"/>
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="name">Usuarios</field>
-            <field name="description">Grupo Usuarios</field>
-        </row>
-    </table_data>
-    <table_data name="UserProfile">
-        <row>
-            <field name="id">1</field>
-            <field name="name">Admin</field>
-            <field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A303B733A31343A22002A006163635669657750617373223B623A303B733A31373A22002A0061636356696577486973746F7279223B623A303B733A31303A22002A0061636345646974223B623A303B733A31343A22002A006163634564697450617373223B623A303B733A393A22002A00616363416464223B623A303B733A31323A22002A0061636344656C657465223B623A303B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A313B733A31383A22002A006163635072697661746547726F7570223B623A313B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="name">Demo</field>
-            <field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A313B733A31343A22002A006163635669657750617373223B623A313B733A31373A22002A0061636356696577486973746F7279223B623A313B733A31303A22002A0061636345646974223B623A313B733A31343A22002A006163634564697450617373223B623A313B733A393A22002A00616363416464223B623A313B733A31323A22002A0061636344656C657465223B623A313B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A303B733A31383A22002A006163635072697661746547726F7570223B623A303B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="name">Usuarios</field>
-            <field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A313B733A31343A22002A006163635669657750617373223B623A313B733A31373A22002A0061636356696577486973746F7279223B623A313B733A31303A22002A0061636345646974223B623A313B733A31343A22002A006163634564697450617373223B623A313B733A393A22002A00616363416464223B623A313B733A31323A22002A0061636344656C657465223B623A313B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A303B733A31383A22002A006163635072697661746547726F7570223B623A303B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
-        </row>
-    </table_data>
-    <table_data name="User">
-        <row>
-            <field name="id">1</field>
-            <field name="name">sysPass Admin</field>
-            <field name="userGroupId">1</field>
-            <field name="login">admin</field>
-            <field name="ssoLogin" xsi:nil="true" />
-            <field name="pass" xsi:type="xs:hexBinary">243279243130247635695230547A4933744E3036416A304C4A656B39755371496834356C70575539366E644A71444A704E6969713139306A444A486D</field>
-            <field name="mPass" xsi:type="xs:hexBinary">64656635303230306330383635633335373637316233366261353266333137346134356466333633626135656431613962323261356461353965376134373930356664656239373436356462373934613831373635316133316432626363636266663836626233353235643930333932393734323535663937316261616239656436346637383266363066646465386539336637363164356663633436393031356433363164333234643436633533633138313335613334663739633039</field>
-            <field name="mKey" xsi:type="xs:hexBinary">6465663130303030646566353032303062316163626161346361643036643237386562323533616462643433613966376463636439343063656265313962343061383436643464633035303636306466653630613561653139363433643636353936643733333764646236386536363930336562383031373764356463386430663963623661643361663565643766303936376262393964663530373936316330656132373462663830346333663966373563336538643539396336326231623738333730303963616263373836383637366433636337376162383365386338323335336335626164396534656535333532656132346632653434653663316336656131643162313264393332386335303539623437656235343534666138356435626437343637353333383132636662313230316634633635383733316465323934613664643035396332613362373333613765343462633539306338363337393032306662303263363262303565613030623234646235323566653863303263323138666561356661353139306563396266333461316637613937633733396637343534323333316466323932343965323138656338343233306161623038373336346463353236363935383630656638623232313439626262656636656266373030366638376434343661333535353863323062353462376336623330</field>
-            <field name="email" xsi:nil="true" />
-            <field name="notes" xsi:nil="true" />
-            <field name="loginCount">81</field>
-            <field name="userProfileId">1</field>
-            <field name="lastLogin">2018-04-19 23:46:48</field>
-            <field name="lastUpdate" xsi:nil="true" />
-            <field name="lastUpdateMPass">1521887152</field>
-            <field name="isAdminApp">1</field>
-            <field name="isAdminAcc">0</field>
-            <field name="isLdap">0</field>
-            <field name="isDisabled">0</field>
-            <field name="hashSalt"></field>
-            <field name="isMigrate">0</field>
-            <field name="isChangePass">0</field>
-            <field name="isChangedPass">0</field>
-            <field name="preferences" xsi:type="xs:hexBinary">4F3A33323A2253505C446174614D6F64656C5C55736572507265666572656E63657344617461223A31303A7B733A373A22757365725F6964223B693A313B733A363A22757365324661223B623A303B733A343A226C616E67223B733A353A22656E5F5553223B733A353A227468656D65223B733A31333A226D6174657269616C2D626C7565223B733A31343A22726573756C747350657250616765223B693A34383B733A31313A226163636F756E744C696E6B223B623A313B733A393A22736F72745669657773223B623A303B733A393A22746F704E6176626172223B623A303B733A31353A226F7074696F6E616C416374696F6E73223B623A303B733A31343A22726573756C747341734361726473223B623A303B7D</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="name">sysPass demo</field>
-            <field name="userGroupId">2</field>
-            <field name="login">demo</field>
-            <field name="ssoLogin">demo</field>
-            <field name="pass" xsi:type="xs:hexBinary">2432792431302454726E69756C5763754361433635346F76566F35392E766B4C5433414E31624A6D726A79553462696335325069436A6B5572396669</field>
-            <field name="mPass" xsi:type="xs:hexBinary">64656635303230303231616533353730373263373165626239393534353966366236636164373235336534316336633534353036336339326136653730616366333930393165373934613865376662386662326664333931383932363562396466303133333631623063323732323339653465373165343839313030646534326265633737623966343238396635633936613837646531343864313963653663643338613131343932623163313765653630326430623532343564346566</field>
-            <field name="mKey" xsi:type="xs:hexBinary">6465663130303030646566353032303035643534316262633462653032333563313338626561366561333536626436663037353365313035653030333563653166316235336534663364343565366262353335626163396639646538653131316262356334383865336535633637323333666632626365313837626335386135353839373535373034386564353634366361646638623736396132323164363032353435653034306264613135663138323638383665373536313236353361313037306530333261323365636364336339616438323162306363383962643130333035303931653965626332653935313465656631373462663339343664656132393661346262366264343463646333363361643335623032373561356633323430313936346531633131663937313764313139633130633561373161666332356365346534366661623234646663626362326237303964336335316532623834326464303933653230353965373265356638376363366236626239306231346265376264373637663163303937366231313362393630613265636565336633313131663538656131346139353736623332653163303962636435313366383733656664653062373333366238643464646637616237323333373038613264393965633738356139393036306135643262316366306262663739346262663765</field>
-            <field name="email">demo@syspass.org</field>
-            <field name="notes">aaaa</field>
-            <field name="loginCount">12</field>
-            <field name="userProfileId">2</field>
-            <field name="lastLogin">2018-04-01 21:29:47</field>
-            <field name="lastUpdate">2018-04-14 08:47:43</field>
-            <field name="lastUpdateMPass">1522582852</field>
-            <field name="isAdminApp">0</field>
-            <field name="isAdminAcc">0</field>
-            <field name="isLdap">0</field>
-            <field name="isDisabled">0</field>
-            <field name="hashSalt"></field>
-            <field name="isMigrate">0</field>
-            <field name="isChangePass">0</field>
-            <field name="isChangedPass">0</field>
-            <field name="preferences" xsi:nil="true" />
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="name">User A</field>
-            <field name="userGroupId">2</field>
-            <field name="login">user_a</field>
-            <field name="ssoLogin">user_a</field>
-            <field name="pass" xsi:type="xs:hexBinary">2432792431302469444B442E2F4F624D79742E6F43594F5249514D5065624454783966744D636A703034365A435976662E765479597A594F6A4C472E</field>
-            <field name="mPass" xsi:nil="true" />
-            <field name="mKey" xsi:nil="true" />
-            <field name="email">user_a@syspass.org</field>
-            <field name="notes"></field>
-            <field name="loginCount">0</field>
-            <field name="userProfileId">1</field>
-            <field name="lastLogin" xsi:nil="true" />
-            <field name="lastUpdate">2018-04-14 08:48:08</field>
-            <field name="lastUpdateMPass">0</field>
-            <field name="isAdminApp">0</field>
-            <field name="isAdminAcc">0</field>
-            <field name="isLdap">0</field>
-            <field name="isDisabled">0</field>
-            <field name="hashSalt"></field>
-            <field name="isMigrate">0</field>
-            <field name="isChangePass">0</field>
-            <field name="isChangedPass">0</field>
-            <field name="preferences" xsi:nil="true" />
-        </row>
-        <row>
-            <field name="id">4</field>
-            <field name="name">User B</field>
-            <field name="userGroupId">2</field>
-            <field name="login">user_b</field>
-            <field name="ssoLogin" xsi:nil="true" />
-            <field name="pass" xsi:type="xs:hexBinary">243279243130244C37643658736A663955794F6E583662472E6F384E4F713961674B6F64536B4B5674485350462F6861414E657971517065372E6532</field>
-            <field name="mPass" xsi:nil="true" />
-            <field name="mKey" xsi:nil="true" />
-            <field name="email">user_b@syspass.org</field>
-            <field name="notes"></field>
-            <field name="loginCount">0</field>
-            <field name="userProfileId">1</field>
-            <field name="lastLogin" xsi:nil="true" />
-            <field name="lastUpdate">2018-03-30 18:38:32</field>
-            <field name="lastUpdateMPass">0</field>
-            <field name="isAdminApp">0</field>
-            <field name="isAdminAcc">0</field>
-            <field name="isLdap">0</field>
-            <field name="isDisabled">0</field>
-            <field name="hashSalt"></field>
-            <field name="isMigrate">0</field>
-            <field name="isChangePass">0</field>
-            <field name="isChangedPass">0</field>
-            <field name="preferences" xsi:nil="true" />
-        </row>
-    </table_data>
-    <table_data name="Category">
-        <row>
-            <field name="id">1</field>
-            <field name="name">Web</field>
-            <field name="description">Web sites</field>
-            <field name="hash" xsi:type="xs:hexBinary">3235363761356563393730356562376163326339383430333365303631383964</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="name">Linux</field>
-            <field name="description">Linux server</field>
-            <field name="hash" xsi:type="xs:hexBinary">6532303661353465393736393063636535306363383732646437306565383936</field>
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="name">SSH</field>
-            <field name="description">SSH access</field>
-            <field name="hash" xsi:type="xs:hexBinary">3137383764373634363330346335643938376366346536346133393733646337</field>
-        </row>
-    </table_data>
-    <table_data name="Client">
-        <row>
-            <field name="id">1</field>
-            <field name="name">Google</field>
-            <field name="hash" xsi:type="xs:hexBinary">6338323263316236333835336564323733623839363837616335303566396661</field>
-            <field name="description">Google Inc.</field>
-            <field name="isGlobal">0</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="name">Apple</field>
-            <field name="hash" xsi:type="xs:hexBinary">3166333837306265323734663663343962336533316130633637323839353766</field>
-            <field name="description">Apple Inc.</field>
-            <field name="isGlobal">0</field>
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="name">Microsoft</field>
-            <field name="hash" xsi:type="xs:hexBinary">3566353332613366633466316561343033663337303730663539613761353361</field>
-            <field name="description">Microsoft Inc.</field>
-            <field name="isGlobal">1</field>
-        </row>
-    </table_data>
-    <table_data name="Tag">
-        <row>
-            <field name="id">1</field>
-            <field name="name">www</field>
-            <field name="hash" xsi:type="xs:hexBinary">3465616533356631623335393737613030656264383038366332353964346339</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="name">windows</field>
-            <field name="hash" xsi:type="xs:hexBinary">3066343133376564313530326235303435643630383361613235386235633432</field>
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="name">Linux</field>
-            <field name="hash" xsi:type="xs:hexBinary">6532303661353465393736393063636535306363383732646437306565383936</field>
-        </row>
-    </table_data>
-	<table_data name="Account">
-	<row>
-		<field name="id">1</field>
-		<field name="userGroupId">1</field>
-		<field name="userId">1</field>
-		<field name="userEditId">1</field>
-		<field name="clientId">1</field>
-		<field name="name">Google</field>
-		<field name="categoryId">1</field>
-		<field name="login">admin</field>
-		<field name="url">http://google.com</field>
-		<field name="pass" xsi:type="xs:hexBinary">6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138</field>
-		<field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432</field>
-		<field name="notes">aaaa</field>
-		<field name="countView">341</field>
-		<field name="countDecrypt">35</field>
-		<field name="dateAdd">2018-03-25 09:54:07</field>
-		<field name="dateEdit">2018-04-02 21:38:25</field>
-		<field name="otherUserGroupEdit">0</field>
-		<field name="otherUserEdit">0</field>
-		<field name="isPrivate">0</field>
-		<field name="isPrivateGroup">0</field>
-		<field name="passDate">1522341709</field>
-		<field name="passDateChange">0</field>
-		<field name="parentId">0</field>
-	</row>
-    <row>
-        <field name="id">2</field>
-        <field name="userGroupId">1</field>
-        <field name="userId">1</field>
-        <field name="userEditId">1</field>
-        <field name="clientId">2</field>
-        <field name="name">Apple</field>
-        <field name="categoryId">2</field>
-        <field name="login">admin</field>
-        <field name="url">http://apple.com</field>
-        <field name="pass" xsi:type="xs:hexBinary">6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138</field>
-        <field name="key" xsi:type="xs:hexBinary">6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432</field>
-        <field name="notes">bbbb</field>
-        <field name="countView">341</field>
-        <field name="countDecrypt">35</field>
-        <field name="dateAdd">2018-03-25 09:54:07</field>
-        <field name="dateEdit">2018-04-02 21:38:25</field>
-        <field name="otherUserGroupEdit">0</field>
-        <field name="otherUserEdit">0</field>
-        <field name="isPrivate">0</field>
-        <field name="isPrivateGroup">0</field>
-        <field name="passDate">1522341709</field>
-        <field name="passDateChange">0</field>
-        <field name="parentId">0</field>
-    </row>
-	</table_data>
-	<table_data name="AccountToTag">
-	<row>
-		<field name="accountId">1</field>
-		<field name="tagId">1</field>
-	</row>
-	</table_data>
-</database>
-</mysqldump>
diff --git a/tests/res/datasets/syspass_itemPreset.xml b/tests/res/datasets/syspass_itemPreset.xml
deleted file mode 100644
index 6084f85b..00000000
--- a/tests/res/datasets/syspass_itemPreset.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0"?>
-<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <database name="syspass-test">
-        <table_data name="UserProfile">
-            <row>
-                <field name="id">1</field>
-                <field name="name">Admin</field>
-                <field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A303B733A31343A22002A006163635669657750617373223B623A303B733A31373A22002A0061636356696577486973746F7279223B623A303B733A31303A22002A0061636345646974223B623A303B733A31343A22002A006163634564697450617373223B623A303B733A393A22002A00616363416464223B623A303B733A31323A22002A0061636344656C657465223B623A303B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A313B733A31383A22002A006163635072697661746547726F7570223B623A313B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
-            </row>
-            <row>
-                <field name="id">2</field>
-                <field name="name">Demo</field>
-                <field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A313B733A31343A22002A006163635669657750617373223B623A313B733A31373A22002A0061636356696577486973746F7279223B623A313B733A31303A22002A0061636345646974223B623A313B733A31343A22002A006163634564697450617373223B623A313B733A393A22002A00616363416464223B623A313B733A31323A22002A0061636344656C657465223B623A313B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A303B733A31383A22002A006163635072697661746547726F7570223B623A303B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
-            </row>
-            <row>
-                <field name="id">3</field>
-                <field name="name">Usuarios</field>
-                <field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A313B733A31343A22002A006163635669657750617373223B623A313B733A31373A22002A0061636356696577486973746F7279223B623A313B733A31303A22002A0061636345646974223B623A313B733A31343A22002A006163634564697450617373223B623A313B733A393A22002A00616363416464223B623A313B733A31323A22002A0061636344656C657465223B623A313B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A303B733A31383A22002A006163635072697661746547726F7570223B623A303B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
-            </row>
-        </table_data>
-        <table_data name="UserGroup">
-            <row>
-                <field name="id">1</field>
-                <field name="name">Admins</field>
-                <field name="description">sysPass Admins</field>
-            </row>
-            <row>
-                <field name="id">2</field>
-                <field name="name">Demo</field>
-                <field name="description"/>
-            </row>
-            <row>
-                <field name="id">3</field>
-                <field name="name">Usuarios</field>
-                <field name="description">Grupo Usuarios</field>
-            </row>
-        </table_data>
-        <table_data name="User">
-            <row>
-                <field name="id">1</field>
-                <field name="name">sysPass Admin</field>
-                <field name="userGroupId">1</field>
-                <field name="login">admin</field>
-                <field name="ssoLogin" xsi:nil="true" />
-                <field name="pass" xsi:type="xs:hexBinary">2432792431302432584B666F627854545234444E4A7956573748365165774153356E5234434E4B7748746A4A614362545333486D72316B37485A4E4F</field>
-                <field name="mPass" xsi:type="xs:hexBinary">64656635303230306339373130623861363837613161346136323261333134613936303034326531646638643662323838326537383264636261653237326662346562386138326665613134386165666637343132663537363035663034363135623633623961616239303266333933613863323439386539613734343061356337333937326131653663333766326532306136643766356266383137653965376465363438633738663034323333386230303666353461643039363437</field>
-                <field name="mKey" xsi:type="xs:hexBinary">6465663130303030646566353032303033633166653138613634613233646466323436333064626636616335306634376539356630653063303335636231353938343362626638363932323138366536613330333839663735333832376532356464333436633035393730316433303539333531376233633434386535303539356666663630326263373037373564363330623439313539363862333263353262643961366564306165336439623764626564653633633163346536613330383936616230303639613139356431333736623231333232663766663765386632623838336432363062353835666430393133323631346239303266646463393061313532376638313639623138356563666438653130303435393864623134643464666263393232336432653833386665313333626138393761643532383139666264396336326333306637343964333564313236386464663365383137643339333036616365343964636130316531376163306432616161646362346263613439333763386564656261396139313962363433363833616163333234316330393734343962613033383962616238303432653339656666666332316264643163636436343464643362646565346335666564316164616132653537666537656166353964306331303865396664626135323735396366353265306430336536</field>
-                <field name="email" xsi:nil="true" />
-                <field name="notes" xsi:nil="true" />
-                <field name="loginCount">100</field>
-                <field name="userProfileId">1</field>
-                <field name="lastLogin">2018-07-22 22:23:11</field>
-                <field name="lastUpdate" xsi:nil="true" />
-                <field name="lastUpdateMPass">1532297701</field>
-                <field name="isAdminApp">1</field>
-                <field name="isAdminAcc">0</field>
-                <field name="isLdap">0</field>
-                <field name="isDisabled">0</field>
-                <field name="hashSalt"></field>
-                <field name="isMigrate">0</field>
-                <field name="isChangePass">0</field>
-                <field name="isChangedPass">0</field>
-                <field name="preferences" xsi:type="xs:hexBinary">4F3A33323A2253505C446174614D6F64656C5C55736572507265666572656E63657344617461223A31303A7B733A373A22757365725F6964223B693A313B733A363A22757365324661223B623A303B733A343A226C616E67223B733A353A2265735F4553223B733A353A227468656D65223B733A31333A226D6174657269616C2D626C7565223B733A31343A22726573756C747350657250616765223B693A363B733A31313A226163636F756E744C696E6B223B623A303B733A393A22736F72745669657773223B623A303B733A393A22746F704E6176626172223B623A303B733A31353A226F7074696F6E616C416374696F6E73223B623A303B733A31343A22726573756C747341734361726473223B623A303B7D</field>
-            </row>
-            <row>
-                <field name="id">2</field>
-                <field name="name">sysPass demo</field>
-                <field name="userGroupId">2</field>
-                <field name="login">demo</field>
-                <field name="ssoLogin">demo</field>
-                <field name="pass" xsi:type="xs:hexBinary">2432792431302454726E69756C5763754361433635346F76566F35392E766B4C5433414E31624A6D726A79553462696335325069436A6B5572396669</field>
-                <field name="mPass" xsi:type="xs:hexBinary">64656635303230303231616533353730373263373165626239393534353966366236636164373235336534316336633534353036336339326136653730616366333930393165373934613865376662386662326664333931383932363562396466303133333631623063323732323339653465373165343839313030646534326265633737623966343238396635633936613837646531343864313963653663643338613131343932623163313765653630326430623532343564346566</field>
-                <field name="mKey" xsi:type="xs:hexBinary">6465663130303030646566353032303035643534316262633462653032333563313338626561366561333536626436663037353365313035653030333563653166316235336534663364343565366262353335626163396639646538653131316262356334383865336535633637323333666632626365313837626335386135353839373535373034386564353634366361646638623736396132323164363032353435653034306264613135663138323638383665373536313236353361313037306530333261323365636364336339616438323162306363383962643130333035303931653965626332653935313465656631373462663339343664656132393661346262366264343463646333363361643335623032373561356633323430313936346531633131663937313764313139633130633561373161666332356365346534366661623234646663626362326237303964336335316532623834326464303933653230353965373265356638376363366236626239306231346265376264373637663163303937366231313362393630613265636565336633313131663538656131346139353736623332653163303962636435313366383733656664653062373333366238643464646637616237323333373038613264393965633738356139393036306135643262316366306262663739346262663765</field>
-                <field name="email">demo@syspass.org</field>
-                <field name="notes">aaaa</field>
-                <field name="loginCount">12</field>
-                <field name="userProfileId">2</field>
-                <field name="lastLogin">2018-04-01 21:29:47</field>
-                <field name="lastUpdate">2018-04-14 08:47:43</field>
-                <field name="lastUpdateMPass">1522582852</field>
-                <field name="isAdminApp">0</field>
-                <field name="isAdminAcc">0</field>
-                <field name="isLdap">0</field>
-                <field name="isDisabled">0</field>
-                <field name="hashSalt"></field>
-                <field name="isMigrate">0</field>
-                <field name="isChangePass">0</field>
-                <field name="isChangedPass">0</field>
-                <field name="preferences" xsi:nil="true" />
-            </row>
-            <row>
-                <field name="id">3</field>
-                <field name="name">User A</field>
-                <field name="userGroupId">2</field>
-                <field name="login">user_a</field>
-                <field name="ssoLogin">user_a</field>
-                <field name="pass" xsi:type="xs:hexBinary">2432792431302469444B442E2F4F624D79742E6F43594F5249514D5065624454783966744D636A703034365A435976662E765479597A594F6A4C472E</field>
-                <field name="mPass" xsi:nil="true" />
-                <field name="mKey" xsi:nil="true" />
-                <field name="email">user_a@syspass.org</field>
-                <field name="notes"></field>
-                <field name="loginCount">0</field>
-                <field name="userProfileId">1</field>
-                <field name="lastLogin" xsi:nil="true" />
-                <field name="lastUpdate">2018-04-14 08:48:08</field>
-                <field name="lastUpdateMPass">0</field>
-                <field name="isAdminApp">0</field>
-                <field name="isAdminAcc">0</field>
-                <field name="isLdap">0</field>
-                <field name="isDisabled">0</field>
-                <field name="hashSalt"></field>
-                <field name="isMigrate">0</field>
-                <field name="isChangePass">0</field>
-                <field name="isChangedPass">0</field>
-                <field name="preferences" xsi:nil="true" />
-            </row>
-            <row>
-                <field name="id">4</field>
-                <field name="name">User B</field>
-                <field name="userGroupId">2</field>
-                <field name="login">user_b</field>
-                <field name="ssoLogin" xsi:nil="true" />
-                <field name="pass" xsi:type="xs:hexBinary">243279243130244C37643658736A663955794F6E583662472E6F384E4F713961674B6F64536B4B5674485350462F6861414E657971517065372E6532</field>
-                <field name="mPass" xsi:nil="true" />
-                <field name="mKey" xsi:nil="true" />
-                <field name="email">user_b@syspass.org</field>
-                <field name="notes"></field>
-                <field name="loginCount">0</field>
-                <field name="userProfileId">1</field>
-                <field name="lastLogin" xsi:nil="true" />
-                <field name="lastUpdate">2018-03-30 18:38:32</field>
-                <field name="lastUpdateMPass">0</field>
-                <field name="isAdminApp">0</field>
-                <field name="isAdminAcc">0</field>
-                <field name="isLdap">0</field>
-                <field name="isDisabled">0</field>
-                <field name="hashSalt"></field>
-                <field name="isMigrate">0</field>
-                <field name="isChangePass">0</field>
-                <field name="isChangedPass">0</field>
-                <field name="preferences" xsi:nil="true" />
-            </row>
-        </table_data>
-        <table_data name="ItemPreset">
-            <row>
-                <field name="id">1</field>
-                <field name="userId">1</field>
-                <field name="userGroupId" xsi:nil="true"/>
-                <field name="userProfileId" xsi:nil="true"/>
-                <field name="fixed">0</field>
-                <field name="priority">0</field>
-                <field name="data" xsi:nil="true"/>
-                <field name="type">permission</field>
-                <field name="hash">284985459df4616aa682a6de4c4994a9fedf164d</field>
-            </row>
-            <row>
-                <field name="id">2</field>
-                <field name="userId" xsi:nil="true"/>
-                <field name="userGroupId">1</field>
-                <field name="userProfileId" xsi:nil="true"/>
-                <field name="fixed">0</field>
-                <field name="priority">10</field>
-                <field name="data" xsi:nil="true"/>
-                <field name="type">permission</field>
-                <field name="hash">ac1de29cfbc9db8c63b3b109c899148e904ccced</field>
-            </row>
-            <row>
-                <field name="id">3</field>
-                <field name="userId" xsi:nil="true"/>
-                <field name="userGroupId" xsi:nil="true"/>
-                <field name="userProfileId">1</field>
-                <field name="fixed">0</field>
-                <field name="priority">20</field>
-                <field name="data" xsi:nil="true"/>
-                <field name="type">permission</field>
-                <field name="hash">3ec16d2bece6de02ed9423f98fcaaba260ffd36b</field>
-            </row>
-            <row>
-                <field name="id">4</field>
-                <field name="userId">2</field>
-                <field name="userGroupId" xsi:nil="true"/>
-                <field name="userProfileId" xsi:nil="true"/>
-                <field name="fixed">0</field>
-                <field name="priority">0</field>
-                <field name="data" xsi:nil="true"/>
-                <field name="type">permission</field>
-                <field name="hash">8eca5d3518e5531aa968ce0d5a7221f659f5d0ee</field>
-            </row>
-            <row>
-                <field name="id">5</field>
-                <field name="userId" xsi:nil="true"/>
-                <field name="userGroupId" xsi:nil="true"/>
-                <field name="userProfileId">3</field>
-                <field name="fixed">0</field>
-                <field name="priority">10</field>
-                <field name="data" xsi:nil="true"/>
-                <field name="type">permission</field>
-                <field name="hash">fa66da8c08bf2728dfa90bb0682494a763dc0c11</field>
-            </row>
-        </table_data>
-        <table_data name="UserToUserGroup">
-            <row>
-                <field name="userId">1</field>
-                <field name="userGroupId">2</field>
-            </row>
-            <row>
-                <field name="userId">3</field>
-                <field name="userGroupId">2</field>
-            </row>
-            <row>
-                <field name="userId">2</field>
-                <field name="userGroupId">1</field>
-            </row>
-        </table_data>
-    </database>
-</mysqldump>
diff --git a/tests/res/datasets/syspass_notification.xml b/tests/res/datasets/syspass_notification.xml
deleted file mode 100644
index 2122e1a0..00000000
--- a/tests/res/datasets/syspass_notification.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<database name="syspass">
-    <table_data name="Notification">
-        <row>
-            <field name="id">1</field>
-            <field name="type">Prueba</field>
-            <field name="component">Accounts</field>
-            <field name="description">Notificación de prueba</field>
-            <field name="date">1529145158</field>
-            <field name="checked">0</field>
-            <field name="userId">2</field>
-            <field name="sticky">0</field>
-            <field name="onlyAdmin">0</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="type">Global</field>
-            <field name="component">Accounts</field>
-            <field name="description">test</field>
-            <field name="date">1529145296</field>
-            <field name="checked">0</field>
-            <field name="userId" xsi:nil="true" />
-            <field name="sticky">1</field>
-            <field name="onlyAdmin">0</field>
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="type">Admins</field>
-            <field name="component">Accounts</field>
-            <field name="description">test</field>
-            <field name="date">1529145313</field>
-            <field name="checked">0</field>
-            <field name="userId" xsi:nil="true" />
-            <field name="sticky">0</field>
-            <field name="onlyAdmin">1</field>
-        </row>
-    </table_data>
-</database>
-</mysqldump>
diff --git a/tests/res/datasets/syspass_plugin.xml b/tests/res/datasets/syspass_plugin.xml
deleted file mode 100644
index f8431817..00000000
--- a/tests/res/datasets/syspass_plugin.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<database name="syspass">
-	<table_data name="Plugin">
-	<row>
-		<field name="id">1</field>
-		<field name="name">Authenticator</field>
-		<field name="data" xsi:nil="true" />
-		<field name="enabled">0</field>
-		<field name="available">1</field>
-	</row>
-	<row>
-		<field name="id">2</field>
-		<field name="name">XML Exporter</field>
-		<field name="data" >data</field>
-		<field name="enabled">1</field>
-		<field name="available">1</field>
-	</row>
-	<row>
-		<field name="id">3</field>
-		<field name="name">DokuWiki</field>
-		<field name="data" xsi:nil="true" />
-		<field name="enabled">1</field>
-		<field name="available">0</field>
-	</row>
-	</table_data>
-	<table_data name="PluginData">
-		<row>
-			<field name="itemId">1</field>
-			<field name="name">Authenticator</field>
-            <field name="data">def502003606d6eb85aebcb1d9e635f0e6f969d05f064ffb719769a8a91864f0d094ff84674746f6c81ef122d04049fec4682337bada1d2ea272705d2631be4245d3c3dec2c341c5b6b7f0406f7cc9296740132e691c2b96b66057f54e27</field>
-            <field name="key">def10000def50200c35308f24d1f3b0501a873018043ca9c05762039fab3b3a9fdb6574cfecec65e2ec833a33c5b7698e37ce8e9b28fe371251b2b6513dfad95dbed69cc27e15c934b63951bce9649d42ca3c9e85e273c32583dad12653cf3ebb0f8b39bafeba085d04c62577ecad4229d91328caf8071e4a94fca947c1a3e5a9f13f7e32d80691e9f55f1779f8db85fb7b9ba463d5571904954df65ce9d7b7c4eb6c16066fd4dc79881c37f065ee656668695cee1f4649ac98f3530706649a5956a9dc5aa4e6a32870478b29ef6563551f5fbff7800c58e030774cd379f9144cd1cca85dd8620078fefe0d3d2a62feb81654d9dd5fc8638bd2c8a2dab01a4a5</field>
-		</row>
-		<row>
-			<field name="itemId">2</field>
-			<field name="name">Authenticator</field>
-			<field name="data">def50200290e0767802bb0cf1304efb2b9900da6676d51ee1c7a7538e05ebd10a5d9af1fcf658322274a8b906efd2411d71c1e38df3ac68ac6c7e21263aad2bef48aaf719f1c43b369d773cd30087eaa168b26114c2097dff9763295d2d1d7</field>
-			<field name="key">def10000def50200235f986cd31997981128329a2a327416007538a5457b30360632a734469faf5247927f223ed2470f6ee4e8687bfafc44cb6cbc9f292aaaaf4adb73bc09cf189502f778ad20e9d55fbda905da11c9f39d51aff7da4c1c36c26676c53b482a96274e868448ff8f924605b87f0079f42934d51838677a368dde2bf0b994708b6181afd7e86ac5f856d25aac5ba9602fb4cd383f6d5cff0417764eabeeb61e615856ad6a424dd65c95805c51e1ceccee3470f0a488dae36157fb33bf115bc7d7e3a5a6fc9a9dc62926737bbea1fff509b0761cd56062d4f8cbe999182b0dccd6e2595a87ec626b315d1cfa4b32f62fb11b81ea6af45d8215203f</field>
-		</row>
-		<row>
-			<field name="itemId">2</field>
-			<field name="name">XML Exporter</field>
-			<field name="data">def502004f363167a52704815e58bebb593b0be863052bbafac43bef4388a4692c124bf45f8968a5be7ce7f1b90a693f79d2f9147ed352334709b629297c34c432f986ff465033e899cddf80282fee6179124ebc12bb3a82</field>
-			<field name="key">def10000def50200a5e70a393f85c0bc81ee4a8555d14ca50d1845549e7851dd5e0b75695603819de6ac4f8860bc26b4b9432a9f6c0587f6e3f1b7081d528c7e9422ad7c52fd02be6772955ec0ba9dc3f83e644e8bc9e72e61039703ae17874066443f192d8c0840e13cf7f19d21c495ff81984bd3a2377893e8e5caf99aa25b529ff1fc264002f2372e7bc2ecf824865e7830af1aac2c344798c380cd071eee1d4e5bcd1633a2a9b308620a2136285e247f7b31a406074c858e3f9eaa5e3b3a44af41b02425790ec95f170ab7780f75cdbf448a513dfec71071700b4586b3384911f0ae8a7764076f98fbf5ed63e1b9651f73f6b73675a855a6d02693d3560c</field>
-		</row>
-		<row>
-			<field name="itemId">3</field>
-			<field name="name">DokuWiki</field>
-            <field name="data">def502009fdf89235fd6c084779a79d720b9fd657ba9563d738cc64ad11f4074f674a79dba7a798c89f250243beae86fb7e7b0d67e57349b6eff051ee26662b297f9efaf572779ac96ee567cbb85d1c77a7197054111eb108da82c6a09da</field>
-			<field name="key">def10000def50200ac689f83389580d9934abe4109a85f789c64ab443e182d0946fe55ba2a2b77b03227983d4eca8cd2abfa48f94e1752b435c5b70805ee1cbe0198fc5293f2a43098bdbf81ca1436f1b519b3159906ed4db45cd00774c935aeda4cd6cced42b5ad6df3da161a57d31ac46e6c3007dc4c3de7d19a6f11b949c1a09c98f1143c74dd006ecde5285f7b613cb18ce4c1e99d5accce12164d8d6e86e06529fd236091b7340b7a797a88b36b9b517c0b070e91977210153b2b82a2b253c4245b168a95e6238fb7c28bfca523013e0d1093d1b0c3f3e7b185cc12ec7df804c1370b2ea02977d17423433ebc8e38dad674a3d62f106a669f1df093c921</field>
-		</row>
-	</table_data>
-</database>
-</mysqldump>
diff --git a/tests/res/datasets/syspass_publicLink.xml b/tests/res/datasets/syspass_publicLink.xml
deleted file mode 100644
index a70be39e..00000000
--- a/tests/res/datasets/syspass_publicLink.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<database name="syspass">
-	<table_data name="PublicLink">
-	<row>
-		<field name="id">2</field>
-		<field name="itemId">1</field>
-		<field name="hash" xsi:type="xs:hexBinary">636564333430306561313730363139616437643235383934383862366236303734376561393966313265323230663561393130656465366438333466</field>
-		<field name="data" xsi:type="xs:hexBinary">4F3A31393A2253505C436F72655C43727970745C5661756C74223A343A7B733A32353A220053505C436F72655C43727970745C5661756C740064617461223B733A313833303A22646566353032303036636430326564663336666265623963383631616264643662396131373061376432303631323836353435303031666230396664636565663665633264313438623663336334373134643337616239333665353738613763393365333035613663623763396665383438646335626439656630303034323665346631663932653831323330623765616132323564306438303336613139363330656361613561336232626530333236336435353564363234323261323539346234306637623864623863396662316361376232616637313865626338316636356635633432333965663439626563653961643334363861353961613665303336613036663836383261343038376562323261383536373464626264613531623533633738633166333366616161663765383866366561626464666431626636643564653932656138616139376130633466313035373166653637303235313237653139333832623562643835666264366438393235383064653934373832653532343264653338626564613439383063616337306530306335353263343338616166663866343335373665656333356564386561356139643263643736616663316637363233633732323065653663303337623766343264626234393134653532313732373337623936373039333866396230303762353933356637613666393562306332366237663535643132393234316630616339373736356161323134376239363931666666636337356332643734616434323534323030646463346132353535323562356634633866626261363838396233383265366539333462633864363165363036323865366235313864346536613662613837303630626432626465363839366462623431333438313333613039663632363333343365613061353937333739613530393665316263616637356236633365656366326631306230653438376434346333346562323061303133633832656431373662613762316661653465386138313336636131336363363231613538326532303736306166623965616638363262373633373136626330363135303062323766306230626339623436373665393934623666623934356134626439323734393137316265646662306563636166666432646134666137386163376533663036306539313163613366616132616636396338336135363732616237636662636563643162653561336131323134336630346364353061316632383334346535646439396463613862343433383564363362653066393834333236373664313539383761313334313661363637363932333136343733303837663437396532316330633635363164333832623463613830313232613830313035326538643730313336616432353231363035323735333865306666646433353130643337323064656334653631363931666232656635383466636237353736633336303432656566343732633437383431306339393166373964623331353865316232396333633830346462353932323362373534316233376638636430306531393565333332663937306531303038326130613638353236333362373763316133626161623632623332616339646636646138623962333038616137333866616533353765376630356430343963333335653961376533356338623531633863343964653937373031653532323931616135633637356433363134343936326462646437363731656134643037343237646235386366303664666630333964313338643135343732326164313734663865363034663539306562346361633362313263636436626430303261323561653139363234363763386266393733376639666139643031303862306134303439666663633963666562303766323236303838363432313761366339383637633564363331353932616635383135313162393961643335316335333763346262663734383666613964663362633432666565383664393931613233623635306664383837386535346164393932356565653738633638373035323030643861313566383038393331323832666538316634326139326235373933626163353362663462326636316234373238366434343731646662393363383532613534626366633739663264373266376336383064656431663436313431656335366533343034396665636464303538613937613465376664303964616662373632613663656539636637386439343937303434393561333838306233353134386636363238636533363437306337656635613937346335343833656132383963633166333966363635383663373036653032363166626564653763376636616437303234623462663139623333666362653066333763376537363139616637303235336533396163636461353135306161613832326438323238636531336465386432383462326364323466353131643032303435343737663335316632373734646537223B733A32343A220053505C436F72655C43727970745C5661756C74006B6579223B733A3531323A226465663130303030646566353032303037633239663335326261346335623130653135643930386262303734376632373934386433323831306538306266396232303965663835366135303436353762323533393036333834343335623236373537653565376464613662323434303038363131643333396330333266346139363632373765643139363831363330623731373465366232643436376664313137393063343234373634313766656530333338636233303562396431306333653964663733356664633935393366633463653938623137633961373138343337353338326665633335343965326233373232616237386365363537323866323162343336656136326266366437333033656339336432663735316335303661623162306338636238323139656564376435626133363666643961333833383930326333333931626536373436373638613063333137663865363066343463646139653634643737323833373836663664653565653531323932396463313033613131346565343563643363393262323962343463613738363832353264336661323135663961353263303732393034326366333231633231356634633737613733653331396365383835633738333565326332353363656532663736346138393037353035313235393232663130616166623866626666356562633161376332223B733A32383A220053505C436F72655C43727970745C5661756C740074696D65536574223B693A313533323238303232353B733A33323A220053505C436F72655C43727970745C5661756C740074696D6555706461746564223B693A303B7D</field>
-		<field name="userId">1</field>
-		<field name="typeId">1</field>
-		<field name="notify">0</field>
-		<field name="dateAdd">1529228863</field>
-		<field name="dateExpire">1532280825</field>
-		<field name="dateUpdate">0</field>
-		<field name="countViews">0</field>
-		<field name="totalCountViews">0</field>
-		<field name="maxCountViews">3</field>
-		<field name="useinfo" xsi:nil="true" />
-	</row>
-	<row>
-		<field name="id">3</field>
-		<field name="itemId">2</field>
-		<field name="hash" xsi:type="xs:hexBinary">616337343462363934383832336362303531343534366335363739383163653466653732343064663339363832366439396632346664396131333434</field>
-		<field name="data" xsi:type="xs:hexBinary">4F3A31393A2253505C436F72655C43727970745C5661756C74223A343A7B733A32353A220053505C436F72655C43727970745C5661756C740064617461223B733A313834343A226465663530323030376339353039326234633263383533353734663131343039373138363831386435373135656137663734643534393632356136313032616538623262613339636133616365353234656361643466316431616130306262653965643063316331666236303732643062343733333631363637346235646336313231356333666436623335353961666633666639383761353934323966633963313637373462336235613938363265653761636135653137646536313635306132343533653632613261393362613838353764663436656261353138363363663436386336373434643363303633353738643930363965306634313533646163616131376463633465383335626138666430613563363131393734393665306261336264373139633165343664616666636137313430643434326263663965303564663639393434373765353566363536376666366138633265656639313863623863323930653063613762656337376237376335306337303530396638633436653465356130363933663438306137313639393663393331613539353636363663343466633837393862336536323939616638353966623736353233316566363837656665316530316635623065616237636138363465323637366134663533643032313565343731303338353435356634383463366332636663303336386262333330353631666166343162366433333034373533326565303930653434323833386337613835373035633333383136616363376139623433313237363064623332623638363038666432313138616161666631623366323865356635643061663030636532633564633930366662623337626331333863653238656631383262656664356461623037363265623062343932383030363336303263306237333264656364343538386536326331353636353437383037663761343132626532646663633930623638333461336364376165616237363239376364363162366130346436383665303537373936623538626664356361396666333539323939643464333961646339646535393765313839363239343766623366656361376631356365656634343862336335393938623964323032343463393032656263383362646439306637353366653337636638326137613365303664613366646532616138663865613462316535356331393436653861626634306165663936333566313166323264303064626133373662656134333963346532333238303837303165336431346263323761633431623138303966643732626462316638346533343930366233386665316433306461653831623832656133326632316532383663653233373530623430353765643965303463376134623762666261393537333733623236646336663063633939366130396131386538626234343736656263666663616666326437623164326230643466653166323264346262663366373537646631613664393162396564303732313836656138366633346665343238393731663661373732396330353366303266646531343531376166356361386130663233316335383435636564303430306136313134623462353936393564386132623730336562646237643731333539326137356634396532663231326163386231343232646232336464333361373337303362396437363837373830653132643365316439313235313434623062326334613865633237326334373161643763373364356166623735363661663034386130613332633632346163383238336131626466313434363661663538306634346236643934326266643837333663653663323139306431373439643032376533346264356231616231313762353037633237633833353434613661303039326364353039363535323865663964306234386262626138383038313436336666313163303036373932396335363736353435663937616636363039323232373262313762343938313836383530623565376638663230353235383363306235353430313639303165353832613066643164653635336233373035313663653564646330376261313632366335383639306362663832633530346335306635353430373333616164333033656432656133313538656661633966393538316238633166386436396133316631616537616339623337393539363633323834613233316639616633333439623939643630373733383731396561636563326335383466353635383031656532393737653631336437386135636561633036353661346663343133393236613139376430323463303639633762613732366435623938633638343336323765386337373939653961613564333736333035666239303738346363663764643536636632323132386534346537666565333762633461343139326235666332646437386261643336333736313739616335303163343335613336373336393261393531306163326137343961323065663636316564353833223B733A32343A220053505C436F72655C43727970745C5661756C74006B6579223B733A3531323A226465663130303030646566353032303062336137653530303338396635343239663939656266376365366131636534666461656633666236613439366532333739653931643930393335616336353362663239326331353066353233643335326537643463373237643133363365303135396564316333656261386530363065343032646561653838666432323363383433386663373438333436633237356637663536626636306363323033666666373466346665643533623738336662323264376438653838343431303539636332653430616538633066616433326138333534623937396364333439323634336563366130303438353061376135396564316638393364623762356664393865373432653532643630643134346139346332663865646665353834616136646432343831636632616632376662393662376633653437346265313439333363663364313837373230343931316163656438656665353239303361333336656336653138323263326131663539383539313133333830663735376263636432306266653362623631346631333535326535323235316530626436313864333838363030383633376331323262336231303631613061386166396465646138646630393331643463353464313162623632623834613962353534326261303961343938306336613831386230626131336237223B733A32383A220053505C436F72655C43727970745C5661756C740074696D65536574223B693A313533323238303232383B733A33323A220053505C436F72655C43727970745C5661756C740074696D6555706461746564223B693A303B7D</field>
-		<field name="userId">1</field>
-		<field name="typeId">1</field>
-		<field name="notify">0</field>
-		<field name="dateAdd">1529276100</field>
-		<field name="dateExpire">1532280828</field>
-		<field name="dateUpdate">0</field>
-		<field name="countViews">0</field>
-		<field name="totalCountViews">0</field>
-		<field name="maxCountViews">3</field>
-		<field name="useinfo" xsi:nil="true" />
-	</row>
-	</table_data>
-	<table_data name="Config">
-		<row>
-			<field name="parameter">lastupdatempass</field>
-			<field name="VALUE">1528236611</field>
-		</row>
-		<row>
-			<field name="parameter">masterPwd</field>
-			<field name="VALUE">$2y$10$xtsuN2PUvgSH/0mrfBlsbOActVgCjYcqDqC6L3T9QraNxZC4RXGYa</field>
-		</row>
-		<row>
-			<field name="parameter">version</field>
-			<field name="VALUE">300.18053101</field>
-		</row>
-	</table_data>
-</database>
-</mysqldump>
diff --git a/tests/res/datasets/syspass_tag.xml b/tests/res/datasets/syspass_tag.xml
deleted file mode 100644
index 86db484b..00000000
--- a/tests/res/datasets/syspass_tag.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<database name="syspass">
-    <table_data name="Tag">
-        <row>
-            <field name="id">1</field>
-            <field name="name">www</field>
-            <field name="hash" xsi:type="xs:hexBinary">3465616533356631623335393737613030656264383038366332353964346339</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="name">windows</field>
-            <field name="hash" xsi:type="xs:hexBinary">3066343133376564313530326235303435643630383361613235386235633432</field>
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="name">Linux</field>
-            <field name="hash" xsi:type="xs:hexBinary">6532303661353465393736393063636535306363383732646437306565383936</field>
-        </row>
-    </table_data>
-    <table_data name="AccountToTag">
-        <row>
-            <field name="accountId">1</field>
-            <field name="tagId">1</field>
-        </row>
-    </table_data>
-</database>
-</mysqldump>
diff --git a/tests/res/datasets/syspass_track.xml b/tests/res/datasets/syspass_track.xml
deleted file mode 100644
index 2568c75c..00000000
--- a/tests/res/datasets/syspass_track.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0"?>
-<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<database name="syspass">
-	<table_data name="Track">
-	<row>
-		<field name="id">1</field>
-		<field name="userId" xsi:nil="true" />
-		<field name="source">login</field>
-		<field name="time">1529145183</field>
-		<field name="ipv4" xsi:type="xs:hexBinary">AC160001</field>
-		<field name="ipv6" xsi:nil="true" />
-	</row>
-	<row>
-		<field name="id">2</field>
-		<field name="userId" xsi:nil="true" />
-		<field name="source">login</field>
-		<field name="time">1529145189</field>
-		<field name="ipv4" xsi:type="xs:hexBinary">AC160001</field>
-		<field name="ipv6" xsi:nil="true" />
-	</row>
-	<row>
-		<field name="id">3</field>
-		<field name="userId" xsi:nil="true" />
-		<field name="source">login</field>
-		<field name="time">1529145194</field>
-		<field name="ipv4" xsi:type="xs:hexBinary">AC160001</field>
-		<field name="ipv6" xsi:nil="true" />
-	</row>
-	<row>
-		<field name="id">4</field>
-		<field name="userId" xsi:nil="true" />
-		<field name="source">login</field>
-		<field name="time">1529272367</field>
-		<field name="ipv4" xsi:type="xs:hexBinary">AC160001</field>
-		<field name="ipv6" xsi:nil="true" />
-	</row>
-	<row>
-		<field name="id">5</field>
-		<field name="userId" xsi:nil="true" />
-		<field name="source">login</field>
-		<field name="time">1529272372</field>
-		<field name="ipv4" xsi:type="xs:hexBinary">AC160001</field>
-		<field name="ipv6" xsi:nil="true" />
-	</row>
-	<row>
-		<field name="id">6</field>
-		<field name="userId" xsi:nil="true" />
-		<field name="source">login</field>
-		<field name="time">1529272376</field>
-		<field name="ipv4" xsi:type="xs:hexBinary">AC160001</field>
-		<field name="ipv6" xsi:nil="true" />
-	</row>
-	</table_data>
-</database>
-</mysqldump>
diff --git a/tests/res/datasets/syspass_user.xml b/tests/res/datasets/syspass_user.xml
deleted file mode 100644
index a18af100..00000000
--- a/tests/res/datasets/syspass_user.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0"?>
-<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<database name="syspass">
-    <table_data name="UserProfile">
-        <row>
-            <field name="id">1</field>
-            <field name="name">Admin</field>
-            <field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A303B733A31343A22002A006163635669657750617373223B623A303B733A31373A22002A0061636356696577486973746F7279223B623A303B733A31303A22002A0061636345646974223B623A303B733A31343A22002A006163634564697450617373223B623A303B733A393A22002A00616363416464223B623A303B733A31323A22002A0061636344656C657465223B623A303B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A313B733A31383A22002A006163635072697661746547726F7570223B623A313B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="name">Demo</field>
-            <field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A313B733A31343A22002A006163635669657750617373223B623A313B733A31373A22002A0061636356696577486973746F7279223B623A313B733A31303A22002A0061636345646974223B623A313B733A31343A22002A006163634564697450617373223B623A313B733A393A22002A00616363416464223B623A313B733A31323A22002A0061636344656C657465223B623A313B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A303B733A31383A22002A006163635072697661746547726F7570223B623A303B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="name">Usuarios</field>
-            <field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A313B733A31343A22002A006163635669657750617373223B623A313B733A31373A22002A0061636356696577486973746F7279223B623A313B733A31303A22002A0061636345646974223B623A313B733A31343A22002A006163634564697450617373223B623A313B733A393A22002A00616363416464223B623A313B733A31323A22002A0061636344656C657465223B623A313B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A303B733A31383A22002A006163635072697661746547726F7570223B623A303B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
-        </row>
-    </table_data>
-    <table_data name="UserGroup">
-        <row>
-            <field name="id">1</field>
-            <field name="name">Admins</field>
-            <field name="description">sysPass Admins</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="name">Demo</field>
-            <field name="description"/>
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="name">Usuarios</field>
-            <field name="description">Grupo Usuarios</field>
-        </row>
-    </table_data>
-    <table_data name="User">
-        <row>
-            <field name="id">1</field>
-            <field name="name">sysPass Admin</field>
-            <field name="userGroupId">1</field>
-            <field name="login">admin</field>
-            <field name="ssoLogin" xsi:nil="true" />
-            <field name="pass" xsi:type="xs:hexBinary">2432792431302432584B666F627854545234444E4A7956573748365165774153356E5234434E4B7748746A4A614362545333486D72316B37485A4E4F</field>
-            <field name="mPass" xsi:type="xs:hexBinary">64656635303230306339373130623861363837613161346136323261333134613936303034326531646638643662323838326537383264636261653237326662346562386138326665613134386165666637343132663537363035663034363135623633623961616239303266333933613863323439386539613734343061356337333937326131653663333766326532306136643766356266383137653965376465363438633738663034323333386230303666353461643039363437</field>
-            <field name="mKey" xsi:type="xs:hexBinary">6465663130303030646566353032303033633166653138613634613233646466323436333064626636616335306634376539356630653063303335636231353938343362626638363932323138366536613330333839663735333832376532356464333436633035393730316433303539333531376233633434386535303539356666663630326263373037373564363330623439313539363862333263353262643961366564306165336439623764626564653633633163346536613330383936616230303639613139356431333736623231333232663766663765386632623838336432363062353835666430393133323631346239303266646463393061313532376638313639623138356563666438653130303435393864623134643464666263393232336432653833386665313333626138393761643532383139666264396336326333306637343964333564313236386464663365383137643339333036616365343964636130316531376163306432616161646362346263613439333763386564656261396139313962363433363833616163333234316330393734343962613033383962616238303432653339656666666332316264643163636436343464643362646565346335666564316164616132653537666537656166353964306331303865396664626135323735396366353265306430336536</field>
-            <field name="email" xsi:nil="true" />
-            <field name="notes" xsi:nil="true" />
-            <field name="loginCount">100</field>
-            <field name="userProfileId">1</field>
-            <field name="lastLogin">2018-07-22 22:23:11</field>
-            <field name="lastUpdate" xsi:nil="true" />
-            <field name="lastUpdateMPass">1532297701</field>
-            <field name="isAdminApp">1</field>
-            <field name="isAdminAcc">0</field>
-            <field name="isLdap">0</field>
-            <field name="isDisabled">0</field>
-            <field name="hashSalt"></field>
-            <field name="isMigrate">0</field>
-            <field name="isChangePass">0</field>
-            <field name="isChangedPass">0</field>
-            <field name="preferences" xsi:type="xs:hexBinary">4F3A33323A2253505C446174614D6F64656C5C55736572507265666572656E63657344617461223A31303A7B733A373A22757365725F6964223B693A313B733A363A22757365324661223B623A303B733A343A226C616E67223B733A353A2265735F4553223B733A353A227468656D65223B733A31333A226D6174657269616C2D626C7565223B733A31343A22726573756C747350657250616765223B693A363B733A31313A226163636F756E744C696E6B223B623A303B733A393A22736F72745669657773223B623A303B733A393A22746F704E6176626172223B623A303B733A31353A226F7074696F6E616C416374696F6E73223B623A303B733A31343A22726573756C747341734361726473223B623A303B7D</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="name">sysPass demo</field>
-            <field name="userGroupId">2</field>
-            <field name="login">demo</field>
-            <field name="ssoLogin">demo</field>
-            <field name="pass" xsi:type="xs:hexBinary">2432792431302454726E69756C5763754361433635346F76566F35392E766B4C5433414E31624A6D726A79553462696335325069436A6B5572396669</field>
-            <field name="mPass" xsi:type="xs:hexBinary">64656635303230303231616533353730373263373165626239393534353966366236636164373235336534316336633534353036336339326136653730616366333930393165373934613865376662386662326664333931383932363562396466303133333631623063323732323339653465373165343839313030646534326265633737623966343238396635633936613837646531343864313963653663643338613131343932623163313765653630326430623532343564346566</field>
-            <field name="mKey" xsi:type="xs:hexBinary">6465663130303030646566353032303035643534316262633462653032333563313338626561366561333536626436663037353365313035653030333563653166316235336534663364343565366262353335626163396639646538653131316262356334383865336535633637323333666632626365313837626335386135353839373535373034386564353634366361646638623736396132323164363032353435653034306264613135663138323638383665373536313236353361313037306530333261323365636364336339616438323162306363383962643130333035303931653965626332653935313465656631373462663339343664656132393661346262366264343463646333363361643335623032373561356633323430313936346531633131663937313764313139633130633561373161666332356365346534366661623234646663626362326237303964336335316532623834326464303933653230353965373265356638376363366236626239306231346265376264373637663163303937366231313362393630613265636565336633313131663538656131346139353736623332653163303962636435313366383733656664653062373333366238643464646637616237323333373038613264393965633738356139393036306135643262316366306262663739346262663765</field>
-            <field name="email">demo@syspass.org</field>
-            <field name="notes">aaaa</field>
-            <field name="loginCount">12</field>
-            <field name="userProfileId">2</field>
-            <field name="lastLogin">2018-04-01 21:29:47</field>
-            <field name="lastUpdate">2018-04-14 08:47:43</field>
-            <field name="lastUpdateMPass">1522582852</field>
-            <field name="isAdminApp">0</field>
-            <field name="isAdminAcc">0</field>
-            <field name="isLdap">0</field>
-            <field name="isDisabled">0</field>
-            <field name="hashSalt"></field>
-            <field name="isMigrate">0</field>
-            <field name="isChangePass">0</field>
-            <field name="isChangedPass">0</field>
-            <field name="preferences" xsi:nil="true" />
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="name">User A</field>
-            <field name="userGroupId">2</field>
-            <field name="login">user_a</field>
-            <field name="ssoLogin">user_a</field>
-            <field name="pass" xsi:type="xs:hexBinary">2432792431302469444B442E2F4F624D79742E6F43594F5249514D5065624454783966744D636A703034365A435976662E765479597A594F6A4C472E</field>
-            <field name="mPass" xsi:nil="true" />
-            <field name="mKey" xsi:nil="true" />
-            <field name="email">user_a@syspass.org</field>
-            <field name="notes"></field>
-            <field name="loginCount">0</field>
-            <field name="userProfileId">1</field>
-            <field name="lastLogin" xsi:nil="true" />
-            <field name="lastUpdate">2018-04-14 08:48:08</field>
-            <field name="lastUpdateMPass">0</field>
-            <field name="isAdminApp">0</field>
-            <field name="isAdminAcc">0</field>
-            <field name="isLdap">0</field>
-            <field name="isDisabled">0</field>
-            <field name="hashSalt"></field>
-            <field name="isMigrate">0</field>
-            <field name="isChangePass">0</field>
-            <field name="isChangedPass">0</field>
-            <field name="preferences" xsi:nil="true" />
-        </row>
-        <row>
-            <field name="id">4</field>
-            <field name="name">User B</field>
-            <field name="userGroupId">2</field>
-            <field name="login">user_b</field>
-            <field name="ssoLogin" xsi:nil="true" />
-            <field name="pass" xsi:type="xs:hexBinary">243279243130244C37643658736A663955794F6E583662472E6F384E4F713961674B6F64536B4B5674485350462F6861414E657971517065372E6532</field>
-            <field name="mPass" xsi:nil="true" />
-            <field name="mKey" xsi:nil="true" />
-            <field name="email">user_b@syspass.org</field>
-            <field name="notes"></field>
-            <field name="loginCount">0</field>
-            <field name="userProfileId">1</field>
-            <field name="lastLogin" xsi:nil="true" />
-            <field name="lastUpdate">2018-03-30 18:38:32</field>
-            <field name="lastUpdateMPass">0</field>
-            <field name="isAdminApp">0</field>
-            <field name="isAdminAcc">0</field>
-            <field name="isLdap">0</field>
-            <field name="isDisabled">0</field>
-            <field name="hashSalt"></field>
-            <field name="isMigrate">0</field>
-            <field name="isChangePass">0</field>
-            <field name="isChangedPass">0</field>
-            <field name="preferences" xsi:nil="true" />
-        </row>
-    </table_data>
-    <table_data name="Config">
-        <row>
-            <field name="parameter">lastupdatempass</field>
-            <field name="VALUE">1528236611</field>
-        </row>
-        <row>
-            <field name="parameter">masterPwd</field>
-            <field name="VALUE">$2y$10$xtsuN2PUvgSH/0mrfBlsbOActVgCjYcqDqC6L3T9QraNxZC4RXGYa</field>
-        </row>
-        <row>
-            <field name="parameter">version</field>
-            <field name="VALUE">300.18053101</field>
-        </row>
-    </table_data>
-</database>
-</mysqldump>
\ No newline at end of file
diff --git a/tests/res/datasets/syspass_userGroup.xml b/tests/res/datasets/syspass_userGroup.xml
deleted file mode 100644
index 9073cb58..00000000
--- a/tests/res/datasets/syspass_userGroup.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0"?>
-<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<database name="syspass">
-    <table_data name="UserProfile">
-        <row>
-            <field name="id">1</field>
-            <field name="name">Admin</field>
-            <field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A303B733A31343A22002A006163635669657750617373223B623A303B733A31373A22002A0061636356696577486973746F7279223B623A303B733A31303A22002A0061636345646974223B623A303B733A31343A22002A006163634564697450617373223B623A303B733A393A22002A00616363416464223B623A303B733A31323A22002A0061636344656C657465223B623A303B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A313B733A31383A22002A006163635072697661746547726F7570223B623A313B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="name">Demo</field>
-            <field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A313B733A31343A22002A006163635669657750617373223B623A313B733A31373A22002A0061636356696577486973746F7279223B623A313B733A31303A22002A0061636345646974223B623A313B733A31343A22002A006163634564697450617373223B623A313B733A393A22002A00616363416464223B623A313B733A31323A22002A0061636344656C657465223B623A313B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A303B733A31383A22002A006163635072697661746547726F7570223B623A303B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="name">Usuarios</field>
-            <field name="profile" xsi:type="xs:hexBinary">4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A313B733A31343A22002A006163635669657750617373223B623A313B733A31373A22002A0061636356696577486973746F7279223B623A313B733A31303A22002A0061636345646974223B623A313B733A31343A22002A006163634564697450617373223B623A313B733A393A22002A00616363416464223B623A313B733A31323A22002A0061636344656C657465223B623A313B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A303B733A31383A22002A006163635072697661746547726F7570223B623A303B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D</field>
-        </row>
-    </table_data>
-    <table_data name="UserGroup">
-        <row>
-            <field name="id">1</field>
-            <field name="name">Admins</field>
-            <field name="description">sysPass Admins</field>
-        </row>
-        <row>
-            <field name="id">2</field>
-            <field name="name">Demo</field>
-            <field name="description"/>
-        </row>
-        <row>
-            <field name="id">3</field>
-            <field name="name">Usuarios</field>
-            <field name="description">Grupo Usuarios</field>
-        </row>
-        <row>
-            <field name="id">4</field>
-            <field name="name">Test A</field>
-            <field name="description" />
-        </row>
-        <row>
-            <field name="id">5</field>
-            <field name="name">Test B</field>
-            <field name="description" />
-        </row>
-    </table_data>
-    <table_data name="UserToUserGroup">
-        <row>
-            <field name="userId">1</field>
-            <field name="userGroupId">2</field>
-        </row>
-        <row>
-            <field name="userId">3</field>
-            <field name="userGroupId">2</field>
-        </row>
-        <row>
-            <field name="userId">2</field>
-            <field name="userGroupId">1</field>
-        </row>
-        <row>
-            <field name="userId">2</field>
-            <field name="userGroupId">3</field>
-        </row>
-    </table_data>
-</database>
-</mysqldump>
\ No newline at end of file
diff --git a/tests/res/datasets/truncate.sql b/tests/res/datasets/truncate.sql
new file mode 100644
index 00000000..c2ad4f97
--- /dev/null
+++ b/tests/res/datasets/truncate.sql
@@ -0,0 +1,61 @@
+/*
+ * sysPass
+ *
+ * @author nuxsmin
+ * @link https://syspass.org
+ * @copyright 2012-2020, Rubén Domínguez nuxsmin@$syspass.org
+ *
+ * This file is part of sysPass.
+ *
+ * sysPass is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * sysPass is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** FROM: https://stackoverflow.com/a/47016383 **/
+
+/* SELECT CONCAT('TRUNCATE TABLE ', table_name, ';')
+FROM information_schema.tables
+WHERE table_type = 'BASE TABLE'
+  AND table_schema = DATABASE(); */
+
+SET FOREIGN_KEY_CHECKS = 0;
+
+TRUNCATE TABLE Account;
+TRUNCATE TABLE AccountFile;
+TRUNCATE TABLE AccountHistory;
+TRUNCATE TABLE AccountToFavorite;
+TRUNCATE TABLE AccountToTag;
+TRUNCATE TABLE AccountToUser;
+TRUNCATE TABLE AccountToUserGroup;
+TRUNCATE TABLE AuthToken;
+TRUNCATE TABLE Category;
+TRUNCATE TABLE Client;
+TRUNCATE TABLE Config;
+TRUNCATE TABLE CustomFieldData;
+TRUNCATE TABLE CustomFieldDefinition;
+TRUNCATE TABLE CustomFieldType;
+TRUNCATE TABLE EventLog;
+TRUNCATE TABLE ItemPreset;
+TRUNCATE TABLE Notification;
+TRUNCATE TABLE Plugin;
+TRUNCATE TABLE PluginData;
+TRUNCATE TABLE PublicLink;
+TRUNCATE TABLE Tag;
+TRUNCATE TABLE Track;
+TRUNCATE TABLE User;
+TRUNCATE TABLE UserGroup;
+TRUNCATE TABLE UserPassRecover;
+TRUNCATE TABLE UserProfile;
+TRUNCATE TABLE UserToUserGroup;
+
+SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file
diff --git a/tests/res/scripts/reset_db.sh b/tests/res/scripts/reset_db.sh
index b6ac634d..12b5db22 100755
--- a/tests/res/scripts/reset_db.sh
+++ b/tests/res/scripts/reset_db.sh
@@ -1,40 +1,114 @@
-#!/bin/bash
+#!/usr/bin/env bash
+set -euo pipefail
 
-DB_HOST=$(docker inspect build_db-test_1 --format {{.NetworkSettings.Networks.bridge.IPAddress}})
+: ${SQL_FILE:=}
+: ${DB_NAME:=}
+: ${DB_CONTAINER_NAME:=}
 
-if [[ -z "${DB_HOST}" ]]; then
-    echo "Unknown host"
+usage() {
+  echo "Usage: $0 [ -s SQL_FILE ] [ -d DB_NAME ] [ -p PROJECT_DIR ] [ -C DB_CONTAINER_NAME ]" 1>&2
+}
+
+exit_abnormal() {
+  usage
+  exit 1
+}
+
+do_import() {
+  case ${DB_NAME} in
+  "syspass")
+    mysql -h ${DB_HOST} -u root -psyspass ${DB_NAME} <${PROJECT_DIR}/schemas/dbstructure.sql
+    mysql -h ${DB_HOST} -u root -psyspass ${DB_NAME} <${SQL_FILE}
+    ;;
+  "syspass-test")
+    mysql -h ${DB_HOST} -u root -psyspass -e 'DROP DATABASE IF EXISTS `'"${DB_NAME}"'`;'
+    mysql -h ${DB_HOST} -u root -psyspass -e 'CREATE DATABASE `'"${DB_NAME}"'` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;'
+    mysql -h ${DB_HOST} -u root -psyspass ${DB_NAME} <${SQL_FILE}
+    ;;
+  *)
+    echo "Database name not set"
     exit 1
-fi
+    ;;
+  esac
 
-SQL_FILE=$1
-DB_NAME=$2
-PROJECT_DIR=$3
-
-if [[ ! -e "${SQL_FILE}" ]]; then
-    echo "SQL file does not exist: ${SQL_FILE}"
-    exit 1
-fi
-
-echo "Database host: ${DB_HOST}"
-echo "Database name: ${DB_NAME}"
-
-case ${DB_NAME} in
-    "syspass")
-        mysql -h ${DB_HOST} -u root -psyspass ${DB_NAME} < ${PROJECT_DIR}/schemas/dbstructure.sql
-        mysql -h ${DB_HOST} -u root -psyspass ${DB_NAME} < ${SQL_FILE}
-        ;;
-    "syspass-test")
-        mysql -h ${DB_HOST} -u root -psyspass -e 'DROP DATABASE IF EXISTS `'"${DB_NAME}"'`;'
-        mysql -h ${DB_HOST} -u root -psyspass -e 'CREATE DATABASE `'"${DB_NAME}"'` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;'
-        mysql -h ${DB_HOST} -u root -psyspass ${DB_NAME} < ${SQL_FILE}
-        ;;
-    *)
-        echo "Database name not set"
-        exit 1
-        ;;
-esac
-
-if [[ $? -eq 0 ]]; then
+  if [[ $? -eq 0 ]]; then
     echo "Database data imported"
-fi
\ No newline at end of file
+  fi
+}
+
+get_db_host() {
+  DB_HOST=$(docker inspect ${DB_CONTAINER_NAME} --format {{.NetworkSettings.Networks.bridge.IPAddress}})
+
+  if [[ -z "${DB_HOST}" ]]; then
+    echo "Couldn't guess DB host from Docker container '${OPTARG}"
+    exit_abnormal
+  fi
+
+  echo "Database host: ${DB_HOST}"
+}
+
+check_options() {
+  if [ -z "${DB_NAME}" ]; then
+    echo "Database name not set"
+    exit_abnormal
+  fi
+
+  if [ -z "${SQL_FILE}" ]; then
+    echo "SQL file not set"
+    exit_abnormal
+  fi
+
+  if [ -z "${DB_CONTAINER_NAME}" ]; then
+    echo "Database container name not set"
+    exit_abnormal
+  fi
+}
+
+while getopts ":hs:d:p:C:" OPTIONS; do
+  case "${OPTIONS}" in
+  h)
+    usage
+    ;;
+  s)
+    SQL_FILE=${OPTARG}
+
+    if [[ ! -e "${SQL_FILE}" ]]; then
+      echo "SQL file does not exist: ${SQL_FILE}"
+      exit_abnormal
+    fi
+
+    echo "SQL file: ${SQL_FILE}"
+    ;;
+  d)
+    DB_NAME=${OPTARG}
+
+    echo "Database name: ${DB_NAME}"
+    ;;
+  p)
+    PROJECT_DIR=${OPTARG}
+
+    echo "Project dir: ${PROJECT_DIR}"
+    ;;
+  C)
+    DB_CONTAINER_NAME=${OPTARG}
+
+    echo "Database container name: ${DB_CONTAINER_NAME}"
+
+    get_db_host
+    ;;
+  :)
+    echo "$0: Must supply an argument to -$OPTARG." >&2
+    exit_abnormal
+    ;;
+  ?)
+    echo "Invalid option: -${OPTARG}."
+    exit_abnormal
+    ;;
+  *)
+    exit_abnormal
+    ;;
+  esac
+done
+
+check_options
+do_import