diff --git a/community_server/tests/Fixture/BaseTestFixture.php b/community_server/tests/Fixture/BaseTestFixture.php
index b22738883..27eb36989 100644
--- a/community_server/tests/Fixture/BaseTestFixture.php
+++ b/community_server/tests/Fixture/BaseTestFixture.php
@@ -13,7 +13,11 @@ use Cake\TestSuite\Fixture\TestFixture;
 class BaseTestFixture extends TestFixture
 {
     // after copy from sql export, replace all hex values to hex strings with regExp (z.B. within Netbeans)
+<<<<<<< HEAD
     // ''([0-9a-f]*) => '$1'
+=======
+    // 0x([0-9a-f]*) => '$1'
+>>>>>>> 33d751edaa339bca5a33ee873d2f00453dd0545a
     protected function sqlEntrysToRecords($sql_entries, $fields) {
         $field_array_keys = array_keys($fields);
         $records = [];
diff --git a/community_server/tests/Fixture/StateUsersFixture.php b/community_server/tests/Fixture/StateUsersFixture.php
index a9b033bf7..344296da4 100644
--- a/community_server/tests/Fixture/StateUsersFixture.php
+++ b/community_server/tests/Fixture/StateUsersFixture.php
@@ -49,6 +49,7 @@ class StateUsersFixture extends BaseTestFixture
             [4, 0, 0, 'e3369de3623ce8446d0424c4013e7a1d71a2671ae3d7bf1e798ebf0665d145f2', 'test3.yahoo.com', 'Samuel', 'Schmied', NULL, 0]
         ];
         $this->records = $this->sqlEntrysToRecords($sql_entrys, $this->fields);
+        echo bin2hex($this->records[0]['public_key']) . "\n";
         parent::init();
     }
 }
diff --git a/community_server/tests/Fixture/TransactionSignaturesFixture.php b/community_server/tests/Fixture/TransactionSignaturesFixture.php
index 24c19b3b8..710f055a0 100644
--- a/community_server/tests/Fixture/TransactionSignaturesFixture.php
+++ b/community_server/tests/Fixture/TransactionSignaturesFixture.php
@@ -6,7 +6,7 @@ use Cake\TestSuite\Fixture\TestFixture;
 /**
  * TransactionSignaturesFixture
  */
-class TransactionSignaturesFixture extends TestFixture
+class TransactionSignaturesFixture extends BaseTestFixture
 {
     /**
      * Fields
@@ -45,6 +45,7 @@ class TransactionSignaturesFixture extends TestFixture
             [7, 7, '83ab780535883ec53ee76d0f68db0e1596418c9e100c806a4d4655d4dedf589d54a6319a2795dabab301e212b52f0dafb2725b7583447f19e47cb417d188a107', 'e3369de3623ce8446d0424c4013e7a1d71a2671ae3d7bf1e798ebf0665d145f2'],
             [8, 8, '83ab780535883ec53ee76d0f68db0e1596418c9e100c806a4d4655d4dedf589d54a6319a2795dabab301e212b52f0dafb2725b7583447f19e47cb417d188a107', 'e3369de3623ce8446d0424c4013e7a1d71a2671ae3d7bf1e798ebf0665d145f2']
         ];
+        $this->records = $this->sqlEntrysToRecords($sql, $this->fields);
         parent::init();
     }
 }