diff --git a/tests/Account/PermissionAbstractTest.php b/tests/Account/PermissionAbstractTest.php
index b0aa9b01d..5c7db6d17 100755
--- a/tests/Account/PermissionAbstractTest.php
+++ b/tests/Account/PermissionAbstractTest.php
@@ -54,8 +54,14 @@ public function testAbstractDefault() : void
                 'from'       => null,
                 'element'    => null,
                 'component'  => null,
-                'permission' => PermissionType::NONE,
                 'category'   => null,
+                'hasRead' => false,
+                'hasModify' => false,
+                'hasCreate' => false,
+                'hasDelete' => false,
+                'hasPermission' => false,
+                'defaultCPermissions' => null,
+                'defaultPPermissions' => null,
             ],
             $perm->jsonSerialize()
         );
diff --git a/tests/DataStorage/Cache/Connection/ConnectionFactoryTest.php b/tests/DataStorage/Cache/Connection/ConnectionFactoryTest.php
index 19541e74f..6059acd0e 100755
--- a/tests/DataStorage/Cache/Connection/ConnectionFactoryTest.php
+++ b/tests/DataStorage/Cache/Connection/ConnectionFactoryTest.php
@@ -45,7 +45,7 @@ public function testCreateMemCached() : void
 
         self::assertInstanceOf(
             \phpOMS\DataStorage\Cache\Connection\MemCached::class,
-            ConnectionFactory::create(['type' => CacheType::MEMCACHED, 'data' => $GLOBALS['CONFIG']['cache']['memcached']])
+            ConnectionFactory::create(\array_merge(['type' => CacheType::MEMCACHED], $GLOBALS['CONFIG']['cache']['memcached']))
         );
     }
 
@@ -61,7 +61,7 @@ public function testCreateRedisCache() : void
 
         self::assertInstanceOf(
             \phpOMS\DataStorage\Cache\Connection\RedisCache::class,
-            ConnectionFactory::create(['type' => CacheType::REDIS, 'data' => $GLOBALS['CONFIG']['cache']['redis']])
+            ConnectionFactory::create(\array_merge(['type' => CacheType::REDIS], $GLOBALS['CONFIG']['cache']['redis']))
         );
     }
 
diff --git a/tests/DataStorage/Database/Schema/BuilderTest.php b/tests/DataStorage/Database/Schema/BuilderTest.php
index 53e2da22f..14ef7397c 100755
--- a/tests/DataStorage/Database/Schema/BuilderTest.php
+++ b/tests/DataStorage/Database/Schema/BuilderTest.php
@@ -102,9 +102,9 @@ public function testShowTables($con) : void
 
         $sql = '';
         if ($con instanceof MysqlConnection) {
-            $sql = 'SELECT [table_name] FROM [information_schema].[tables] WHERE [table_schema] = \'' . $GLOBALS['CONFIG']['db']['core']['masters']['admin']['database']. '\';';
+            $sql = 'SELECT [table_name] FROM [information_schema].[tables] WHERE [table_schema] = ?;';
         } elseif ($con instanceof PostgresConnection) {
-            $sql = 'SELECT [table_name] FROM [information_schema].[tables] WHERE [table_schema] = \'' . $GLOBALS['CONFIG']['db']['core']['masters']['admin']['database']. '\';';
+            $sql = 'SELECT [table_name] FROM [information_schema].[tables] WHERE [table_schema] = ?;';
         } elseif ($con instanceof SqlServerConnection) {
             $sql = 'SELECT [table_name] FROM [sys].[tables] INNER JOIN [sys].[schemas] ON [sys].[tables.schema_id] = [sys].[schemas.schema_id];';
         } elseif ($con instanceof SQLiteConnection) {
@@ -133,13 +133,13 @@ public function testShowFields($con) : void
 
         $sql = '';
         if ($con instanceof MysqlConnection) {
-            $sql = 'SELECT * FROM [information_schema].[columns] WHERE [table_schema] = \'' . $GLOBALS['CONFIG']['db']['core']['masters']['admin']['database']. '\' AND [table_name] = \'test\';';
+            $sql = 'SELECT * FROM [information_schema].[columns] WHERE [table_schema] = ? AND [table_name] = ?;';
         } elseif ($con instanceof PostgresConnection) {
-            $sql = 'SELECT * FROM [information_schema].[columns] WHERE [table_schema] = \'' . $GLOBALS['CONFIG']['db']['core']['masters']['admin']['database']. '\' AND [table_name] = \'test\';';
+            $sql = 'SELECT * FROM [information_schema].[columns] WHERE [table_schema] = ? AND [table_name] = ?;';
         } elseif ($con instanceof SqlServerConnection) {
-            $sql = 'SELECT * FROM [information_schema].[columns] WHERE [table_schema] = \'' . $GLOBALS['CONFIG']['db']['core']['masters']['admin']['database']. '\' AND [table_name] = \'test\';';
+            $sql = 'SELECT * FROM [information_schema].[columns] WHERE [table_schema] = ? AND [table_name] = ?;';
         } elseif ($con instanceof SQLiteConnection) {
-            $sql = 'SELECT * FROM pragma_table_info(\'test\') WHERE pragma_table_info(\'test\') = \'test\';';
+            $sql = 'SELECT * FROM pragma_table_info(?) WHERE pragma_table_info(?) = ?;';
         }
 
         $sql = \strtr($sql, '[]', $iS . $iE);
@@ -164,13 +164,13 @@ public function testCreateTable($con) : void
 
         $sql = '';
         if ($con instanceof MysqlConnection) {
-            $sql = 'CREATE TABLE IF NOT EXISTS [user_roles] ([user_id] INT AUTO_INCREMENT, [role_id] VARCHAR(10) DEFAULT \'1\' NULL, PRIMARY KEY ([user_id]), FOREIGN KEY ([user_id]) REFERENCES [users] ([ext1_id]), FOREIGN KEY ([role_id]) REFERENCES [roles] ([ext2_id])) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 AUTO_INCREMENT=1;';
+            $sql = 'CREATE TABLE IF NOT EXISTS [user_roles] ([user_id] INT AUTO_INCREMENT, [role_id] VARCHAR(10) DEFAULT ? NULL, PRIMARY KEY ([user_id]), FOREIGN KEY ([user_id]) REFERENCES [users] ([ext1_id]), FOREIGN KEY ([role_id]) REFERENCES [roles] ([ext2_id])) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 AUTO_INCREMENT=1;';
         } elseif ($con instanceof PostgresConnection) {
-            $sql = 'CREATE TABLE IF NOT EXISTS [user_roles] ([user_id] INT AUTO_INCREMENT, [role_id] VARCHAR(10) DEFAULT \'1\' NULL, PRIMARY KEY ([user_id]), FOREIGN KEY ([user_id]) REFERENCES [users] ([ext1_id]), FOREIGN KEY ([role_id]) REFERENCES [roles] ([ext2_id]));';
+            $sql = 'CREATE TABLE IF NOT EXISTS [user_roles] ([user_id] INT AUTO_INCREMENT, [role_id] VARCHAR(10) DEFAULT ? NULL, PRIMARY KEY ([user_id]), FOREIGN KEY ([user_id]) REFERENCES [users] ([ext1_id]), FOREIGN KEY ([role_id]) REFERENCES [roles] ([ext2_id]));';
         } elseif ($con instanceof SqlServerConnection) {
-            $sql = 'CREATE TABLE IF NOT EXISTS [user_roles] ([user_id] INT AUTO_INCREMENT, [role_id] VARCHAR(10) DEFAULT \'1\' NULL, PRIMARY KEY ([user_id]), FOREIGN KEY ([user_id]) REFERENCES [users] ([ext1_id]), FOREIGN KEY ([role_id]) REFERENCES [roles] ([ext2_id]));';
+            $sql = 'CREATE TABLE IF NOT EXISTS [user_roles] ([user_id] INT AUTO_INCREMENT, [role_id] VARCHAR(10) DEFAULT ? NULL, PRIMARY KEY ([user_id]), FOREIGN KEY ([user_id]) REFERENCES [users] ([ext1_id]), FOREIGN KEY ([role_id]) REFERENCES [roles] ([ext2_id]));';
         } elseif ($con instanceof SQLiteConnection) {
-            $sql = 'CREATE TABLE [user_roles] ([user_id] INTEGER AUTOINCREMENT PRIMARY KEY, [role_id] TEXT DEFAULT \'1\' NULL, FOREIGN KEY ([user_id]) REFERENCES [users] ([ext1_id]), FOREIGN KEY ([role_id]) REFERENCES [roles] ([ext2_id]));';
+            $sql = 'CREATE TABLE [user_roles] ([user_id] INTEGER AUTOINCREMENT PRIMARY KEY, [role_id] TEXT DEFAULT ? NULL, FOREIGN KEY ([user_id]) REFERENCES [users] ([ext1_id]), FOREIGN KEY ([role_id]) REFERENCES [roles] ([ext2_id]));';
         }
 
         $sql = \strtr($sql, '[]', $iS . $iE);
@@ -196,7 +196,7 @@ public function testAlter($con) : void
         $iE = $con->getGrammar()->systemIdentifierEnd;
 
         $query = new Builder($con);
-        $sql   = 'CREATE TABLE IF NOT EXISTS user_roles (user_id INT NOT NULL AUTO_INCREMENT, role_id VARCHAR(10) DEFAULT \'1\' NULL, PRIMARY KEY (user_id), FOREIGN KEY (user_id) REFERENCES users (ext1_id), FOREIGN KEY (role_id) REFERENCES roles (ext2_id)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 AUTO_INCREMENT=1;';
+        $sql   = 'CREATE TABLE IF NOT EXISTS user_roles (user_id INT NOT NULL AUTO_INCREMENT, role_id VARCHAR(10) DEFAULT ? NULL, PRIMARY KEY (user_id), FOREIGN KEY (user_id) REFERENCES users (ext1_id), FOREIGN KEY (role_id) REFERENCES roles (ext2_id)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 AUTO_INCREMENT=1;';
         $sql   = \strtr($sql, '[]', $iS . $iE);
         self::assertEquals(
             $sql,
diff --git a/tests/Stdlib/Base/LocationTest.php b/tests/Stdlib/Base/LocationTest.php
index 00793368a..eb646f5f5 100755
--- a/tests/Stdlib/Base/LocationTest.php
+++ b/tests/Stdlib/Base/LocationTest.php
@@ -46,6 +46,8 @@ public function testDefault() : void
             'state'   => '',
             'lat'     => 0.0,
             'lon'     => 0.0,
+            'id' => 0,
+            'type' => 2,
         ];
 
         self::assertEquals('', $this->location->postal);
@@ -111,6 +113,8 @@ public function testArray() : void
             'state'   => 'This is a state 123',
             'lat'     => 12.1,
             'lon'     => 11.2,
+            'id' => 0,
+            'type' => 2,
         ];
 
         $this->location->postal  = '0123456789';
@@ -137,6 +141,8 @@ public function testJsonSerialize() : void
             'state'   => 'This is a state 123',
             'lat'     => 12.1,
             'lon'     => 11.2,
+            'id' => 0,
+            'type' => 2,
         ];
 
         $this->location->postal  = '0123456789';
@@ -164,6 +170,8 @@ public function testUnserialize() : void
             'state'   => 'This is a state 123',
             'lat'     => 12.1,
             'lon'     => 11.2,
+            'id' => 0,
+            'type' => 2,
         ];
 
         $this->location->unserialize(\json_encode($expected));