Fill BlockchainTests on https://github.com/ethereum/cpp-ethereum/pull/4458

In all BlockchainTests, an empty account should disappear from the post state for Constantinople

96 files changed, 4128 insertions, 4800 deletions

diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest109BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest109BC.json
index 83da0c8df..bb2970cd2 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest109BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest109BC.json
@@ -2,8 +2,8 @@
     "randomStatetest109BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.851326b7.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest109BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest109BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa218",
-                    "hash" : "0x8b9ea0ebc425e873ad48a05f635c9d2c4410ea75dd2b5d439c5a7ca0f78be18d",
-                    "mixHash" : "0xc956d0fb2f5d5085daf6c1700ae0ffceae4718ada66f9f277b83b19804cf4aad",
-                    "nonce" : "0x560524935e84584f",
+                    "hash" : "0x64be1036d304af77cfa6c2da2f36f7c1c7ea859d86feb4c3aff01291260944e0",
+                    "mixHash" : "0x199282ba8c68af52a46e96745ee6c1a0f6e05516a90fe4d19f38b1a2ded66900",
+                    "nonce" : "0xc4ae82b0f5ba7d0b",
                     "number" : "0x01",
                     "parentHash" : "0x9d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94",
                     "receiptTrie" : "0x6899214c67b8a4ef38e0acce95cb3fc91d1ee7eccac59fbddbef1a3269e3d840",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca09d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0eb6b24677a8e10345d3abf255cf92dcf333f68d768386500a58e6c6a3a635558a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06899214c67b8a4ef38e0acce95cb3fc91d1ee7eccac59fbddbef1a3269e3d840b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2188203e880a0c956d0fb2f5d5085daf6c1700ae0ffceae4718ada66f9f277b83b19804cf4aad88560524935e84584ff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca09d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0eb6b24677a8e10345d3abf255cf92dcf333f68d768386500a58e6c6a3a635558a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06899214c67b8a4ef38e0acce95cb3fc91d1ee7eccac59fbddbef1a3269e3d840b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2188203e880a0199282ba8c68af52a46e96745ee6c1a0f6e05516a90fe4d19f38b1a2ded6690088c4ae82b0f5ba7d0bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0469d4026341ad0b45531cd551833537c9e90f01bae11bcf560bd36709c86f8c8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8b9ea0ebc425e873ad48a05f635c9d2c4410ea75dd2b5d439c5a7ca0f78be18d",
+        "lastblockhash" : "0x64be1036d304af77cfa6c2da2f36f7c1c7ea859d86feb4c3aff01291260944e0",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest109BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.851326b7.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest109BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest109BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa524",
-                    "hash" : "0x0ad7eb75498adceb2b70854b576ff7f8ca0ec3be747f3dc06276063bfa4e3303",
-                    "mixHash" : "0x9dc89608cb5d7beda3e0071650915842eef6bef7ead4f25809005adf946df96d",
-                    "nonce" : "0x0c34c1834eff6ba2",
+                    "hash" : "0x402c9f8a6f24a8516ddc1ddec2d156ad044131dd2094f09f2953472e113843b0",
+                    "mixHash" : "0x821eba25d98efd47f7fc8ee09bc3238933ef3efe31f3f5ac803d9e0d738fdc14",
+                    "nonce" : "0x6e82ad8476b17ca2",
                     "number" : "0x01",
                     "parentHash" : "0x9d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94",
                     "receiptTrie" : "0x0cdfed66484fa8a192c2be587587233b7b6ca83fcf65826a8d5bef1f5f06bdb8",
-                    "stateRoot" : "0x86c61383edffdee9eb2e34db3a0acf5a96777a2c67b93695da1193b17c323ef6",
+                    "stateRoot" : "0xcb61d1d6e935f40456b89b142238fcc294b163c308858804033edec8522816cc",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca09d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a086c61383edffdee9eb2e34db3a0acf5a96777a2c67b93695da1193b17c323ef6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa00cdfed66484fa8a192c2be587587233b7b6ca83fcf65826a8d5bef1f5f06bdb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a5248203e880a09dc89608cb5d7beda3e0071650915842eef6bef7ead4f25809005adf946df96d880c34c1834eff6ba2f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca09d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cb61d1d6e935f40456b89b142238fcc294b163c308858804033edec8522816cca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa00cdfed66484fa8a192c2be587587233b7b6ca83fcf65826a8d5bef1f5f06bdb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a5248203e880a0821eba25d98efd47f7fc8ee09bc3238933ef3efe31f3f5ac803d9e0d738fdc14886e82ad8476b17ca2f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0469d4026341ad0b45531cd551833537c9e90f01bae11bcf560bd36709c86f8c8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0ad7eb75498adceb2b70854b576ff7f8ca0ec3be747f3dc06276063bfa4e3303",
+        "lastblockhash" : "0x402c9f8a6f24a8516ddc1ddec2d156ad044131dd2094f09f2953472e113843b0",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x44444131444055",
@@ -235,8 +228,8 @@
     "randomStatetest109BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.851326b7.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest109BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest109BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa218",
-                    "hash" : "0xad04139092c921d1d2da34e5b099caab3ef97522763d5b9c54b4e956b6ca7ac8",
-                    "mixHash" : "0x080257c9e3cdabfcf5a8d92165852b8a3821107910462008926ec9012ef2a6e4",
-                    "nonce" : "0x640998be9a2616c4",
+                    "hash" : "0xf5bcdfbb87080d878b08a0a4a8c5aaa24f0b4ba08c5a3d4bf2e455b46ef65b20",
+                    "mixHash" : "0x651c62a31d68f8bfe36ce72fd45473aadc8c4b29f3a28606d10f7d81237aa3a1",
+                    "nonce" : "0x850cbb6a252088ce",
                     "number" : "0x01",
                     "parentHash" : "0x9d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94",
                     "receiptTrie" : "0x47228fc386828d150819cef6971a4f939e8ffe2a3f6ab402e9588f54bf9cb248",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca09d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b140d890daf6d7ff0689e87331fe8a04876efdce2a8bdb4ae6aa2a4d03bd8087a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa047228fc386828d150819cef6971a4f939e8ffe2a3f6ab402e9588f54bf9cb248b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2188203e880a0080257c9e3cdabfcf5a8d92165852b8a3821107910462008926ec9012ef2a6e488640998be9a2616c4f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca09d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b140d890daf6d7ff0689e87331fe8a04876efdce2a8bdb4ae6aa2a4d03bd8087a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa047228fc386828d150819cef6971a4f939e8ffe2a3f6ab402e9588f54bf9cb248b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2188203e880a0651c62a31d68f8bfe36ce72fd45473aadc8c4b29f3a28606d10f7d81237aa3a188850cbb6a252088cef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0469d4026341ad0b45531cd551833537c9e90f01bae11bcf560bd36709c86f8c8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xad04139092c921d1d2da34e5b099caab3ef97522763d5b9c54b4e956b6ca7ac8",
+        "lastblockhash" : "0xf5bcdfbb87080d878b08a0a4a8c5aaa24f0b4ba08c5a3d4bf2e455b46ef65b20",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest109BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.851326b7.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest109BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest109BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa218",
-                    "hash" : "0xfe4d736ed530917930bb087bcb1b95fac0564064d3f0ed61023d221804d26e4b",
-                    "mixHash" : "0xd2c418f898f285359565dfa5da9f52809f03c30f3ada2b0c5112058824edcd1a",
-                    "nonce" : "0xe824ef3705eb58a6",
+                    "hash" : "0x1de6cd87d2995571364c0431ea5ac2f9f4d7dfcade84a4173701af348ea8cdd5",
+                    "mixHash" : "0xaf9a5088babd82091c503aa7706977607f08a72506291574f58ab755283044f2",
+                    "nonce" : "0x7d9d29c146cb6691",
                     "number" : "0x01",
                     "parentHash" : "0x9d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94",
                     "receiptTrie" : "0x47228fc386828d150819cef6971a4f939e8ffe2a3f6ab402e9588f54bf9cb248",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca09d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b140d890daf6d7ff0689e87331fe8a04876efdce2a8bdb4ae6aa2a4d03bd8087a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa047228fc386828d150819cef6971a4f939e8ffe2a3f6ab402e9588f54bf9cb248b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2188203e880a0d2c418f898f285359565dfa5da9f52809f03c30f3ada2b0c5112058824edcd1a88e824ef3705eb58a6f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca09d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b140d890daf6d7ff0689e87331fe8a04876efdce2a8bdb4ae6aa2a4d03bd8087a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa047228fc386828d150819cef6971a4f939e8ffe2a3f6ab402e9588f54bf9cb248b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2188203e880a0af9a5088babd82091c503aa7706977607f08a72506291574f58ab755283044f2887d9d29c146cb6691f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0469d4026341ad0b45531cd551833537c9e90f01bae11bcf560bd36709c86f8c8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfe4d736ed530917930bb087bcb1b95fac0564064d3f0ed61023d221804d26e4b",
+        "lastblockhash" : "0x1de6cd87d2995571364c0431ea5ac2f9f4d7dfcade84a4173701af348ea8cdd5",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest109BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.851326b7.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest109BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest109BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa09c",
-                    "hash" : "0x5a6ae370223735de036603479f37141ff9b528e1ff22c3f042ccab67d84287ee",
-                    "mixHash" : "0xd14d4d8d763c418845fe3ffd92098cf9bff4b4a0599247d01afe8759759d914b",
-                    "nonce" : "0x3725ea8f01b23a46",
+                    "hash" : "0x36d8832a5c84de7d0e1fee9e73b8e0ae313469c90822f78fd7d640f9bf49075a",
+                    "mixHash" : "0xfabadc309346f1d5e9be3d56d85c7948a5510f8f920823cab6c006b4d9a4110e",
+                    "nonce" : "0x230088fb00c4eb7a",
                     "number" : "0x01",
                     "parentHash" : "0x9d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94",
                     "receiptTrie" : "0xc01f36e7ba8120299f830828efa296e4b15681321491e19900bb4f65f1eae70d",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca09d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0efb00001a028f8c1aa66735164241f4d87c91df306dd51d8cfdd005f3f3270e9a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0c01f36e7ba8120299f830828efa296e4b15681321491e19900bb4f65f1eae70db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a09c8203e880a0d14d4d8d763c418845fe3ffd92098cf9bff4b4a0599247d01afe8759759d914b883725ea8f01b23a46f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca09d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0efb00001a028f8c1aa66735164241f4d87c91df306dd51d8cfdd005f3f3270e9a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0c01f36e7ba8120299f830828efa296e4b15681321491e19900bb4f65f1eae70db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a09c8203e880a0fabadc309346f1d5e9be3d56d85c7948a5510f8f920823cab6c006b4d9a4110e88230088fb00c4eb7af865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0469d4026341ad0b45531cd551833537c9e90f01bae11bcf560bd36709c86f8c8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5a6ae370223735de036603479f37141ff9b528e1ff22c3f042ccab67d84287ee",
+        "lastblockhash" : "0x36d8832a5c84de7d0e1fee9e73b8e0ae313469c90822f78fd7d640f9bf49075a",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest109BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.851326b7.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest109BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest109BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa09c",
-                    "hash" : "0xba3b09b4dfa46fc720b1451c692612a8a219c1e20f5abc207b4778e98af59ba6",
-                    "mixHash" : "0xd7c035922cf08e95a6c954a07512ca81a0783c64ba64127dc8cd594705c34076",
-                    "nonce" : "0x96d56cc7f823bb10",
+                    "hash" : "0x44844c2b9c018cc3dd1096df11d17236ba4d9253d6125d8a6eda305e22bedeb1",
+                    "mixHash" : "0x8b24daff276c5cf4f326b5a81c436c671c831f0ff11154a726af058144fbd49e",
+                    "nonce" : "0x7f1a4c2ca99b0e38",
                     "number" : "0x01",
                     "parentHash" : "0x9d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94",
                     "receiptTrie" : "0xc01f36e7ba8120299f830828efa296e4b15681321491e19900bb4f65f1eae70d",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca09d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0efb00001a028f8c1aa66735164241f4d87c91df306dd51d8cfdd005f3f3270e9a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0c01f36e7ba8120299f830828efa296e4b15681321491e19900bb4f65f1eae70db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a09c8203e880a0d7c035922cf08e95a6c954a07512ca81a0783c64ba64127dc8cd594705c340768896d56cc7f823bb10f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca09d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0efb00001a028f8c1aa66735164241f4d87c91df306dd51d8cfdd005f3f3270e9a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0c01f36e7ba8120299f830828efa296e4b15681321491e19900bb4f65f1eae70db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a09c8203e880a08b24daff276c5cf4f326b5a81c436c671c831f0ff11154a726af058144fbd49e887f1a4c2ca99b0e38f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0469d4026341ad0b45531cd551833537c9e90f01bae11bcf560bd36709c86f8c8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xba3b09b4dfa46fc720b1451c692612a8a219c1e20f5abc207b4778e98af59ba6",
+        "lastblockhash" : "0x44844c2b9c018cc3dd1096df11d17236ba4d9253d6125d8a6eda305e22bedeb1",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest113BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest113BC.json
index af8f5c41b..59d2c3638 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest113BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest113BC.json
@@ -2,8 +2,8 @@
     "randomStatetest113BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.851326b7.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest113BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest113BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc7fd",
-                    "hash" : "0xf336b187b55e2882931c29bcc9c065a9094b36251b9c2b65e45de46b346c38e4",
-                    "mixHash" : "0x73a5f551617e919068693cf511de5f313b0b6f3395ffd64f9d9ef73a9ad8409d",
-                    "nonce" : "0x5c0ac8927ab9856c",
+                    "hash" : "0xc4b5a97fafef88f88bc8f7a20a755e7c80796d2f65d8db598e3aadf648c8e083",
+                    "mixHash" : "0x54df7f9b6a782319849a5e8afab3972a3072b68de175c3dc42267e7511853a95",
+                    "nonce" : "0x57cdbe276ddad89b",
                     "number" : "0x01",
                     "parentHash" : "0xf3b6b5c334fb69e5b4189429ad26fe5376d1c67e8c5337ea8e8e1e7a6df1a773",
                     "receiptTrie" : "0x71f920af5301ca295e9a897bf88ab00029530de7620c47175cef0dd0bd61fa95",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x1039c95bea44db3a6aac48b68ba1da95f2756393cf41099da10a29c756d03917",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90364f901fca0f3b6b5c334fb69e5b4189429ad26fe5376d1c67e8c5337ea8e8e1e7a6df1a773a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0aecb99524dda42abbd7e555568f03f96ad2d6d3c5055af5f19a1165269f78d6da01039c95bea44db3a6aac48b68ba1da95f2756393cf41099da10a29c756d03917a071f920af5301ca295e9a897bf88ab00029530de7620c47175cef0dd0bd61fa95b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c7fd8203e880a073a5f551617e919068693cf511de5f313b0b6f3395ffd64f9d9ef73a9ad8409d885c0ac8927ab9856cf90161f9015e800184053490f694095e7baea6a6c7c4c2dfeb977efac326af552d878432f99975b8f87fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f6582a26ef383339ff078f0f00779781ba0df45617b385a4211320e216cae82d1fb97432a5300c5b25f3a7690b3abe4be07a030f74ce0b61c57b8708ed0773ecea36948972f4da4bca0087d55f91c0c69ecb9c0",
+                "rlp" : "0xf90364f901fca0f3b6b5c334fb69e5b4189429ad26fe5376d1c67e8c5337ea8e8e1e7a6df1a773a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0aecb99524dda42abbd7e555568f03f96ad2d6d3c5055af5f19a1165269f78d6da01039c95bea44db3a6aac48b68ba1da95f2756393cf41099da10a29c756d03917a071f920af5301ca295e9a897bf88ab00029530de7620c47175cef0dd0bd61fa95b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c7fd8203e880a054df7f9b6a782319849a5e8afab3972a3072b68de175c3dc42267e7511853a958857cdbe276ddad89bf90161f9015e800184053490f694095e7baea6a6c7c4c2dfeb977efac326af552d878432f99975b8f87fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f6582a26ef383339ff078f0f00779781ba0df45617b385a4211320e216cae82d1fb97432a5300c5b25f3a7690b3abe4be07a030f74ce0b61c57b8708ed0773ecea36948972f4da4bca0087d55f91c0c69ecb9c0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f6582a26ef383339ff078f0f0077978",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a087e6e182fd6ff17d1935766e56ada44265b76dbb346043fd315cde7b491f4dc6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf336b187b55e2882931c29bcc9c065a9094b36251b9c2b65e45de46b346c38e4",
+        "lastblockhash" : "0xc4b5a97fafef88f88bc8f7a20a755e7c80796d2f65d8db598e3aadf648c8e083",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest113BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.851326b7.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest113BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest113BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xcb09",
-                    "hash" : "0x0d3d85a3a6596614822d511781809eb63f8bde45fdea64e51068d31b7d09511c",
-                    "mixHash" : "0x3aef80cbb7624bea5ecd31224f59d9d5a2ca1f484be39d53387763889865d7b8",
-                    "nonce" : "0x78f86ffcc18fd5bd",
+                    "hash" : "0x41c6507fc2183e51f2f471d6d90a58e01ad5dc8c7e987cdc018ebb84c37dad6f",
+                    "mixHash" : "0xf1df0392b2710774b96e064a45151283e6beab710a8fc60d94a20c3b31a2ed61",
+                    "nonce" : "0xbffbe2f0a301973d",
                     "number" : "0x01",
                     "parentHash" : "0xf3b6b5c334fb69e5b4189429ad26fe5376d1c67e8c5337ea8e8e1e7a6df1a773",
                     "receiptTrie" : "0x57b4fb52ab2398bb89f1f63ce7e77bdb70b9e8c2d6ff4e88d492df01ed05cfb1",
-                    "stateRoot" : "0x1f65fa2552a5de93afdd834f6549f04f0d09a41e146ec8718fd0ff7127eac174",
+                    "stateRoot" : "0x07dfda032a905aa9bef692a2e0ac575034995eacd697a40f3e9ec398d24b6cf3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1039c95bea44db3a6aac48b68ba1da95f2756393cf41099da10a29c756d03917",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90364f901fca0f3b6b5c334fb69e5b4189429ad26fe5376d1c67e8c5337ea8e8e1e7a6df1a773a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01f65fa2552a5de93afdd834f6549f04f0d09a41e146ec8718fd0ff7127eac174a01039c95bea44db3a6aac48b68ba1da95f2756393cf41099da10a29c756d03917a057b4fb52ab2398bb89f1f63ce7e77bdb70b9e8c2d6ff4e88d492df01ed05cfb1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cb098203e880a03aef80cbb7624bea5ecd31224f59d9d5a2ca1f484be39d53387763889865d7b88878f86ffcc18fd5bdf90161f9015e800184053490f694095e7baea6a6c7c4c2dfeb977efac326af552d878432f99975b8f87fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f6582a26ef383339ff078f0f00779781ba0df45617b385a4211320e216cae82d1fb97432a5300c5b25f3a7690b3abe4be07a030f74ce0b61c57b8708ed0773ecea36948972f4da4bca0087d55f91c0c69ecb9c0",
+                "rlp" : "0xf90364f901fca0f3b6b5c334fb69e5b4189429ad26fe5376d1c67e8c5337ea8e8e1e7a6df1a773a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a007dfda032a905aa9bef692a2e0ac575034995eacd697a40f3e9ec398d24b6cf3a01039c95bea44db3a6aac48b68ba1da95f2756393cf41099da10a29c756d03917a057b4fb52ab2398bb89f1f63ce7e77bdb70b9e8c2d6ff4e88d492df01ed05cfb1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cb098203e880a0f1df0392b2710774b96e064a45151283e6beab710a8fc60d94a20c3b31a2ed6188bffbe2f0a301973df90161f9015e800184053490f694095e7baea6a6c7c4c2dfeb977efac326af552d878432f99975b8f87fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f6582a26ef383339ff078f0f00779781ba0df45617b385a4211320e216cae82d1fb97432a5300c5b25f3a7690b3abe4be07a030f74ce0b61c57b8708ed0773ecea36948972f4da4bca0087d55f91c0c69ecb9c0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f6582a26ef383339ff078f0f0077978",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a087e6e182fd6ff17d1935766e56ada44265b76dbb346043fd315cde7b491f4dc6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0d3d85a3a6596614822d511781809eb63f8bde45fdea64e51068d31b7d09511c",
+        "lastblockhash" : "0x41c6507fc2183e51f2f471d6d90a58e01ad5dc8c7e987cdc018ebb84c37dad6f",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x32f99975",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f6582a26ef383339ff078f0f00779785560005155",
@@ -235,8 +228,8 @@
     "randomStatetest113BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.851326b7.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest113BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest113BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc7fd",
-                    "hash" : "0x7f0b16836839257f3ebc68b47c99b388393564a8524c9bf39a78c32ded7ade72",
-                    "mixHash" : "0x190920d89c38efb9774b3862e7407bdc5653a6327ad201e49bda67115bc0fb0a",
-                    "nonce" : "0xf331d82f9040907f",
+                    "hash" : "0x9b53e4e1d3f107e832277e5e329c3a1d250f6a4e7ee100f0a63cd68e00805242",
+                    "mixHash" : "0xcc3acaf923ad611a8cb00c013873df65a2adab11b73c43b4054c55d1689059a7",
+                    "nonce" : "0x2e3a60f804995c72",
                     "number" : "0x01",
                     "parentHash" : "0xf3b6b5c334fb69e5b4189429ad26fe5376d1c67e8c5337ea8e8e1e7a6df1a773",
                     "receiptTrie" : "0x1cf274084ab9689fd96a95704b4c7725ab1a27c44cbecf7538f60c8fe63b9c07",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0x1039c95bea44db3a6aac48b68ba1da95f2756393cf41099da10a29c756d03917",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90364f901fca0f3b6b5c334fb69e5b4189429ad26fe5376d1c67e8c5337ea8e8e1e7a6df1a773a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0314a946ded6b84ea450368ee39bf35db1dee7d26a551ecec490ee19d339c71d2a01039c95bea44db3a6aac48b68ba1da95f2756393cf41099da10a29c756d03917a01cf274084ab9689fd96a95704b4c7725ab1a27c44cbecf7538f60c8fe63b9c07b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c7fd8203e880a0190920d89c38efb9774b3862e7407bdc5653a6327ad201e49bda67115bc0fb0a88f331d82f9040907ff90161f9015e800184053490f694095e7baea6a6c7c4c2dfeb977efac326af552d878432f99975b8f87fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f6582a26ef383339ff078f0f00779781ba0df45617b385a4211320e216cae82d1fb97432a5300c5b25f3a7690b3abe4be07a030f74ce0b61c57b8708ed0773ecea36948972f4da4bca0087d55f91c0c69ecb9c0",
+                "rlp" : "0xf90364f901fca0f3b6b5c334fb69e5b4189429ad26fe5376d1c67e8c5337ea8e8e1e7a6df1a773a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0314a946ded6b84ea450368ee39bf35db1dee7d26a551ecec490ee19d339c71d2a01039c95bea44db3a6aac48b68ba1da95f2756393cf41099da10a29c756d03917a01cf274084ab9689fd96a95704b4c7725ab1a27c44cbecf7538f60c8fe63b9c07b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c7fd8203e880a0cc3acaf923ad611a8cb00c013873df65a2adab11b73c43b4054c55d1689059a7882e3a60f804995c72f90161f9015e800184053490f694095e7baea6a6c7c4c2dfeb977efac326af552d878432f99975b8f87fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f6582a26ef383339ff078f0f00779781ba0df45617b385a4211320e216cae82d1fb97432a5300c5b25f3a7690b3abe4be07a030f74ce0b61c57b8708ed0773ecea36948972f4da4bca0087d55f91c0c69ecb9c0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f6582a26ef383339ff078f0f0077978",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a087e6e182fd6ff17d1935766e56ada44265b76dbb346043fd315cde7b491f4dc6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7f0b16836839257f3ebc68b47c99b388393564a8524c9bf39a78c32ded7ade72",
+        "lastblockhash" : "0x9b53e4e1d3f107e832277e5e329c3a1d250f6a4e7ee100f0a63cd68e00805242",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest113BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.851326b7.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest113BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest113BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc7fd",
-                    "hash" : "0x1d65a4499551664b7f19b169b1322ca694e8f5fbf68e85f7432b47bc95db3183",
-                    "mixHash" : "0xf23c68149dbd0439922725df1b5d81e91ed619f1ddb378376b9ed641dd48219c",
-                    "nonce" : "0x1ec371620a98f052",
+                    "hash" : "0x459e3f2275ed4a9857a9794274cdef99d1538149ab20179e939e18d87344e419",
+                    "mixHash" : "0x9a45ad5f33a4b8916d3f0bbd3bfe6c3fa1a4944de21434039499c933d3f72707",
+                    "nonce" : "0x03378d84fc6fc9ae",
                     "number" : "0x01",
                     "parentHash" : "0xf3b6b5c334fb69e5b4189429ad26fe5376d1c67e8c5337ea8e8e1e7a6df1a773",
                     "receiptTrie" : "0x1cf274084ab9689fd96a95704b4c7725ab1a27c44cbecf7538f60c8fe63b9c07",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0x1039c95bea44db3a6aac48b68ba1da95f2756393cf41099da10a29c756d03917",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90364f901fca0f3b6b5c334fb69e5b4189429ad26fe5376d1c67e8c5337ea8e8e1e7a6df1a773a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0314a946ded6b84ea450368ee39bf35db1dee7d26a551ecec490ee19d339c71d2a01039c95bea44db3a6aac48b68ba1da95f2756393cf41099da10a29c756d03917a01cf274084ab9689fd96a95704b4c7725ab1a27c44cbecf7538f60c8fe63b9c07b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c7fd8203e880a0f23c68149dbd0439922725df1b5d81e91ed619f1ddb378376b9ed641dd48219c881ec371620a98f052f90161f9015e800184053490f694095e7baea6a6c7c4c2dfeb977efac326af552d878432f99975b8f87fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f6582a26ef383339ff078f0f00779781ba0df45617b385a4211320e216cae82d1fb97432a5300c5b25f3a7690b3abe4be07a030f74ce0b61c57b8708ed0773ecea36948972f4da4bca0087d55f91c0c69ecb9c0",
+                "rlp" : "0xf90364f901fca0f3b6b5c334fb69e5b4189429ad26fe5376d1c67e8c5337ea8e8e1e7a6df1a773a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0314a946ded6b84ea450368ee39bf35db1dee7d26a551ecec490ee19d339c71d2a01039c95bea44db3a6aac48b68ba1da95f2756393cf41099da10a29c756d03917a01cf274084ab9689fd96a95704b4c7725ab1a27c44cbecf7538f60c8fe63b9c07b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c7fd8203e880a09a45ad5f33a4b8916d3f0bbd3bfe6c3fa1a4944de21434039499c933d3f727078803378d84fc6fc9aef90161f9015e800184053490f694095e7baea6a6c7c4c2dfeb977efac326af552d878432f99975b8f87fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f6582a26ef383339ff078f0f00779781ba0df45617b385a4211320e216cae82d1fb97432a5300c5b25f3a7690b3abe4be07a030f74ce0b61c57b8708ed0773ecea36948972f4da4bca0087d55f91c0c69ecb9c0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f6582a26ef383339ff078f0f0077978",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a087e6e182fd6ff17d1935766e56ada44265b76dbb346043fd315cde7b491f4dc6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1d65a4499551664b7f19b169b1322ca694e8f5fbf68e85f7432b47bc95db3183",
+        "lastblockhash" : "0x459e3f2275ed4a9857a9794274cdef99d1538149ab20179e939e18d87344e419",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest113BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.851326b7.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest113BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest113BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc7fd",
-                    "hash" : "0x44f066871c76057f0b46bef973a74ac90c507989d3c6a19b68207b297616d139",
-                    "mixHash" : "0x0673c0ec3b58be541cc7eec621677ec0fab8dcbe3d45a0c59af66fe8620be400",
-                    "nonce" : "0xfa68f35243539059",
+                    "hash" : "0xd205847a0b36f8b6c6a6820788e3874c5153797cd9a08b88263163894379d9dc",
+                    "mixHash" : "0x55938321c6d2338e4264409db4555a9d9a93ad414545401885caacfb85c5c31d",
+                    "nonce" : "0x80e2bc277eebe7bc",
                     "number" : "0x01",
                     "parentHash" : "0xf3b6b5c334fb69e5b4189429ad26fe5376d1c67e8c5337ea8e8e1e7a6df1a773",
                     "receiptTrie" : "0x1cf274084ab9689fd96a95704b4c7725ab1a27c44cbecf7538f60c8fe63b9c07",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0x1039c95bea44db3a6aac48b68ba1da95f2756393cf41099da10a29c756d03917",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90364f901fca0f3b6b5c334fb69e5b4189429ad26fe5376d1c67e8c5337ea8e8e1e7a6df1a773a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0314a946ded6b84ea450368ee39bf35db1dee7d26a551ecec490ee19d339c71d2a01039c95bea44db3a6aac48b68ba1da95f2756393cf41099da10a29c756d03917a01cf274084ab9689fd96a95704b4c7725ab1a27c44cbecf7538f60c8fe63b9c07b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c7fd8203e880a00673c0ec3b58be541cc7eec621677ec0fab8dcbe3d45a0c59af66fe8620be40088fa68f35243539059f90161f9015e800184053490f694095e7baea6a6c7c4c2dfeb977efac326af552d878432f99975b8f87fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f6582a26ef383339ff078f0f00779781ba0df45617b385a4211320e216cae82d1fb97432a5300c5b25f3a7690b3abe4be07a030f74ce0b61c57b8708ed0773ecea36948972f4da4bca0087d55f91c0c69ecb9c0",
+                "rlp" : "0xf90364f901fca0f3b6b5c334fb69e5b4189429ad26fe5376d1c67e8c5337ea8e8e1e7a6df1a773a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0314a946ded6b84ea450368ee39bf35db1dee7d26a551ecec490ee19d339c71d2a01039c95bea44db3a6aac48b68ba1da95f2756393cf41099da10a29c756d03917a01cf274084ab9689fd96a95704b4c7725ab1a27c44cbecf7538f60c8fe63b9c07b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c7fd8203e880a055938321c6d2338e4264409db4555a9d9a93ad414545401885caacfb85c5c31d8880e2bc277eebe7bcf90161f9015e800184053490f694095e7baea6a6c7c4c2dfeb977efac326af552d878432f99975b8f87fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f6582a26ef383339ff078f0f00779781ba0df45617b385a4211320e216cae82d1fb97432a5300c5b25f3a7690b3abe4be07a030f74ce0b61c57b8708ed0773ecea36948972f4da4bca0087d55f91c0c69ecb9c0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f6582a26ef383339ff078f0f0077978",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a087e6e182fd6ff17d1935766e56ada44265b76dbb346043fd315cde7b491f4dc6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x44f066871c76057f0b46bef973a74ac90c507989d3c6a19b68207b297616d139",
+        "lastblockhash" : "0xd205847a0b36f8b6c6a6820788e3874c5153797cd9a08b88263163894379d9dc",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest113BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.851326b7.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest113BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest113BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc7fd",
-                    "hash" : "0x02d2f415e49d2d6d186603ffaf2158a07110f9314054a5ad9de6405d4aab00fd",
-                    "mixHash" : "0xfe4575d766e38acd4ab9ecbbea2521b0621fb9f09c071cc89e6e27d0d15e6338",
-                    "nonce" : "0x246c5df37507a571",
+                    "hash" : "0x0a510cf1b0a83003c648ab9c44643ae5db99b95db6c91e2bbf126bd5b9c2cbd9",
+                    "mixHash" : "0x26ff5f8f47941fefb14abc2f60bad8e6262cccaf7cbde47d8608d0d278f17a15",
+                    "nonce" : "0x5d58eaae379a8c40",
                     "number" : "0x01",
                     "parentHash" : "0xf3b6b5c334fb69e5b4189429ad26fe5376d1c67e8c5337ea8e8e1e7a6df1a773",
                     "receiptTrie" : "0x1cf274084ab9689fd96a95704b4c7725ab1a27c44cbecf7538f60c8fe63b9c07",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0x1039c95bea44db3a6aac48b68ba1da95f2756393cf41099da10a29c756d03917",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90364f901fca0f3b6b5c334fb69e5b4189429ad26fe5376d1c67e8c5337ea8e8e1e7a6df1a773a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0314a946ded6b84ea450368ee39bf35db1dee7d26a551ecec490ee19d339c71d2a01039c95bea44db3a6aac48b68ba1da95f2756393cf41099da10a29c756d03917a01cf274084ab9689fd96a95704b4c7725ab1a27c44cbecf7538f60c8fe63b9c07b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c7fd8203e880a0fe4575d766e38acd4ab9ecbbea2521b0621fb9f09c071cc89e6e27d0d15e633888246c5df37507a571f90161f9015e800184053490f694095e7baea6a6c7c4c2dfeb977efac326af552d878432f99975b8f87fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f6582a26ef383339ff078f0f00779781ba0df45617b385a4211320e216cae82d1fb97432a5300c5b25f3a7690b3abe4be07a030f74ce0b61c57b8708ed0773ecea36948972f4da4bca0087d55f91c0c69ecb9c0",
+                "rlp" : "0xf90364f901fca0f3b6b5c334fb69e5b4189429ad26fe5376d1c67e8c5337ea8e8e1e7a6df1a773a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0314a946ded6b84ea450368ee39bf35db1dee7d26a551ecec490ee19d339c71d2a01039c95bea44db3a6aac48b68ba1da95f2756393cf41099da10a29c756d03917a01cf274084ab9689fd96a95704b4c7725ab1a27c44cbecf7538f60c8fe63b9c07b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c7fd8203e880a026ff5f8f47941fefb14abc2f60bad8e6262cccaf7cbde47d8608d0d278f17a15885d58eaae379a8c40f90161f9015e800184053490f694095e7baea6a6c7c4c2dfeb977efac326af552d878432f99975b8f87fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f6582a26ef383339ff078f0f00779781ba0df45617b385a4211320e216cae82d1fb97432a5300c5b25f3a7690b3abe4be07a030f74ce0b61c57b8708ed0773ecea36948972f4da4bca0087d55f91c0c69ecb9c0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f6582a26ef383339ff078f0f0077978",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a087e6e182fd6ff17d1935766e56ada44265b76dbb346043fd315cde7b491f4dc6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x02d2f415e49d2d6d186603ffaf2158a07110f9314054a5ad9de6405d4aab00fd",
+        "lastblockhash" : "0x0a510cf1b0a83003c648ab9c44643ae5db99b95db6c91e2bbf126bd5b9c2cbd9",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest127BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest127BC.json
index 3afd69e38..821c511c6 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest127BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest127BC.json
@@ -2,8 +2,8 @@
     "randomStatetest127BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.851326b7.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest127BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest127BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa098",
-                    "hash" : "0x846f40bc768cc2a1709d0594f565b46f626beaeef932fd9a6d9e366e5a37ce89",
-                    "mixHash" : "0x9c8ced2fb24ca22317642379ec73465a37e47843aa6917e8923c11924f1d63f3",
-                    "nonce" : "0x0a5b72eac07f3b95",
+                    "hash" : "0xa575a5a9b6016a27a5ea265094f89c73defb1023ea14cf6938604c1847dac9ed",
+                    "mixHash" : "0x862df914d2c9255dda5f40188dd5cbe80c504d444026e22bb00b8b8bf3b1e271",
+                    "nonce" : "0x0ebcef96e6396b62",
                     "number" : "0x01",
                     "parentHash" : "0x64f9a3a70af31bba33aa821702313129823ade027a4cffa3d9e2b7506592f888",
                     "receiptTrie" : "0xcfcb7df3e773e1f9b73cb7477658fabbb03686057cfb9711fe9de20520097eb6",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca064f9a3a70af31bba33aa821702313129823ade027a4cffa3d9e2b7506592f888a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a021f836cb06e5554bf0d1924197b2219422fa8b0ec6ab2102731ef52b9cade63ba0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0cfcb7df3e773e1f9b73cb7477658fabbb03686057cfb9711fe9de20520097eb6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0988203e880a09c8ced2fb24ca22317642379ec73465a37e47843aa6917e8923c11924f1d63f3880a5b72eac07f3b95f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca064f9a3a70af31bba33aa821702313129823ade027a4cffa3d9e2b7506592f888a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a021f836cb06e5554bf0d1924197b2219422fa8b0ec6ab2102731ef52b9cade63ba0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0cfcb7df3e773e1f9b73cb7477658fabbb03686057cfb9711fe9de20520097eb6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0988203e880a0862df914d2c9255dda5f40188dd5cbe80c504d444026e22bb00b8b8bf3b1e271880ebcef96e6396b62f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a039584d128aef4a35853b45df80655e610513fc5f6ed2e56f9cdf1577ba9a38c0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x846f40bc768cc2a1709d0594f565b46f626beaeef932fd9a6d9e366e5a37ce89",
+        "lastblockhash" : "0xa575a5a9b6016a27a5ea265094f89c73defb1023ea14cf6938604c1847dac9ed",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest127BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.851326b7.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest127BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest127BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa3a4",
-                    "hash" : "0x7a291ef1bea0c7a75bc4d7b75f6b4936f8483cacccb27ac116a790be84a593f8",
-                    "mixHash" : "0x4a0047bfea8e42c4b4984d35e1efb8d0a048f3e7bb5d02fe1a7a8af40bba58ef",
-                    "nonce" : "0xc974d4b763880001",
+                    "hash" : "0x24e28af11365da7a4ea14d7eebbd2af40f6ef1f6578e6a9b2bc5e48396d6c120",
+                    "mixHash" : "0x15fa843f5605c038734c1c3737da7d96500b21a915aefa2a9948981e4d114fe7",
+                    "nonce" : "0xee29b96d449db302",
                     "number" : "0x01",
                     "parentHash" : "0x64f9a3a70af31bba33aa821702313129823ade027a4cffa3d9e2b7506592f888",
                     "receiptTrie" : "0x970a5d7c844cdd73e4b0ffb5c7cc67b095579654d8eef3f05bafbbe33c203ef7",
-                    "stateRoot" : "0xd9431ce00cc6e5c5057c92d9b08d3fde634ccd380363d8460ad6e963ac8574b2",
+                    "stateRoot" : "0x2df3e904b0b8830c67206cdbe5adfe861d21a7a6dd7d4645956b9368d48c0350",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca064f9a3a70af31bba33aa821702313129823ade027a4cffa3d9e2b7506592f888a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d9431ce00cc6e5c5057c92d9b08d3fde634ccd380363d8460ad6e963ac8574b2a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0970a5d7c844cdd73e4b0ffb5c7cc67b095579654d8eef3f05bafbbe33c203ef7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a3a48203e880a04a0047bfea8e42c4b4984d35e1efb8d0a048f3e7bb5d02fe1a7a8af40bba58ef88c974d4b763880001f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca064f9a3a70af31bba33aa821702313129823ade027a4cffa3d9e2b7506592f888a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02df3e904b0b8830c67206cdbe5adfe861d21a7a6dd7d4645956b9368d48c0350a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0970a5d7c844cdd73e4b0ffb5c7cc67b095579654d8eef3f05bafbbe33c203ef7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a3a48203e880a015fa843f5605c038734c1c3737da7d96500b21a915aefa2a9948981e4d114fe788ee29b96d449db302f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a039584d128aef4a35853b45df80655e610513fc5f6ed2e56f9cdf1577ba9a38c0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7a291ef1bea0c7a75bc4d7b75f6b4936f8483cacccb27ac116a790be84a593f8",
+        "lastblockhash" : "0x24e28af11365da7a4ea14d7eebbd2af40f6ef1f6578e6a9b2bc5e48396d6c120",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x4241424540444145084555",
@@ -235,8 +228,8 @@
     "randomStatetest127BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.851326b7.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest127BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest127BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa098",
-                    "hash" : "0x8dfce9fae6fbf3d7d5d0d38db2858e762cd356595c936e21e997188dd9f632f5",
-                    "mixHash" : "0xc1a6819c74f9ec4c43a18ead5b09fa856b07572f997121a3c499cfa8b80d1af5",
-                    "nonce" : "0x4ec0456c0fa3478c",
+                    "hash" : "0x4695b165aacc1973588d9709f488a19ba4362b8065cba114818d7a3dd426fba2",
+                    "mixHash" : "0x27fe70b5724f1276382d365d805267b857326653d590b5326abb7f0b99d0687f",
+                    "nonce" : "0xa8f5ae425eb4ef71",
                     "number" : "0x01",
                     "parentHash" : "0x64f9a3a70af31bba33aa821702313129823ade027a4cffa3d9e2b7506592f888",
                     "receiptTrie" : "0xea04117167cb53dc47498579b57d11d3d3101dd55f72aa34cab9bd0826a1b736",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca064f9a3a70af31bba33aa821702313129823ade027a4cffa3d9e2b7506592f888a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0015cb87f790603853f97facf4e178339f8e6cbcba46608bd32de16f5c3b48b44a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0ea04117167cb53dc47498579b57d11d3d3101dd55f72aa34cab9bd0826a1b736b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0988203e880a0c1a6819c74f9ec4c43a18ead5b09fa856b07572f997121a3c499cfa8b80d1af5884ec0456c0fa3478cf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca064f9a3a70af31bba33aa821702313129823ade027a4cffa3d9e2b7506592f888a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0015cb87f790603853f97facf4e178339f8e6cbcba46608bd32de16f5c3b48b44a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0ea04117167cb53dc47498579b57d11d3d3101dd55f72aa34cab9bd0826a1b736b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0988203e880a027fe70b5724f1276382d365d805267b857326653d590b5326abb7f0b99d0687f88a8f5ae425eb4ef71f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a039584d128aef4a35853b45df80655e610513fc5f6ed2e56f9cdf1577ba9a38c0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8dfce9fae6fbf3d7d5d0d38db2858e762cd356595c936e21e997188dd9f632f5",
+        "lastblockhash" : "0x4695b165aacc1973588d9709f488a19ba4362b8065cba114818d7a3dd426fba2",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest127BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.851326b7.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest127BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest127BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa098",
-                    "hash" : "0x04e9ef9a0b67af081e86a81a17dd9130c48e9312ef75eaf15302993dfe69e033",
-                    "mixHash" : "0x46e6b400c6a1993bacb1e53a1448015212f7f48d6c7ad05abf03ca4fa4891059",
-                    "nonce" : "0xb1ae6350b2d4b103",
+                    "hash" : "0x1b266c4f5cfe49d570a1400944decd3b9eceaa08a63b0489230b511ee97087e0",
+                    "mixHash" : "0x7f0ec51f6b5ac9bfc7e8fd5b7a001cf04d909267756683ee0cef058ac4122b62",
+                    "nonce" : "0xfba6c36314b33096",
                     "number" : "0x01",
                     "parentHash" : "0x64f9a3a70af31bba33aa821702313129823ade027a4cffa3d9e2b7506592f888",
                     "receiptTrie" : "0xea04117167cb53dc47498579b57d11d3d3101dd55f72aa34cab9bd0826a1b736",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca064f9a3a70af31bba33aa821702313129823ade027a4cffa3d9e2b7506592f888a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0015cb87f790603853f97facf4e178339f8e6cbcba46608bd32de16f5c3b48b44a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0ea04117167cb53dc47498579b57d11d3d3101dd55f72aa34cab9bd0826a1b736b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0988203e880a046e6b400c6a1993bacb1e53a1448015212f7f48d6c7ad05abf03ca4fa489105988b1ae6350b2d4b103f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca064f9a3a70af31bba33aa821702313129823ade027a4cffa3d9e2b7506592f888a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0015cb87f790603853f97facf4e178339f8e6cbcba46608bd32de16f5c3b48b44a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0ea04117167cb53dc47498579b57d11d3d3101dd55f72aa34cab9bd0826a1b736b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0988203e880a07f0ec51f6b5ac9bfc7e8fd5b7a001cf04d909267756683ee0cef058ac4122b6288fba6c36314b33096f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a039584d128aef4a35853b45df80655e610513fc5f6ed2e56f9cdf1577ba9a38c0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x04e9ef9a0b67af081e86a81a17dd9130c48e9312ef75eaf15302993dfe69e033",
+        "lastblockhash" : "0x1b266c4f5cfe49d570a1400944decd3b9eceaa08a63b0489230b511ee97087e0",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest127BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.851326b7.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest127BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest127BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa098",
-                    "hash" : "0x7d6da21c0c4be2c0003a1a5b56d9d72e95621a20f265c01b5155da19ccdb35e8",
-                    "mixHash" : "0xe7a5718834bb0900937185b6c4fc5e617279ffbf65ef9e013e4f3c28e788d860",
-                    "nonce" : "0x0e73cbb273bb34a7",
+                    "hash" : "0xfac09747c5e16d068041a3a18ba87d6a3a3d3953bc91a2da22e0a3d6d7be320e",
+                    "mixHash" : "0x7c1625faef91aaffeb0a9bf33a6e150ba4a658c359e560b8fa843d381d76dad1",
+                    "nonce" : "0x72e3dbb60d690698",
                     "number" : "0x01",
                     "parentHash" : "0x64f9a3a70af31bba33aa821702313129823ade027a4cffa3d9e2b7506592f888",
                     "receiptTrie" : "0xea04117167cb53dc47498579b57d11d3d3101dd55f72aa34cab9bd0826a1b736",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca064f9a3a70af31bba33aa821702313129823ade027a4cffa3d9e2b7506592f888a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0015cb87f790603853f97facf4e178339f8e6cbcba46608bd32de16f5c3b48b44a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0ea04117167cb53dc47498579b57d11d3d3101dd55f72aa34cab9bd0826a1b736b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0988203e880a0e7a5718834bb0900937185b6c4fc5e617279ffbf65ef9e013e4f3c28e788d860880e73cbb273bb34a7f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca064f9a3a70af31bba33aa821702313129823ade027a4cffa3d9e2b7506592f888a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0015cb87f790603853f97facf4e178339f8e6cbcba46608bd32de16f5c3b48b44a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0ea04117167cb53dc47498579b57d11d3d3101dd55f72aa34cab9bd0826a1b736b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0988203e880a07c1625faef91aaffeb0a9bf33a6e150ba4a658c359e560b8fa843d381d76dad18872e3dbb60d690698f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a039584d128aef4a35853b45df80655e610513fc5f6ed2e56f9cdf1577ba9a38c0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7d6da21c0c4be2c0003a1a5b56d9d72e95621a20f265c01b5155da19ccdb35e8",
+        "lastblockhash" : "0xfac09747c5e16d068041a3a18ba87d6a3a3d3953bc91a2da22e0a3d6d7be320e",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest127BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.851326b7.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest127BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest127BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa098",
-                    "hash" : "0x4b982cdbf5bba87607b092f5ef5d5d1ac98cc357491fbcc5bd8dd0e30d35c748",
-                    "mixHash" : "0x78170120b5b58cfb213be8498e11305b93245338a84954cc6f36b420494a4fe3",
-                    "nonce" : "0x1b0031f0b9e0d160",
+                    "hash" : "0x859ff72fee5a2466316d54a44b9b7ab75844ebac957833df1abfae48532a6dcf",
+                    "mixHash" : "0x207c9a56073aae98cdeb2c164ecd39799318cb5b1f1af7a5107572f8afe3829d",
+                    "nonce" : "0xd72c1d2458734fb3",
                     "number" : "0x01",
                     "parentHash" : "0x64f9a3a70af31bba33aa821702313129823ade027a4cffa3d9e2b7506592f888",
                     "receiptTrie" : "0xea04117167cb53dc47498579b57d11d3d3101dd55f72aa34cab9bd0826a1b736",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca064f9a3a70af31bba33aa821702313129823ade027a4cffa3d9e2b7506592f888a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0015cb87f790603853f97facf4e178339f8e6cbcba46608bd32de16f5c3b48b44a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0ea04117167cb53dc47498579b57d11d3d3101dd55f72aa34cab9bd0826a1b736b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0988203e880a078170120b5b58cfb213be8498e11305b93245338a84954cc6f36b420494a4fe3881b0031f0b9e0d160f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca064f9a3a70af31bba33aa821702313129823ade027a4cffa3d9e2b7506592f888a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0015cb87f790603853f97facf4e178339f8e6cbcba46608bd32de16f5c3b48b44a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0ea04117167cb53dc47498579b57d11d3d3101dd55f72aa34cab9bd0826a1b736b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0988203e880a0207c9a56073aae98cdeb2c164ecd39799318cb5b1f1af7a5107572f8afe3829d88d72c1d2458734fb3f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a039584d128aef4a35853b45df80655e610513fc5f6ed2e56f9cdf1577ba9a38c0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4b982cdbf5bba87607b092f5ef5d5d1ac98cc357491fbcc5bd8dd0e30d35c748",
+        "lastblockhash" : "0x859ff72fee5a2466316d54a44b9b7ab75844ebac957833df1abfae48532a6dcf",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest128BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest128BC.json
index afa232e73..290115e9b 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest128BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest128BC.json
@@ -2,8 +2,8 @@
     "randomStatetest128BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.851326b7.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest128BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest128BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xaf3a",
-                    "hash" : "0xf06dfcd8d970fc63124c7af108df6f714fc5210c63aa926161490c1e1a8aef5b",
-                    "mixHash" : "0xf5d51cbc21a5379a11b71e27d9f4e2bf7894f2d5f5dd64f2830683bc4f13d5b0",
-                    "nonce" : "0x3bcd3979bacc45bb",
+                    "hash" : "0x72cc794e01c47a3416875231196c6677704b1707b7b41e3e88d25f85c8382596",
+                    "mixHash" : "0x62efb962776a57785e0fe7f4e5132642f1e3c22a52e3707df719c26aeaf9eb7a",
+                    "nonce" : "0x90c8bb476708aef4",
                     "number" : "0x01",
                     "parentHash" : "0xf0e5bc9d161fdf1d7e770c7b3c00d523a1447c2985bafcf3e9c21bee66bb0d61",
                     "receiptTrie" : "0x83c102730c26769fd5f956a95d1d072f616c5ad1a307ef7040ec9f771b53c127",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x62e0fff4790e3aa5264d849c99334195483eff02ddf19c6d09e9e058c7c13709",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca0f0e5bc9d161fdf1d7e770c7b3c00d523a1447c2985bafcf3e9c21bee66bb0d61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f5c31f7bf6f48ba86914f777f6b62b18c5ccdecf8d9f887a1af909b01072ac6da062e0fff4790e3aa5264d849c99334195483eff02ddf19c6d09e9e058c7c13709a083c102730c26769fd5f956a95d1d072f616c5ad1a307ef7040ec9f771b53c127b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82af3a8203e880a0f5d51cbc21a5379a11b71e27d9f4e2bf7894f2d5f5dd64f2830683bc4f13d5b0883bcd3979bacc45bbf90121f9011e800184337507fe94095e7baea6a6c7c4c2dfeb977efac326af552d87843453f6b2b8b87f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540527f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000006f786ef19163848934f380343807968c611ba0b88adb4738ab2af174e73f4c03026c439a0a19ce537061b4b5936495c78dffb5a01cc2b1cc100f5f0f0f26d087c2665a5deb7d8eb3a823c4e6aa60999c9c5d6edfc0",
+                "rlp" : "0xf90324f901fca0f0e5bc9d161fdf1d7e770c7b3c00d523a1447c2985bafcf3e9c21bee66bb0d61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f5c31f7bf6f48ba86914f777f6b62b18c5ccdecf8d9f887a1af909b01072ac6da062e0fff4790e3aa5264d849c99334195483eff02ddf19c6d09e9e058c7c13709a083c102730c26769fd5f956a95d1d072f616c5ad1a307ef7040ec9f771b53c127b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82af3a8203e880a062efb962776a57785e0fe7f4e5132642f1e3c22a52e3707df719c26aeaf9eb7a8890c8bb476708aef4f90121f9011e800184337507fe94095e7baea6a6c7c4c2dfeb977efac326af552d87843453f6b2b8b87f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540527f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000006f786ef19163848934f380343807968c611ba0b88adb4738ab2af174e73f4c03026c439a0a19ce537061b4b5936495c78dffb5a01cc2b1cc100f5f0f0f26d087c2665a5deb7d8eb3a823c4e6aa60999c9c5d6edfc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540527f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000006f786ef19163848934f380343807968c61",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08a295ae738d8d4748f6e1ad6829cab8626d56836a5475de8cc28f59b15f790d0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf06dfcd8d970fc63124c7af108df6f714fc5210c63aa926161490c1e1a8aef5b",
+        "lastblockhash" : "0x72cc794e01c47a3416875231196c6677704b1707b7b41e3e88d25f85c8382596",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest128BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.851326b7.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest128BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest128BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb246",
-                    "hash" : "0x29e6277d7b834d32d16bf0ad75d77c308a8903d81347f77d869a7009a22fcf77",
-                    "mixHash" : "0x26fddb00f8c911f876e4f3028a9934437897cf15557aaf197f4c21aaa3b90b7f",
-                    "nonce" : "0x46a0aca1cff6337c",
+                    "hash" : "0xc91a22c181cbf71f19fc1ada764e64e7c17a775259dc610719c6c6d16f50bc0a",
+                    "mixHash" : "0xc39bc56029a3fda706aa5f95f3841e3c6188e80c27d9d52ca808d863d605623a",
+                    "nonce" : "0xfd206c25dfa16521",
                     "number" : "0x01",
                     "parentHash" : "0xf0e5bc9d161fdf1d7e770c7b3c00d523a1447c2985bafcf3e9c21bee66bb0d61",
                     "receiptTrie" : "0xca0009fc66080d392d9e3450e1a78ff1a385d965aeae4d726941681be09d6e08",
-                    "stateRoot" : "0x762d8c2c0e7659e1448c52fe3a9f3ddd6dd5b4e34cfe15de7af9c1305700aa95",
+                    "stateRoot" : "0xadca7785c43c4863fc85442de6a363a04b074d8ecd2aeba9c2d339a464cf04ef",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x62e0fff4790e3aa5264d849c99334195483eff02ddf19c6d09e9e058c7c13709",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca0f0e5bc9d161fdf1d7e770c7b3c00d523a1447c2985bafcf3e9c21bee66bb0d61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0762d8c2c0e7659e1448c52fe3a9f3ddd6dd5b4e34cfe15de7af9c1305700aa95a062e0fff4790e3aa5264d849c99334195483eff02ddf19c6d09e9e058c7c13709a0ca0009fc66080d392d9e3450e1a78ff1a385d965aeae4d726941681be09d6e08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b2468203e880a026fddb00f8c911f876e4f3028a9934437897cf15557aaf197f4c21aaa3b90b7f8846a0aca1cff6337cf90121f9011e800184337507fe94095e7baea6a6c7c4c2dfeb977efac326af552d87843453f6b2b8b87f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540527f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000006f786ef19163848934f380343807968c611ba0b88adb4738ab2af174e73f4c03026c439a0a19ce537061b4b5936495c78dffb5a01cc2b1cc100f5f0f0f26d087c2665a5deb7d8eb3a823c4e6aa60999c9c5d6edfc0",
+                "rlp" : "0xf90324f901fca0f0e5bc9d161fdf1d7e770c7b3c00d523a1447c2985bafcf3e9c21bee66bb0d61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0adca7785c43c4863fc85442de6a363a04b074d8ecd2aeba9c2d339a464cf04efa062e0fff4790e3aa5264d849c99334195483eff02ddf19c6d09e9e058c7c13709a0ca0009fc66080d392d9e3450e1a78ff1a385d965aeae4d726941681be09d6e08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b2468203e880a0c39bc56029a3fda706aa5f95f3841e3c6188e80c27d9d52ca808d863d605623a88fd206c25dfa16521f90121f9011e800184337507fe94095e7baea6a6c7c4c2dfeb977efac326af552d87843453f6b2b8b87f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540527f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000006f786ef19163848934f380343807968c611ba0b88adb4738ab2af174e73f4c03026c439a0a19ce537061b4b5936495c78dffb5a01cc2b1cc100f5f0f0f26d087c2665a5deb7d8eb3a823c4e6aa60999c9c5d6edfc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540527f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000006f786ef19163848934f380343807968c61",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08a295ae738d8d4748f6e1ad6829cab8626d56836a5475de8cc28f59b15f790d0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x29e6277d7b834d32d16bf0ad75d77c308a8903d81347f77d869a7009a22fcf77",
+        "lastblockhash" : "0xc91a22c181cbf71f19fc1ada764e64e7c17a775259dc610719c6c6d16f50bc0a",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x3453f6b2",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540527f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000006f786ef19163848934f380343807968c6160005155",
@@ -235,8 +228,8 @@
     "randomStatetest128BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.851326b7.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest128BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest128BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xaf3a",
-                    "hash" : "0x2a8a4b04cbf96b1f349f6e7c138a0e827ba960f8610da6832c04686545d8e3d9",
-                    "mixHash" : "0x40d8ec9fd7c3e4982aac983f7c32ad5a62692b8e95ba4ad43a0b499d5d02ce87",
-                    "nonce" : "0x4a35568a5407152a",
+                    "hash" : "0x73c37900e7bea98d51ef1929ee387591caf8651b6db197c8dbb745d8400fe214",
+                    "mixHash" : "0xca41963a9743c6410362766c774324bcbca75ece962a8cc4218706ecac915d56",
+                    "nonce" : "0x12a56db2f2cc0d6f",
                     "number" : "0x01",
                     "parentHash" : "0xf0e5bc9d161fdf1d7e770c7b3c00d523a1447c2985bafcf3e9c21bee66bb0d61",
                     "receiptTrie" : "0xb8581e1566855f6edd5b6c9bbada69c27bf068206b9b8748ccad753ad0bb5eee",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0x62e0fff4790e3aa5264d849c99334195483eff02ddf19c6d09e9e058c7c13709",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca0f0e5bc9d161fdf1d7e770c7b3c00d523a1447c2985bafcf3e9c21bee66bb0d61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09301d7335a667977bb144a63bf2b8df3f1bb6f3cad0d36fcf57f24b941dd5667a062e0fff4790e3aa5264d849c99334195483eff02ddf19c6d09e9e058c7c13709a0b8581e1566855f6edd5b6c9bbada69c27bf068206b9b8748ccad753ad0bb5eeeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82af3a8203e880a040d8ec9fd7c3e4982aac983f7c32ad5a62692b8e95ba4ad43a0b499d5d02ce87884a35568a5407152af90121f9011e800184337507fe94095e7baea6a6c7c4c2dfeb977efac326af552d87843453f6b2b8b87f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540527f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000006f786ef19163848934f380343807968c611ba0b88adb4738ab2af174e73f4c03026c439a0a19ce537061b4b5936495c78dffb5a01cc2b1cc100f5f0f0f26d087c2665a5deb7d8eb3a823c4e6aa60999c9c5d6edfc0",
+                "rlp" : "0xf90324f901fca0f0e5bc9d161fdf1d7e770c7b3c00d523a1447c2985bafcf3e9c21bee66bb0d61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09301d7335a667977bb144a63bf2b8df3f1bb6f3cad0d36fcf57f24b941dd5667a062e0fff4790e3aa5264d849c99334195483eff02ddf19c6d09e9e058c7c13709a0b8581e1566855f6edd5b6c9bbada69c27bf068206b9b8748ccad753ad0bb5eeeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82af3a8203e880a0ca41963a9743c6410362766c774324bcbca75ece962a8cc4218706ecac915d568812a56db2f2cc0d6ff90121f9011e800184337507fe94095e7baea6a6c7c4c2dfeb977efac326af552d87843453f6b2b8b87f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540527f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000006f786ef19163848934f380343807968c611ba0b88adb4738ab2af174e73f4c03026c439a0a19ce537061b4b5936495c78dffb5a01cc2b1cc100f5f0f0f26d087c2665a5deb7d8eb3a823c4e6aa60999c9c5d6edfc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540527f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000006f786ef19163848934f380343807968c61",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08a295ae738d8d4748f6e1ad6829cab8626d56836a5475de8cc28f59b15f790d0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2a8a4b04cbf96b1f349f6e7c138a0e827ba960f8610da6832c04686545d8e3d9",
+        "lastblockhash" : "0x73c37900e7bea98d51ef1929ee387591caf8651b6db197c8dbb745d8400fe214",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest128BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.851326b7.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest128BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest128BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xaf3a",
-                    "hash" : "0xa7bd7c87740b8a0f3937aff72706737ab4f6a1cb1a8dc203d71bee37793d8f2e",
-                    "mixHash" : "0xf32218a1eafae622462643dca25c12e07ec2e7212b2d10386c13bb6854ca323c",
-                    "nonce" : "0xfad5369bdbf5dd71",
+                    "hash" : "0xc3d4a63056f878d4d8823097efb9c3aa800350908b44de206dcfe02e62af59b0",
+                    "mixHash" : "0xdc2c2fe900f76fbecc6cc3e580b4709eb977b34da9035ee4208a26f281c4e478",
+                    "nonce" : "0x93be5bdfd647ddcd",
                     "number" : "0x01",
                     "parentHash" : "0xf0e5bc9d161fdf1d7e770c7b3c00d523a1447c2985bafcf3e9c21bee66bb0d61",
                     "receiptTrie" : "0xb8581e1566855f6edd5b6c9bbada69c27bf068206b9b8748ccad753ad0bb5eee",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0x62e0fff4790e3aa5264d849c99334195483eff02ddf19c6d09e9e058c7c13709",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca0f0e5bc9d161fdf1d7e770c7b3c00d523a1447c2985bafcf3e9c21bee66bb0d61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09301d7335a667977bb144a63bf2b8df3f1bb6f3cad0d36fcf57f24b941dd5667a062e0fff4790e3aa5264d849c99334195483eff02ddf19c6d09e9e058c7c13709a0b8581e1566855f6edd5b6c9bbada69c27bf068206b9b8748ccad753ad0bb5eeeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82af3a8203e880a0f32218a1eafae622462643dca25c12e07ec2e7212b2d10386c13bb6854ca323c88fad5369bdbf5dd71f90121f9011e800184337507fe94095e7baea6a6c7c4c2dfeb977efac326af552d87843453f6b2b8b87f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540527f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000006f786ef19163848934f380343807968c611ba0b88adb4738ab2af174e73f4c03026c439a0a19ce537061b4b5936495c78dffb5a01cc2b1cc100f5f0f0f26d087c2665a5deb7d8eb3a823c4e6aa60999c9c5d6edfc0",
+                "rlp" : "0xf90324f901fca0f0e5bc9d161fdf1d7e770c7b3c00d523a1447c2985bafcf3e9c21bee66bb0d61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09301d7335a667977bb144a63bf2b8df3f1bb6f3cad0d36fcf57f24b941dd5667a062e0fff4790e3aa5264d849c99334195483eff02ddf19c6d09e9e058c7c13709a0b8581e1566855f6edd5b6c9bbada69c27bf068206b9b8748ccad753ad0bb5eeeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82af3a8203e880a0dc2c2fe900f76fbecc6cc3e580b4709eb977b34da9035ee4208a26f281c4e4788893be5bdfd647ddcdf90121f9011e800184337507fe94095e7baea6a6c7c4c2dfeb977efac326af552d87843453f6b2b8b87f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540527f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000006f786ef19163848934f380343807968c611ba0b88adb4738ab2af174e73f4c03026c439a0a19ce537061b4b5936495c78dffb5a01cc2b1cc100f5f0f0f26d087c2665a5deb7d8eb3a823c4e6aa60999c9c5d6edfc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540527f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000006f786ef19163848934f380343807968c61",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08a295ae738d8d4748f6e1ad6829cab8626d56836a5475de8cc28f59b15f790d0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa7bd7c87740b8a0f3937aff72706737ab4f6a1cb1a8dc203d71bee37793d8f2e",
+        "lastblockhash" : "0xc3d4a63056f878d4d8823097efb9c3aa800350908b44de206dcfe02e62af59b0",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest128BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.851326b7.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest128BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest128BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xaf3a",
-                    "hash" : "0xf3951e5ab854871d27ac27295d52719d6d0c734f96c1881762ebcabfbe4fb589",
-                    "mixHash" : "0xa968bcc3b37bdb4add4172ce92629da53ee1a2462857b973af718b1a2a7092fd",
-                    "nonce" : "0x1f564f4140c2ed77",
+                    "hash" : "0x01de691e3b708e5564b0620d68fd08529b2924ac48e32fc809815952f129ec43",
+                    "mixHash" : "0xfd8b249e4ec78873b12a2469b92e32d0ad460310f6f765f65a8b79594bd15c2c",
+                    "nonce" : "0x08e307c2d49a776a",
                     "number" : "0x01",
                     "parentHash" : "0xf0e5bc9d161fdf1d7e770c7b3c00d523a1447c2985bafcf3e9c21bee66bb0d61",
                     "receiptTrie" : "0xb8581e1566855f6edd5b6c9bbada69c27bf068206b9b8748ccad753ad0bb5eee",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0x62e0fff4790e3aa5264d849c99334195483eff02ddf19c6d09e9e058c7c13709",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca0f0e5bc9d161fdf1d7e770c7b3c00d523a1447c2985bafcf3e9c21bee66bb0d61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09301d7335a667977bb144a63bf2b8df3f1bb6f3cad0d36fcf57f24b941dd5667a062e0fff4790e3aa5264d849c99334195483eff02ddf19c6d09e9e058c7c13709a0b8581e1566855f6edd5b6c9bbada69c27bf068206b9b8748ccad753ad0bb5eeeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82af3a8203e880a0a968bcc3b37bdb4add4172ce92629da53ee1a2462857b973af718b1a2a7092fd881f564f4140c2ed77f90121f9011e800184337507fe94095e7baea6a6c7c4c2dfeb977efac326af552d87843453f6b2b8b87f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540527f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000006f786ef19163848934f380343807968c611ba0b88adb4738ab2af174e73f4c03026c439a0a19ce537061b4b5936495c78dffb5a01cc2b1cc100f5f0f0f26d087c2665a5deb7d8eb3a823c4e6aa60999c9c5d6edfc0",
+                "rlp" : "0xf90324f901fca0f0e5bc9d161fdf1d7e770c7b3c00d523a1447c2985bafcf3e9c21bee66bb0d61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09301d7335a667977bb144a63bf2b8df3f1bb6f3cad0d36fcf57f24b941dd5667a062e0fff4790e3aa5264d849c99334195483eff02ddf19c6d09e9e058c7c13709a0b8581e1566855f6edd5b6c9bbada69c27bf068206b9b8748ccad753ad0bb5eeeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82af3a8203e880a0fd8b249e4ec78873b12a2469b92e32d0ad460310f6f765f65a8b79594bd15c2c8808e307c2d49a776af90121f9011e800184337507fe94095e7baea6a6c7c4c2dfeb977efac326af552d87843453f6b2b8b87f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540527f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000006f786ef19163848934f380343807968c611ba0b88adb4738ab2af174e73f4c03026c439a0a19ce537061b4b5936495c78dffb5a01cc2b1cc100f5f0f0f26d087c2665a5deb7d8eb3a823c4e6aa60999c9c5d6edfc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540527f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000006f786ef19163848934f380343807968c61",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08a295ae738d8d4748f6e1ad6829cab8626d56836a5475de8cc28f59b15f790d0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf3951e5ab854871d27ac27295d52719d6d0c734f96c1881762ebcabfbe4fb589",
+        "lastblockhash" : "0x01de691e3b708e5564b0620d68fd08529b2924ac48e32fc809815952f129ec43",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest128BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.851326b7.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest128BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest128BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xaf3a",
-                    "hash" : "0x1ce3a5cd41fb447b452198bb7413453837bd8061840fdb60abf06426b7b8013b",
-                    "mixHash" : "0x973bfbf38254cc070ae67a5b50fdebaaf676d0ee7e689cdb41c8f04a2ea40ee8",
-                    "nonce" : "0x01776ea7f29cba3c",
+                    "hash" : "0xd0c9e00153372e3e3d399837cf4c2bae2ced2d2c738dcb3242584127647a7cd8",
+                    "mixHash" : "0x7d0ac9afcd40ef96ceb3ff20a9e7d2b23404d660d14f06db8574ce397ef5e8f8",
+                    "nonce" : "0xb9076e61c7dc1e37",
                     "number" : "0x01",
                     "parentHash" : "0xf0e5bc9d161fdf1d7e770c7b3c00d523a1447c2985bafcf3e9c21bee66bb0d61",
                     "receiptTrie" : "0xb8581e1566855f6edd5b6c9bbada69c27bf068206b9b8748ccad753ad0bb5eee",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0x62e0fff4790e3aa5264d849c99334195483eff02ddf19c6d09e9e058c7c13709",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca0f0e5bc9d161fdf1d7e770c7b3c00d523a1447c2985bafcf3e9c21bee66bb0d61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09301d7335a667977bb144a63bf2b8df3f1bb6f3cad0d36fcf57f24b941dd5667a062e0fff4790e3aa5264d849c99334195483eff02ddf19c6d09e9e058c7c13709a0b8581e1566855f6edd5b6c9bbada69c27bf068206b9b8748ccad753ad0bb5eeeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82af3a8203e880a0973bfbf38254cc070ae67a5b50fdebaaf676d0ee7e689cdb41c8f04a2ea40ee88801776ea7f29cba3cf90121f9011e800184337507fe94095e7baea6a6c7c4c2dfeb977efac326af552d87843453f6b2b8b87f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540527f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000006f786ef19163848934f380343807968c611ba0b88adb4738ab2af174e73f4c03026c439a0a19ce537061b4b5936495c78dffb5a01cc2b1cc100f5f0f0f26d087c2665a5deb7d8eb3a823c4e6aa60999c9c5d6edfc0",
+                "rlp" : "0xf90324f901fca0f0e5bc9d161fdf1d7e770c7b3c00d523a1447c2985bafcf3e9c21bee66bb0d61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09301d7335a667977bb144a63bf2b8df3f1bb6f3cad0d36fcf57f24b941dd5667a062e0fff4790e3aa5264d849c99334195483eff02ddf19c6d09e9e058c7c13709a0b8581e1566855f6edd5b6c9bbada69c27bf068206b9b8748ccad753ad0bb5eeeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82af3a8203e880a07d0ac9afcd40ef96ceb3ff20a9e7d2b23404d660d14f06db8574ce397ef5e8f888b9076e61c7dc1e37f90121f9011e800184337507fe94095e7baea6a6c7c4c2dfeb977efac326af552d87843453f6b2b8b87f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540527f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000006f786ef19163848934f380343807968c611ba0b88adb4738ab2af174e73f4c03026c439a0a19ce537061b4b5936495c78dffb5a01cc2b1cc100f5f0f0f26d087c2665a5deb7d8eb3a823c4e6aa60999c9c5d6edfc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540527f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000006f786ef19163848934f380343807968c61",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08a295ae738d8d4748f6e1ad6829cab8626d56836a5475de8cc28f59b15f790d0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1ce3a5cd41fb447b452198bb7413453837bd8061840fdb60abf06426b7b8013b",
+        "lastblockhash" : "0xd0c9e00153372e3e3d399837cf4c2bae2ced2d2c738dcb3242584127647a7cd8",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest132BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest132BC.json
index 69d016fd4..1f2fe0dad 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest132BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest132BC.json
@@ -2,8 +2,8 @@
     "randomStatetest132BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.851326b7.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest132BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest132BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x7bf6",
-                    "hash" : "0x648e5abcf9cd84b6705ab3667c6851282f25ac0785568569c90402030bccd660",
-                    "mixHash" : "0xd3b55c210e7d1404bcacdc08d88a19ccfea0b7a539092ab79d488e5d159176d7",
-                    "nonce" : "0xe9ddb2c163e4f341",
+                    "hash" : "0x7b3d2c6ac4dd74aed1b145d0647613b73396438e8346c86038a2dd293eaca744",
+                    "mixHash" : "0x3f877c167ec939f4aea621188a7fd4724f5459a740e89aadecd72be257154560",
+                    "nonce" : "0xe9342c1258fc63b2",
                     "number" : "0x01",
                     "parentHash" : "0x7e56aa7f533deab3866282b080bae6a74f300854ef147c3933d7be6cf3b7a070",
                     "receiptTrie" : "0x30338b678e1481cf77717542e3dc61cd6277377c0d11301f35f1b70230197dae",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x95aac5651f886736f36bbf05d6c6015926c3636cabbfe1f26cf7f5af546f290d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90359f901fca07e56aa7f533deab3866282b080bae6a74f300854ef147c3933d7be6cf3b7a070a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07569a139f654defabb518549101ffc9a1bc84edb69bed82cb0ae28abbb918ac1a095aac5651f886736f36bbf05d6c6015926c3636cabbfe1f26cf7f5af546f290da030338b678e1481cf77717542e3dc61cd6277377c0d11301f35f1b70230197daeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff827bf68203e880a0d3b55c210e7d1404bcacdc08d88a19ccfea0b7a539092ab79d488e5d159176d788e9ddb2c163e4f341f90156f90153800184598caf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87844996c9ccb8ed7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5407f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09516b36981ba05329086e272d3c6db76c171a4922dcd3ca8ae57444b02d37c45dcc9c4a901a14a05aa594adbf4949977dc408944f9fabdb6a9a53115b871506f0de146c8a4fa5a3c0",
+                "rlp" : "0xf90359f901fca07e56aa7f533deab3866282b080bae6a74f300854ef147c3933d7be6cf3b7a070a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07569a139f654defabb518549101ffc9a1bc84edb69bed82cb0ae28abbb918ac1a095aac5651f886736f36bbf05d6c6015926c3636cabbfe1f26cf7f5af546f290da030338b678e1481cf77717542e3dc61cd6277377c0d11301f35f1b70230197daeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff827bf68203e880a03f877c167ec939f4aea621188a7fd4724f5459a740e89aadecd72be25715456088e9342c1258fc63b2f90156f90153800184598caf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87844996c9ccb8ed7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5407f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09516b36981ba05329086e272d3c6db76c171a4922dcd3ca8ae57444b02d37c45dcc9c4a901a14a05aa594adbf4949977dc408944f9fabdb6a9a53115b871506f0de146c8a4fa5a3c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5407f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09516b3698",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e07234e2b5dedb91894e2f9b7532d8992aa7c829bd05488db9d69f4bc63de777a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x648e5abcf9cd84b6705ab3667c6851282f25ac0785568569c90402030bccd660",
+        "lastblockhash" : "0x7b3d2c6ac4dd74aed1b145d0647613b73396438e8346c86038a2dd293eaca744",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest132BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.851326b7.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest132BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest132BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x7f02",
-                    "hash" : "0x5ef8cfbc2fc3c278d71121b08c885dab3b92b00cb311045b6a42e9e708aa048d",
-                    "mixHash" : "0x03dea2de36d3f5df3adf6ccd12bce8000e2020c6422243f88cbd907a0fa6a769",
-                    "nonce" : "0x2f4a680be70f8cbd",
+                    "hash" : "0xa1cad55ef2d2abf561d37bacc06451400a4ef8f701d99db3df1bf7e24ed47060",
+                    "mixHash" : "0x86faaef5f5c0b5d2979dce7af4a5675085cb9a6e1d76c953eb1165bbbc60368b",
+                    "nonce" : "0x738f78eca1f86963",
                     "number" : "0x01",
                     "parentHash" : "0x7e56aa7f533deab3866282b080bae6a74f300854ef147c3933d7be6cf3b7a070",
                     "receiptTrie" : "0xe57c1018aeeaae835c58f8df1fbcc5736b903a56de54451a74823ec85b6bc423",
-                    "stateRoot" : "0xc207398612c32570bdf07026ebd86d9212afcc2eaf5e9026889b0eb48dc8066a",
+                    "stateRoot" : "0x7a1e5239a1f36d3ff74044ccdb71d4634a97a82f190fbc5153f7a9f7b12aac81",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x95aac5651f886736f36bbf05d6c6015926c3636cabbfe1f26cf7f5af546f290d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90359f901fca07e56aa7f533deab3866282b080bae6a74f300854ef147c3933d7be6cf3b7a070a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c207398612c32570bdf07026ebd86d9212afcc2eaf5e9026889b0eb48dc8066aa095aac5651f886736f36bbf05d6c6015926c3636cabbfe1f26cf7f5af546f290da0e57c1018aeeaae835c58f8df1fbcc5736b903a56de54451a74823ec85b6bc423b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff827f028203e880a003dea2de36d3f5df3adf6ccd12bce8000e2020c6422243f88cbd907a0fa6a769882f4a680be70f8cbdf90156f90153800184598caf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87844996c9ccb8ed7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5407f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09516b36981ba05329086e272d3c6db76c171a4922dcd3ca8ae57444b02d37c45dcc9c4a901a14a05aa594adbf4949977dc408944f9fabdb6a9a53115b871506f0de146c8a4fa5a3c0",
+                "rlp" : "0xf90359f901fca07e56aa7f533deab3866282b080bae6a74f300854ef147c3933d7be6cf3b7a070a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07a1e5239a1f36d3ff74044ccdb71d4634a97a82f190fbc5153f7a9f7b12aac81a095aac5651f886736f36bbf05d6c6015926c3636cabbfe1f26cf7f5af546f290da0e57c1018aeeaae835c58f8df1fbcc5736b903a56de54451a74823ec85b6bc423b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff827f028203e880a086faaef5f5c0b5d2979dce7af4a5675085cb9a6e1d76c953eb1165bbbc60368b88738f78eca1f86963f90156f90153800184598caf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87844996c9ccb8ed7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5407f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09516b36981ba05329086e272d3c6db76c171a4922dcd3ca8ae57444b02d37c45dcc9c4a901a14a05aa594adbf4949977dc408944f9fabdb6a9a53115b871506f0de146c8a4fa5a3c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5407f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09516b3698",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e07234e2b5dedb91894e2f9b7532d8992aa7c829bd05488db9d69f4bc63de777a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5ef8cfbc2fc3c278d71121b08c885dab3b92b00cb311045b6a42e9e708aa048d",
+        "lastblockhash" : "0xa1cad55ef2d2abf561d37bacc06451400a4ef8f701d99db3df1bf7e24ed47060",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x4996c9cc",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5407f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09516b369855",
@@ -233,8 +226,8 @@
     "randomStatetest132BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.851326b7.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest132BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest132BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x7bf6",
-                    "hash" : "0xb052d66b8f0e8967f512484e691b59894a0f711b2723617a9d3f0adfb306e807",
-                    "mixHash" : "0x71be046ed2f69ade79d9a87d6c58a111b3935dd60ed52e0a026ec8c392f396c7",
-                    "nonce" : "0x796ddffba502ec95",
+                    "hash" : "0xbab957f95637417d4653eb84caabf61cee25398bbeef695aa12b045d239a685a",
+                    "mixHash" : "0x4d64c4e43222fb5455d40e3cf8a653c536bb59ec6939dda6923eaea18cb04e36",
+                    "nonce" : "0xd5caabef50e75dd6",
                     "number" : "0x01",
                     "parentHash" : "0x7e56aa7f533deab3866282b080bae6a74f300854ef147c3933d7be6cf3b7a070",
                     "receiptTrie" : "0x062ce28c1e95d55cb55e106820ccae614fafa697cebe12b8457b5e740aac122e",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0x95aac5651f886736f36bbf05d6c6015926c3636cabbfe1f26cf7f5af546f290d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90359f901fca07e56aa7f533deab3866282b080bae6a74f300854ef147c3933d7be6cf3b7a070a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09162bba94d21f150eb0fb43807e88383e2fb22c6734e8c7e1bca98ad30446480a095aac5651f886736f36bbf05d6c6015926c3636cabbfe1f26cf7f5af546f290da0062ce28c1e95d55cb55e106820ccae614fafa697cebe12b8457b5e740aac122eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff827bf68203e880a071be046ed2f69ade79d9a87d6c58a111b3935dd60ed52e0a026ec8c392f396c788796ddffba502ec95f90156f90153800184598caf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87844996c9ccb8ed7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5407f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09516b36981ba05329086e272d3c6db76c171a4922dcd3ca8ae57444b02d37c45dcc9c4a901a14a05aa594adbf4949977dc408944f9fabdb6a9a53115b871506f0de146c8a4fa5a3c0",
+                "rlp" : "0xf90359f901fca07e56aa7f533deab3866282b080bae6a74f300854ef147c3933d7be6cf3b7a070a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09162bba94d21f150eb0fb43807e88383e2fb22c6734e8c7e1bca98ad30446480a095aac5651f886736f36bbf05d6c6015926c3636cabbfe1f26cf7f5af546f290da0062ce28c1e95d55cb55e106820ccae614fafa697cebe12b8457b5e740aac122eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff827bf68203e880a04d64c4e43222fb5455d40e3cf8a653c536bb59ec6939dda6923eaea18cb04e3688d5caabef50e75dd6f90156f90153800184598caf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87844996c9ccb8ed7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5407f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09516b36981ba05329086e272d3c6db76c171a4922dcd3ca8ae57444b02d37c45dcc9c4a901a14a05aa594adbf4949977dc408944f9fabdb6a9a53115b871506f0de146c8a4fa5a3c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5407f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09516b3698",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e07234e2b5dedb91894e2f9b7532d8992aa7c829bd05488db9d69f4bc63de777a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb052d66b8f0e8967f512484e691b59894a0f711b2723617a9d3f0adfb306e807",
+        "lastblockhash" : "0xbab957f95637417d4653eb84caabf61cee25398bbeef695aa12b045d239a685a",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest132BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.851326b7.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest132BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest132BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x7bf6",
-                    "hash" : "0x005acba1d6a4a92c5dee4866de2a6a643bf6e39f22c10a044ff1bdd2c88d4d56",
-                    "mixHash" : "0x56965cfe44aea2f2f220cc449cf70e790ee119b4fd3480aa8fe21bea1196d5cb",
-                    "nonce" : "0xb764b7621ae34534",
+                    "hash" : "0xa35bb2a5e18a8c0c55b4718a589391dd8530ce7c8f0654f2b63b412946143dec",
+                    "mixHash" : "0x8b1296b8c96110d27133a12f940ebbb8bba41a95690a03130c85fc349b930e8e",
+                    "nonce" : "0x5aa020daa08c9b25",
                     "number" : "0x01",
                     "parentHash" : "0x7e56aa7f533deab3866282b080bae6a74f300854ef147c3933d7be6cf3b7a070",
                     "receiptTrie" : "0x062ce28c1e95d55cb55e106820ccae614fafa697cebe12b8457b5e740aac122e",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0x95aac5651f886736f36bbf05d6c6015926c3636cabbfe1f26cf7f5af546f290d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90359f901fca07e56aa7f533deab3866282b080bae6a74f300854ef147c3933d7be6cf3b7a070a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09162bba94d21f150eb0fb43807e88383e2fb22c6734e8c7e1bca98ad30446480a095aac5651f886736f36bbf05d6c6015926c3636cabbfe1f26cf7f5af546f290da0062ce28c1e95d55cb55e106820ccae614fafa697cebe12b8457b5e740aac122eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff827bf68203e880a056965cfe44aea2f2f220cc449cf70e790ee119b4fd3480aa8fe21bea1196d5cb88b764b7621ae34534f90156f90153800184598caf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87844996c9ccb8ed7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5407f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09516b36981ba05329086e272d3c6db76c171a4922dcd3ca8ae57444b02d37c45dcc9c4a901a14a05aa594adbf4949977dc408944f9fabdb6a9a53115b871506f0de146c8a4fa5a3c0",
+                "rlp" : "0xf90359f901fca07e56aa7f533deab3866282b080bae6a74f300854ef147c3933d7be6cf3b7a070a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09162bba94d21f150eb0fb43807e88383e2fb22c6734e8c7e1bca98ad30446480a095aac5651f886736f36bbf05d6c6015926c3636cabbfe1f26cf7f5af546f290da0062ce28c1e95d55cb55e106820ccae614fafa697cebe12b8457b5e740aac122eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff827bf68203e880a08b1296b8c96110d27133a12f940ebbb8bba41a95690a03130c85fc349b930e8e885aa020daa08c9b25f90156f90153800184598caf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87844996c9ccb8ed7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5407f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09516b36981ba05329086e272d3c6db76c171a4922dcd3ca8ae57444b02d37c45dcc9c4a901a14a05aa594adbf4949977dc408944f9fabdb6a9a53115b871506f0de146c8a4fa5a3c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5407f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09516b3698",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e07234e2b5dedb91894e2f9b7532d8992aa7c829bd05488db9d69f4bc63de777a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x005acba1d6a4a92c5dee4866de2a6a643bf6e39f22c10a044ff1bdd2c88d4d56",
+        "lastblockhash" : "0xa35bb2a5e18a8c0c55b4718a589391dd8530ce7c8f0654f2b63b412946143dec",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest132BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.851326b7.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest132BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest132BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x7bf6",
-                    "hash" : "0x56319b2cb0f1e1224bf237ef6246fb460eccc24c384e934538b1b0e0f9ce5485",
-                    "mixHash" : "0x97e2406c784dcfddac34262d9a075cd62c882888f0fb23f14985284515058232",
-                    "nonce" : "0x62e9ecc0fd9a7847",
+                    "hash" : "0x01274e0028cd2d6a6b6c31b151a392dbf2737a1530b75adeec46f179f511f90b",
+                    "mixHash" : "0x98ab955d85e0653162d63d27f5bee4f689e68fab336a9fb1e389be155a60eb43",
+                    "nonce" : "0xead019d60244b7d7",
                     "number" : "0x01",
                     "parentHash" : "0x7e56aa7f533deab3866282b080bae6a74f300854ef147c3933d7be6cf3b7a070",
                     "receiptTrie" : "0x062ce28c1e95d55cb55e106820ccae614fafa697cebe12b8457b5e740aac122e",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0x95aac5651f886736f36bbf05d6c6015926c3636cabbfe1f26cf7f5af546f290d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90359f901fca07e56aa7f533deab3866282b080bae6a74f300854ef147c3933d7be6cf3b7a070a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09162bba94d21f150eb0fb43807e88383e2fb22c6734e8c7e1bca98ad30446480a095aac5651f886736f36bbf05d6c6015926c3636cabbfe1f26cf7f5af546f290da0062ce28c1e95d55cb55e106820ccae614fafa697cebe12b8457b5e740aac122eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff827bf68203e880a097e2406c784dcfddac34262d9a075cd62c882888f0fb23f149852845150582328862e9ecc0fd9a7847f90156f90153800184598caf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87844996c9ccb8ed7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5407f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09516b36981ba05329086e272d3c6db76c171a4922dcd3ca8ae57444b02d37c45dcc9c4a901a14a05aa594adbf4949977dc408944f9fabdb6a9a53115b871506f0de146c8a4fa5a3c0",
+                "rlp" : "0xf90359f901fca07e56aa7f533deab3866282b080bae6a74f300854ef147c3933d7be6cf3b7a070a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09162bba94d21f150eb0fb43807e88383e2fb22c6734e8c7e1bca98ad30446480a095aac5651f886736f36bbf05d6c6015926c3636cabbfe1f26cf7f5af546f290da0062ce28c1e95d55cb55e106820ccae614fafa697cebe12b8457b5e740aac122eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff827bf68203e880a098ab955d85e0653162d63d27f5bee4f689e68fab336a9fb1e389be155a60eb4388ead019d60244b7d7f90156f90153800184598caf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87844996c9ccb8ed7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5407f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09516b36981ba05329086e272d3c6db76c171a4922dcd3ca8ae57444b02d37c45dcc9c4a901a14a05aa594adbf4949977dc408944f9fabdb6a9a53115b871506f0de146c8a4fa5a3c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5407f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09516b3698",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e07234e2b5dedb91894e2f9b7532d8992aa7c829bd05488db9d69f4bc63de777a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x56319b2cb0f1e1224bf237ef6246fb460eccc24c384e934538b1b0e0f9ce5485",
+        "lastblockhash" : "0x01274e0028cd2d6a6b6c31b151a392dbf2737a1530b75adeec46f179f511f90b",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest132BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.851326b7.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest132BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest132BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x7bf6",
-                    "hash" : "0x3232ddc5fd2bd282ca262990b0c7363dc5994d21c10b3e4b105a43f2c1daec8b",
-                    "mixHash" : "0x5d7ce57e57d7756ca5daad456f1e96045f1aa761f392a255e1eea7ac3da5a8cb",
-                    "nonce" : "0x570d7d8c71fc60e9",
+                    "hash" : "0x4b25d5e099edcc9ef5ccd9b601195ab6815c4c75dc6855e1b3c80cd1ec556dad",
+                    "mixHash" : "0x576482b69c52132abcd6d889d5e03735d0e41f87da9b6fc9c18c2badb68e8f91",
+                    "nonce" : "0x3b7f2f256bc6ae10",
                     "number" : "0x01",
                     "parentHash" : "0x7e56aa7f533deab3866282b080bae6a74f300854ef147c3933d7be6cf3b7a070",
                     "receiptTrie" : "0x062ce28c1e95d55cb55e106820ccae614fafa697cebe12b8457b5e740aac122e",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0x95aac5651f886736f36bbf05d6c6015926c3636cabbfe1f26cf7f5af546f290d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90359f901fca07e56aa7f533deab3866282b080bae6a74f300854ef147c3933d7be6cf3b7a070a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09162bba94d21f150eb0fb43807e88383e2fb22c6734e8c7e1bca98ad30446480a095aac5651f886736f36bbf05d6c6015926c3636cabbfe1f26cf7f5af546f290da0062ce28c1e95d55cb55e106820ccae614fafa697cebe12b8457b5e740aac122eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff827bf68203e880a05d7ce57e57d7756ca5daad456f1e96045f1aa761f392a255e1eea7ac3da5a8cb88570d7d8c71fc60e9f90156f90153800184598caf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87844996c9ccb8ed7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5407f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09516b36981ba05329086e272d3c6db76c171a4922dcd3ca8ae57444b02d37c45dcc9c4a901a14a05aa594adbf4949977dc408944f9fabdb6a9a53115b871506f0de146c8a4fa5a3c0",
+                "rlp" : "0xf90359f901fca07e56aa7f533deab3866282b080bae6a74f300854ef147c3933d7be6cf3b7a070a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09162bba94d21f150eb0fb43807e88383e2fb22c6734e8c7e1bca98ad30446480a095aac5651f886736f36bbf05d6c6015926c3636cabbfe1f26cf7f5af546f290da0062ce28c1e95d55cb55e106820ccae614fafa697cebe12b8457b5e740aac122eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff827bf68203e880a0576482b69c52132abcd6d889d5e03735d0e41f87da9b6fc9c18c2badb68e8f91883b7f2f256bc6ae10f90156f90153800184598caf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87844996c9ccb8ed7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5407f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09516b36981ba05329086e272d3c6db76c171a4922dcd3ca8ae57444b02d37c45dcc9c4a901a14a05aa594adbf4949977dc408944f9fabdb6a9a53115b871506f0de146c8a4fa5a3c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5407f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09516b3698",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e07234e2b5dedb91894e2f9b7532d8992aa7c829bd05488db9d69f4bc63de777a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3232ddc5fd2bd282ca262990b0c7363dc5994d21c10b3e4b105a43f2c1daec8b",
+        "lastblockhash" : "0x4b25d5e099edcc9ef5ccd9b601195ab6815c4c75dc6855e1b3c80cd1ec556dad",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest140BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest140BC.json
index 35ea90b78..b09565ebf 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest140BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest140BC.json
@@ -2,8 +2,8 @@
     "randomStatetest140BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest140BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest140BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc8fc",
-                    "hash" : "0x8d2aabec6ac4965e78c54e35768119a60615f7cc9dd4b7e68a913433f076baed",
-                    "mixHash" : "0xb46911291f80914f677a534f4b8d74b278d4596cb8bbcf49ec70fa352787135a",
-                    "nonce" : "0x6d81e5abe4729ecb",
+                    "hash" : "0x08a092ba0f0070134e7756ec8da3d8182ffa9c3bfa12c2470e2f63ca83d370c1",
+                    "mixHash" : "0x8250a2c66c8c5372fadca76ca86844b99ab43c973d95d633e5543b986a374aa6",
+                    "nonce" : "0x7032d5d01b44497a",
                     "number" : "0x01",
                     "parentHash" : "0xa304c9772102fee9110d9d1ca9caab9f4ff10c7f4fb23e12b004a679860582b6",
                     "receiptTrie" : "0x2f9968ae3d8a197c00e397adf9666bb0a583eb794632977f932d3a364d488443",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x1cff3e80aaf47be07543e17ca74bc039b49a15b5ed74be48f9118f15bb888ef8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0a304c9772102fee9110d9d1ca9caab9f4ff10c7f4fb23e12b004a679860582b6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0bdc002dc3f665366f738080171afdd025af2d844eb05476cd5ed337a9585b681a01cff3e80aaf47be07543e17ca74bc039b49a15b5ed74be48f9118f15bb888ef8a02f9968ae3d8a197c00e397adf9666bb0a583eb794632977f932d3a364d488443b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c8fc8203e880a0b46911291f80914f677a534f4b8d74b278d4596cb8bbcf49ec70fa352787135a886d81e5abe4729ecbf90141f9013e800184168e26c294095e7baea6a6c7c4c2dfeb977efac326af552d87845ddec6b0b8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f0000000000000000000000000000000000000000000000000000000000000001407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f2d6f4162696d5767078708977c37541ca0438337b25e94e60f9b69c01cd296fb53588695e70ddb850184f87b9cd01a4b9ba04e813c57cdb77ece6f5751b995d40dc35d74cacd2ad3febfbbf7ca5707bb0bb0c0",
+                "rlp" : "0xf90344f901fca0a304c9772102fee9110d9d1ca9caab9f4ff10c7f4fb23e12b004a679860582b6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0bdc002dc3f665366f738080171afdd025af2d844eb05476cd5ed337a9585b681a01cff3e80aaf47be07543e17ca74bc039b49a15b5ed74be48f9118f15bb888ef8a02f9968ae3d8a197c00e397adf9666bb0a583eb794632977f932d3a364d488443b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c8fc8203e880a08250a2c66c8c5372fadca76ca86844b99ab43c973d95d633e5543b986a374aa6887032d5d01b44497af90141f9013e800184168e26c294095e7baea6a6c7c4c2dfeb977efac326af552d87845ddec6b0b8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f0000000000000000000000000000000000000000000000000000000000000001407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f2d6f4162696d5767078708977c37541ca0438337b25e94e60f9b69c01cd296fb53588695e70ddb850184f87b9cd01a4b9ba04e813c57cdb77ece6f5751b995d40dc35d74cacd2ad3febfbbf7ca5707bb0bb0c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f0000000000000000000000000000000000000000000000000000000000000001407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f2d6f4162696d5767078708977c3754",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a092848bd455b6ec3b9cbf089102b38ec1727703594bbf0ae6da5aad521c7ce8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8d2aabec6ac4965e78c54e35768119a60615f7cc9dd4b7e68a913433f076baed",
+        "lastblockhash" : "0x08a092ba0f0070134e7756ec8da3d8182ffa9c3bfa12c2470e2f63ca83d370c1",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest140BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest140BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest140BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xcc08",
-                    "hash" : "0x667d522ea9fc37ce861ff1a7e1080da03da961cf93b83b84414719b7ec7ff4bf",
-                    "mixHash" : "0xff8f67501d715182d278ea3aa1afbfe478ee5c1855bb0456f494565a927fcff8",
-                    "nonce" : "0x64d014aad34e52d4",
+                    "hash" : "0xdc5ee2cd9e1923da10ec82de718d6c311d526a5fa559fa269dd120a1a71e9fcc",
+                    "mixHash" : "0x2e6a159180c9d446929bd9c2e6b7fd5f2b8f92676008900df8d73c90d37c967c",
+                    "nonce" : "0x25d35d052ee903a1",
                     "number" : "0x01",
                     "parentHash" : "0xa304c9772102fee9110d9d1ca9caab9f4ff10c7f4fb23e12b004a679860582b6",
                     "receiptTrie" : "0x9384de9cc852a3eb3352e53ff1bb8d9d4173aea1a36c43122110765183e04012",
-                    "stateRoot" : "0x52518d756c49edf85bb3f246abee786cd36d57068ffe7573b2f497e50a93c421",
+                    "stateRoot" : "0xda1974321865014897a2b92a08122d71db8fbcd06c5fd896e9e5aadb7391d500",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1cff3e80aaf47be07543e17ca74bc039b49a15b5ed74be48f9118f15bb888ef8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0a304c9772102fee9110d9d1ca9caab9f4ff10c7f4fb23e12b004a679860582b6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a052518d756c49edf85bb3f246abee786cd36d57068ffe7573b2f497e50a93c421a01cff3e80aaf47be07543e17ca74bc039b49a15b5ed74be48f9118f15bb888ef8a09384de9cc852a3eb3352e53ff1bb8d9d4173aea1a36c43122110765183e04012b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cc088203e880a0ff8f67501d715182d278ea3aa1afbfe478ee5c1855bb0456f494565a927fcff88864d014aad34e52d4f90141f9013e800184168e26c294095e7baea6a6c7c4c2dfeb977efac326af552d87845ddec6b0b8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f0000000000000000000000000000000000000000000000000000000000000001407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f2d6f4162696d5767078708977c37541ca0438337b25e94e60f9b69c01cd296fb53588695e70ddb850184f87b9cd01a4b9ba04e813c57cdb77ece6f5751b995d40dc35d74cacd2ad3febfbbf7ca5707bb0bb0c0",
+                "rlp" : "0xf90344f901fca0a304c9772102fee9110d9d1ca9caab9f4ff10c7f4fb23e12b004a679860582b6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0da1974321865014897a2b92a08122d71db8fbcd06c5fd896e9e5aadb7391d500a01cff3e80aaf47be07543e17ca74bc039b49a15b5ed74be48f9118f15bb888ef8a09384de9cc852a3eb3352e53ff1bb8d9d4173aea1a36c43122110765183e04012b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cc088203e880a02e6a159180c9d446929bd9c2e6b7fd5f2b8f92676008900df8d73c90d37c967c8825d35d052ee903a1f90141f9013e800184168e26c294095e7baea6a6c7c4c2dfeb977efac326af552d87845ddec6b0b8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f0000000000000000000000000000000000000000000000000000000000000001407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f2d6f4162696d5767078708977c37541ca0438337b25e94e60f9b69c01cd296fb53588695e70ddb850184f87b9cd01a4b9ba04e813c57cdb77ece6f5751b995d40dc35d74cacd2ad3febfbbf7ca5707bb0bb0c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f0000000000000000000000000000000000000000000000000000000000000001407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f2d6f4162696d5767078708977c3754",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a092848bd455b6ec3b9cbf089102b38ec1727703594bbf0ae6da5aad521c7ce8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x667d522ea9fc37ce861ff1a7e1080da03da961cf93b83b84414719b7ec7ff4bf",
+        "lastblockhash" : "0xdc5ee2cd9e1923da10ec82de718d6c311d526a5fa559fa269dd120a1a71e9fcc",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x5ddec6b0",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f0000000000000000000000000000000000000000000000000000000000000001407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f2d6f4162696d5767078708977c37545560005155",
@@ -235,8 +228,8 @@
     "randomStatetest140BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest140BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest140BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc8fc",
-                    "hash" : "0x5a0718ae50d385409cde1865cbfb4b8e5ef97586e1a4b97efcc1fbff2f2e59dc",
-                    "mixHash" : "0x295c47afbefec7e0de1980b52722f01a298cc6180b8b40f49be1fc8c5ab87761",
-                    "nonce" : "0x540cfe092ae03d43",
+                    "hash" : "0x6e3c7694377cf30d25c539b6e9d66842ab440b3b8cefa8e719227a4e21907411",
+                    "mixHash" : "0xde10b21b5228e98deeb52fe33be01a090eb294283c57ef79e0adcf192eabac3f",
+                    "nonce" : "0x200f8bbc94094242",
                     "number" : "0x01",
                     "parentHash" : "0xa304c9772102fee9110d9d1ca9caab9f4ff10c7f4fb23e12b004a679860582b6",
                     "receiptTrie" : "0x9d3132e00abc9a1e0f7667849ea00f24239a8e3f3922b5e58432acca3646fec9",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0x1cff3e80aaf47be07543e17ca74bc039b49a15b5ed74be48f9118f15bb888ef8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0a304c9772102fee9110d9d1ca9caab9f4ff10c7f4fb23e12b004a679860582b6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0202963a286c4922855b91ffd231e2b561d640b06b67a2edd81978d84a9380a4ba01cff3e80aaf47be07543e17ca74bc039b49a15b5ed74be48f9118f15bb888ef8a09d3132e00abc9a1e0f7667849ea00f24239a8e3f3922b5e58432acca3646fec9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c8fc8203e880a0295c47afbefec7e0de1980b52722f01a298cc6180b8b40f49be1fc8c5ab8776188540cfe092ae03d43f90141f9013e800184168e26c294095e7baea6a6c7c4c2dfeb977efac326af552d87845ddec6b0b8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f0000000000000000000000000000000000000000000000000000000000000001407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f2d6f4162696d5767078708977c37541ca0438337b25e94e60f9b69c01cd296fb53588695e70ddb850184f87b9cd01a4b9ba04e813c57cdb77ece6f5751b995d40dc35d74cacd2ad3febfbbf7ca5707bb0bb0c0",
+                "rlp" : "0xf90344f901fca0a304c9772102fee9110d9d1ca9caab9f4ff10c7f4fb23e12b004a679860582b6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0202963a286c4922855b91ffd231e2b561d640b06b67a2edd81978d84a9380a4ba01cff3e80aaf47be07543e17ca74bc039b49a15b5ed74be48f9118f15bb888ef8a09d3132e00abc9a1e0f7667849ea00f24239a8e3f3922b5e58432acca3646fec9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c8fc8203e880a0de10b21b5228e98deeb52fe33be01a090eb294283c57ef79e0adcf192eabac3f88200f8bbc94094242f90141f9013e800184168e26c294095e7baea6a6c7c4c2dfeb977efac326af552d87845ddec6b0b8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f0000000000000000000000000000000000000000000000000000000000000001407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f2d6f4162696d5767078708977c37541ca0438337b25e94e60f9b69c01cd296fb53588695e70ddb850184f87b9cd01a4b9ba04e813c57cdb77ece6f5751b995d40dc35d74cacd2ad3febfbbf7ca5707bb0bb0c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f0000000000000000000000000000000000000000000000000000000000000001407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f2d6f4162696d5767078708977c3754",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a092848bd455b6ec3b9cbf089102b38ec1727703594bbf0ae6da5aad521c7ce8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5a0718ae50d385409cde1865cbfb4b8e5ef97586e1a4b97efcc1fbff2f2e59dc",
+        "lastblockhash" : "0x6e3c7694377cf30d25c539b6e9d66842ab440b3b8cefa8e719227a4e21907411",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest140BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest140BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest140BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc8fc",
-                    "hash" : "0xb302242c62acc51f5555d4f8a199622b9e1e23163c0a0da8e0bd69eea9276cae",
-                    "mixHash" : "0xbbd28e7524e17169e4791ada41b842ac65c349d70b6632f12837869b6b4c164f",
-                    "nonce" : "0x62671aed9e3402de",
+                    "hash" : "0xc223c2b8defe5da13678f70b0768c0b0c3c0f5b7c9dc94e10fc7ad473b72f429",
+                    "mixHash" : "0xa1475928a3bad5be210c6ff71583298aa7364e2ca10afba723e28368fcf8423b",
+                    "nonce" : "0x0296a2b0f4d59a84",
                     "number" : "0x01",
                     "parentHash" : "0xa304c9772102fee9110d9d1ca9caab9f4ff10c7f4fb23e12b004a679860582b6",
                     "receiptTrie" : "0x9d3132e00abc9a1e0f7667849ea00f24239a8e3f3922b5e58432acca3646fec9",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0x1cff3e80aaf47be07543e17ca74bc039b49a15b5ed74be48f9118f15bb888ef8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0a304c9772102fee9110d9d1ca9caab9f4ff10c7f4fb23e12b004a679860582b6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0202963a286c4922855b91ffd231e2b561d640b06b67a2edd81978d84a9380a4ba01cff3e80aaf47be07543e17ca74bc039b49a15b5ed74be48f9118f15bb888ef8a09d3132e00abc9a1e0f7667849ea00f24239a8e3f3922b5e58432acca3646fec9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c8fc8203e880a0bbd28e7524e17169e4791ada41b842ac65c349d70b6632f12837869b6b4c164f8862671aed9e3402def90141f9013e800184168e26c294095e7baea6a6c7c4c2dfeb977efac326af552d87845ddec6b0b8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f0000000000000000000000000000000000000000000000000000000000000001407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f2d6f4162696d5767078708977c37541ca0438337b25e94e60f9b69c01cd296fb53588695e70ddb850184f87b9cd01a4b9ba04e813c57cdb77ece6f5751b995d40dc35d74cacd2ad3febfbbf7ca5707bb0bb0c0",
+                "rlp" : "0xf90344f901fca0a304c9772102fee9110d9d1ca9caab9f4ff10c7f4fb23e12b004a679860582b6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0202963a286c4922855b91ffd231e2b561d640b06b67a2edd81978d84a9380a4ba01cff3e80aaf47be07543e17ca74bc039b49a15b5ed74be48f9118f15bb888ef8a09d3132e00abc9a1e0f7667849ea00f24239a8e3f3922b5e58432acca3646fec9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c8fc8203e880a0a1475928a3bad5be210c6ff71583298aa7364e2ca10afba723e28368fcf8423b880296a2b0f4d59a84f90141f9013e800184168e26c294095e7baea6a6c7c4c2dfeb977efac326af552d87845ddec6b0b8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f0000000000000000000000000000000000000000000000000000000000000001407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f2d6f4162696d5767078708977c37541ca0438337b25e94e60f9b69c01cd296fb53588695e70ddb850184f87b9cd01a4b9ba04e813c57cdb77ece6f5751b995d40dc35d74cacd2ad3febfbbf7ca5707bb0bb0c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f0000000000000000000000000000000000000000000000000000000000000001407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f2d6f4162696d5767078708977c3754",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a092848bd455b6ec3b9cbf089102b38ec1727703594bbf0ae6da5aad521c7ce8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb302242c62acc51f5555d4f8a199622b9e1e23163c0a0da8e0bd69eea9276cae",
+        "lastblockhash" : "0xc223c2b8defe5da13678f70b0768c0b0c3c0f5b7c9dc94e10fc7ad473b72f429",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest140BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest140BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest140BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc8fc",
-                    "hash" : "0x283fbc02951e1f434761e8fa1789bdb0889243af46c85869ce93e0138d62f883",
-                    "mixHash" : "0x42b2a9631932b2ad27cac7ad8d81413970434661dd6f6ed20acad10d2f58a5fa",
-                    "nonce" : "0xf6e27056a6555694",
+                    "hash" : "0xf052873f20c9081e601b6c0c4b66c5ce0495282f05c2a2929b5ecab5b5db18d8",
+                    "mixHash" : "0x1cc0ef7188226d1123385168b5bb94094f2542200ffbcf7e18d4431f18c367cb",
+                    "nonce" : "0xdbfbe35d3f57ae3b",
                     "number" : "0x01",
                     "parentHash" : "0xa304c9772102fee9110d9d1ca9caab9f4ff10c7f4fb23e12b004a679860582b6",
                     "receiptTrie" : "0x9d3132e00abc9a1e0f7667849ea00f24239a8e3f3922b5e58432acca3646fec9",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0x1cff3e80aaf47be07543e17ca74bc039b49a15b5ed74be48f9118f15bb888ef8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0a304c9772102fee9110d9d1ca9caab9f4ff10c7f4fb23e12b004a679860582b6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0202963a286c4922855b91ffd231e2b561d640b06b67a2edd81978d84a9380a4ba01cff3e80aaf47be07543e17ca74bc039b49a15b5ed74be48f9118f15bb888ef8a09d3132e00abc9a1e0f7667849ea00f24239a8e3f3922b5e58432acca3646fec9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c8fc8203e880a042b2a9631932b2ad27cac7ad8d81413970434661dd6f6ed20acad10d2f58a5fa88f6e27056a6555694f90141f9013e800184168e26c294095e7baea6a6c7c4c2dfeb977efac326af552d87845ddec6b0b8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f0000000000000000000000000000000000000000000000000000000000000001407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f2d6f4162696d5767078708977c37541ca0438337b25e94e60f9b69c01cd296fb53588695e70ddb850184f87b9cd01a4b9ba04e813c57cdb77ece6f5751b995d40dc35d74cacd2ad3febfbbf7ca5707bb0bb0c0",
+                "rlp" : "0xf90344f901fca0a304c9772102fee9110d9d1ca9caab9f4ff10c7f4fb23e12b004a679860582b6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0202963a286c4922855b91ffd231e2b561d640b06b67a2edd81978d84a9380a4ba01cff3e80aaf47be07543e17ca74bc039b49a15b5ed74be48f9118f15bb888ef8a09d3132e00abc9a1e0f7667849ea00f24239a8e3f3922b5e58432acca3646fec9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c8fc8203e880a01cc0ef7188226d1123385168b5bb94094f2542200ffbcf7e18d4431f18c367cb88dbfbe35d3f57ae3bf90141f9013e800184168e26c294095e7baea6a6c7c4c2dfeb977efac326af552d87845ddec6b0b8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f0000000000000000000000000000000000000000000000000000000000000001407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f2d6f4162696d5767078708977c37541ca0438337b25e94e60f9b69c01cd296fb53588695e70ddb850184f87b9cd01a4b9ba04e813c57cdb77ece6f5751b995d40dc35d74cacd2ad3febfbbf7ca5707bb0bb0c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f0000000000000000000000000000000000000000000000000000000000000001407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f2d6f4162696d5767078708977c3754",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a092848bd455b6ec3b9cbf089102b38ec1727703594bbf0ae6da5aad521c7ce8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x283fbc02951e1f434761e8fa1789bdb0889243af46c85869ce93e0138d62f883",
+        "lastblockhash" : "0xf052873f20c9081e601b6c0c4b66c5ce0495282f05c2a2929b5ecab5b5db18d8",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest140BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest140BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest140BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc8fc",
-                    "hash" : "0x53d81d167cba866bc8405d24b2d97d49acc5b8e9e524a2897afaf83d4c36ae87",
-                    "mixHash" : "0x36bfa9695f73327b5eaf7b067bc18343586a1596dab3e74d0f2cb0050f538007",
-                    "nonce" : "0x46ae2f3f61fb5982",
+                    "hash" : "0x39c0db8a70bff5ca494703818b7187c75f501e353242b96a681833b4ee76d13e",
+                    "mixHash" : "0x273d1048e8ac209e5c4625f83880ebc7e27263a46568d073824a8b76780988e5",
+                    "nonce" : "0x5c9497c4e16c22f1",
                     "number" : "0x01",
                     "parentHash" : "0xa304c9772102fee9110d9d1ca9caab9f4ff10c7f4fb23e12b004a679860582b6",
                     "receiptTrie" : "0x9d3132e00abc9a1e0f7667849ea00f24239a8e3f3922b5e58432acca3646fec9",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0x1cff3e80aaf47be07543e17ca74bc039b49a15b5ed74be48f9118f15bb888ef8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0a304c9772102fee9110d9d1ca9caab9f4ff10c7f4fb23e12b004a679860582b6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0202963a286c4922855b91ffd231e2b561d640b06b67a2edd81978d84a9380a4ba01cff3e80aaf47be07543e17ca74bc039b49a15b5ed74be48f9118f15bb888ef8a09d3132e00abc9a1e0f7667849ea00f24239a8e3f3922b5e58432acca3646fec9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c8fc8203e880a036bfa9695f73327b5eaf7b067bc18343586a1596dab3e74d0f2cb0050f5380078846ae2f3f61fb5982f90141f9013e800184168e26c294095e7baea6a6c7c4c2dfeb977efac326af552d87845ddec6b0b8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f0000000000000000000000000000000000000000000000000000000000000001407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f2d6f4162696d5767078708977c37541ca0438337b25e94e60f9b69c01cd296fb53588695e70ddb850184f87b9cd01a4b9ba04e813c57cdb77ece6f5751b995d40dc35d74cacd2ad3febfbbf7ca5707bb0bb0c0",
+                "rlp" : "0xf90344f901fca0a304c9772102fee9110d9d1ca9caab9f4ff10c7f4fb23e12b004a679860582b6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0202963a286c4922855b91ffd231e2b561d640b06b67a2edd81978d84a9380a4ba01cff3e80aaf47be07543e17ca74bc039b49a15b5ed74be48f9118f15bb888ef8a09d3132e00abc9a1e0f7667849ea00f24239a8e3f3922b5e58432acca3646fec9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c8fc8203e880a0273d1048e8ac209e5c4625f83880ebc7e27263a46568d073824a8b76780988e5885c9497c4e16c22f1f90141f9013e800184168e26c294095e7baea6a6c7c4c2dfeb977efac326af552d87845ddec6b0b8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f0000000000000000000000000000000000000000000000000000000000000001407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f2d6f4162696d5767078708977c37541ca0438337b25e94e60f9b69c01cd296fb53588695e70ddb850184f87b9cd01a4b9ba04e813c57cdb77ece6f5751b995d40dc35d74cacd2ad3febfbbf7ca5707bb0bb0c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f0000000000000000000000000000000000000000000000000000000000000001407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f2d6f4162696d5767078708977c3754",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a092848bd455b6ec3b9cbf089102b38ec1727703594bbf0ae6da5aad521c7ce8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x53d81d167cba866bc8405d24b2d97d49acc5b8e9e524a2897afaf83d4c36ae87",
+        "lastblockhash" : "0x39c0db8a70bff5ca494703818b7187c75f501e353242b96a681833b4ee76d13e",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest141BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest141BC.json
index 21be707f7..a6e77d57e 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest141BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest141BC.json
@@ -2,8 +2,8 @@
     "randomStatetest141BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest141BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest141BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa1ca",
-                    "hash" : "0x1751de62113f6ae0555cc0d3ddeedba2444f7d927ee55bf58b114122247cf0cb",
-                    "mixHash" : "0xfe7c0094b4b555d25d38528581d3cd93ca20a76709476bbf8bd793355993da28",
-                    "nonce" : "0xb99c9e73160bf238",
+                    "hash" : "0x303120b16743b3d84f59834d06c7e41b203c6456c8a33c482a847dea440c33be",
+                    "mixHash" : "0xad64fd6e33771e77a2c004dd684868503ab4ef203bab5b69ce0f29f5a248e6cf",
+                    "nonce" : "0x2b5a6ca09e25cb9f",
                     "number" : "0x01",
                     "parentHash" : "0xb8934790dbf3ccc55da958133d100238c50794c0207a0bd47e8c0646f2e348d8",
                     "receiptTrie" : "0xdfb001a5dd06236667d93bfd7385e18eefbc3213c059a93d417c45945dc74e9d",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0b8934790dbf3ccc55da958133d100238c50794c0207a0bd47e8c0646f2e348d8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00144b489f548be3df3c8a7f2f88de99ff6cba7ed17d33792fd20763070415619a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0dfb001a5dd06236667d93bfd7385e18eefbc3213c059a93d417c45945dc74e9db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1ca8203e880a0fe7c0094b4b555d25d38528581d3cd93ca20a76709476bbf8bd793355993da2888b99c9e73160bf238f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0b8934790dbf3ccc55da958133d100238c50794c0207a0bd47e8c0646f2e348d8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00144b489f548be3df3c8a7f2f88de99ff6cba7ed17d33792fd20763070415619a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0dfb001a5dd06236667d93bfd7385e18eefbc3213c059a93d417c45945dc74e9db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1ca8203e880a0ad64fd6e33771e77a2c004dd684868503ab4ef203bab5b69ce0f29f5a248e6cf882b5a6ca09e25cb9ff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0424649094b168d78ead4a1674d0838143209716218ec61e6a26200a5d3700451a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1751de62113f6ae0555cc0d3ddeedba2444f7d927ee55bf58b114122247cf0cb",
+        "lastblockhash" : "0x303120b16743b3d84f59834d06c7e41b203c6456c8a33c482a847dea440c33be",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest141BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest141BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest141BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa4d6",
-                    "hash" : "0x5f43d91220365ae4bf1d728fb89df844f7f5fc4dbfdffaf3f955a1026d7bf7a9",
-                    "mixHash" : "0xf1f1c3e3824afe9697a75c455723bcb253b124bfdbeeb44a9e29080f43b70d1d",
-                    "nonce" : "0xe6ac632b6b8a6acb",
+                    "hash" : "0x7e1674ddceeef87b76783df1f454787d06e0dea10de2f5c75824862a15a357ad",
+                    "mixHash" : "0x658ea8c4c5ccddee37237a3a721ffc66a0a46f5037f87720d19d1c9a5c6088cb",
+                    "nonce" : "0x4ba2cd9f442b127a",
                     "number" : "0x01",
                     "parentHash" : "0xb8934790dbf3ccc55da958133d100238c50794c0207a0bd47e8c0646f2e348d8",
                     "receiptTrie" : "0x8f593864ea2fc8a4d8d8e7a4a17660c38535dcf693c754fa66767b95b7bf5b07",
-                    "stateRoot" : "0x7aac07aa2b63bece2de74da6044c6fe4473a63a6d74a6660525c02bd45adf08c",
+                    "stateRoot" : "0x0e143583cc2001dacba9942ca7ecc7bd4eb417c85e2bea2da757f2e8cedd1ebc",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0b8934790dbf3ccc55da958133d100238c50794c0207a0bd47e8c0646f2e348d8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07aac07aa2b63bece2de74da6044c6fe4473a63a6d74a6660525c02bd45adf08ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa08f593864ea2fc8a4d8d8e7a4a17660c38535dcf693c754fa66767b95b7bf5b07b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a4d68203e880a0f1f1c3e3824afe9697a75c455723bcb253b124bfdbeeb44a9e29080f43b70d1d88e6ac632b6b8a6acbf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0b8934790dbf3ccc55da958133d100238c50794c0207a0bd47e8c0646f2e348d8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00e143583cc2001dacba9942ca7ecc7bd4eb417c85e2bea2da757f2e8cedd1ebca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa08f593864ea2fc8a4d8d8e7a4a17660c38535dcf693c754fa66767b95b7bf5b07b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a4d68203e880a0658ea8c4c5ccddee37237a3a721ffc66a0a46f5037f87720d19d1c9a5c6088cb884ba2cd9f442b127af865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0424649094b168d78ead4a1674d0838143209716218ec61e6a26200a5d3700451a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5f43d91220365ae4bf1d728fb89df844f7f5fc4dbfdffaf3f955a1026d7bf7a9",
+        "lastblockhash" : "0x7e1674ddceeef87b76783df1f454787d06e0dea10de2f5c75824862a15a357ad",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x4544424140204555",
@@ -235,8 +228,8 @@
     "randomStatetest141BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest141BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest141BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa1ca",
-                    "hash" : "0x167291f019b5dded24dcf3effff3e750c3f10acc92c92f7ce271710bfdf9d3eb",
-                    "mixHash" : "0x2bc30c02d602e2b4f138f47b47e01a65949d21703cfb0dfbfb0e229f726ab988",
-                    "nonce" : "0xd70224a81b0e932b",
+                    "hash" : "0x20fc3ece27964a0a9c0a19be0e8008ad6c27b6429f8bab06ac1bdea9f7b6f1ef",
+                    "mixHash" : "0x18dee5ba0c71662e100fc53175bfb571b7b0c0a8a423b3af62b2ca0be47731aa",
+                    "nonce" : "0xe479c165dcfdd591",
                     "number" : "0x01",
                     "parentHash" : "0xb8934790dbf3ccc55da958133d100238c50794c0207a0bd47e8c0646f2e348d8",
                     "receiptTrie" : "0xa30aa63036a36b9e6704edd1283e309a7f61148e97580bf95fd966e4c0bdd957",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0b8934790dbf3ccc55da958133d100238c50794c0207a0bd47e8c0646f2e348d8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c6cc087f32f1ab9c45735b48efebc06ff5be88f422fb240c62488d7dc6d2e498a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0a30aa63036a36b9e6704edd1283e309a7f61148e97580bf95fd966e4c0bdd957b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1ca8203e880a02bc30c02d602e2b4f138f47b47e01a65949d21703cfb0dfbfb0e229f726ab98888d70224a81b0e932bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0b8934790dbf3ccc55da958133d100238c50794c0207a0bd47e8c0646f2e348d8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c6cc087f32f1ab9c45735b48efebc06ff5be88f422fb240c62488d7dc6d2e498a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0a30aa63036a36b9e6704edd1283e309a7f61148e97580bf95fd966e4c0bdd957b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1ca8203e880a018dee5ba0c71662e100fc53175bfb571b7b0c0a8a423b3af62b2ca0be47731aa88e479c165dcfdd591f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0424649094b168d78ead4a1674d0838143209716218ec61e6a26200a5d3700451a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x167291f019b5dded24dcf3effff3e750c3f10acc92c92f7ce271710bfdf9d3eb",
+        "lastblockhash" : "0x20fc3ece27964a0a9c0a19be0e8008ad6c27b6429f8bab06ac1bdea9f7b6f1ef",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest141BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest141BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest141BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa1ca",
-                    "hash" : "0x606396ab9941b78f0dc5563b172213b847174f944b310ae4c5509817a7df1049",
-                    "mixHash" : "0xf94080ecb46fcd74ea50362f7c0e81fc02cdf7845dd6c098759d2b8c27d5aa62",
-                    "nonce" : "0x02b347427d48824d",
+                    "hash" : "0x706e5d829cbe1401c48064d7c191f993332464e6a3a00bbfa98bbabee15723c3",
+                    "mixHash" : "0x83d88ef8d6b5ae46eb8916d9bb739130c280cbbcab15cf38656b30dc36e751d8",
+                    "nonce" : "0x16b190b81726d60f",
                     "number" : "0x01",
                     "parentHash" : "0xb8934790dbf3ccc55da958133d100238c50794c0207a0bd47e8c0646f2e348d8",
                     "receiptTrie" : "0xa30aa63036a36b9e6704edd1283e309a7f61148e97580bf95fd966e4c0bdd957",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0b8934790dbf3ccc55da958133d100238c50794c0207a0bd47e8c0646f2e348d8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c6cc087f32f1ab9c45735b48efebc06ff5be88f422fb240c62488d7dc6d2e498a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0a30aa63036a36b9e6704edd1283e309a7f61148e97580bf95fd966e4c0bdd957b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1ca8203e880a0f94080ecb46fcd74ea50362f7c0e81fc02cdf7845dd6c098759d2b8c27d5aa628802b347427d48824df865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0b8934790dbf3ccc55da958133d100238c50794c0207a0bd47e8c0646f2e348d8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c6cc087f32f1ab9c45735b48efebc06ff5be88f422fb240c62488d7dc6d2e498a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0a30aa63036a36b9e6704edd1283e309a7f61148e97580bf95fd966e4c0bdd957b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1ca8203e880a083d88ef8d6b5ae46eb8916d9bb739130c280cbbcab15cf38656b30dc36e751d88816b190b81726d60ff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0424649094b168d78ead4a1674d0838143209716218ec61e6a26200a5d3700451a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x606396ab9941b78f0dc5563b172213b847174f944b310ae4c5509817a7df1049",
+        "lastblockhash" : "0x706e5d829cbe1401c48064d7c191f993332464e6a3a00bbfa98bbabee15723c3",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest141BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest141BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest141BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa1ca",
-                    "hash" : "0xfd28891d752c3b91cc126c56740a6a9ecbfd3845bc346dd086fec02e42160359",
-                    "mixHash" : "0xdf27c9127335e1a9c7e930a10420654f860d4e5d93ebb2726844fdd18ed139c2",
-                    "nonce" : "0xd6cbef6234450345",
+                    "hash" : "0x0b7afa4162fa3ac964119c44ebb1e9cee9cea20e82189056f57249f53db6ab64",
+                    "mixHash" : "0xef5c98066f65b32ae6cc5953d7c0f4d438eb129051888b2e2a95d48dd4b72691",
+                    "nonce" : "0x80099426cd52bf5f",
                     "number" : "0x01",
                     "parentHash" : "0xb8934790dbf3ccc55da958133d100238c50794c0207a0bd47e8c0646f2e348d8",
                     "receiptTrie" : "0xa30aa63036a36b9e6704edd1283e309a7f61148e97580bf95fd966e4c0bdd957",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0b8934790dbf3ccc55da958133d100238c50794c0207a0bd47e8c0646f2e348d8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c6cc087f32f1ab9c45735b48efebc06ff5be88f422fb240c62488d7dc6d2e498a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0a30aa63036a36b9e6704edd1283e309a7f61148e97580bf95fd966e4c0bdd957b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1ca8203e880a0df27c9127335e1a9c7e930a10420654f860d4e5d93ebb2726844fdd18ed139c288d6cbef6234450345f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0b8934790dbf3ccc55da958133d100238c50794c0207a0bd47e8c0646f2e348d8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c6cc087f32f1ab9c45735b48efebc06ff5be88f422fb240c62488d7dc6d2e498a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0a30aa63036a36b9e6704edd1283e309a7f61148e97580bf95fd966e4c0bdd957b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1ca8203e880a0ef5c98066f65b32ae6cc5953d7c0f4d438eb129051888b2e2a95d48dd4b726918880099426cd52bf5ff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0424649094b168d78ead4a1674d0838143209716218ec61e6a26200a5d3700451a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfd28891d752c3b91cc126c56740a6a9ecbfd3845bc346dd086fec02e42160359",
+        "lastblockhash" : "0x0b7afa4162fa3ac964119c44ebb1e9cee9cea20e82189056f57249f53db6ab64",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest141BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest141BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest141BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa1ca",
-                    "hash" : "0x59e04ec6c9b808a7bc7d301d0597e0c0b8995318ef18a3b80fa1e7790ba35861",
-                    "mixHash" : "0xdf5819c8fe8dbe4248223a7a1f317cd44814d29b968fa5276489eac1b82b8f92",
-                    "nonce" : "0xb9732f02da52c47c",
+                    "hash" : "0x4f2173da2cb13b76a94cff2ffa3e33ed8591b24e851d9528429c57de3583a09b",
+                    "mixHash" : "0xbb27fa4bf651d3365b7471c84747c14b554ce5733601e0016d25e95d54744d05",
+                    "nonce" : "0x9042de0b191f8011",
                     "number" : "0x01",
                     "parentHash" : "0xb8934790dbf3ccc55da958133d100238c50794c0207a0bd47e8c0646f2e348d8",
                     "receiptTrie" : "0xa30aa63036a36b9e6704edd1283e309a7f61148e97580bf95fd966e4c0bdd957",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0b8934790dbf3ccc55da958133d100238c50794c0207a0bd47e8c0646f2e348d8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c6cc087f32f1ab9c45735b48efebc06ff5be88f422fb240c62488d7dc6d2e498a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0a30aa63036a36b9e6704edd1283e309a7f61148e97580bf95fd966e4c0bdd957b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1ca8203e880a0df5819c8fe8dbe4248223a7a1f317cd44814d29b968fa5276489eac1b82b8f9288b9732f02da52c47cf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0b8934790dbf3ccc55da958133d100238c50794c0207a0bd47e8c0646f2e348d8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c6cc087f32f1ab9c45735b48efebc06ff5be88f422fb240c62488d7dc6d2e498a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0a30aa63036a36b9e6704edd1283e309a7f61148e97580bf95fd966e4c0bdd957b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1ca8203e880a0bb27fa4bf651d3365b7471c84747c14b554ce5733601e0016d25e95d54744d05889042de0b191f8011f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0424649094b168d78ead4a1674d0838143209716218ec61e6a26200a5d3700451a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x59e04ec6c9b808a7bc7d301d0597e0c0b8995318ef18a3b80fa1e7790ba35861",
+        "lastblockhash" : "0x4f2173da2cb13b76a94cff2ffa3e33ed8591b24e851d9528429c57de3583a09b",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest152BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest152BC.json
index 0b9c8e8b6..41f2db044 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest152BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest152BC.json
@@ -2,8 +2,8 @@
     "randomStatetest152BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest152BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest152BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xcd72",
-                    "hash" : "0xe1de8ae020d3256c66cee1bfbf2e9796c9bea4c65f7e318fd7952e6d9f91b33b",
-                    "mixHash" : "0x3d65fd4004bc075aabd53ad235d44184063a232a18692e5f5df60a2fa333a5fa",
-                    "nonce" : "0x5f9351bab5c81bbc",
+                    "hash" : "0x4c916a429462c6c05a3226df3b97f17e550c4a93e17d4b5acddfb3866d759115",
+                    "mixHash" : "0x0b22a1607c30d7fc08428cb738f58052b28d4be949e4a7c0a9759c576971952f",
+                    "nonce" : "0xc8ba830efc35cdd2",
                     "number" : "0x01",
                     "parentHash" : "0x7fd54db624de03dd9a042e5e94a41d444a2c9b9220448e6f43d83b0454566f60",
                     "receiptTrie" : "0x91389f81eb3d8e6f10d9a2854c7ceb1c84f52989124c7e13b2a86631a4723dd1",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x0700400ec5ed6f8463a0d339a4201a08e9b6b2060063b466b47059442537b5f5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902fbf901fca07fd54db624de03dd9a042e5e94a41d444a2c9b9220448e6f43d83b0454566f60a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ae0f626931a9894ce0f50f3cc6134789a12748392f097e90c92b1145d5239c9fa00700400ec5ed6f8463a0d339a4201a08e9b6b2060063b466b47059442537b5f5a091389f81eb3d8e6f10d9a2854c7ceb1c84f52989124c7e13b2a86631a4723dd1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cd728203e880a03d65fd4004bc075aabd53ad235d44184063a232a18692e5f5df60a2fa333a5fa885f9351bab5c81bbcf8f9f8f78001840b0a48e494095e7baea6a6c7c4c2dfeb977efac326af552d87842c94b555b8917f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c35041407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c35052594252591752611790801ca0866ef0628f52a8cc9cc89ad1a7929686a9e86eb1dc9dfbdd8483a2ee69d7fb24a0629b3903c658ca620844f7c8103d8b27704e9568972561f134b0b9ccb58f4493c0",
+                "rlp" : "0xf902fbf901fca07fd54db624de03dd9a042e5e94a41d444a2c9b9220448e6f43d83b0454566f60a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ae0f626931a9894ce0f50f3cc6134789a12748392f097e90c92b1145d5239c9fa00700400ec5ed6f8463a0d339a4201a08e9b6b2060063b466b47059442537b5f5a091389f81eb3d8e6f10d9a2854c7ceb1c84f52989124c7e13b2a86631a4723dd1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cd728203e880a00b22a1607c30d7fc08428cb738f58052b28d4be949e4a7c0a9759c576971952f88c8ba830efc35cdd2f8f9f8f78001840b0a48e494095e7baea6a6c7c4c2dfeb977efac326af552d87842c94b555b8917f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c35041407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c35052594252591752611790801ca0866ef0628f52a8cc9cc89ad1a7929686a9e86eb1dc9dfbdd8483a2ee69d7fb24a0629b3903c658ca620844f7c8103d8b27704e9568972561f134b0b9ccb58f4493c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c35041407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3505259425259175261179080",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f0f48856b2ba8543fbf753c3987fb0ff7c39750307ee86542f38d0870806861da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe1de8ae020d3256c66cee1bfbf2e9796c9bea4c65f7e318fd7952e6d9f91b33b",
+        "lastblockhash" : "0x4c916a429462c6c05a3226df3b97f17e550c4a93e17d4b5acddfb3866d759115",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest152BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest152BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest152BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xd07e",
-                    "hash" : "0xd0adbe10bab72e166b9546589fd7fd6a9593c53a5001ae2c4f8a42e584a424e4",
-                    "mixHash" : "0x034d89057ebb398b75ad7fee6fa0f574d6d467224c70e6c2d8303f08aabb03e1",
-                    "nonce" : "0x7e7d4c374a12a3e9",
+                    "hash" : "0xad556e823d68b1ed5f6f93fcf5bc7294f99f0ebb45c6ccc89e4a5d5950a5b6c2",
+                    "mixHash" : "0x60994850e3585b169ea7e93e75dd6b769cf780e8c3fe4b302c23769821805eeb",
+                    "nonce" : "0x14215aff8eaa7298",
                     "number" : "0x01",
                     "parentHash" : "0x7fd54db624de03dd9a042e5e94a41d444a2c9b9220448e6f43d83b0454566f60",
                     "receiptTrie" : "0x0ceacd5c4465b661157b6add02525c12fe2317d5ce966dde64dd98670f3daaae",
-                    "stateRoot" : "0x04747b5d551e228d375bf2b52755729544cf52be007fae69d005d838c7ae15a4",
+                    "stateRoot" : "0x08a65c1cee6f75baa26f8f33b5d5b88ce7d3d5bc8d93cde4989a0dc46b295a87",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0700400ec5ed6f8463a0d339a4201a08e9b6b2060063b466b47059442537b5f5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902fbf901fca07fd54db624de03dd9a042e5e94a41d444a2c9b9220448e6f43d83b0454566f60a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a004747b5d551e228d375bf2b52755729544cf52be007fae69d005d838c7ae15a4a00700400ec5ed6f8463a0d339a4201a08e9b6b2060063b466b47059442537b5f5a00ceacd5c4465b661157b6add02525c12fe2317d5ce966dde64dd98670f3daaaeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82d07e8203e880a0034d89057ebb398b75ad7fee6fa0f574d6d467224c70e6c2d8303f08aabb03e1887e7d4c374a12a3e9f8f9f8f78001840b0a48e494095e7baea6a6c7c4c2dfeb977efac326af552d87842c94b555b8917f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c35041407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c35052594252591752611790801ca0866ef0628f52a8cc9cc89ad1a7929686a9e86eb1dc9dfbdd8483a2ee69d7fb24a0629b3903c658ca620844f7c8103d8b27704e9568972561f134b0b9ccb58f4493c0",
+                "rlp" : "0xf902fbf901fca07fd54db624de03dd9a042e5e94a41d444a2c9b9220448e6f43d83b0454566f60a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a008a65c1cee6f75baa26f8f33b5d5b88ce7d3d5bc8d93cde4989a0dc46b295a87a00700400ec5ed6f8463a0d339a4201a08e9b6b2060063b466b47059442537b5f5a00ceacd5c4465b661157b6add02525c12fe2317d5ce966dde64dd98670f3daaaeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82d07e8203e880a060994850e3585b169ea7e93e75dd6b769cf780e8c3fe4b302c23769821805eeb8814215aff8eaa7298f8f9f8f78001840b0a48e494095e7baea6a6c7c4c2dfeb977efac326af552d87842c94b555b8917f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c35041407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c35052594252591752611790801ca0866ef0628f52a8cc9cc89ad1a7929686a9e86eb1dc9dfbdd8483a2ee69d7fb24a0629b3903c658ca620844f7c8103d8b27704e9568972561f134b0b9ccb58f4493c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c35041407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3505259425259175261179080",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f0f48856b2ba8543fbf753c3987fb0ff7c39750307ee86542f38d0870806861da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd0adbe10bab72e166b9546589fd7fd6a9593c53a5001ae2c4f8a42e584a424e4",
+        "lastblockhash" : "0xad556e823d68b1ed5f6f93fcf5bc7294f99f0ebb45c6ccc89e4a5d5950a5b6c2",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x2c94b555",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c35041407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350525942525917526117908060005155",
@@ -235,8 +228,8 @@
     "randomStatetest152BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest152BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest152BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xcd72",
-                    "hash" : "0x3391ec1830423213da24e9955d0bec6cf31d36bd867927b92d9e4ca54ffe4663",
-                    "mixHash" : "0x00b1af0df529966bd7bcbef3bc515158cbabca6bacbff008cd71c58f586462cc",
-                    "nonce" : "0x8b078f5a84763b28",
+                    "hash" : "0x84cd6c234bbff086d119cf03a1f482c94ddfc602220e6e106fc563706b89ed05",
+                    "mixHash" : "0xf5e1b28452ca4ef33f123f8401adb6e1fc62cf8c53001dc8ff7dbf52d524fc6c",
+                    "nonce" : "0x38def25f4f246dd6",
                     "number" : "0x01",
                     "parentHash" : "0x7fd54db624de03dd9a042e5e94a41d444a2c9b9220448e6f43d83b0454566f60",
                     "receiptTrie" : "0x1bfc42c55c657b2257999d58914a8250ec1b191d9749cb0685128e2a47ebc884",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0x0700400ec5ed6f8463a0d339a4201a08e9b6b2060063b466b47059442537b5f5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902fbf901fca07fd54db624de03dd9a042e5e94a41d444a2c9b9220448e6f43d83b0454566f60a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a068381d0bb79b41a4c7da81f4593b52f72bd437e180b63c520a54f5e0d76c8f32a00700400ec5ed6f8463a0d339a4201a08e9b6b2060063b466b47059442537b5f5a01bfc42c55c657b2257999d58914a8250ec1b191d9749cb0685128e2a47ebc884b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cd728203e880a000b1af0df529966bd7bcbef3bc515158cbabca6bacbff008cd71c58f586462cc888b078f5a84763b28f8f9f8f78001840b0a48e494095e7baea6a6c7c4c2dfeb977efac326af552d87842c94b555b8917f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c35041407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c35052594252591752611790801ca0866ef0628f52a8cc9cc89ad1a7929686a9e86eb1dc9dfbdd8483a2ee69d7fb24a0629b3903c658ca620844f7c8103d8b27704e9568972561f134b0b9ccb58f4493c0",
+                "rlp" : "0xf902fbf901fca07fd54db624de03dd9a042e5e94a41d444a2c9b9220448e6f43d83b0454566f60a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a068381d0bb79b41a4c7da81f4593b52f72bd437e180b63c520a54f5e0d76c8f32a00700400ec5ed6f8463a0d339a4201a08e9b6b2060063b466b47059442537b5f5a01bfc42c55c657b2257999d58914a8250ec1b191d9749cb0685128e2a47ebc884b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cd728203e880a0f5e1b28452ca4ef33f123f8401adb6e1fc62cf8c53001dc8ff7dbf52d524fc6c8838def25f4f246dd6f8f9f8f78001840b0a48e494095e7baea6a6c7c4c2dfeb977efac326af552d87842c94b555b8917f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c35041407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c35052594252591752611790801ca0866ef0628f52a8cc9cc89ad1a7929686a9e86eb1dc9dfbdd8483a2ee69d7fb24a0629b3903c658ca620844f7c8103d8b27704e9568972561f134b0b9ccb58f4493c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c35041407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3505259425259175261179080",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f0f48856b2ba8543fbf753c3987fb0ff7c39750307ee86542f38d0870806861da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3391ec1830423213da24e9955d0bec6cf31d36bd867927b92d9e4ca54ffe4663",
+        "lastblockhash" : "0x84cd6c234bbff086d119cf03a1f482c94ddfc602220e6e106fc563706b89ed05",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest152BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest152BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest152BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xcd72",
-                    "hash" : "0x2e3e9d4c4bf4e1ebc7fd1487cf3c5cecd15474294fd9a23023c764605a1a43ea",
-                    "mixHash" : "0x0099f4ffb5174a247397625c6e6c85d1db068351c9b92cac5eefa762d414cde2",
-                    "nonce" : "0x8cf93c227ac402d6",
+                    "hash" : "0xe5246851b098e271ec2a7f1c7a2b9fea0afe6bac713649908e8b1dd1e3011154",
+                    "mixHash" : "0x9e82e3408fe31078002aa5381cd45cdb2d991e4a9707aed0b4113ce368154c4e",
+                    "nonce" : "0x293d3fbf007a7fd1",
                     "number" : "0x01",
                     "parentHash" : "0x7fd54db624de03dd9a042e5e94a41d444a2c9b9220448e6f43d83b0454566f60",
                     "receiptTrie" : "0x1bfc42c55c657b2257999d58914a8250ec1b191d9749cb0685128e2a47ebc884",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0x0700400ec5ed6f8463a0d339a4201a08e9b6b2060063b466b47059442537b5f5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902fbf901fca07fd54db624de03dd9a042e5e94a41d444a2c9b9220448e6f43d83b0454566f60a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a068381d0bb79b41a4c7da81f4593b52f72bd437e180b63c520a54f5e0d76c8f32a00700400ec5ed6f8463a0d339a4201a08e9b6b2060063b466b47059442537b5f5a01bfc42c55c657b2257999d58914a8250ec1b191d9749cb0685128e2a47ebc884b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cd728203e880a00099f4ffb5174a247397625c6e6c85d1db068351c9b92cac5eefa762d414cde2888cf93c227ac402d6f8f9f8f78001840b0a48e494095e7baea6a6c7c4c2dfeb977efac326af552d87842c94b555b8917f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c35041407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c35052594252591752611790801ca0866ef0628f52a8cc9cc89ad1a7929686a9e86eb1dc9dfbdd8483a2ee69d7fb24a0629b3903c658ca620844f7c8103d8b27704e9568972561f134b0b9ccb58f4493c0",
+                "rlp" : "0xf902fbf901fca07fd54db624de03dd9a042e5e94a41d444a2c9b9220448e6f43d83b0454566f60a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a068381d0bb79b41a4c7da81f4593b52f72bd437e180b63c520a54f5e0d76c8f32a00700400ec5ed6f8463a0d339a4201a08e9b6b2060063b466b47059442537b5f5a01bfc42c55c657b2257999d58914a8250ec1b191d9749cb0685128e2a47ebc884b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cd728203e880a09e82e3408fe31078002aa5381cd45cdb2d991e4a9707aed0b4113ce368154c4e88293d3fbf007a7fd1f8f9f8f78001840b0a48e494095e7baea6a6c7c4c2dfeb977efac326af552d87842c94b555b8917f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c35041407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c35052594252591752611790801ca0866ef0628f52a8cc9cc89ad1a7929686a9e86eb1dc9dfbdd8483a2ee69d7fb24a0629b3903c658ca620844f7c8103d8b27704e9568972561f134b0b9ccb58f4493c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c35041407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3505259425259175261179080",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f0f48856b2ba8543fbf753c3987fb0ff7c39750307ee86542f38d0870806861da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2e3e9d4c4bf4e1ebc7fd1487cf3c5cecd15474294fd9a23023c764605a1a43ea",
+        "lastblockhash" : "0xe5246851b098e271ec2a7f1c7a2b9fea0afe6bac713649908e8b1dd1e3011154",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest152BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest152BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest152BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xcd72",
-                    "hash" : "0xd0a2ad12c06fce5daf776db3b0ff86809575b34f895eb5096c106ac0fabb1689",
-                    "mixHash" : "0xfe7071aedeb5101b44ca9515ad1e1101b8ff8aafc24af98a68b7419d7ce511ea",
-                    "nonce" : "0xaed6e71862a7948e",
+                    "hash" : "0xce3221387b0fe443cef39d1a73893b9756329f11299cea0622bfd5482ec399fb",
+                    "mixHash" : "0x9f1e70e11f52317afdde73213213bcd51a2d443d3e8259d97fe7f944bb6a9157",
+                    "nonce" : "0xaf7378a01b5599cb",
                     "number" : "0x01",
                     "parentHash" : "0x7fd54db624de03dd9a042e5e94a41d444a2c9b9220448e6f43d83b0454566f60",
                     "receiptTrie" : "0x1bfc42c55c657b2257999d58914a8250ec1b191d9749cb0685128e2a47ebc884",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0x0700400ec5ed6f8463a0d339a4201a08e9b6b2060063b466b47059442537b5f5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902fbf901fca07fd54db624de03dd9a042e5e94a41d444a2c9b9220448e6f43d83b0454566f60a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a068381d0bb79b41a4c7da81f4593b52f72bd437e180b63c520a54f5e0d76c8f32a00700400ec5ed6f8463a0d339a4201a08e9b6b2060063b466b47059442537b5f5a01bfc42c55c657b2257999d58914a8250ec1b191d9749cb0685128e2a47ebc884b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cd728203e880a0fe7071aedeb5101b44ca9515ad1e1101b8ff8aafc24af98a68b7419d7ce511ea88aed6e71862a7948ef8f9f8f78001840b0a48e494095e7baea6a6c7c4c2dfeb977efac326af552d87842c94b555b8917f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c35041407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c35052594252591752611790801ca0866ef0628f52a8cc9cc89ad1a7929686a9e86eb1dc9dfbdd8483a2ee69d7fb24a0629b3903c658ca620844f7c8103d8b27704e9568972561f134b0b9ccb58f4493c0",
+                "rlp" : "0xf902fbf901fca07fd54db624de03dd9a042e5e94a41d444a2c9b9220448e6f43d83b0454566f60a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a068381d0bb79b41a4c7da81f4593b52f72bd437e180b63c520a54f5e0d76c8f32a00700400ec5ed6f8463a0d339a4201a08e9b6b2060063b466b47059442537b5f5a01bfc42c55c657b2257999d58914a8250ec1b191d9749cb0685128e2a47ebc884b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cd728203e880a09f1e70e11f52317afdde73213213bcd51a2d443d3e8259d97fe7f944bb6a915788af7378a01b5599cbf8f9f8f78001840b0a48e494095e7baea6a6c7c4c2dfeb977efac326af552d87842c94b555b8917f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c35041407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c35052594252591752611790801ca0866ef0628f52a8cc9cc89ad1a7929686a9e86eb1dc9dfbdd8483a2ee69d7fb24a0629b3903c658ca620844f7c8103d8b27704e9568972561f134b0b9ccb58f4493c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c35041407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3505259425259175261179080",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f0f48856b2ba8543fbf753c3987fb0ff7c39750307ee86542f38d0870806861da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd0a2ad12c06fce5daf776db3b0ff86809575b34f895eb5096c106ac0fabb1689",
+        "lastblockhash" : "0xce3221387b0fe443cef39d1a73893b9756329f11299cea0622bfd5482ec399fb",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest152BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest152BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest152BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xcd72",
-                    "hash" : "0xc65b97502f61bb696ff0cae27ca92d81aed9215bf5cfe83e9c17e3e9e3f4208f",
-                    "mixHash" : "0x6beb3e489604cfe3c7475d1844a6290ac6742d883516684af367df5c1a49ded8",
-                    "nonce" : "0x57f65c79a97b9174",
+                    "hash" : "0x6e2557080ef11d9e122c1b699b397a84d6bce03aa926276c6557221ffb397a8f",
+                    "mixHash" : "0x08268b1dea92f470dbe7b0945b60ec0860dc4f3fb49d90ea20bbcac9619a7a45",
+                    "nonce" : "0xa23b8ead2786a371",
                     "number" : "0x01",
                     "parentHash" : "0x7fd54db624de03dd9a042e5e94a41d444a2c9b9220448e6f43d83b0454566f60",
                     "receiptTrie" : "0x1bfc42c55c657b2257999d58914a8250ec1b191d9749cb0685128e2a47ebc884",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0x0700400ec5ed6f8463a0d339a4201a08e9b6b2060063b466b47059442537b5f5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902fbf901fca07fd54db624de03dd9a042e5e94a41d444a2c9b9220448e6f43d83b0454566f60a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a068381d0bb79b41a4c7da81f4593b52f72bd437e180b63c520a54f5e0d76c8f32a00700400ec5ed6f8463a0d339a4201a08e9b6b2060063b466b47059442537b5f5a01bfc42c55c657b2257999d58914a8250ec1b191d9749cb0685128e2a47ebc884b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cd728203e880a06beb3e489604cfe3c7475d1844a6290ac6742d883516684af367df5c1a49ded88857f65c79a97b9174f8f9f8f78001840b0a48e494095e7baea6a6c7c4c2dfeb977efac326af552d87842c94b555b8917f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c35041407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c35052594252591752611790801ca0866ef0628f52a8cc9cc89ad1a7929686a9e86eb1dc9dfbdd8483a2ee69d7fb24a0629b3903c658ca620844f7c8103d8b27704e9568972561f134b0b9ccb58f4493c0",
+                "rlp" : "0xf902fbf901fca07fd54db624de03dd9a042e5e94a41d444a2c9b9220448e6f43d83b0454566f60a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a068381d0bb79b41a4c7da81f4593b52f72bd437e180b63c520a54f5e0d76c8f32a00700400ec5ed6f8463a0d339a4201a08e9b6b2060063b466b47059442537b5f5a01bfc42c55c657b2257999d58914a8250ec1b191d9749cb0685128e2a47ebc884b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cd728203e880a008268b1dea92f470dbe7b0945b60ec0860dc4f3fb49d90ea20bbcac9619a7a4588a23b8ead2786a371f8f9f8f78001840b0a48e494095e7baea6a6c7c4c2dfeb977efac326af552d87842c94b555b8917f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c35041407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c35052594252591752611790801ca0866ef0628f52a8cc9cc89ad1a7929686a9e86eb1dc9dfbdd8483a2ee69d7fb24a0629b3903c658ca620844f7c8103d8b27704e9568972561f134b0b9ccb58f4493c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c35041407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3505259425259175261179080",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f0f48856b2ba8543fbf753c3987fb0ff7c39750307ee86542f38d0870806861da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc65b97502f61bb696ff0cae27ca92d81aed9215bf5cfe83e9c17e3e9e3f4208f",
+        "lastblockhash" : "0x6e2557080ef11d9e122c1b699b397a84d6bce03aa926276c6557221ffb397a8f",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest165BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest165BC.json
index 9379996c5..27ee8d758 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest165BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest165BC.json
@@ -2,8 +2,8 @@
     "randomStatetest165BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest165BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest165BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa096",
-                    "hash" : "0x6344daaf01cb62bc67f9a2c80de6d363c26e6dbe8bd3b48aa81f03094850ec38",
-                    "mixHash" : "0xaee6c7036a20a871fc6c0be498855047fdbc3698261d43f968c90831d305551c",
-                    "nonce" : "0xfb74543912e33dcc",
+                    "hash" : "0x1a3c45320c6bbdc575c3c1e73f7e720eb956f2134844d307fe64cdb210231ed3",
+                    "mixHash" : "0xde6b9f9eed72898ef8fcab37950278ab83d040f3352d0ece4ede64d79da97cc5",
+                    "nonce" : "0xd6c2c2d4ef48a95f",
                     "number" : "0x01",
                     "parentHash" : "0x13bf683d485bdf6f6a9f05b2a1eb265efcbe497eb49e856cbc3531f7384613a1",
                     "receiptTrie" : "0x8a53e9ab087a9a9694f2b26a3cffce7b0c860614f89cc48d27b72b0cb3128c0a",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca013bf683d485bdf6f6a9f05b2a1eb265efcbe497eb49e856cbc3531f7384613a1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d0e46e807b1530bd1c9a708ad9a8785aff2c51e8bef445642b3b5835fe6140dea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa08a53e9ab087a9a9694f2b26a3cffce7b0c860614f89cc48d27b72b0cb3128c0ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0968203e880a0aee6c7036a20a871fc6c0be498855047fdbc3698261d43f968c90831d305551c88fb74543912e33dccf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca013bf683d485bdf6f6a9f05b2a1eb265efcbe497eb49e856cbc3531f7384613a1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d0e46e807b1530bd1c9a708ad9a8785aff2c51e8bef445642b3b5835fe6140dea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa08a53e9ab087a9a9694f2b26a3cffce7b0c860614f89cc48d27b72b0cb3128c0ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0968203e880a0de6b9f9eed72898ef8fcab37950278ab83d040f3352d0ece4ede64d79da97cc588d6c2c2d4ef48a95ff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00bd8f7d165aa36cc125b3869dcda2810559688cf488b759b26a19cc21f8bb667a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6344daaf01cb62bc67f9a2c80de6d363c26e6dbe8bd3b48aa81f03094850ec38",
+        "lastblockhash" : "0x1a3c45320c6bbdc575c3c1e73f7e720eb956f2134844d307fe64cdb210231ed3",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest165BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest165BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest165BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa3a2",
-                    "hash" : "0x16adf2b0a8c38908889a5e7ca4860313b840e3f964c023de1e5e1957583fef6f",
-                    "mixHash" : "0xfaab49303c3e9041e7e797e1a2ef861b30f1e338e8e5fe794c057e6ca3a9a034",
-                    "nonce" : "0x43363f9a859f0a8a",
+                    "hash" : "0x349fafe8da2a81a665940d5926777af6ce9437cddc7a6f280a1809c4040f3ec5",
+                    "mixHash" : "0x4022f599ea73d74694abcf83bcfd2dd852ed252ad52ffc57c0b56ed5ed1a715b",
+                    "nonce" : "0x3e1f68ffcb61930b",
                     "number" : "0x01",
                     "parentHash" : "0x13bf683d485bdf6f6a9f05b2a1eb265efcbe497eb49e856cbc3531f7384613a1",
                     "receiptTrie" : "0xf0e54a5f3c88a2e5f836165884b2c32945a0c1c8c94bd3cde7ea67bf5b5a67e9",
-                    "stateRoot" : "0xd5698a8fb38e7516fca413827f8ca35aac31b404d7d899856db22ae43fff0da9",
+                    "stateRoot" : "0xe0d30022c47390874c333e5ceb73ae7f92f3d2a41bbd39ae3c183f965aed0516",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca013bf683d485bdf6f6a9f05b2a1eb265efcbe497eb49e856cbc3531f7384613a1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d5698a8fb38e7516fca413827f8ca35aac31b404d7d899856db22ae43fff0da9a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f0e54a5f3c88a2e5f836165884b2c32945a0c1c8c94bd3cde7ea67bf5b5a67e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a3a28203e880a0faab49303c3e9041e7e797e1a2ef861b30f1e338e8e5fe794c057e6ca3a9a0348843363f9a859f0a8af865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca013bf683d485bdf6f6a9f05b2a1eb265efcbe497eb49e856cbc3531f7384613a1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e0d30022c47390874c333e5ceb73ae7f92f3d2a41bbd39ae3c183f965aed0516a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f0e54a5f3c88a2e5f836165884b2c32945a0c1c8c94bd3cde7ea67bf5b5a67e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a3a28203e880a04022f599ea73d74694abcf83bcfd2dd852ed252ad52ffc57c0b56ed5ed1a715b883e1f68ffcb61930bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00bd8f7d165aa36cc125b3869dcda2810559688cf488b759b26a19cc21f8bb667a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x16adf2b0a8c38908889a5e7ca4860313b840e3f964c023de1e5e1957583fef6f",
+        "lastblockhash" : "0x349fafe8da2a81a665940d5926777af6ce9437cddc7a6f280a1809c4040f3ec5",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x41404244444145085955",
@@ -235,8 +228,8 @@
     "randomStatetest165BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest165BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest165BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa096",
-                    "hash" : "0xad78d8593f212214de14182d3b3cd9e6c956fceba9b4157010bf3a6f33071805",
-                    "mixHash" : "0xbfe0d9126e04908e7724301b67ce0022d959a8a8774c89da951133b8c7590a08",
-                    "nonce" : "0xa81966ddcf4f5a6d",
+                    "hash" : "0x9a3934f32baf982644a6513997a5ab10b424e8e3be21f3b4a4d8b82fc3dbb8b5",
+                    "mixHash" : "0xb0a94a5f5a732cb74ac708a8f3cd0754d9ead4a93a17339d365e9a3b868a2b8f",
+                    "nonce" : "0x404148d302350dba",
                     "number" : "0x01",
                     "parentHash" : "0x13bf683d485bdf6f6a9f05b2a1eb265efcbe497eb49e856cbc3531f7384613a1",
                     "receiptTrie" : "0x6ccc516f303c05df12d0e144a0688c1fd11c43eb5d34cd175ade4395220866fb",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca013bf683d485bdf6f6a9f05b2a1eb265efcbe497eb49e856cbc3531f7384613a1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0df29e6e6b496fca129a61db3335a33fe9e8e398d2990004c3b9dd2b33bc03f0da0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06ccc516f303c05df12d0e144a0688c1fd11c43eb5d34cd175ade4395220866fbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0968203e880a0bfe0d9126e04908e7724301b67ce0022d959a8a8774c89da951133b8c7590a0888a81966ddcf4f5a6df865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca013bf683d485bdf6f6a9f05b2a1eb265efcbe497eb49e856cbc3531f7384613a1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0df29e6e6b496fca129a61db3335a33fe9e8e398d2990004c3b9dd2b33bc03f0da0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06ccc516f303c05df12d0e144a0688c1fd11c43eb5d34cd175ade4395220866fbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0968203e880a0b0a94a5f5a732cb74ac708a8f3cd0754d9ead4a93a17339d365e9a3b868a2b8f88404148d302350dbaf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00bd8f7d165aa36cc125b3869dcda2810559688cf488b759b26a19cc21f8bb667a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xad78d8593f212214de14182d3b3cd9e6c956fceba9b4157010bf3a6f33071805",
+        "lastblockhash" : "0x9a3934f32baf982644a6513997a5ab10b424e8e3be21f3b4a4d8b82fc3dbb8b5",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest165BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest165BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest165BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa096",
-                    "hash" : "0x5b6b005f761db51e66fc6fcec68b4ad0e0109c5a867b4647d5e26f646652af85",
-                    "mixHash" : "0x4ea8001193eb380b0107444c5f4ad0651ae5484dee2ece0ff4a2056f363e3d4f",
-                    "nonce" : "0x34a764b6191dc5d5",
+                    "hash" : "0x20b154b4e9bfe637779abb5fbcd08b2ae9432573e15935b4bec74b46c99f1a21",
+                    "mixHash" : "0x91d75222d5db20d8df06ab4260eb6df719e3f66ffcda99bb6de12867debae3b3",
+                    "nonce" : "0xf5e894705acbaee2",
                     "number" : "0x01",
                     "parentHash" : "0x13bf683d485bdf6f6a9f05b2a1eb265efcbe497eb49e856cbc3531f7384613a1",
                     "receiptTrie" : "0x6ccc516f303c05df12d0e144a0688c1fd11c43eb5d34cd175ade4395220866fb",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca013bf683d485bdf6f6a9f05b2a1eb265efcbe497eb49e856cbc3531f7384613a1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0df29e6e6b496fca129a61db3335a33fe9e8e398d2990004c3b9dd2b33bc03f0da0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06ccc516f303c05df12d0e144a0688c1fd11c43eb5d34cd175ade4395220866fbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0968203e880a04ea8001193eb380b0107444c5f4ad0651ae5484dee2ece0ff4a2056f363e3d4f8834a764b6191dc5d5f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca013bf683d485bdf6f6a9f05b2a1eb265efcbe497eb49e856cbc3531f7384613a1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0df29e6e6b496fca129a61db3335a33fe9e8e398d2990004c3b9dd2b33bc03f0da0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06ccc516f303c05df12d0e144a0688c1fd11c43eb5d34cd175ade4395220866fbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0968203e880a091d75222d5db20d8df06ab4260eb6df719e3f66ffcda99bb6de12867debae3b388f5e894705acbaee2f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00bd8f7d165aa36cc125b3869dcda2810559688cf488b759b26a19cc21f8bb667a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5b6b005f761db51e66fc6fcec68b4ad0e0109c5a867b4647d5e26f646652af85",
+        "lastblockhash" : "0x20b154b4e9bfe637779abb5fbcd08b2ae9432573e15935b4bec74b46c99f1a21",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest165BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest165BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest165BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa096",
-                    "hash" : "0xe144144eea419efc13eb4670dab220afb41256fdaeff86693e538d3001798728",
-                    "mixHash" : "0x117cd18b9d4a75419f5a7710b0c30bbbc472be158c6b231b7f617849a7b01430",
-                    "nonce" : "0x80c793bfa0c984d8",
+                    "hash" : "0xad1133882e6669d46cdf1697c5cf96e8a83cf467b80261cee9bb7604e0b0e7b1",
+                    "mixHash" : "0x900e9e245034828d0e52a9a7e236ed7669d6d27514acb68e5b63b86ed945b82c",
+                    "nonce" : "0xb795d999b869153c",
                     "number" : "0x01",
                     "parentHash" : "0x13bf683d485bdf6f6a9f05b2a1eb265efcbe497eb49e856cbc3531f7384613a1",
                     "receiptTrie" : "0x6ccc516f303c05df12d0e144a0688c1fd11c43eb5d34cd175ade4395220866fb",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca013bf683d485bdf6f6a9f05b2a1eb265efcbe497eb49e856cbc3531f7384613a1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0df29e6e6b496fca129a61db3335a33fe9e8e398d2990004c3b9dd2b33bc03f0da0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06ccc516f303c05df12d0e144a0688c1fd11c43eb5d34cd175ade4395220866fbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0968203e880a0117cd18b9d4a75419f5a7710b0c30bbbc472be158c6b231b7f617849a7b014308880c793bfa0c984d8f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca013bf683d485bdf6f6a9f05b2a1eb265efcbe497eb49e856cbc3531f7384613a1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0df29e6e6b496fca129a61db3335a33fe9e8e398d2990004c3b9dd2b33bc03f0da0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06ccc516f303c05df12d0e144a0688c1fd11c43eb5d34cd175ade4395220866fbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0968203e880a0900e9e245034828d0e52a9a7e236ed7669d6d27514acb68e5b63b86ed945b82c88b795d999b869153cf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00bd8f7d165aa36cc125b3869dcda2810559688cf488b759b26a19cc21f8bb667a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe144144eea419efc13eb4670dab220afb41256fdaeff86693e538d3001798728",
+        "lastblockhash" : "0xad1133882e6669d46cdf1697c5cf96e8a83cf467b80261cee9bb7604e0b0e7b1",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest165BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest165BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest165BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa096",
-                    "hash" : "0x0e69f16a0025f361b960edc0d0687d114a45ed616fdee6afd4dd046c345ba8a4",
-                    "mixHash" : "0x0a7ac515edeac4db5f9cdec05a3da9041db26d28cd25ddcd56c61ea05d1b9315",
-                    "nonce" : "0xd78fcb5632302ec0",
+                    "hash" : "0xd972f7fa90d02c92648dc00c0caf735ff5568f0b4da2f45568262bdaeaf47425",
+                    "mixHash" : "0x64f644bf2e74365921bd95bda45609df6ca90d2bed94b18338f402f61e8f87d5",
+                    "nonce" : "0xcb4d5aef8e6e01af",
                     "number" : "0x01",
                     "parentHash" : "0x13bf683d485bdf6f6a9f05b2a1eb265efcbe497eb49e856cbc3531f7384613a1",
                     "receiptTrie" : "0x6ccc516f303c05df12d0e144a0688c1fd11c43eb5d34cd175ade4395220866fb",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca013bf683d485bdf6f6a9f05b2a1eb265efcbe497eb49e856cbc3531f7384613a1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0df29e6e6b496fca129a61db3335a33fe9e8e398d2990004c3b9dd2b33bc03f0da0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06ccc516f303c05df12d0e144a0688c1fd11c43eb5d34cd175ade4395220866fbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0968203e880a00a7ac515edeac4db5f9cdec05a3da9041db26d28cd25ddcd56c61ea05d1b931588d78fcb5632302ec0f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca013bf683d485bdf6f6a9f05b2a1eb265efcbe497eb49e856cbc3531f7384613a1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0df29e6e6b496fca129a61db3335a33fe9e8e398d2990004c3b9dd2b33bc03f0da0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06ccc516f303c05df12d0e144a0688c1fd11c43eb5d34cd175ade4395220866fbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0968203e880a064f644bf2e74365921bd95bda45609df6ca90d2bed94b18338f402f61e8f87d588cb4d5aef8e6e01aff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00bd8f7d165aa36cc125b3869dcda2810559688cf488b759b26a19cc21f8bb667a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0e69f16a0025f361b960edc0d0687d114a45ed616fdee6afd4dd046c345ba8a4",
+        "lastblockhash" : "0xd972f7fa90d02c92648dc00c0caf735ff5568f0b4da2f45568262bdaeaf47425",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest168BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest168BC.json
index 1714cfea6..044600114 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest168BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest168BC.json
@@ -2,8 +2,8 @@
     "randomStatetest168BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest168BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest168BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc276",
-                    "hash" : "0x55682644ab9110696bb3ca6d5ec8ad4d6982da50d45a75ea15db209d0ac7c2f5",
-                    "mixHash" : "0xa90bad490a077d046731a2dc71714df96331c70d4a9508081ab159ccc10cd255",
-                    "nonce" : "0xdadfd8e51026968a",
+                    "hash" : "0xaa8a33e757cfd8d796d6ab786eada96715b7e9b6eaf05185bf5c363e0a170693",
+                    "mixHash" : "0xb99793700bc4aeb5f432001aca9fb004d253760fcc16831143f7f440a9af669e",
+                    "nonce" : "0x9455d7111b99f057",
                     "number" : "0x01",
                     "parentHash" : "0xe8cb50f87dc798fb2abdbcd7fda4f67e4e4839a6c6b21b7a0e49d457edbfb246",
                     "receiptTrie" : "0xb82ca983ab547a84a130968dd005d996f684e672cf5da887504a3628dc1577ac",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x764610bf3755bff76340101b9d68c7f1f6a9be56d613c166018c83c74bd69d97",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90301f901fca0e8cb50f87dc798fb2abdbcd7fda4f67e4e4839a6c6b21b7a0e49d457edbfb246a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0de810360a7f0c6ce501d231b94f4eac66439b949c60e0946d98883c1dfe2f058a0764610bf3755bff76340101b9d68c7f1f6a9be56d613c166018c83c74bd69d97a0b82ca983ab547a84a130968dd005d996f684e672cf5da887504a3628dc1577acb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c2768203e880a0a90bad490a077d046731a2dc71714df96331c70d4a9508081ab159ccc10cd25588dadfd8e51026968af8fff8fd8001843593cf7794095e7baea6a6c7c4c2dfeb977efac326af552d878412804f88b8977fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5b407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe067f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f618a8186756319140295026c0996871ca05379f7dea456f199a6ad99326acff4295c60356f56aa79faf75fbf6f44ac041ca05e01e7e7ed1b2b6d1386e4f613c57c18840a4db7a35b88811fff0946bd3fb467c0",
+                "rlp" : "0xf90301f901fca0e8cb50f87dc798fb2abdbcd7fda4f67e4e4839a6c6b21b7a0e49d457edbfb246a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0de810360a7f0c6ce501d231b94f4eac66439b949c60e0946d98883c1dfe2f058a0764610bf3755bff76340101b9d68c7f1f6a9be56d613c166018c83c74bd69d97a0b82ca983ab547a84a130968dd005d996f684e672cf5da887504a3628dc1577acb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c2768203e880a0b99793700bc4aeb5f432001aca9fb004d253760fcc16831143f7f440a9af669e889455d7111b99f057f8fff8fd8001843593cf7794095e7baea6a6c7c4c2dfeb977efac326af552d878412804f88b8977fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5b407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe067f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f618a8186756319140295026c0996871ca05379f7dea456f199a6ad99326acff4295c60356f56aa79faf75fbf6f44ac041ca05e01e7e7ed1b2b6d1386e4f613c57c18840a4db7a35b88811fff0946bd3fb467c0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5b407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe067f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f618a8186756319140295026c099687",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02ed16d9b02704b445ea785bddcf4177f81e28130164d5a1447d80f65bf3167a4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x55682644ab9110696bb3ca6d5ec8ad4d6982da50d45a75ea15db209d0ac7c2f5",
+        "lastblockhash" : "0xaa8a33e757cfd8d796d6ab786eada96715b7e9b6eaf05185bf5c363e0a170693",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest168BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest168BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest168BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc582",
-                    "hash" : "0x7bf0a95ab58dd05f597e6790a58ea9db168a54832617b279f7d87e4007f4e0d4",
-                    "mixHash" : "0x38f0e3d200183d254981f075167e9eb40f3707dd7fb4625a4abd9650ca4a0ece",
-                    "nonce" : "0x0fda63cff663be30",
+                    "hash" : "0x7d890b57b48ce0455ac69a22e0b613f1d16123ed230fa30ff300632b18a3e72e",
+                    "mixHash" : "0xb4ed8aa441913c959ba2a663d0b0a5aa0b93f1e03dfdb6a91195326b97687686",
+                    "nonce" : "0x238509897b5b4bfb",
                     "number" : "0x01",
                     "parentHash" : "0xe8cb50f87dc798fb2abdbcd7fda4f67e4e4839a6c6b21b7a0e49d457edbfb246",
                     "receiptTrie" : "0xff4c1e875df3ab8d634c4ecc3304b902ef7f013c49f139d3bb17524b11d3ecff",
-                    "stateRoot" : "0x1c49b4653dbe2f330398ff9fa1e85afba30678455ebbb691a2cc6698bd8644f3",
+                    "stateRoot" : "0x5f831995cf08850076a70cbc6eb7acd5eac5080b4de6d92ff41f5bb1a88c22b7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x764610bf3755bff76340101b9d68c7f1f6a9be56d613c166018c83c74bd69d97",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90301f901fca0e8cb50f87dc798fb2abdbcd7fda4f67e4e4839a6c6b21b7a0e49d457edbfb246a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01c49b4653dbe2f330398ff9fa1e85afba30678455ebbb691a2cc6698bd8644f3a0764610bf3755bff76340101b9d68c7f1f6a9be56d613c166018c83c74bd69d97a0ff4c1e875df3ab8d634c4ecc3304b902ef7f013c49f139d3bb17524b11d3ecffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c5828203e880a038f0e3d200183d254981f075167e9eb40f3707dd7fb4625a4abd9650ca4a0ece880fda63cff663be30f8fff8fd8001843593cf7794095e7baea6a6c7c4c2dfeb977efac326af552d878412804f88b8977fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5b407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe067f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f618a8186756319140295026c0996871ca05379f7dea456f199a6ad99326acff4295c60356f56aa79faf75fbf6f44ac041ca05e01e7e7ed1b2b6d1386e4f613c57c18840a4db7a35b88811fff0946bd3fb467c0",
+                "rlp" : "0xf90301f901fca0e8cb50f87dc798fb2abdbcd7fda4f67e4e4839a6c6b21b7a0e49d457edbfb246a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05f831995cf08850076a70cbc6eb7acd5eac5080b4de6d92ff41f5bb1a88c22b7a0764610bf3755bff76340101b9d68c7f1f6a9be56d613c166018c83c74bd69d97a0ff4c1e875df3ab8d634c4ecc3304b902ef7f013c49f139d3bb17524b11d3ecffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c5828203e880a0b4ed8aa441913c959ba2a663d0b0a5aa0b93f1e03dfdb6a91195326b9768768688238509897b5b4bfbf8fff8fd8001843593cf7794095e7baea6a6c7c4c2dfeb977efac326af552d878412804f88b8977fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5b407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe067f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f618a8186756319140295026c0996871ca05379f7dea456f199a6ad99326acff4295c60356f56aa79faf75fbf6f44ac041ca05e01e7e7ed1b2b6d1386e4f613c57c18840a4db7a35b88811fff0946bd3fb467c0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5b407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe067f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f618a8186756319140295026c099687",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02ed16d9b02704b445ea785bddcf4177f81e28130164d5a1447d80f65bf3167a4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7bf0a95ab58dd05f597e6790a58ea9db168a54832617b279f7d87e4007f4e0d4",
+        "lastblockhash" : "0x7d890b57b48ce0455ac69a22e0b613f1d16123ed230fa30ff300632b18a3e72e",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x12804f88",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5b407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe067f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f618a8186756319140295026c0996875560005155",
@@ -235,8 +228,8 @@
     "randomStatetest168BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest168BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest168BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc276",
-                    "hash" : "0xcf0e5a047dd4d94569438b22c0ba509f35a148f74bfd0b1d8a747270c6dfd50c",
-                    "mixHash" : "0x420f4ec34d2aa41030aa293d1c610c3f04d08a7949672dec1b7e147e12773a7a",
-                    "nonce" : "0x79b13480e5df537c",
+                    "hash" : "0x8d56a7a1f949b156049a95cd3dcaa4423deb9164e160d1e846ba38a4ecbd7d85",
+                    "mixHash" : "0x8cee81a4aed424af9f9a0f6e252c4a687b2484b47af53442370b4d41238f7453",
+                    "nonce" : "0x7e4207ff0df270c9",
                     "number" : "0x01",
                     "parentHash" : "0xe8cb50f87dc798fb2abdbcd7fda4f67e4e4839a6c6b21b7a0e49d457edbfb246",
                     "receiptTrie" : "0xec35cb5805abb74ecce48442437924a6f345e57b8b5565810721c3aeaec49c23",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0x764610bf3755bff76340101b9d68c7f1f6a9be56d613c166018c83c74bd69d97",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90301f901fca0e8cb50f87dc798fb2abdbcd7fda4f67e4e4839a6c6b21b7a0e49d457edbfb246a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03ab089c5f2514906d8034be3d5c1c3ca8ffbc7040c7e38b7f07f91e6bfbcd33ba0764610bf3755bff76340101b9d68c7f1f6a9be56d613c166018c83c74bd69d97a0ec35cb5805abb74ecce48442437924a6f345e57b8b5565810721c3aeaec49c23b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c2768203e880a0420f4ec34d2aa41030aa293d1c610c3f04d08a7949672dec1b7e147e12773a7a8879b13480e5df537cf8fff8fd8001843593cf7794095e7baea6a6c7c4c2dfeb977efac326af552d878412804f88b8977fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5b407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe067f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f618a8186756319140295026c0996871ca05379f7dea456f199a6ad99326acff4295c60356f56aa79faf75fbf6f44ac041ca05e01e7e7ed1b2b6d1386e4f613c57c18840a4db7a35b88811fff0946bd3fb467c0",
+                "rlp" : "0xf90301f901fca0e8cb50f87dc798fb2abdbcd7fda4f67e4e4839a6c6b21b7a0e49d457edbfb246a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03ab089c5f2514906d8034be3d5c1c3ca8ffbc7040c7e38b7f07f91e6bfbcd33ba0764610bf3755bff76340101b9d68c7f1f6a9be56d613c166018c83c74bd69d97a0ec35cb5805abb74ecce48442437924a6f345e57b8b5565810721c3aeaec49c23b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c2768203e880a08cee81a4aed424af9f9a0f6e252c4a687b2484b47af53442370b4d41238f7453887e4207ff0df270c9f8fff8fd8001843593cf7794095e7baea6a6c7c4c2dfeb977efac326af552d878412804f88b8977fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5b407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe067f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f618a8186756319140295026c0996871ca05379f7dea456f199a6ad99326acff4295c60356f56aa79faf75fbf6f44ac041ca05e01e7e7ed1b2b6d1386e4f613c57c18840a4db7a35b88811fff0946bd3fb467c0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5b407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe067f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f618a8186756319140295026c099687",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02ed16d9b02704b445ea785bddcf4177f81e28130164d5a1447d80f65bf3167a4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcf0e5a047dd4d94569438b22c0ba509f35a148f74bfd0b1d8a747270c6dfd50c",
+        "lastblockhash" : "0x8d56a7a1f949b156049a95cd3dcaa4423deb9164e160d1e846ba38a4ecbd7d85",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest168BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest168BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest168BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc276",
-                    "hash" : "0x43eda04cca691ca4063261664e74c55b0f15e9aed67e938c20f33e0133a8096e",
-                    "mixHash" : "0x55d1406c2ab61312ea4de3c08496aec0531fe21916ff7092ed62d7ba9eb4f34e",
-                    "nonce" : "0x9583dc10e0ab2ed7",
+                    "hash" : "0xe7417a08ccc00434647082532c7da1cc34899c1d04683aaf9ab0759531d526b1",
+                    "mixHash" : "0xc5785025026d4b021b61d71d08d64c02230cb4ab88cd578aaf6a62df0be28bc0",
+                    "nonce" : "0xfbea14a094a20b6c",
                     "number" : "0x01",
                     "parentHash" : "0xe8cb50f87dc798fb2abdbcd7fda4f67e4e4839a6c6b21b7a0e49d457edbfb246",
                     "receiptTrie" : "0xec35cb5805abb74ecce48442437924a6f345e57b8b5565810721c3aeaec49c23",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0x764610bf3755bff76340101b9d68c7f1f6a9be56d613c166018c83c74bd69d97",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90301f901fca0e8cb50f87dc798fb2abdbcd7fda4f67e4e4839a6c6b21b7a0e49d457edbfb246a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03ab089c5f2514906d8034be3d5c1c3ca8ffbc7040c7e38b7f07f91e6bfbcd33ba0764610bf3755bff76340101b9d68c7f1f6a9be56d613c166018c83c74bd69d97a0ec35cb5805abb74ecce48442437924a6f345e57b8b5565810721c3aeaec49c23b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c2768203e880a055d1406c2ab61312ea4de3c08496aec0531fe21916ff7092ed62d7ba9eb4f34e889583dc10e0ab2ed7f8fff8fd8001843593cf7794095e7baea6a6c7c4c2dfeb977efac326af552d878412804f88b8977fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5b407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe067f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f618a8186756319140295026c0996871ca05379f7dea456f199a6ad99326acff4295c60356f56aa79faf75fbf6f44ac041ca05e01e7e7ed1b2b6d1386e4f613c57c18840a4db7a35b88811fff0946bd3fb467c0",
+                "rlp" : "0xf90301f901fca0e8cb50f87dc798fb2abdbcd7fda4f67e4e4839a6c6b21b7a0e49d457edbfb246a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03ab089c5f2514906d8034be3d5c1c3ca8ffbc7040c7e38b7f07f91e6bfbcd33ba0764610bf3755bff76340101b9d68c7f1f6a9be56d613c166018c83c74bd69d97a0ec35cb5805abb74ecce48442437924a6f345e57b8b5565810721c3aeaec49c23b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c2768203e880a0c5785025026d4b021b61d71d08d64c02230cb4ab88cd578aaf6a62df0be28bc088fbea14a094a20b6cf8fff8fd8001843593cf7794095e7baea6a6c7c4c2dfeb977efac326af552d878412804f88b8977fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5b407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe067f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f618a8186756319140295026c0996871ca05379f7dea456f199a6ad99326acff4295c60356f56aa79faf75fbf6f44ac041ca05e01e7e7ed1b2b6d1386e4f613c57c18840a4db7a35b88811fff0946bd3fb467c0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5b407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe067f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f618a8186756319140295026c099687",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02ed16d9b02704b445ea785bddcf4177f81e28130164d5a1447d80f65bf3167a4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x43eda04cca691ca4063261664e74c55b0f15e9aed67e938c20f33e0133a8096e",
+        "lastblockhash" : "0xe7417a08ccc00434647082532c7da1cc34899c1d04683aaf9ab0759531d526b1",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest168BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest168BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest168BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc276",
-                    "hash" : "0x45892294436eb2c76fe5a8901c143be0f483207802498e3142666011e1bce7a3",
-                    "mixHash" : "0xf924a4630c590dad880739722af73dfa3a21f06bfaee46a290145c3c3a31d01e",
-                    "nonce" : "0x2783c98a101ae7f4",
+                    "hash" : "0x056ff397b140cc5e356bd23741ca801a77674cf55b64d3fba4a46c9989afa421",
+                    "mixHash" : "0xbe4b8a41d3dba7f6eb18c8d7b5555fd0050f02473a5a099a5344bf9f848db939",
+                    "nonce" : "0xe03ab4ce4cb3dd1d",
                     "number" : "0x01",
                     "parentHash" : "0xe8cb50f87dc798fb2abdbcd7fda4f67e4e4839a6c6b21b7a0e49d457edbfb246",
                     "receiptTrie" : "0xec35cb5805abb74ecce48442437924a6f345e57b8b5565810721c3aeaec49c23",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0x764610bf3755bff76340101b9d68c7f1f6a9be56d613c166018c83c74bd69d97",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90301f901fca0e8cb50f87dc798fb2abdbcd7fda4f67e4e4839a6c6b21b7a0e49d457edbfb246a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03ab089c5f2514906d8034be3d5c1c3ca8ffbc7040c7e38b7f07f91e6bfbcd33ba0764610bf3755bff76340101b9d68c7f1f6a9be56d613c166018c83c74bd69d97a0ec35cb5805abb74ecce48442437924a6f345e57b8b5565810721c3aeaec49c23b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c2768203e880a0f924a4630c590dad880739722af73dfa3a21f06bfaee46a290145c3c3a31d01e882783c98a101ae7f4f8fff8fd8001843593cf7794095e7baea6a6c7c4c2dfeb977efac326af552d878412804f88b8977fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5b407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe067f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f618a8186756319140295026c0996871ca05379f7dea456f199a6ad99326acff4295c60356f56aa79faf75fbf6f44ac041ca05e01e7e7ed1b2b6d1386e4f613c57c18840a4db7a35b88811fff0946bd3fb467c0",
+                "rlp" : "0xf90301f901fca0e8cb50f87dc798fb2abdbcd7fda4f67e4e4839a6c6b21b7a0e49d457edbfb246a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03ab089c5f2514906d8034be3d5c1c3ca8ffbc7040c7e38b7f07f91e6bfbcd33ba0764610bf3755bff76340101b9d68c7f1f6a9be56d613c166018c83c74bd69d97a0ec35cb5805abb74ecce48442437924a6f345e57b8b5565810721c3aeaec49c23b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c2768203e880a0be4b8a41d3dba7f6eb18c8d7b5555fd0050f02473a5a099a5344bf9f848db93988e03ab4ce4cb3dd1df8fff8fd8001843593cf7794095e7baea6a6c7c4c2dfeb977efac326af552d878412804f88b8977fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5b407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe067f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f618a8186756319140295026c0996871ca05379f7dea456f199a6ad99326acff4295c60356f56aa79faf75fbf6f44ac041ca05e01e7e7ed1b2b6d1386e4f613c57c18840a4db7a35b88811fff0946bd3fb467c0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5b407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe067f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f618a8186756319140295026c099687",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02ed16d9b02704b445ea785bddcf4177f81e28130164d5a1447d80f65bf3167a4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x45892294436eb2c76fe5a8901c143be0f483207802498e3142666011e1bce7a3",
+        "lastblockhash" : "0x056ff397b140cc5e356bd23741ca801a77674cf55b64d3fba4a46c9989afa421",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest168BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest168BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest168BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc276",
-                    "hash" : "0xad33c7971e5228123332b9ae5071110f2c57ee4a53b3df62cbbc992b355b1088",
-                    "mixHash" : "0xc223a15539546d3accf7b78b8b8782d7a212d31ee5c5b9212a637f4ac746c417",
-                    "nonce" : "0xdab727d8790ea840",
+                    "hash" : "0xa03a81f4b9bb766f95fceace85ea9a66b26c88eb3489abadf9a8bca6c39dddc4",
+                    "mixHash" : "0x8c2e442c48b3cd091051b89c15072f65d6c6a9350326cb74349e576fe49990f1",
+                    "nonce" : "0xb7a59c319addd347",
                     "number" : "0x01",
                     "parentHash" : "0xe8cb50f87dc798fb2abdbcd7fda4f67e4e4839a6c6b21b7a0e49d457edbfb246",
                     "receiptTrie" : "0xec35cb5805abb74ecce48442437924a6f345e57b8b5565810721c3aeaec49c23",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0x764610bf3755bff76340101b9d68c7f1f6a9be56d613c166018c83c74bd69d97",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90301f901fca0e8cb50f87dc798fb2abdbcd7fda4f67e4e4839a6c6b21b7a0e49d457edbfb246a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03ab089c5f2514906d8034be3d5c1c3ca8ffbc7040c7e38b7f07f91e6bfbcd33ba0764610bf3755bff76340101b9d68c7f1f6a9be56d613c166018c83c74bd69d97a0ec35cb5805abb74ecce48442437924a6f345e57b8b5565810721c3aeaec49c23b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c2768203e880a0c223a15539546d3accf7b78b8b8782d7a212d31ee5c5b9212a637f4ac746c41788dab727d8790ea840f8fff8fd8001843593cf7794095e7baea6a6c7c4c2dfeb977efac326af552d878412804f88b8977fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5b407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe067f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f618a8186756319140295026c0996871ca05379f7dea456f199a6ad99326acff4295c60356f56aa79faf75fbf6f44ac041ca05e01e7e7ed1b2b6d1386e4f613c57c18840a4db7a35b88811fff0946bd3fb467c0",
+                "rlp" : "0xf90301f901fca0e8cb50f87dc798fb2abdbcd7fda4f67e4e4839a6c6b21b7a0e49d457edbfb246a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03ab089c5f2514906d8034be3d5c1c3ca8ffbc7040c7e38b7f07f91e6bfbcd33ba0764610bf3755bff76340101b9d68c7f1f6a9be56d613c166018c83c74bd69d97a0ec35cb5805abb74ecce48442437924a6f345e57b8b5565810721c3aeaec49c23b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c2768203e880a08c2e442c48b3cd091051b89c15072f65d6c6a9350326cb74349e576fe49990f188b7a59c319addd347f8fff8fd8001843593cf7794095e7baea6a6c7c4c2dfeb977efac326af552d878412804f88b8977fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5b407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe067f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f618a8186756319140295026c0996871ca05379f7dea456f199a6ad99326acff4295c60356f56aa79faf75fbf6f44ac041ca05e01e7e7ed1b2b6d1386e4f613c57c18840a4db7a35b88811fff0946bd3fb467c0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5b407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe067f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f618a8186756319140295026c099687",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02ed16d9b02704b445ea785bddcf4177f81e28130164d5a1447d80f65bf3167a4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xad33c7971e5228123332b9ae5071110f2c57ee4a53b3df62cbbc992b355b1088",
+        "lastblockhash" : "0xa03a81f4b9bb766f95fceace85ea9a66b26c88eb3489abadf9a8bca6c39dddc4",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest181BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest181BC.json
index 6473bb565..f80165741 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest181BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest181BC.json
@@ -2,8 +2,8 @@
     "randomStatetest181BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest181BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest181BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6e1a",
-                    "hash" : "0x7b0ce754df03714349e8c50c6b0fddb53c583cd0294b2a634eb3f19aea8ae24e",
-                    "mixHash" : "0x4ab4d893b9b55459533023e819be0d99fa1c7f483a07d97fe6dd5f3b74815517",
-                    "nonce" : "0x17329a166246f7e8",
+                    "hash" : "0xf4517aaf1a4687aa6d06b14356b8c078b297af3966f3240e4526b6ad54249623",
+                    "mixHash" : "0x4322051718f1485589d19ee5178cd35aa18063312aade53d2ca10e445deb3a2b",
+                    "nonce" : "0x9e0d41448fbbc4bd",
                     "number" : "0x01",
                     "parentHash" : "0xd6ab733f25bb421d672a0abbb9e237f87c36fb26528add6e17a9999d1540cd61",
                     "receiptTrie" : "0xa7bd2d41b78d6f233b2602650e308382d72284e341faf4d00c285eac68820d70",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x8948d1ab75c7dadb846e1d62c15d1684d2e86a2c043da7dee8d93761e7aa0d37",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90338f901fca0d6ab733f25bb421d672a0abbb9e237f87c36fb26528add6e17a9999d1540cd61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ffb21fe68ab7558c484533c8c6be121ebe59997440d7abd9e1f7040d309a40a0a08948d1ab75c7dadb846e1d62c15d1684d2e86a2c043da7dee8d93761e7aa0d37a0a7bd2d41b78d6f233b2602650e308382d72284e341faf4d00c285eac68820d70b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826e1a8203e880a04ab4d893b9b55459533023e819be0d99fa1c7f483a07d97fe6dd5f3b748155178817329a166246f7e8f90135f9013280018421fced6b94095e7baea6a6c7c4c2dfeb977efac326af552d87846e117e37b8cc7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000427f0000000000000000000000010000000000000000000000000000000000000000407f0000000000000000000000000000000000000000000000000000000000000001425359351ca0f9065e3a9a748cdc6962d6463dcf9d95bcf30822dbee8911059fd68cdd565713a00bec930530d56de55cb43aec50e265915325c4cd5afe09a33976a8fd3deb5d0ec0",
+                "rlp" : "0xf90338f901fca0d6ab733f25bb421d672a0abbb9e237f87c36fb26528add6e17a9999d1540cd61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ffb21fe68ab7558c484533c8c6be121ebe59997440d7abd9e1f7040d309a40a0a08948d1ab75c7dadb846e1d62c15d1684d2e86a2c043da7dee8d93761e7aa0d37a0a7bd2d41b78d6f233b2602650e308382d72284e341faf4d00c285eac68820d70b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826e1a8203e880a04322051718f1485589d19ee5178cd35aa18063312aade53d2ca10e445deb3a2b889e0d41448fbbc4bdf90135f9013280018421fced6b94095e7baea6a6c7c4c2dfeb977efac326af552d87846e117e37b8cc7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000427f0000000000000000000000010000000000000000000000000000000000000000407f0000000000000000000000000000000000000000000000000000000000000001425359351ca0f9065e3a9a748cdc6962d6463dcf9d95bcf30822dbee8911059fd68cdd565713a00bec930530d56de55cb43aec50e265915325c4cd5afe09a33976a8fd3deb5d0ec0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000427f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000000142535935",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08c2411f00dbd4336b3eab848ce4b281dea118490613f817189fb360d18cf63b5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7b0ce754df03714349e8c50c6b0fddb53c583cd0294b2a634eb3f19aea8ae24e",
+        "lastblockhash" : "0xf4517aaf1a4687aa6d06b14356b8c078b297af3966f3240e4526b6ad54249623",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest181BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest181BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest181BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x7126",
-                    "hash" : "0x28701461025f8c7b766a50b168ea773c24aca8d978599e10d6e6471ee0219c5e",
-                    "mixHash" : "0x32a788db5e194cb4bfa58770a3a9357722387f7fd859bb6034beb511df9ecccd",
-                    "nonce" : "0xe3dc7aeaca4a4da6",
+                    "hash" : "0xb3c3d58e15421373b90578b6dbfb41fceaca1fb410533b976f79c55fb44f0dcb",
+                    "mixHash" : "0xe91bc32be817f5f52d873c1a387aa5d470da215509ecb862b11e2f134ee358de",
+                    "nonce" : "0x234ef637ebbf2557",
                     "number" : "0x01",
                     "parentHash" : "0xd6ab733f25bb421d672a0abbb9e237f87c36fb26528add6e17a9999d1540cd61",
                     "receiptTrie" : "0x4ddd2ee410aa5b29130082da1564ed6f8252ed7231a23239ce75fb059f28c425",
-                    "stateRoot" : "0x3fea9304ebb44f6ffd7c77f53d9e7163243e8a4103e03c0a5f4ec7094c24eea6",
+                    "stateRoot" : "0x34ced7017b2a37f16b78edef1b4a0558f4185e9e59a2001695b8155b600f7d9e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8948d1ab75c7dadb846e1d62c15d1684d2e86a2c043da7dee8d93761e7aa0d37",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90338f901fca0d6ab733f25bb421d672a0abbb9e237f87c36fb26528add6e17a9999d1540cd61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03fea9304ebb44f6ffd7c77f53d9e7163243e8a4103e03c0a5f4ec7094c24eea6a08948d1ab75c7dadb846e1d62c15d1684d2e86a2c043da7dee8d93761e7aa0d37a04ddd2ee410aa5b29130082da1564ed6f8252ed7231a23239ce75fb059f28c425b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8271268203e880a032a788db5e194cb4bfa58770a3a9357722387f7fd859bb6034beb511df9ecccd88e3dc7aeaca4a4da6f90135f9013280018421fced6b94095e7baea6a6c7c4c2dfeb977efac326af552d87846e117e37b8cc7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000427f0000000000000000000000010000000000000000000000000000000000000000407f0000000000000000000000000000000000000000000000000000000000000001425359351ca0f9065e3a9a748cdc6962d6463dcf9d95bcf30822dbee8911059fd68cdd565713a00bec930530d56de55cb43aec50e265915325c4cd5afe09a33976a8fd3deb5d0ec0",
+                "rlp" : "0xf90338f901fca0d6ab733f25bb421d672a0abbb9e237f87c36fb26528add6e17a9999d1540cd61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a034ced7017b2a37f16b78edef1b4a0558f4185e9e59a2001695b8155b600f7d9ea08948d1ab75c7dadb846e1d62c15d1684d2e86a2c043da7dee8d93761e7aa0d37a04ddd2ee410aa5b29130082da1564ed6f8252ed7231a23239ce75fb059f28c425b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8271268203e880a0e91bc32be817f5f52d873c1a387aa5d470da215509ecb862b11e2f134ee358de88234ef637ebbf2557f90135f9013280018421fced6b94095e7baea6a6c7c4c2dfeb977efac326af552d87846e117e37b8cc7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000427f0000000000000000000000010000000000000000000000000000000000000000407f0000000000000000000000000000000000000000000000000000000000000001425359351ca0f9065e3a9a748cdc6962d6463dcf9d95bcf30822dbee8911059fd68cdd565713a00bec930530d56de55cb43aec50e265915325c4cd5afe09a33976a8fd3deb5d0ec0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000427f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000000142535935",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08c2411f00dbd4336b3eab848ce4b281dea118490613f817189fb360d18cf63b5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x28701461025f8c7b766a50b168ea773c24aca8d978599e10d6e6471ee0219c5e",
+        "lastblockhash" : "0xb3c3d58e15421373b90578b6dbfb41fceaca1fb410533b976f79c55fb44f0dcb",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x6e117e37",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000427f0000000000000000000000010000000000000000000000000000000000000000407f00000000000000000000000000000000000000000000000000000000000000014253593560005155",
@@ -233,8 +226,8 @@
     "randomStatetest181BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest181BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest181BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6e1a",
-                    "hash" : "0xd9bfcfc6b1394a10639d34123b6ca60e56705ac908b4289c469f24ea7ee37885",
-                    "mixHash" : "0x10d37a8d45513180c0dadc95765f8637912344fd5aef0f53d773297b733a4c59",
-                    "nonce" : "0xd187a2d7fd9fc3fa",
+                    "hash" : "0x458d03aa8b4783153269fd4d4f1f822a7240f8855065a07932e1a2f6b5119b13",
+                    "mixHash" : "0xdd1d283427556a90d21bfbc8db10aacbce912b366628d80f565e52c81c874e3b",
+                    "nonce" : "0x8f7872cf6f30bedc",
                     "number" : "0x01",
                     "parentHash" : "0xd6ab733f25bb421d672a0abbb9e237f87c36fb26528add6e17a9999d1540cd61",
                     "receiptTrie" : "0x8c2ed2ecd79e1970f632f1b630021cf985e45f07e259d3ac653e4e9ce049bddf",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0x8948d1ab75c7dadb846e1d62c15d1684d2e86a2c043da7dee8d93761e7aa0d37",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90338f901fca0d6ab733f25bb421d672a0abbb9e237f87c36fb26528add6e17a9999d1540cd61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05cc3ff751011d42550fd8cd34931932fbe16695b49296f0c94dd21cf5c11df23a08948d1ab75c7dadb846e1d62c15d1684d2e86a2c043da7dee8d93761e7aa0d37a08c2ed2ecd79e1970f632f1b630021cf985e45f07e259d3ac653e4e9ce049bddfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826e1a8203e880a010d37a8d45513180c0dadc95765f8637912344fd5aef0f53d773297b733a4c5988d187a2d7fd9fc3faf90135f9013280018421fced6b94095e7baea6a6c7c4c2dfeb977efac326af552d87846e117e37b8cc7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000427f0000000000000000000000010000000000000000000000000000000000000000407f0000000000000000000000000000000000000000000000000000000000000001425359351ca0f9065e3a9a748cdc6962d6463dcf9d95bcf30822dbee8911059fd68cdd565713a00bec930530d56de55cb43aec50e265915325c4cd5afe09a33976a8fd3deb5d0ec0",
+                "rlp" : "0xf90338f901fca0d6ab733f25bb421d672a0abbb9e237f87c36fb26528add6e17a9999d1540cd61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05cc3ff751011d42550fd8cd34931932fbe16695b49296f0c94dd21cf5c11df23a08948d1ab75c7dadb846e1d62c15d1684d2e86a2c043da7dee8d93761e7aa0d37a08c2ed2ecd79e1970f632f1b630021cf985e45f07e259d3ac653e4e9ce049bddfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826e1a8203e880a0dd1d283427556a90d21bfbc8db10aacbce912b366628d80f565e52c81c874e3b888f7872cf6f30bedcf90135f9013280018421fced6b94095e7baea6a6c7c4c2dfeb977efac326af552d87846e117e37b8cc7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000427f0000000000000000000000010000000000000000000000000000000000000000407f0000000000000000000000000000000000000000000000000000000000000001425359351ca0f9065e3a9a748cdc6962d6463dcf9d95bcf30822dbee8911059fd68cdd565713a00bec930530d56de55cb43aec50e265915325c4cd5afe09a33976a8fd3deb5d0ec0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000427f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000000142535935",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08c2411f00dbd4336b3eab848ce4b281dea118490613f817189fb360d18cf63b5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd9bfcfc6b1394a10639d34123b6ca60e56705ac908b4289c469f24ea7ee37885",
+        "lastblockhash" : "0x458d03aa8b4783153269fd4d4f1f822a7240f8855065a07932e1a2f6b5119b13",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest181BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest181BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest181BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6e1a",
-                    "hash" : "0x6439f528b72aa68359b3d177c054aa7d5ab8cbbf153b0c0e3354ccf78397c86d",
-                    "mixHash" : "0xba3cf7cbf7e6ba957b8078bc4c3883e63154d4f065e49dd448e3d9bc15817852",
-                    "nonce" : "0x15c8ae7ef9eebd1d",
+                    "hash" : "0xe5642671b3559ab297360de6659fcca6a682997adb305be7173c6bd6bb808718",
+                    "mixHash" : "0xf5cf746be7d47a99935a2acccb6d25b493625884fb147f2d304b71271da4a3ad",
+                    "nonce" : "0x0b120be70567522b",
                     "number" : "0x01",
                     "parentHash" : "0xd6ab733f25bb421d672a0abbb9e237f87c36fb26528add6e17a9999d1540cd61",
                     "receiptTrie" : "0x8c2ed2ecd79e1970f632f1b630021cf985e45f07e259d3ac653e4e9ce049bddf",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0x8948d1ab75c7dadb846e1d62c15d1684d2e86a2c043da7dee8d93761e7aa0d37",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90338f901fca0d6ab733f25bb421d672a0abbb9e237f87c36fb26528add6e17a9999d1540cd61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05cc3ff751011d42550fd8cd34931932fbe16695b49296f0c94dd21cf5c11df23a08948d1ab75c7dadb846e1d62c15d1684d2e86a2c043da7dee8d93761e7aa0d37a08c2ed2ecd79e1970f632f1b630021cf985e45f07e259d3ac653e4e9ce049bddfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826e1a8203e880a0ba3cf7cbf7e6ba957b8078bc4c3883e63154d4f065e49dd448e3d9bc158178528815c8ae7ef9eebd1df90135f9013280018421fced6b94095e7baea6a6c7c4c2dfeb977efac326af552d87846e117e37b8cc7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000427f0000000000000000000000010000000000000000000000000000000000000000407f0000000000000000000000000000000000000000000000000000000000000001425359351ca0f9065e3a9a748cdc6962d6463dcf9d95bcf30822dbee8911059fd68cdd565713a00bec930530d56de55cb43aec50e265915325c4cd5afe09a33976a8fd3deb5d0ec0",
+                "rlp" : "0xf90338f901fca0d6ab733f25bb421d672a0abbb9e237f87c36fb26528add6e17a9999d1540cd61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05cc3ff751011d42550fd8cd34931932fbe16695b49296f0c94dd21cf5c11df23a08948d1ab75c7dadb846e1d62c15d1684d2e86a2c043da7dee8d93761e7aa0d37a08c2ed2ecd79e1970f632f1b630021cf985e45f07e259d3ac653e4e9ce049bddfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826e1a8203e880a0f5cf746be7d47a99935a2acccb6d25b493625884fb147f2d304b71271da4a3ad880b120be70567522bf90135f9013280018421fced6b94095e7baea6a6c7c4c2dfeb977efac326af552d87846e117e37b8cc7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000427f0000000000000000000000010000000000000000000000000000000000000000407f0000000000000000000000000000000000000000000000000000000000000001425359351ca0f9065e3a9a748cdc6962d6463dcf9d95bcf30822dbee8911059fd68cdd565713a00bec930530d56de55cb43aec50e265915325c4cd5afe09a33976a8fd3deb5d0ec0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000427f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000000142535935",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08c2411f00dbd4336b3eab848ce4b281dea118490613f817189fb360d18cf63b5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6439f528b72aa68359b3d177c054aa7d5ab8cbbf153b0c0e3354ccf78397c86d",
+        "lastblockhash" : "0xe5642671b3559ab297360de6659fcca6a682997adb305be7173c6bd6bb808718",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest181BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest181BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest181BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6e1a",
-                    "hash" : "0xc5dda5d00da592c31fc128f43a452e254178383974c4bf41c2c57bb1629593bd",
-                    "mixHash" : "0x48a9e8f15cfb4f9993337be2bc4790afd57a0f2868d2b1dea802ebb1a015fbd4",
-                    "nonce" : "0x8f5d6630a1129329",
+                    "hash" : "0x9d7c5226bdbcb6684bb8f2f04573713f640fccec91bd78a867acff9e233a6cb1",
+                    "mixHash" : "0x9018070da094de4f63d959e404a51a2dbe49bd274138ac002e7155361beecb75",
+                    "nonce" : "0x4319bbe56d76bda9",
                     "number" : "0x01",
                     "parentHash" : "0xd6ab733f25bb421d672a0abbb9e237f87c36fb26528add6e17a9999d1540cd61",
                     "receiptTrie" : "0x8c2ed2ecd79e1970f632f1b630021cf985e45f07e259d3ac653e4e9ce049bddf",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0x8948d1ab75c7dadb846e1d62c15d1684d2e86a2c043da7dee8d93761e7aa0d37",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90338f901fca0d6ab733f25bb421d672a0abbb9e237f87c36fb26528add6e17a9999d1540cd61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05cc3ff751011d42550fd8cd34931932fbe16695b49296f0c94dd21cf5c11df23a08948d1ab75c7dadb846e1d62c15d1684d2e86a2c043da7dee8d93761e7aa0d37a08c2ed2ecd79e1970f632f1b630021cf985e45f07e259d3ac653e4e9ce049bddfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826e1a8203e880a048a9e8f15cfb4f9993337be2bc4790afd57a0f2868d2b1dea802ebb1a015fbd4888f5d6630a1129329f90135f9013280018421fced6b94095e7baea6a6c7c4c2dfeb977efac326af552d87846e117e37b8cc7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000427f0000000000000000000000010000000000000000000000000000000000000000407f0000000000000000000000000000000000000000000000000000000000000001425359351ca0f9065e3a9a748cdc6962d6463dcf9d95bcf30822dbee8911059fd68cdd565713a00bec930530d56de55cb43aec50e265915325c4cd5afe09a33976a8fd3deb5d0ec0",
+                "rlp" : "0xf90338f901fca0d6ab733f25bb421d672a0abbb9e237f87c36fb26528add6e17a9999d1540cd61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05cc3ff751011d42550fd8cd34931932fbe16695b49296f0c94dd21cf5c11df23a08948d1ab75c7dadb846e1d62c15d1684d2e86a2c043da7dee8d93761e7aa0d37a08c2ed2ecd79e1970f632f1b630021cf985e45f07e259d3ac653e4e9ce049bddfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826e1a8203e880a09018070da094de4f63d959e404a51a2dbe49bd274138ac002e7155361beecb75884319bbe56d76bda9f90135f9013280018421fced6b94095e7baea6a6c7c4c2dfeb977efac326af552d87846e117e37b8cc7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000427f0000000000000000000000010000000000000000000000000000000000000000407f0000000000000000000000000000000000000000000000000000000000000001425359351ca0f9065e3a9a748cdc6962d6463dcf9d95bcf30822dbee8911059fd68cdd565713a00bec930530d56de55cb43aec50e265915325c4cd5afe09a33976a8fd3deb5d0ec0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000427f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000000142535935",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08c2411f00dbd4336b3eab848ce4b281dea118490613f817189fb360d18cf63b5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc5dda5d00da592c31fc128f43a452e254178383974c4bf41c2c57bb1629593bd",
+        "lastblockhash" : "0x9d7c5226bdbcb6684bb8f2f04573713f640fccec91bd78a867acff9e233a6cb1",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest181BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest181BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest181BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6e1a",
-                    "hash" : "0xa2de49ba4c1601bc78a19ea8440f880cd49ca5ca76bfef04cdc1c18f41a0c908",
-                    "mixHash" : "0x8d396f51f983538a08b9413422aa49b31bd3c22a8d446610cffd65983a6ff427",
-                    "nonce" : "0x7a6261ba78178345",
+                    "hash" : "0x7cd6668e0f5a2cec3872594ad3becf8a0e459edbef3294fe826abf043658a115",
+                    "mixHash" : "0xfc4389b8f0df75d03759f73dcbfcee726a4e8f368fdd5e3d7a52624669b35004",
+                    "nonce" : "0x9b3678a56e442ae0",
                     "number" : "0x01",
                     "parentHash" : "0xd6ab733f25bb421d672a0abbb9e237f87c36fb26528add6e17a9999d1540cd61",
                     "receiptTrie" : "0x8c2ed2ecd79e1970f632f1b630021cf985e45f07e259d3ac653e4e9ce049bddf",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0x8948d1ab75c7dadb846e1d62c15d1684d2e86a2c043da7dee8d93761e7aa0d37",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90338f901fca0d6ab733f25bb421d672a0abbb9e237f87c36fb26528add6e17a9999d1540cd61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05cc3ff751011d42550fd8cd34931932fbe16695b49296f0c94dd21cf5c11df23a08948d1ab75c7dadb846e1d62c15d1684d2e86a2c043da7dee8d93761e7aa0d37a08c2ed2ecd79e1970f632f1b630021cf985e45f07e259d3ac653e4e9ce049bddfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826e1a8203e880a08d396f51f983538a08b9413422aa49b31bd3c22a8d446610cffd65983a6ff427887a6261ba78178345f90135f9013280018421fced6b94095e7baea6a6c7c4c2dfeb977efac326af552d87846e117e37b8cc7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000427f0000000000000000000000010000000000000000000000000000000000000000407f0000000000000000000000000000000000000000000000000000000000000001425359351ca0f9065e3a9a748cdc6962d6463dcf9d95bcf30822dbee8911059fd68cdd565713a00bec930530d56de55cb43aec50e265915325c4cd5afe09a33976a8fd3deb5d0ec0",
+                "rlp" : "0xf90338f901fca0d6ab733f25bb421d672a0abbb9e237f87c36fb26528add6e17a9999d1540cd61a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05cc3ff751011d42550fd8cd34931932fbe16695b49296f0c94dd21cf5c11df23a08948d1ab75c7dadb846e1d62c15d1684d2e86a2c043da7dee8d93761e7aa0d37a08c2ed2ecd79e1970f632f1b630021cf985e45f07e259d3ac653e4e9ce049bddfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826e1a8203e880a0fc4389b8f0df75d03759f73dcbfcee726a4e8f368fdd5e3d7a52624669b35004889b3678a56e442ae0f90135f9013280018421fced6b94095e7baea6a6c7c4c2dfeb977efac326af552d87846e117e37b8cc7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000427f0000000000000000000000010000000000000000000000000000000000000000407f0000000000000000000000000000000000000000000000000000000000000001425359351ca0f9065e3a9a748cdc6962d6463dcf9d95bcf30822dbee8911059fd68cdd565713a00bec930530d56de55cb43aec50e265915325c4cd5afe09a33976a8fd3deb5d0ec0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000427f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000000142535935",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08c2411f00dbd4336b3eab848ce4b281dea118490613f817189fb360d18cf63b5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa2de49ba4c1601bc78a19ea8440f880cd49ca5ca76bfef04cdc1c18f41a0c908",
+        "lastblockhash" : "0x7cd6668e0f5a2cec3872594ad3becf8a0e459edbef3294fe826abf043658a115",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest182BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest182BC.json
index 9f367c15d..07ccf5a1d 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest182BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest182BC.json
@@ -2,8 +2,8 @@
     "randomStatetest182BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest182BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest182BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x011e02",
-                    "hash" : "0x85608a5b5eb658fe49c2874defbe982347f187977c6bdb2002ed5f48e994c9f3",
-                    "mixHash" : "0xc28fd53a43f18be1a01e25af67a15673100c08b26d43bea19329ebf6fca7c61e",
-                    "nonce" : "0x68c015d26696ded5",
+                    "hash" : "0x2fb0d026ac8ec6a9689b866587fee8d4cf2b0532a525f37fc938d524b22a3f1f",
+                    "mixHash" : "0x8577f720d432a9a384370cc6b97222c2adbc866c647055019129a574b9dd63bd",
+                    "nonce" : "0xa77653f6bb5c3d3c",
                     "number" : "0x01",
                     "parentHash" : "0xb59ce1dc7c55555112a204fcbf83163758de6a2720a02e110ef208e40f715114",
                     "receiptTrie" : "0xa2f2bc2ef6ce3531ff137644a93f644180742107cb31e83911a412a14561c3ea",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xa5ff33b83dfe82d6977d92b113aef1c202835d511e127a888583135356705b41",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9035af901fda0b59ce1dc7c55555112a204fcbf83163758de6a2720a02e110ef208e40f715114a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f8f475772644091df3846d25df9438994ffc48d1baadb9e4ec91a455d28f84eda0a5ff33b83dfe82d6977d92b113aef1c202835d511e127a888583135356705b41a0a2f2bc2ef6ce3531ff137644a93f644180742107cb31e83911a412a14561c3eab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011e028203e880a0c28fd53a43f18be1a01e25af67a15673100c08b26d43bea19329ebf6fca7c61e8868c015d26696ded5f90156f9015380018469e42f5494095e7baea6a6c7c4c2dfeb977efac326af552d8783df5aefb8ee7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe60600943608f1ca0e9626076f3b83833caee875fa068995f86340f51ad6afe37eeb7f0fcf2091fd7a01072f5edda8b7cfe2a3d5c44ebec6d8a1b9dd394e181fad8b3d08f63a2479491c0",
+                "rlp" : "0xf9035af901fda0b59ce1dc7c55555112a204fcbf83163758de6a2720a02e110ef208e40f715114a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f8f475772644091df3846d25df9438994ffc48d1baadb9e4ec91a455d28f84eda0a5ff33b83dfe82d6977d92b113aef1c202835d511e127a888583135356705b41a0a2f2bc2ef6ce3531ff137644a93f644180742107cb31e83911a412a14561c3eab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011e028203e880a08577f720d432a9a384370cc6b97222c2adbc866c647055019129a574b9dd63bd88a77653f6bb5c3d3cf90156f9015380018469e42f5494095e7baea6a6c7c4c2dfeb977efac326af552d8783df5aefb8ee7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe60600943608f1ca0e9626076f3b83833caee875fa068995f86340f51ad6afe37eeb7f0fcf2091fd7a01072f5edda8b7cfe2a3d5c44ebec6d8a1b9dd394e181fad8b3d08f63a2479491c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe60600943608f",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09f6ba990e3e3443873b26ef3c0538cac143ad357a5b962b30d37413384f02c73a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x85608a5b5eb658fe49c2874defbe982347f187977c6bdb2002ed5f48e994c9f3",
+        "lastblockhash" : "0x2fb0d026ac8ec6a9689b866587fee8d4cf2b0532a525f37fc938d524b22a3f1f",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -116,8 +116,8 @@
     "randomStatetest182BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest182BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest182BCFiller.json"
         },
         "blocks" : [
             {
@@ -128,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x01210e",
-                    "hash" : "0xfe39d9d1b996cf0e87a2e51a58239db4264dda5ab2e1d262aa8cc4f943555cc5",
-                    "mixHash" : "0x53b04ab06455f0283d39bd4a8621ae54303d448cd3688c3548c5d0ea6a5711fe",
-                    "nonce" : "0xf1afb8339b2532b4",
+                    "hash" : "0xfe5420e99375b406fc9cf8bdadb137f6f220b63320dfaf9231265624a0b4fc61",
+                    "mixHash" : "0x3eb34258dfdf18afc064f34465874441d08874c424580312aad9087852c701b6",
+                    "nonce" : "0x97a58391a7f5eb25",
                     "number" : "0x01",
                     "parentHash" : "0xb59ce1dc7c55555112a204fcbf83163758de6a2720a02e110ef208e40f715114",
                     "receiptTrie" : "0x948bc4413414a65b3451b5ea7d58d0d427fc6668cfbec1e230f3f5b2149d9e95",
-                    "stateRoot" : "0xcb95c57ca217efc96ce17e14da0eef64d84cff21eaf27de1456ef79dace183b4",
+                    "stateRoot" : "0x71e26d5b8fe55e51a5bdf1fbdcdaaf85e6c70755963d7c2ce471cd1a7aa0dfcc",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa5ff33b83dfe82d6977d92b113aef1c202835d511e127a888583135356705b41",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9035af901fda0b59ce1dc7c55555112a204fcbf83163758de6a2720a02e110ef208e40f715114a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cb95c57ca217efc96ce17e14da0eef64d84cff21eaf27de1456ef79dace183b4a0a5ff33b83dfe82d6977d92b113aef1c202835d511e127a888583135356705b41a0948bc4413414a65b3451b5ea7d58d0d427fc6668cfbec1e230f3f5b2149d9e95b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301210e8203e880a053b04ab06455f0283d39bd4a8621ae54303d448cd3688c3548c5d0ea6a5711fe88f1afb8339b2532b4f90156f9015380018469e42f5494095e7baea6a6c7c4c2dfeb977efac326af552d8783df5aefb8ee7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe60600943608f1ca0e9626076f3b83833caee875fa068995f86340f51ad6afe37eeb7f0fcf2091fd7a01072f5edda8b7cfe2a3d5c44ebec6d8a1b9dd394e181fad8b3d08f63a2479491c0",
+                "rlp" : "0xf9035af901fda0b59ce1dc7c55555112a204fcbf83163758de6a2720a02e110ef208e40f715114a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a071e26d5b8fe55e51a5bdf1fbdcdaaf85e6c70755963d7c2ce471cd1a7aa0dfcca0a5ff33b83dfe82d6977d92b113aef1c202835d511e127a888583135356705b41a0948bc4413414a65b3451b5ea7d58d0d427fc6668cfbec1e230f3f5b2149d9e95b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301210e8203e880a03eb34258dfdf18afc064f34465874441d08874c424580312aad9087852c701b68897a58391a7f5eb25f90156f9015380018469e42f5494095e7baea6a6c7c4c2dfeb977efac326af552d8783df5aefb8ee7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe60600943608f1ca0e9626076f3b83833caee875fa068995f86340f51ad6afe37eeb7f0fcf2091fd7a01072f5edda8b7cfe2a3d5c44ebec6d8a1b9dd394e181fad8b3d08f63a2479491c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe60600943608f",
@@ -176,16 +176,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09f6ba990e3e3443873b26ef3c0538cac143ad357a5b962b30d37413384f02c73a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfe39d9d1b996cf0e87a2e51a58239db4264dda5ab2e1d262aa8cc4f943555cc5",
+        "lastblockhash" : "0xfe5420e99375b406fc9cf8bdadb137f6f220b63320dfaf9231265624a0b4fc61",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0xdf5aef",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe60600943608f5560005155",
@@ -237,8 +230,8 @@
     "randomStatetest182BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest182BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest182BCFiller.json"
         },
         "blocks" : [
             {
@@ -249,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x011e02",
-                    "hash" : "0x56b5f41decfd03a1f9b5a5b103ebfeecda46c9924704bd6f9833b90b596c5915",
-                    "mixHash" : "0xb84f8db55579b570a4c9cff9d3debfc77a5abe6d23e59f2d2e44f79313e7299b",
-                    "nonce" : "0x5e5351390b339b0c",
+                    "hash" : "0xc3e52413e07fd97de1f420c31b9e86cea0f10dd5eb0aaae642513b754663312b",
+                    "mixHash" : "0x2051943bdc745e36fe461aaa47b65536ae9e1bff30bd463d0b9905ef7c793d7c",
+                    "nonce" : "0x636cadc6b22438f2",
                     "number" : "0x01",
                     "parentHash" : "0xb59ce1dc7c55555112a204fcbf83163758de6a2720a02e110ef208e40f715114",
                     "receiptTrie" : "0x53e6c8a423111be480d1fbe3c0cd62a57d4f09b48f1897d8ba36756f65402518",
@@ -260,7 +253,7 @@
                     "transactionsTrie" : "0xa5ff33b83dfe82d6977d92b113aef1c202835d511e127a888583135356705b41",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9035af901fda0b59ce1dc7c55555112a204fcbf83163758de6a2720a02e110ef208e40f715114a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a042af5124c57d871ea1975c8dde42b50206a2be8f3e93ef1ab2e8e4b1a5bde7fca0a5ff33b83dfe82d6977d92b113aef1c202835d511e127a888583135356705b41a053e6c8a423111be480d1fbe3c0cd62a57d4f09b48f1897d8ba36756f65402518b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011e028203e880a0b84f8db55579b570a4c9cff9d3debfc77a5abe6d23e59f2d2e44f79313e7299b885e5351390b339b0cf90156f9015380018469e42f5494095e7baea6a6c7c4c2dfeb977efac326af552d8783df5aefb8ee7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe60600943608f1ca0e9626076f3b83833caee875fa068995f86340f51ad6afe37eeb7f0fcf2091fd7a01072f5edda8b7cfe2a3d5c44ebec6d8a1b9dd394e181fad8b3d08f63a2479491c0",
+                "rlp" : "0xf9035af901fda0b59ce1dc7c55555112a204fcbf83163758de6a2720a02e110ef208e40f715114a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a042af5124c57d871ea1975c8dde42b50206a2be8f3e93ef1ab2e8e4b1a5bde7fca0a5ff33b83dfe82d6977d92b113aef1c202835d511e127a888583135356705b41a053e6c8a423111be480d1fbe3c0cd62a57d4f09b48f1897d8ba36756f65402518b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011e028203e880a02051943bdc745e36fe461aaa47b65536ae9e1bff30bd463d0b9905ef7c793d7c88636cadc6b22438f2f90156f9015380018469e42f5494095e7baea6a6c7c4c2dfeb977efac326af552d8783df5aefb8ee7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe60600943608f1ca0e9626076f3b83833caee875fa068995f86340f51ad6afe37eeb7f0fcf2091fd7a01072f5edda8b7cfe2a3d5c44ebec6d8a1b9dd394e181fad8b3d08f63a2479491c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe60600943608f",
@@ -297,7 +290,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09f6ba990e3e3443873b26ef3c0538cac143ad357a5b962b30d37413384f02c73a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x56b5f41decfd03a1f9b5a5b103ebfeecda46c9924704bd6f9833b90b596c5915",
+        "lastblockhash" : "0xc3e52413e07fd97de1f420c31b9e86cea0f10dd5eb0aaae642513b754663312b",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -351,8 +344,8 @@
     "randomStatetest182BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest182BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest182BCFiller.json"
         },
         "blocks" : [
             {
@@ -363,9 +356,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x011e02",
-                    "hash" : "0x8968b0cccbbec927bd722dec2f525bad1e132eb158d2aa8b8fd2ec4eedc4881e",
-                    "mixHash" : "0x2ce24374c396336ee302847d5c75cbcc03b85ee307c25fdad7f5044a7d5614af",
-                    "nonce" : "0xf45836cffcf5fb1c",
+                    "hash" : "0xb55e8c4182dd1a6208601ad07cb214ebe5ec8b1f2443097dbab198c2465c4e0a",
+                    "mixHash" : "0xc523609265713827055f910e89eea2e2d2a334138b95e92c7e7b7de4c5197fa8",
+                    "nonce" : "0xf6ba6b2646466210",
                     "number" : "0x01",
                     "parentHash" : "0xb59ce1dc7c55555112a204fcbf83163758de6a2720a02e110ef208e40f715114",
                     "receiptTrie" : "0x53e6c8a423111be480d1fbe3c0cd62a57d4f09b48f1897d8ba36756f65402518",
@@ -374,7 +367,7 @@
                     "transactionsTrie" : "0xa5ff33b83dfe82d6977d92b113aef1c202835d511e127a888583135356705b41",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9035af901fda0b59ce1dc7c55555112a204fcbf83163758de6a2720a02e110ef208e40f715114a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a042af5124c57d871ea1975c8dde42b50206a2be8f3e93ef1ab2e8e4b1a5bde7fca0a5ff33b83dfe82d6977d92b113aef1c202835d511e127a888583135356705b41a053e6c8a423111be480d1fbe3c0cd62a57d4f09b48f1897d8ba36756f65402518b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011e028203e880a02ce24374c396336ee302847d5c75cbcc03b85ee307c25fdad7f5044a7d5614af88f45836cffcf5fb1cf90156f9015380018469e42f5494095e7baea6a6c7c4c2dfeb977efac326af552d8783df5aefb8ee7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe60600943608f1ca0e9626076f3b83833caee875fa068995f86340f51ad6afe37eeb7f0fcf2091fd7a01072f5edda8b7cfe2a3d5c44ebec6d8a1b9dd394e181fad8b3d08f63a2479491c0",
+                "rlp" : "0xf9035af901fda0b59ce1dc7c55555112a204fcbf83163758de6a2720a02e110ef208e40f715114a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a042af5124c57d871ea1975c8dde42b50206a2be8f3e93ef1ab2e8e4b1a5bde7fca0a5ff33b83dfe82d6977d92b113aef1c202835d511e127a888583135356705b41a053e6c8a423111be480d1fbe3c0cd62a57d4f09b48f1897d8ba36756f65402518b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011e028203e880a0c523609265713827055f910e89eea2e2d2a334138b95e92c7e7b7de4c5197fa888f6ba6b2646466210f90156f9015380018469e42f5494095e7baea6a6c7c4c2dfeb977efac326af552d8783df5aefb8ee7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe60600943608f1ca0e9626076f3b83833caee875fa068995f86340f51ad6afe37eeb7f0fcf2091fd7a01072f5edda8b7cfe2a3d5c44ebec6d8a1b9dd394e181fad8b3d08f63a2479491c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe60600943608f",
@@ -411,7 +404,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09f6ba990e3e3443873b26ef3c0538cac143ad357a5b962b30d37413384f02c73a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8968b0cccbbec927bd722dec2f525bad1e132eb158d2aa8b8fd2ec4eedc4881e",
+        "lastblockhash" : "0xb55e8c4182dd1a6208601ad07cb214ebe5ec8b1f2443097dbab198c2465c4e0a",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -465,8 +458,8 @@
     "randomStatetest182BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest182BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest182BCFiller.json"
         },
         "blocks" : [
             {
@@ -477,9 +470,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x011e02",
-                    "hash" : "0xee5b6d943af094a0dfbf4172bddad7eaddef62b520d37ffe36a492fa7c0f63ab",
-                    "mixHash" : "0x03f635afcbf9e50d19163468a1f2b5ff71768ec7f1d00ca3f82e1d8246a3afcd",
-                    "nonce" : "0x3c2fd5b5738d8831",
+                    "hash" : "0x7b8e371c0e9ead9bb2dbd3f0b99527a0a71540450254128d742a2b797cea41fd",
+                    "mixHash" : "0x5fdf2596771032fc15b79bb0e703e5807016c7fab4719d3f0946ff22f7da0071",
+                    "nonce" : "0xfce44a2da1a37f3f",
                     "number" : "0x01",
                     "parentHash" : "0xb59ce1dc7c55555112a204fcbf83163758de6a2720a02e110ef208e40f715114",
                     "receiptTrie" : "0x53e6c8a423111be480d1fbe3c0cd62a57d4f09b48f1897d8ba36756f65402518",
@@ -488,7 +481,7 @@
                     "transactionsTrie" : "0xa5ff33b83dfe82d6977d92b113aef1c202835d511e127a888583135356705b41",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9035af901fda0b59ce1dc7c55555112a204fcbf83163758de6a2720a02e110ef208e40f715114a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a042af5124c57d871ea1975c8dde42b50206a2be8f3e93ef1ab2e8e4b1a5bde7fca0a5ff33b83dfe82d6977d92b113aef1c202835d511e127a888583135356705b41a053e6c8a423111be480d1fbe3c0cd62a57d4f09b48f1897d8ba36756f65402518b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011e028203e880a003f635afcbf9e50d19163468a1f2b5ff71768ec7f1d00ca3f82e1d8246a3afcd883c2fd5b5738d8831f90156f9015380018469e42f5494095e7baea6a6c7c4c2dfeb977efac326af552d8783df5aefb8ee7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe60600943608f1ca0e9626076f3b83833caee875fa068995f86340f51ad6afe37eeb7f0fcf2091fd7a01072f5edda8b7cfe2a3d5c44ebec6d8a1b9dd394e181fad8b3d08f63a2479491c0",
+                "rlp" : "0xf9035af901fda0b59ce1dc7c55555112a204fcbf83163758de6a2720a02e110ef208e40f715114a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a042af5124c57d871ea1975c8dde42b50206a2be8f3e93ef1ab2e8e4b1a5bde7fca0a5ff33b83dfe82d6977d92b113aef1c202835d511e127a888583135356705b41a053e6c8a423111be480d1fbe3c0cd62a57d4f09b48f1897d8ba36756f65402518b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011e028203e880a05fdf2596771032fc15b79bb0e703e5807016c7fab4719d3f0946ff22f7da007188fce44a2da1a37f3ff90156f9015380018469e42f5494095e7baea6a6c7c4c2dfeb977efac326af552d8783df5aefb8ee7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe60600943608f1ca0e9626076f3b83833caee875fa068995f86340f51ad6afe37eeb7f0fcf2091fd7a01072f5edda8b7cfe2a3d5c44ebec6d8a1b9dd394e181fad8b3d08f63a2479491c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe60600943608f",
@@ -525,7 +518,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09f6ba990e3e3443873b26ef3c0538cac143ad357a5b962b30d37413384f02c73a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xee5b6d943af094a0dfbf4172bddad7eaddef62b520d37ffe36a492fa7c0f63ab",
+        "lastblockhash" : "0x7b8e371c0e9ead9bb2dbd3f0b99527a0a71540450254128d742a2b797cea41fd",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -579,8 +572,8 @@
     "randomStatetest182BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest182BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest182BCFiller.json"
         },
         "blocks" : [
             {
@@ -591,9 +584,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x011e02",
-                    "hash" : "0x8ceace406fc1903964eae2399320fdb706e0a702dda327ecabed3cecce170e2d",
-                    "mixHash" : "0x9a28d17ef4f8e1e4b1012cd2c7cb49f58f0038f6f63052b07bcbc4f5570ab249",
-                    "nonce" : "0xc0699d1b89198c2a",
+                    "hash" : "0xcc15e0771d3f607e188754eece4e804f4e3531cce83fe19daade2db0e8506df2",
+                    "mixHash" : "0xb372d06bbfeb43c2b884d5bd4e6d2d612fa0a5f9c6dcb9818e626f34e3228006",
+                    "nonce" : "0x7b374a0490a69686",
                     "number" : "0x01",
                     "parentHash" : "0xb59ce1dc7c55555112a204fcbf83163758de6a2720a02e110ef208e40f715114",
                     "receiptTrie" : "0x53e6c8a423111be480d1fbe3c0cd62a57d4f09b48f1897d8ba36756f65402518",
@@ -602,7 +595,7 @@
                     "transactionsTrie" : "0xa5ff33b83dfe82d6977d92b113aef1c202835d511e127a888583135356705b41",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9035af901fda0b59ce1dc7c55555112a204fcbf83163758de6a2720a02e110ef208e40f715114a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a042af5124c57d871ea1975c8dde42b50206a2be8f3e93ef1ab2e8e4b1a5bde7fca0a5ff33b83dfe82d6977d92b113aef1c202835d511e127a888583135356705b41a053e6c8a423111be480d1fbe3c0cd62a57d4f09b48f1897d8ba36756f65402518b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011e028203e880a09a28d17ef4f8e1e4b1012cd2c7cb49f58f0038f6f63052b07bcbc4f5570ab24988c0699d1b89198c2af90156f9015380018469e42f5494095e7baea6a6c7c4c2dfeb977efac326af552d8783df5aefb8ee7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe60600943608f1ca0e9626076f3b83833caee875fa068995f86340f51ad6afe37eeb7f0fcf2091fd7a01072f5edda8b7cfe2a3d5c44ebec6d8a1b9dd394e181fad8b3d08f63a2479491c0",
+                "rlp" : "0xf9035af901fda0b59ce1dc7c55555112a204fcbf83163758de6a2720a02e110ef208e40f715114a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a042af5124c57d871ea1975c8dde42b50206a2be8f3e93ef1ab2e8e4b1a5bde7fca0a5ff33b83dfe82d6977d92b113aef1c202835d511e127a888583135356705b41a053e6c8a423111be480d1fbe3c0cd62a57d4f09b48f1897d8ba36756f65402518b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011e028203e880a0b372d06bbfeb43c2b884d5bd4e6d2d612fa0a5f9c6dcb9818e626f34e3228006887b374a0490a69686f90156f9015380018469e42f5494095e7baea6a6c7c4c2dfeb977efac326af552d8783df5aefb8ee7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe60600943608f1ca0e9626076f3b83833caee875fa068995f86340f51ad6afe37eeb7f0fcf2091fd7a01072f5edda8b7cfe2a3d5c44ebec6d8a1b9dd394e181fad8b3d08f63a2479491c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe60600943608f",
@@ -639,7 +632,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09f6ba990e3e3443873b26ef3c0538cac143ad357a5b962b30d37413384f02c73a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8ceace406fc1903964eae2399320fdb706e0a702dda327ecabed3cecce170e2d",
+        "lastblockhash" : "0xcc15e0771d3f607e188754eece4e804f4e3531cce83fe19daade2db0e8506df2",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest186BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest186BC.json
index 940ef271d..82ea9376d 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest186BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest186BC.json
@@ -2,8 +2,8 @@
     "randomStatetest186BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest186BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest186BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa225",
-                    "hash" : "0xf675bc9e858c38486a55c5412b4368b6769b1a0ab822fdc8609d0cf4606d7fc1",
-                    "mixHash" : "0x195befc2c1e74d6371fa22c427919502d8667ecf5bec231c8b126f01ec21a3c1",
-                    "nonce" : "0x8380e268de19c2db",
+                    "hash" : "0xecf82b76bf9fbf0a9f39551d026317819d8efd30229dafb362f1ed27074ad3ea",
+                    "mixHash" : "0xfb5f951a4f5fe0f1c974267a8c7493d2f2145dd9f4c7d71ba841c2a2e6432137",
+                    "nonce" : "0xef54202371d19cb9",
                     "number" : "0x01",
                     "parentHash" : "0x0bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0",
                     "receiptTrie" : "0x140b6bcdf10b742ab2e7ecea97cfca9d6a3a738a60f7b09e0aa3b325e369d4c3",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca00bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05b142b2c938a87467c1c3d6d13cce504586d244f9920dab9a84507ceff751643a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0140b6bcdf10b742ab2e7ecea97cfca9d6a3a738a60f7b09e0aa3b325e369d4c3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2258203e880a0195befc2c1e74d6371fa22c427919502d8667ecf5bec231c8b126f01ec21a3c1888380e268de19c2dbf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca00bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05b142b2c938a87467c1c3d6d13cce504586d244f9920dab9a84507ceff751643a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0140b6bcdf10b742ab2e7ecea97cfca9d6a3a738a60f7b09e0aa3b325e369d4c3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2258203e880a0fb5f951a4f5fe0f1c974267a8c7493d2f2145dd9f4c7d71ba841c2a2e643213788ef54202371d19cb9f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f4dc20cb56f58593294d8b703ae4bc01c8ca7a724de986c07c4a788e3dd13ae3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf675bc9e858c38486a55c5412b4368b6769b1a0ab822fdc8609d0cf4606d7fc1",
+        "lastblockhash" : "0xecf82b76bf9fbf0a9f39551d026317819d8efd30229dafb362f1ed27074ad3ea",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest186BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest186BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest186BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa531",
-                    "hash" : "0x2dde68f15b2f81c0cd0176016e1976d92662d6949ed1ac17c0401be9c815c707",
-                    "mixHash" : "0x49d99beb201888fe6d168bc698c99a8b840f061e3490849168902941452d8929",
-                    "nonce" : "0x562b7e14ea5444cc",
+                    "hash" : "0x7d1f681004a24ba30398058ba16673fd6f5c594d880f6a4e75d31cfa799ad5f5",
+                    "mixHash" : "0x1ec3ea34ba7c7f0cf3e782aab62e0052cec2b8f926cad628c39d41c95de68c78",
+                    "nonce" : "0x7c289fb8a145bca9",
                     "number" : "0x01",
                     "parentHash" : "0x0bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0",
                     "receiptTrie" : "0xc871f4cd3fe898b4b6d7842d64d1e5bf8e01f21f5caef9f1229d6a3978138d89",
-                    "stateRoot" : "0x8f9cd2195dbcd3551cc3b5703428a20f3107880b9db4bfe4f3fd52e9f5dfd00f",
+                    "stateRoot" : "0x12c83a93d7fbd9b876288c1ec69b22c2664311f34302098072c228b50926beab",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca00bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08f9cd2195dbcd3551cc3b5703428a20f3107880b9db4bfe4f3fd52e9f5dfd00fa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0c871f4cd3fe898b4b6d7842d64d1e5bf8e01f21f5caef9f1229d6a3978138d89b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a5318203e880a049d99beb201888fe6d168bc698c99a8b840f061e3490849168902941452d892988562b7e14ea5444ccf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca00bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a012c83a93d7fbd9b876288c1ec69b22c2664311f34302098072c228b50926beaba0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0c871f4cd3fe898b4b6d7842d64d1e5bf8e01f21f5caef9f1229d6a3978138d89b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a5318203e880a01ec3ea34ba7c7f0cf3e782aab62e0052cec2b8f926cad628c39d41c95de68c78887c289fb8a145bca9f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f4dc20cb56f58593294d8b703ae4bc01c8ca7a724de986c07c4a788e3dd13ae3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2dde68f15b2f81c0cd0176016e1976d92662d6949ed1ac17c0401be9c815c707",
+        "lastblockhash" : "0x7d1f681004a24ba30398058ba16673fd6f5c594d880f6a4e75d31cfa799ad5f5",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x45454340424244444131599455",
@@ -235,8 +228,8 @@
     "randomStatetest186BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest186BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest186BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa225",
-                    "hash" : "0xcb58b0367a0d2f8e2a7f198652a5661e285bfb155c7dfb21db2d553e7e3621ae",
-                    "mixHash" : "0xf5794c72f17aa83ecf68f674842ea4c07f2433fd24380286fa2a39348bea2999",
-                    "nonce" : "0xac170c1c30c6cd96",
+                    "hash" : "0x94a880e97bd3ff5f052b5fb2c1cd5c033856b24ccea5d02657d933a0331576db",
+                    "mixHash" : "0xd4f62144f1185f7ccb78921e4ab26d9a08136f18a1d39cf73b38968a1604cae0",
+                    "nonce" : "0xe7bd638b33a2e67a",
                     "number" : "0x01",
                     "parentHash" : "0x0bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0",
                     "receiptTrie" : "0xe81fc05369aec35b457c9d2eaa1ca0ed667b471204268981c6273ddabf250810",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca00bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d286b421fc4db58504981d7584828c192e77376ac22fd8246064b229df11ff34a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e81fc05369aec35b457c9d2eaa1ca0ed667b471204268981c6273ddabf250810b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2258203e880a0f5794c72f17aa83ecf68f674842ea4c07f2433fd24380286fa2a39348bea299988ac170c1c30c6cd96f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca00bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d286b421fc4db58504981d7584828c192e77376ac22fd8246064b229df11ff34a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e81fc05369aec35b457c9d2eaa1ca0ed667b471204268981c6273ddabf250810b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2258203e880a0d4f62144f1185f7ccb78921e4ab26d9a08136f18a1d39cf73b38968a1604cae088e7bd638b33a2e67af865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f4dc20cb56f58593294d8b703ae4bc01c8ca7a724de986c07c4a788e3dd13ae3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcb58b0367a0d2f8e2a7f198652a5661e285bfb155c7dfb21db2d553e7e3621ae",
+        "lastblockhash" : "0x94a880e97bd3ff5f052b5fb2c1cd5c033856b24ccea5d02657d933a0331576db",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest186BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest186BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest186BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa225",
-                    "hash" : "0x33d3ff871331395c6c296de4eb030ba0122e1505632212334766d3d2ab465e1e",
-                    "mixHash" : "0x0e4d7a5a367a04f668eafb9bfbb7f69f1fb65eda2e85bac3bc91dee2c6092810",
-                    "nonce" : "0x467e0b9e130b2e38",
+                    "hash" : "0xab5febfa1ec909c3fccf4c2f6049176a5f35b35c972c3a4669b8386f9b1a4167",
+                    "mixHash" : "0x6b81b1e9be97302a4139362b386d6ece3ee9e24428a186fd1b0f618d0f71176c",
+                    "nonce" : "0x8f0c241b05e7a085",
                     "number" : "0x01",
                     "parentHash" : "0x0bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0",
                     "receiptTrie" : "0xe81fc05369aec35b457c9d2eaa1ca0ed667b471204268981c6273ddabf250810",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca00bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d286b421fc4db58504981d7584828c192e77376ac22fd8246064b229df11ff34a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e81fc05369aec35b457c9d2eaa1ca0ed667b471204268981c6273ddabf250810b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2258203e880a00e4d7a5a367a04f668eafb9bfbb7f69f1fb65eda2e85bac3bc91dee2c609281088467e0b9e130b2e38f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca00bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d286b421fc4db58504981d7584828c192e77376ac22fd8246064b229df11ff34a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e81fc05369aec35b457c9d2eaa1ca0ed667b471204268981c6273ddabf250810b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2258203e880a06b81b1e9be97302a4139362b386d6ece3ee9e24428a186fd1b0f618d0f71176c888f0c241b05e7a085f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f4dc20cb56f58593294d8b703ae4bc01c8ca7a724de986c07c4a788e3dd13ae3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x33d3ff871331395c6c296de4eb030ba0122e1505632212334766d3d2ab465e1e",
+        "lastblockhash" : "0xab5febfa1ec909c3fccf4c2f6049176a5f35b35c972c3a4669b8386f9b1a4167",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest186BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest186BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest186BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa0a9",
-                    "hash" : "0xb5356b0a22a364c48a7c5514899a2692866ef7f81d576e794ee21f208cedcfbf",
-                    "mixHash" : "0xf2b893125c9415f7ee83e56fa8189947921a1d7160ec10b0b94e834a7af8f1fb",
-                    "nonce" : "0x730e997120a64807",
+                    "hash" : "0xd247c1e75372fdf175eca237f877ff22f8e6845e5d97249869c546f59672f408",
+                    "mixHash" : "0xb4bb7f009f8620ac02cd97311ae8fd93528f01e0f27d83f3124e2e329208263e",
+                    "nonce" : "0xcf3320b1ef2e2226",
                     "number" : "0x01",
                     "parentHash" : "0x0bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0",
                     "receiptTrie" : "0x5abaa8e88c4b27a1b9f68aac1a0aad43e2817a42aeaeebc857e1dc45c623f9e5",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca00bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0166a3aba5d2ad9497405a0fc877c874afcfd825f641bfdfa79ee81f3605ebbbca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa05abaa8e88c4b27a1b9f68aac1a0aad43e2817a42aeaeebc857e1dc45c623f9e5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a98203e880a0f2b893125c9415f7ee83e56fa8189947921a1d7160ec10b0b94e834a7af8f1fb88730e997120a64807f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca00bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0166a3aba5d2ad9497405a0fc877c874afcfd825f641bfdfa79ee81f3605ebbbca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa05abaa8e88c4b27a1b9f68aac1a0aad43e2817a42aeaeebc857e1dc45c623f9e5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a98203e880a0b4bb7f009f8620ac02cd97311ae8fd93528f01e0f27d83f3124e2e329208263e88cf3320b1ef2e2226f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f4dc20cb56f58593294d8b703ae4bc01c8ca7a724de986c07c4a788e3dd13ae3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb5356b0a22a364c48a7c5514899a2692866ef7f81d576e794ee21f208cedcfbf",
+        "lastblockhash" : "0xd247c1e75372fdf175eca237f877ff22f8e6845e5d97249869c546f59672f408",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest186BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest186BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest186BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa0a9",
-                    "hash" : "0x0c044d0baf07593cff6433fe924901cf24e24a543f9e6f93cf9b600f1a3edb00",
-                    "mixHash" : "0x0953edd3094caaa793bbdea06078067682ba5d6705d3e8acfd213ecbe7f81fef",
-                    "nonce" : "0x2d8bec2ab0df1499",
+                    "hash" : "0x9297a857d7408b609682ce76849d99319f78497110a1ae85925f461b5f7e87ac",
+                    "mixHash" : "0x82cea61c88af09d36ae57df1f4f09c02ac1a9a63f7738fd8c16878d3ee287d48",
+                    "nonce" : "0x14432d712ee9fbb0",
                     "number" : "0x01",
                     "parentHash" : "0x0bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0",
                     "receiptTrie" : "0x5abaa8e88c4b27a1b9f68aac1a0aad43e2817a42aeaeebc857e1dc45c623f9e5",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca00bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0166a3aba5d2ad9497405a0fc877c874afcfd825f641bfdfa79ee81f3605ebbbca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa05abaa8e88c4b27a1b9f68aac1a0aad43e2817a42aeaeebc857e1dc45c623f9e5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a98203e880a00953edd3094caaa793bbdea06078067682ba5d6705d3e8acfd213ecbe7f81fef882d8bec2ab0df1499f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca00bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0166a3aba5d2ad9497405a0fc877c874afcfd825f641bfdfa79ee81f3605ebbbca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa05abaa8e88c4b27a1b9f68aac1a0aad43e2817a42aeaeebc857e1dc45c623f9e5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a98203e880a082cea61c88af09d36ae57df1f4f09c02ac1a9a63f7738fd8c16878d3ee287d488814432d712ee9fbb0f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f4dc20cb56f58593294d8b703ae4bc01c8ca7a724de986c07c4a788e3dd13ae3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0c044d0baf07593cff6433fe924901cf24e24a543f9e6f93cf9b600f1a3edb00",
+        "lastblockhash" : "0x9297a857d7408b609682ce76849d99319f78497110a1ae85925f461b5f7e87ac",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest193BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest193BC.json
index 73adc2ca5..c0d7b97c0 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest193BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest193BC.json
@@ -2,8 +2,8 @@
     "randomStatetest193BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest193BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest193BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x417a",
-                    "hash" : "0xe9e376255e37154265f72ea6bb84c469f75b38539b24702f300ee31ece8c8a5a",
-                    "mixHash" : "0xf8948d87c3c8b093f4068b81dfb96af4cdfb2462dfdaf16124178f3f92480505",
-                    "nonce" : "0x76497934f735fbd1",
+                    "hash" : "0x067194bad0a5e17d67cfb1796ebe9743ae6ef4b4593950f2a3b33dbac2178677",
+                    "mixHash" : "0x68e9bf3ead6626b92622502a14b958687f6403176e40e267b3151a36b7133158",
+                    "nonce" : "0x73ee2ffc2455e944",
                     "number" : "0x01",
                     "parentHash" : "0xb0e9ca3f17f1a8d4dbd0db266b2794b94fb002770baa0d53dad7fac46233670a",
                     "receiptTrie" : "0xadcc71c3360a20326c87ef11e2a8752b834e0308b0c1922564549ba0870c5ea0",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x181dc8dd572e314f841be5395f42231c7b7608dead4c5090b274999a825c66d1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9033bf901fca0b0e9ca3f17f1a8d4dbd0db266b2794b94fb002770baa0d53dad7fac46233670aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c60a8520ad6cc07057ac2d89948450cc40d8b8077318a7f05f2425e88c58f27ca0181dc8dd572e314f841be5395f42231c7b7608dead4c5090b274999a825c66d1a0adcc71c3360a20326c87ef11e2a8752b834e0308b0c1922564549ba0870c5ea0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82417a8203e880a0f8948d87c3c8b093f4068b81dfb96af4cdfb2462dfdaf16124178f3f924805058876497934f735fbd1f90138f901358001847fc7181494095e7baea6a6c7c4c2dfeb977efac326af552d878478221579b8cf7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5ff6b42909913521ca09949ed3ae7ebe35260962232903179206324d51e32c0c5b7cc6905084ff88b0ba0446f532f90219ba4881e984fdafe7fee14704fb2565928045f320f82965d775fc0",
+                "rlp" : "0xf9033bf901fca0b0e9ca3f17f1a8d4dbd0db266b2794b94fb002770baa0d53dad7fac46233670aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c60a8520ad6cc07057ac2d89948450cc40d8b8077318a7f05f2425e88c58f27ca0181dc8dd572e314f841be5395f42231c7b7608dead4c5090b274999a825c66d1a0adcc71c3360a20326c87ef11e2a8752b834e0308b0c1922564549ba0870c5ea0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82417a8203e880a068e9bf3ead6626b92622502a14b958687f6403176e40e267b3151a36b71331588873ee2ffc2455e944f90138f901358001847fc7181494095e7baea6a6c7c4c2dfeb977efac326af552d878478221579b8cf7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5ff6b42909913521ca09949ed3ae7ebe35260962232903179206324d51e32c0c5b7cc6905084ff88b0ba0446f532f90219ba4881e984fdafe7fee14704fb2565928045f320f82965d775fc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5ff6b4290991352",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0765f59d71a425ce2eec964dca7cac932c023e9b04a7c072ca22b457c48b98587a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe9e376255e37154265f72ea6bb84c469f75b38539b24702f300ee31ece8c8a5a",
+        "lastblockhash" : "0x067194bad0a5e17d67cfb1796ebe9743ae6ef4b4593950f2a3b33dbac2178677",
         "network" : "Byzantium",
         "postState" : {
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
@@ -107,8 +107,8 @@
     "randomStatetest193BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest193BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest193BCFiller.json"
         },
         "blocks" : [
             {
@@ -119,18 +119,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x4300",
-                    "hash" : "0x28bf24c29bcf8c74e013853454b8da57ab902df92118a907931b6158c209411f",
-                    "mixHash" : "0x7b507e16b1085ffcb1d8f20b00333220bb594c9f180f0b5640af3f275bd6709d",
-                    "nonce" : "0x4346c5fb5f3ad929",
+                    "hash" : "0xa3600bfe187e2fc67810dfc21fc3f467779f1398674bd958a36ef6d0de747c3d",
+                    "mixHash" : "0xec8919b337f3385000d836f04c49df8b3009b012a2e2c514e43d1dd3c4b1aa0b",
+                    "nonce" : "0xee6f01e5aaa1a803",
                     "number" : "0x01",
                     "parentHash" : "0xb0e9ca3f17f1a8d4dbd0db266b2794b94fb002770baa0d53dad7fac46233670a",
                     "receiptTrie" : "0x6e1cce6795d875c5838b117c53f74d3403fe1e141c39504eeb6c0c3e9862f7a9",
-                    "stateRoot" : "0x5c12b8c9202ab4d8ec3f09865a9d4a857c86fe2fe6a948f41aeafd7eff4ece12",
+                    "stateRoot" : "0xca64b1b6b708569543b1eaa83a8893fde3493279da1c71cbc2f303462f291651",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x181dc8dd572e314f841be5395f42231c7b7608dead4c5090b274999a825c66d1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9033bf901fca0b0e9ca3f17f1a8d4dbd0db266b2794b94fb002770baa0d53dad7fac46233670aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05c12b8c9202ab4d8ec3f09865a9d4a857c86fe2fe6a948f41aeafd7eff4ece12a0181dc8dd572e314f841be5395f42231c7b7608dead4c5090b274999a825c66d1a06e1cce6795d875c5838b117c53f74d3403fe1e141c39504eeb6c0c3e9862f7a9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8243008203e880a07b507e16b1085ffcb1d8f20b00333220bb594c9f180f0b5640af3f275bd6709d884346c5fb5f3ad929f90138f901358001847fc7181494095e7baea6a6c7c4c2dfeb977efac326af552d878478221579b8cf7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5ff6b42909913521ca09949ed3ae7ebe35260962232903179206324d51e32c0c5b7cc6905084ff88b0ba0446f532f90219ba4881e984fdafe7fee14704fb2565928045f320f82965d775fc0",
+                "rlp" : "0xf9033bf901fca0b0e9ca3f17f1a8d4dbd0db266b2794b94fb002770baa0d53dad7fac46233670aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ca64b1b6b708569543b1eaa83a8893fde3493279da1c71cbc2f303462f291651a0181dc8dd572e314f841be5395f42231c7b7608dead4c5090b274999a825c66d1a06e1cce6795d875c5838b117c53f74d3403fe1e141c39504eeb6c0c3e9862f7a9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8243008203e880a0ec8919b337f3385000d836f04c49df8b3009b012a2e2c514e43d1dd3c4b1aa0b88ee6f01e5aaa1a803f90138f901358001847fc7181494095e7baea6a6c7c4c2dfeb977efac326af552d878478221579b8cf7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5ff6b42909913521ca09949ed3ae7ebe35260962232903179206324d51e32c0c5b7cc6905084ff88b0ba0446f532f90219ba4881e984fdafe7fee14704fb2565928045f320f82965d775fc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5ff6b4290991352",
@@ -167,16 +167,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0765f59d71a425ce2eec964dca7cac932c023e9b04a7c072ca22b457c48b98587a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x28bf24c29bcf8c74e013853454b8da57ab902df92118a907931b6158c209411f",
+        "lastblockhash" : "0xa3600bfe187e2fc67810dfc21fc3f467779f1398674bd958a36ef6d0de747c3d",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x29a2241b6e4e58a7",
                 "code" : "0x6000355415600957005b60203560003555",
@@ -219,8 +212,8 @@
     "randomStatetest193BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest193BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest193BCFiller.json"
         },
         "blocks" : [
             {
@@ -231,9 +224,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x417a",
-                    "hash" : "0xb5f184376bba9daf20f20cba54b12b633164ca64e93b774b8085aa05f8362c4a",
-                    "mixHash" : "0xae1914a43169efdd5b5936012798061b74e71c9037ab627ab9eb62a916103c04",
-                    "nonce" : "0xbfcfb5c265230516",
+                    "hash" : "0x230771c42f9e2418ae9457665cac9b4fd1327ef56fd64f75409c654570bb798b",
+                    "mixHash" : "0xec0b4976bc196a5005ebd9ffbe33e6b59f0e5cf776db838c8769b41e8ddb7ec2",
+                    "nonce" : "0x6183e489dd91bd76",
                     "number" : "0x01",
                     "parentHash" : "0xb0e9ca3f17f1a8d4dbd0db266b2794b94fb002770baa0d53dad7fac46233670a",
                     "receiptTrie" : "0x4ffa260b44d5f0b7e675130d68bdd1e283c447357bcfaf6628953d2c8e0b2340",
@@ -242,7 +235,7 @@
                     "transactionsTrie" : "0x181dc8dd572e314f841be5395f42231c7b7608dead4c5090b274999a825c66d1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9033bf901fca0b0e9ca3f17f1a8d4dbd0db266b2794b94fb002770baa0d53dad7fac46233670aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e41b9d95c685dd0efbd53e17054c3b59b4c9119e7dc123ed495d66710e9e45bca0181dc8dd572e314f841be5395f42231c7b7608dead4c5090b274999a825c66d1a04ffa260b44d5f0b7e675130d68bdd1e283c447357bcfaf6628953d2c8e0b2340b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82417a8203e880a0ae1914a43169efdd5b5936012798061b74e71c9037ab627ab9eb62a916103c0488bfcfb5c265230516f90138f901358001847fc7181494095e7baea6a6c7c4c2dfeb977efac326af552d878478221579b8cf7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5ff6b42909913521ca09949ed3ae7ebe35260962232903179206324d51e32c0c5b7cc6905084ff88b0ba0446f532f90219ba4881e984fdafe7fee14704fb2565928045f320f82965d775fc0",
+                "rlp" : "0xf9033bf901fca0b0e9ca3f17f1a8d4dbd0db266b2794b94fb002770baa0d53dad7fac46233670aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e41b9d95c685dd0efbd53e17054c3b59b4c9119e7dc123ed495d66710e9e45bca0181dc8dd572e314f841be5395f42231c7b7608dead4c5090b274999a825c66d1a04ffa260b44d5f0b7e675130d68bdd1e283c447357bcfaf6628953d2c8e0b2340b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82417a8203e880a0ec0b4976bc196a5005ebd9ffbe33e6b59f0e5cf776db838c8769b41e8ddb7ec2886183e489dd91bd76f90138f901358001847fc7181494095e7baea6a6c7c4c2dfeb977efac326af552d878478221579b8cf7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5ff6b42909913521ca09949ed3ae7ebe35260962232903179206324d51e32c0c5b7cc6905084ff88b0ba0446f532f90219ba4881e984fdafe7fee14704fb2565928045f320f82965d775fc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5ff6b4290991352",
@@ -279,7 +272,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0765f59d71a425ce2eec964dca7cac932c023e9b04a7c072ca22b457c48b98587a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb5f184376bba9daf20f20cba54b12b633164ca64e93b774b8085aa05f8362c4a",
+        "lastblockhash" : "0x230771c42f9e2418ae9457665cac9b4fd1327ef56fd64f75409c654570bb798b",
         "network" : "EIP150",
         "postState" : {
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
@@ -324,8 +317,8 @@
     "randomStatetest193BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest193BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest193BCFiller.json"
         },
         "blocks" : [
             {
@@ -336,9 +329,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x417a",
-                    "hash" : "0x8371a6186b1df3e39074edb1252a866646711a77da91687d5f1b8c1522af5569",
-                    "mixHash" : "0xa0a5194d081a7e059b3f7b2454d2e6f6cf9abb02b22220e1231dc7c8f4e7968d",
-                    "nonce" : "0x354d3c84af75ef47",
+                    "hash" : "0xd420f2152a5161f2308fa568c40c329bd68e6d045c70ac7d1b503c20bc4fbc36",
+                    "mixHash" : "0x6197a3b3a976740bbf238be2c645a0c304966ebe05f9477c6d128a198dd5d68a",
+                    "nonce" : "0xf7798ed272aafa9e",
                     "number" : "0x01",
                     "parentHash" : "0xb0e9ca3f17f1a8d4dbd0db266b2794b94fb002770baa0d53dad7fac46233670a",
                     "receiptTrie" : "0x4ffa260b44d5f0b7e675130d68bdd1e283c447357bcfaf6628953d2c8e0b2340",
@@ -347,7 +340,7 @@
                     "transactionsTrie" : "0x181dc8dd572e314f841be5395f42231c7b7608dead4c5090b274999a825c66d1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9033bf901fca0b0e9ca3f17f1a8d4dbd0db266b2794b94fb002770baa0d53dad7fac46233670aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e41b9d95c685dd0efbd53e17054c3b59b4c9119e7dc123ed495d66710e9e45bca0181dc8dd572e314f841be5395f42231c7b7608dead4c5090b274999a825c66d1a04ffa260b44d5f0b7e675130d68bdd1e283c447357bcfaf6628953d2c8e0b2340b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82417a8203e880a0a0a5194d081a7e059b3f7b2454d2e6f6cf9abb02b22220e1231dc7c8f4e7968d88354d3c84af75ef47f90138f901358001847fc7181494095e7baea6a6c7c4c2dfeb977efac326af552d878478221579b8cf7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5ff6b42909913521ca09949ed3ae7ebe35260962232903179206324d51e32c0c5b7cc6905084ff88b0ba0446f532f90219ba4881e984fdafe7fee14704fb2565928045f320f82965d775fc0",
+                "rlp" : "0xf9033bf901fca0b0e9ca3f17f1a8d4dbd0db266b2794b94fb002770baa0d53dad7fac46233670aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e41b9d95c685dd0efbd53e17054c3b59b4c9119e7dc123ed495d66710e9e45bca0181dc8dd572e314f841be5395f42231c7b7608dead4c5090b274999a825c66d1a04ffa260b44d5f0b7e675130d68bdd1e283c447357bcfaf6628953d2c8e0b2340b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82417a8203e880a06197a3b3a976740bbf238be2c645a0c304966ebe05f9477c6d128a198dd5d68a88f7798ed272aafa9ef90138f901358001847fc7181494095e7baea6a6c7c4c2dfeb977efac326af552d878478221579b8cf7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5ff6b42909913521ca09949ed3ae7ebe35260962232903179206324d51e32c0c5b7cc6905084ff88b0ba0446f532f90219ba4881e984fdafe7fee14704fb2565928045f320f82965d775fc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5ff6b4290991352",
@@ -384,7 +377,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0765f59d71a425ce2eec964dca7cac932c023e9b04a7c072ca22b457c48b98587a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8371a6186b1df3e39074edb1252a866646711a77da91687d5f1b8c1522af5569",
+        "lastblockhash" : "0xd420f2152a5161f2308fa568c40c329bd68e6d045c70ac7d1b503c20bc4fbc36",
         "network" : "EIP158",
         "postState" : {
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
@@ -429,8 +422,8 @@
     "randomStatetest193BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest193BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest193BCFiller.json"
         },
         "blocks" : [
             {
@@ -441,9 +434,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x37b6",
-                    "hash" : "0x3e65c334e33c90e59b254da8fe5d1e14c6c7337e5e2d5c4f74846fc0884c51b2",
-                    "mixHash" : "0x4800e3fda0eea2b10159e951782b3368c75083a3322aea9b46afa839e60fd4bb",
-                    "nonce" : "0x48c1d67e27c005d5",
+                    "hash" : "0xf66ce9f97c6006e820aad2877163a5b86b987e9f22941e4472a0d22d7bc53922",
+                    "mixHash" : "0xa6b0102150f4bfb42c58b33bbddce34675600b83bfaffb1bc0f24f39a2242163",
+                    "nonce" : "0x0dd095c7a75a6c7f",
                     "number" : "0x01",
                     "parentHash" : "0xb0e9ca3f17f1a8d4dbd0db266b2794b94fb002770baa0d53dad7fac46233670a",
                     "receiptTrie" : "0xeb8414867c88c6da931b1c52d8f43547b27bba87a50e1d2d26ae1242b543301a",
@@ -452,7 +445,7 @@
                     "transactionsTrie" : "0x181dc8dd572e314f841be5395f42231c7b7608dead4c5090b274999a825c66d1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9033bf901fca0b0e9ca3f17f1a8d4dbd0db266b2794b94fb002770baa0d53dad7fac46233670aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02327f2fde1fc5310dca67ef544bbf63ef4e3b1584b73b618cf411607e637a5f8a0181dc8dd572e314f841be5395f42231c7b7608dead4c5090b274999a825c66d1a0eb8414867c88c6da931b1c52d8f43547b27bba87a50e1d2d26ae1242b543301ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8237b68203e880a04800e3fda0eea2b10159e951782b3368c75083a3322aea9b46afa839e60fd4bb8848c1d67e27c005d5f90138f901358001847fc7181494095e7baea6a6c7c4c2dfeb977efac326af552d878478221579b8cf7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5ff6b42909913521ca09949ed3ae7ebe35260962232903179206324d51e32c0c5b7cc6905084ff88b0ba0446f532f90219ba4881e984fdafe7fee14704fb2565928045f320f82965d775fc0",
+                "rlp" : "0xf9033bf901fca0b0e9ca3f17f1a8d4dbd0db266b2794b94fb002770baa0d53dad7fac46233670aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02327f2fde1fc5310dca67ef544bbf63ef4e3b1584b73b618cf411607e637a5f8a0181dc8dd572e314f841be5395f42231c7b7608dead4c5090b274999a825c66d1a0eb8414867c88c6da931b1c52d8f43547b27bba87a50e1d2d26ae1242b543301ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8237b68203e880a0a6b0102150f4bfb42c58b33bbddce34675600b83bfaffb1bc0f24f39a2242163880dd095c7a75a6c7ff90138f901358001847fc7181494095e7baea6a6c7c4c2dfeb977efac326af552d878478221579b8cf7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5ff6b42909913521ca09949ed3ae7ebe35260962232903179206324d51e32c0c5b7cc6905084ff88b0ba0446f532f90219ba4881e984fdafe7fee14704fb2565928045f320f82965d775fc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5ff6b4290991352",
@@ -489,7 +482,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0765f59d71a425ce2eec964dca7cac932c023e9b04a7c072ca22b457c48b98587a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3e65c334e33c90e59b254da8fe5d1e14c6c7337e5e2d5c4f74846fc0884c51b2",
+        "lastblockhash" : "0xf66ce9f97c6006e820aad2877163a5b86b987e9f22941e4472a0d22d7bc53922",
         "network" : "Frontier",
         "postState" : {
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
@@ -534,8 +527,8 @@
     "randomStatetest193BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest193BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest193BCFiller.json"
         },
         "blocks" : [
             {
@@ -546,9 +539,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x37b6",
-                    "hash" : "0x33ef4b68ac970be24adc8ddf5d61af25d486ddde3f0c8471c2867d30b8eb4102",
-                    "mixHash" : "0x967bdbf897998232ac3a60f772aff3f7d0efcc263327ddfa58941a4e2705ebca",
-                    "nonce" : "0x3f49681ea06cd55f",
+                    "hash" : "0x0dada2b66e3c20850c501d74d9fb0c41efba7a88549e5d206139382d80a00480",
+                    "mixHash" : "0x6d1a97957f799f258f74247f16b8e238f0ea3d0ff9e396428c9b796ab63a9e5a",
+                    "nonce" : "0x3e6ce580dac82a5f",
                     "number" : "0x01",
                     "parentHash" : "0xb0e9ca3f17f1a8d4dbd0db266b2794b94fb002770baa0d53dad7fac46233670a",
                     "receiptTrie" : "0xeb8414867c88c6da931b1c52d8f43547b27bba87a50e1d2d26ae1242b543301a",
@@ -557,7 +550,7 @@
                     "transactionsTrie" : "0x181dc8dd572e314f841be5395f42231c7b7608dead4c5090b274999a825c66d1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9033bf901fca0b0e9ca3f17f1a8d4dbd0db266b2794b94fb002770baa0d53dad7fac46233670aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02327f2fde1fc5310dca67ef544bbf63ef4e3b1584b73b618cf411607e637a5f8a0181dc8dd572e314f841be5395f42231c7b7608dead4c5090b274999a825c66d1a0eb8414867c88c6da931b1c52d8f43547b27bba87a50e1d2d26ae1242b543301ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8237b68203e880a0967bdbf897998232ac3a60f772aff3f7d0efcc263327ddfa58941a4e2705ebca883f49681ea06cd55ff90138f901358001847fc7181494095e7baea6a6c7c4c2dfeb977efac326af552d878478221579b8cf7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5ff6b42909913521ca09949ed3ae7ebe35260962232903179206324d51e32c0c5b7cc6905084ff88b0ba0446f532f90219ba4881e984fdafe7fee14704fb2565928045f320f82965d775fc0",
+                "rlp" : "0xf9033bf901fca0b0e9ca3f17f1a8d4dbd0db266b2794b94fb002770baa0d53dad7fac46233670aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02327f2fde1fc5310dca67ef544bbf63ef4e3b1584b73b618cf411607e637a5f8a0181dc8dd572e314f841be5395f42231c7b7608dead4c5090b274999a825c66d1a0eb8414867c88c6da931b1c52d8f43547b27bba87a50e1d2d26ae1242b543301ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8237b68203e880a06d1a97957f799f258f74247f16b8e238f0ea3d0ff9e396428c9b796ab63a9e5a883e6ce580dac82a5ff90138f901358001847fc7181494095e7baea6a6c7c4c2dfeb977efac326af552d878478221579b8cf7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5ff6b42909913521ca09949ed3ae7ebe35260962232903179206324d51e32c0c5b7cc6905084ff88b0ba0446f532f90219ba4881e984fdafe7fee14704fb2565928045f320f82965d775fc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5ff6b4290991352",
@@ -594,7 +587,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0765f59d71a425ce2eec964dca7cac932c023e9b04a7c072ca22b457c48b98587a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x33ef4b68ac970be24adc8ddf5d61af25d486ddde3f0c8471c2867d30b8eb4102",
+        "lastblockhash" : "0x0dada2b66e3c20850c501d74d9fb0c41efba7a88549e5d206139382d80a00480",
         "network" : "Homestead",
         "postState" : {
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest203BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest203BC.json
index f7ed4ec09..ef22213b3 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest203BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest203BC.json
@@ -2,8 +2,8 @@
     "randomStatetest203BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest203BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest203BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb2fc",
-                    "hash" : "0xec1cc1a22a988f2725863de40eb80b3723822dac72f58804775558bf8b902e5e",
-                    "mixHash" : "0xd893f34faad382c861a870d69e9b1a1f3d40216b13aa93940c749fc659a76d02",
-                    "nonce" : "0x81443b20138bc2b6",
+                    "hash" : "0xd6c610e46a26d6e6ff79a063497780812822b26fa75f2ab7d29e0ee48b3f7dc6",
+                    "mixHash" : "0xfd6f248bb5ae300569e314529d64b9f58a9336c1f4ac76bcfea3a3f748d1621f",
+                    "nonce" : "0xe68a44c0a786aa89",
                     "number" : "0x01",
                     "parentHash" : "0x847fc156cc128a025d6a97c7484dece2c9c241d53eff82ad5cb9a19656478ba9",
                     "receiptTrie" : "0x1f8ae14df324c13ea8b965c62510720abedc8086965ec5762d6f8295ba6e2e1a",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x360793cbc0f66d648f8b686c88ac269c6bea05195c91a78614f120d1072cb366",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0847fc156cc128a025d6a97c7484dece2c9c241d53eff82ad5cb9a19656478ba9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dd74b926a13cccc28514458a931d9e0a700a3304881ee27edbe166cfa870b64da0360793cbc0f66d648f8b686c88ac269c6bea05195c91a78614f120d1072cb366a01f8ae14df324c13ea8b965c62510720abedc8086965ec5762d6f8295ba6e2e1ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b2fc8203e880a0d893f34faad382c861a870d69e9b1a1f3d40216b13aa93940c749fc659a76d028881443b20138bc2b6f90141f9013e8001840509d22c94095e7baea6a6c7c4c2dfeb977efac326af552d8784574e8a2db8d87fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001407f0000000000000000000000000000000000000000000000000000000000000001417f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f72086c539905609b44a1018c78826b1ba0ac3230750dc83310354d255d19435f0c7a6086729ed78971c883280f67ba43eaa04ba44c7f224881dc0cbe768a90333a08dff594422b4ccde8cb4e147487ebd923c0",
+                "rlp" : "0xf90344f901fca0847fc156cc128a025d6a97c7484dece2c9c241d53eff82ad5cb9a19656478ba9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dd74b926a13cccc28514458a931d9e0a700a3304881ee27edbe166cfa870b64da0360793cbc0f66d648f8b686c88ac269c6bea05195c91a78614f120d1072cb366a01f8ae14df324c13ea8b965c62510720abedc8086965ec5762d6f8295ba6e2e1ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b2fc8203e880a0fd6f248bb5ae300569e314529d64b9f58a9336c1f4ac76bcfea3a3f748d1621f88e68a44c0a786aa89f90141f9013e8001840509d22c94095e7baea6a6c7c4c2dfeb977efac326af552d8784574e8a2db8d87fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001407f0000000000000000000000000000000000000000000000000000000000000001417f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f72086c539905609b44a1018c78826b1ba0ac3230750dc83310354d255d19435f0c7a6086729ed78971c883280f67ba43eaa04ba44c7f224881dc0cbe768a90333a08dff594422b4ccde8cb4e147487ebd923c0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001407f0000000000000000000000000000000000000000000000000000000000000001417f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f72086c539905609b44a1018c78826b",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08edb9c3d10d5f3ce8268c7628febffc59a5c9b49dd906611b3bd697ea7c6aa1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xec1cc1a22a988f2725863de40eb80b3723822dac72f58804775558bf8b902e5e",
+        "lastblockhash" : "0xd6c610e46a26d6e6ff79a063497780812822b26fa75f2ab7d29e0ee48b3f7dc6",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest203BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest203BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest203BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb608",
-                    "hash" : "0xf5b4ed0f3c282ceb46e08c74b5348adcc3e654003b34731c3dc1762d3d6f359d",
-                    "mixHash" : "0xc2372d8f95d20807e08cd65717380ed5fc8b6ee1c2d7a105e074c15f5e3a1002",
-                    "nonce" : "0xcacff78138dc44ed",
+                    "hash" : "0x223e36d720e787dd33771f351da7046d7544437ec374fa1b1a7feb5632d65a06",
+                    "mixHash" : "0x4fdc1b88f5c029a63c784ca49d04d34efcbc43a87613a025b2305f3f8c91979f",
+                    "nonce" : "0xf3e39424a6d714ad",
                     "number" : "0x01",
                     "parentHash" : "0x847fc156cc128a025d6a97c7484dece2c9c241d53eff82ad5cb9a19656478ba9",
                     "receiptTrie" : "0xb763401c14fa89a40689467b0dab6b9a5a7acb79d4b252342a5e50da4bc55592",
-                    "stateRoot" : "0xa23726ef71f514b807d866cea59432e2269f48ffc9c6574f9ed21f53697b3ae9",
+                    "stateRoot" : "0x42036126c8702ceb176f9f2255992a04f2b832c8fe2e6ad277d98b1fcba81806",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x360793cbc0f66d648f8b686c88ac269c6bea05195c91a78614f120d1072cb366",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0847fc156cc128a025d6a97c7484dece2c9c241d53eff82ad5cb9a19656478ba9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a23726ef71f514b807d866cea59432e2269f48ffc9c6574f9ed21f53697b3ae9a0360793cbc0f66d648f8b686c88ac269c6bea05195c91a78614f120d1072cb366a0b763401c14fa89a40689467b0dab6b9a5a7acb79d4b252342a5e50da4bc55592b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b6088203e880a0c2372d8f95d20807e08cd65717380ed5fc8b6ee1c2d7a105e074c15f5e3a100288cacff78138dc44edf90141f9013e8001840509d22c94095e7baea6a6c7c4c2dfeb977efac326af552d8784574e8a2db8d87fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001407f0000000000000000000000000000000000000000000000000000000000000001417f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f72086c539905609b44a1018c78826b1ba0ac3230750dc83310354d255d19435f0c7a6086729ed78971c883280f67ba43eaa04ba44c7f224881dc0cbe768a90333a08dff594422b4ccde8cb4e147487ebd923c0",
+                "rlp" : "0xf90344f901fca0847fc156cc128a025d6a97c7484dece2c9c241d53eff82ad5cb9a19656478ba9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a042036126c8702ceb176f9f2255992a04f2b832c8fe2e6ad277d98b1fcba81806a0360793cbc0f66d648f8b686c88ac269c6bea05195c91a78614f120d1072cb366a0b763401c14fa89a40689467b0dab6b9a5a7acb79d4b252342a5e50da4bc55592b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b6088203e880a04fdc1b88f5c029a63c784ca49d04d34efcbc43a87613a025b2305f3f8c91979f88f3e39424a6d714adf90141f9013e8001840509d22c94095e7baea6a6c7c4c2dfeb977efac326af552d8784574e8a2db8d87fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001407f0000000000000000000000000000000000000000000000000000000000000001417f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f72086c539905609b44a1018c78826b1ba0ac3230750dc83310354d255d19435f0c7a6086729ed78971c883280f67ba43eaa04ba44c7f224881dc0cbe768a90333a08dff594422b4ccde8cb4e147487ebd923c0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001407f0000000000000000000000000000000000000000000000000000000000000001417f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f72086c539905609b44a1018c78826b",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08edb9c3d10d5f3ce8268c7628febffc59a5c9b49dd906611b3bd697ea7c6aa1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf5b4ed0f3c282ceb46e08c74b5348adcc3e654003b34731c3dc1762d3d6f359d",
+        "lastblockhash" : "0x223e36d720e787dd33771f351da7046d7544437ec374fa1b1a7feb5632d65a06",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x574e8a2d",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001407f0000000000000000000000000000000000000000000000000000000000000001417f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f72086c539905609b44a1018c78826b5560005155",
@@ -235,8 +228,8 @@
     "randomStatetest203BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest203BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest203BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb2fc",
-                    "hash" : "0xcdf4fc42354f8c6af8823016171107e0095438d4ff4c1f70181b6282979106fe",
-                    "mixHash" : "0x20b3552c8b2b5b1ffa349fa5fa2f88d1af478e1827d2f5e5982ecdd1f2bff130",
-                    "nonce" : "0x488f738838fb3544",
+                    "hash" : "0xe1921baac7668c6c600bae77e59b95a0aeaa060fb27bac94ee1a4b144baa72ad",
+                    "mixHash" : "0x9a2a90b082b2378ffdd0e6f44ca28093a9bd90bb1cd32f4808b21b3e77f9ed59",
+                    "nonce" : "0xe78828c1d880c676",
                     "number" : "0x01",
                     "parentHash" : "0x847fc156cc128a025d6a97c7484dece2c9c241d53eff82ad5cb9a19656478ba9",
                     "receiptTrie" : "0x4ae7ced2de6bdd367a0df5031a324931c5faa3da3875c79206b689d82886617a",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0x360793cbc0f66d648f8b686c88ac269c6bea05195c91a78614f120d1072cb366",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0847fc156cc128a025d6a97c7484dece2c9c241d53eff82ad5cb9a19656478ba9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03f65502c5883ff490e9dd7a9e09eb306cbae86f74ace9402f65fddeffc3d5069a0360793cbc0f66d648f8b686c88ac269c6bea05195c91a78614f120d1072cb366a04ae7ced2de6bdd367a0df5031a324931c5faa3da3875c79206b689d82886617ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b2fc8203e880a020b3552c8b2b5b1ffa349fa5fa2f88d1af478e1827d2f5e5982ecdd1f2bff13088488f738838fb3544f90141f9013e8001840509d22c94095e7baea6a6c7c4c2dfeb977efac326af552d8784574e8a2db8d87fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001407f0000000000000000000000000000000000000000000000000000000000000001417f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f72086c539905609b44a1018c78826b1ba0ac3230750dc83310354d255d19435f0c7a6086729ed78971c883280f67ba43eaa04ba44c7f224881dc0cbe768a90333a08dff594422b4ccde8cb4e147487ebd923c0",
+                "rlp" : "0xf90344f901fca0847fc156cc128a025d6a97c7484dece2c9c241d53eff82ad5cb9a19656478ba9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03f65502c5883ff490e9dd7a9e09eb306cbae86f74ace9402f65fddeffc3d5069a0360793cbc0f66d648f8b686c88ac269c6bea05195c91a78614f120d1072cb366a04ae7ced2de6bdd367a0df5031a324931c5faa3da3875c79206b689d82886617ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b2fc8203e880a09a2a90b082b2378ffdd0e6f44ca28093a9bd90bb1cd32f4808b21b3e77f9ed5988e78828c1d880c676f90141f9013e8001840509d22c94095e7baea6a6c7c4c2dfeb977efac326af552d8784574e8a2db8d87fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001407f0000000000000000000000000000000000000000000000000000000000000001417f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f72086c539905609b44a1018c78826b1ba0ac3230750dc83310354d255d19435f0c7a6086729ed78971c883280f67ba43eaa04ba44c7f224881dc0cbe768a90333a08dff594422b4ccde8cb4e147487ebd923c0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001407f0000000000000000000000000000000000000000000000000000000000000001417f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f72086c539905609b44a1018c78826b",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08edb9c3d10d5f3ce8268c7628febffc59a5c9b49dd906611b3bd697ea7c6aa1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcdf4fc42354f8c6af8823016171107e0095438d4ff4c1f70181b6282979106fe",
+        "lastblockhash" : "0xe1921baac7668c6c600bae77e59b95a0aeaa060fb27bac94ee1a4b144baa72ad",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest203BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest203BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest203BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb2fc",
-                    "hash" : "0x81eea8e807b892b76377b885b3ea2338b483536d7afce17c6ff2e3e683638da3",
-                    "mixHash" : "0xccc468aab11b041792b5fd2b3f1239f0d7f887f47d7cccfb959e990e18327aa4",
-                    "nonce" : "0x2d3a8359377c500f",
+                    "hash" : "0x833b7df246ea7bbc5899d2a3ab7abc5ac237e6f1510a17d35ab0eecd56b77c4c",
+                    "mixHash" : "0xd850da3ad44afddf8205a9ad2fa4dcf1616a5335f61d4ec06f5793dcba2fc886",
+                    "nonce" : "0x8ef5f2f2f18efd58",
                     "number" : "0x01",
                     "parentHash" : "0x847fc156cc128a025d6a97c7484dece2c9c241d53eff82ad5cb9a19656478ba9",
                     "receiptTrie" : "0x4ae7ced2de6bdd367a0df5031a324931c5faa3da3875c79206b689d82886617a",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0x360793cbc0f66d648f8b686c88ac269c6bea05195c91a78614f120d1072cb366",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0847fc156cc128a025d6a97c7484dece2c9c241d53eff82ad5cb9a19656478ba9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03f65502c5883ff490e9dd7a9e09eb306cbae86f74ace9402f65fddeffc3d5069a0360793cbc0f66d648f8b686c88ac269c6bea05195c91a78614f120d1072cb366a04ae7ced2de6bdd367a0df5031a324931c5faa3da3875c79206b689d82886617ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b2fc8203e880a0ccc468aab11b041792b5fd2b3f1239f0d7f887f47d7cccfb959e990e18327aa4882d3a8359377c500ff90141f9013e8001840509d22c94095e7baea6a6c7c4c2dfeb977efac326af552d8784574e8a2db8d87fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001407f0000000000000000000000000000000000000000000000000000000000000001417f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f72086c539905609b44a1018c78826b1ba0ac3230750dc83310354d255d19435f0c7a6086729ed78971c883280f67ba43eaa04ba44c7f224881dc0cbe768a90333a08dff594422b4ccde8cb4e147487ebd923c0",
+                "rlp" : "0xf90344f901fca0847fc156cc128a025d6a97c7484dece2c9c241d53eff82ad5cb9a19656478ba9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03f65502c5883ff490e9dd7a9e09eb306cbae86f74ace9402f65fddeffc3d5069a0360793cbc0f66d648f8b686c88ac269c6bea05195c91a78614f120d1072cb366a04ae7ced2de6bdd367a0df5031a324931c5faa3da3875c79206b689d82886617ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b2fc8203e880a0d850da3ad44afddf8205a9ad2fa4dcf1616a5335f61d4ec06f5793dcba2fc886888ef5f2f2f18efd58f90141f9013e8001840509d22c94095e7baea6a6c7c4c2dfeb977efac326af552d8784574e8a2db8d87fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001407f0000000000000000000000000000000000000000000000000000000000000001417f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f72086c539905609b44a1018c78826b1ba0ac3230750dc83310354d255d19435f0c7a6086729ed78971c883280f67ba43eaa04ba44c7f224881dc0cbe768a90333a08dff594422b4ccde8cb4e147487ebd923c0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001407f0000000000000000000000000000000000000000000000000000000000000001417f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f72086c539905609b44a1018c78826b",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08edb9c3d10d5f3ce8268c7628febffc59a5c9b49dd906611b3bd697ea7c6aa1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x81eea8e807b892b76377b885b3ea2338b483536d7afce17c6ff2e3e683638da3",
+        "lastblockhash" : "0x833b7df246ea7bbc5899d2a3ab7abc5ac237e6f1510a17d35ab0eecd56b77c4c",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest203BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest203BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest203BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb2fc",
-                    "hash" : "0xecb3fafa71b075b9b82279e00b8ff192c77b77785a63109a4fee085d5b1efec4",
-                    "mixHash" : "0x84ce56595e291ec8922036577df4ad55ac08d92677e416ad4a5c06f29a4574f8",
-                    "nonce" : "0x0badde1897c51c43",
+                    "hash" : "0x5e28842ad8a9396ae06019f6933d7c0acf3ae05e16527756d251f4d205dcbb3a",
+                    "mixHash" : "0x809210cb78fd4f1acac9acf715142ba273493e666c01fdaee5895ebfbccada70",
+                    "nonce" : "0x40c7604a4909af01",
                     "number" : "0x01",
                     "parentHash" : "0x847fc156cc128a025d6a97c7484dece2c9c241d53eff82ad5cb9a19656478ba9",
                     "receiptTrie" : "0x4ae7ced2de6bdd367a0df5031a324931c5faa3da3875c79206b689d82886617a",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0x360793cbc0f66d648f8b686c88ac269c6bea05195c91a78614f120d1072cb366",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0847fc156cc128a025d6a97c7484dece2c9c241d53eff82ad5cb9a19656478ba9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03f65502c5883ff490e9dd7a9e09eb306cbae86f74ace9402f65fddeffc3d5069a0360793cbc0f66d648f8b686c88ac269c6bea05195c91a78614f120d1072cb366a04ae7ced2de6bdd367a0df5031a324931c5faa3da3875c79206b689d82886617ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b2fc8203e880a084ce56595e291ec8922036577df4ad55ac08d92677e416ad4a5c06f29a4574f8880badde1897c51c43f90141f9013e8001840509d22c94095e7baea6a6c7c4c2dfeb977efac326af552d8784574e8a2db8d87fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001407f0000000000000000000000000000000000000000000000000000000000000001417f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f72086c539905609b44a1018c78826b1ba0ac3230750dc83310354d255d19435f0c7a6086729ed78971c883280f67ba43eaa04ba44c7f224881dc0cbe768a90333a08dff594422b4ccde8cb4e147487ebd923c0",
+                "rlp" : "0xf90344f901fca0847fc156cc128a025d6a97c7484dece2c9c241d53eff82ad5cb9a19656478ba9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03f65502c5883ff490e9dd7a9e09eb306cbae86f74ace9402f65fddeffc3d5069a0360793cbc0f66d648f8b686c88ac269c6bea05195c91a78614f120d1072cb366a04ae7ced2de6bdd367a0df5031a324931c5faa3da3875c79206b689d82886617ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b2fc8203e880a0809210cb78fd4f1acac9acf715142ba273493e666c01fdaee5895ebfbccada708840c7604a4909af01f90141f9013e8001840509d22c94095e7baea6a6c7c4c2dfeb977efac326af552d8784574e8a2db8d87fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001407f0000000000000000000000000000000000000000000000000000000000000001417f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f72086c539905609b44a1018c78826b1ba0ac3230750dc83310354d255d19435f0c7a6086729ed78971c883280f67ba43eaa04ba44c7f224881dc0cbe768a90333a08dff594422b4ccde8cb4e147487ebd923c0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001407f0000000000000000000000000000000000000000000000000000000000000001417f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f72086c539905609b44a1018c78826b",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08edb9c3d10d5f3ce8268c7628febffc59a5c9b49dd906611b3bd697ea7c6aa1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xecb3fafa71b075b9b82279e00b8ff192c77b77785a63109a4fee085d5b1efec4",
+        "lastblockhash" : "0x5e28842ad8a9396ae06019f6933d7c0acf3ae05e16527756d251f4d205dcbb3a",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest203BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest203BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest203BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb2fc",
-                    "hash" : "0x0d3973c25e21daaac998c599c8972ada1b4d6a460fe6fbe07d6c42eb3dae6163",
-                    "mixHash" : "0x9a54193203c1b669ab96b65b107a9304b5cee6cfd5169ab724b849bd8508af6c",
-                    "nonce" : "0x5bd244178609c626",
+                    "hash" : "0xfbbf24e27dc7ac71f9b76a41447b9b5356d95227785a288f470cc14f2618820b",
+                    "mixHash" : "0x085a6f21212bdc4839fdeb1f174d0582bbf17827afb9754b5c7d7158a8465af6",
+                    "nonce" : "0xb6e862ed75fd5cf3",
                     "number" : "0x01",
                     "parentHash" : "0x847fc156cc128a025d6a97c7484dece2c9c241d53eff82ad5cb9a19656478ba9",
                     "receiptTrie" : "0x4ae7ced2de6bdd367a0df5031a324931c5faa3da3875c79206b689d82886617a",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0x360793cbc0f66d648f8b686c88ac269c6bea05195c91a78614f120d1072cb366",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0847fc156cc128a025d6a97c7484dece2c9c241d53eff82ad5cb9a19656478ba9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03f65502c5883ff490e9dd7a9e09eb306cbae86f74ace9402f65fddeffc3d5069a0360793cbc0f66d648f8b686c88ac269c6bea05195c91a78614f120d1072cb366a04ae7ced2de6bdd367a0df5031a324931c5faa3da3875c79206b689d82886617ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b2fc8203e880a09a54193203c1b669ab96b65b107a9304b5cee6cfd5169ab724b849bd8508af6c885bd244178609c626f90141f9013e8001840509d22c94095e7baea6a6c7c4c2dfeb977efac326af552d8784574e8a2db8d87fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001407f0000000000000000000000000000000000000000000000000000000000000001417f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f72086c539905609b44a1018c78826b1ba0ac3230750dc83310354d255d19435f0c7a6086729ed78971c883280f67ba43eaa04ba44c7f224881dc0cbe768a90333a08dff594422b4ccde8cb4e147487ebd923c0",
+                "rlp" : "0xf90344f901fca0847fc156cc128a025d6a97c7484dece2c9c241d53eff82ad5cb9a19656478ba9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03f65502c5883ff490e9dd7a9e09eb306cbae86f74ace9402f65fddeffc3d5069a0360793cbc0f66d648f8b686c88ac269c6bea05195c91a78614f120d1072cb366a04ae7ced2de6bdd367a0df5031a324931c5faa3da3875c79206b689d82886617ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b2fc8203e880a0085a6f21212bdc4839fdeb1f174d0582bbf17827afb9754b5c7d7158a8465af688b6e862ed75fd5cf3f90141f9013e8001840509d22c94095e7baea6a6c7c4c2dfeb977efac326af552d8784574e8a2db8d87fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001407f0000000000000000000000000000000000000000000000000000000000000001417f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f72086c539905609b44a1018c78826b1ba0ac3230750dc83310354d255d19435f0c7a6086729ed78971c883280f67ba43eaa04ba44c7f224881dc0cbe768a90333a08dff594422b4ccde8cb4e147487ebd923c0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001407f0000000000000000000000000000000000000000000000000000000000000001417f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f72086c539905609b44a1018c78826b",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08edb9c3d10d5f3ce8268c7628febffc59a5c9b49dd906611b3bd697ea7c6aa1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0d3973c25e21daaac998c599c8972ada1b4d6a460fe6fbe07d6c42eb3dae6163",
+        "lastblockhash" : "0xfbbf24e27dc7ac71f9b76a41447b9b5356d95227785a288f470cc14f2618820b",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest213BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest213BC.json
index 751b563c4..84875a281 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest213BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest213BC.json
@@ -2,8 +2,8 @@
     "randomStatetest213BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest213BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest213BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xba39",
-                    "hash" : "0x21d16669c2fb8142289cb73aa2616924f792bdf4ce008a14aebe964f6da5d912",
-                    "mixHash" : "0x04c90766712628802d580e086e080bafa8c3a8c66ff14dd353831f8b9325262d",
-                    "nonce" : "0x52fe39999ddcfe9e",
+                    "hash" : "0x69af5646a49faf1aaa7fb13410962b4a3e428f1de3deb3c0546ad1ff76b80a9e",
+                    "mixHash" : "0x55ca6df4cd5f6985d5b7b8816313c527ecb8b1fb64c69459a7fe48bcf17c27c9",
+                    "nonce" : "0x3fb590c54c47e336",
                     "number" : "0x01",
                     "parentHash" : "0x0a533130fa6de7c0b017def197d33d940ccccd597bc6d9d72eb541e1bfbf618e",
                     "receiptTrie" : "0x8a1863377828da47721c7a0d49ba6418fe29341e7539bb34e7f0ea36cd4a7ddf",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xe64b4a4e287a60c2b8b503b0bbdc864d0ecdaf80cffba44e88e3d21ee8207053",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e2f901fca00a533130fa6de7c0b017def197d33d940ccccd597bc6d9d72eb541e1bfbf618ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0619b87a2e0d16b7ac03a7ac669f888c01822d1699c256b72f1a81008b6dc6b89a0e64b4a4e287a60c2b8b503b0bbdc864d0ecdaf80cffba44e88e3d21ee8207053a08a1863377828da47721c7a0d49ba6418fe29341e7539bb34e7f0ea36cd4a7ddfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82ba398203e880a004c90766712628802d580e086e080bafa8c3a8c66ff14dd353831f8b9325262d8852fe39999ddcfe9ef8e0f8de8001843d40466494095e7baea6a6c7c4c2dfeb977efac326af552d878461cd5764b8784338407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff425a7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f3b1860586d8587cc788e106fa3937f1ca0a20b6d234ef8e08a44342a1182abe4d6762d2f6415d1e0e4aa4bf4f9723b5ee7a0115959b53b888eec791d6522935efac78ea0932f449fae551a8897ce0abc280dc0",
+                "rlp" : "0xf902e2f901fca00a533130fa6de7c0b017def197d33d940ccccd597bc6d9d72eb541e1bfbf618ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0619b87a2e0d16b7ac03a7ac669f888c01822d1699c256b72f1a81008b6dc6b89a0e64b4a4e287a60c2b8b503b0bbdc864d0ecdaf80cffba44e88e3d21ee8207053a08a1863377828da47721c7a0d49ba6418fe29341e7539bb34e7f0ea36cd4a7ddfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82ba398203e880a055ca6df4cd5f6985d5b7b8816313c527ecb8b1fb64c69459a7fe48bcf17c27c9883fb590c54c47e336f8e0f8de8001843d40466494095e7baea6a6c7c4c2dfeb977efac326af552d878461cd5764b8784338407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff425a7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f3b1860586d8587cc788e106fa3937f1ca0a20b6d234ef8e08a44342a1182abe4d6762d2f6415d1e0e4aa4bf4f9723b5ee7a0115959b53b888eec791d6522935efac78ea0932f449fae551a8897ce0abc280dc0",
                 "transactions" : [
                     {
                         "data" : "0x4338407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff425a7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f3b1860586d8587cc788e106fa3937f",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0392e68f9e4ade989eb363972204e68ac3e3c29da90b3537b69afa53493c2029da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x21d16669c2fb8142289cb73aa2616924f792bdf4ce008a14aebe964f6da5d912",
+        "lastblockhash" : "0x69af5646a49faf1aaa7fb13410962b4a3e428f1de3deb3c0546ad1ff76b80a9e",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest213BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest213BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest213BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xbd45",
-                    "hash" : "0x62d1043484e1b8d9988bba231def661e535f0b42d8c0969e8113ef3c60faaf03",
-                    "mixHash" : "0xb3987552245a8ee19b9477c373c5c6a42a028b78452816fbdabc92df58316c21",
-                    "nonce" : "0xd097578c49354d2a",
+                    "hash" : "0xeb5a465726ebbc77cca8da244a258cec9ef448b102d83e285533f40a766a9c46",
+                    "mixHash" : "0x92e88f07c5e59c0def9f2ea47ab783d66969b21c9839150d42807f647ccc36c0",
+                    "nonce" : "0xec027a02fc1a7623",
                     "number" : "0x01",
                     "parentHash" : "0x0a533130fa6de7c0b017def197d33d940ccccd597bc6d9d72eb541e1bfbf618e",
                     "receiptTrie" : "0x6a6d5ea86e0ab1c9ee9f3801d17eec33c41f688c0d5f5edbf74b83b4dbc4a7af",
-                    "stateRoot" : "0x75990dd41b2c33a3cf36f60a934526ff63114703830e1d8b60711d0ef4885c2f",
+                    "stateRoot" : "0x2f7c62c6a49eaa6891eb4e44f3bc04c0662aad443b6b4fb7f7307bcce5d4d7bc",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe64b4a4e287a60c2b8b503b0bbdc864d0ecdaf80cffba44e88e3d21ee8207053",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e2f901fca00a533130fa6de7c0b017def197d33d940ccccd597bc6d9d72eb541e1bfbf618ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a075990dd41b2c33a3cf36f60a934526ff63114703830e1d8b60711d0ef4885c2fa0e64b4a4e287a60c2b8b503b0bbdc864d0ecdaf80cffba44e88e3d21ee8207053a06a6d5ea86e0ab1c9ee9f3801d17eec33c41f688c0d5f5edbf74b83b4dbc4a7afb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bd458203e880a0b3987552245a8ee19b9477c373c5c6a42a028b78452816fbdabc92df58316c2188d097578c49354d2af8e0f8de8001843d40466494095e7baea6a6c7c4c2dfeb977efac326af552d878461cd5764b8784338407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff425a7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f3b1860586d8587cc788e106fa3937f1ca0a20b6d234ef8e08a44342a1182abe4d6762d2f6415d1e0e4aa4bf4f9723b5ee7a0115959b53b888eec791d6522935efac78ea0932f449fae551a8897ce0abc280dc0",
+                "rlp" : "0xf902e2f901fca00a533130fa6de7c0b017def197d33d940ccccd597bc6d9d72eb541e1bfbf618ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02f7c62c6a49eaa6891eb4e44f3bc04c0662aad443b6b4fb7f7307bcce5d4d7bca0e64b4a4e287a60c2b8b503b0bbdc864d0ecdaf80cffba44e88e3d21ee8207053a06a6d5ea86e0ab1c9ee9f3801d17eec33c41f688c0d5f5edbf74b83b4dbc4a7afb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bd458203e880a092e88f07c5e59c0def9f2ea47ab783d66969b21c9839150d42807f647ccc36c088ec027a02fc1a7623f8e0f8de8001843d40466494095e7baea6a6c7c4c2dfeb977efac326af552d878461cd5764b8784338407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff425a7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f3b1860586d8587cc788e106fa3937f1ca0a20b6d234ef8e08a44342a1182abe4d6762d2f6415d1e0e4aa4bf4f9723b5ee7a0115959b53b888eec791d6522935efac78ea0932f449fae551a8897ce0abc280dc0",
                 "transactions" : [
                     {
                         "data" : "0x4338407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff425a7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f3b1860586d8587cc788e106fa3937f",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0392e68f9e4ade989eb363972204e68ac3e3c29da90b3537b69afa53493c2029da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x62d1043484e1b8d9988bba231def661e535f0b42d8c0969e8113ef3c60faaf03",
+        "lastblockhash" : "0xeb5a465726ebbc77cca8da244a258cec9ef448b102d83e285533f40a766a9c46",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x61cd5764",
                 "code" : "0x4338407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff425a7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f3b1860586d8587cc788e106fa3937f5560005155",
@@ -235,8 +228,8 @@
     "randomStatetest213BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest213BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest213BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xba39",
-                    "hash" : "0x525669d4dd89d138e95c621f4f6bdd3901db2ef23623b9c2c44cfa0919e0af22",
-                    "mixHash" : "0x4ffbabc137c217137e903ef75e8dc0640ca313eec29d482c711898f401d7fc63",
-                    "nonce" : "0xac5d720f6090f045",
+                    "hash" : "0xb65c58644af298b35f5c9a7d9fa3a8feddf46f9bc94084d20c5bb67928dd5bf0",
+                    "mixHash" : "0x3e3af450287cc4150d9fa03c9adce8dbc6a99f8b721d1c45c9070311c3fdc192",
+                    "nonce" : "0xadb670ef055d69d1",
                     "number" : "0x01",
                     "parentHash" : "0x0a533130fa6de7c0b017def197d33d940ccccd597bc6d9d72eb541e1bfbf618e",
                     "receiptTrie" : "0x8834105fe17d3ff7c3021f468045101937a425d79374d8a517c2c84febf449bd",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xe64b4a4e287a60c2b8b503b0bbdc864d0ecdaf80cffba44e88e3d21ee8207053",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e2f901fca00a533130fa6de7c0b017def197d33d940ccccd597bc6d9d72eb541e1bfbf618ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07bcd4376e9bd06ede486aaaec1f4fbf4549f103664de2e464179731c27261df7a0e64b4a4e287a60c2b8b503b0bbdc864d0ecdaf80cffba44e88e3d21ee8207053a08834105fe17d3ff7c3021f468045101937a425d79374d8a517c2c84febf449bdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82ba398203e880a04ffbabc137c217137e903ef75e8dc0640ca313eec29d482c711898f401d7fc6388ac5d720f6090f045f8e0f8de8001843d40466494095e7baea6a6c7c4c2dfeb977efac326af552d878461cd5764b8784338407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff425a7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f3b1860586d8587cc788e106fa3937f1ca0a20b6d234ef8e08a44342a1182abe4d6762d2f6415d1e0e4aa4bf4f9723b5ee7a0115959b53b888eec791d6522935efac78ea0932f449fae551a8897ce0abc280dc0",
+                "rlp" : "0xf902e2f901fca00a533130fa6de7c0b017def197d33d940ccccd597bc6d9d72eb541e1bfbf618ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07bcd4376e9bd06ede486aaaec1f4fbf4549f103664de2e464179731c27261df7a0e64b4a4e287a60c2b8b503b0bbdc864d0ecdaf80cffba44e88e3d21ee8207053a08834105fe17d3ff7c3021f468045101937a425d79374d8a517c2c84febf449bdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82ba398203e880a03e3af450287cc4150d9fa03c9adce8dbc6a99f8b721d1c45c9070311c3fdc19288adb670ef055d69d1f8e0f8de8001843d40466494095e7baea6a6c7c4c2dfeb977efac326af552d878461cd5764b8784338407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff425a7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f3b1860586d8587cc788e106fa3937f1ca0a20b6d234ef8e08a44342a1182abe4d6762d2f6415d1e0e4aa4bf4f9723b5ee7a0115959b53b888eec791d6522935efac78ea0932f449fae551a8897ce0abc280dc0",
                 "transactions" : [
                     {
                         "data" : "0x4338407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff425a7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f3b1860586d8587cc788e106fa3937f",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0392e68f9e4ade989eb363972204e68ac3e3c29da90b3537b69afa53493c2029da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x525669d4dd89d138e95c621f4f6bdd3901db2ef23623b9c2c44cfa0919e0af22",
+        "lastblockhash" : "0xb65c58644af298b35f5c9a7d9fa3a8feddf46f9bc94084d20c5bb67928dd5bf0",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest213BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest213BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest213BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xba39",
-                    "hash" : "0xfc090444d8de553a0c8030e403185e843e1cb780253fdf15d38a450c92b56de5",
-                    "mixHash" : "0x093e44f22d265672ad3b39a69c78e2f52316c96214e66034e275d556ab8ceadc",
-                    "nonce" : "0x15c36e618d069975",
+                    "hash" : "0x8ef0563ff7cf9b6e43fa2d20ef8b8d00a0d0fd4ea0067a5fb9d6abfd3b6b5941",
+                    "mixHash" : "0xea432c3d9bf826fcfd51d45bea6af1f8a76e1e9bba5d906e597b5573b4069cb7",
+                    "nonce" : "0xf48c2cc895891ad7",
                     "number" : "0x01",
                     "parentHash" : "0x0a533130fa6de7c0b017def197d33d940ccccd597bc6d9d72eb541e1bfbf618e",
                     "receiptTrie" : "0x8834105fe17d3ff7c3021f468045101937a425d79374d8a517c2c84febf449bd",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xe64b4a4e287a60c2b8b503b0bbdc864d0ecdaf80cffba44e88e3d21ee8207053",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e2f901fca00a533130fa6de7c0b017def197d33d940ccccd597bc6d9d72eb541e1bfbf618ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07bcd4376e9bd06ede486aaaec1f4fbf4549f103664de2e464179731c27261df7a0e64b4a4e287a60c2b8b503b0bbdc864d0ecdaf80cffba44e88e3d21ee8207053a08834105fe17d3ff7c3021f468045101937a425d79374d8a517c2c84febf449bdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82ba398203e880a0093e44f22d265672ad3b39a69c78e2f52316c96214e66034e275d556ab8ceadc8815c36e618d069975f8e0f8de8001843d40466494095e7baea6a6c7c4c2dfeb977efac326af552d878461cd5764b8784338407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff425a7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f3b1860586d8587cc788e106fa3937f1ca0a20b6d234ef8e08a44342a1182abe4d6762d2f6415d1e0e4aa4bf4f9723b5ee7a0115959b53b888eec791d6522935efac78ea0932f449fae551a8897ce0abc280dc0",
+                "rlp" : "0xf902e2f901fca00a533130fa6de7c0b017def197d33d940ccccd597bc6d9d72eb541e1bfbf618ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07bcd4376e9bd06ede486aaaec1f4fbf4549f103664de2e464179731c27261df7a0e64b4a4e287a60c2b8b503b0bbdc864d0ecdaf80cffba44e88e3d21ee8207053a08834105fe17d3ff7c3021f468045101937a425d79374d8a517c2c84febf449bdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82ba398203e880a0ea432c3d9bf826fcfd51d45bea6af1f8a76e1e9bba5d906e597b5573b4069cb788f48c2cc895891ad7f8e0f8de8001843d40466494095e7baea6a6c7c4c2dfeb977efac326af552d878461cd5764b8784338407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff425a7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f3b1860586d8587cc788e106fa3937f1ca0a20b6d234ef8e08a44342a1182abe4d6762d2f6415d1e0e4aa4bf4f9723b5ee7a0115959b53b888eec791d6522935efac78ea0932f449fae551a8897ce0abc280dc0",
                 "transactions" : [
                     {
                         "data" : "0x4338407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff425a7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f3b1860586d8587cc788e106fa3937f",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0392e68f9e4ade989eb363972204e68ac3e3c29da90b3537b69afa53493c2029da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfc090444d8de553a0c8030e403185e843e1cb780253fdf15d38a450c92b56de5",
+        "lastblockhash" : "0x8ef0563ff7cf9b6e43fa2d20ef8b8d00a0d0fd4ea0067a5fb9d6abfd3b6b5941",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest213BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest213BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest213BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xba39",
-                    "hash" : "0xb9165e41e03dd9615b61cf3052a4242a38babf5928a923d54e6c1137252600b4",
-                    "mixHash" : "0xe65c4c349d4ee6c4d77949822cdc97e61693060a4197767a8440afb314c13fd8",
-                    "nonce" : "0x2aecc2bfa28b067c",
+                    "hash" : "0xc797dbb8391d3d99c7fc576a5808e452f7aa6d7e505611d621d8eaebc97b18c3",
+                    "mixHash" : "0xd906d5983023c4fd7264d4ef6e8baf0c7924cd75621eedb2a4c45889f073bfd6",
+                    "nonce" : "0xc18d0f2741cad012",
                     "number" : "0x01",
                     "parentHash" : "0x0a533130fa6de7c0b017def197d33d940ccccd597bc6d9d72eb541e1bfbf618e",
                     "receiptTrie" : "0x8834105fe17d3ff7c3021f468045101937a425d79374d8a517c2c84febf449bd",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xe64b4a4e287a60c2b8b503b0bbdc864d0ecdaf80cffba44e88e3d21ee8207053",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e2f901fca00a533130fa6de7c0b017def197d33d940ccccd597bc6d9d72eb541e1bfbf618ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07bcd4376e9bd06ede486aaaec1f4fbf4549f103664de2e464179731c27261df7a0e64b4a4e287a60c2b8b503b0bbdc864d0ecdaf80cffba44e88e3d21ee8207053a08834105fe17d3ff7c3021f468045101937a425d79374d8a517c2c84febf449bdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82ba398203e880a0e65c4c349d4ee6c4d77949822cdc97e61693060a4197767a8440afb314c13fd8882aecc2bfa28b067cf8e0f8de8001843d40466494095e7baea6a6c7c4c2dfeb977efac326af552d878461cd5764b8784338407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff425a7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f3b1860586d8587cc788e106fa3937f1ca0a20b6d234ef8e08a44342a1182abe4d6762d2f6415d1e0e4aa4bf4f9723b5ee7a0115959b53b888eec791d6522935efac78ea0932f449fae551a8897ce0abc280dc0",
+                "rlp" : "0xf902e2f901fca00a533130fa6de7c0b017def197d33d940ccccd597bc6d9d72eb541e1bfbf618ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07bcd4376e9bd06ede486aaaec1f4fbf4549f103664de2e464179731c27261df7a0e64b4a4e287a60c2b8b503b0bbdc864d0ecdaf80cffba44e88e3d21ee8207053a08834105fe17d3ff7c3021f468045101937a425d79374d8a517c2c84febf449bdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82ba398203e880a0d906d5983023c4fd7264d4ef6e8baf0c7924cd75621eedb2a4c45889f073bfd688c18d0f2741cad012f8e0f8de8001843d40466494095e7baea6a6c7c4c2dfeb977efac326af552d878461cd5764b8784338407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff425a7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f3b1860586d8587cc788e106fa3937f1ca0a20b6d234ef8e08a44342a1182abe4d6762d2f6415d1e0e4aa4bf4f9723b5ee7a0115959b53b888eec791d6522935efac78ea0932f449fae551a8897ce0abc280dc0",
                 "transactions" : [
                     {
                         "data" : "0x4338407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff425a7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f3b1860586d8587cc788e106fa3937f",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0392e68f9e4ade989eb363972204e68ac3e3c29da90b3537b69afa53493c2029da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb9165e41e03dd9615b61cf3052a4242a38babf5928a923d54e6c1137252600b4",
+        "lastblockhash" : "0xc797dbb8391d3d99c7fc576a5808e452f7aa6d7e505611d621d8eaebc97b18c3",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest213BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest213BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest213BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xba39",
-                    "hash" : "0x74268781dec3815b254fb0f5afd517c8986daa11e483d75c2e7f1735dd11949b",
-                    "mixHash" : "0xc996c6ca6aaa0df885a2cf246c2eae11b5d7dba0ccb587dd5f01cb63923a6e8d",
-                    "nonce" : "0x5cfb5d4fd5c1a495",
+                    "hash" : "0xcfd5b052fd960b9968f328c21c4010875e30a9b594181dc7551c5933c24ccdf6",
+                    "mixHash" : "0xa7d6edbd56b4b41a69c1dfc54775ad8114ce4170087f5ef1618729dd52f40a1f",
+                    "nonce" : "0x0a8853c11efa1679",
                     "number" : "0x01",
                     "parentHash" : "0x0a533130fa6de7c0b017def197d33d940ccccd597bc6d9d72eb541e1bfbf618e",
                     "receiptTrie" : "0x8834105fe17d3ff7c3021f468045101937a425d79374d8a517c2c84febf449bd",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xe64b4a4e287a60c2b8b503b0bbdc864d0ecdaf80cffba44e88e3d21ee8207053",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e2f901fca00a533130fa6de7c0b017def197d33d940ccccd597bc6d9d72eb541e1bfbf618ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07bcd4376e9bd06ede486aaaec1f4fbf4549f103664de2e464179731c27261df7a0e64b4a4e287a60c2b8b503b0bbdc864d0ecdaf80cffba44e88e3d21ee8207053a08834105fe17d3ff7c3021f468045101937a425d79374d8a517c2c84febf449bdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82ba398203e880a0c996c6ca6aaa0df885a2cf246c2eae11b5d7dba0ccb587dd5f01cb63923a6e8d885cfb5d4fd5c1a495f8e0f8de8001843d40466494095e7baea6a6c7c4c2dfeb977efac326af552d878461cd5764b8784338407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff425a7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f3b1860586d8587cc788e106fa3937f1ca0a20b6d234ef8e08a44342a1182abe4d6762d2f6415d1e0e4aa4bf4f9723b5ee7a0115959b53b888eec791d6522935efac78ea0932f449fae551a8897ce0abc280dc0",
+                "rlp" : "0xf902e2f901fca00a533130fa6de7c0b017def197d33d940ccccd597bc6d9d72eb541e1bfbf618ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07bcd4376e9bd06ede486aaaec1f4fbf4549f103664de2e464179731c27261df7a0e64b4a4e287a60c2b8b503b0bbdc864d0ecdaf80cffba44e88e3d21ee8207053a08834105fe17d3ff7c3021f468045101937a425d79374d8a517c2c84febf449bdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82ba398203e880a0a7d6edbd56b4b41a69c1dfc54775ad8114ce4170087f5ef1618729dd52f40a1f880a8853c11efa1679f8e0f8de8001843d40466494095e7baea6a6c7c4c2dfeb977efac326af552d878461cd5764b8784338407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff425a7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f3b1860586d8587cc788e106fa3937f1ca0a20b6d234ef8e08a44342a1182abe4d6762d2f6415d1e0e4aa4bf4f9723b5ee7a0115959b53b888eec791d6522935efac78ea0932f449fae551a8897ce0abc280dc0",
                 "transactions" : [
                     {
                         "data" : "0x4338407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff425a7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f3b1860586d8587cc788e106fa3937f",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0392e68f9e4ade989eb363972204e68ac3e3c29da90b3537b69afa53493c2029da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x74268781dec3815b254fb0f5afd517c8986daa11e483d75c2e7f1735dd11949b",
+        "lastblockhash" : "0xcfd5b052fd960b9968f328c21c4010875e30a9b594181dc7551c5933c24ccdf6",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest218BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest218BC.json
index 46236d2e2..3f6c253a8 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest218BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest218BC.json
@@ -2,8 +2,8 @@
     "randomStatetest218BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest218BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest218BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xcb17",
-                    "hash" : "0x79f098b288bd91a085b544c7c9daebf2761ab1a11a6460e6ffb91fb4f864012a",
-                    "mixHash" : "0xa8573cfac73789a5d5263558e7c34284f5359ee806afecc87e66c5bfda800a46",
-                    "nonce" : "0x743d36d4a50abe05",
+                    "hash" : "0x793cc48cc7d88bd68f77f375f2716559cb6831ada16d0ae028de79182bf97ebc",
+                    "mixHash" : "0x67ee4e7ef3f126dfbae3977ee172214244aa9025f41913924955253c8450d61c",
+                    "nonce" : "0x30349729a3cca62e",
                     "number" : "0x01",
                     "parentHash" : "0x450d1c75e19a27da6d4b2d785dd690b802e48d0d129df5e36925de258f32ea34",
                     "receiptTrie" : "0x65454f67cce29ae974ae2d2471198c2f2a4ece985980215c7b9f725cea5a1a43",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x96afd4922b9a2b54ebd10b3ea5c2d4ba55fc6f9fef9f8ca3f274079f39264648",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90335f901fca0450d1c75e19a27da6d4b2d785dd690b802e48d0d129df5e36925de258f32ea34a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c861fc2f28f660aec861aad10d227cee431de47d6de94ae9b1be4d0409eb417ea096afd4922b9a2b54ebd10b3ea5c2d4ba55fc6f9fef9f8ca3f274079f39264648a065454f67cce29ae974ae2d2471198c2f2a4ece985980215c7b9f725cea5a1a43b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cb178203e880a0a8573cfac73789a5d5263558e7c34284f5359ee806afecc87e66c5bfda800a4688743d36d4a50abe05f90132f9012f80018454dd471594095e7baea6a6c7c4c2dfeb977efac326af552d878435d3cf40b8c97fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe091ba04a2cab8705109a6e4548cb92cac5b36d331ccd779b466d05800c6c74e1e29695a048f378cd7653d28ddcdaa492c202156716ed62ed92150dbe53ae10a31ff9c9cfc0",
+                "rlp" : "0xf90335f901fca0450d1c75e19a27da6d4b2d785dd690b802e48d0d129df5e36925de258f32ea34a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c861fc2f28f660aec861aad10d227cee431de47d6de94ae9b1be4d0409eb417ea096afd4922b9a2b54ebd10b3ea5c2d4ba55fc6f9fef9f8ca3f274079f39264648a065454f67cce29ae974ae2d2471198c2f2a4ece985980215c7b9f725cea5a1a43b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cb178203e880a067ee4e7ef3f126dfbae3977ee172214244aa9025f41913924955253c8450d61c8830349729a3cca62ef90132f9012f80018454dd471594095e7baea6a6c7c4c2dfeb977efac326af552d878435d3cf40b8c97fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe091ba04a2cab8705109a6e4548cb92cac5b36d331ccd779b466d05800c6c74e1e29695a048f378cd7653d28ddcdaa492c202156716ed62ed92150dbe53ae10a31ff9c9cfc0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00b75dd29297c0866eb0e811f682d735f56543d3c61b7448dc65c0dcb844668caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x79f098b288bd91a085b544c7c9daebf2761ab1a11a6460e6ffb91fb4f864012a",
+        "lastblockhash" : "0x793cc48cc7d88bd68f77f375f2716559cb6831ada16d0ae028de79182bf97ebc",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest218BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest218BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest218BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xd12f",
-                    "hash" : "0xa52c49969398b6bdb56c87b0e30094c8b3205227fea99aae67881943c3a53781",
-                    "mixHash" : "0x981dfc9fcb6f5fb51c2ad253c390049f50aa3d4c3a0d1d6a6a3899ba6da545cf",
-                    "nonce" : "0x5b22f8551e4436fb",
+                    "hash" : "0x901289bdb0ff989fae87a8beba11631660b6418c38143ac453797b6c3a218b26",
+                    "mixHash" : "0x22eb26e86942f7aee4bbc8724fd8e42339431a57fbac7e6dbcccecbdd0baaae0",
+                    "nonce" : "0xe5f3aa9177bae79e",
                     "number" : "0x01",
                     "parentHash" : "0x450d1c75e19a27da6d4b2d785dd690b802e48d0d129df5e36925de258f32ea34",
                     "receiptTrie" : "0xd60f10e3d34684814eef329334338f073944419754a1107c153cdefebe8c1603",
-                    "stateRoot" : "0xbb48ba6ddb9731df4fa65d909706dc27277cfefe3de275ad724d49170d59055b",
+                    "stateRoot" : "0xad13b00727c7f66bf504c16dfb0a988779967f87d824b955ebfc5a02bb60941b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x96afd4922b9a2b54ebd10b3ea5c2d4ba55fc6f9fef9f8ca3f274079f39264648",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90335f901fca0450d1c75e19a27da6d4b2d785dd690b802e48d0d129df5e36925de258f32ea34a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0bb48ba6ddb9731df4fa65d909706dc27277cfefe3de275ad724d49170d59055ba096afd4922b9a2b54ebd10b3ea5c2d4ba55fc6f9fef9f8ca3f274079f39264648a0d60f10e3d34684814eef329334338f073944419754a1107c153cdefebe8c1603b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82d12f8203e880a0981dfc9fcb6f5fb51c2ad253c390049f50aa3d4c3a0d1d6a6a3899ba6da545cf885b22f8551e4436fbf90132f9012f80018454dd471594095e7baea6a6c7c4c2dfeb977efac326af552d878435d3cf40b8c97fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe091ba04a2cab8705109a6e4548cb92cac5b36d331ccd779b466d05800c6c74e1e29695a048f378cd7653d28ddcdaa492c202156716ed62ed92150dbe53ae10a31ff9c9cfc0",
+                "rlp" : "0xf90335f901fca0450d1c75e19a27da6d4b2d785dd690b802e48d0d129df5e36925de258f32ea34a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ad13b00727c7f66bf504c16dfb0a988779967f87d824b955ebfc5a02bb60941ba096afd4922b9a2b54ebd10b3ea5c2d4ba55fc6f9fef9f8ca3f274079f39264648a0d60f10e3d34684814eef329334338f073944419754a1107c153cdefebe8c1603b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82d12f8203e880a022eb26e86942f7aee4bbc8724fd8e42339431a57fbac7e6dbcccecbdd0baaae088e5f3aa9177bae79ef90132f9012f80018454dd471594095e7baea6a6c7c4c2dfeb977efac326af552d878435d3cf40b8c97fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe091ba04a2cab8705109a6e4548cb92cac5b36d331ccd779b466d05800c6c74e1e29695a048f378cd7653d28ddcdaa492c202156716ed62ed92150dbe53ae10a31ff9c9cfc0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00b75dd29297c0866eb0e811f682d735f56543d3c61b7448dc65c0dcb844668caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa52c49969398b6bdb56c87b0e30094c8b3205227fea99aae67881943c3a53781",
+        "lastblockhash" : "0x901289bdb0ff989fae87a8beba11631660b6418c38143ac453797b6c3a218b26",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x35d3cf40",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0960005155",
@@ -235,8 +228,8 @@
     "randomStatetest218BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest218BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest218BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xcb17",
-                    "hash" : "0x9c6906864ce3307735a369a84f11fd20a8fca62256479084f957d29d628c93f0",
-                    "mixHash" : "0x7d8c7a7af17d56029419fa3fc7c716fa6500d9f2d0bc5e087d1f15d72d9c727e",
-                    "nonce" : "0xe0d1d0a325d2778a",
+                    "hash" : "0xfba2d1664fe239bbb17fe0333184260867e09360c9701697b8d9935f19a1bf15",
+                    "mixHash" : "0xf6f8ddf13f17873a9b9b380d521a32ff0c1d502a7338dce127b74c10572d40af",
+                    "nonce" : "0xc30331f293722653",
                     "number" : "0x01",
                     "parentHash" : "0x450d1c75e19a27da6d4b2d785dd690b802e48d0d129df5e36925de258f32ea34",
                     "receiptTrie" : "0x3d82ba770e5e0c5b8fa7fbc6974db94f631f6b03f217c020d992ae3e79d931e9",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0x96afd4922b9a2b54ebd10b3ea5c2d4ba55fc6f9fef9f8ca3f274079f39264648",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90335f901fca0450d1c75e19a27da6d4b2d785dd690b802e48d0d129df5e36925de258f32ea34a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a6203e518ebca11c07f16dd1e47a3fcdd7a76e07dadb584e7ede573009ed0cc3a096afd4922b9a2b54ebd10b3ea5c2d4ba55fc6f9fef9f8ca3f274079f39264648a03d82ba770e5e0c5b8fa7fbc6974db94f631f6b03f217c020d992ae3e79d931e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cb178203e880a07d8c7a7af17d56029419fa3fc7c716fa6500d9f2d0bc5e087d1f15d72d9c727e88e0d1d0a325d2778af90132f9012f80018454dd471594095e7baea6a6c7c4c2dfeb977efac326af552d878435d3cf40b8c97fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe091ba04a2cab8705109a6e4548cb92cac5b36d331ccd779b466d05800c6c74e1e29695a048f378cd7653d28ddcdaa492c202156716ed62ed92150dbe53ae10a31ff9c9cfc0",
+                "rlp" : "0xf90335f901fca0450d1c75e19a27da6d4b2d785dd690b802e48d0d129df5e36925de258f32ea34a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a6203e518ebca11c07f16dd1e47a3fcdd7a76e07dadb584e7ede573009ed0cc3a096afd4922b9a2b54ebd10b3ea5c2d4ba55fc6f9fef9f8ca3f274079f39264648a03d82ba770e5e0c5b8fa7fbc6974db94f631f6b03f217c020d992ae3e79d931e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cb178203e880a0f6f8ddf13f17873a9b9b380d521a32ff0c1d502a7338dce127b74c10572d40af88c30331f293722653f90132f9012f80018454dd471594095e7baea6a6c7c4c2dfeb977efac326af552d878435d3cf40b8c97fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe091ba04a2cab8705109a6e4548cb92cac5b36d331ccd779b466d05800c6c74e1e29695a048f378cd7653d28ddcdaa492c202156716ed62ed92150dbe53ae10a31ff9c9cfc0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00b75dd29297c0866eb0e811f682d735f56543d3c61b7448dc65c0dcb844668caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9c6906864ce3307735a369a84f11fd20a8fca62256479084f957d29d628c93f0",
+        "lastblockhash" : "0xfba2d1664fe239bbb17fe0333184260867e09360c9701697b8d9935f19a1bf15",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest218BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest218BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest218BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xcb17",
-                    "hash" : "0x1ecaa55fda69b1e52fe937e996f5a7be9fcb65c0b653ddd1c5e1499378a70b67",
-                    "mixHash" : "0xe8e6115b91b1a6b190d85921db708f3f53f4bbb850b12876fbc1a8c4aac8e9db",
-                    "nonce" : "0x09cf0621854b1792",
+                    "hash" : "0x695c7acb19facc1190777e2bccc2ed1ce09047f688a0ae39601559dec318bea1",
+                    "mixHash" : "0x6df62ebd73130e7779cced9ad26adee71cff961e669c4e947a30fee3eee6ca02",
+                    "nonce" : "0x3d2232b92331c5c6",
                     "number" : "0x01",
                     "parentHash" : "0x450d1c75e19a27da6d4b2d785dd690b802e48d0d129df5e36925de258f32ea34",
                     "receiptTrie" : "0x3d82ba770e5e0c5b8fa7fbc6974db94f631f6b03f217c020d992ae3e79d931e9",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0x96afd4922b9a2b54ebd10b3ea5c2d4ba55fc6f9fef9f8ca3f274079f39264648",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90335f901fca0450d1c75e19a27da6d4b2d785dd690b802e48d0d129df5e36925de258f32ea34a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a6203e518ebca11c07f16dd1e47a3fcdd7a76e07dadb584e7ede573009ed0cc3a096afd4922b9a2b54ebd10b3ea5c2d4ba55fc6f9fef9f8ca3f274079f39264648a03d82ba770e5e0c5b8fa7fbc6974db94f631f6b03f217c020d992ae3e79d931e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cb178203e880a0e8e6115b91b1a6b190d85921db708f3f53f4bbb850b12876fbc1a8c4aac8e9db8809cf0621854b1792f90132f9012f80018454dd471594095e7baea6a6c7c4c2dfeb977efac326af552d878435d3cf40b8c97fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe091ba04a2cab8705109a6e4548cb92cac5b36d331ccd779b466d05800c6c74e1e29695a048f378cd7653d28ddcdaa492c202156716ed62ed92150dbe53ae10a31ff9c9cfc0",
+                "rlp" : "0xf90335f901fca0450d1c75e19a27da6d4b2d785dd690b802e48d0d129df5e36925de258f32ea34a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a6203e518ebca11c07f16dd1e47a3fcdd7a76e07dadb584e7ede573009ed0cc3a096afd4922b9a2b54ebd10b3ea5c2d4ba55fc6f9fef9f8ca3f274079f39264648a03d82ba770e5e0c5b8fa7fbc6974db94f631f6b03f217c020d992ae3e79d931e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cb178203e880a06df62ebd73130e7779cced9ad26adee71cff961e669c4e947a30fee3eee6ca02883d2232b92331c5c6f90132f9012f80018454dd471594095e7baea6a6c7c4c2dfeb977efac326af552d878435d3cf40b8c97fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe091ba04a2cab8705109a6e4548cb92cac5b36d331ccd779b466d05800c6c74e1e29695a048f378cd7653d28ddcdaa492c202156716ed62ed92150dbe53ae10a31ff9c9cfc0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00b75dd29297c0866eb0e811f682d735f56543d3c61b7448dc65c0dcb844668caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1ecaa55fda69b1e52fe937e996f5a7be9fcb65c0b653ddd1c5e1499378a70b67",
+        "lastblockhash" : "0x695c7acb19facc1190777e2bccc2ed1ce09047f688a0ae39601559dec318bea1",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest218BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest218BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest218BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xcb17",
-                    "hash" : "0x77dc5db19de18d62978d98baef7f4700a66fc74633c4a00f3776d27d30c649a7",
-                    "mixHash" : "0x5a520a5a6b05c8e766628f5437f7d0afdb1b7e46e270c82dd33426a11ed00c9b",
-                    "nonce" : "0xd2e885c181628f9b",
+                    "hash" : "0x7859986e1138fe5a6d5d30af3874208f2b7b42facf7de6e7955aa6c55339370b",
+                    "mixHash" : "0xae403cbbb5a37d7058ecf886b9018cdd82f6be7b73f1f9e523e1ece3415b4a88",
+                    "nonce" : "0xc75ad16edf02a659",
                     "number" : "0x01",
                     "parentHash" : "0x450d1c75e19a27da6d4b2d785dd690b802e48d0d129df5e36925de258f32ea34",
                     "receiptTrie" : "0x3d82ba770e5e0c5b8fa7fbc6974db94f631f6b03f217c020d992ae3e79d931e9",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0x96afd4922b9a2b54ebd10b3ea5c2d4ba55fc6f9fef9f8ca3f274079f39264648",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90335f901fca0450d1c75e19a27da6d4b2d785dd690b802e48d0d129df5e36925de258f32ea34a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a6203e518ebca11c07f16dd1e47a3fcdd7a76e07dadb584e7ede573009ed0cc3a096afd4922b9a2b54ebd10b3ea5c2d4ba55fc6f9fef9f8ca3f274079f39264648a03d82ba770e5e0c5b8fa7fbc6974db94f631f6b03f217c020d992ae3e79d931e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cb178203e880a05a520a5a6b05c8e766628f5437f7d0afdb1b7e46e270c82dd33426a11ed00c9b88d2e885c181628f9bf90132f9012f80018454dd471594095e7baea6a6c7c4c2dfeb977efac326af552d878435d3cf40b8c97fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe091ba04a2cab8705109a6e4548cb92cac5b36d331ccd779b466d05800c6c74e1e29695a048f378cd7653d28ddcdaa492c202156716ed62ed92150dbe53ae10a31ff9c9cfc0",
+                "rlp" : "0xf90335f901fca0450d1c75e19a27da6d4b2d785dd690b802e48d0d129df5e36925de258f32ea34a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a6203e518ebca11c07f16dd1e47a3fcdd7a76e07dadb584e7ede573009ed0cc3a096afd4922b9a2b54ebd10b3ea5c2d4ba55fc6f9fef9f8ca3f274079f39264648a03d82ba770e5e0c5b8fa7fbc6974db94f631f6b03f217c020d992ae3e79d931e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cb178203e880a0ae403cbbb5a37d7058ecf886b9018cdd82f6be7b73f1f9e523e1ece3415b4a8888c75ad16edf02a659f90132f9012f80018454dd471594095e7baea6a6c7c4c2dfeb977efac326af552d878435d3cf40b8c97fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe091ba04a2cab8705109a6e4548cb92cac5b36d331ccd779b466d05800c6c74e1e29695a048f378cd7653d28ddcdaa492c202156716ed62ed92150dbe53ae10a31ff9c9cfc0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00b75dd29297c0866eb0e811f682d735f56543d3c61b7448dc65c0dcb844668caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x77dc5db19de18d62978d98baef7f4700a66fc74633c4a00f3776d27d30c649a7",
+        "lastblockhash" : "0x7859986e1138fe5a6d5d30af3874208f2b7b42facf7de6e7955aa6c55339370b",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest218BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest218BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest218BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xcb17",
-                    "hash" : "0x5c376f2dd567bc2b697d7eece43a087d6d919029cca0da5015c7c61d50f4c0a1",
-                    "mixHash" : "0x0e0e972aa1ea19fe90d47023db3d7b92d70446dcdc0daa7598fb26e2a4f5787e",
-                    "nonce" : "0xcb7df9ed308b2ac7",
+                    "hash" : "0xfc12a93ca2612c2bbd780fb0d4e2ce55748a7263b0852aa63e5356bb601d69ed",
+                    "mixHash" : "0x5f1f6ae45567921c76fd60b457305e311671f46558dcd5340ef7c9186e53a7fd",
+                    "nonce" : "0x1e2b508a2bc7183d",
                     "number" : "0x01",
                     "parentHash" : "0x450d1c75e19a27da6d4b2d785dd690b802e48d0d129df5e36925de258f32ea34",
                     "receiptTrie" : "0x3d82ba770e5e0c5b8fa7fbc6974db94f631f6b03f217c020d992ae3e79d931e9",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0x96afd4922b9a2b54ebd10b3ea5c2d4ba55fc6f9fef9f8ca3f274079f39264648",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90335f901fca0450d1c75e19a27da6d4b2d785dd690b802e48d0d129df5e36925de258f32ea34a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a6203e518ebca11c07f16dd1e47a3fcdd7a76e07dadb584e7ede573009ed0cc3a096afd4922b9a2b54ebd10b3ea5c2d4ba55fc6f9fef9f8ca3f274079f39264648a03d82ba770e5e0c5b8fa7fbc6974db94f631f6b03f217c020d992ae3e79d931e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cb178203e880a00e0e972aa1ea19fe90d47023db3d7b92d70446dcdc0daa7598fb26e2a4f5787e88cb7df9ed308b2ac7f90132f9012f80018454dd471594095e7baea6a6c7c4c2dfeb977efac326af552d878435d3cf40b8c97fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe091ba04a2cab8705109a6e4548cb92cac5b36d331ccd779b466d05800c6c74e1e29695a048f378cd7653d28ddcdaa492c202156716ed62ed92150dbe53ae10a31ff9c9cfc0",
+                "rlp" : "0xf90335f901fca0450d1c75e19a27da6d4b2d785dd690b802e48d0d129df5e36925de258f32ea34a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a6203e518ebca11c07f16dd1e47a3fcdd7a76e07dadb584e7ede573009ed0cc3a096afd4922b9a2b54ebd10b3ea5c2d4ba55fc6f9fef9f8ca3f274079f39264648a03d82ba770e5e0c5b8fa7fbc6974db94f631f6b03f217c020d992ae3e79d931e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cb178203e880a05f1f6ae45567921c76fd60b457305e311671f46558dcd5340ef7c9186e53a7fd881e2b508a2bc7183df90132f9012f80018454dd471594095e7baea6a6c7c4c2dfeb977efac326af552d878435d3cf40b8c97fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe091ba04a2cab8705109a6e4548cb92cac5b36d331ccd779b466d05800c6c74e1e29695a048f378cd7653d28ddcdaa492c202156716ed62ed92150dbe53ae10a31ff9c9cfc0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00b75dd29297c0866eb0e811f682d735f56543d3c61b7448dc65c0dcb844668caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5c376f2dd567bc2b697d7eece43a087d6d919029cca0da5015c7c61d50f4c0a1",
+        "lastblockhash" : "0xfc12a93ca2612c2bbd780fb0d4e2ce55748a7263b0852aa63e5356bb601d69ed",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest21BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest21BC.json
index f6cf221b5..85e34ab67 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest21BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest21BC.json
@@ -2,8 +2,8 @@
     "randomStatetest21BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest21BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest21BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5604",
-                    "hash" : "0x8c65cc42e9a230095f016d0f135c3faeacb5e40b9579461a206ec1a25b64750b",
-                    "mixHash" : "0x1173c6fce599bd2796275f7733004f937f9232c8a2d0adb02b335281d8266f73",
-                    "nonce" : "0x0a327fd2e701b0c9",
+                    "hash" : "0xfafe10b20b5e3bb52d3e65bd123baaca7e46c71dd0af6ab66b71161474c9c7dd",
+                    "mixHash" : "0xfd76682f320110787558b60e082c956a30415441798d19d93c39a537090c43a9",
+                    "nonce" : "0x21544901539961ff",
                     "number" : "0x01",
                     "parentHash" : "0xbd17f990fda340705eb14de1ddbb0227184195e347bb2897818aa5b09a65c3bc",
                     "receiptTrie" : "0xa0c31e46f03741b6d23b740d529f86e2b994197ede85f6c15519ec2858be051d",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0bd17f990fda340705eb14de1ddbb0227184195e347bb2897818aa5b09a65c3bca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0086be47795f9b6fbdde790e0b588a5478616651ae8b1bd7f843842067079842aa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0a0c31e46f03741b6d23b740d529f86e2b994197ede85f6c15519ec2858be051db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8256048203e880a01173c6fce599bd2796275f7733004f937f9232c8a2d0adb02b335281d8266f73880a327fd2e701b0c9f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0bd17f990fda340705eb14de1ddbb0227184195e347bb2897818aa5b09a65c3bca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0086be47795f9b6fbdde790e0b588a5478616651ae8b1bd7f843842067079842aa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0a0c31e46f03741b6d23b740d529f86e2b994197ede85f6c15519ec2858be051db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8256048203e880a0fd76682f320110787558b60e082c956a30415441798d19d93c39a537090c43a98821544901539961fff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08ad31fb2c77a1d815c95cf31381e6501f14e49302de7313262fd350d4c1ac4e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8c65cc42e9a230095f016d0f135c3faeacb5e40b9579461a206ec1a25b64750b",
+        "lastblockhash" : "0xfafe10b20b5e3bb52d3e65bd123baaca7e46c71dd0af6ab66b71161474c9c7dd",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest21BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest21BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest21BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5c1c",
-                    "hash" : "0xbafe910aada62897363719ccd4d20ed037c0265df331664bc00ab8e84558341b",
-                    "mixHash" : "0x71d078059524f9d536572c3052112765bebfb2cf756aad9d8fd16e39232816bb",
-                    "nonce" : "0x0d6f60c626dadf50",
+                    "hash" : "0x969642766ca8bbffae38e35d9c051e796ee4d264b7066f78f36d0a0c4332dd88",
+                    "mixHash" : "0x7e8b3471870e29ec8074cd80aeb4a037294b40c5a1666489d7e9bbdf3c32bba7",
+                    "nonce" : "0x55eb2cad5ca4291d",
                     "number" : "0x01",
                     "parentHash" : "0xbd17f990fda340705eb14de1ddbb0227184195e347bb2897818aa5b09a65c3bc",
                     "receiptTrie" : "0x2d5fc3010e4f8f20deb870ac914712a0dbd33881795bf81010350f00e79ecfcf",
-                    "stateRoot" : "0x4071d537f50844a2a760c15fe3b34f81914e1de47186dbe8dd21a751cea1a2a9",
+                    "stateRoot" : "0x1b04a6512e58249b63a01e77cc7cee9340c653a20823a75656588e0bcae861f0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0bd17f990fda340705eb14de1ddbb0227184195e347bb2897818aa5b09a65c3bca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04071d537f50844a2a760c15fe3b34f81914e1de47186dbe8dd21a751cea1a2a9a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02d5fc3010e4f8f20deb870ac914712a0dbd33881795bf81010350f00e79ecfcfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff825c1c8203e880a071d078059524f9d536572c3052112765bebfb2cf756aad9d8fd16e39232816bb880d6f60c626dadf50f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0bd17f990fda340705eb14de1ddbb0227184195e347bb2897818aa5b09a65c3bca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01b04a6512e58249b63a01e77cc7cee9340c653a20823a75656588e0bcae861f0a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02d5fc3010e4f8f20deb870ac914712a0dbd33881795bf81010350f00e79ecfcfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff825c1c8203e880a07e8b3471870e29ec8074cd80aeb4a037294b40c5a1666489d7e9bbdf3c32bba78855eb2cad5ca4291df865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08ad31fb2c77a1d815c95cf31381e6501f14e49302de7313262fd350d4c1ac4e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbafe910aada62897363719ccd4d20ed037c0265df331664bc00ab8e84558341b",
+        "lastblockhash" : "0x969642766ca8bbffae38e35d9c051e796ee4d264b7066f78f36d0a0c4332dd88",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x4440444245414045913c63087c55",
@@ -233,8 +226,8 @@
     "randomStatetest21BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest21BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest21BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5604",
-                    "hash" : "0xfd9fd4a641c68071cc4a3b879fdccaa078feb97a5bb3200ce2220d649dd2187e",
-                    "mixHash" : "0xc038faed0f355553bc130111811d4b69bf5b6a7f9f665fc2112682ab0576fc99",
-                    "nonce" : "0x6367e7fbca59efcc",
+                    "hash" : "0x18315ecba070cb143e06b5791f06e9a9acc562a62227f5f265e758c7143f0ae4",
+                    "mixHash" : "0xe22114a14ccec712c7e2100780d59dd1cbbd4d4e56b024cc364b9b1fb37cf120",
+                    "nonce" : "0xd3221c419a9c2a92",
                     "number" : "0x01",
                     "parentHash" : "0xbd17f990fda340705eb14de1ddbb0227184195e347bb2897818aa5b09a65c3bc",
                     "receiptTrie" : "0xf74fd486c7d03cf6ecd85f611702aa32ec4866bcbe91e0393ca15dfa31480c03",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0bd17f990fda340705eb14de1ddbb0227184195e347bb2897818aa5b09a65c3bca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08cfde63636083ea2477729e70fbe77aec9e6a324119a680e52338a765bedce35a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f74fd486c7d03cf6ecd85f611702aa32ec4866bcbe91e0393ca15dfa31480c03b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8256048203e880a0c038faed0f355553bc130111811d4b69bf5b6a7f9f665fc2112682ab0576fc99886367e7fbca59efccf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0bd17f990fda340705eb14de1ddbb0227184195e347bb2897818aa5b09a65c3bca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08cfde63636083ea2477729e70fbe77aec9e6a324119a680e52338a765bedce35a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f74fd486c7d03cf6ecd85f611702aa32ec4866bcbe91e0393ca15dfa31480c03b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8256048203e880a0e22114a14ccec712c7e2100780d59dd1cbbd4d4e56b024cc364b9b1fb37cf12088d3221c419a9c2a92f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08ad31fb2c77a1d815c95cf31381e6501f14e49302de7313262fd350d4c1ac4e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfd9fd4a641c68071cc4a3b879fdccaa078feb97a5bb3200ce2220d649dd2187e",
+        "lastblockhash" : "0x18315ecba070cb143e06b5791f06e9a9acc562a62227f5f265e758c7143f0ae4",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest21BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest21BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest21BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5604",
-                    "hash" : "0x4f06af5b10c1f1498dfddcafe43bd530c2be89aa8b59531488387768738eaff1",
-                    "mixHash" : "0x5ec522c2873de8c3d97a95d9b63cc3112d9262bfdd724d12ef651bebd7bc698a",
-                    "nonce" : "0x88e8f5e31a746c86",
+                    "hash" : "0xad58ada447bc663f1badc2a592e8f0239e30cd6647beeb9fb079e596596799d8",
+                    "mixHash" : "0x5d80e18d17366b040007230ef20573e5b7766766b84f88ffb529c01ed44af1ac",
+                    "nonce" : "0xabb1a0334a56e776",
                     "number" : "0x01",
                     "parentHash" : "0xbd17f990fda340705eb14de1ddbb0227184195e347bb2897818aa5b09a65c3bc",
                     "receiptTrie" : "0xf74fd486c7d03cf6ecd85f611702aa32ec4866bcbe91e0393ca15dfa31480c03",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0bd17f990fda340705eb14de1ddbb0227184195e347bb2897818aa5b09a65c3bca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08cfde63636083ea2477729e70fbe77aec9e6a324119a680e52338a765bedce35a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f74fd486c7d03cf6ecd85f611702aa32ec4866bcbe91e0393ca15dfa31480c03b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8256048203e880a05ec522c2873de8c3d97a95d9b63cc3112d9262bfdd724d12ef651bebd7bc698a8888e8f5e31a746c86f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0bd17f990fda340705eb14de1ddbb0227184195e347bb2897818aa5b09a65c3bca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08cfde63636083ea2477729e70fbe77aec9e6a324119a680e52338a765bedce35a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f74fd486c7d03cf6ecd85f611702aa32ec4866bcbe91e0393ca15dfa31480c03b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8256048203e880a05d80e18d17366b040007230ef20573e5b7766766b84f88ffb529c01ed44af1ac88abb1a0334a56e776f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08ad31fb2c77a1d815c95cf31381e6501f14e49302de7313262fd350d4c1ac4e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4f06af5b10c1f1498dfddcafe43bd530c2be89aa8b59531488387768738eaff1",
+        "lastblockhash" : "0xad58ada447bc663f1badc2a592e8f0239e30cd6647beeb9fb079e596596799d8",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest21BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest21BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest21BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x535c",
-                    "hash" : "0x5f3ee94cdac7d0afc5a73beb8df225a7a1ca0204e0d8ee7fc71121db088c94b5",
-                    "mixHash" : "0x1e4b8521794b03bd66c1121a0f190c23461030b44d1af51c2d36d7783397f410",
-                    "nonce" : "0xa749923e72a95e70",
+                    "hash" : "0x1134bc3f430fc9c243a11912dd5b5e70b34b1fbe73d482fbfb393a8a2248cf1e",
+                    "mixHash" : "0x8ac4f92f2ae81e7178b94953b447cd75ab7a3b872dbb5c438394ffc04617a91f",
+                    "nonce" : "0x13c8674c6052e45e",
                     "number" : "0x01",
                     "parentHash" : "0xbd17f990fda340705eb14de1ddbb0227184195e347bb2897818aa5b09a65c3bc",
                     "receiptTrie" : "0xbb3cb4bc743dab22edc5377c64e3c76db1d1e64b41b9fcfa4535937147bb2ac2",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0bd17f990fda340705eb14de1ddbb0227184195e347bb2897818aa5b09a65c3bca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08f3311dacd0c66697513d6b6e03b88275f7df6698c24fa720d6e932e77474778a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0bb3cb4bc743dab22edc5377c64e3c76db1d1e64b41b9fcfa4535937147bb2ac2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82535c8203e880a01e4b8521794b03bd66c1121a0f190c23461030b44d1af51c2d36d7783397f41088a749923e72a95e70f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0bd17f990fda340705eb14de1ddbb0227184195e347bb2897818aa5b09a65c3bca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08f3311dacd0c66697513d6b6e03b88275f7df6698c24fa720d6e932e77474778a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0bb3cb4bc743dab22edc5377c64e3c76db1d1e64b41b9fcfa4535937147bb2ac2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82535c8203e880a08ac4f92f2ae81e7178b94953b447cd75ab7a3b872dbb5c438394ffc04617a91f8813c8674c6052e45ef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08ad31fb2c77a1d815c95cf31381e6501f14e49302de7313262fd350d4c1ac4e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5f3ee94cdac7d0afc5a73beb8df225a7a1ca0204e0d8ee7fc71121db088c94b5",
+        "lastblockhash" : "0x1134bc3f430fc9c243a11912dd5b5e70b34b1fbe73d482fbfb393a8a2248cf1e",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest21BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest21BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest21BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x535c",
-                    "hash" : "0x312f746ef125283f8a589556b77acbd349a1c7afc3b2720b9c83149ae9b0dd73",
-                    "mixHash" : "0x7e9080380f26e5bc2a79a5b28bae880999f827abd0083e287762e1c4f08b2592",
-                    "nonce" : "0x3ab65d5394ecfaac",
+                    "hash" : "0x24ecdf4110fe3b92db98f845053fd9ee7527511bc091edd95c2c5b158b009322",
+                    "mixHash" : "0x480becde3f149578af9c1b6a2df5bb767520c9651e93af90b3b5a759535e971c",
+                    "nonce" : "0xe48bb53ed3c64868",
                     "number" : "0x01",
                     "parentHash" : "0xbd17f990fda340705eb14de1ddbb0227184195e347bb2897818aa5b09a65c3bc",
                     "receiptTrie" : "0xbb3cb4bc743dab22edc5377c64e3c76db1d1e64b41b9fcfa4535937147bb2ac2",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0bd17f990fda340705eb14de1ddbb0227184195e347bb2897818aa5b09a65c3bca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08f3311dacd0c66697513d6b6e03b88275f7df6698c24fa720d6e932e77474778a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0bb3cb4bc743dab22edc5377c64e3c76db1d1e64b41b9fcfa4535937147bb2ac2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82535c8203e880a07e9080380f26e5bc2a79a5b28bae880999f827abd0083e287762e1c4f08b2592883ab65d5394ecfaacf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0bd17f990fda340705eb14de1ddbb0227184195e347bb2897818aa5b09a65c3bca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08f3311dacd0c66697513d6b6e03b88275f7df6698c24fa720d6e932e77474778a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0bb3cb4bc743dab22edc5377c64e3c76db1d1e64b41b9fcfa4535937147bb2ac2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82535c8203e880a0480becde3f149578af9c1b6a2df5bb767520c9651e93af90b3b5a759535e971c88e48bb53ed3c64868f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08ad31fb2c77a1d815c95cf31381e6501f14e49302de7313262fd350d4c1ac4e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x312f746ef125283f8a589556b77acbd349a1c7afc3b2720b9c83149ae9b0dd73",
+        "lastblockhash" : "0x24ecdf4110fe3b92db98f845053fd9ee7527511bc091edd95c2c5b158b009322",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest224BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest224BC.json
index 100705a31..52cc27e4b 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest224BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest224BC.json
@@ -2,8 +2,8 @@
     "randomStatetest224BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest224BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest224BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x16aab9",
-                    "hash" : "0x2e18b8ec937fbc37e88d0237799ff2ec022e6f69a46fecbf75d6102e64ed7f4c",
-                    "mixHash" : "0xefb28b36dd653a3cca6c2474856fba1556a22675910c5ee4fecca06e0406ee84",
-                    "nonce" : "0xbb86d2e0e74c3f78",
+                    "hash" : "0xcf271d12eb78ad398b649f2176fb43809796f340f3bf4453d9e101b5b97bf10c",
+                    "mixHash" : "0x2ed8fb1e2a718ad51c350ea8715170c732e069509a966fe732b287832300a61c",
+                    "nonce" : "0x6d7f01ced67392e2",
                     "number" : "0x01",
                     "parentHash" : "0x465e03433bd472624bf6894ff36d5b06f3b99711627732fd8e8fe25acc4ed097",
                     "receiptTrie" : "0x5eb19e79714439e7b90abde96cf98f98d5141ed18f28f58a214f6ae104946567",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xde1eab16eb35fd363a2b56b6b366b5b0f84698a21007d0f25892bb79442ab86a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90363f901fda0465e03433bd472624bf6894ff36d5b06f3b99711627732fd8e8fe25acc4ed097a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01c5ea8522aa8df5bc409521f156854c850c877c75fdc7b469382d7e3b2117d7ca0de1eab16eb35fd363a2b56b6b366b5b0f84698a21007d0f25892bb79442ab86aa05eb19e79714439e7b90abde96cf98f98d5141ed18f28f58a214f6ae104946567b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000040000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000080000100000000000000000000000000000000000002000000000000000000000000000400000000000000000000000000000400000000000000000000000000000100000000000000000000000008302000001887fffffffffffffff8316aab98203e880a0efb28b36dd653a3cca6c2474856fba1556a22675910c5ee4fecca06e0406ee8488bb86d2e0e74c3f78f9015ff9015c800184450bec9494095e7baea6a6c7c4c2dfeb977efac326af552d87846974fd0db8f67f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000001a6202a31690a3a06f6e9307039b1ca034a2ea2c4b60ace1a3bf84882d3bdec081ce53fb9efc66afb6b222658023be76a06844540fad6b5d24a69fb9d3430296b3b54b2c4efc7383679a84a2c39e670212c0",
+                "rlp" : "0xf90363f901fda0465e03433bd472624bf6894ff36d5b06f3b99711627732fd8e8fe25acc4ed097a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01c5ea8522aa8df5bc409521f156854c850c877c75fdc7b469382d7e3b2117d7ca0de1eab16eb35fd363a2b56b6b366b5b0f84698a21007d0f25892bb79442ab86aa05eb19e79714439e7b90abde96cf98f98d5141ed18f28f58a214f6ae104946567b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000040000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000080000100000000000000000000000000000000000002000000000000000000000000000400000000000000000000000000000400000000000000000000000000000100000000000000000000000008302000001887fffffffffffffff8316aab98203e880a02ed8fb1e2a718ad51c350ea8715170c732e069509a966fe732b287832300a61c886d7f01ced67392e2f9015ff9015c800184450bec9494095e7baea6a6c7c4c2dfeb977efac326af552d87846974fd0db8f67f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000001a6202a31690a3a06f6e9307039b1ca034a2ea2c4b60ace1a3bf84882d3bdec081ce53fb9efc66afb6b222658023be76a06844540fad6b5d24a69fb9d3430296b3b54b2c4efc7383679a84a2c39e670212c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000001a6202a31690a3a06f6e9307039b",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0747794de75eabf377e22fbeb2b4823ed1a97e86e0e0a9c649a4cee1819ee8a90a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2e18b8ec937fbc37e88d0237799ff2ec022e6f69a46fecbf75d6102e64ed7f4c",
+        "lastblockhash" : "0xcf271d12eb78ad398b649f2176fb43809796f340f3bf4453d9e101b5b97bf10c",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest224BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest224BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest224BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x16adc5",
-                    "hash" : "0x5fdef034d6f283d3f6d2320fc2837e48f9b069d2e4b21dc8f02336c5aab8cef9",
-                    "mixHash" : "0x8378119562658ed00bb1810ae1c3fb263949f19aa4111818348c7fbd30ccc25d",
-                    "nonce" : "0xd6a6ac0742b359f6",
+                    "hash" : "0x41d5a0c038dcf2b90213a6a4ab9b197742d529912976625a7e3de7f55aaf1035",
+                    "mixHash" : "0x99dda03d173bb926a9fb635fe14b66f59846b521f1ff9591cb6d524a706dfa72",
+                    "nonce" : "0x901700c917917350",
                     "number" : "0x01",
                     "parentHash" : "0x465e03433bd472624bf6894ff36d5b06f3b99711627732fd8e8fe25acc4ed097",
                     "receiptTrie" : "0x9fdfd256871933fb34575c59de2c95a1c5df19fc8e6d143dbe464081dfa3aee8",
-                    "stateRoot" : "0x9b02e0b2a478cd8efba74bb2461e2f7185935010d6fe05bf353a277a100321fe",
+                    "stateRoot" : "0x3e637bf59e786f5ad0ce21bdfb43aecda3b024491ea540b9190dc701986d9c6f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xde1eab16eb35fd363a2b56b6b366b5b0f84698a21007d0f25892bb79442ab86a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90363f901fda0465e03433bd472624bf6894ff36d5b06f3b99711627732fd8e8fe25acc4ed097a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09b02e0b2a478cd8efba74bb2461e2f7185935010d6fe05bf353a277a100321fea0de1eab16eb35fd363a2b56b6b366b5b0f84698a21007d0f25892bb79442ab86aa09fdfd256871933fb34575c59de2c95a1c5df19fc8e6d143dbe464081dfa3aee8b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000040000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000080000100000000000000000000000000000000000002000000000000000000000000000400000000000000000000000000000400000000000000000000000000000100000000000000000000000008302000001887fffffffffffffff8316adc58203e880a08378119562658ed00bb1810ae1c3fb263949f19aa4111818348c7fbd30ccc25d88d6a6ac0742b359f6f9015ff9015c800184450bec9494095e7baea6a6c7c4c2dfeb977efac326af552d87846974fd0db8f67f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000001a6202a31690a3a06f6e9307039b1ca034a2ea2c4b60ace1a3bf84882d3bdec081ce53fb9efc66afb6b222658023be76a06844540fad6b5d24a69fb9d3430296b3b54b2c4efc7383679a84a2c39e670212c0",
+                "rlp" : "0xf90363f901fda0465e03433bd472624bf6894ff36d5b06f3b99711627732fd8e8fe25acc4ed097a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03e637bf59e786f5ad0ce21bdfb43aecda3b024491ea540b9190dc701986d9c6fa0de1eab16eb35fd363a2b56b6b366b5b0f84698a21007d0f25892bb79442ab86aa09fdfd256871933fb34575c59de2c95a1c5df19fc8e6d143dbe464081dfa3aee8b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000040000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000080000100000000000000000000000000000000000002000000000000000000000000000400000000000000000000000000000400000000000000000000000000000100000000000000000000000008302000001887fffffffffffffff8316adc58203e880a099dda03d173bb926a9fb635fe14b66f59846b521f1ff9591cb6d524a706dfa7288901700c917917350f9015ff9015c800184450bec9494095e7baea6a6c7c4c2dfeb977efac326af552d87846974fd0db8f67f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000001a6202a31690a3a06f6e9307039b1ca034a2ea2c4b60ace1a3bf84882d3bdec081ce53fb9efc66afb6b222658023be76a06844540fad6b5d24a69fb9d3430296b3b54b2c4efc7383679a84a2c39e670212c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000001a6202a31690a3a06f6e9307039b",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0747794de75eabf377e22fbeb2b4823ed1a97e86e0e0a9c649a4cee1819ee8a90a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5fdef034d6f283d3f6d2320fc2837e48f9b069d2e4b21dc8f02336c5aab8cef9",
+        "lastblockhash" : "0x41d5a0c038dcf2b90213a6a4ab9b197742d529912976625a7e3de7f55aaf1035",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x6974fd0d",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000001a6202a31690a3a06f6e9307039b",
@@ -233,8 +226,8 @@
     "randomStatetest224BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest224BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest224BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x16aab9",
-                    "hash" : "0x7092b0be4fce3d3c2e31300df0694e70ad1ec7286cfd19defe71232ca99db366",
-                    "mixHash" : "0x25d3152f5b6e23d6b307a461178d9785c74bd022792610a2e07392c29d8e2ae7",
-                    "nonce" : "0x02b196d7285caf0e",
+                    "hash" : "0x8267174eb7f43a85de8564c26490a0c59fbf780f1595cc57cc694e3553b00559",
+                    "mixHash" : "0x423e5bf7587f5932b8c3e3175ae904fcdf022e77f9b445eafb1a4e647117248a",
+                    "nonce" : "0xa0b6145885a54634",
                     "number" : "0x01",
                     "parentHash" : "0x465e03433bd472624bf6894ff36d5b06f3b99711627732fd8e8fe25acc4ed097",
                     "receiptTrie" : "0xa113a18f3315d989a877d580ade6bc66706c8095ac791646a2999cf84a488e20",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0xde1eab16eb35fd363a2b56b6b366b5b0f84698a21007d0f25892bb79442ab86a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90363f901fda0465e03433bd472624bf6894ff36d5b06f3b99711627732fd8e8fe25acc4ed097a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03491d4660556096fda9d8854e6029051bc0ba348ec8f9e80ac2fa2efaf892a43a0de1eab16eb35fd363a2b56b6b366b5b0f84698a21007d0f25892bb79442ab86aa0a113a18f3315d989a877d580ade6bc66706c8095ac791646a2999cf84a488e20b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000040000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000080000100000000000000000000000000000000000002000000000000000000000000000400000000000000000000000000000400000000000000000000000000000100000000000000000000000008302000001887fffffffffffffff8316aab98203e880a025d3152f5b6e23d6b307a461178d9785c74bd022792610a2e07392c29d8e2ae78802b196d7285caf0ef9015ff9015c800184450bec9494095e7baea6a6c7c4c2dfeb977efac326af552d87846974fd0db8f67f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000001a6202a31690a3a06f6e9307039b1ca034a2ea2c4b60ace1a3bf84882d3bdec081ce53fb9efc66afb6b222658023be76a06844540fad6b5d24a69fb9d3430296b3b54b2c4efc7383679a84a2c39e670212c0",
+                "rlp" : "0xf90363f901fda0465e03433bd472624bf6894ff36d5b06f3b99711627732fd8e8fe25acc4ed097a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03491d4660556096fda9d8854e6029051bc0ba348ec8f9e80ac2fa2efaf892a43a0de1eab16eb35fd363a2b56b6b366b5b0f84698a21007d0f25892bb79442ab86aa0a113a18f3315d989a877d580ade6bc66706c8095ac791646a2999cf84a488e20b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000040000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000080000100000000000000000000000000000000000002000000000000000000000000000400000000000000000000000000000400000000000000000000000000000100000000000000000000000008302000001887fffffffffffffff8316aab98203e880a0423e5bf7587f5932b8c3e3175ae904fcdf022e77f9b445eafb1a4e647117248a88a0b6145885a54634f9015ff9015c800184450bec9494095e7baea6a6c7c4c2dfeb977efac326af552d87846974fd0db8f67f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000001a6202a31690a3a06f6e9307039b1ca034a2ea2c4b60ace1a3bf84882d3bdec081ce53fb9efc66afb6b222658023be76a06844540fad6b5d24a69fb9d3430296b3b54b2c4efc7383679a84a2c39e670212c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000001a6202a31690a3a06f6e9307039b",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0747794de75eabf377e22fbeb2b4823ed1a97e86e0e0a9c649a4cee1819ee8a90a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7092b0be4fce3d3c2e31300df0694e70ad1ec7286cfd19defe71232ca99db366",
+        "lastblockhash" : "0x8267174eb7f43a85de8564c26490a0c59fbf780f1595cc57cc694e3553b00559",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest224BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest224BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest224BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x16aab9",
-                    "hash" : "0x6f1a892da9fe611906421e1ce59fed5b46ab31e2a53d3c6d8122972d5f5f8a1a",
-                    "mixHash" : "0x294d6a791280e613bf7030813df3a96457ef35749086df49d468ac3a859dc516",
-                    "nonce" : "0xe90bbad6853830b4",
+                    "hash" : "0x82cb8509baca939ce73d3f9dcb92132b8d7945ed7b87042e135ab2415d19ae5e",
+                    "mixHash" : "0xc1741b86efb7a5dda3bd97a698ff5d68a34b05095b386a498adf1391bd5a65c8",
+                    "nonce" : "0x2dfaa531bee91346",
                     "number" : "0x01",
                     "parentHash" : "0x465e03433bd472624bf6894ff36d5b06f3b99711627732fd8e8fe25acc4ed097",
                     "receiptTrie" : "0xa113a18f3315d989a877d580ade6bc66706c8095ac791646a2999cf84a488e20",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0xde1eab16eb35fd363a2b56b6b366b5b0f84698a21007d0f25892bb79442ab86a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90363f901fda0465e03433bd472624bf6894ff36d5b06f3b99711627732fd8e8fe25acc4ed097a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03491d4660556096fda9d8854e6029051bc0ba348ec8f9e80ac2fa2efaf892a43a0de1eab16eb35fd363a2b56b6b366b5b0f84698a21007d0f25892bb79442ab86aa0a113a18f3315d989a877d580ade6bc66706c8095ac791646a2999cf84a488e20b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000040000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000080000100000000000000000000000000000000000002000000000000000000000000000400000000000000000000000000000400000000000000000000000000000100000000000000000000000008302000001887fffffffffffffff8316aab98203e880a0294d6a791280e613bf7030813df3a96457ef35749086df49d468ac3a859dc51688e90bbad6853830b4f9015ff9015c800184450bec9494095e7baea6a6c7c4c2dfeb977efac326af552d87846974fd0db8f67f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000001a6202a31690a3a06f6e9307039b1ca034a2ea2c4b60ace1a3bf84882d3bdec081ce53fb9efc66afb6b222658023be76a06844540fad6b5d24a69fb9d3430296b3b54b2c4efc7383679a84a2c39e670212c0",
+                "rlp" : "0xf90363f901fda0465e03433bd472624bf6894ff36d5b06f3b99711627732fd8e8fe25acc4ed097a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03491d4660556096fda9d8854e6029051bc0ba348ec8f9e80ac2fa2efaf892a43a0de1eab16eb35fd363a2b56b6b366b5b0f84698a21007d0f25892bb79442ab86aa0a113a18f3315d989a877d580ade6bc66706c8095ac791646a2999cf84a488e20b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000040000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000080000100000000000000000000000000000000000002000000000000000000000000000400000000000000000000000000000400000000000000000000000000000100000000000000000000000008302000001887fffffffffffffff8316aab98203e880a0c1741b86efb7a5dda3bd97a698ff5d68a34b05095b386a498adf1391bd5a65c8882dfaa531bee91346f9015ff9015c800184450bec9494095e7baea6a6c7c4c2dfeb977efac326af552d87846974fd0db8f67f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000001a6202a31690a3a06f6e9307039b1ca034a2ea2c4b60ace1a3bf84882d3bdec081ce53fb9efc66afb6b222658023be76a06844540fad6b5d24a69fb9d3430296b3b54b2c4efc7383679a84a2c39e670212c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000001a6202a31690a3a06f6e9307039b",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0747794de75eabf377e22fbeb2b4823ed1a97e86e0e0a9c649a4cee1819ee8a90a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6f1a892da9fe611906421e1ce59fed5b46ab31e2a53d3c6d8122972d5f5f8a1a",
+        "lastblockhash" : "0x82cb8509baca939ce73d3f9dcb92132b8d7945ed7b87042e135ab2415d19ae5e",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest224BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest224BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest224BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x16aab9",
-                    "hash" : "0x953f4ae9b51852c140d691197458bd3c884439a9728190904940631c02e8b496",
-                    "mixHash" : "0xdd9e3bd8390651c7f29b23159b08b9484bda8e8d679614105158a9c8ade55cf5",
-                    "nonce" : "0x127c91e21dbbad29",
+                    "hash" : "0x57b65e0e8252b0274ff06e67c3b0b574790d76ff21ad369b8f0533503fccfc23",
+                    "mixHash" : "0xae343c672c6c043ce861066fbc268017dd5ce9c06789d01cc87cd505db1daab0",
+                    "nonce" : "0xde522dd1888879f6",
                     "number" : "0x01",
                     "parentHash" : "0x465e03433bd472624bf6894ff36d5b06f3b99711627732fd8e8fe25acc4ed097",
                     "receiptTrie" : "0xa113a18f3315d989a877d580ade6bc66706c8095ac791646a2999cf84a488e20",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0xde1eab16eb35fd363a2b56b6b366b5b0f84698a21007d0f25892bb79442ab86a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90363f901fda0465e03433bd472624bf6894ff36d5b06f3b99711627732fd8e8fe25acc4ed097a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03491d4660556096fda9d8854e6029051bc0ba348ec8f9e80ac2fa2efaf892a43a0de1eab16eb35fd363a2b56b6b366b5b0f84698a21007d0f25892bb79442ab86aa0a113a18f3315d989a877d580ade6bc66706c8095ac791646a2999cf84a488e20b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000040000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000080000100000000000000000000000000000000000002000000000000000000000000000400000000000000000000000000000400000000000000000000000000000100000000000000000000000008302000001887fffffffffffffff8316aab98203e880a0dd9e3bd8390651c7f29b23159b08b9484bda8e8d679614105158a9c8ade55cf588127c91e21dbbad29f9015ff9015c800184450bec9494095e7baea6a6c7c4c2dfeb977efac326af552d87846974fd0db8f67f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000001a6202a31690a3a06f6e9307039b1ca034a2ea2c4b60ace1a3bf84882d3bdec081ce53fb9efc66afb6b222658023be76a06844540fad6b5d24a69fb9d3430296b3b54b2c4efc7383679a84a2c39e670212c0",
+                "rlp" : "0xf90363f901fda0465e03433bd472624bf6894ff36d5b06f3b99711627732fd8e8fe25acc4ed097a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03491d4660556096fda9d8854e6029051bc0ba348ec8f9e80ac2fa2efaf892a43a0de1eab16eb35fd363a2b56b6b366b5b0f84698a21007d0f25892bb79442ab86aa0a113a18f3315d989a877d580ade6bc66706c8095ac791646a2999cf84a488e20b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000040000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000080000100000000000000000000000000000000000002000000000000000000000000000400000000000000000000000000000400000000000000000000000000000100000000000000000000000008302000001887fffffffffffffff8316aab98203e880a0ae343c672c6c043ce861066fbc268017dd5ce9c06789d01cc87cd505db1daab088de522dd1888879f6f9015ff9015c800184450bec9494095e7baea6a6c7c4c2dfeb977efac326af552d87846974fd0db8f67f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000001a6202a31690a3a06f6e9307039b1ca034a2ea2c4b60ace1a3bf84882d3bdec081ce53fb9efc66afb6b222658023be76a06844540fad6b5d24a69fb9d3430296b3b54b2c4efc7383679a84a2c39e670212c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000001a6202a31690a3a06f6e9307039b",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0747794de75eabf377e22fbeb2b4823ed1a97e86e0e0a9c649a4cee1819ee8a90a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x953f4ae9b51852c140d691197458bd3c884439a9728190904940631c02e8b496",
+        "lastblockhash" : "0x57b65e0e8252b0274ff06e67c3b0b574790d76ff21ad369b8f0533503fccfc23",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest224BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest224BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest224BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x16aab9",
-                    "hash" : "0x804b060b7476ad318cde0025187fcdfbedc76f9ebbd86e3aa46e7e5c3d3c098e",
-                    "mixHash" : "0xe410cd4872dc01c06057b508ea074efbf1611ecf0e61fee7acad1b23789d7dad",
-                    "nonce" : "0x2b1bb4e57bfdb071",
+                    "hash" : "0x3f28e91f596c782e32a4fc0240c895ebfd0659bd606d152f6c5d8643f8a85af9",
+                    "mixHash" : "0xa82fbef54e307da2b9013868257b9297f56c279ee97f7a7f41256897edaa0760",
+                    "nonce" : "0x5371df035e553b4a",
                     "number" : "0x01",
                     "parentHash" : "0x465e03433bd472624bf6894ff36d5b06f3b99711627732fd8e8fe25acc4ed097",
                     "receiptTrie" : "0xa113a18f3315d989a877d580ade6bc66706c8095ac791646a2999cf84a488e20",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0xde1eab16eb35fd363a2b56b6b366b5b0f84698a21007d0f25892bb79442ab86a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90363f901fda0465e03433bd472624bf6894ff36d5b06f3b99711627732fd8e8fe25acc4ed097a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03491d4660556096fda9d8854e6029051bc0ba348ec8f9e80ac2fa2efaf892a43a0de1eab16eb35fd363a2b56b6b366b5b0f84698a21007d0f25892bb79442ab86aa0a113a18f3315d989a877d580ade6bc66706c8095ac791646a2999cf84a488e20b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000040000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000080000100000000000000000000000000000000000002000000000000000000000000000400000000000000000000000000000400000000000000000000000000000100000000000000000000000008302000001887fffffffffffffff8316aab98203e880a0e410cd4872dc01c06057b508ea074efbf1611ecf0e61fee7acad1b23789d7dad882b1bb4e57bfdb071f9015ff9015c800184450bec9494095e7baea6a6c7c4c2dfeb977efac326af552d87846974fd0db8f67f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000001a6202a31690a3a06f6e9307039b1ca034a2ea2c4b60ace1a3bf84882d3bdec081ce53fb9efc66afb6b222658023be76a06844540fad6b5d24a69fb9d3430296b3b54b2c4efc7383679a84a2c39e670212c0",
+                "rlp" : "0xf90363f901fda0465e03433bd472624bf6894ff36d5b06f3b99711627732fd8e8fe25acc4ed097a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03491d4660556096fda9d8854e6029051bc0ba348ec8f9e80ac2fa2efaf892a43a0de1eab16eb35fd363a2b56b6b366b5b0f84698a21007d0f25892bb79442ab86aa0a113a18f3315d989a877d580ade6bc66706c8095ac791646a2999cf84a488e20b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000040000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000080000100000000000000000000000000000000000002000000000000000000000000000400000000000000000000000000000400000000000000000000000000000100000000000000000000000008302000001887fffffffffffffff8316aab98203e880a0a82fbef54e307da2b9013868257b9297f56c279ee97f7a7f41256897edaa0760885371df035e553b4af9015ff9015c800184450bec9494095e7baea6a6c7c4c2dfeb977efac326af552d87846974fd0db8f67f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000001a6202a31690a3a06f6e9307039b1ca034a2ea2c4b60ace1a3bf84882d3bdec081ce53fb9efc66afb6b222658023be76a06844540fad6b5d24a69fb9d3430296b3b54b2c4efc7383679a84a2c39e670212c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000001a6202a31690a3a06f6e9307039b",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0747794de75eabf377e22fbeb2b4823ed1a97e86e0e0a9c649a4cee1819ee8a90a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x804b060b7476ad318cde0025187fcdfbedc76f9ebbd86e3aa46e7e5c3d3c098e",
+        "lastblockhash" : "0x3f28e91f596c782e32a4fc0240c895ebfd0659bd606d152f6c5d8643f8a85af9",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest234BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest234BC.json
index 8bb9890a9..703b64fb1 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest234BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest234BC.json
@@ -2,8 +2,8 @@
     "randomStatetest234BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest234BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest234BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8375",
-                    "hash" : "0xf2a2543d8023eade743970bc418e96f71b7b605b4617b29db8258b0fac1bc02d",
-                    "mixHash" : "0x4be11a7a4c837a754ad9881681f85dcb7266f46de19c5c5e381dc4b81cd8d009",
-                    "nonce" : "0xfed7098732982c48",
+                    "hash" : "0x99ca1e486e25ae5c4abe37ff7c2471d9feacba12f19535f07dcf6b8cd67d79e4",
+                    "mixHash" : "0x3a1744f1750fd89b40cb7fa449cf6aa307822205c08191ed2129580504f8d8bb",
+                    "nonce" : "0x38aad6fe1e7feaad",
                     "number" : "0x01",
                     "parentHash" : "0x7dcccaed7455ba19911cd26fb5d540525f61589451c4629ec025f0e25fc8af63",
                     "receiptTrie" : "0x88472b796baf03c912c40f1d27b40c25f2004792394d19ef14d5c936f4a2a894",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xf3317853585e362ccac6285a17f4ce5f909b333e0b5efc70f88a26639be382d5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90360f901fca07dcccaed7455ba19911cd26fb5d540525f61589451c4629ec025f0e25fc8af63a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07d3a2ea8f73c5178dbeb803aa490891945a69b6ecf15ae054958de1f28c8b7fda0f3317853585e362ccac6285a17f4ce5f909b333e0b5efc70f88a26639be382d5a088472b796baf03c912c40f1d27b40c25f2004792394d19ef14d5c936f4a2a894b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000010000000000400000000000000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000600000000000400000000000000000000000200000000000000000000000000000008302000001887fffffffffffffff8283758203e880a04be11a7a4c837a754ad9881681f85dcb7266f46de19c5c5e381dc4b81cd8d00988fed7098732982c48f9015df9015a8001840eb4785094095e7baea6a6c7c4c2dfeb977efac326af552d878478c81dbcb8f47f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09a3447d617a066c9437f3371ba09a8d52abaab9a48cbff6dc70fc4d57f8c1f3d74cbe4f252f7ddf81b2d5a7761aa0798be7f4221622783b33ea613913c1793079815474184154c4e34a05b3e3893dc0",
+                "rlp" : "0xf90360f901fca07dcccaed7455ba19911cd26fb5d540525f61589451c4629ec025f0e25fc8af63a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07d3a2ea8f73c5178dbeb803aa490891945a69b6ecf15ae054958de1f28c8b7fda0f3317853585e362ccac6285a17f4ce5f909b333e0b5efc70f88a26639be382d5a088472b796baf03c912c40f1d27b40c25f2004792394d19ef14d5c936f4a2a894b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000010000000000400000000000000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000600000000000400000000000000000000000200000000000000000000000000000008302000001887fffffffffffffff8283758203e880a03a1744f1750fd89b40cb7fa449cf6aa307822205c08191ed2129580504f8d8bb8838aad6fe1e7feaadf9015df9015a8001840eb4785094095e7baea6a6c7c4c2dfeb977efac326af552d878478c81dbcb8f47f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09a3447d617a066c9437f3371ba09a8d52abaab9a48cbff6dc70fc4d57f8c1f3d74cbe4f252f7ddf81b2d5a7761aa0798be7f4221622783b33ea613913c1793079815474184154c4e34a05b3e3893dc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09a3447d617a066c9437f337",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02c7f2937e7ce798c591a4f019ccd732a965630b952957015d5430aad619ede22a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf2a2543d8023eade743970bc418e96f71b7b605b4617b29db8258b0fac1bc02d",
+        "lastblockhash" : "0x99ca1e486e25ae5c4abe37ff7c2471d9feacba12f19535f07dcf6b8cd67d79e4",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest234BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest234BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest234BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8681",
-                    "hash" : "0xb3485375a76601364c4ede5b026dd841e4ab9dd8838f2d6fff5fbe10fb9b9f60",
-                    "mixHash" : "0xf3ad4cd5b9dd041978b6c6ab2850fb99b1ef4b1348011b8769ff0c157fb9639c",
-                    "nonce" : "0xd9d0089efb76dce6",
+                    "hash" : "0x6d89bc2c5b7a7cfd14db0209aef95279b22e42a907745fae9393765c0eaf2933",
+                    "mixHash" : "0x49b73f3ea48f53778df1f7cfb2f1ca9bd3610d1730ba5e27f75ccd0bcfe092bc",
+                    "nonce" : "0xd4b7ed58902a0682",
                     "number" : "0x01",
                     "parentHash" : "0x7dcccaed7455ba19911cd26fb5d540525f61589451c4629ec025f0e25fc8af63",
                     "receiptTrie" : "0x9dc654eecb40fc1979d9a25576e1134ac88bfc250fbf4504ddf6defd2c49c59a",
-                    "stateRoot" : "0xfd3d4d64057ef2f58448aeba2991222415426492d4eb68a5184881ea67a9ce05",
+                    "stateRoot" : "0x0c96353279ea33f6d3c219ae4e13a30735a1ec7c1ec93ef50e3659dbb97ffcfc",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf3317853585e362ccac6285a17f4ce5f909b333e0b5efc70f88a26639be382d5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90360f901fca07dcccaed7455ba19911cd26fb5d540525f61589451c4629ec025f0e25fc8af63a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fd3d4d64057ef2f58448aeba2991222415426492d4eb68a5184881ea67a9ce05a0f3317853585e362ccac6285a17f4ce5f909b333e0b5efc70f88a26639be382d5a09dc654eecb40fc1979d9a25576e1134ac88bfc250fbf4504ddf6defd2c49c59ab90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000010000000000400000000000000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000600000000000400000000000000000000000200000000000000000000000000000008302000001887fffffffffffffff8286818203e880a0f3ad4cd5b9dd041978b6c6ab2850fb99b1ef4b1348011b8769ff0c157fb9639c88d9d0089efb76dce6f9015df9015a8001840eb4785094095e7baea6a6c7c4c2dfeb977efac326af552d878478c81dbcb8f47f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09a3447d617a066c9437f3371ba09a8d52abaab9a48cbff6dc70fc4d57f8c1f3d74cbe4f252f7ddf81b2d5a7761aa0798be7f4221622783b33ea613913c1793079815474184154c4e34a05b3e3893dc0",
+                "rlp" : "0xf90360f901fca07dcccaed7455ba19911cd26fb5d540525f61589451c4629ec025f0e25fc8af63a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00c96353279ea33f6d3c219ae4e13a30735a1ec7c1ec93ef50e3659dbb97ffcfca0f3317853585e362ccac6285a17f4ce5f909b333e0b5efc70f88a26639be382d5a09dc654eecb40fc1979d9a25576e1134ac88bfc250fbf4504ddf6defd2c49c59ab90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000010000000000400000000000000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000600000000000400000000000000000000000200000000000000000000000000000008302000001887fffffffffffffff8286818203e880a049b73f3ea48f53778df1f7cfb2f1ca9bd3610d1730ba5e27f75ccd0bcfe092bc88d4b7ed58902a0682f9015df9015a8001840eb4785094095e7baea6a6c7c4c2dfeb977efac326af552d878478c81dbcb8f47f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09a3447d617a066c9437f3371ba09a8d52abaab9a48cbff6dc70fc4d57f8c1f3d74cbe4f252f7ddf81b2d5a7761aa0798be7f4221622783b33ea613913c1793079815474184154c4e34a05b3e3893dc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09a3447d617a066c9437f337",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02c7f2937e7ce798c591a4f019ccd732a965630b952957015d5430aad619ede22a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb3485375a76601364c4ede5b026dd841e4ab9dd8838f2d6fff5fbe10fb9b9f60",
+        "lastblockhash" : "0x6d89bc2c5b7a7cfd14db0209aef95279b22e42a907745fae9393765c0eaf2933",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x78c81dbc",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09a3447d617a066c9437f337",
@@ -233,8 +226,8 @@
     "randomStatetest234BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest234BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest234BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8375",
-                    "hash" : "0x914b5d55dcf2cb3f45987e17f88d955283148d4e1ab9f8fc33e45b4f1dd04c48",
-                    "mixHash" : "0x0fdfd85a8b55c8ba94b21b182cc1228b16688ef0db9b36c70477949e233291e1",
-                    "nonce" : "0x6a85e92c67035e9f",
+                    "hash" : "0x1b016a4d8b977fb75821461ddbf08ad31ea61de9fc7a3a5f96ec4fe11f2f9bda",
+                    "mixHash" : "0xef5f513a78e55f405df69b462bd045ff7997efb59dcaaa6ec3fcb8bd2b116a3d",
+                    "nonce" : "0x66c0daf0a7a2f96b",
                     "number" : "0x01",
                     "parentHash" : "0x7dcccaed7455ba19911cd26fb5d540525f61589451c4629ec025f0e25fc8af63",
                     "receiptTrie" : "0x7a3309a8188eed0326a78b54469c81fb99c30ecf5600c77ed2b515277a55464a",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0xf3317853585e362ccac6285a17f4ce5f909b333e0b5efc70f88a26639be382d5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90360f901fca07dcccaed7455ba19911cd26fb5d540525f61589451c4629ec025f0e25fc8af63a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a877d4225b4f43c4f729941fc3e5fc8e516fe50e0b671fda1e0e24836845ca53a0f3317853585e362ccac6285a17f4ce5f909b333e0b5efc70f88a26639be382d5a07a3309a8188eed0326a78b54469c81fb99c30ecf5600c77ed2b515277a55464ab90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000010000000000400000000000000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000600000000000400000000000000000000000200000000000000000000000000000008302000001887fffffffffffffff8283758203e880a00fdfd85a8b55c8ba94b21b182cc1228b16688ef0db9b36c70477949e233291e1886a85e92c67035e9ff9015df9015a8001840eb4785094095e7baea6a6c7c4c2dfeb977efac326af552d878478c81dbcb8f47f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09a3447d617a066c9437f3371ba09a8d52abaab9a48cbff6dc70fc4d57f8c1f3d74cbe4f252f7ddf81b2d5a7761aa0798be7f4221622783b33ea613913c1793079815474184154c4e34a05b3e3893dc0",
+                "rlp" : "0xf90360f901fca07dcccaed7455ba19911cd26fb5d540525f61589451c4629ec025f0e25fc8af63a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a877d4225b4f43c4f729941fc3e5fc8e516fe50e0b671fda1e0e24836845ca53a0f3317853585e362ccac6285a17f4ce5f909b333e0b5efc70f88a26639be382d5a07a3309a8188eed0326a78b54469c81fb99c30ecf5600c77ed2b515277a55464ab90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000010000000000400000000000000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000600000000000400000000000000000000000200000000000000000000000000000008302000001887fffffffffffffff8283758203e880a0ef5f513a78e55f405df69b462bd045ff7997efb59dcaaa6ec3fcb8bd2b116a3d8866c0daf0a7a2f96bf9015df9015a8001840eb4785094095e7baea6a6c7c4c2dfeb977efac326af552d878478c81dbcb8f47f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09a3447d617a066c9437f3371ba09a8d52abaab9a48cbff6dc70fc4d57f8c1f3d74cbe4f252f7ddf81b2d5a7761aa0798be7f4221622783b33ea613913c1793079815474184154c4e34a05b3e3893dc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09a3447d617a066c9437f337",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02c7f2937e7ce798c591a4f019ccd732a965630b952957015d5430aad619ede22a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x914b5d55dcf2cb3f45987e17f88d955283148d4e1ab9f8fc33e45b4f1dd04c48",
+        "lastblockhash" : "0x1b016a4d8b977fb75821461ddbf08ad31ea61de9fc7a3a5f96ec4fe11f2f9bda",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest234BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest234BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest234BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8375",
-                    "hash" : "0x3ccb505b7d3d45877d6304aa21c10ce8c8f908b99cdf3fb2d6447fe998efbe6a",
-                    "mixHash" : "0xe4caa4a5db59fb7970bc9f91450929d3c108dd9f17308ae4b4d972bc6d4e0738",
-                    "nonce" : "0x32dabb2d26138510",
+                    "hash" : "0xe60eae58b822c07a5fb57609087958f103c499062ada4202ab9a4a3b7cc958ca",
+                    "mixHash" : "0x66720b4df9719af2c58857fd1d8a170f3730b40e5c9c7d6b271b1cefdc985ce5",
+                    "nonce" : "0x582fb5254a8af672",
                     "number" : "0x01",
                     "parentHash" : "0x7dcccaed7455ba19911cd26fb5d540525f61589451c4629ec025f0e25fc8af63",
                     "receiptTrie" : "0x7a3309a8188eed0326a78b54469c81fb99c30ecf5600c77ed2b515277a55464a",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0xf3317853585e362ccac6285a17f4ce5f909b333e0b5efc70f88a26639be382d5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90360f901fca07dcccaed7455ba19911cd26fb5d540525f61589451c4629ec025f0e25fc8af63a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a877d4225b4f43c4f729941fc3e5fc8e516fe50e0b671fda1e0e24836845ca53a0f3317853585e362ccac6285a17f4ce5f909b333e0b5efc70f88a26639be382d5a07a3309a8188eed0326a78b54469c81fb99c30ecf5600c77ed2b515277a55464ab90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000010000000000400000000000000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000600000000000400000000000000000000000200000000000000000000000000000008302000001887fffffffffffffff8283758203e880a0e4caa4a5db59fb7970bc9f91450929d3c108dd9f17308ae4b4d972bc6d4e07388832dabb2d26138510f9015df9015a8001840eb4785094095e7baea6a6c7c4c2dfeb977efac326af552d878478c81dbcb8f47f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09a3447d617a066c9437f3371ba09a8d52abaab9a48cbff6dc70fc4d57f8c1f3d74cbe4f252f7ddf81b2d5a7761aa0798be7f4221622783b33ea613913c1793079815474184154c4e34a05b3e3893dc0",
+                "rlp" : "0xf90360f901fca07dcccaed7455ba19911cd26fb5d540525f61589451c4629ec025f0e25fc8af63a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a877d4225b4f43c4f729941fc3e5fc8e516fe50e0b671fda1e0e24836845ca53a0f3317853585e362ccac6285a17f4ce5f909b333e0b5efc70f88a26639be382d5a07a3309a8188eed0326a78b54469c81fb99c30ecf5600c77ed2b515277a55464ab90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000010000000000400000000000000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000600000000000400000000000000000000000200000000000000000000000000000008302000001887fffffffffffffff8283758203e880a066720b4df9719af2c58857fd1d8a170f3730b40e5c9c7d6b271b1cefdc985ce588582fb5254a8af672f9015df9015a8001840eb4785094095e7baea6a6c7c4c2dfeb977efac326af552d878478c81dbcb8f47f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09a3447d617a066c9437f3371ba09a8d52abaab9a48cbff6dc70fc4d57f8c1f3d74cbe4f252f7ddf81b2d5a7761aa0798be7f4221622783b33ea613913c1793079815474184154c4e34a05b3e3893dc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09a3447d617a066c9437f337",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02c7f2937e7ce798c591a4f019ccd732a965630b952957015d5430aad619ede22a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3ccb505b7d3d45877d6304aa21c10ce8c8f908b99cdf3fb2d6447fe998efbe6a",
+        "lastblockhash" : "0xe60eae58b822c07a5fb57609087958f103c499062ada4202ab9a4a3b7cc958ca",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest234BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest234BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest234BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8375",
-                    "hash" : "0xb6108c16a5c7a49e66fcc0eba2c15ee7aed3177fe43d2e74d86e9818ba9a56d7",
-                    "mixHash" : "0x9ef284465e97b0855cff66c841c08c20b6e550c1daf4c5b2c993f5dfbcf2dac2",
-                    "nonce" : "0x90b3e071f0be0b96",
+                    "hash" : "0x92bdf33d1d35107aed598b9467ad929fd2f9580422ef6668d1d8914d828d1113",
+                    "mixHash" : "0xd5ca0b2b9c48da0d4d213dd17bbb367a69d70c883672513ee3ed4565a9887344",
+                    "nonce" : "0xbfa0012826ebd07e",
                     "number" : "0x01",
                     "parentHash" : "0x7dcccaed7455ba19911cd26fb5d540525f61589451c4629ec025f0e25fc8af63",
                     "receiptTrie" : "0x7a3309a8188eed0326a78b54469c81fb99c30ecf5600c77ed2b515277a55464a",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0xf3317853585e362ccac6285a17f4ce5f909b333e0b5efc70f88a26639be382d5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90360f901fca07dcccaed7455ba19911cd26fb5d540525f61589451c4629ec025f0e25fc8af63a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a877d4225b4f43c4f729941fc3e5fc8e516fe50e0b671fda1e0e24836845ca53a0f3317853585e362ccac6285a17f4ce5f909b333e0b5efc70f88a26639be382d5a07a3309a8188eed0326a78b54469c81fb99c30ecf5600c77ed2b515277a55464ab90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000010000000000400000000000000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000600000000000400000000000000000000000200000000000000000000000000000008302000001887fffffffffffffff8283758203e880a09ef284465e97b0855cff66c841c08c20b6e550c1daf4c5b2c993f5dfbcf2dac28890b3e071f0be0b96f9015df9015a8001840eb4785094095e7baea6a6c7c4c2dfeb977efac326af552d878478c81dbcb8f47f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09a3447d617a066c9437f3371ba09a8d52abaab9a48cbff6dc70fc4d57f8c1f3d74cbe4f252f7ddf81b2d5a7761aa0798be7f4221622783b33ea613913c1793079815474184154c4e34a05b3e3893dc0",
+                "rlp" : "0xf90360f901fca07dcccaed7455ba19911cd26fb5d540525f61589451c4629ec025f0e25fc8af63a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a877d4225b4f43c4f729941fc3e5fc8e516fe50e0b671fda1e0e24836845ca53a0f3317853585e362ccac6285a17f4ce5f909b333e0b5efc70f88a26639be382d5a07a3309a8188eed0326a78b54469c81fb99c30ecf5600c77ed2b515277a55464ab90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000010000000000400000000000000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000600000000000400000000000000000000000200000000000000000000000000000008302000001887fffffffffffffff8283758203e880a0d5ca0b2b9c48da0d4d213dd17bbb367a69d70c883672513ee3ed4565a988734488bfa0012826ebd07ef9015df9015a8001840eb4785094095e7baea6a6c7c4c2dfeb977efac326af552d878478c81dbcb8f47f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09a3447d617a066c9437f3371ba09a8d52abaab9a48cbff6dc70fc4d57f8c1f3d74cbe4f252f7ddf81b2d5a7761aa0798be7f4221622783b33ea613913c1793079815474184154c4e34a05b3e3893dc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09a3447d617a066c9437f337",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02c7f2937e7ce798c591a4f019ccd732a965630b952957015d5430aad619ede22a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb6108c16a5c7a49e66fcc0eba2c15ee7aed3177fe43d2e74d86e9818ba9a56d7",
+        "lastblockhash" : "0x92bdf33d1d35107aed598b9467ad929fd2f9580422ef6668d1d8914d828d1113",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest234BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest234BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest234BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8375",
-                    "hash" : "0x056a704f4a4ab90d60a0d703d1e728c16afa1e668a280f9404272d1090d8109f",
-                    "mixHash" : "0x4f04a75d597481a6dd47c88d173d0271527b6b971ad2e68f191e761f07758808",
-                    "nonce" : "0x95f1716361a2742a",
+                    "hash" : "0x96ae9843623745bf177eced210aba061d3ed0d2766fbc0b831331a865d73635d",
+                    "mixHash" : "0x7dd370499aafef59a4ae372cde0bd560b9e7541e490cbab512104109c9e62c24",
+                    "nonce" : "0x1b4eec0ed1d18a89",
                     "number" : "0x01",
                     "parentHash" : "0x7dcccaed7455ba19911cd26fb5d540525f61589451c4629ec025f0e25fc8af63",
                     "receiptTrie" : "0x7a3309a8188eed0326a78b54469c81fb99c30ecf5600c77ed2b515277a55464a",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0xf3317853585e362ccac6285a17f4ce5f909b333e0b5efc70f88a26639be382d5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90360f901fca07dcccaed7455ba19911cd26fb5d540525f61589451c4629ec025f0e25fc8af63a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a877d4225b4f43c4f729941fc3e5fc8e516fe50e0b671fda1e0e24836845ca53a0f3317853585e362ccac6285a17f4ce5f909b333e0b5efc70f88a26639be382d5a07a3309a8188eed0326a78b54469c81fb99c30ecf5600c77ed2b515277a55464ab90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000010000000000400000000000000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000600000000000400000000000000000000000200000000000000000000000000000008302000001887fffffffffffffff8283758203e880a04f04a75d597481a6dd47c88d173d0271527b6b971ad2e68f191e761f077588088895f1716361a2742af9015df9015a8001840eb4785094095e7baea6a6c7c4c2dfeb977efac326af552d878478c81dbcb8f47f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09a3447d617a066c9437f3371ba09a8d52abaab9a48cbff6dc70fc4d57f8c1f3d74cbe4f252f7ddf81b2d5a7761aa0798be7f4221622783b33ea613913c1793079815474184154c4e34a05b3e3893dc0",
+                "rlp" : "0xf90360f901fca07dcccaed7455ba19911cd26fb5d540525f61589451c4629ec025f0e25fc8af63a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a877d4225b4f43c4f729941fc3e5fc8e516fe50e0b671fda1e0e24836845ca53a0f3317853585e362ccac6285a17f4ce5f909b333e0b5efc70f88a26639be382d5a07a3309a8188eed0326a78b54469c81fb99c30ecf5600c77ed2b515277a55464ab90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000010000000000400000000000000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000600000000000400000000000000000000000200000000000000000000000000000008302000001887fffffffffffffff8283758203e880a07dd370499aafef59a4ae372cde0bd560b9e7541e490cbab512104109c9e62c24881b4eec0ed1d18a89f9015df9015a8001840eb4785094095e7baea6a6c7c4c2dfeb977efac326af552d878478c81dbcb8f47f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09a3447d617a066c9437f3371ba09a8d52abaab9a48cbff6dc70fc4d57f8c1f3d74cbe4f252f7ddf81b2d5a7761aa0798be7f4221622783b33ea613913c1793079815474184154c4e34a05b3e3893dc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09a3447d617a066c9437f337",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02c7f2937e7ce798c591a4f019ccd732a965630b952957015d5430aad619ede22a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x056a704f4a4ab90d60a0d703d1e728c16afa1e668a280f9404272d1090d8109f",
+        "lastblockhash" : "0x96ae9843623745bf177eced210aba061d3ed0d2766fbc0b831331a865d73635d",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest235BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest235BC.json
index 44ca7fe85..e9e00c6c1 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest235BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest235BC.json
@@ -2,8 +2,8 @@
     "randomStatetest235BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest235BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest235BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8786",
-                    "hash" : "0xf44861d75d5690f6758cca31ad2bd9dc0235b89ae884fe4fcdae021de5fd8bf4",
-                    "mixHash" : "0x6c474266bfee1ec68a746d5d714b4bf105c71e95feef2974757fa28eaeb90a77",
-                    "nonce" : "0x341c83c8a88da548",
+                    "hash" : "0xd85fade22ba7a1bbf7d492645c149a2bd1872f8762c708f141efd1dbfb803816",
+                    "mixHash" : "0x47f2d25e5b7f538728aae9c80f27f63dd93453e43129c662838238adc3507752",
+                    "nonce" : "0x9b1605977bac0953",
                     "number" : "0x01",
                     "parentHash" : "0x62a9333b85ae921678027affc23d7406f4104e0e2f4057cb6fe0258bff6d216a",
                     "receiptTrie" : "0x1025cec147628d615da772a9a00de495c8ec6bd5926fdf378c1bfac9f8e03c22",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xd1e057b57a4f02c2908c7d6a611e88ae415dc060c377dc20515425aa2e563d89",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9033cf901fca062a9333b85ae921678027affc23d7406f4104e0e2f4057cb6fe0258bff6d216aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ddbc0702164fa769b82f90b15e6b7e7ae78a60b50c40ce47da808ea53228ff18a0d1e057b57a4f02c2908c7d6a611e88ae415dc060c377dc20515425aa2e563d89a01025cec147628d615da772a9a00de495c8ec6bd5926fdf378c1bfac9f8e03c22b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8287868203e880a06c474266bfee1ec68a746d5d714b4bf105c71e95feef2974757fa28eaeb90a7788341c83c8a88da548f90139f901368001846ac6de8194095e7baea6a6c7c4c2dfeb977efac326af552d87841d7dd23cb8d041407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe810967567786f2921ca06529325405a857218300ac43a972e6e3be57b822e1dcdd59afce82d62ee41224a060f21da78008b628e617abbafb57ef6b9c40c450e0d9758336760c2f5dc5c6edc0",
+                "rlp" : "0xf9033cf901fca062a9333b85ae921678027affc23d7406f4104e0e2f4057cb6fe0258bff6d216aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ddbc0702164fa769b82f90b15e6b7e7ae78a60b50c40ce47da808ea53228ff18a0d1e057b57a4f02c2908c7d6a611e88ae415dc060c377dc20515425aa2e563d89a01025cec147628d615da772a9a00de495c8ec6bd5926fdf378c1bfac9f8e03c22b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8287868203e880a047f2d25e5b7f538728aae9c80f27f63dd93453e43129c662838238adc3507752889b1605977bac0953f90139f901368001846ac6de8194095e7baea6a6c7c4c2dfeb977efac326af552d87841d7dd23cb8d041407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe810967567786f2921ca06529325405a857218300ac43a972e6e3be57b822e1dcdd59afce82d62ee41224a060f21da78008b628e617abbafb57ef6b9c40c450e0d9758336760c2f5dc5c6edc0",
                 "transactions" : [
                     {
                         "data" : "0x41407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe810967567786f292",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0634da2d88ea712bbecac631c63bec49fc36e6dfa07165e0e0f24aa953a9916aaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf44861d75d5690f6758cca31ad2bd9dc0235b89ae884fe4fcdae021de5fd8bf4",
+        "lastblockhash" : "0xd85fade22ba7a1bbf7d492645c149a2bd1872f8762c708f141efd1dbfb803816",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest235BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest235BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest235BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8a92",
-                    "hash" : "0xe3d02146df36cd1053ce5452ec13cb7f086d7df680078b1bd926fd3e53b8e63a",
-                    "mixHash" : "0x14f204ecb329206ab32620b27492b670c56365f8e146c0245c2150135e2918e5",
-                    "nonce" : "0xe1386d051c46ab48",
+                    "hash" : "0xc14f6670cbeb19d8da976087da3acf861d1d4f9803afbca515a1eb8be23c3384",
+                    "mixHash" : "0x1d2cb72eaf5d3a4a33b77953f4992cd9e8d351ab1da93988120edfe8e4a381cc",
+                    "nonce" : "0x5ebbb8452eabd8e4",
                     "number" : "0x01",
                     "parentHash" : "0x62a9333b85ae921678027affc23d7406f4104e0e2f4057cb6fe0258bff6d216a",
                     "receiptTrie" : "0x78f88f18affa39b406ada2fc542d48d530bb1704f92fd9f56ff3deca91b6ce43",
-                    "stateRoot" : "0xfeb873617d5753f41098afc5138df1335e85a9a0fd53e7a164c6d46cd78c0fa9",
+                    "stateRoot" : "0xcd3bd690f7d9fde1c5a1b135bad24a9fbc02c6637edca0c9308392ec3d5640d5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd1e057b57a4f02c2908c7d6a611e88ae415dc060c377dc20515425aa2e563d89",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9033cf901fca062a9333b85ae921678027affc23d7406f4104e0e2f4057cb6fe0258bff6d216aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0feb873617d5753f41098afc5138df1335e85a9a0fd53e7a164c6d46cd78c0fa9a0d1e057b57a4f02c2908c7d6a611e88ae415dc060c377dc20515425aa2e563d89a078f88f18affa39b406ada2fc542d48d530bb1704f92fd9f56ff3deca91b6ce43b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828a928203e880a014f204ecb329206ab32620b27492b670c56365f8e146c0245c2150135e2918e588e1386d051c46ab48f90139f901368001846ac6de8194095e7baea6a6c7c4c2dfeb977efac326af552d87841d7dd23cb8d041407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe810967567786f2921ca06529325405a857218300ac43a972e6e3be57b822e1dcdd59afce82d62ee41224a060f21da78008b628e617abbafb57ef6b9c40c450e0d9758336760c2f5dc5c6edc0",
+                "rlp" : "0xf9033cf901fca062a9333b85ae921678027affc23d7406f4104e0e2f4057cb6fe0258bff6d216aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cd3bd690f7d9fde1c5a1b135bad24a9fbc02c6637edca0c9308392ec3d5640d5a0d1e057b57a4f02c2908c7d6a611e88ae415dc060c377dc20515425aa2e563d89a078f88f18affa39b406ada2fc542d48d530bb1704f92fd9f56ff3deca91b6ce43b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828a928203e880a01d2cb72eaf5d3a4a33b77953f4992cd9e8d351ab1da93988120edfe8e4a381cc885ebbb8452eabd8e4f90139f901368001846ac6de8194095e7baea6a6c7c4c2dfeb977efac326af552d87841d7dd23cb8d041407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe810967567786f2921ca06529325405a857218300ac43a972e6e3be57b822e1dcdd59afce82d62ee41224a060f21da78008b628e617abbafb57ef6b9c40c450e0d9758336760c2f5dc5c6edc0",
                 "transactions" : [
                     {
                         "data" : "0x41407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe810967567786f292",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0634da2d88ea712bbecac631c63bec49fc36e6dfa07165e0e0f24aa953a9916aaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe3d02146df36cd1053ce5452ec13cb7f086d7df680078b1bd926fd3e53b8e63a",
+        "lastblockhash" : "0xc14f6670cbeb19d8da976087da3acf861d1d4f9803afbca515a1eb8be23c3384",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1d7dd23c",
                 "code" : "0x41407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe810967567786f29260005155",
@@ -233,8 +226,8 @@
     "randomStatetest235BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest235BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest235BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8786",
-                    "hash" : "0x24dbd1353ecf393fc534bcf3f387b342abda659d32cc87ea8d5ad5b51d3a56d6",
-                    "mixHash" : "0x3c3ad8c8ad3c05fe325b6e4a7c7e0d7e7455fbfc2a2f78f56e5c705d70f735b0",
-                    "nonce" : "0xe9c4f05f421267c0",
+                    "hash" : "0x08a839abbc754efc033985caac5a06f9c11d89c6b1fcac58b806f20e7748367e",
+                    "mixHash" : "0x358355af24344048243de543ff161302dbb87061a85c503ea42abaef77c70f09",
+                    "nonce" : "0x918fcdc1e1f6a152",
                     "number" : "0x01",
                     "parentHash" : "0x62a9333b85ae921678027affc23d7406f4104e0e2f4057cb6fe0258bff6d216a",
                     "receiptTrie" : "0xa565f7824590096437f2a475804e8f400cb7da4239028a85384e163cbc00b036",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0xd1e057b57a4f02c2908c7d6a611e88ae415dc060c377dc20515425aa2e563d89",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9033cf901fca062a9333b85ae921678027affc23d7406f4104e0e2f4057cb6fe0258bff6d216aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01283c72d12b3b798c33f2eb9d4827ba280536f2a5dd7c182dfd2e830f8a3112aa0d1e057b57a4f02c2908c7d6a611e88ae415dc060c377dc20515425aa2e563d89a0a565f7824590096437f2a475804e8f400cb7da4239028a85384e163cbc00b036b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8287868203e880a03c3ad8c8ad3c05fe325b6e4a7c7e0d7e7455fbfc2a2f78f56e5c705d70f735b088e9c4f05f421267c0f90139f901368001846ac6de8194095e7baea6a6c7c4c2dfeb977efac326af552d87841d7dd23cb8d041407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe810967567786f2921ca06529325405a857218300ac43a972e6e3be57b822e1dcdd59afce82d62ee41224a060f21da78008b628e617abbafb57ef6b9c40c450e0d9758336760c2f5dc5c6edc0",
+                "rlp" : "0xf9033cf901fca062a9333b85ae921678027affc23d7406f4104e0e2f4057cb6fe0258bff6d216aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01283c72d12b3b798c33f2eb9d4827ba280536f2a5dd7c182dfd2e830f8a3112aa0d1e057b57a4f02c2908c7d6a611e88ae415dc060c377dc20515425aa2e563d89a0a565f7824590096437f2a475804e8f400cb7da4239028a85384e163cbc00b036b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8287868203e880a0358355af24344048243de543ff161302dbb87061a85c503ea42abaef77c70f0988918fcdc1e1f6a152f90139f901368001846ac6de8194095e7baea6a6c7c4c2dfeb977efac326af552d87841d7dd23cb8d041407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe810967567786f2921ca06529325405a857218300ac43a972e6e3be57b822e1dcdd59afce82d62ee41224a060f21da78008b628e617abbafb57ef6b9c40c450e0d9758336760c2f5dc5c6edc0",
                 "transactions" : [
                     {
                         "data" : "0x41407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe810967567786f292",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0634da2d88ea712bbecac631c63bec49fc36e6dfa07165e0e0f24aa953a9916aaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x24dbd1353ecf393fc534bcf3f387b342abda659d32cc87ea8d5ad5b51d3a56d6",
+        "lastblockhash" : "0x08a839abbc754efc033985caac5a06f9c11d89c6b1fcac58b806f20e7748367e",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest235BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest235BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest235BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8786",
-                    "hash" : "0x9c0d990a5691fc6e693b74a0908d50e5b9f4d9acf638dce7219ec5ed4588d056",
-                    "mixHash" : "0x9fbc4fde0ff1de9b21a6268fe3f46202652c4a7afd5e3937e1622c594e54b32b",
-                    "nonce" : "0xb0657cf2197ea701",
+                    "hash" : "0xf681c9b59f3a60d7220b4d47498b4f039f4748f0892a094343d9bdda877dcc7e",
+                    "mixHash" : "0x909fef286f5328161c7f450c18360c7a0900299f920ef4b33f9423cba78a3f10",
+                    "nonce" : "0x9af6dadbe3722f17",
                     "number" : "0x01",
                     "parentHash" : "0x62a9333b85ae921678027affc23d7406f4104e0e2f4057cb6fe0258bff6d216a",
                     "receiptTrie" : "0xa565f7824590096437f2a475804e8f400cb7da4239028a85384e163cbc00b036",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0xd1e057b57a4f02c2908c7d6a611e88ae415dc060c377dc20515425aa2e563d89",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9033cf901fca062a9333b85ae921678027affc23d7406f4104e0e2f4057cb6fe0258bff6d216aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01283c72d12b3b798c33f2eb9d4827ba280536f2a5dd7c182dfd2e830f8a3112aa0d1e057b57a4f02c2908c7d6a611e88ae415dc060c377dc20515425aa2e563d89a0a565f7824590096437f2a475804e8f400cb7da4239028a85384e163cbc00b036b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8287868203e880a09fbc4fde0ff1de9b21a6268fe3f46202652c4a7afd5e3937e1622c594e54b32b88b0657cf2197ea701f90139f901368001846ac6de8194095e7baea6a6c7c4c2dfeb977efac326af552d87841d7dd23cb8d041407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe810967567786f2921ca06529325405a857218300ac43a972e6e3be57b822e1dcdd59afce82d62ee41224a060f21da78008b628e617abbafb57ef6b9c40c450e0d9758336760c2f5dc5c6edc0",
+                "rlp" : "0xf9033cf901fca062a9333b85ae921678027affc23d7406f4104e0e2f4057cb6fe0258bff6d216aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01283c72d12b3b798c33f2eb9d4827ba280536f2a5dd7c182dfd2e830f8a3112aa0d1e057b57a4f02c2908c7d6a611e88ae415dc060c377dc20515425aa2e563d89a0a565f7824590096437f2a475804e8f400cb7da4239028a85384e163cbc00b036b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8287868203e880a0909fef286f5328161c7f450c18360c7a0900299f920ef4b33f9423cba78a3f10889af6dadbe3722f17f90139f901368001846ac6de8194095e7baea6a6c7c4c2dfeb977efac326af552d87841d7dd23cb8d041407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe810967567786f2921ca06529325405a857218300ac43a972e6e3be57b822e1dcdd59afce82d62ee41224a060f21da78008b628e617abbafb57ef6b9c40c450e0d9758336760c2f5dc5c6edc0",
                 "transactions" : [
                     {
                         "data" : "0x41407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe810967567786f292",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0634da2d88ea712bbecac631c63bec49fc36e6dfa07165e0e0f24aa953a9916aaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9c0d990a5691fc6e693b74a0908d50e5b9f4d9acf638dce7219ec5ed4588d056",
+        "lastblockhash" : "0xf681c9b59f3a60d7220b4d47498b4f039f4748f0892a094343d9bdda877dcc7e",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest235BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest235BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest235BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8786",
-                    "hash" : "0x4c02c7be65535ee208e7a48865555a031ef925190216590dd04dc5ad93ff3494",
-                    "mixHash" : "0xf0927003b6a8f8f07f1bba3b39ca44d6d535736902d7f10e354740610fea73ed",
-                    "nonce" : "0x8913e9a9fab6c303",
+                    "hash" : "0x6a7214e0100f35d9c1c6b9ae3fcd1de448df5b72a40d4b5de3a07ae2265a4d0c",
+                    "mixHash" : "0xeebdc09c0d4acc670de732b2dffdd7bc0bc3a852d3c477d92d8fd674daa76590",
+                    "nonce" : "0xa58103c929267517",
                     "number" : "0x01",
                     "parentHash" : "0x62a9333b85ae921678027affc23d7406f4104e0e2f4057cb6fe0258bff6d216a",
                     "receiptTrie" : "0xa565f7824590096437f2a475804e8f400cb7da4239028a85384e163cbc00b036",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0xd1e057b57a4f02c2908c7d6a611e88ae415dc060c377dc20515425aa2e563d89",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9033cf901fca062a9333b85ae921678027affc23d7406f4104e0e2f4057cb6fe0258bff6d216aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01283c72d12b3b798c33f2eb9d4827ba280536f2a5dd7c182dfd2e830f8a3112aa0d1e057b57a4f02c2908c7d6a611e88ae415dc060c377dc20515425aa2e563d89a0a565f7824590096437f2a475804e8f400cb7da4239028a85384e163cbc00b036b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8287868203e880a0f0927003b6a8f8f07f1bba3b39ca44d6d535736902d7f10e354740610fea73ed888913e9a9fab6c303f90139f901368001846ac6de8194095e7baea6a6c7c4c2dfeb977efac326af552d87841d7dd23cb8d041407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe810967567786f2921ca06529325405a857218300ac43a972e6e3be57b822e1dcdd59afce82d62ee41224a060f21da78008b628e617abbafb57ef6b9c40c450e0d9758336760c2f5dc5c6edc0",
+                "rlp" : "0xf9033cf901fca062a9333b85ae921678027affc23d7406f4104e0e2f4057cb6fe0258bff6d216aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01283c72d12b3b798c33f2eb9d4827ba280536f2a5dd7c182dfd2e830f8a3112aa0d1e057b57a4f02c2908c7d6a611e88ae415dc060c377dc20515425aa2e563d89a0a565f7824590096437f2a475804e8f400cb7da4239028a85384e163cbc00b036b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8287868203e880a0eebdc09c0d4acc670de732b2dffdd7bc0bc3a852d3c477d92d8fd674daa7659088a58103c929267517f90139f901368001846ac6de8194095e7baea6a6c7c4c2dfeb977efac326af552d87841d7dd23cb8d041407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe810967567786f2921ca06529325405a857218300ac43a972e6e3be57b822e1dcdd59afce82d62ee41224a060f21da78008b628e617abbafb57ef6b9c40c450e0d9758336760c2f5dc5c6edc0",
                 "transactions" : [
                     {
                         "data" : "0x41407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe810967567786f292",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0634da2d88ea712bbecac631c63bec49fc36e6dfa07165e0e0f24aa953a9916aaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4c02c7be65535ee208e7a48865555a031ef925190216590dd04dc5ad93ff3494",
+        "lastblockhash" : "0x6a7214e0100f35d9c1c6b9ae3fcd1de448df5b72a40d4b5de3a07ae2265a4d0c",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest235BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest235BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest235BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8786",
-                    "hash" : "0xe27ccac07f492be80d5dce8b476c473ac5c3fd54c580efb702d8ff94041d03f1",
-                    "mixHash" : "0x92ec23af27059a92990428b11c9acc9572ac5d6b4fde8dd280772aadd39a2a18",
-                    "nonce" : "0xb39f09c68bfa779c",
+                    "hash" : "0x76e992468858591565217d151335e84c72067fa9ecf5aa6d3f72d0beb13c5cdf",
+                    "mixHash" : "0x560b74a9b20120a59e238a50c155a2258ed3ec9377ad1e4e546df922b4e28ef7",
+                    "nonce" : "0xf18ffe374d5cf6d4",
                     "number" : "0x01",
                     "parentHash" : "0x62a9333b85ae921678027affc23d7406f4104e0e2f4057cb6fe0258bff6d216a",
                     "receiptTrie" : "0xa565f7824590096437f2a475804e8f400cb7da4239028a85384e163cbc00b036",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0xd1e057b57a4f02c2908c7d6a611e88ae415dc060c377dc20515425aa2e563d89",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9033cf901fca062a9333b85ae921678027affc23d7406f4104e0e2f4057cb6fe0258bff6d216aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01283c72d12b3b798c33f2eb9d4827ba280536f2a5dd7c182dfd2e830f8a3112aa0d1e057b57a4f02c2908c7d6a611e88ae415dc060c377dc20515425aa2e563d89a0a565f7824590096437f2a475804e8f400cb7da4239028a85384e163cbc00b036b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8287868203e880a092ec23af27059a92990428b11c9acc9572ac5d6b4fde8dd280772aadd39a2a1888b39f09c68bfa779cf90139f901368001846ac6de8194095e7baea6a6c7c4c2dfeb977efac326af552d87841d7dd23cb8d041407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe810967567786f2921ca06529325405a857218300ac43a972e6e3be57b822e1dcdd59afce82d62ee41224a060f21da78008b628e617abbafb57ef6b9c40c450e0d9758336760c2f5dc5c6edc0",
+                "rlp" : "0xf9033cf901fca062a9333b85ae921678027affc23d7406f4104e0e2f4057cb6fe0258bff6d216aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01283c72d12b3b798c33f2eb9d4827ba280536f2a5dd7c182dfd2e830f8a3112aa0d1e057b57a4f02c2908c7d6a611e88ae415dc060c377dc20515425aa2e563d89a0a565f7824590096437f2a475804e8f400cb7da4239028a85384e163cbc00b036b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8287868203e880a0560b74a9b20120a59e238a50c155a2258ed3ec9377ad1e4e546df922b4e28ef788f18ffe374d5cf6d4f90139f901368001846ac6de8194095e7baea6a6c7c4c2dfeb977efac326af552d87841d7dd23cb8d041407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe810967567786f2921ca06529325405a857218300ac43a972e6e3be57b822e1dcdd59afce82d62ee41224a060f21da78008b628e617abbafb57ef6b9c40c450e0d9758336760c2f5dc5c6edc0",
                 "transactions" : [
                     {
                         "data" : "0x41407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe810967567786f292",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0634da2d88ea712bbecac631c63bec49fc36e6dfa07165e0e0f24aa953a9916aaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe27ccac07f492be80d5dce8b476c473ac5c3fd54c580efb702d8ff94041d03f1",
+        "lastblockhash" : "0x76e992468858591565217d151335e84c72067fa9ecf5aa6d3f72d0beb13c5cdf",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest239BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest239BC.json
index 2cba22546..dea8a534d 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest239BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest239BC.json
@@ -2,8 +2,8 @@
     "randomStatetest239BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest239BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest239BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x04166956",
-                    "hash" : "0xb23f81d9a4a2bdcb507efd29c5fdd29f3196d2a6672f18daf745ef313498817a",
-                    "mixHash" : "0xea57cc4de69e230f9d08d4feb341db5842925917201f30750ce0d6e1d104f232",
-                    "nonce" : "0x09667996b2c55dda",
+                    "hash" : "0xd710fb29ad0fa7784011176c3c0013dc9fed1ba222faaa0aaf3dc26fe3c8b02c",
+                    "mixHash" : "0xa60d2bd7a5375bb23c81b75e7fa133af03f07f6940225c824dcb72ec9c87a453",
+                    "nonce" : "0x34864ba1cd46e20f",
                     "number" : "0x01",
                     "parentHash" : "0x0382928f666a1600554ecfdcceb874c2952d4da8a2148280458ecb1219f0ba2f",
                     "receiptTrie" : "0xbce541c3691dbc2b0b8dba4d1dbbe19f2cc8535ff4ac4bd1d5f3d3e3b6445101",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xcd2741886d0977679e582e5ae72083dd189a0c938e6ea51ce44611db667adfcc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90343f901fea00382928f666a1600554ecfdcceb874c2952d4da8a2148280458ecb1219f0ba2fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0afd9c9999fbae4bb5f39c3edc928a80b610e2eb7ee9fa716ddd7dec790efa0fda0cd2741886d0977679e582e5ae72083dd189a0c938e6ea51ce44611db667adfcca0bce541c3691dbc2b0b8dba4d1dbbe19f2cc8535ff4ac4bd1d5f3d3e3b6445101b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84041669568203e880a0ea57cc4de69e230f9d08d4feb341db5842925917201f30750ce0d6e1d104f2328809667996b2c55ddaf9013ef9013b80018437f5aeb094095e7baea6a6c7c4c2dfeb977efac326af552d87844a9a17a5b8d5427f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000000000000000000000000000000000000000c3504535625b1a39921909f31117861ba00d4b741d75d1910a8135de233f04889e459ac002d1d8bb4e6a7f6046beb6cf9ea02196c3a70dd25eb690a162e037e6ffda6fc3c68330152bc14a785c78a37cb809c0",
+                "rlp" : "0xf90343f901fea00382928f666a1600554ecfdcceb874c2952d4da8a2148280458ecb1219f0ba2fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0afd9c9999fbae4bb5f39c3edc928a80b610e2eb7ee9fa716ddd7dec790efa0fda0cd2741886d0977679e582e5ae72083dd189a0c938e6ea51ce44611db667adfcca0bce541c3691dbc2b0b8dba4d1dbbe19f2cc8535ff4ac4bd1d5f3d3e3b6445101b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84041669568203e880a0a60d2bd7a5375bb23c81b75e7fa133af03f07f6940225c824dcb72ec9c87a4538834864ba1cd46e20ff9013ef9013b80018437f5aeb094095e7baea6a6c7c4c2dfeb977efac326af552d87844a9a17a5b8d5427f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000000000000000000000000000000000000000c3504535625b1a39921909f31117861ba00d4b741d75d1910a8135de233f04889e459ac002d1d8bb4e6a7f6046beb6cf9ea02196c3a70dd25eb690a162e037e6ffda6fc3c68330152bc14a785c78a37cb809c0",
                 "transactions" : [
                     {
                         "data" : "0x427f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000000000000000000000000000000000000000c3504535625b1a39921909f3111786",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00293619ecd0a9c90fd82e2045b8f4ab224f8930b3a0abe297caef3b692e6b4b4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb23f81d9a4a2bdcb507efd29c5fdd29f3196d2a6672f18daf745ef313498817a",
+        "lastblockhash" : "0xd710fb29ad0fa7784011176c3c0013dc9fed1ba222faaa0aaf3dc26fe3c8b02c",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest239BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest239BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest239BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x04166c62",
-                    "hash" : "0xac4860bc4c25bd89d4ba0bb2c3eef8ed4886ddd5a4e1375f970ccedf5110bcfe",
-                    "mixHash" : "0x8f130456ecb4c91ea37ca8c0a4b7c6df38557c4c3ad33b99b6caa03db238de6d",
-                    "nonce" : "0xa3198007eeb000e5",
+                    "hash" : "0x419fdeafb49093156bd7eb7b38e3f1232b443f617a7eb34e600904e4e61a3f86",
+                    "mixHash" : "0xfeec45c49ee0131d1a01148245a5f9628552095d85e79d525c3fe78cda6f4fa1",
+                    "nonce" : "0xcd58283f6099ad66",
                     "number" : "0x01",
                     "parentHash" : "0x0382928f666a1600554ecfdcceb874c2952d4da8a2148280458ecb1219f0ba2f",
                     "receiptTrie" : "0x423548556f99881d18fb5971e4d5683e6942bcab173ea29d13ccea315ae1f786",
-                    "stateRoot" : "0x705894e01344a8211f06bd1f6387c83d52951f7151676c2830c08c90bbb344d6",
+                    "stateRoot" : "0x7a5b0ab85dfde79fa0a8ce409a99000710a70e804c9710e2a0b2b154bd6b5f54",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xcd2741886d0977679e582e5ae72083dd189a0c938e6ea51ce44611db667adfcc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90343f901fea00382928f666a1600554ecfdcceb874c2952d4da8a2148280458ecb1219f0ba2fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0705894e01344a8211f06bd1f6387c83d52951f7151676c2830c08c90bbb344d6a0cd2741886d0977679e582e5ae72083dd189a0c938e6ea51ce44611db667adfcca0423548556f99881d18fb5971e4d5683e6942bcab173ea29d13ccea315ae1f786b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8404166c628203e880a08f130456ecb4c91ea37ca8c0a4b7c6df38557c4c3ad33b99b6caa03db238de6d88a3198007eeb000e5f9013ef9013b80018437f5aeb094095e7baea6a6c7c4c2dfeb977efac326af552d87844a9a17a5b8d5427f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000000000000000000000000000000000000000c3504535625b1a39921909f31117861ba00d4b741d75d1910a8135de233f04889e459ac002d1d8bb4e6a7f6046beb6cf9ea02196c3a70dd25eb690a162e037e6ffda6fc3c68330152bc14a785c78a37cb809c0",
+                "rlp" : "0xf90343f901fea00382928f666a1600554ecfdcceb874c2952d4da8a2148280458ecb1219f0ba2fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07a5b0ab85dfde79fa0a8ce409a99000710a70e804c9710e2a0b2b154bd6b5f54a0cd2741886d0977679e582e5ae72083dd189a0c938e6ea51ce44611db667adfcca0423548556f99881d18fb5971e4d5683e6942bcab173ea29d13ccea315ae1f786b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8404166c628203e880a0feec45c49ee0131d1a01148245a5f9628552095d85e79d525c3fe78cda6f4fa188cd58283f6099ad66f9013ef9013b80018437f5aeb094095e7baea6a6c7c4c2dfeb977efac326af552d87844a9a17a5b8d5427f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000000000000000000000000000000000000000c3504535625b1a39921909f31117861ba00d4b741d75d1910a8135de233f04889e459ac002d1d8bb4e6a7f6046beb6cf9ea02196c3a70dd25eb690a162e037e6ffda6fc3c68330152bc14a785c78a37cb809c0",
                 "transactions" : [
                     {
                         "data" : "0x427f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000000000000000000000000000000000000000c3504535625b1a39921909f3111786",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00293619ecd0a9c90fd82e2045b8f4ab224f8930b3a0abe297caef3b692e6b4b4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xac4860bc4c25bd89d4ba0bb2c3eef8ed4886ddd5a4e1375f970ccedf5110bcfe",
+        "lastblockhash" : "0x419fdeafb49093156bd7eb7b38e3f1232b443f617a7eb34e600904e4e61a3f86",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x4a9a17a5",
                 "code" : "0x427f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000000000000000000000000000000000000000c3504535625b1a39921909f311178655",
@@ -233,8 +226,8 @@
     "randomStatetest239BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest239BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest239BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x04166956",
-                    "hash" : "0x5c88eaf4148aeb0b1acb68cad75d550f7f732c486b9062b2912ec111ff87ddda",
-                    "mixHash" : "0x5eb9f439b439d9d9df185fcca572e7babde188b5156fce97ad6953293bcd3858",
-                    "nonce" : "0x8582f00086f9cd20",
+                    "hash" : "0xfba360daba8181cf14ceb74b716ea427f54a4a68a248d1a6915910bfeed06abd",
+                    "mixHash" : "0xec5a76fc9fb0a704435b78d56ed3360e214d1203625625490756c417851887eb",
+                    "nonce" : "0xebf0a4e53b57aab8",
                     "number" : "0x01",
                     "parentHash" : "0x0382928f666a1600554ecfdcceb874c2952d4da8a2148280458ecb1219f0ba2f",
                     "receiptTrie" : "0x1b5a5bbda9d6f58790d69754d81917ad03b9c119c006f74dc9222650a83dabd3",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0xcd2741886d0977679e582e5ae72083dd189a0c938e6ea51ce44611db667adfcc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90343f901fea00382928f666a1600554ecfdcceb874c2952d4da8a2148280458ecb1219f0ba2fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01da644f211ae70a8f5d5495dc775028bf185cb4f640cf7e80c4451fee1df3d2ca0cd2741886d0977679e582e5ae72083dd189a0c938e6ea51ce44611db667adfcca01b5a5bbda9d6f58790d69754d81917ad03b9c119c006f74dc9222650a83dabd3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84041669568203e880a05eb9f439b439d9d9df185fcca572e7babde188b5156fce97ad6953293bcd3858888582f00086f9cd20f9013ef9013b80018437f5aeb094095e7baea6a6c7c4c2dfeb977efac326af552d87844a9a17a5b8d5427f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000000000000000000000000000000000000000c3504535625b1a39921909f31117861ba00d4b741d75d1910a8135de233f04889e459ac002d1d8bb4e6a7f6046beb6cf9ea02196c3a70dd25eb690a162e037e6ffda6fc3c68330152bc14a785c78a37cb809c0",
+                "rlp" : "0xf90343f901fea00382928f666a1600554ecfdcceb874c2952d4da8a2148280458ecb1219f0ba2fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01da644f211ae70a8f5d5495dc775028bf185cb4f640cf7e80c4451fee1df3d2ca0cd2741886d0977679e582e5ae72083dd189a0c938e6ea51ce44611db667adfcca01b5a5bbda9d6f58790d69754d81917ad03b9c119c006f74dc9222650a83dabd3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84041669568203e880a0ec5a76fc9fb0a704435b78d56ed3360e214d1203625625490756c417851887eb88ebf0a4e53b57aab8f9013ef9013b80018437f5aeb094095e7baea6a6c7c4c2dfeb977efac326af552d87844a9a17a5b8d5427f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000000000000000000000000000000000000000c3504535625b1a39921909f31117861ba00d4b741d75d1910a8135de233f04889e459ac002d1d8bb4e6a7f6046beb6cf9ea02196c3a70dd25eb690a162e037e6ffda6fc3c68330152bc14a785c78a37cb809c0",
                 "transactions" : [
                     {
                         "data" : "0x427f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000000000000000000000000000000000000000c3504535625b1a39921909f3111786",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00293619ecd0a9c90fd82e2045b8f4ab224f8930b3a0abe297caef3b692e6b4b4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5c88eaf4148aeb0b1acb68cad75d550f7f732c486b9062b2912ec111ff87ddda",
+        "lastblockhash" : "0xfba360daba8181cf14ceb74b716ea427f54a4a68a248d1a6915910bfeed06abd",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest239BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest239BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest239BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x04166956",
-                    "hash" : "0xac9359aa31fd541d5c4a9e9733364db05ddb6c3fc3bf59b461f6f35b812426e3",
-                    "mixHash" : "0x6fb792a7952f5ffde7c684973d10822623aab7791e995ca92b9f3a2d45fc2200",
-                    "nonce" : "0xc15818c216401bbc",
+                    "hash" : "0x33555831f1c0a79bd70d5b54dcc26d8fbf7d2b55d6bd562484dad367238850c9",
+                    "mixHash" : "0xac6c500fd4a09b8789b856fd392d87a3f8b9110f34b206ce268a3d21957f7a44",
+                    "nonce" : "0xc1054739b08192cb",
                     "number" : "0x01",
                     "parentHash" : "0x0382928f666a1600554ecfdcceb874c2952d4da8a2148280458ecb1219f0ba2f",
                     "receiptTrie" : "0x1b5a5bbda9d6f58790d69754d81917ad03b9c119c006f74dc9222650a83dabd3",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0xcd2741886d0977679e582e5ae72083dd189a0c938e6ea51ce44611db667adfcc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90343f901fea00382928f666a1600554ecfdcceb874c2952d4da8a2148280458ecb1219f0ba2fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01da644f211ae70a8f5d5495dc775028bf185cb4f640cf7e80c4451fee1df3d2ca0cd2741886d0977679e582e5ae72083dd189a0c938e6ea51ce44611db667adfcca01b5a5bbda9d6f58790d69754d81917ad03b9c119c006f74dc9222650a83dabd3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84041669568203e880a06fb792a7952f5ffde7c684973d10822623aab7791e995ca92b9f3a2d45fc220088c15818c216401bbcf9013ef9013b80018437f5aeb094095e7baea6a6c7c4c2dfeb977efac326af552d87844a9a17a5b8d5427f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000000000000000000000000000000000000000c3504535625b1a39921909f31117861ba00d4b741d75d1910a8135de233f04889e459ac002d1d8bb4e6a7f6046beb6cf9ea02196c3a70dd25eb690a162e037e6ffda6fc3c68330152bc14a785c78a37cb809c0",
+                "rlp" : "0xf90343f901fea00382928f666a1600554ecfdcceb874c2952d4da8a2148280458ecb1219f0ba2fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01da644f211ae70a8f5d5495dc775028bf185cb4f640cf7e80c4451fee1df3d2ca0cd2741886d0977679e582e5ae72083dd189a0c938e6ea51ce44611db667adfcca01b5a5bbda9d6f58790d69754d81917ad03b9c119c006f74dc9222650a83dabd3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84041669568203e880a0ac6c500fd4a09b8789b856fd392d87a3f8b9110f34b206ce268a3d21957f7a4488c1054739b08192cbf9013ef9013b80018437f5aeb094095e7baea6a6c7c4c2dfeb977efac326af552d87844a9a17a5b8d5427f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000000000000000000000000000000000000000c3504535625b1a39921909f31117861ba00d4b741d75d1910a8135de233f04889e459ac002d1d8bb4e6a7f6046beb6cf9ea02196c3a70dd25eb690a162e037e6ffda6fc3c68330152bc14a785c78a37cb809c0",
                 "transactions" : [
                     {
                         "data" : "0x427f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000000000000000000000000000000000000000c3504535625b1a39921909f3111786",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00293619ecd0a9c90fd82e2045b8f4ab224f8930b3a0abe297caef3b692e6b4b4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xac9359aa31fd541d5c4a9e9733364db05ddb6c3fc3bf59b461f6f35b812426e3",
+        "lastblockhash" : "0x33555831f1c0a79bd70d5b54dcc26d8fbf7d2b55d6bd562484dad367238850c9",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest239BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest239BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest239BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x04166956",
-                    "hash" : "0x0e3932c1a5847f9e3dc283ab82f643058f63b3b5eae76b3757b712a1ddaf217e",
-                    "mixHash" : "0xfd30ef7d22e099434fd8d4950e0ba57228f8f5a4b3de38313bf5f29f1a5229c8",
-                    "nonce" : "0x08f4c304e2601381",
+                    "hash" : "0x116b7984512d23b8b3ff384bf371ef41ac2a5750f86b8b113776b90c006fa6a1",
+                    "mixHash" : "0xce643526030dc4ed0e72c00991e9ac016a8d6d3abf7bb4daf3ee579d210b9893",
+                    "nonce" : "0xad21f3042f947623",
                     "number" : "0x01",
                     "parentHash" : "0x0382928f666a1600554ecfdcceb874c2952d4da8a2148280458ecb1219f0ba2f",
                     "receiptTrie" : "0x1b5a5bbda9d6f58790d69754d81917ad03b9c119c006f74dc9222650a83dabd3",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0xcd2741886d0977679e582e5ae72083dd189a0c938e6ea51ce44611db667adfcc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90343f901fea00382928f666a1600554ecfdcceb874c2952d4da8a2148280458ecb1219f0ba2fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01da644f211ae70a8f5d5495dc775028bf185cb4f640cf7e80c4451fee1df3d2ca0cd2741886d0977679e582e5ae72083dd189a0c938e6ea51ce44611db667adfcca01b5a5bbda9d6f58790d69754d81917ad03b9c119c006f74dc9222650a83dabd3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84041669568203e880a0fd30ef7d22e099434fd8d4950e0ba57228f8f5a4b3de38313bf5f29f1a5229c88808f4c304e2601381f9013ef9013b80018437f5aeb094095e7baea6a6c7c4c2dfeb977efac326af552d87844a9a17a5b8d5427f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000000000000000000000000000000000000000c3504535625b1a39921909f31117861ba00d4b741d75d1910a8135de233f04889e459ac002d1d8bb4e6a7f6046beb6cf9ea02196c3a70dd25eb690a162e037e6ffda6fc3c68330152bc14a785c78a37cb809c0",
+                "rlp" : "0xf90343f901fea00382928f666a1600554ecfdcceb874c2952d4da8a2148280458ecb1219f0ba2fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01da644f211ae70a8f5d5495dc775028bf185cb4f640cf7e80c4451fee1df3d2ca0cd2741886d0977679e582e5ae72083dd189a0c938e6ea51ce44611db667adfcca01b5a5bbda9d6f58790d69754d81917ad03b9c119c006f74dc9222650a83dabd3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84041669568203e880a0ce643526030dc4ed0e72c00991e9ac016a8d6d3abf7bb4daf3ee579d210b989388ad21f3042f947623f9013ef9013b80018437f5aeb094095e7baea6a6c7c4c2dfeb977efac326af552d87844a9a17a5b8d5427f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000000000000000000000000000000000000000c3504535625b1a39921909f31117861ba00d4b741d75d1910a8135de233f04889e459ac002d1d8bb4e6a7f6046beb6cf9ea02196c3a70dd25eb690a162e037e6ffda6fc3c68330152bc14a785c78a37cb809c0",
                 "transactions" : [
                     {
                         "data" : "0x427f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000000000000000000000000000000000000000c3504535625b1a39921909f3111786",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00293619ecd0a9c90fd82e2045b8f4ab224f8930b3a0abe297caef3b692e6b4b4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0e3932c1a5847f9e3dc283ab82f643058f63b3b5eae76b3757b712a1ddaf217e",
+        "lastblockhash" : "0x116b7984512d23b8b3ff384bf371ef41ac2a5750f86b8b113776b90c006fa6a1",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest239BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest239BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest239BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x04166956",
-                    "hash" : "0x3fa277864d0c390dab544be29c30e3e3594ce2ee42ba0013e9c7c6b914f29ae2",
-                    "mixHash" : "0xafff005c85e67c74fda9249ef68fa37288da2bb4c96279ae0d2e98ffc9d8cd7e",
-                    "nonce" : "0x2fd9bead9c9a6cd4",
+                    "hash" : "0x1bf9f2b3bcaacbb5701ce75d80b211aa0385300d98ef8c9f99d02d929bcd2d73",
+                    "mixHash" : "0xcc07cf323ddaf92a8e4b5159ab2d95fc6d94630562cc7d756fb4a34fbc5b3746",
+                    "nonce" : "0xb709611c38ecefa7",
                     "number" : "0x01",
                     "parentHash" : "0x0382928f666a1600554ecfdcceb874c2952d4da8a2148280458ecb1219f0ba2f",
                     "receiptTrie" : "0x1b5a5bbda9d6f58790d69754d81917ad03b9c119c006f74dc9222650a83dabd3",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0xcd2741886d0977679e582e5ae72083dd189a0c938e6ea51ce44611db667adfcc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90343f901fea00382928f666a1600554ecfdcceb874c2952d4da8a2148280458ecb1219f0ba2fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01da644f211ae70a8f5d5495dc775028bf185cb4f640cf7e80c4451fee1df3d2ca0cd2741886d0977679e582e5ae72083dd189a0c938e6ea51ce44611db667adfcca01b5a5bbda9d6f58790d69754d81917ad03b9c119c006f74dc9222650a83dabd3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84041669568203e880a0afff005c85e67c74fda9249ef68fa37288da2bb4c96279ae0d2e98ffc9d8cd7e882fd9bead9c9a6cd4f9013ef9013b80018437f5aeb094095e7baea6a6c7c4c2dfeb977efac326af552d87844a9a17a5b8d5427f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000000000000000000000000000000000000000c3504535625b1a39921909f31117861ba00d4b741d75d1910a8135de233f04889e459ac002d1d8bb4e6a7f6046beb6cf9ea02196c3a70dd25eb690a162e037e6ffda6fc3c68330152bc14a785c78a37cb809c0",
+                "rlp" : "0xf90343f901fea00382928f666a1600554ecfdcceb874c2952d4da8a2148280458ecb1219f0ba2fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01da644f211ae70a8f5d5495dc775028bf185cb4f640cf7e80c4451fee1df3d2ca0cd2741886d0977679e582e5ae72083dd189a0c938e6ea51ce44611db667adfcca01b5a5bbda9d6f58790d69754d81917ad03b9c119c006f74dc9222650a83dabd3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84041669568203e880a0cc07cf323ddaf92a8e4b5159ab2d95fc6d94630562cc7d756fb4a34fbc5b374688b709611c38ecefa7f9013ef9013b80018437f5aeb094095e7baea6a6c7c4c2dfeb977efac326af552d87844a9a17a5b8d5427f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000000000000000000000000000000000000000c3504535625b1a39921909f31117861ba00d4b741d75d1910a8135de233f04889e459ac002d1d8bb4e6a7f6046beb6cf9ea02196c3a70dd25eb690a162e037e6ffda6fc3c68330152bc14a785c78a37cb809c0",
                 "transactions" : [
                     {
                         "data" : "0x427f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000000000000000000000000000000000000000c3504535625b1a39921909f3111786",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00293619ecd0a9c90fd82e2045b8f4ab224f8930b3a0abe297caef3b692e6b4b4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3fa277864d0c390dab544be29c30e3e3594ce2ee42ba0013e9c7c6b914f29ae2",
+        "lastblockhash" : "0x1bf9f2b3bcaacbb5701ce75d80b211aa0385300d98ef8c9f99d02d929bcd2d73",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest240BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest240BC.json
index 0bb7a4c6c..be19da07c 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest240BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest240BC.json
@@ -2,8 +2,8 @@
     "randomStatetest240BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest240BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest240BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050af7",
-                    "hash" : "0x9dc6d09522bc9fffd0e85b2def2121ca3bbad0fcdb33e655fb85556727951396",
-                    "mixHash" : "0x94236fa43d989427fee3ca83ce9b602440e094ff3728336235342973fd923fa2",
-                    "nonce" : "0x6ef58d75055d3ac2",
+                    "hash" : "0xe5f50198872382b00b413a1c812ab106172b99f41e057b6e566f0390915f61d2",
+                    "mixHash" : "0x19fe46c2cd953717148c0d9064a789d096bfa455753971198b03d5395ce1e176",
+                    "nonce" : "0xb134af518eac1c53",
                     "number" : "0x01",
                     "parentHash" : "0x0db89cdbba43da81f8f97785109eee92a4c8b93722a7bdef19dd0e68af8c4add",
                     "receiptTrie" : "0x9f072b5efb0c20f02f9fc2a7101a0c52468c44541f88e0373fe8a8b2b8af6fca",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda00db89cdbba43da81f8f97785109eee92a4c8b93722a7bdef19dd0e68af8c4adda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cf74f500322e342b175422ca3c24022df39e23352bf1df51f552d2191f22ef0ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa09f072b5efb0c20f02f9fc2a7101a0c52468c44541f88e0373fe8a8b2b8af6fcab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050af78203e880a094236fa43d989427fee3ca83ce9b602440e094ff3728336235342973fd923fa2886ef58d75055d3ac2f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda00db89cdbba43da81f8f97785109eee92a4c8b93722a7bdef19dd0e68af8c4adda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cf74f500322e342b175422ca3c24022df39e23352bf1df51f552d2191f22ef0ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa09f072b5efb0c20f02f9fc2a7101a0c52468c44541f88e0373fe8a8b2b8af6fcab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050af78203e880a019fe46c2cd953717148c0d9064a789d096bfa455753971198b03d5395ce1e17688b134af518eac1c53f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b57077f8488513aee18c332dbfffdcc3c3c74cc40c53efe7d856e29270a0dc2fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9dc6d09522bc9fffd0e85b2def2121ca3bbad0fcdb33e655fb85556727951396",
+        "lastblockhash" : "0xe5f50198872382b00b413a1c812ab106172b99f41e057b6e566f0390915f61d2",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest240BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest240BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest240BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x0507a6",
-                    "hash" : "0x55f560ec526853306a8b0a39eadbc60243761301f57f45c79a1ecec43284a828",
-                    "mixHash" : "0xcc92fd9030044035ed0f37148451566a54c6e9c2f6ab9da006cee9ad8cd57e38",
-                    "nonce" : "0x73a98b18a0f9dfe7",
+                    "hash" : "0x60240a0524f9e9a65f99268853961394b33761c045951f93083fc0a73740c72b",
+                    "mixHash" : "0x9c1872631add128a22a742d4b12146db0d059e6c9939e2007961235754c8be7f",
+                    "nonce" : "0xf67d81801a164887",
                     "number" : "0x01",
                     "parentHash" : "0x0db89cdbba43da81f8f97785109eee92a4c8b93722a7bdef19dd0e68af8c4add",
                     "receiptTrie" : "0x94c5b51744211df9a857115dbdc9c92cc7de910364183e54ccb75f953f097e7d",
-                    "stateRoot" : "0xe7e695a1dee9e31435e837547269fcb20d83e26f712e2189914027c188f1fc55",
+                    "stateRoot" : "0xdd938448f231f66a4261c0491203664dbda2b4a4ced0b68c5e78c582bf205008",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda00db89cdbba43da81f8f97785109eee92a4c8b93722a7bdef19dd0e68af8c4adda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e7e695a1dee9e31435e837547269fcb20d83e26f712e2189914027c188f1fc55a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa094c5b51744211df9a857115dbdc9c92cc7de910364183e54ccb75f953f097e7db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830507a68203e880a0cc92fd9030044035ed0f37148451566a54c6e9c2f6ab9da006cee9ad8cd57e388873a98b18a0f9dfe7f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda00db89cdbba43da81f8f97785109eee92a4c8b93722a7bdef19dd0e68af8c4adda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dd938448f231f66a4261c0491203664dbda2b4a4ced0b68c5e78c582bf205008a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa094c5b51744211df9a857115dbdc9c92cc7de910364183e54ccb75f953f097e7db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830507a68203e880a09c1872631add128a22a742d4b12146db0d059e6c9939e2007961235754c8be7f88f67d81801a164887f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b57077f8488513aee18c332dbfffdcc3c3c74cc40c53efe7d856e29270a0dc2fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x55f560ec526853306a8b0a39eadbc60243761301f57f45c79a1ecec43284a828",
+        "lastblockhash" : "0x60240a0524f9e9a65f99268853961394b33761c045951f93083fc0a73740c72b",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x45404042455a43f36109",
@@ -233,8 +226,8 @@
     "randomStatetest240BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest240BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest240BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050af7",
-                    "hash" : "0xa6fc2a007526760aec7da707447012f67d25e779352e50dff40f11d1cf463b9d",
-                    "mixHash" : "0x95de8caeef475b615ef6b29a2104962b0bac54c5ea4c269d5ef036e3776ec35b",
-                    "nonce" : "0x85221dbc499a65aa",
+                    "hash" : "0x7121ded54d32c3146b04f0872c40b00e1cf87d35381a1e8c18d28a8cfe5ce33f",
+                    "mixHash" : "0xda034a2de799b8497996be3b79be3c6a3e2045211603972a1266623becb98c9a",
+                    "nonce" : "0xfd9372fa1189eef0",
                     "number" : "0x01",
                     "parentHash" : "0x0db89cdbba43da81f8f97785109eee92a4c8b93722a7bdef19dd0e68af8c4add",
                     "receiptTrie" : "0x1b131c2a7667cdce3157dac9afb96dace249be8f0a7899907b9ed7d0cbab39a4",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda00db89cdbba43da81f8f97785109eee92a4c8b93722a7bdef19dd0e68af8c4adda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0830292a8bfabfa66ff26b6d646ba4d3413c5461440210a4fa8dde3be9a53d8c7a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa01b131c2a7667cdce3157dac9afb96dace249be8f0a7899907b9ed7d0cbab39a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050af78203e880a095de8caeef475b615ef6b29a2104962b0bac54c5ea4c269d5ef036e3776ec35b8885221dbc499a65aaf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda00db89cdbba43da81f8f97785109eee92a4c8b93722a7bdef19dd0e68af8c4adda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0830292a8bfabfa66ff26b6d646ba4d3413c5461440210a4fa8dde3be9a53d8c7a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa01b131c2a7667cdce3157dac9afb96dace249be8f0a7899907b9ed7d0cbab39a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050af78203e880a0da034a2de799b8497996be3b79be3c6a3e2045211603972a1266623becb98c9a88fd9372fa1189eef0f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b57077f8488513aee18c332dbfffdcc3c3c74cc40c53efe7d856e29270a0dc2fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa6fc2a007526760aec7da707447012f67d25e779352e50dff40f11d1cf463b9d",
+        "lastblockhash" : "0x7121ded54d32c3146b04f0872c40b00e1cf87d35381a1e8c18d28a8cfe5ce33f",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest240BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest240BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest240BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050af7",
-                    "hash" : "0x519cb3fe0b1d490c33e392ca6dff9254d97d9c1804dcfd499d8c721b0f24efd7",
-                    "mixHash" : "0x992739919553bffd8550baed32e1e9a8cc6a86ce9baf1bdfdc8d8a359c535645",
-                    "nonce" : "0x7d315143d1c20cbb",
+                    "hash" : "0x7a277ad56ccb73852fa4909ecc00d9a94c8073220038b0efbf220c8561c35fe1",
+                    "mixHash" : "0x2879042ad49a585b120b5413390ab5bcfd59c993737c99bcc608eeeb97074380",
+                    "nonce" : "0x4897ce05742fdbbd",
                     "number" : "0x01",
                     "parentHash" : "0x0db89cdbba43da81f8f97785109eee92a4c8b93722a7bdef19dd0e68af8c4add",
                     "receiptTrie" : "0x1b131c2a7667cdce3157dac9afb96dace249be8f0a7899907b9ed7d0cbab39a4",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda00db89cdbba43da81f8f97785109eee92a4c8b93722a7bdef19dd0e68af8c4adda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0830292a8bfabfa66ff26b6d646ba4d3413c5461440210a4fa8dde3be9a53d8c7a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa01b131c2a7667cdce3157dac9afb96dace249be8f0a7899907b9ed7d0cbab39a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050af78203e880a0992739919553bffd8550baed32e1e9a8cc6a86ce9baf1bdfdc8d8a359c535645887d315143d1c20cbbf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda00db89cdbba43da81f8f97785109eee92a4c8b93722a7bdef19dd0e68af8c4adda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0830292a8bfabfa66ff26b6d646ba4d3413c5461440210a4fa8dde3be9a53d8c7a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa01b131c2a7667cdce3157dac9afb96dace249be8f0a7899907b9ed7d0cbab39a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050af78203e880a02879042ad49a585b120b5413390ab5bcfd59c993737c99bcc608eeeb97074380884897ce05742fdbbdf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b57077f8488513aee18c332dbfffdcc3c3c74cc40c53efe7d856e29270a0dc2fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x519cb3fe0b1d490c33e392ca6dff9254d97d9c1804dcfd499d8c721b0f24efd7",
+        "lastblockhash" : "0x7a277ad56ccb73852fa4909ecc00d9a94c8073220038b0efbf220c8561c35fe1",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest240BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest240BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest240BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050af7",
-                    "hash" : "0xb7215d0d04332b8d925b44b6298d124c6e1df627066646b12b58151517a56bc6",
-                    "mixHash" : "0x2daa700f3fcf8ca9327cde5407309f9ddf087549a0dd9fa78e12e7c5e39fa046",
-                    "nonce" : "0xb820a9fc167436db",
+                    "hash" : "0x2f698cd2501d10511297a41ca6e7468d8634e2738ecd8764afe701719f094a46",
+                    "mixHash" : "0x1cb127eb0f8e703cd482844d28d933ee958d6d062a00574586ba98f2eac642aa",
+                    "nonce" : "0xb840002b3676eb9f",
                     "number" : "0x01",
                     "parentHash" : "0x0db89cdbba43da81f8f97785109eee92a4c8b93722a7bdef19dd0e68af8c4add",
                     "receiptTrie" : "0x1b131c2a7667cdce3157dac9afb96dace249be8f0a7899907b9ed7d0cbab39a4",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda00db89cdbba43da81f8f97785109eee92a4c8b93722a7bdef19dd0e68af8c4adda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0830292a8bfabfa66ff26b6d646ba4d3413c5461440210a4fa8dde3be9a53d8c7a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa01b131c2a7667cdce3157dac9afb96dace249be8f0a7899907b9ed7d0cbab39a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050af78203e880a02daa700f3fcf8ca9327cde5407309f9ddf087549a0dd9fa78e12e7c5e39fa04688b820a9fc167436dbf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda00db89cdbba43da81f8f97785109eee92a4c8b93722a7bdef19dd0e68af8c4adda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0830292a8bfabfa66ff26b6d646ba4d3413c5461440210a4fa8dde3be9a53d8c7a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa01b131c2a7667cdce3157dac9afb96dace249be8f0a7899907b9ed7d0cbab39a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050af78203e880a01cb127eb0f8e703cd482844d28d933ee958d6d062a00574586ba98f2eac642aa88b840002b3676eb9ff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b57077f8488513aee18c332dbfffdcc3c3c74cc40c53efe7d856e29270a0dc2fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb7215d0d04332b8d925b44b6298d124c6e1df627066646b12b58151517a56bc6",
+        "lastblockhash" : "0x2f698cd2501d10511297a41ca6e7468d8634e2738ecd8764afe701719f094a46",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest240BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest240BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest240BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050af7",
-                    "hash" : "0x2646fffad2bdd43760230fe8d7a103139468c6c3aaa486cb52e67145272b5365",
-                    "mixHash" : "0x7d69a0e35b042799386f3c3291e98ba8a671b9ee2ebf145dee95e3cd62c306ca",
-                    "nonce" : "0x948e7fa77fb5ef7d",
+                    "hash" : "0x41f16c3238a78394c0cb27992f80e0ad2e6c5661189f9489867842101c2c8222",
+                    "mixHash" : "0xd432c1d9df385312e96a6d56c8baa7a68cbadb2d594b6c600d5a1d6642a6ec77",
+                    "nonce" : "0xff4e87f395bff8ec",
                     "number" : "0x01",
                     "parentHash" : "0x0db89cdbba43da81f8f97785109eee92a4c8b93722a7bdef19dd0e68af8c4add",
                     "receiptTrie" : "0x1b131c2a7667cdce3157dac9afb96dace249be8f0a7899907b9ed7d0cbab39a4",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda00db89cdbba43da81f8f97785109eee92a4c8b93722a7bdef19dd0e68af8c4adda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0830292a8bfabfa66ff26b6d646ba4d3413c5461440210a4fa8dde3be9a53d8c7a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa01b131c2a7667cdce3157dac9afb96dace249be8f0a7899907b9ed7d0cbab39a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050af78203e880a07d69a0e35b042799386f3c3291e98ba8a671b9ee2ebf145dee95e3cd62c306ca88948e7fa77fb5ef7df865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda00db89cdbba43da81f8f97785109eee92a4c8b93722a7bdef19dd0e68af8c4adda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0830292a8bfabfa66ff26b6d646ba4d3413c5461440210a4fa8dde3be9a53d8c7a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa01b131c2a7667cdce3157dac9afb96dace249be8f0a7899907b9ed7d0cbab39a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050af78203e880a0d432c1d9df385312e96a6d56c8baa7a68cbadb2d594b6c600d5a1d6642a6ec7788ff4e87f395bff8ecf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b57077f8488513aee18c332dbfffdcc3c3c74cc40c53efe7d856e29270a0dc2fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2646fffad2bdd43760230fe8d7a103139468c6c3aaa486cb52e67145272b5365",
+        "lastblockhash" : "0x41f16c3238a78394c0cb27992f80e0ad2e6c5661189f9489867842101c2c8222",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest253BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest253BC.json
index 2bc27bd5c..003e80749 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest253BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest253BC.json
@@ -2,8 +2,8 @@
     "randomStatetest253BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest253BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest253BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6fbc",
-                    "hash" : "0x398c7aa078fb2845993cac7512c6166e1f02d243d8910315d54cd04c6952b0cd",
-                    "mixHash" : "0xdba012db35323d8e5552209bed87a16762b6e236709764767d619762c321839a",
-                    "nonce" : "0xf1bd2e52c91c80d1",
+                    "hash" : "0x063a256fbdd72f6d36a8424951b0140c5c381db3d82f345dafbfb7c35cd9e4ef",
+                    "mixHash" : "0x2241eda3c23958a091523fbb731486990d075fb62a14bdea0b10a44421f7ddc3",
+                    "nonce" : "0xddca085d96239bc6",
                     "number" : "0x01",
                     "parentHash" : "0x357ecdcc5b70a99a5c4809d548966d8c0331d387fdcdf9c99bd0154d59cad0a8",
                     "receiptTrie" : "0x0bdbd2c27986a97e7e11158e619aaf2a1b65e03082c82539cd0ac01e6cb1f958",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0357ecdcc5b70a99a5c4809d548966d8c0331d387fdcdf9c99bd0154d59cad0a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a000033e4ac9dc5a3d5cd456e8c9c4ab33d7544c47ad8dc684bb14010c14a13118a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa00bdbd2c27986a97e7e11158e619aaf2a1b65e03082c82539cd0ac01e6cb1f958b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826fbc8203e880a0dba012db35323d8e5552209bed87a16762b6e236709764767d619762c321839a88f1bd2e52c91c80d1f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0357ecdcc5b70a99a5c4809d548966d8c0331d387fdcdf9c99bd0154d59cad0a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a000033e4ac9dc5a3d5cd456e8c9c4ab33d7544c47ad8dc684bb14010c14a13118a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa00bdbd2c27986a97e7e11158e619aaf2a1b65e03082c82539cd0ac01e6cb1f958b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826fbc8203e880a02241eda3c23958a091523fbb731486990d075fb62a14bdea0b10a44421f7ddc388ddca085d96239bc6f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b96069dbc6e117e6afb31a65ca3ad162a5845f9755fc944f9ba92cd5b23ba7d2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x398c7aa078fb2845993cac7512c6166e1f02d243d8910315d54cd04c6952b0cd",
+        "lastblockhash" : "0x063a256fbdd72f6d36a8424951b0140c5c381db3d82f345dafbfb7c35cd9e4ef",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest253BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest253BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest253BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x72c8",
-                    "hash" : "0xbe082eb00803fb462ddc7e64249baad935de5d0fd8fc06fa1b9c9250aa783e9d",
-                    "mixHash" : "0xf897cca094017587aa805995c1fe8183499522477ea9e1f89930be15875b15ff",
-                    "nonce" : "0x597c237737175239",
+                    "hash" : "0x7fb0496737cfbf45943da921188208d0d07624ed28a0d720a4e78a2618819638",
+                    "mixHash" : "0xfb6f8ea665cb856198a2ff9a58ab0139ad852384b5d1768722baef9d17bb605e",
+                    "nonce" : "0x8146eb1b1675adf8",
                     "number" : "0x01",
                     "parentHash" : "0x357ecdcc5b70a99a5c4809d548966d8c0331d387fdcdf9c99bd0154d59cad0a8",
                     "receiptTrie" : "0x335b3c749ff2c7b1e5021d7134b9765478794a5a687d58d88a4de384f78f943d",
-                    "stateRoot" : "0x69a8f9c3487a86467ce8ef7296aee2f2a067f17a7958a04dd597cf5139f7d886",
+                    "stateRoot" : "0x62d733cdacda193a34f5c84a3945a65ea170dd7c42e727bd05e17e8c3cb5a889",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0357ecdcc5b70a99a5c4809d548966d8c0331d387fdcdf9c99bd0154d59cad0a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a069a8f9c3487a86467ce8ef7296aee2f2a067f17a7958a04dd597cf5139f7d886a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0335b3c749ff2c7b1e5021d7134b9765478794a5a687d58d88a4de384f78f943db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8272c88203e880a0f897cca094017587aa805995c1fe8183499522477ea9e1f89930be15875b15ff88597c237737175239f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0357ecdcc5b70a99a5c4809d548966d8c0331d387fdcdf9c99bd0154d59cad0a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a062d733cdacda193a34f5c84a3945a65ea170dd7c42e727bd05e17e8c3cb5a889a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0335b3c749ff2c7b1e5021d7134b9765478794a5a687d58d88a4de384f78f943db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8272c88203e880a0fb6f8ea665cb856198a2ff9a58ab0139ad852384b5d1768722baef9d17bb605e888146eb1b1675adf8f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b96069dbc6e117e6afb31a65ca3ad162a5845f9755fc944f9ba92cd5b23ba7d2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbe082eb00803fb462ddc7e64249baad935de5d0fd8fc06fa1b9c9250aa783e9d",
+        "lastblockhash" : "0x7fb0496737cfbf45943da921188208d0d07624ed28a0d720a4e78a2618819638",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x4243428144424140f271f155",
@@ -233,8 +226,8 @@
     "randomStatetest253BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest253BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest253BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6fbc",
-                    "hash" : "0xe039a042764e2c805479e9356be82bd6e72698dbd685c27746dea161746851b5",
-                    "mixHash" : "0x113e275aa796ab88c4cfe7ffedaff63f6f84de73982f5178654199e13a859b7f",
-                    "nonce" : "0xba4a3fce3549a4c5",
+                    "hash" : "0x6df4e81146a69a9972c5796b6a7b63aad8d56ae30d0aa0e0b30c17d07ced24e0",
+                    "mixHash" : "0x095a0dae709f91a1fd2c83468dd26a81107b7331d7e40d14f9feb6b306aee10b",
+                    "nonce" : "0x66a471b9a068bad1",
                     "number" : "0x01",
                     "parentHash" : "0x357ecdcc5b70a99a5c4809d548966d8c0331d387fdcdf9c99bd0154d59cad0a8",
                     "receiptTrie" : "0xb3a5b163a01770fa1f3be4c03ff114a32171904ef7a646cfdfb912e89d23bebb",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0357ecdcc5b70a99a5c4809d548966d8c0331d387fdcdf9c99bd0154d59cad0a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09ca09b826e486d729f7b779c4824941555768a924d51d94db14dc9491b373cf0a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0b3a5b163a01770fa1f3be4c03ff114a32171904ef7a646cfdfb912e89d23bebbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826fbc8203e880a0113e275aa796ab88c4cfe7ffedaff63f6f84de73982f5178654199e13a859b7f88ba4a3fce3549a4c5f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0357ecdcc5b70a99a5c4809d548966d8c0331d387fdcdf9c99bd0154d59cad0a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09ca09b826e486d729f7b779c4824941555768a924d51d94db14dc9491b373cf0a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0b3a5b163a01770fa1f3be4c03ff114a32171904ef7a646cfdfb912e89d23bebbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826fbc8203e880a0095a0dae709f91a1fd2c83468dd26a81107b7331d7e40d14f9feb6b306aee10b8866a471b9a068bad1f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b96069dbc6e117e6afb31a65ca3ad162a5845f9755fc944f9ba92cd5b23ba7d2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe039a042764e2c805479e9356be82bd6e72698dbd685c27746dea161746851b5",
+        "lastblockhash" : "0x6df4e81146a69a9972c5796b6a7b63aad8d56ae30d0aa0e0b30c17d07ced24e0",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest253BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest253BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest253BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6fbc",
-                    "hash" : "0xfe2514b84a793af81ea2e474ed7cad9aba6a34fda4fc528b0b77cebfcae34702",
-                    "mixHash" : "0x60c496fff3e8f168ea0e977546add4c8df4b22d4fe47fd7a3d93630b5ab56eb6",
-                    "nonce" : "0xd0458c326c198411",
+                    "hash" : "0x6c734e4f8a1242d0bca8e17c99153d0a7c77d28d0775acc65dd81b2fd7a85ab1",
+                    "mixHash" : "0x433b189830fdf2522b1693681ea3292e3171d62cddee91e53ac65162d14f1ba5",
+                    "nonce" : "0x5a39a77e10f63067",
                     "number" : "0x01",
                     "parentHash" : "0x357ecdcc5b70a99a5c4809d548966d8c0331d387fdcdf9c99bd0154d59cad0a8",
                     "receiptTrie" : "0xb3a5b163a01770fa1f3be4c03ff114a32171904ef7a646cfdfb912e89d23bebb",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0357ecdcc5b70a99a5c4809d548966d8c0331d387fdcdf9c99bd0154d59cad0a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09ca09b826e486d729f7b779c4824941555768a924d51d94db14dc9491b373cf0a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0b3a5b163a01770fa1f3be4c03ff114a32171904ef7a646cfdfb912e89d23bebbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826fbc8203e880a060c496fff3e8f168ea0e977546add4c8df4b22d4fe47fd7a3d93630b5ab56eb688d0458c326c198411f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0357ecdcc5b70a99a5c4809d548966d8c0331d387fdcdf9c99bd0154d59cad0a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09ca09b826e486d729f7b779c4824941555768a924d51d94db14dc9491b373cf0a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0b3a5b163a01770fa1f3be4c03ff114a32171904ef7a646cfdfb912e89d23bebbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826fbc8203e880a0433b189830fdf2522b1693681ea3292e3171d62cddee91e53ac65162d14f1ba5885a39a77e10f63067f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b96069dbc6e117e6afb31a65ca3ad162a5845f9755fc944f9ba92cd5b23ba7d2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfe2514b84a793af81ea2e474ed7cad9aba6a34fda4fc528b0b77cebfcae34702",
+        "lastblockhash" : "0x6c734e4f8a1242d0bca8e17c99153d0a7c77d28d0775acc65dd81b2fd7a85ab1",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest253BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest253BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest253BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6d28",
-                    "hash" : "0x5670098ef202b5a0c72bb64d6ea6ebba3dac66c0251024f1f0eb6dec9531fdfe",
-                    "mixHash" : "0xa151c3d303bd90aca28ac6b5daf56b3b8cbce13a6fc0b5729b65c401cc06bd58",
-                    "nonce" : "0x4d0e2f2661722916",
+                    "hash" : "0x7d7f31720b5aa63dc92b410565293a4feccad35a6f10164559f1301ec5d814d2",
+                    "mixHash" : "0x1a6e2c37aacb1a2cdd21e7748039f910c58372b24303b2368fd5e0f142dc948f",
+                    "nonce" : "0xbc83a89b1e8e84e0",
                     "number" : "0x01",
                     "parentHash" : "0x357ecdcc5b70a99a5c4809d548966d8c0331d387fdcdf9c99bd0154d59cad0a8",
                     "receiptTrie" : "0x8bcd96ef7752810f4684a95ec8f994df24ce5a0a48e21662ec91c3593a2ce811",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0357ecdcc5b70a99a5c4809d548966d8c0331d387fdcdf9c99bd0154d59cad0a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08f5bef3a8a373d2290debd43926254d2cf87f2ce8b60a1e70597fba21966264ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa08bcd96ef7752810f4684a95ec8f994df24ce5a0a48e21662ec91c3593a2ce811b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826d288203e880a0a151c3d303bd90aca28ac6b5daf56b3b8cbce13a6fc0b5729b65c401cc06bd58884d0e2f2661722916f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0357ecdcc5b70a99a5c4809d548966d8c0331d387fdcdf9c99bd0154d59cad0a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08f5bef3a8a373d2290debd43926254d2cf87f2ce8b60a1e70597fba21966264ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa08bcd96ef7752810f4684a95ec8f994df24ce5a0a48e21662ec91c3593a2ce811b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826d288203e880a01a6e2c37aacb1a2cdd21e7748039f910c58372b24303b2368fd5e0f142dc948f88bc83a89b1e8e84e0f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b96069dbc6e117e6afb31a65ca3ad162a5845f9755fc944f9ba92cd5b23ba7d2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5670098ef202b5a0c72bb64d6ea6ebba3dac66c0251024f1f0eb6dec9531fdfe",
+        "lastblockhash" : "0x7d7f31720b5aa63dc92b410565293a4feccad35a6f10164559f1301ec5d814d2",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest253BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest253BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest253BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6d28",
-                    "hash" : "0x24fe44610549bb0fc0230e91936116f20b4633184c9514c08f9787d7956f4662",
-                    "mixHash" : "0x4ff911d14d352b6e4a74bec2017d604ba5255c90f26cfe6599f1a1b30f183f33",
-                    "nonce" : "0xe92afdfa721e8b37",
+                    "hash" : "0x3de9c78f6a58d925fde8697dc0da294d05061d8e4d0c810b62d1db02a97d082b",
+                    "mixHash" : "0xa0a729e40ed7b63083f2021978d948229d2d553d2046bd4bb67c523f98bf1f18",
+                    "nonce" : "0x5a4ee88dd403537e",
                     "number" : "0x01",
                     "parentHash" : "0x357ecdcc5b70a99a5c4809d548966d8c0331d387fdcdf9c99bd0154d59cad0a8",
                     "receiptTrie" : "0x8bcd96ef7752810f4684a95ec8f994df24ce5a0a48e21662ec91c3593a2ce811",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0357ecdcc5b70a99a5c4809d548966d8c0331d387fdcdf9c99bd0154d59cad0a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08f5bef3a8a373d2290debd43926254d2cf87f2ce8b60a1e70597fba21966264ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa08bcd96ef7752810f4684a95ec8f994df24ce5a0a48e21662ec91c3593a2ce811b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826d288203e880a04ff911d14d352b6e4a74bec2017d604ba5255c90f26cfe6599f1a1b30f183f3388e92afdfa721e8b37f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0357ecdcc5b70a99a5c4809d548966d8c0331d387fdcdf9c99bd0154d59cad0a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08f5bef3a8a373d2290debd43926254d2cf87f2ce8b60a1e70597fba21966264ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa08bcd96ef7752810f4684a95ec8f994df24ce5a0a48e21662ec91c3593a2ce811b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826d288203e880a0a0a729e40ed7b63083f2021978d948229d2d553d2046bd4bb67c523f98bf1f18885a4ee88dd403537ef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b96069dbc6e117e6afb31a65ca3ad162a5845f9755fc944f9ba92cd5b23ba7d2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x24fe44610549bb0fc0230e91936116f20b4633184c9514c08f9787d7956f4662",
+        "lastblockhash" : "0x3de9c78f6a58d925fde8697dc0da294d05061d8e4d0c810b62d1db02a97d082b",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest255BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest255BC.json
index 231a1c617..0fd843409 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest255BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest255BC.json
@@ -2,8 +2,8 @@
     "randomStatetest255BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest255BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest255BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb88d",
-                    "hash" : "0x26943994daf2522c645a61a59cd08419146dd7d1f136c2d39a76dab0ed71e26f",
-                    "mixHash" : "0x49adea27bf79621e98e793564f8a7b7c0fee4fccffa388a2881045a704b32461",
-                    "nonce" : "0xca970629eccc9a38",
+                    "hash" : "0x136f5d386f0a709961cb46cfbb15f3974f810926a36670082358c063fd52be41",
+                    "mixHash" : "0x70da0c49876ac4168ae4166d78d19f6f10533c29653f329d9c87361bacc4c9d1",
+                    "nonce" : "0xc7a06d94a59293b1",
                     "number" : "0x01",
                     "parentHash" : "0xf3e671d0c334ee3f58d1a86371b226f1e17fe9ac7a4cef4278b26bbf32fd0474",
                     "receiptTrie" : "0xb97afd6c425d5cbcc3585a1864300c310bfc3830c15ccee2dd5e0fe2b995b733",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xd6b6371a6092246414f926d7612b7b98d0263c7f2b1817b5d4a4017aba8f3959",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca0f3e671d0c334ee3f58d1a86371b226f1e17fe9ac7a4cef4278b26bbf32fd0474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0936696cbd52f7c8c6aad520fdbee2bab3b14334f8c0ca30a18eaea48ac59ca62a0d6b6371a6092246414f926d7612b7b98d0263c7f2b1817b5d4a4017aba8f3959a0b97afd6c425d5cbcc3585a1864300c310bfc3830c15ccee2dd5e0fe2b995b733b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b88d8203e880a049adea27bf79621e98e793564f8a7b7c0fee4fccffa388a2881045a704b3246188ca970629eccc9a38f90121f9011e800184268e649194095e7baea6a6c7c4c2dfeb977efac326af552d87843471a7b7b8b87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000000040407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000001456f92663a70a367083877458c56936f831ba0bb99b99b3c24743b2c2a28c5c9fa3fe20a903c327f6de3a917c21fd5ceab6775a02d4fbbc316c587ccb7d437a3ba014bbf5184a62c54ec06b38736921aa774537fc0",
+                "rlp" : "0xf90324f901fca0f3e671d0c334ee3f58d1a86371b226f1e17fe9ac7a4cef4278b26bbf32fd0474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0936696cbd52f7c8c6aad520fdbee2bab3b14334f8c0ca30a18eaea48ac59ca62a0d6b6371a6092246414f926d7612b7b98d0263c7f2b1817b5d4a4017aba8f3959a0b97afd6c425d5cbcc3585a1864300c310bfc3830c15ccee2dd5e0fe2b995b733b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b88d8203e880a070da0c49876ac4168ae4166d78d19f6f10533c29653f329d9c87361bacc4c9d188c7a06d94a59293b1f90121f9011e800184268e649194095e7baea6a6c7c4c2dfeb977efac326af552d87843471a7b7b8b87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000000040407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000001456f92663a70a367083877458c56936f831ba0bb99b99b3c24743b2c2a28c5c9fa3fe20a903c327f6de3a917c21fd5ceab6775a02d4fbbc316c587ccb7d437a3ba014bbf5184a62c54ec06b38736921aa774537fc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000000040407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000001456f92663a70a367083877458c56936f83",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a033db5ed469bbcd370bf33bbbae0d9c31b28685b5a5c89a7f18246c574f68ab8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x26943994daf2522c645a61a59cd08419146dd7d1f136c2d39a76dab0ed71e26f",
+        "lastblockhash" : "0x136f5d386f0a709961cb46cfbb15f3974f810926a36670082358c063fd52be41",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest255BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest255BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest255BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xbea5",
-                    "hash" : "0x6076c808da140bec9a780cff9e0498d7002b78399a57dc9884b928765434c090",
-                    "mixHash" : "0x3817ff0d516109709f1e6ecb25d5367b7eb32e20681b6abbddcc96f1663213bc",
-                    "nonce" : "0xff443e8a61df1682",
+                    "hash" : "0x0a8f423913a1e2d12c27c051485fac025df2dd95b13986e83a6aeb37ffc5bfe9",
+                    "mixHash" : "0xe78e762202afb43e8c7bd125bce7621d61c7e5c560cff5fff895b056b2a46eb6",
+                    "nonce" : "0x004a7ef1fbd3eb09",
                     "number" : "0x01",
                     "parentHash" : "0xf3e671d0c334ee3f58d1a86371b226f1e17fe9ac7a4cef4278b26bbf32fd0474",
                     "receiptTrie" : "0x87d7ac294760f1128079f9e603b17e57ea8a949fb4f35c9f78d1564c09e63a3b",
-                    "stateRoot" : "0xe6e585c12c3026320f0f49e0b5fd00feab60760226de6e4c3dcb1762b792c9de",
+                    "stateRoot" : "0x599d5dcfb627563d905051968e7ec2ff502c1fe3344d9608d7085025fdb2bff2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd6b6371a6092246414f926d7612b7b98d0263c7f2b1817b5d4a4017aba8f3959",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca0f3e671d0c334ee3f58d1a86371b226f1e17fe9ac7a4cef4278b26bbf32fd0474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e6e585c12c3026320f0f49e0b5fd00feab60760226de6e4c3dcb1762b792c9dea0d6b6371a6092246414f926d7612b7b98d0263c7f2b1817b5d4a4017aba8f3959a087d7ac294760f1128079f9e603b17e57ea8a949fb4f35c9f78d1564c09e63a3bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bea58203e880a03817ff0d516109709f1e6ecb25d5367b7eb32e20681b6abbddcc96f1663213bc88ff443e8a61df1682f90121f9011e800184268e649194095e7baea6a6c7c4c2dfeb977efac326af552d87843471a7b7b8b87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000000040407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000001456f92663a70a367083877458c56936f831ba0bb99b99b3c24743b2c2a28c5c9fa3fe20a903c327f6de3a917c21fd5ceab6775a02d4fbbc316c587ccb7d437a3ba014bbf5184a62c54ec06b38736921aa774537fc0",
+                "rlp" : "0xf90324f901fca0f3e671d0c334ee3f58d1a86371b226f1e17fe9ac7a4cef4278b26bbf32fd0474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0599d5dcfb627563d905051968e7ec2ff502c1fe3344d9608d7085025fdb2bff2a0d6b6371a6092246414f926d7612b7b98d0263c7f2b1817b5d4a4017aba8f3959a087d7ac294760f1128079f9e603b17e57ea8a949fb4f35c9f78d1564c09e63a3bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bea58203e880a0e78e762202afb43e8c7bd125bce7621d61c7e5c560cff5fff895b056b2a46eb688004a7ef1fbd3eb09f90121f9011e800184268e649194095e7baea6a6c7c4c2dfeb977efac326af552d87843471a7b7b8b87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000000040407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000001456f92663a70a367083877458c56936f831ba0bb99b99b3c24743b2c2a28c5c9fa3fe20a903c327f6de3a917c21fd5ceab6775a02d4fbbc316c587ccb7d437a3ba014bbf5184a62c54ec06b38736921aa774537fc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000000040407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000001456f92663a70a367083877458c56936f83",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a033db5ed469bbcd370bf33bbbae0d9c31b28685b5a5c89a7f18246c574f68ab8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6076c808da140bec9a780cff9e0498d7002b78399a57dc9884b928765434c090",
+        "lastblockhash" : "0x0a8f423913a1e2d12c27c051485fac025df2dd95b13986e83a6aeb37ffc5bfe9",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x3471a7b7",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000000040407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000001456f92663a70a367083877458c56936f835560005155",
@@ -235,8 +228,8 @@
     "randomStatetest255BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest255BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest255BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb88d",
-                    "hash" : "0x1ee6902ab378b46aefb4df27f9bdcad958b8bd773183bc9b4ed6805eddc805ae",
-                    "mixHash" : "0x341025816e3400e0ee25ef7a96f63bd39929875b1baa90d65ce3720c9fcc206f",
-                    "nonce" : "0xd4abb04df814df4c",
+                    "hash" : "0x413b92986fa9110c7f6a374d500c997b6881ea3e1048d7c351ba1bb567f38579",
+                    "mixHash" : "0xdd512421637b44491148767c6cbe1da677580451b8d46c4dd651cee97f663514",
+                    "nonce" : "0xf73bb69fcf4b4397",
                     "number" : "0x01",
                     "parentHash" : "0xf3e671d0c334ee3f58d1a86371b226f1e17fe9ac7a4cef4278b26bbf32fd0474",
                     "receiptTrie" : "0x07e37a0d7cd26edc3aca495314658c10554ae02b36d14404750ab7f6ae7e834e",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xd6b6371a6092246414f926d7612b7b98d0263c7f2b1817b5d4a4017aba8f3959",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca0f3e671d0c334ee3f58d1a86371b226f1e17fe9ac7a4cef4278b26bbf32fd0474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07977db546492eb71a6f9d2360bcf39d8f1b209f8e869e144c891e281b0e4b18fa0d6b6371a6092246414f926d7612b7b98d0263c7f2b1817b5d4a4017aba8f3959a007e37a0d7cd26edc3aca495314658c10554ae02b36d14404750ab7f6ae7e834eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b88d8203e880a0341025816e3400e0ee25ef7a96f63bd39929875b1baa90d65ce3720c9fcc206f88d4abb04df814df4cf90121f9011e800184268e649194095e7baea6a6c7c4c2dfeb977efac326af552d87843471a7b7b8b87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000000040407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000001456f92663a70a367083877458c56936f831ba0bb99b99b3c24743b2c2a28c5c9fa3fe20a903c327f6de3a917c21fd5ceab6775a02d4fbbc316c587ccb7d437a3ba014bbf5184a62c54ec06b38736921aa774537fc0",
+                "rlp" : "0xf90324f901fca0f3e671d0c334ee3f58d1a86371b226f1e17fe9ac7a4cef4278b26bbf32fd0474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07977db546492eb71a6f9d2360bcf39d8f1b209f8e869e144c891e281b0e4b18fa0d6b6371a6092246414f926d7612b7b98d0263c7f2b1817b5d4a4017aba8f3959a007e37a0d7cd26edc3aca495314658c10554ae02b36d14404750ab7f6ae7e834eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b88d8203e880a0dd512421637b44491148767c6cbe1da677580451b8d46c4dd651cee97f66351488f73bb69fcf4b4397f90121f9011e800184268e649194095e7baea6a6c7c4c2dfeb977efac326af552d87843471a7b7b8b87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000000040407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000001456f92663a70a367083877458c56936f831ba0bb99b99b3c24743b2c2a28c5c9fa3fe20a903c327f6de3a917c21fd5ceab6775a02d4fbbc316c587ccb7d437a3ba014bbf5184a62c54ec06b38736921aa774537fc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000000040407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000001456f92663a70a367083877458c56936f83",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a033db5ed469bbcd370bf33bbbae0d9c31b28685b5a5c89a7f18246c574f68ab8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1ee6902ab378b46aefb4df27f9bdcad958b8bd773183bc9b4ed6805eddc805ae",
+        "lastblockhash" : "0x413b92986fa9110c7f6a374d500c997b6881ea3e1048d7c351ba1bb567f38579",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest255BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest255BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest255BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb88d",
-                    "hash" : "0x5b71dcd2619bf7dca60da673264794f44ba84a20f2fb09949feab54c6806be6e",
-                    "mixHash" : "0x3617d66a4c874f3e7e1ec65a6f6e9a48deee5c7037de8dcc7dc89bda4485cd60",
-                    "nonce" : "0x6a9ca4b50040ecb9",
+                    "hash" : "0x95c285278fd202e86d356be86de94ab2f7c9f1492791e0093a3bc8e7c7e64931",
+                    "mixHash" : "0x673dfcd691267b87448c6dc7d5bf693c192e90f94b756d0a73a5d0eb75d0a536",
+                    "nonce" : "0x84c2e69424a4588b",
                     "number" : "0x01",
                     "parentHash" : "0xf3e671d0c334ee3f58d1a86371b226f1e17fe9ac7a4cef4278b26bbf32fd0474",
                     "receiptTrie" : "0x07e37a0d7cd26edc3aca495314658c10554ae02b36d14404750ab7f6ae7e834e",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xd6b6371a6092246414f926d7612b7b98d0263c7f2b1817b5d4a4017aba8f3959",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca0f3e671d0c334ee3f58d1a86371b226f1e17fe9ac7a4cef4278b26bbf32fd0474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07977db546492eb71a6f9d2360bcf39d8f1b209f8e869e144c891e281b0e4b18fa0d6b6371a6092246414f926d7612b7b98d0263c7f2b1817b5d4a4017aba8f3959a007e37a0d7cd26edc3aca495314658c10554ae02b36d14404750ab7f6ae7e834eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b88d8203e880a03617d66a4c874f3e7e1ec65a6f6e9a48deee5c7037de8dcc7dc89bda4485cd60886a9ca4b50040ecb9f90121f9011e800184268e649194095e7baea6a6c7c4c2dfeb977efac326af552d87843471a7b7b8b87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000000040407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000001456f92663a70a367083877458c56936f831ba0bb99b99b3c24743b2c2a28c5c9fa3fe20a903c327f6de3a917c21fd5ceab6775a02d4fbbc316c587ccb7d437a3ba014bbf5184a62c54ec06b38736921aa774537fc0",
+                "rlp" : "0xf90324f901fca0f3e671d0c334ee3f58d1a86371b226f1e17fe9ac7a4cef4278b26bbf32fd0474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07977db546492eb71a6f9d2360bcf39d8f1b209f8e869e144c891e281b0e4b18fa0d6b6371a6092246414f926d7612b7b98d0263c7f2b1817b5d4a4017aba8f3959a007e37a0d7cd26edc3aca495314658c10554ae02b36d14404750ab7f6ae7e834eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b88d8203e880a0673dfcd691267b87448c6dc7d5bf693c192e90f94b756d0a73a5d0eb75d0a5368884c2e69424a4588bf90121f9011e800184268e649194095e7baea6a6c7c4c2dfeb977efac326af552d87843471a7b7b8b87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000000040407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000001456f92663a70a367083877458c56936f831ba0bb99b99b3c24743b2c2a28c5c9fa3fe20a903c327f6de3a917c21fd5ceab6775a02d4fbbc316c587ccb7d437a3ba014bbf5184a62c54ec06b38736921aa774537fc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000000040407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000001456f92663a70a367083877458c56936f83",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a033db5ed469bbcd370bf33bbbae0d9c31b28685b5a5c89a7f18246c574f68ab8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5b71dcd2619bf7dca60da673264794f44ba84a20f2fb09949feab54c6806be6e",
+        "lastblockhash" : "0x95c285278fd202e86d356be86de94ab2f7c9f1492791e0093a3bc8e7c7e64931",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest255BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest255BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest255BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb88d",
-                    "hash" : "0x1b67569f2c7d34f4d18669e36c0a0c5f56ebc9be329c0fb33a7034ad8388ab1f",
-                    "mixHash" : "0x9c8d23de839a4d43cbb7dd1901fed177d024d55f4487ff5f15eecedc26c4dfdb",
-                    "nonce" : "0x6e1fa79c077632da",
+                    "hash" : "0x5e7882795855d182927488f5db67627bf4d85a52148a84e62f01b0eb93b96cdf",
+                    "mixHash" : "0xaaf6e8198c1d764a524fcbcbd777b8bb823e287ac608adcf7945ff29a1a6f6a8",
+                    "nonce" : "0x3a56b57c15189a6d",
                     "number" : "0x01",
                     "parentHash" : "0xf3e671d0c334ee3f58d1a86371b226f1e17fe9ac7a4cef4278b26bbf32fd0474",
                     "receiptTrie" : "0x07e37a0d7cd26edc3aca495314658c10554ae02b36d14404750ab7f6ae7e834e",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xd6b6371a6092246414f926d7612b7b98d0263c7f2b1817b5d4a4017aba8f3959",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca0f3e671d0c334ee3f58d1a86371b226f1e17fe9ac7a4cef4278b26bbf32fd0474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07977db546492eb71a6f9d2360bcf39d8f1b209f8e869e144c891e281b0e4b18fa0d6b6371a6092246414f926d7612b7b98d0263c7f2b1817b5d4a4017aba8f3959a007e37a0d7cd26edc3aca495314658c10554ae02b36d14404750ab7f6ae7e834eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b88d8203e880a09c8d23de839a4d43cbb7dd1901fed177d024d55f4487ff5f15eecedc26c4dfdb886e1fa79c077632daf90121f9011e800184268e649194095e7baea6a6c7c4c2dfeb977efac326af552d87843471a7b7b8b87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000000040407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000001456f92663a70a367083877458c56936f831ba0bb99b99b3c24743b2c2a28c5c9fa3fe20a903c327f6de3a917c21fd5ceab6775a02d4fbbc316c587ccb7d437a3ba014bbf5184a62c54ec06b38736921aa774537fc0",
+                "rlp" : "0xf90324f901fca0f3e671d0c334ee3f58d1a86371b226f1e17fe9ac7a4cef4278b26bbf32fd0474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07977db546492eb71a6f9d2360bcf39d8f1b209f8e869e144c891e281b0e4b18fa0d6b6371a6092246414f926d7612b7b98d0263c7f2b1817b5d4a4017aba8f3959a007e37a0d7cd26edc3aca495314658c10554ae02b36d14404750ab7f6ae7e834eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b88d8203e880a0aaf6e8198c1d764a524fcbcbd777b8bb823e287ac608adcf7945ff29a1a6f6a8883a56b57c15189a6df90121f9011e800184268e649194095e7baea6a6c7c4c2dfeb977efac326af552d87843471a7b7b8b87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000000040407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000001456f92663a70a367083877458c56936f831ba0bb99b99b3c24743b2c2a28c5c9fa3fe20a903c327f6de3a917c21fd5ceab6775a02d4fbbc316c587ccb7d437a3ba014bbf5184a62c54ec06b38736921aa774537fc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000000040407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000001456f92663a70a367083877458c56936f83",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a033db5ed469bbcd370bf33bbbae0d9c31b28685b5a5c89a7f18246c574f68ab8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1b67569f2c7d34f4d18669e36c0a0c5f56ebc9be329c0fb33a7034ad8388ab1f",
+        "lastblockhash" : "0x5e7882795855d182927488f5db67627bf4d85a52148a84e62f01b0eb93b96cdf",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest255BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest255BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest255BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb88d",
-                    "hash" : "0xa9b0b3c387cbb7deeab0149a5565a3eb4f8fddfff88c40fa4284f2da7ecef5f8",
-                    "mixHash" : "0xe73e12deda82ae72eb492d71765cb44bc581985dd7667ea14cbacf810f9bf2f5",
-                    "nonce" : "0x42593cceecebb8e7",
+                    "hash" : "0x284583166308b94cccceb6841c1fc5e6babb0ea25feb5e5afa58f83c86773f79",
+                    "mixHash" : "0x71f8e31619515a0f5aa9a8ade40c2978a673f866801d4c21b6e1e20648517060",
+                    "nonce" : "0xa19318982c2cc4ee",
                     "number" : "0x01",
                     "parentHash" : "0xf3e671d0c334ee3f58d1a86371b226f1e17fe9ac7a4cef4278b26bbf32fd0474",
                     "receiptTrie" : "0x07e37a0d7cd26edc3aca495314658c10554ae02b36d14404750ab7f6ae7e834e",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xd6b6371a6092246414f926d7612b7b98d0263c7f2b1817b5d4a4017aba8f3959",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca0f3e671d0c334ee3f58d1a86371b226f1e17fe9ac7a4cef4278b26bbf32fd0474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07977db546492eb71a6f9d2360bcf39d8f1b209f8e869e144c891e281b0e4b18fa0d6b6371a6092246414f926d7612b7b98d0263c7f2b1817b5d4a4017aba8f3959a007e37a0d7cd26edc3aca495314658c10554ae02b36d14404750ab7f6ae7e834eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b88d8203e880a0e73e12deda82ae72eb492d71765cb44bc581985dd7667ea14cbacf810f9bf2f58842593cceecebb8e7f90121f9011e800184268e649194095e7baea6a6c7c4c2dfeb977efac326af552d87843471a7b7b8b87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000000040407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000001456f92663a70a367083877458c56936f831ba0bb99b99b3c24743b2c2a28c5c9fa3fe20a903c327f6de3a917c21fd5ceab6775a02d4fbbc316c587ccb7d437a3ba014bbf5184a62c54ec06b38736921aa774537fc0",
+                "rlp" : "0xf90324f901fca0f3e671d0c334ee3f58d1a86371b226f1e17fe9ac7a4cef4278b26bbf32fd0474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07977db546492eb71a6f9d2360bcf39d8f1b209f8e869e144c891e281b0e4b18fa0d6b6371a6092246414f926d7612b7b98d0263c7f2b1817b5d4a4017aba8f3959a007e37a0d7cd26edc3aca495314658c10554ae02b36d14404750ab7f6ae7e834eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b88d8203e880a071f8e31619515a0f5aa9a8ade40c2978a673f866801d4c21b6e1e2064851706088a19318982c2cc4eef90121f9011e800184268e649194095e7baea6a6c7c4c2dfeb977efac326af552d87843471a7b7b8b87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000000040407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000001456f92663a70a367083877458c56936f831ba0bb99b99b3c24743b2c2a28c5c9fa3fe20a903c327f6de3a917c21fd5ceab6775a02d4fbbc316c587ccb7d437a3ba014bbf5184a62c54ec06b38736921aa774537fc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000000040407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000001456f92663a70a367083877458c56936f83",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a033db5ed469bbcd370bf33bbbae0d9c31b28685b5a5c89a7f18246c574f68ab8ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa9b0b3c387cbb7deeab0149a5565a3eb4f8fddfff88c40fa4284f2da7ecef5f8",
+        "lastblockhash" : "0x284583166308b94cccceb6841c1fc5e6babb0ea25feb5e5afa58f83c86773f79",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest256BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest256BC.json
index c9b66ae4e..05c83676f 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest256BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest256BC.json
@@ -2,8 +2,8 @@
     "randomStatetest256BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest256BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest256BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x01498d",
-                    "hash" : "0xb0fe40245d2cd5eff614cf7073f59dd4fc47628489122a537eb0f12f5996cde6",
-                    "mixHash" : "0x77f89de1ef255ffbcbf7e557339a16b53b37b15cbd1cc2394ba6919f5a2c847c",
-                    "nonce" : "0xc16a572e887b4c15",
+                    "hash" : "0x7746e9058c3d3449930f76417f4f576f468bd22bb417dad4a50052f00a9e3564",
+                    "mixHash" : "0xe3b7a80b535a80c2a41ea16871ac61461984337bce145aa75362986c948a934d",
+                    "nonce" : "0x790b0ec0a149d815",
                     "number" : "0x01",
                     "parentHash" : "0xf6d9a59681055e0d2715e654ac1299faf44e26a6768aa1ba1eb7a6e32fbda8f2",
                     "receiptTrie" : "0xe0775f69e2246361c8e620c6ef3ba139628746956147d7c5fb18d4c42c44c4f1",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xa1c0314e4e2007127f7374cd3ed5baaa5cc232722787b862fb3bb0009846c2c2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9037cf901fda0f6d9a59681055e0d2715e654ac1299faf44e26a6768aa1ba1eb7a6e32fbda8f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01ded33b3aac1ff5eb99ccd51843413e1096f280b65597c7bf194e5f797a4958da0a1c0314e4e2007127f7374cd3ed5baaa5cc232722787b862fb3bb0009846c2c2a0e0775f69e2246361c8e620c6ef3ba139628746956147d7c5fb18d4c42c44c4f1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301498d8203e880a077f89de1ef255ffbcbf7e557339a16b53b37b15cbd1cc2394ba6919f5a2c847c88c16a572e887b4c15f90178f901758001841599255094095e7baea6a6c7c4c2dfeb977efac326af552d8784025a8725b9010e7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4080371a54061ba048772bd5f74e762711e4c24b0d801bb32e2d20fd5b25af8f98bdfa8c7314d5b5a03a793648e93706e7293122310f40af3f725fedfd6ecc94ffb89a98f98b583cffc0",
+                "rlp" : "0xf9037cf901fda0f6d9a59681055e0d2715e654ac1299faf44e26a6768aa1ba1eb7a6e32fbda8f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01ded33b3aac1ff5eb99ccd51843413e1096f280b65597c7bf194e5f797a4958da0a1c0314e4e2007127f7374cd3ed5baaa5cc232722787b862fb3bb0009846c2c2a0e0775f69e2246361c8e620c6ef3ba139628746956147d7c5fb18d4c42c44c4f1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301498d8203e880a0e3b7a80b535a80c2a41ea16871ac61461984337bce145aa75362986c948a934d88790b0ec0a149d815f90178f901758001841599255094095e7baea6a6c7c4c2dfeb977efac326af552d8784025a8725b9010e7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4080371a54061ba048772bd5f74e762711e4c24b0d801bb32e2d20fd5b25af8f98bdfa8c7314d5b5a03a793648e93706e7293122310f40af3f725fedfd6ecc94ffb89a98f98b583cffc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4080371a5406",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0efe89907c37e03114e3dbf9d1612f9131f9b6e3205701bef1338f721bbdd36a1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb0fe40245d2cd5eff614cf7073f59dd4fc47628489122a537eb0f12f5996cde6",
+        "lastblockhash" : "0x7746e9058c3d3449930f76417f4f576f468bd22bb417dad4a50052f00a9e3564",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -116,8 +116,8 @@
     "randomStatetest256BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest256BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest256BCFiller.json"
         },
         "blocks" : [
             {
@@ -128,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x014c99",
-                    "hash" : "0x75c00ecd3cab2e79476168137e118849ad038c012738850f55353ac2e2fa6a98",
-                    "mixHash" : "0x0aff4e7a6ade8b26be7ba9f699594bbd57d751f56c62ac1260916f56cff4cf00",
-                    "nonce" : "0x49ac8c62ab362a51",
+                    "hash" : "0x41ff5cd8f90b9cf4b01bd0c8bdbd8e85e6894ff940838b70bbefaefcbb982d5f",
+                    "mixHash" : "0x8d6a13625c43a93acfeb9036108a1023c404844b93de30263fab9987b6d518cb",
+                    "nonce" : "0xb3247a6fe21a4bc7",
                     "number" : "0x01",
                     "parentHash" : "0xf6d9a59681055e0d2715e654ac1299faf44e26a6768aa1ba1eb7a6e32fbda8f2",
                     "receiptTrie" : "0x11554a5fd769dc9f20582852cebbec091c41d379aafa180ddf73e25d1201eb71",
-                    "stateRoot" : "0x16ecba4062bf78f2d1ef39761fadcfbdf93a1dd6174b7ba82181fe7faaddeff9",
+                    "stateRoot" : "0xf34ce2a86e108946c70aea918ab08829e7afa688df085c7c2ad773ab1a20e273",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa1c0314e4e2007127f7374cd3ed5baaa5cc232722787b862fb3bb0009846c2c2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9037cf901fda0f6d9a59681055e0d2715e654ac1299faf44e26a6768aa1ba1eb7a6e32fbda8f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a016ecba4062bf78f2d1ef39761fadcfbdf93a1dd6174b7ba82181fe7faaddeff9a0a1c0314e4e2007127f7374cd3ed5baaa5cc232722787b862fb3bb0009846c2c2a011554a5fd769dc9f20582852cebbec091c41d379aafa180ddf73e25d1201eb71b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83014c998203e880a00aff4e7a6ade8b26be7ba9f699594bbd57d751f56c62ac1260916f56cff4cf008849ac8c62ab362a51f90178f901758001841599255094095e7baea6a6c7c4c2dfeb977efac326af552d8784025a8725b9010e7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4080371a54061ba048772bd5f74e762711e4c24b0d801bb32e2d20fd5b25af8f98bdfa8c7314d5b5a03a793648e93706e7293122310f40af3f725fedfd6ecc94ffb89a98f98b583cffc0",
+                "rlp" : "0xf9037cf901fda0f6d9a59681055e0d2715e654ac1299faf44e26a6768aa1ba1eb7a6e32fbda8f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f34ce2a86e108946c70aea918ab08829e7afa688df085c7c2ad773ab1a20e273a0a1c0314e4e2007127f7374cd3ed5baaa5cc232722787b862fb3bb0009846c2c2a011554a5fd769dc9f20582852cebbec091c41d379aafa180ddf73e25d1201eb71b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83014c998203e880a08d6a13625c43a93acfeb9036108a1023c404844b93de30263fab9987b6d518cb88b3247a6fe21a4bc7f90178f901758001841599255094095e7baea6a6c7c4c2dfeb977efac326af552d8784025a8725b9010e7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4080371a54061ba048772bd5f74e762711e4c24b0d801bb32e2d20fd5b25af8f98bdfa8c7314d5b5a03a793648e93706e7293122310f40af3f725fedfd6ecc94ffb89a98f98b583cffc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4080371a5406",
@@ -176,16 +176,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0efe89907c37e03114e3dbf9d1612f9131f9b6e3205701bef1338f721bbdd36a1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x75c00ecd3cab2e79476168137e118849ad038c012738850f55353ac2e2fa6a98",
+        "lastblockhash" : "0x41ff5cd8f90b9cf4b01bd0c8bdbd8e85e6894ff940838b70bbefaefcbb982d5f",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x025a8725",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4080371a54065560005155",
@@ -237,8 +230,8 @@
     "randomStatetest256BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest256BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest256BCFiller.json"
         },
         "blocks" : [
             {
@@ -249,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x01498d",
-                    "hash" : "0x7ab30668c627b64e0dec24ee9b9ebb132144f07a5fe840746e4439e62819785b",
-                    "mixHash" : "0xf414b960e89e9fc7fcc202ecbb6ded88b098f49e90ee57493cfbed651414b403",
-                    "nonce" : "0x22113f213936f8bd",
+                    "hash" : "0xc93a7cef3fc3c03305546e8bd2eb46ba57b48907cf02b6399da123438c7cad24",
+                    "mixHash" : "0x9446b9e827f416267590705eeb6ed3d88f4457b331c7de0a443c00e56ffdef5f",
+                    "nonce" : "0x9efbb607c7d9c634",
                     "number" : "0x01",
                     "parentHash" : "0xf6d9a59681055e0d2715e654ac1299faf44e26a6768aa1ba1eb7a6e32fbda8f2",
                     "receiptTrie" : "0xd3ee7e096f5b8a80241c681ab912a60dc3bf307f4806354a963e0125e3bf40b9",
@@ -260,7 +253,7 @@
                     "transactionsTrie" : "0xa1c0314e4e2007127f7374cd3ed5baaa5cc232722787b862fb3bb0009846c2c2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9037cf901fda0f6d9a59681055e0d2715e654ac1299faf44e26a6768aa1ba1eb7a6e32fbda8f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a023a712000d4298717b6d3c1d3c08f98c4e29510b94a364c3ae4f732ea3eff0c7a0a1c0314e4e2007127f7374cd3ed5baaa5cc232722787b862fb3bb0009846c2c2a0d3ee7e096f5b8a80241c681ab912a60dc3bf307f4806354a963e0125e3bf40b9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301498d8203e880a0f414b960e89e9fc7fcc202ecbb6ded88b098f49e90ee57493cfbed651414b4038822113f213936f8bdf90178f901758001841599255094095e7baea6a6c7c4c2dfeb977efac326af552d8784025a8725b9010e7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4080371a54061ba048772bd5f74e762711e4c24b0d801bb32e2d20fd5b25af8f98bdfa8c7314d5b5a03a793648e93706e7293122310f40af3f725fedfd6ecc94ffb89a98f98b583cffc0",
+                "rlp" : "0xf9037cf901fda0f6d9a59681055e0d2715e654ac1299faf44e26a6768aa1ba1eb7a6e32fbda8f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a023a712000d4298717b6d3c1d3c08f98c4e29510b94a364c3ae4f732ea3eff0c7a0a1c0314e4e2007127f7374cd3ed5baaa5cc232722787b862fb3bb0009846c2c2a0d3ee7e096f5b8a80241c681ab912a60dc3bf307f4806354a963e0125e3bf40b9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301498d8203e880a09446b9e827f416267590705eeb6ed3d88f4457b331c7de0a443c00e56ffdef5f889efbb607c7d9c634f90178f901758001841599255094095e7baea6a6c7c4c2dfeb977efac326af552d8784025a8725b9010e7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4080371a54061ba048772bd5f74e762711e4c24b0d801bb32e2d20fd5b25af8f98bdfa8c7314d5b5a03a793648e93706e7293122310f40af3f725fedfd6ecc94ffb89a98f98b583cffc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4080371a5406",
@@ -297,7 +290,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0efe89907c37e03114e3dbf9d1612f9131f9b6e3205701bef1338f721bbdd36a1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7ab30668c627b64e0dec24ee9b9ebb132144f07a5fe840746e4439e62819785b",
+        "lastblockhash" : "0xc93a7cef3fc3c03305546e8bd2eb46ba57b48907cf02b6399da123438c7cad24",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -351,8 +344,8 @@
     "randomStatetest256BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest256BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest256BCFiller.json"
         },
         "blocks" : [
             {
@@ -363,9 +356,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x01498d",
-                    "hash" : "0xfa691e0a50fb20b55ae9e2e47eabeb4e66ff370ed8db9005663c348d44efa26a",
-                    "mixHash" : "0x8672ed9440ee084cd8aa9d707a4da69e64ad41fab06133b299fb62ba70d09dce",
-                    "nonce" : "0x0a8ce2b40bb5e35d",
+                    "hash" : "0x6f5204c0b110039b38d59b2f4718b0c5fc5784a398106eedf6433c27795e51cd",
+                    "mixHash" : "0x6467ac177a531068f0e8a2503a6022d193f87f349414009774af87e09e50a751",
+                    "nonce" : "0x6fc93b966b7ab9c2",
                     "number" : "0x01",
                     "parentHash" : "0xf6d9a59681055e0d2715e654ac1299faf44e26a6768aa1ba1eb7a6e32fbda8f2",
                     "receiptTrie" : "0xd3ee7e096f5b8a80241c681ab912a60dc3bf307f4806354a963e0125e3bf40b9",
@@ -374,7 +367,7 @@
                     "transactionsTrie" : "0xa1c0314e4e2007127f7374cd3ed5baaa5cc232722787b862fb3bb0009846c2c2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9037cf901fda0f6d9a59681055e0d2715e654ac1299faf44e26a6768aa1ba1eb7a6e32fbda8f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a023a712000d4298717b6d3c1d3c08f98c4e29510b94a364c3ae4f732ea3eff0c7a0a1c0314e4e2007127f7374cd3ed5baaa5cc232722787b862fb3bb0009846c2c2a0d3ee7e096f5b8a80241c681ab912a60dc3bf307f4806354a963e0125e3bf40b9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301498d8203e880a08672ed9440ee084cd8aa9d707a4da69e64ad41fab06133b299fb62ba70d09dce880a8ce2b40bb5e35df90178f901758001841599255094095e7baea6a6c7c4c2dfeb977efac326af552d8784025a8725b9010e7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4080371a54061ba048772bd5f74e762711e4c24b0d801bb32e2d20fd5b25af8f98bdfa8c7314d5b5a03a793648e93706e7293122310f40af3f725fedfd6ecc94ffb89a98f98b583cffc0",
+                "rlp" : "0xf9037cf901fda0f6d9a59681055e0d2715e654ac1299faf44e26a6768aa1ba1eb7a6e32fbda8f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a023a712000d4298717b6d3c1d3c08f98c4e29510b94a364c3ae4f732ea3eff0c7a0a1c0314e4e2007127f7374cd3ed5baaa5cc232722787b862fb3bb0009846c2c2a0d3ee7e096f5b8a80241c681ab912a60dc3bf307f4806354a963e0125e3bf40b9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301498d8203e880a06467ac177a531068f0e8a2503a6022d193f87f349414009774af87e09e50a751886fc93b966b7ab9c2f90178f901758001841599255094095e7baea6a6c7c4c2dfeb977efac326af552d8784025a8725b9010e7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4080371a54061ba048772bd5f74e762711e4c24b0d801bb32e2d20fd5b25af8f98bdfa8c7314d5b5a03a793648e93706e7293122310f40af3f725fedfd6ecc94ffb89a98f98b583cffc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4080371a5406",
@@ -411,7 +404,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0efe89907c37e03114e3dbf9d1612f9131f9b6e3205701bef1338f721bbdd36a1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfa691e0a50fb20b55ae9e2e47eabeb4e66ff370ed8db9005663c348d44efa26a",
+        "lastblockhash" : "0x6f5204c0b110039b38d59b2f4718b0c5fc5784a398106eedf6433c27795e51cd",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -465,8 +458,8 @@
     "randomStatetest256BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest256BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest256BCFiller.json"
         },
         "blocks" : [
             {
@@ -477,9 +470,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x0148f7",
-                    "hash" : "0x55d1ddc8350da2f4502a89bedf425648474f0abbf2c8852aba17566f6844f123",
-                    "mixHash" : "0xdd796c71d9cbad5495d611ac04283ac9b4d451ee2ce8c31c80545160f464bcd9",
-                    "nonce" : "0x84635877edd47204",
+                    "hash" : "0x1b31ac0f41d3a73e2e3d330f7d714fb072749974d982dd6593f05860843c27be",
+                    "mixHash" : "0x6ee4ab6d5f1f144c52333ccbf71e37ea7e8b1e98558e4d956688b9b022276188",
+                    "nonce" : "0x5821d7748e3c7d74",
                     "number" : "0x01",
                     "parentHash" : "0xf6d9a59681055e0d2715e654ac1299faf44e26a6768aa1ba1eb7a6e32fbda8f2",
                     "receiptTrie" : "0x8688c13545ba129c6883fa69e9d79b78958601cc9ca0a19d05d4ec5ec51ea0be",
@@ -488,7 +481,7 @@
                     "transactionsTrie" : "0xa1c0314e4e2007127f7374cd3ed5baaa5cc232722787b862fb3bb0009846c2c2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9037cf901fda0f6d9a59681055e0d2715e654ac1299faf44e26a6768aa1ba1eb7a6e32fbda8f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03155b8008e786855dda5d70c2a588c0ff49a924164ce6108f82348b2b5fcda3fa0a1c0314e4e2007127f7374cd3ed5baaa5cc232722787b862fb3bb0009846c2c2a08688c13545ba129c6883fa69e9d79b78958601cc9ca0a19d05d4ec5ec51ea0beb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830148f78203e880a0dd796c71d9cbad5495d611ac04283ac9b4d451ee2ce8c31c80545160f464bcd98884635877edd47204f90178f901758001841599255094095e7baea6a6c7c4c2dfeb977efac326af552d8784025a8725b9010e7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4080371a54061ba048772bd5f74e762711e4c24b0d801bb32e2d20fd5b25af8f98bdfa8c7314d5b5a03a793648e93706e7293122310f40af3f725fedfd6ecc94ffb89a98f98b583cffc0",
+                "rlp" : "0xf9037cf901fda0f6d9a59681055e0d2715e654ac1299faf44e26a6768aa1ba1eb7a6e32fbda8f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03155b8008e786855dda5d70c2a588c0ff49a924164ce6108f82348b2b5fcda3fa0a1c0314e4e2007127f7374cd3ed5baaa5cc232722787b862fb3bb0009846c2c2a08688c13545ba129c6883fa69e9d79b78958601cc9ca0a19d05d4ec5ec51ea0beb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830148f78203e880a06ee4ab6d5f1f144c52333ccbf71e37ea7e8b1e98558e4d956688b9b022276188885821d7748e3c7d74f90178f901758001841599255094095e7baea6a6c7c4c2dfeb977efac326af552d8784025a8725b9010e7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4080371a54061ba048772bd5f74e762711e4c24b0d801bb32e2d20fd5b25af8f98bdfa8c7314d5b5a03a793648e93706e7293122310f40af3f725fedfd6ecc94ffb89a98f98b583cffc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4080371a5406",
@@ -525,7 +518,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0efe89907c37e03114e3dbf9d1612f9131f9b6e3205701bef1338f721bbdd36a1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x55d1ddc8350da2f4502a89bedf425648474f0abbf2c8852aba17566f6844f123",
+        "lastblockhash" : "0x1b31ac0f41d3a73e2e3d330f7d714fb072749974d982dd6593f05860843c27be",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -579,8 +572,8 @@
     "randomStatetest256BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest256BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest256BCFiller.json"
         },
         "blocks" : [
             {
@@ -591,9 +584,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x0148f7",
-                    "hash" : "0x91f609ca02f7e66ccd4a7969d5e0ec3d6125b4d697b75b4f8e07f09b060f377d",
-                    "mixHash" : "0x76477688355976a0a7ed78666b1e410927d538059199b4b7aaf80bdec4f81c36",
-                    "nonce" : "0xaacfe161000cfc0e",
+                    "hash" : "0x3e0d4cb9c13f0528a6b869db9a520755fc8a12d61710673e31f4564dace53bfd",
+                    "mixHash" : "0xc12025f928620c80b59f9bfa57ab9d988eef453b67e71bbe341eb652efd942eb",
+                    "nonce" : "0x27027ba5ca82d764",
                     "number" : "0x01",
                     "parentHash" : "0xf6d9a59681055e0d2715e654ac1299faf44e26a6768aa1ba1eb7a6e32fbda8f2",
                     "receiptTrie" : "0x8688c13545ba129c6883fa69e9d79b78958601cc9ca0a19d05d4ec5ec51ea0be",
@@ -602,7 +595,7 @@
                     "transactionsTrie" : "0xa1c0314e4e2007127f7374cd3ed5baaa5cc232722787b862fb3bb0009846c2c2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9037cf901fda0f6d9a59681055e0d2715e654ac1299faf44e26a6768aa1ba1eb7a6e32fbda8f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03155b8008e786855dda5d70c2a588c0ff49a924164ce6108f82348b2b5fcda3fa0a1c0314e4e2007127f7374cd3ed5baaa5cc232722787b862fb3bb0009846c2c2a08688c13545ba129c6883fa69e9d79b78958601cc9ca0a19d05d4ec5ec51ea0beb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830148f78203e880a076477688355976a0a7ed78666b1e410927d538059199b4b7aaf80bdec4f81c3688aacfe161000cfc0ef90178f901758001841599255094095e7baea6a6c7c4c2dfeb977efac326af552d8784025a8725b9010e7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4080371a54061ba048772bd5f74e762711e4c24b0d801bb32e2d20fd5b25af8f98bdfa8c7314d5b5a03a793648e93706e7293122310f40af3f725fedfd6ecc94ffb89a98f98b583cffc0",
+                "rlp" : "0xf9037cf901fda0f6d9a59681055e0d2715e654ac1299faf44e26a6768aa1ba1eb7a6e32fbda8f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03155b8008e786855dda5d70c2a588c0ff49a924164ce6108f82348b2b5fcda3fa0a1c0314e4e2007127f7374cd3ed5baaa5cc232722787b862fb3bb0009846c2c2a08688c13545ba129c6883fa69e9d79b78958601cc9ca0a19d05d4ec5ec51ea0beb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830148f78203e880a0c12025f928620c80b59f9bfa57ab9d988eef453b67e71bbe341eb652efd942eb8827027ba5ca82d764f90178f901758001841599255094095e7baea6a6c7c4c2dfeb977efac326af552d8784025a8725b9010e7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4080371a54061ba048772bd5f74e762711e4c24b0d801bb32e2d20fd5b25af8f98bdfa8c7314d5b5a03a793648e93706e7293122310f40af3f725fedfd6ecc94ffb89a98f98b583cffc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4080371a5406",
@@ -639,7 +632,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0efe89907c37e03114e3dbf9d1612f9131f9b6e3205701bef1338f721bbdd36a1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x91f609ca02f7e66ccd4a7969d5e0ec3d6125b4d697b75b4f8e07f09b060f377d",
+        "lastblockhash" : "0x3e0d4cb9c13f0528a6b869db9a520755fc8a12d61710673e31f4564dace53bfd",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest258BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest258BC.json
index 8a2799bf6..8736063c6 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest258BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest258BC.json
@@ -2,8 +2,8 @@
     "randomStatetest258BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest258BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest258BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xaf00",
-                    "hash" : "0x1d8be236d861649d5e98531efaff0181099ea0284ace6c3d0b8733e1a0c6f93b",
-                    "mixHash" : "0x048c269d218cfc2046ee5d09be2a36c185712dce9bf0cc1cdeec2f2678746ab5",
-                    "nonce" : "0x85cec584daf45875",
+                    "hash" : "0x2a7b480ae58c4503006045dbf8188542d00a2f26a5a76790094c84bac6d15108",
+                    "mixHash" : "0x37cb1bfffdf6fcc8ff9631ac80f988dfbd00de5b5843015527637e4bd4976da9",
+                    "nonce" : "0xe63b4242ef28efa9",
                     "number" : "0x01",
                     "parentHash" : "0xe7d0c82b79f562aa7d1c7a81f2f4345fb7ed48cd379e3b790dcf00b1a522f4d2",
                     "receiptTrie" : "0xca1b19653a7dbf50f69a97f0480edae47d58c48595a17ac69faff7aa50d42601",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x4da96b9469f5ba42d2f4daf2cdc1194f0334669ee999595c815acd2c3bb265a0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90303f901fca0e7d0c82b79f562aa7d1c7a81f2f4345fb7ed48cd379e3b790dcf00b1a522f4d2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0444b7feed90db00202361bf15f9776370a4377fd157678218cbab1a3056afc4fa04da96b9469f5ba42d2f4daf2cdc1194f0334669ee999595c815acd2c3bb265a0a0ca1b19653a7dbf50f69a97f0480edae47d58c48595a17ac69faff7aa50d42601b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82af008203e880a0048c269d218cfc2046ee5d09be2a36c185712dce9bf0cc1cdeec2f2678746ab58885cec584daf45875f90100f8fe800184120fed1894095e7baea6a6c7c4c2dfeb977efac326af552d878465b61990b8987f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b554447f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000145406f986d138a67320b4113330a64934f831ba060d079bae31fa906e5fcf0db9e48b022212c8dbde3c4d67c57e9b82c13c52ce8a06894e1f2655008afc0da841e6ff0030d55e18970e3d68b88d341229440f3df1cc0",
+                "rlp" : "0xf90303f901fca0e7d0c82b79f562aa7d1c7a81f2f4345fb7ed48cd379e3b790dcf00b1a522f4d2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0444b7feed90db00202361bf15f9776370a4377fd157678218cbab1a3056afc4fa04da96b9469f5ba42d2f4daf2cdc1194f0334669ee999595c815acd2c3bb265a0a0ca1b19653a7dbf50f69a97f0480edae47d58c48595a17ac69faff7aa50d42601b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82af008203e880a037cb1bfffdf6fcc8ff9631ac80f988dfbd00de5b5843015527637e4bd4976da988e63b4242ef28efa9f90100f8fe800184120fed1894095e7baea6a6c7c4c2dfeb977efac326af552d878465b61990b8987f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b554447f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000145406f986d138a67320b4113330a64934f831ba060d079bae31fa906e5fcf0db9e48b022212c8dbde3c4d67c57e9b82c13c52ce8a06894e1f2655008afc0da841e6ff0030d55e18970e3d68b88d341229440f3df1cc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b554447f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000145406f986d138a67320b4113330a64934f83",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dc306afca17b5f24e8c58f8e327159d35254dd1ba9f454b1d214a80c5434c6baa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1d8be236d861649d5e98531efaff0181099ea0284ace6c3d0b8733e1a0c6f93b",
+        "lastblockhash" : "0x2a7b480ae58c4503006045dbf8188542d00a2f26a5a76790094c84bac6d15108",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest258BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest258BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest258BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb20c",
-                    "hash" : "0x00cb3237cc5a1b2238432624ef4aaf4f09847757a62302c4f306a63336a5ca80",
-                    "mixHash" : "0x84890c414c8019a59e007ce2c9fa6dd173e968ad7cd64fd2924c5adaf1e3248f",
-                    "nonce" : "0x1fa7ab0537a669e9",
+                    "hash" : "0x35be3f2389a09892c9755dfa06e86f6e3ebae033409363cb9e32c5f9fc4e6f43",
+                    "mixHash" : "0xcb14e6cb42c6ce96eda4076c781c821e0f125f8a9d073336867094e49ebbecea",
+                    "nonce" : "0x4013b51ed7fc0598",
                     "number" : "0x01",
                     "parentHash" : "0xe7d0c82b79f562aa7d1c7a81f2f4345fb7ed48cd379e3b790dcf00b1a522f4d2",
                     "receiptTrie" : "0xc6fb0c4d6ffecdc6d779c4b129ffc984e4d02c1b2e25e2971b5c0f946b3c76bb",
-                    "stateRoot" : "0xdd2caf0b9113adeb7efa1cd065f6c6b52994fe63b9aadb755d413b24b6b6d456",
+                    "stateRoot" : "0x1207dc0bc998ca01f58a5e3f5668efdb251af28f718c65a818d767347586fa2b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4da96b9469f5ba42d2f4daf2cdc1194f0334669ee999595c815acd2c3bb265a0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90303f901fca0e7d0c82b79f562aa7d1c7a81f2f4345fb7ed48cd379e3b790dcf00b1a522f4d2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dd2caf0b9113adeb7efa1cd065f6c6b52994fe63b9aadb755d413b24b6b6d456a04da96b9469f5ba42d2f4daf2cdc1194f0334669ee999595c815acd2c3bb265a0a0c6fb0c4d6ffecdc6d779c4b129ffc984e4d02c1b2e25e2971b5c0f946b3c76bbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b20c8203e880a084890c414c8019a59e007ce2c9fa6dd173e968ad7cd64fd2924c5adaf1e3248f881fa7ab0537a669e9f90100f8fe800184120fed1894095e7baea6a6c7c4c2dfeb977efac326af552d878465b61990b8987f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b554447f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000145406f986d138a67320b4113330a64934f831ba060d079bae31fa906e5fcf0db9e48b022212c8dbde3c4d67c57e9b82c13c52ce8a06894e1f2655008afc0da841e6ff0030d55e18970e3d68b88d341229440f3df1cc0",
+                "rlp" : "0xf90303f901fca0e7d0c82b79f562aa7d1c7a81f2f4345fb7ed48cd379e3b790dcf00b1a522f4d2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01207dc0bc998ca01f58a5e3f5668efdb251af28f718c65a818d767347586fa2ba04da96b9469f5ba42d2f4daf2cdc1194f0334669ee999595c815acd2c3bb265a0a0c6fb0c4d6ffecdc6d779c4b129ffc984e4d02c1b2e25e2971b5c0f946b3c76bbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b20c8203e880a0cb14e6cb42c6ce96eda4076c781c821e0f125f8a9d073336867094e49ebbecea884013b51ed7fc0598f90100f8fe800184120fed1894095e7baea6a6c7c4c2dfeb977efac326af552d878465b61990b8987f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b554447f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000145406f986d138a67320b4113330a64934f831ba060d079bae31fa906e5fcf0db9e48b022212c8dbde3c4d67c57e9b82c13c52ce8a06894e1f2655008afc0da841e6ff0030d55e18970e3d68b88d341229440f3df1cc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b554447f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000145406f986d138a67320b4113330a64934f83",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dc306afca17b5f24e8c58f8e327159d35254dd1ba9f454b1d214a80c5434c6baa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x00cb3237cc5a1b2238432624ef4aaf4f09847757a62302c4f306a63336a5ca80",
+        "lastblockhash" : "0x35be3f2389a09892c9755dfa06e86f6e3ebae033409363cb9e32c5f9fc4e6f43",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x65b61990",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b554447f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000145406f986d138a67320b4113330a64934f835560005155",
@@ -235,8 +228,8 @@
     "randomStatetest258BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest258BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest258BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xaf00",
-                    "hash" : "0x969e83c1a512885a70c166810bea6ee5a4fca6f3387a7abf7d58c7c6f6c20408",
-                    "mixHash" : "0xcd279e085797c675b964109fda9ec94f2550f221a5449b38e34401253a869ad2",
-                    "nonce" : "0x8626bc9b4e49940c",
+                    "hash" : "0x7322f5b6cd1ec45e25c9af71fce20502164113d1362a57a7df04f11a12b96f71",
+                    "mixHash" : "0xd8f4231c9a62c2f370354c16469263385134dadbc73c9cd326ae7d2f7c66d081",
+                    "nonce" : "0x2f5a314618eef79e",
                     "number" : "0x01",
                     "parentHash" : "0xe7d0c82b79f562aa7d1c7a81f2f4345fb7ed48cd379e3b790dcf00b1a522f4d2",
                     "receiptTrie" : "0xab806de39edef7512684005c72b99eea612968f639163ec8d5cb991488d11263",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0x4da96b9469f5ba42d2f4daf2cdc1194f0334669ee999595c815acd2c3bb265a0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90303f901fca0e7d0c82b79f562aa7d1c7a81f2f4345fb7ed48cd379e3b790dcf00b1a522f4d2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a027cccfc372a7ed086348f82a251f1f8d3fb7179c1b9dfd6dcc0c7839800c328ea04da96b9469f5ba42d2f4daf2cdc1194f0334669ee999595c815acd2c3bb265a0a0ab806de39edef7512684005c72b99eea612968f639163ec8d5cb991488d11263b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82af008203e880a0cd279e085797c675b964109fda9ec94f2550f221a5449b38e34401253a869ad2888626bc9b4e49940cf90100f8fe800184120fed1894095e7baea6a6c7c4c2dfeb977efac326af552d878465b61990b8987f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b554447f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000145406f986d138a67320b4113330a64934f831ba060d079bae31fa906e5fcf0db9e48b022212c8dbde3c4d67c57e9b82c13c52ce8a06894e1f2655008afc0da841e6ff0030d55e18970e3d68b88d341229440f3df1cc0",
+                "rlp" : "0xf90303f901fca0e7d0c82b79f562aa7d1c7a81f2f4345fb7ed48cd379e3b790dcf00b1a522f4d2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a027cccfc372a7ed086348f82a251f1f8d3fb7179c1b9dfd6dcc0c7839800c328ea04da96b9469f5ba42d2f4daf2cdc1194f0334669ee999595c815acd2c3bb265a0a0ab806de39edef7512684005c72b99eea612968f639163ec8d5cb991488d11263b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82af008203e880a0d8f4231c9a62c2f370354c16469263385134dadbc73c9cd326ae7d2f7c66d081882f5a314618eef79ef90100f8fe800184120fed1894095e7baea6a6c7c4c2dfeb977efac326af552d878465b61990b8987f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b554447f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000145406f986d138a67320b4113330a64934f831ba060d079bae31fa906e5fcf0db9e48b022212c8dbde3c4d67c57e9b82c13c52ce8a06894e1f2655008afc0da841e6ff0030d55e18970e3d68b88d341229440f3df1cc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b554447f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000145406f986d138a67320b4113330a64934f83",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dc306afca17b5f24e8c58f8e327159d35254dd1ba9f454b1d214a80c5434c6baa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x969e83c1a512885a70c166810bea6ee5a4fca6f3387a7abf7d58c7c6f6c20408",
+        "lastblockhash" : "0x7322f5b6cd1ec45e25c9af71fce20502164113d1362a57a7df04f11a12b96f71",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest258BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest258BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest258BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xaf00",
-                    "hash" : "0x261f2a8945bb1be8eb2b0d657983da2ea6f4211ee68ff453d3440f95075ec74c",
-                    "mixHash" : "0x693dc68dc20bbce94b8978b81cd5202e2ff0d1a753e9ace37511688a0d0bbaff",
-                    "nonce" : "0x907f162abede303a",
+                    "hash" : "0xbfbb173597ba8827ccacbfe9d60eb4ab6dafa52cc20994f628f42ef91da8d926",
+                    "mixHash" : "0xfef986262082a08571f4c5c09516efb7666ce0987641134780b18079fe225520",
+                    "nonce" : "0x4749625af4d3578a",
                     "number" : "0x01",
                     "parentHash" : "0xe7d0c82b79f562aa7d1c7a81f2f4345fb7ed48cd379e3b790dcf00b1a522f4d2",
                     "receiptTrie" : "0xab806de39edef7512684005c72b99eea612968f639163ec8d5cb991488d11263",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0x4da96b9469f5ba42d2f4daf2cdc1194f0334669ee999595c815acd2c3bb265a0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90303f901fca0e7d0c82b79f562aa7d1c7a81f2f4345fb7ed48cd379e3b790dcf00b1a522f4d2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a027cccfc372a7ed086348f82a251f1f8d3fb7179c1b9dfd6dcc0c7839800c328ea04da96b9469f5ba42d2f4daf2cdc1194f0334669ee999595c815acd2c3bb265a0a0ab806de39edef7512684005c72b99eea612968f639163ec8d5cb991488d11263b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82af008203e880a0693dc68dc20bbce94b8978b81cd5202e2ff0d1a753e9ace37511688a0d0bbaff88907f162abede303af90100f8fe800184120fed1894095e7baea6a6c7c4c2dfeb977efac326af552d878465b61990b8987f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b554447f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000145406f986d138a67320b4113330a64934f831ba060d079bae31fa906e5fcf0db9e48b022212c8dbde3c4d67c57e9b82c13c52ce8a06894e1f2655008afc0da841e6ff0030d55e18970e3d68b88d341229440f3df1cc0",
+                "rlp" : "0xf90303f901fca0e7d0c82b79f562aa7d1c7a81f2f4345fb7ed48cd379e3b790dcf00b1a522f4d2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a027cccfc372a7ed086348f82a251f1f8d3fb7179c1b9dfd6dcc0c7839800c328ea04da96b9469f5ba42d2f4daf2cdc1194f0334669ee999595c815acd2c3bb265a0a0ab806de39edef7512684005c72b99eea612968f639163ec8d5cb991488d11263b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82af008203e880a0fef986262082a08571f4c5c09516efb7666ce0987641134780b18079fe225520884749625af4d3578af90100f8fe800184120fed1894095e7baea6a6c7c4c2dfeb977efac326af552d878465b61990b8987f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b554447f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000145406f986d138a67320b4113330a64934f831ba060d079bae31fa906e5fcf0db9e48b022212c8dbde3c4d67c57e9b82c13c52ce8a06894e1f2655008afc0da841e6ff0030d55e18970e3d68b88d341229440f3df1cc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b554447f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000145406f986d138a67320b4113330a64934f83",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dc306afca17b5f24e8c58f8e327159d35254dd1ba9f454b1d214a80c5434c6baa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x261f2a8945bb1be8eb2b0d657983da2ea6f4211ee68ff453d3440f95075ec74c",
+        "lastblockhash" : "0xbfbb173597ba8827ccacbfe9d60eb4ab6dafa52cc20994f628f42ef91da8d926",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest258BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest258BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest258BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xae6a",
-                    "hash" : "0x49c1052eabfcc64888dacf14207592f43e15776a41bd323b95216aef329130a1",
-                    "mixHash" : "0x891ec687185a9a5a521013b6de1428b18789558117ec94b7ec59ef51cad6e036",
-                    "nonce" : "0x9c27963abe223947",
+                    "hash" : "0x38c4b9979b99d785db395960218c19266a645b36ff4d03a9166626cf4f62067a",
+                    "mixHash" : "0x2e544d6600dd4826de0e61f5f7bc42f6671fe9a6db6c9b022b9a83b7ab4ddae3",
+                    "nonce" : "0xf69cfb036549213a",
                     "number" : "0x01",
                     "parentHash" : "0xe7d0c82b79f562aa7d1c7a81f2f4345fb7ed48cd379e3b790dcf00b1a522f4d2",
                     "receiptTrie" : "0x56626d0d1f047424cece59c7adfe1735a34797305adbd5d82ec13adcf4203c55",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0x4da96b9469f5ba42d2f4daf2cdc1194f0334669ee999595c815acd2c3bb265a0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90303f901fca0e7d0c82b79f562aa7d1c7a81f2f4345fb7ed48cd379e3b790dcf00b1a522f4d2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06d42b217c37369edba82e500b95e01adb5a933402dc9c81c81d80de4af625505a04da96b9469f5ba42d2f4daf2cdc1194f0334669ee999595c815acd2c3bb265a0a056626d0d1f047424cece59c7adfe1735a34797305adbd5d82ec13adcf4203c55b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82ae6a8203e880a0891ec687185a9a5a521013b6de1428b18789558117ec94b7ec59ef51cad6e036889c27963abe223947f90100f8fe800184120fed1894095e7baea6a6c7c4c2dfeb977efac326af552d878465b61990b8987f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b554447f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000145406f986d138a67320b4113330a64934f831ba060d079bae31fa906e5fcf0db9e48b022212c8dbde3c4d67c57e9b82c13c52ce8a06894e1f2655008afc0da841e6ff0030d55e18970e3d68b88d341229440f3df1cc0",
+                "rlp" : "0xf90303f901fca0e7d0c82b79f562aa7d1c7a81f2f4345fb7ed48cd379e3b790dcf00b1a522f4d2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06d42b217c37369edba82e500b95e01adb5a933402dc9c81c81d80de4af625505a04da96b9469f5ba42d2f4daf2cdc1194f0334669ee999595c815acd2c3bb265a0a056626d0d1f047424cece59c7adfe1735a34797305adbd5d82ec13adcf4203c55b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82ae6a8203e880a02e544d6600dd4826de0e61f5f7bc42f6671fe9a6db6c9b022b9a83b7ab4ddae388f69cfb036549213af90100f8fe800184120fed1894095e7baea6a6c7c4c2dfeb977efac326af552d878465b61990b8987f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b554447f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000145406f986d138a67320b4113330a64934f831ba060d079bae31fa906e5fcf0db9e48b022212c8dbde3c4d67c57e9b82c13c52ce8a06894e1f2655008afc0da841e6ff0030d55e18970e3d68b88d341229440f3df1cc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b554447f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000145406f986d138a67320b4113330a64934f83",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dc306afca17b5f24e8c58f8e327159d35254dd1ba9f454b1d214a80c5434c6baa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x49c1052eabfcc64888dacf14207592f43e15776a41bd323b95216aef329130a1",
+        "lastblockhash" : "0x38c4b9979b99d785db395960218c19266a645b36ff4d03a9166626cf4f62067a",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest258BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest258BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest258BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xae6a",
-                    "hash" : "0xd709fb701e394c21a37761f4edefa0b2007a0d36fa6e68a2fd2254e728636368",
-                    "mixHash" : "0x1a33c5958da17ce347458c190e809bb415540e73eacd0c46579f3a170d631966",
-                    "nonce" : "0xf5e0b10c714c52bb",
+                    "hash" : "0x91284c04bf68e9c811cfc14607d7e559490ea1a47daa08b7b9701ef5382884ed",
+                    "mixHash" : "0xeccc980ae1c29491da26506a012cea4229710e5b06feea4124181dbe593feb7e",
+                    "nonce" : "0xd40e6a9490b40329",
                     "number" : "0x01",
                     "parentHash" : "0xe7d0c82b79f562aa7d1c7a81f2f4345fb7ed48cd379e3b790dcf00b1a522f4d2",
                     "receiptTrie" : "0x56626d0d1f047424cece59c7adfe1735a34797305adbd5d82ec13adcf4203c55",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0x4da96b9469f5ba42d2f4daf2cdc1194f0334669ee999595c815acd2c3bb265a0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90303f901fca0e7d0c82b79f562aa7d1c7a81f2f4345fb7ed48cd379e3b790dcf00b1a522f4d2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06d42b217c37369edba82e500b95e01adb5a933402dc9c81c81d80de4af625505a04da96b9469f5ba42d2f4daf2cdc1194f0334669ee999595c815acd2c3bb265a0a056626d0d1f047424cece59c7adfe1735a34797305adbd5d82ec13adcf4203c55b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82ae6a8203e880a01a33c5958da17ce347458c190e809bb415540e73eacd0c46579f3a170d63196688f5e0b10c714c52bbf90100f8fe800184120fed1894095e7baea6a6c7c4c2dfeb977efac326af552d878465b61990b8987f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b554447f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000145406f986d138a67320b4113330a64934f831ba060d079bae31fa906e5fcf0db9e48b022212c8dbde3c4d67c57e9b82c13c52ce8a06894e1f2655008afc0da841e6ff0030d55e18970e3d68b88d341229440f3df1cc0",
+                "rlp" : "0xf90303f901fca0e7d0c82b79f562aa7d1c7a81f2f4345fb7ed48cd379e3b790dcf00b1a522f4d2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06d42b217c37369edba82e500b95e01adb5a933402dc9c81c81d80de4af625505a04da96b9469f5ba42d2f4daf2cdc1194f0334669ee999595c815acd2c3bb265a0a056626d0d1f047424cece59c7adfe1735a34797305adbd5d82ec13adcf4203c55b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82ae6a8203e880a0eccc980ae1c29491da26506a012cea4229710e5b06feea4124181dbe593feb7e88d40e6a9490b40329f90100f8fe800184120fed1894095e7baea6a6c7c4c2dfeb977efac326af552d878465b61990b8987f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b554447f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000145406f986d138a67320b4113330a64934f831ba060d079bae31fa906e5fcf0db9e48b022212c8dbde3c4d67c57e9b82c13c52ce8a06894e1f2655008afc0da841e6ff0030d55e18970e3d68b88d341229440f3df1cc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b554447f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000145406f986d138a67320b4113330a64934f83",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dc306afca17b5f24e8c58f8e327159d35254dd1ba9f454b1d214a80c5434c6baa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd709fb701e394c21a37761f4edefa0b2007a0d36fa6e68a2fd2254e728636368",
+        "lastblockhash" : "0x91284c04bf68e9c811cfc14607d7e559490ea1a47daa08b7b9701ef5382884ed",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest262BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest262BC.json
index 9f97dd69c..ad1d078f3 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest262BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest262BC.json
@@ -2,8 +2,8 @@
     "randomStatetest262BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest262BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest262BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xcf0d",
-                    "hash" : "0xc748685e753a19e56b703a37b5d1aa07a0c59fb84ea7515ebe249c855958ffd8",
-                    "mixHash" : "0x71116b82124c0a6be9584fe620e4b93f2b539379f77657fcf583a4bf3b041038",
-                    "nonce" : "0xb6e74d15d518a055",
+                    "hash" : "0x40a6dc6182a9df2fba9e813bccb9ca8cf573d1a719525f85691cd947d35cd671",
+                    "mixHash" : "0x1469ae4e127e3cca692b0fa6f4ebc4f1f4e52ff8020497a687126f3d0ee7dd45",
+                    "nonce" : "0x5e67b38913ee1d88",
                     "number" : "0x01",
                     "parentHash" : "0xa4022e3af0e187d8d2aa5856a0365ca8398c68d4aade0bf53c34925972c080bb",
                     "receiptTrie" : "0x6cb18fdc16c9686fb6dd117b99c18071b40c00a15898d793309115674295f071",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xf8c50cf6cb90fb8a66e52c0b1f31d25c7496d508ab8a698d6aa2e8f0bc8886c0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90335f901fca0a4022e3af0e187d8d2aa5856a0365ca8398c68d4aade0bf53c34925972c080bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e2176f1f59600aee6e1c2a194a58cecbb2bac74be7d938349c1763ea916f405ca0f8c50cf6cb90fb8a66e52c0b1f31d25c7496d508ab8a698d6aa2e8f0bc8886c0a06cb18fdc16c9686fb6dd117b99c18071b40c00a15898d793309115674295f071b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cf0d8203e880a071116b82124c0a6be9584fe620e4b93f2b539379f77657fcf583a4bf3b04103888b6e74d15d518a055f90132f9012f8001840e777b6894095e7baea6a6c7c4c2dfeb977efac326af552d878407320a71b8c97f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe44407f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff091ca0b89a69e861780bd83a4d14b6dfa0294f2945220214cca328d94ce22a9df89179a0268c5364af870eebf909559785c9fcbf57ea5874c7b6a4772e633d9c8044f2d7c0",
+                "rlp" : "0xf90335f901fca0a4022e3af0e187d8d2aa5856a0365ca8398c68d4aade0bf53c34925972c080bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e2176f1f59600aee6e1c2a194a58cecbb2bac74be7d938349c1763ea916f405ca0f8c50cf6cb90fb8a66e52c0b1f31d25c7496d508ab8a698d6aa2e8f0bc8886c0a06cb18fdc16c9686fb6dd117b99c18071b40c00a15898d793309115674295f071b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cf0d8203e880a01469ae4e127e3cca692b0fa6f4ebc4f1f4e52ff8020497a687126f3d0ee7dd45885e67b38913ee1d88f90132f9012f8001840e777b6894095e7baea6a6c7c4c2dfeb977efac326af552d878407320a71b8c97f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe44407f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff091ca0b89a69e861780bd83a4d14b6dfa0294f2945220214cca328d94ce22a9df89179a0268c5364af870eebf909559785c9fcbf57ea5874c7b6a4772e633d9c8044f2d7c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe44407f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff09",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09d7cb576206d3880ecf7c922ac2f3e63f902cc5249648bab4b65f35e77952f4fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc748685e753a19e56b703a37b5d1aa07a0c59fb84ea7515ebe249c855958ffd8",
+        "lastblockhash" : "0x40a6dc6182a9df2fba9e813bccb9ca8cf573d1a719525f85691cd947d35cd671",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest262BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest262BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest262BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xd219",
-                    "hash" : "0x34c218d25b898a9cf52f8cc7cba971a18f55f12b50cdf82dc699fa73a8f12935",
-                    "mixHash" : "0xb7f872e38c8f5f03eafae30601864378676bacb1b165b9626b40c6c50f0e7a40",
-                    "nonce" : "0xb66b7e232472feee",
+                    "hash" : "0x2c70b190376263b7025679bb4d312a9627d0a8be36d929512e2c68fce5b31ff6",
+                    "mixHash" : "0x165fbce293b04028c8b3127336cb05c83b1bc5b6aad6dd62ef3a7b768c18a888",
+                    "nonce" : "0x417c200380dba229",
                     "number" : "0x01",
                     "parentHash" : "0xa4022e3af0e187d8d2aa5856a0365ca8398c68d4aade0bf53c34925972c080bb",
                     "receiptTrie" : "0xfe8c0515b2c664b55f58d609ad161d748e96177f200960141f900e5872dbabec",
-                    "stateRoot" : "0xab34a5715e86f872421a22a7b9a3d9d27af43c5b8b5d49a445c577a33c165540",
+                    "stateRoot" : "0xfca06d8afdc84552ca10c06a65b522159744dfbeea4721f982ea9deb24b27902",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf8c50cf6cb90fb8a66e52c0b1f31d25c7496d508ab8a698d6aa2e8f0bc8886c0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90335f901fca0a4022e3af0e187d8d2aa5856a0365ca8398c68d4aade0bf53c34925972c080bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ab34a5715e86f872421a22a7b9a3d9d27af43c5b8b5d49a445c577a33c165540a0f8c50cf6cb90fb8a66e52c0b1f31d25c7496d508ab8a698d6aa2e8f0bc8886c0a0fe8c0515b2c664b55f58d609ad161d748e96177f200960141f900e5872dbabecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82d2198203e880a0b7f872e38c8f5f03eafae30601864378676bacb1b165b9626b40c6c50f0e7a4088b66b7e232472feeef90132f9012f8001840e777b6894095e7baea6a6c7c4c2dfeb977efac326af552d878407320a71b8c97f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe44407f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff091ca0b89a69e861780bd83a4d14b6dfa0294f2945220214cca328d94ce22a9df89179a0268c5364af870eebf909559785c9fcbf57ea5874c7b6a4772e633d9c8044f2d7c0",
+                "rlp" : "0xf90335f901fca0a4022e3af0e187d8d2aa5856a0365ca8398c68d4aade0bf53c34925972c080bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fca06d8afdc84552ca10c06a65b522159744dfbeea4721f982ea9deb24b27902a0f8c50cf6cb90fb8a66e52c0b1f31d25c7496d508ab8a698d6aa2e8f0bc8886c0a0fe8c0515b2c664b55f58d609ad161d748e96177f200960141f900e5872dbabecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82d2198203e880a0165fbce293b04028c8b3127336cb05c83b1bc5b6aad6dd62ef3a7b768c18a88888417c200380dba229f90132f9012f8001840e777b6894095e7baea6a6c7c4c2dfeb977efac326af552d878407320a71b8c97f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe44407f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff091ca0b89a69e861780bd83a4d14b6dfa0294f2945220214cca328d94ce22a9df89179a0268c5364af870eebf909559785c9fcbf57ea5874c7b6a4772e633d9c8044f2d7c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe44407f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff09",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09d7cb576206d3880ecf7c922ac2f3e63f902cc5249648bab4b65f35e77952f4fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x34c218d25b898a9cf52f8cc7cba971a18f55f12b50cdf82dc699fa73a8f12935",
+        "lastblockhash" : "0x2c70b190376263b7025679bb4d312a9627d0a8be36d929512e2c68fce5b31ff6",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x07320a71",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe44407f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff095560005155",
@@ -235,8 +228,8 @@
     "randomStatetest262BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest262BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest262BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xcf0d",
-                    "hash" : "0x86d75e47108fac5c2db2bca9512bbba7861c80f2bab44dc1fac8c218bf75b2b7",
-                    "mixHash" : "0x3e2e3734dcc95114bb8468690d1018cf978df30cc467eb93b644ba03a23fc1b4",
-                    "nonce" : "0x5ef53249fd7439c0",
+                    "hash" : "0x0ff9b539d343689342e48254c3f9ddbaa0a7df17d1f6320ea739657b3ebce7c0",
+                    "mixHash" : "0xc9ecdeafd24daafba67de4af9e23f0ed3451fd6269c62d52731c24a259275e8d",
+                    "nonce" : "0xadd05c404bffaf82",
                     "number" : "0x01",
                     "parentHash" : "0xa4022e3af0e187d8d2aa5856a0365ca8398c68d4aade0bf53c34925972c080bb",
                     "receiptTrie" : "0xab9f17ea11f802b8c0b54b97fbeaf909b306ea714251ed72259c76ec2c1c23c3",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xf8c50cf6cb90fb8a66e52c0b1f31d25c7496d508ab8a698d6aa2e8f0bc8886c0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90335f901fca0a4022e3af0e187d8d2aa5856a0365ca8398c68d4aade0bf53c34925972c080bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ecf9f984e5bb3cd813c8fe1d97148d64b52e3fa1c5a14e7f7c59b13fcd2407a1a0f8c50cf6cb90fb8a66e52c0b1f31d25c7496d508ab8a698d6aa2e8f0bc8886c0a0ab9f17ea11f802b8c0b54b97fbeaf909b306ea714251ed72259c76ec2c1c23c3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cf0d8203e880a03e2e3734dcc95114bb8468690d1018cf978df30cc467eb93b644ba03a23fc1b4885ef53249fd7439c0f90132f9012f8001840e777b6894095e7baea6a6c7c4c2dfeb977efac326af552d878407320a71b8c97f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe44407f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff091ca0b89a69e861780bd83a4d14b6dfa0294f2945220214cca328d94ce22a9df89179a0268c5364af870eebf909559785c9fcbf57ea5874c7b6a4772e633d9c8044f2d7c0",
+                "rlp" : "0xf90335f901fca0a4022e3af0e187d8d2aa5856a0365ca8398c68d4aade0bf53c34925972c080bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ecf9f984e5bb3cd813c8fe1d97148d64b52e3fa1c5a14e7f7c59b13fcd2407a1a0f8c50cf6cb90fb8a66e52c0b1f31d25c7496d508ab8a698d6aa2e8f0bc8886c0a0ab9f17ea11f802b8c0b54b97fbeaf909b306ea714251ed72259c76ec2c1c23c3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cf0d8203e880a0c9ecdeafd24daafba67de4af9e23f0ed3451fd6269c62d52731c24a259275e8d88add05c404bffaf82f90132f9012f8001840e777b6894095e7baea6a6c7c4c2dfeb977efac326af552d878407320a71b8c97f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe44407f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff091ca0b89a69e861780bd83a4d14b6dfa0294f2945220214cca328d94ce22a9df89179a0268c5364af870eebf909559785c9fcbf57ea5874c7b6a4772e633d9c8044f2d7c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe44407f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff09",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09d7cb576206d3880ecf7c922ac2f3e63f902cc5249648bab4b65f35e77952f4fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x86d75e47108fac5c2db2bca9512bbba7861c80f2bab44dc1fac8c218bf75b2b7",
+        "lastblockhash" : "0x0ff9b539d343689342e48254c3f9ddbaa0a7df17d1f6320ea739657b3ebce7c0",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest262BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest262BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest262BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xcf0d",
-                    "hash" : "0x3e1a5338e6f88298868e0dfebe85e780bd84f5b0f195e4e7d97f915d13bb437a",
-                    "mixHash" : "0x2ebafd9b9af6d718b62bf4c1cf35208adac542a0d524be8ac44ec3df7447d482",
-                    "nonce" : "0x620e7c5f909165f4",
+                    "hash" : "0x4b6d725a2e3025cd61d440653422ddb761e1c50ac294e6e4d053d507ff6afa8a",
+                    "mixHash" : "0x4ccb7200e43e26a082aadd0926d526d0acd67a9b323d1cee7a92a1eacdc88ac0",
+                    "nonce" : "0x3fe32cd6e9d64a84",
                     "number" : "0x01",
                     "parentHash" : "0xa4022e3af0e187d8d2aa5856a0365ca8398c68d4aade0bf53c34925972c080bb",
                     "receiptTrie" : "0xab9f17ea11f802b8c0b54b97fbeaf909b306ea714251ed72259c76ec2c1c23c3",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xf8c50cf6cb90fb8a66e52c0b1f31d25c7496d508ab8a698d6aa2e8f0bc8886c0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90335f901fca0a4022e3af0e187d8d2aa5856a0365ca8398c68d4aade0bf53c34925972c080bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ecf9f984e5bb3cd813c8fe1d97148d64b52e3fa1c5a14e7f7c59b13fcd2407a1a0f8c50cf6cb90fb8a66e52c0b1f31d25c7496d508ab8a698d6aa2e8f0bc8886c0a0ab9f17ea11f802b8c0b54b97fbeaf909b306ea714251ed72259c76ec2c1c23c3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cf0d8203e880a02ebafd9b9af6d718b62bf4c1cf35208adac542a0d524be8ac44ec3df7447d48288620e7c5f909165f4f90132f9012f8001840e777b6894095e7baea6a6c7c4c2dfeb977efac326af552d878407320a71b8c97f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe44407f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff091ca0b89a69e861780bd83a4d14b6dfa0294f2945220214cca328d94ce22a9df89179a0268c5364af870eebf909559785c9fcbf57ea5874c7b6a4772e633d9c8044f2d7c0",
+                "rlp" : "0xf90335f901fca0a4022e3af0e187d8d2aa5856a0365ca8398c68d4aade0bf53c34925972c080bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ecf9f984e5bb3cd813c8fe1d97148d64b52e3fa1c5a14e7f7c59b13fcd2407a1a0f8c50cf6cb90fb8a66e52c0b1f31d25c7496d508ab8a698d6aa2e8f0bc8886c0a0ab9f17ea11f802b8c0b54b97fbeaf909b306ea714251ed72259c76ec2c1c23c3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cf0d8203e880a04ccb7200e43e26a082aadd0926d526d0acd67a9b323d1cee7a92a1eacdc88ac0883fe32cd6e9d64a84f90132f9012f8001840e777b6894095e7baea6a6c7c4c2dfeb977efac326af552d878407320a71b8c97f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe44407f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff091ca0b89a69e861780bd83a4d14b6dfa0294f2945220214cca328d94ce22a9df89179a0268c5364af870eebf909559785c9fcbf57ea5874c7b6a4772e633d9c8044f2d7c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe44407f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff09",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09d7cb576206d3880ecf7c922ac2f3e63f902cc5249648bab4b65f35e77952f4fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3e1a5338e6f88298868e0dfebe85e780bd84f5b0f195e4e7d97f915d13bb437a",
+        "lastblockhash" : "0x4b6d725a2e3025cd61d440653422ddb761e1c50ac294e6e4d053d507ff6afa8a",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest262BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest262BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest262BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xcf0d",
-                    "hash" : "0xacc8436abfdcec04ea8519fc016871b7bc3a15fee8a5974ceea732126bf812c4",
-                    "mixHash" : "0x054585744e4872a9308bba9ce9defc811cb24713ff4c5e451d120b59c12a6334",
-                    "nonce" : "0x57c2426bf081f055",
+                    "hash" : "0x72fa76b4fa98492c792299bad9e1ba175cd4aa7b2394a21228cd3dc8c16f3288",
+                    "mixHash" : "0x6a8205cfa64a9e9b540840bc57fda75af11f53b62ce45f53a4e1036fea71fb62",
+                    "nonce" : "0xd0652ab12f0999e8",
                     "number" : "0x01",
                     "parentHash" : "0xa4022e3af0e187d8d2aa5856a0365ca8398c68d4aade0bf53c34925972c080bb",
                     "receiptTrie" : "0xab9f17ea11f802b8c0b54b97fbeaf909b306ea714251ed72259c76ec2c1c23c3",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xf8c50cf6cb90fb8a66e52c0b1f31d25c7496d508ab8a698d6aa2e8f0bc8886c0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90335f901fca0a4022e3af0e187d8d2aa5856a0365ca8398c68d4aade0bf53c34925972c080bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ecf9f984e5bb3cd813c8fe1d97148d64b52e3fa1c5a14e7f7c59b13fcd2407a1a0f8c50cf6cb90fb8a66e52c0b1f31d25c7496d508ab8a698d6aa2e8f0bc8886c0a0ab9f17ea11f802b8c0b54b97fbeaf909b306ea714251ed72259c76ec2c1c23c3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cf0d8203e880a0054585744e4872a9308bba9ce9defc811cb24713ff4c5e451d120b59c12a63348857c2426bf081f055f90132f9012f8001840e777b6894095e7baea6a6c7c4c2dfeb977efac326af552d878407320a71b8c97f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe44407f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff091ca0b89a69e861780bd83a4d14b6dfa0294f2945220214cca328d94ce22a9df89179a0268c5364af870eebf909559785c9fcbf57ea5874c7b6a4772e633d9c8044f2d7c0",
+                "rlp" : "0xf90335f901fca0a4022e3af0e187d8d2aa5856a0365ca8398c68d4aade0bf53c34925972c080bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ecf9f984e5bb3cd813c8fe1d97148d64b52e3fa1c5a14e7f7c59b13fcd2407a1a0f8c50cf6cb90fb8a66e52c0b1f31d25c7496d508ab8a698d6aa2e8f0bc8886c0a0ab9f17ea11f802b8c0b54b97fbeaf909b306ea714251ed72259c76ec2c1c23c3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cf0d8203e880a06a8205cfa64a9e9b540840bc57fda75af11f53b62ce45f53a4e1036fea71fb6288d0652ab12f0999e8f90132f9012f8001840e777b6894095e7baea6a6c7c4c2dfeb977efac326af552d878407320a71b8c97f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe44407f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff091ca0b89a69e861780bd83a4d14b6dfa0294f2945220214cca328d94ce22a9df89179a0268c5364af870eebf909559785c9fcbf57ea5874c7b6a4772e633d9c8044f2d7c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe44407f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff09",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09d7cb576206d3880ecf7c922ac2f3e63f902cc5249648bab4b65f35e77952f4fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xacc8436abfdcec04ea8519fc016871b7bc3a15fee8a5974ceea732126bf812c4",
+        "lastblockhash" : "0x72fa76b4fa98492c792299bad9e1ba175cd4aa7b2394a21228cd3dc8c16f3288",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest262BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest262BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest262BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xcf0d",
-                    "hash" : "0xb13fa0a9b4a56447314891fae836b32479fb47e9b851b3afe0cd5477085529f6",
-                    "mixHash" : "0x7d976bd538d3b864268e080ad7c9a69b276a9915ad65236f801d672094d7507c",
-                    "nonce" : "0xba8981397c1bde42",
+                    "hash" : "0x9b079851190198b42f98e7fd81e34b28ddf6b87e5a1658da472e46a16c3d5369",
+                    "mixHash" : "0x4bd7669a8fc72de4d811052b1e339935b7cd0abff41fe36cbdc964fccf762592",
+                    "nonce" : "0xa5fd97c733968629",
                     "number" : "0x01",
                     "parentHash" : "0xa4022e3af0e187d8d2aa5856a0365ca8398c68d4aade0bf53c34925972c080bb",
                     "receiptTrie" : "0xab9f17ea11f802b8c0b54b97fbeaf909b306ea714251ed72259c76ec2c1c23c3",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xf8c50cf6cb90fb8a66e52c0b1f31d25c7496d508ab8a698d6aa2e8f0bc8886c0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90335f901fca0a4022e3af0e187d8d2aa5856a0365ca8398c68d4aade0bf53c34925972c080bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ecf9f984e5bb3cd813c8fe1d97148d64b52e3fa1c5a14e7f7c59b13fcd2407a1a0f8c50cf6cb90fb8a66e52c0b1f31d25c7496d508ab8a698d6aa2e8f0bc8886c0a0ab9f17ea11f802b8c0b54b97fbeaf909b306ea714251ed72259c76ec2c1c23c3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cf0d8203e880a07d976bd538d3b864268e080ad7c9a69b276a9915ad65236f801d672094d7507c88ba8981397c1bde42f90132f9012f8001840e777b6894095e7baea6a6c7c4c2dfeb977efac326af552d878407320a71b8c97f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe44407f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff091ca0b89a69e861780bd83a4d14b6dfa0294f2945220214cca328d94ce22a9df89179a0268c5364af870eebf909559785c9fcbf57ea5874c7b6a4772e633d9c8044f2d7c0",
+                "rlp" : "0xf90335f901fca0a4022e3af0e187d8d2aa5856a0365ca8398c68d4aade0bf53c34925972c080bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ecf9f984e5bb3cd813c8fe1d97148d64b52e3fa1c5a14e7f7c59b13fcd2407a1a0f8c50cf6cb90fb8a66e52c0b1f31d25c7496d508ab8a698d6aa2e8f0bc8886c0a0ab9f17ea11f802b8c0b54b97fbeaf909b306ea714251ed72259c76ec2c1c23c3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cf0d8203e880a04bd7669a8fc72de4d811052b1e339935b7cd0abff41fe36cbdc964fccf76259288a5fd97c733968629f90132f9012f8001840e777b6894095e7baea6a6c7c4c2dfeb977efac326af552d878407320a71b8c97f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe44407f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff091ca0b89a69e861780bd83a4d14b6dfa0294f2945220214cca328d94ce22a9df89179a0268c5364af870eebf909559785c9fcbf57ea5874c7b6a4772e633d9c8044f2d7c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe44407f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff09",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09d7cb576206d3880ecf7c922ac2f3e63f902cc5249648bab4b65f35e77952f4fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb13fa0a9b4a56447314891fae836b32479fb47e9b851b3afe0cd5477085529f6",
+        "lastblockhash" : "0x9b079851190198b42f98e7fd81e34b28ddf6b87e5a1658da472e46a16c3d5369",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest272BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest272BC.json
index f565f00da..7606e8909 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest272BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest272BC.json
@@ -2,8 +2,8 @@
     "randomStatetest272BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest272BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest272BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa21e",
-                    "hash" : "0x4d1fcb320ac22ad1a9a2efad1081608f17274b98596b9d571840b56adffe0947",
-                    "mixHash" : "0x6366e740eaefae696bbc98cbbefb3de3e9cb49e98852515d82035b3632ec5f28",
-                    "nonce" : "0xe6f887255ebbb698",
+                    "hash" : "0xf79c2e6919d5837384862d91821d5a4317f10a2dc324b019171b69e81454cdce",
+                    "mixHash" : "0x938b09624b780bfa65b894ff12b11abd311697cf2a4bc7091d50d36eaeafa456",
+                    "nonce" : "0x800ae4c837dc66bf",
                     "number" : "0x01",
                     "parentHash" : "0x2515a928b00fe950dc18f2ef6a8e33a9666b094c68b7b9767121bf868b5c8aec",
                     "receiptTrie" : "0x0a856964c0231fd244b5839cd9cac232ee57dbf5254664eb88381117a032965d",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca02515a928b00fe950dc18f2ef6a8e33a9666b094c68b7b9767121bf868b5c8aeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00a65e29cbf5fe9f37c2891255d88db19a433f6da435d00d0c34740379db14014a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa00a856964c0231fd244b5839cd9cac232ee57dbf5254664eb88381117a032965db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a21e8203e880a06366e740eaefae696bbc98cbbefb3de3e9cb49e98852515d82035b3632ec5f2888e6f887255ebbb698f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca02515a928b00fe950dc18f2ef6a8e33a9666b094c68b7b9767121bf868b5c8aeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00a65e29cbf5fe9f37c2891255d88db19a433f6da435d00d0c34740379db14014a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa00a856964c0231fd244b5839cd9cac232ee57dbf5254664eb88381117a032965db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a21e8203e880a0938b09624b780bfa65b894ff12b11abd311697cf2a4bc7091d50d36eaeafa45688800ae4c837dc66bff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ef0244a4936b28be0cf3cf40c732be21e81b8f78d063b5f11faf5a35ff20cae8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4d1fcb320ac22ad1a9a2efad1081608f17274b98596b9d571840b56adffe0947",
+        "lastblockhash" : "0xf79c2e6919d5837384862d91821d5a4317f10a2dc324b019171b69e81454cdce",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest272BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest272BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest272BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa52a",
-                    "hash" : "0x1c2eaff42bd360a1d1ced78c8aba41cbda4e428c97aaea10c33f6d4f3b76d099",
-                    "mixHash" : "0x21cb5ee559e49fb02d22891387b99697d60eb906c4abc2950adfcc8668dcc2ae",
-                    "nonce" : "0x836619f55cf36903",
+                    "hash" : "0x4e3a207f7eab89afe24040799a743f0d12f39e13ed4fa0af02728e31cdd31e40",
+                    "mixHash" : "0x22101c3f585712a07985dac3dc3a4d09e7f917a5a681e2956f912d090119bed3",
+                    "nonce" : "0x200800eb47cf750b",
                     "number" : "0x01",
                     "parentHash" : "0x2515a928b00fe950dc18f2ef6a8e33a9666b094c68b7b9767121bf868b5c8aec",
                     "receiptTrie" : "0x3a932e30db6c53ccd93717e5aecadec06b4ba45981fb0d697df1c7ba766480b5",
-                    "stateRoot" : "0x89020ab66559b4f14aa289e5b03ef2794f516557ec24ec4def4bbb6f34cafd2c",
+                    "stateRoot" : "0x5ee8d8cc98e4f7d760cd2da8f5bacb20087056556bb201895dd5dd68922396c2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca02515a928b00fe950dc18f2ef6a8e33a9666b094c68b7b9767121bf868b5c8aeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a089020ab66559b4f14aa289e5b03ef2794f516557ec24ec4def4bbb6f34cafd2ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa03a932e30db6c53ccd93717e5aecadec06b4ba45981fb0d697df1c7ba766480b5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a52a8203e880a021cb5ee559e49fb02d22891387b99697d60eb906c4abc2950adfcc8668dcc2ae88836619f55cf36903f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca02515a928b00fe950dc18f2ef6a8e33a9666b094c68b7b9767121bf868b5c8aeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05ee8d8cc98e4f7d760cd2da8f5bacb20087056556bb201895dd5dd68922396c2a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa03a932e30db6c53ccd93717e5aecadec06b4ba45981fb0d697df1c7ba766480b5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a52a8203e880a022101c3f585712a07985dac3dc3a4d09e7f917a5a681e2956f912d090119bed388200800eb47cf750bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ef0244a4936b28be0cf3cf40c732be21e81b8f78d063b5f11faf5a35ff20cae8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1c2eaff42bd360a1d1ced78c8aba41cbda4e428c97aaea10c33f6d4f3b76d099",
+        "lastblockhash" : "0x4e3a207f7eab89afe24040799a743f0d12f39e13ed4fa0af02728e31cdd31e40",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x42424042434445413155",
@@ -235,8 +228,8 @@
     "randomStatetest272BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest272BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest272BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa21e",
-                    "hash" : "0x9a329639b3af38d0ca992d0b2cb9084f7cf71bead9dd8de2dc0aebda3e6c40bb",
-                    "mixHash" : "0x4129fe1b33b7b0fb78e48cd5b39c8cc1f0c2b342776ff5ee7c73bb15ab69830c",
-                    "nonce" : "0x0c51f291aefcccb0",
+                    "hash" : "0xfae70ec0527b270e87443157fd46bc0b93c172e03806ed545410f489aa7013e4",
+                    "mixHash" : "0x1c45e13202e028e4042b6d87ccf69fbf05c293b20a91627dbc33c437c2686d9e",
+                    "nonce" : "0x6ba4521fc1cc80ee",
                     "number" : "0x01",
                     "parentHash" : "0x2515a928b00fe950dc18f2ef6a8e33a9666b094c68b7b9767121bf868b5c8aec",
                     "receiptTrie" : "0x650748d4c250a9abc5fb19544ee5c86fb56e359f359d17243d2a300b3ddec70a",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca02515a928b00fe950dc18f2ef6a8e33a9666b094c68b7b9767121bf868b5c8aeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0019989f0d06bde1a5e8cc60ad8e3e41c3545d77e4018a2f8c639a9aeff9d2b41a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0650748d4c250a9abc5fb19544ee5c86fb56e359f359d17243d2a300b3ddec70ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a21e8203e880a04129fe1b33b7b0fb78e48cd5b39c8cc1f0c2b342776ff5ee7c73bb15ab69830c880c51f291aefcccb0f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca02515a928b00fe950dc18f2ef6a8e33a9666b094c68b7b9767121bf868b5c8aeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0019989f0d06bde1a5e8cc60ad8e3e41c3545d77e4018a2f8c639a9aeff9d2b41a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0650748d4c250a9abc5fb19544ee5c86fb56e359f359d17243d2a300b3ddec70ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a21e8203e880a01c45e13202e028e4042b6d87ccf69fbf05c293b20a91627dbc33c437c2686d9e886ba4521fc1cc80eef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ef0244a4936b28be0cf3cf40c732be21e81b8f78d063b5f11faf5a35ff20cae8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9a329639b3af38d0ca992d0b2cb9084f7cf71bead9dd8de2dc0aebda3e6c40bb",
+        "lastblockhash" : "0xfae70ec0527b270e87443157fd46bc0b93c172e03806ed545410f489aa7013e4",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest272BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest272BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest272BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa21e",
-                    "hash" : "0x1c3ce311b44eaf16ff851883e4713545532fb10598aa469b132ae368bb4c2a5b",
-                    "mixHash" : "0x874b5f46d3d99a10987320387343efa69c7ddcdebf77f07f8f670da25bc44f5b",
-                    "nonce" : "0xd049ca36cd3b717a",
+                    "hash" : "0xfa7ef03c335eaac9052e84e46b816ca491d0fa8833a8869a1afb0d3e349084fb",
+                    "mixHash" : "0x9dc22dcd0f38060c1d7af75a1cfe424b9864a55a7b95b3bea690ad31e2d1d441",
+                    "nonce" : "0xbdaee2cf7ce5727c",
                     "number" : "0x01",
                     "parentHash" : "0x2515a928b00fe950dc18f2ef6a8e33a9666b094c68b7b9767121bf868b5c8aec",
                     "receiptTrie" : "0x650748d4c250a9abc5fb19544ee5c86fb56e359f359d17243d2a300b3ddec70a",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca02515a928b00fe950dc18f2ef6a8e33a9666b094c68b7b9767121bf868b5c8aeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0019989f0d06bde1a5e8cc60ad8e3e41c3545d77e4018a2f8c639a9aeff9d2b41a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0650748d4c250a9abc5fb19544ee5c86fb56e359f359d17243d2a300b3ddec70ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a21e8203e880a0874b5f46d3d99a10987320387343efa69c7ddcdebf77f07f8f670da25bc44f5b88d049ca36cd3b717af865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca02515a928b00fe950dc18f2ef6a8e33a9666b094c68b7b9767121bf868b5c8aeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0019989f0d06bde1a5e8cc60ad8e3e41c3545d77e4018a2f8c639a9aeff9d2b41a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0650748d4c250a9abc5fb19544ee5c86fb56e359f359d17243d2a300b3ddec70ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a21e8203e880a09dc22dcd0f38060c1d7af75a1cfe424b9864a55a7b95b3bea690ad31e2d1d44188bdaee2cf7ce5727cf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ef0244a4936b28be0cf3cf40c732be21e81b8f78d063b5f11faf5a35ff20cae8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1c3ce311b44eaf16ff851883e4713545532fb10598aa469b132ae368bb4c2a5b",
+        "lastblockhash" : "0xfa7ef03c335eaac9052e84e46b816ca491d0fa8833a8869a1afb0d3e349084fb",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest272BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest272BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest272BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa0a2",
-                    "hash" : "0x0ea32536ec0e02320a50bf4b02845f74db59412fec571e1b6d38df3514deb4ac",
-                    "mixHash" : "0x93885effcad67a2d36e3623e20f38e251491072c3e263bb0acaeba2e8b8f2dc3",
-                    "nonce" : "0xb9a5d5ef246fc834",
+                    "hash" : "0xb827f2949f18a80dc83fea64ea034d258ee16c6c4181f455c940b57964ef1b0e",
+                    "mixHash" : "0x944799dbea1a6050de0047c9824caec926ad083c79aa9c7541e0c8734ea92243",
+                    "nonce" : "0xe1894f9d5e07662b",
                     "number" : "0x01",
                     "parentHash" : "0x2515a928b00fe950dc18f2ef6a8e33a9666b094c68b7b9767121bf868b5c8aec",
                     "receiptTrie" : "0xf841d180875ba36eeb7ac0ce9e502ee08ecac3ba213d908c5520ab56f86c98a9",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca02515a928b00fe950dc18f2ef6a8e33a9666b094c68b7b9767121bf868b5c8aeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fc4be04eb5cd30efff2672834b5c006ad4975422899cdb0128d734c649fa152ba0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f841d180875ba36eeb7ac0ce9e502ee08ecac3ba213d908c5520ab56f86c98a9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a28203e880a093885effcad67a2d36e3623e20f38e251491072c3e263bb0acaeba2e8b8f2dc388b9a5d5ef246fc834f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca02515a928b00fe950dc18f2ef6a8e33a9666b094c68b7b9767121bf868b5c8aeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fc4be04eb5cd30efff2672834b5c006ad4975422899cdb0128d734c649fa152ba0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f841d180875ba36eeb7ac0ce9e502ee08ecac3ba213d908c5520ab56f86c98a9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a28203e880a0944799dbea1a6050de0047c9824caec926ad083c79aa9c7541e0c8734ea9224388e1894f9d5e07662bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ef0244a4936b28be0cf3cf40c732be21e81b8f78d063b5f11faf5a35ff20cae8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0ea32536ec0e02320a50bf4b02845f74db59412fec571e1b6d38df3514deb4ac",
+        "lastblockhash" : "0xb827f2949f18a80dc83fea64ea034d258ee16c6c4181f455c940b57964ef1b0e",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest272BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest272BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest272BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa0a2",
-                    "hash" : "0x192645afed956cce1e1cbbe179f1e1f81c951ae9fdf94e6c4a8196b64c185600",
-                    "mixHash" : "0x3220dd2457d273a70981039d772e8531dd4c8361cbfd8ba542aa5349c443c444",
-                    "nonce" : "0x651ecd2c2252fcff",
+                    "hash" : "0x66b899a49d5b5011937718cbe538d502e632ab407cea2958a6be4b0de59bdee2",
+                    "mixHash" : "0xfab8c89a5bfaac205f2d69736a2e4e3e270abd883cb9d24f5aef4228b29d1142",
+                    "nonce" : "0xaddacdf902ceae67",
                     "number" : "0x01",
                     "parentHash" : "0x2515a928b00fe950dc18f2ef6a8e33a9666b094c68b7b9767121bf868b5c8aec",
                     "receiptTrie" : "0xf841d180875ba36eeb7ac0ce9e502ee08ecac3ba213d908c5520ab56f86c98a9",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca02515a928b00fe950dc18f2ef6a8e33a9666b094c68b7b9767121bf868b5c8aeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fc4be04eb5cd30efff2672834b5c006ad4975422899cdb0128d734c649fa152ba0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f841d180875ba36eeb7ac0ce9e502ee08ecac3ba213d908c5520ab56f86c98a9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a28203e880a03220dd2457d273a70981039d772e8531dd4c8361cbfd8ba542aa5349c443c44488651ecd2c2252fcfff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca02515a928b00fe950dc18f2ef6a8e33a9666b094c68b7b9767121bf868b5c8aeca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fc4be04eb5cd30efff2672834b5c006ad4975422899cdb0128d734c649fa152ba0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f841d180875ba36eeb7ac0ce9e502ee08ecac3ba213d908c5520ab56f86c98a9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a28203e880a0fab8c89a5bfaac205f2d69736a2e4e3e270abd883cb9d24f5aef4228b29d114288addacdf902ceae67f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ef0244a4936b28be0cf3cf40c732be21e81b8f78d063b5f11faf5a35ff20cae8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x192645afed956cce1e1cbbe179f1e1f81c951ae9fdf94e6c4a8196b64c185600",
+        "lastblockhash" : "0x66b899a49d5b5011937718cbe538d502e632ab407cea2958a6be4b0de59bdee2",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest277BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest277BC.json
index aa6a3620e..a5c361b5a 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest277BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest277BC.json
@@ -2,8 +2,8 @@
     "randomStatetest277BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest277BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest277BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x526c",
-                    "hash" : "0xa7ce365da9a01f923be1eb6d076ae3a813c1f25f5fcc96f9d4b589675dd75307",
-                    "mixHash" : "0x8f41e088d2c271f70910be1fbe9dcc5d3913b6f6427b309f5735facafaa9fa9d",
-                    "nonce" : "0x723e81e68d5aefdc",
+                    "hash" : "0xe90b81228e70b340b94490359b8a15ffdcd1932a01dbf210f37d5d01708504d8",
+                    "mixHash" : "0x53936fe20b3472d0a6b52fbfa1b5cffb12121d009ab99ada433696606ba5c332",
+                    "nonce" : "0xfc52d9b38da079eb",
                     "number" : "0x01",
                     "parentHash" : "0x49a1c56f118f028126157d1eea1f42fcd6e2de71893d288d380be7ba41f4caa5",
                     "receiptTrie" : "0x8a16e1a639a26aaca56077d89c42731839bcc4fbfbb4f7d73262b5569482ca8e",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca049a1c56f118f028126157d1eea1f42fcd6e2de71893d288d380be7ba41f4caa5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0465e1348bdbec559a64a32f62dbd2bcf4ec0a44a1a68eade6ca17810bb2c6be4a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa08a16e1a639a26aaca56077d89c42731839bcc4fbfbb4f7d73262b5569482ca8eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82526c8203e880a08f41e088d2c271f70910be1fbe9dcc5d3913b6f6427b309f5735facafaa9fa9d88723e81e68d5aefdcf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca049a1c56f118f028126157d1eea1f42fcd6e2de71893d288d380be7ba41f4caa5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0465e1348bdbec559a64a32f62dbd2bcf4ec0a44a1a68eade6ca17810bb2c6be4a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa08a16e1a639a26aaca56077d89c42731839bcc4fbfbb4f7d73262b5569482ca8eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82526c8203e880a053936fe20b3472d0a6b52fbfa1b5cffb12121d009ab99ada433696606ba5c33288fc52d9b38da079ebf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03ee3e9c7eb7223879a83abb538b59cc9d2425a98399cbfdd4f40e96f92520c4ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa7ce365da9a01f923be1eb6d076ae3a813c1f25f5fcc96f9d4b589675dd75307",
+        "lastblockhash" : "0xe90b81228e70b340b94490359b8a15ffdcd1932a01dbf210f37d5d01708504d8",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest277BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest277BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest277BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5578",
-                    "hash" : "0xe924fa7ada1747e58573ceeb0f15d1b0cbd1d238763c1ba8913535970d6d1ad5",
-                    "mixHash" : "0xf0a5e0b7e75b1d324231979d797d777f2108903ebe45a7111c23619f795f9d61",
-                    "nonce" : "0x438199e8dfb2a508",
+                    "hash" : "0x8a14010c93cbd5f1301ac0ece2420d268e082a5b831e0f5fe14baa35f7043c98",
+                    "mixHash" : "0x6dbcf0a301d2aa5afaba61f77f1f5ac4b3a668d94b11692f0a197b6a72bd34a0",
+                    "nonce" : "0xc933201a5a28da60",
                     "number" : "0x01",
                     "parentHash" : "0x49a1c56f118f028126157d1eea1f42fcd6e2de71893d288d380be7ba41f4caa5",
                     "receiptTrie" : "0x9710842394f52351fec3b0cef4b7b2d2ceb4d64da266b13e23c2a7b4531fb043",
-                    "stateRoot" : "0x8819ffaa0f27ebcad598677d3e1042bd672509becc5647c533a20c96a37a09d6",
+                    "stateRoot" : "0x1d64209c0783c050a97da8a67cbc8d831636cf3359f2beb5707b26a1c0b09f44",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca049a1c56f118f028126157d1eea1f42fcd6e2de71893d288d380be7ba41f4caa5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08819ffaa0f27ebcad598677d3e1042bd672509becc5647c533a20c96a37a09d6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa09710842394f52351fec3b0cef4b7b2d2ceb4d64da266b13e23c2a7b4531fb043b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8255788203e880a0f0a5e0b7e75b1d324231979d797d777f2108903ebe45a7111c23619f795f9d6188438199e8dfb2a508f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca049a1c56f118f028126157d1eea1f42fcd6e2de71893d288d380be7ba41f4caa5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01d64209c0783c050a97da8a67cbc8d831636cf3359f2beb5707b26a1c0b09f44a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa09710842394f52351fec3b0cef4b7b2d2ceb4d64da266b13e23c2a7b4531fb043b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8255788203e880a06dbcf0a301d2aa5afaba61f77f1f5ac4b3a668d94b11692f0a197b6a72bd34a088c933201a5a28da60f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03ee3e9c7eb7223879a83abb538b59cc9d2425a98399cbfdd4f40e96f92520c4ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe924fa7ada1747e58573ceeb0f15d1b0cbd1d238763c1ba8913535970d6d1ad5",
+        "lastblockhash" : "0x8a14010c93cbd5f1301ac0ece2420d268e082a5b831e0f5fe14baa35f7043c98",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x41434243414041",
@@ -233,8 +226,8 @@
     "randomStatetest277BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest277BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest277BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x526c",
-                    "hash" : "0x7818937f58876c8ad38af35f6fbfae9ae088eff31d54834bc81ce7fc517990c9",
-                    "mixHash" : "0xf631fdba6ed913c8b0d210416ceb7aebe94c2faef73fdc0cd608b73581a7b372",
-                    "nonce" : "0xcdcface7bbbf8cbf",
+                    "hash" : "0xaa3af388275783016efad437c8fe3c6f760ed84a12fd38c762ae78b59b971eb7",
+                    "mixHash" : "0xbf45127a0ee0fa83ebd0a32b43b880de5c32d0c7eb6a805f7a7241f094b838b7",
+                    "nonce" : "0xbec8e45f8290b121",
                     "number" : "0x01",
                     "parentHash" : "0x49a1c56f118f028126157d1eea1f42fcd6e2de71893d288d380be7ba41f4caa5",
                     "receiptTrie" : "0xfdc0f8815922f4e87d611b5007d7c62b26c8dd64ad15eb0885644721e72901d4",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca049a1c56f118f028126157d1eea1f42fcd6e2de71893d288d380be7ba41f4caa5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06afa8cf83eece0ae6bddaa57012995aea3aa741471ad11bb026528d776f07290a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0fdc0f8815922f4e87d611b5007d7c62b26c8dd64ad15eb0885644721e72901d4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82526c8203e880a0f631fdba6ed913c8b0d210416ceb7aebe94c2faef73fdc0cd608b73581a7b37288cdcface7bbbf8cbff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca049a1c56f118f028126157d1eea1f42fcd6e2de71893d288d380be7ba41f4caa5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06afa8cf83eece0ae6bddaa57012995aea3aa741471ad11bb026528d776f07290a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0fdc0f8815922f4e87d611b5007d7c62b26c8dd64ad15eb0885644721e72901d4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82526c8203e880a0bf45127a0ee0fa83ebd0a32b43b880de5c32d0c7eb6a805f7a7241f094b838b788bec8e45f8290b121f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03ee3e9c7eb7223879a83abb538b59cc9d2425a98399cbfdd4f40e96f92520c4ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7818937f58876c8ad38af35f6fbfae9ae088eff31d54834bc81ce7fc517990c9",
+        "lastblockhash" : "0xaa3af388275783016efad437c8fe3c6f760ed84a12fd38c762ae78b59b971eb7",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest277BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest277BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest277BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x526c",
-                    "hash" : "0x63c465be9c0a7874ec2b823707484ca0a27b6538ddbdbd55143f693c6a87ca48",
-                    "mixHash" : "0x4534859840a65eeab44269b0b0e9a49dd6f1603fab8c7684f78715d2a2bf602f",
-                    "nonce" : "0x8c4d28ec5a05053c",
+                    "hash" : "0x4d60e9b5ec2787464ec6df26252cae7c71534e52bae7833d69ce25e708a6cfc0",
+                    "mixHash" : "0x5cb04db1f5e9d38589e1b6310e528575c83ddc38c3a37bee00a6d330525ef7f8",
+                    "nonce" : "0x91c07a15f60e3616",
                     "number" : "0x01",
                     "parentHash" : "0x49a1c56f118f028126157d1eea1f42fcd6e2de71893d288d380be7ba41f4caa5",
                     "receiptTrie" : "0xfdc0f8815922f4e87d611b5007d7c62b26c8dd64ad15eb0885644721e72901d4",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca049a1c56f118f028126157d1eea1f42fcd6e2de71893d288d380be7ba41f4caa5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06afa8cf83eece0ae6bddaa57012995aea3aa741471ad11bb026528d776f07290a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0fdc0f8815922f4e87d611b5007d7c62b26c8dd64ad15eb0885644721e72901d4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82526c8203e880a04534859840a65eeab44269b0b0e9a49dd6f1603fab8c7684f78715d2a2bf602f888c4d28ec5a05053cf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca049a1c56f118f028126157d1eea1f42fcd6e2de71893d288d380be7ba41f4caa5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06afa8cf83eece0ae6bddaa57012995aea3aa741471ad11bb026528d776f07290a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0fdc0f8815922f4e87d611b5007d7c62b26c8dd64ad15eb0885644721e72901d4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82526c8203e880a05cb04db1f5e9d38589e1b6310e528575c83ddc38c3a37bee00a6d330525ef7f88891c07a15f60e3616f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03ee3e9c7eb7223879a83abb538b59cc9d2425a98399cbfdd4f40e96f92520c4ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x63c465be9c0a7874ec2b823707484ca0a27b6538ddbdbd55143f693c6a87ca48",
+        "lastblockhash" : "0x4d60e9b5ec2787464ec6df26252cae7c71534e52bae7833d69ce25e708a6cfc0",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest277BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest277BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest277BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x526c",
-                    "hash" : "0x73cca884db848efe7d6252047a705b7e998c592d2966b325159824d183f1cff2",
-                    "mixHash" : "0xadd0029215a9f3a20613933a71df33a261f8f7204c3f29205215d4a6129f0a29",
-                    "nonce" : "0xc879918e50ccdcc3",
+                    "hash" : "0x35e9b5607eb35524297f317267f95f54ac321741ffe87beeaf45c534bd99c23f",
+                    "mixHash" : "0x97c8feabbc36eff27a27a876cf9679368e84a1dd17a25afb2488b167d725c4e8",
+                    "nonce" : "0x31376a5971711e96",
                     "number" : "0x01",
                     "parentHash" : "0x49a1c56f118f028126157d1eea1f42fcd6e2de71893d288d380be7ba41f4caa5",
                     "receiptTrie" : "0xfdc0f8815922f4e87d611b5007d7c62b26c8dd64ad15eb0885644721e72901d4",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca049a1c56f118f028126157d1eea1f42fcd6e2de71893d288d380be7ba41f4caa5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06afa8cf83eece0ae6bddaa57012995aea3aa741471ad11bb026528d776f07290a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0fdc0f8815922f4e87d611b5007d7c62b26c8dd64ad15eb0885644721e72901d4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82526c8203e880a0add0029215a9f3a20613933a71df33a261f8f7204c3f29205215d4a6129f0a2988c879918e50ccdcc3f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca049a1c56f118f028126157d1eea1f42fcd6e2de71893d288d380be7ba41f4caa5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06afa8cf83eece0ae6bddaa57012995aea3aa741471ad11bb026528d776f07290a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0fdc0f8815922f4e87d611b5007d7c62b26c8dd64ad15eb0885644721e72901d4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82526c8203e880a097c8feabbc36eff27a27a876cf9679368e84a1dd17a25afb2488b167d725c4e88831376a5971711e96f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03ee3e9c7eb7223879a83abb538b59cc9d2425a98399cbfdd4f40e96f92520c4ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x73cca884db848efe7d6252047a705b7e998c592d2966b325159824d183f1cff2",
+        "lastblockhash" : "0x35e9b5607eb35524297f317267f95f54ac321741ffe87beeaf45c534bd99c23f",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest277BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest277BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest277BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x526c",
-                    "hash" : "0xe9363638f3b6ab25453086e87f2a0dcfc7007f8986d57b5f84615437db116892",
-                    "mixHash" : "0xe3d6b0aafbb7fe243230411b4e434c5cfe4115addfaea5617a12773e798f50e9",
-                    "nonce" : "0x085c05b0e2919406",
+                    "hash" : "0x0c9ac7dcfcabc669aecdb6279d95880cb95d8e1aa2659147e3f0171334e7fb59",
+                    "mixHash" : "0x5759852886f7fa4613e4d9784d81f08dfd61a73bbdd2f32aa63efa4152c9714a",
+                    "nonce" : "0x0d7d1aaf20a41c51",
                     "number" : "0x01",
                     "parentHash" : "0x49a1c56f118f028126157d1eea1f42fcd6e2de71893d288d380be7ba41f4caa5",
                     "receiptTrie" : "0xfdc0f8815922f4e87d611b5007d7c62b26c8dd64ad15eb0885644721e72901d4",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca049a1c56f118f028126157d1eea1f42fcd6e2de71893d288d380be7ba41f4caa5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06afa8cf83eece0ae6bddaa57012995aea3aa741471ad11bb026528d776f07290a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0fdc0f8815922f4e87d611b5007d7c62b26c8dd64ad15eb0885644721e72901d4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82526c8203e880a0e3d6b0aafbb7fe243230411b4e434c5cfe4115addfaea5617a12773e798f50e988085c05b0e2919406f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca049a1c56f118f028126157d1eea1f42fcd6e2de71893d288d380be7ba41f4caa5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06afa8cf83eece0ae6bddaa57012995aea3aa741471ad11bb026528d776f07290a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0fdc0f8815922f4e87d611b5007d7c62b26c8dd64ad15eb0885644721e72901d4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82526c8203e880a05759852886f7fa4613e4d9784d81f08dfd61a73bbdd2f32aa63efa4152c9714a880d7d1aaf20a41c51f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03ee3e9c7eb7223879a83abb538b59cc9d2425a98399cbfdd4f40e96f92520c4ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe9363638f3b6ab25453086e87f2a0dcfc7007f8986d57b5f84615437db116892",
+        "lastblockhash" : "0x0c9ac7dcfcabc669aecdb6279d95880cb95d8e1aa2659147e3f0171334e7fb59",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest284BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest284BC.json
index c7b34fc0d..8232b8bb2 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest284BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest284BC.json
@@ -2,8 +2,8 @@
     "randomStatetest284BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest284BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest284BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x7a7f",
-                    "hash" : "0xb554a4fbbfd338894471c07118360c498d44ec43a1cf83484a0ac4d9264c3292",
-                    "mixHash" : "0x7443266b756aa2c96588aa6bc90f5457f9e8f7ae8487a06e861564095f95b5ea",
-                    "nonce" : "0x5401e9b32fc1fcd2",
+                    "hash" : "0x6f7625a848e8683f2f3e2ff426498666756a0bc8586f842f3f4ff515df85d116",
+                    "mixHash" : "0xc2f97beade8274cd640dd2457385c287296b8c9fdffb0624e98accf32a08fb6b",
+                    "nonce" : "0x18edc617e0b4224a",
                     "number" : "0x01",
                     "parentHash" : "0x6ac925213090830fdf111cb39b116081ac588fab6d1360c51d2195048925d23c",
                     "receiptTrie" : "0xa5bf24ad39608c928ce035ebcad620767d93f769e80e4625006fb0bb0a0f0794",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xe895c4f04dfed31e5834d884e1be147a5c0b023c408284f657ea099199db3f96",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90340f901fca06ac925213090830fdf111cb39b116081ac588fab6d1360c51d2195048925d23ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f17f5a1edea69631446b30cdbafab266da0094f3acdb648ecfc32dee433578caa0e895c4f04dfed31e5834d884e1be147a5c0b023c408284f657ea099199db3f96a0a5bf24ad39608c928ce035ebcad620767d93f769e80e4625006fb0bb0a0f0794b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff827a7f8203e880a07443266b756aa2c96588aa6bc90f5457f9e8f7ae8487a06e861564095f95b5ea885401e9b32fc1fcd2f9013df9013a80018410730dc294095e7baea6a6c7c4c2dfeb977efac326af552d878452870be7b8d47f0000000000000000000000000000000000000000000000000000000000000000457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3b6f88a3615234423703758c1ba0ddb9498737fcc7f585580b888dc5dc71dce4b0c3fcc034b34ce2b0fb65803004a05e15e49ca6cbed628ef22e1e0a101c2a63ac3ebed3865746135efb1c58f95d09c0",
+                "rlp" : "0xf90340f901fca06ac925213090830fdf111cb39b116081ac588fab6d1360c51d2195048925d23ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f17f5a1edea69631446b30cdbafab266da0094f3acdb648ecfc32dee433578caa0e895c4f04dfed31e5834d884e1be147a5c0b023c408284f657ea099199db3f96a0a5bf24ad39608c928ce035ebcad620767d93f769e80e4625006fb0bb0a0f0794b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff827a7f8203e880a0c2f97beade8274cd640dd2457385c287296b8c9fdffb0624e98accf32a08fb6b8818edc617e0b4224af9013df9013a80018410730dc294095e7baea6a6c7c4c2dfeb977efac326af552d878452870be7b8d47f0000000000000000000000000000000000000000000000000000000000000000457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3b6f88a3615234423703758c1ba0ddb9498737fcc7f585580b888dc5dc71dce4b0c3fcc034b34ce2b0fb65803004a05e15e49ca6cbed628ef22e1e0a101c2a63ac3ebed3865746135efb1c58f95d09c0",
                 "transactions" : [
                     {
                         "data" : "0x7f0000000000000000000000000000000000000000000000000000000000000000457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3b6f88a3615234423703758c",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08e2c9c976ce2193d950c2911f238d6ac3564164002f7d650d70b4331829ca6a3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb554a4fbbfd338894471c07118360c498d44ec43a1cf83484a0ac4d9264c3292",
+        "lastblockhash" : "0x6f7625a848e8683f2f3e2ff426498666756a0bc8586f842f3f4ff515df85d116",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest284BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest284BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest284BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x7d8b",
-                    "hash" : "0xce05a1a478e978393cdc7ce4d73fd2517b2a14b291b672296aa71a506aad5e3a",
-                    "mixHash" : "0x20ecc0887eb2e60c2f773337f001bd899220011fa3ea17afbdcbf73e75cc6267",
-                    "nonce" : "0x878d220133d31a9d",
+                    "hash" : "0xbd83cd7e90f7aa888603b464647544ef56602b1074e456faafb30b43118a2319",
+                    "mixHash" : "0x0e141c1f36cc694dac74d69fc702e833fadc1b0facf943f44cd13c110ec08271",
+                    "nonce" : "0x84c6163643714982",
                     "number" : "0x01",
                     "parentHash" : "0x6ac925213090830fdf111cb39b116081ac588fab6d1360c51d2195048925d23c",
                     "receiptTrie" : "0xa8336cb99b27667e129d2dc77ec46d8a581629e87b6d4a97fbc0ec85843b835d",
-                    "stateRoot" : "0x81daecb00fb02f8511cf337944aaba967b012fd7e9747f639aee3504b458519e",
+                    "stateRoot" : "0x575f52c60bb3fc326baaf59d0d91bc6f7877e4e92b98b3243c9f893ead83f42c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe895c4f04dfed31e5834d884e1be147a5c0b023c408284f657ea099199db3f96",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90340f901fca06ac925213090830fdf111cb39b116081ac588fab6d1360c51d2195048925d23ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a081daecb00fb02f8511cf337944aaba967b012fd7e9747f639aee3504b458519ea0e895c4f04dfed31e5834d884e1be147a5c0b023c408284f657ea099199db3f96a0a8336cb99b27667e129d2dc77ec46d8a581629e87b6d4a97fbc0ec85843b835db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff827d8b8203e880a020ecc0887eb2e60c2f773337f001bd899220011fa3ea17afbdcbf73e75cc626788878d220133d31a9df9013df9013a80018410730dc294095e7baea6a6c7c4c2dfeb977efac326af552d878452870be7b8d47f0000000000000000000000000000000000000000000000000000000000000000457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3b6f88a3615234423703758c1ba0ddb9498737fcc7f585580b888dc5dc71dce4b0c3fcc034b34ce2b0fb65803004a05e15e49ca6cbed628ef22e1e0a101c2a63ac3ebed3865746135efb1c58f95d09c0",
+                "rlp" : "0xf90340f901fca06ac925213090830fdf111cb39b116081ac588fab6d1360c51d2195048925d23ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0575f52c60bb3fc326baaf59d0d91bc6f7877e4e92b98b3243c9f893ead83f42ca0e895c4f04dfed31e5834d884e1be147a5c0b023c408284f657ea099199db3f96a0a8336cb99b27667e129d2dc77ec46d8a581629e87b6d4a97fbc0ec85843b835db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff827d8b8203e880a00e141c1f36cc694dac74d69fc702e833fadc1b0facf943f44cd13c110ec082718884c6163643714982f9013df9013a80018410730dc294095e7baea6a6c7c4c2dfeb977efac326af552d878452870be7b8d47f0000000000000000000000000000000000000000000000000000000000000000457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3b6f88a3615234423703758c1ba0ddb9498737fcc7f585580b888dc5dc71dce4b0c3fcc034b34ce2b0fb65803004a05e15e49ca6cbed628ef22e1e0a101c2a63ac3ebed3865746135efb1c58f95d09c0",
                 "transactions" : [
                     {
                         "data" : "0x7f0000000000000000000000000000000000000000000000000000000000000000457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3b6f88a3615234423703758c",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08e2c9c976ce2193d950c2911f238d6ac3564164002f7d650d70b4331829ca6a3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xce05a1a478e978393cdc7ce4d73fd2517b2a14b291b672296aa71a506aad5e3a",
+        "lastblockhash" : "0xbd83cd7e90f7aa888603b464647544ef56602b1074e456faafb30b43118a2319",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x52870be7",
                 "code" : "0x7f0000000000000000000000000000000000000000000000000000000000000000457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3b6f88a3615234423703758c55",
@@ -233,8 +226,8 @@
     "randomStatetest284BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest284BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest284BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x7a7f",
-                    "hash" : "0x32d743a02f3391d64b48638d3f1734650d394b8f2cca129b0b18cbb6f35195fe",
-                    "mixHash" : "0xd938dabb46b016019e95f3c6a936d9d8a0d2c211f3d287d163faf594d66fb0d3",
-                    "nonce" : "0xb784e09a3c013944",
+                    "hash" : "0x16334c1ca541e5081a3907b982f8011d2cf83780e4fc1ab8096e1734997d32bc",
+                    "mixHash" : "0xfc83dc23d1cbe5b06f975e5f66ba40e5dbcb3fe1e6ea9cc1ad145c56236faa23",
+                    "nonce" : "0x3e51150312b76a64",
                     "number" : "0x01",
                     "parentHash" : "0x6ac925213090830fdf111cb39b116081ac588fab6d1360c51d2195048925d23c",
                     "receiptTrie" : "0xb5226d13ebef29c84dff5601a013c7a95efd2812e11b04d43c630bd7b4aa0363",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0xe895c4f04dfed31e5834d884e1be147a5c0b023c408284f657ea099199db3f96",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90340f901fca06ac925213090830fdf111cb39b116081ac588fab6d1360c51d2195048925d23ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0316f98189747218fbe5fd4f7c3da176174c6f6687a88c319575231b324bcc3cda0e895c4f04dfed31e5834d884e1be147a5c0b023c408284f657ea099199db3f96a0b5226d13ebef29c84dff5601a013c7a95efd2812e11b04d43c630bd7b4aa0363b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff827a7f8203e880a0d938dabb46b016019e95f3c6a936d9d8a0d2c211f3d287d163faf594d66fb0d388b784e09a3c013944f9013df9013a80018410730dc294095e7baea6a6c7c4c2dfeb977efac326af552d878452870be7b8d47f0000000000000000000000000000000000000000000000000000000000000000457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3b6f88a3615234423703758c1ba0ddb9498737fcc7f585580b888dc5dc71dce4b0c3fcc034b34ce2b0fb65803004a05e15e49ca6cbed628ef22e1e0a101c2a63ac3ebed3865746135efb1c58f95d09c0",
+                "rlp" : "0xf90340f901fca06ac925213090830fdf111cb39b116081ac588fab6d1360c51d2195048925d23ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0316f98189747218fbe5fd4f7c3da176174c6f6687a88c319575231b324bcc3cda0e895c4f04dfed31e5834d884e1be147a5c0b023c408284f657ea099199db3f96a0b5226d13ebef29c84dff5601a013c7a95efd2812e11b04d43c630bd7b4aa0363b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff827a7f8203e880a0fc83dc23d1cbe5b06f975e5f66ba40e5dbcb3fe1e6ea9cc1ad145c56236faa23883e51150312b76a64f9013df9013a80018410730dc294095e7baea6a6c7c4c2dfeb977efac326af552d878452870be7b8d47f0000000000000000000000000000000000000000000000000000000000000000457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3b6f88a3615234423703758c1ba0ddb9498737fcc7f585580b888dc5dc71dce4b0c3fcc034b34ce2b0fb65803004a05e15e49ca6cbed628ef22e1e0a101c2a63ac3ebed3865746135efb1c58f95d09c0",
                 "transactions" : [
                     {
                         "data" : "0x7f0000000000000000000000000000000000000000000000000000000000000000457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3b6f88a3615234423703758c",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08e2c9c976ce2193d950c2911f238d6ac3564164002f7d650d70b4331829ca6a3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x32d743a02f3391d64b48638d3f1734650d394b8f2cca129b0b18cbb6f35195fe",
+        "lastblockhash" : "0x16334c1ca541e5081a3907b982f8011d2cf83780e4fc1ab8096e1734997d32bc",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest284BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest284BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest284BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x7a7f",
-                    "hash" : "0xbe61129720bf7a78d2302765a823928fc1ac97dd6667443f5cc949ca410dab5e",
-                    "mixHash" : "0x84ab62bfea3de160dd1425c2c524c27265dd0fd65f797a32051ba6ef4e3bb477",
-                    "nonce" : "0x9d76d27e0e9040f4",
+                    "hash" : "0x5aff198f981370e2cd48365578c629147b3d60fc19718c5bceabb7609db99a0e",
+                    "mixHash" : "0xf6849b73d08b91a927909e90f55f785db78e5f0571ff45a07d984b327a1de776",
+                    "nonce" : "0x85110a34024c9c4a",
                     "number" : "0x01",
                     "parentHash" : "0x6ac925213090830fdf111cb39b116081ac588fab6d1360c51d2195048925d23c",
                     "receiptTrie" : "0xb5226d13ebef29c84dff5601a013c7a95efd2812e11b04d43c630bd7b4aa0363",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0xe895c4f04dfed31e5834d884e1be147a5c0b023c408284f657ea099199db3f96",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90340f901fca06ac925213090830fdf111cb39b116081ac588fab6d1360c51d2195048925d23ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0316f98189747218fbe5fd4f7c3da176174c6f6687a88c319575231b324bcc3cda0e895c4f04dfed31e5834d884e1be147a5c0b023c408284f657ea099199db3f96a0b5226d13ebef29c84dff5601a013c7a95efd2812e11b04d43c630bd7b4aa0363b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff827a7f8203e880a084ab62bfea3de160dd1425c2c524c27265dd0fd65f797a32051ba6ef4e3bb477889d76d27e0e9040f4f9013df9013a80018410730dc294095e7baea6a6c7c4c2dfeb977efac326af552d878452870be7b8d47f0000000000000000000000000000000000000000000000000000000000000000457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3b6f88a3615234423703758c1ba0ddb9498737fcc7f585580b888dc5dc71dce4b0c3fcc034b34ce2b0fb65803004a05e15e49ca6cbed628ef22e1e0a101c2a63ac3ebed3865746135efb1c58f95d09c0",
+                "rlp" : "0xf90340f901fca06ac925213090830fdf111cb39b116081ac588fab6d1360c51d2195048925d23ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0316f98189747218fbe5fd4f7c3da176174c6f6687a88c319575231b324bcc3cda0e895c4f04dfed31e5834d884e1be147a5c0b023c408284f657ea099199db3f96a0b5226d13ebef29c84dff5601a013c7a95efd2812e11b04d43c630bd7b4aa0363b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff827a7f8203e880a0f6849b73d08b91a927909e90f55f785db78e5f0571ff45a07d984b327a1de7768885110a34024c9c4af9013df9013a80018410730dc294095e7baea6a6c7c4c2dfeb977efac326af552d878452870be7b8d47f0000000000000000000000000000000000000000000000000000000000000000457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3b6f88a3615234423703758c1ba0ddb9498737fcc7f585580b888dc5dc71dce4b0c3fcc034b34ce2b0fb65803004a05e15e49ca6cbed628ef22e1e0a101c2a63ac3ebed3865746135efb1c58f95d09c0",
                 "transactions" : [
                     {
                         "data" : "0x7f0000000000000000000000000000000000000000000000000000000000000000457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3b6f88a3615234423703758c",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08e2c9c976ce2193d950c2911f238d6ac3564164002f7d650d70b4331829ca6a3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbe61129720bf7a78d2302765a823928fc1ac97dd6667443f5cc949ca410dab5e",
+        "lastblockhash" : "0x5aff198f981370e2cd48365578c629147b3d60fc19718c5bceabb7609db99a0e",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest284BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest284BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest284BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x77d7",
-                    "hash" : "0x9d980ce2bf6b2d0c789a20176209d448e3300bcd06e9482e67c887b6523149fb",
-                    "mixHash" : "0xdf7e993089c3c920694de52834be907ec4fb3d82208158df93c819999fbe412d",
-                    "nonce" : "0xc018333e600f8247",
+                    "hash" : "0x51c54b3ab6ca59d2a3ddf985ff4714e0d83826a4fd04b55c1cae51444ad55ca4",
+                    "mixHash" : "0xf593c483a82ba58fa419dee4d61db6391feacfe984cd5ed0c53638ae2b1f2693",
+                    "nonce" : "0x10c569cd8a6b5cfa",
                     "number" : "0x01",
                     "parentHash" : "0x6ac925213090830fdf111cb39b116081ac588fab6d1360c51d2195048925d23c",
                     "receiptTrie" : "0xaa5a39e77497a628fe5f613c395c3be0dda158685318bcdde0f71fa066f29446",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0xe895c4f04dfed31e5834d884e1be147a5c0b023c408284f657ea099199db3f96",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90340f901fca06ac925213090830fdf111cb39b116081ac588fab6d1360c51d2195048925d23ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ac0f99d06ac12eb3e43027bff3107fb4f71ccfbf8462aca4bc82cf112e720b17a0e895c4f04dfed31e5834d884e1be147a5c0b023c408284f657ea099199db3f96a0aa5a39e77497a628fe5f613c395c3be0dda158685318bcdde0f71fa066f29446b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8277d78203e880a0df7e993089c3c920694de52834be907ec4fb3d82208158df93c819999fbe412d88c018333e600f8247f9013df9013a80018410730dc294095e7baea6a6c7c4c2dfeb977efac326af552d878452870be7b8d47f0000000000000000000000000000000000000000000000000000000000000000457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3b6f88a3615234423703758c1ba0ddb9498737fcc7f585580b888dc5dc71dce4b0c3fcc034b34ce2b0fb65803004a05e15e49ca6cbed628ef22e1e0a101c2a63ac3ebed3865746135efb1c58f95d09c0",
+                "rlp" : "0xf90340f901fca06ac925213090830fdf111cb39b116081ac588fab6d1360c51d2195048925d23ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ac0f99d06ac12eb3e43027bff3107fb4f71ccfbf8462aca4bc82cf112e720b17a0e895c4f04dfed31e5834d884e1be147a5c0b023c408284f657ea099199db3f96a0aa5a39e77497a628fe5f613c395c3be0dda158685318bcdde0f71fa066f29446b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8277d78203e880a0f593c483a82ba58fa419dee4d61db6391feacfe984cd5ed0c53638ae2b1f26938810c569cd8a6b5cfaf9013df9013a80018410730dc294095e7baea6a6c7c4c2dfeb977efac326af552d878452870be7b8d47f0000000000000000000000000000000000000000000000000000000000000000457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3b6f88a3615234423703758c1ba0ddb9498737fcc7f585580b888dc5dc71dce4b0c3fcc034b34ce2b0fb65803004a05e15e49ca6cbed628ef22e1e0a101c2a63ac3ebed3865746135efb1c58f95d09c0",
                 "transactions" : [
                     {
                         "data" : "0x7f0000000000000000000000000000000000000000000000000000000000000000457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3b6f88a3615234423703758c",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08e2c9c976ce2193d950c2911f238d6ac3564164002f7d650d70b4331829ca6a3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9d980ce2bf6b2d0c789a20176209d448e3300bcd06e9482e67c887b6523149fb",
+        "lastblockhash" : "0x51c54b3ab6ca59d2a3ddf985ff4714e0d83826a4fd04b55c1cae51444ad55ca4",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest284BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest284BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest284BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x77d7",
-                    "hash" : "0xe6920e95991d77a1efcf8714b22f4e88f4d29a2243334568c517b594cb47a1bc",
-                    "mixHash" : "0x5151678dbe3c1403cada6957bd848a13ac265e9db0816f8dd19d05b5ce89aefd",
-                    "nonce" : "0x95e1a804071640df",
+                    "hash" : "0x68e9fe89b032481ba18a8073612e7cd7943a1fbd2ef61036524592a856f5851f",
+                    "mixHash" : "0xcf3d998d41d92f11f95ddf764d5a443354f455890e1278cd219c877947f8f079",
+                    "nonce" : "0x6f866125b4666492",
                     "number" : "0x01",
                     "parentHash" : "0x6ac925213090830fdf111cb39b116081ac588fab6d1360c51d2195048925d23c",
                     "receiptTrie" : "0xaa5a39e77497a628fe5f613c395c3be0dda158685318bcdde0f71fa066f29446",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0xe895c4f04dfed31e5834d884e1be147a5c0b023c408284f657ea099199db3f96",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90340f901fca06ac925213090830fdf111cb39b116081ac588fab6d1360c51d2195048925d23ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ac0f99d06ac12eb3e43027bff3107fb4f71ccfbf8462aca4bc82cf112e720b17a0e895c4f04dfed31e5834d884e1be147a5c0b023c408284f657ea099199db3f96a0aa5a39e77497a628fe5f613c395c3be0dda158685318bcdde0f71fa066f29446b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8277d78203e880a05151678dbe3c1403cada6957bd848a13ac265e9db0816f8dd19d05b5ce89aefd8895e1a804071640dff9013df9013a80018410730dc294095e7baea6a6c7c4c2dfeb977efac326af552d878452870be7b8d47f0000000000000000000000000000000000000000000000000000000000000000457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3b6f88a3615234423703758c1ba0ddb9498737fcc7f585580b888dc5dc71dce4b0c3fcc034b34ce2b0fb65803004a05e15e49ca6cbed628ef22e1e0a101c2a63ac3ebed3865746135efb1c58f95d09c0",
+                "rlp" : "0xf90340f901fca06ac925213090830fdf111cb39b116081ac588fab6d1360c51d2195048925d23ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ac0f99d06ac12eb3e43027bff3107fb4f71ccfbf8462aca4bc82cf112e720b17a0e895c4f04dfed31e5834d884e1be147a5c0b023c408284f657ea099199db3f96a0aa5a39e77497a628fe5f613c395c3be0dda158685318bcdde0f71fa066f29446b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8277d78203e880a0cf3d998d41d92f11f95ddf764d5a443354f455890e1278cd219c877947f8f079886f866125b4666492f9013df9013a80018410730dc294095e7baea6a6c7c4c2dfeb977efac326af552d878452870be7b8d47f0000000000000000000000000000000000000000000000000000000000000000457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3b6f88a3615234423703758c1ba0ddb9498737fcc7f585580b888dc5dc71dce4b0c3fcc034b34ce2b0fb65803004a05e15e49ca6cbed628ef22e1e0a101c2a63ac3ebed3865746135efb1c58f95d09c0",
                 "transactions" : [
                     {
                         "data" : "0x7f0000000000000000000000000000000000000000000000000000000000000000457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3b6f88a3615234423703758c",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08e2c9c976ce2193d950c2911f238d6ac3564164002f7d650d70b4331829ca6a3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe6920e95991d77a1efcf8714b22f4e88f4d29a2243334568c517b594cb47a1bc",
+        "lastblockhash" : "0x68e9fe89b032481ba18a8073612e7cd7943a1fbd2ef61036524592a856f5851f",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest289BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest289BC.json
index 09d53d675..3120b6fc8 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest289BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest289BC.json
@@ -2,8 +2,8 @@
     "randomStatetest289BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest289BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest289BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xcd7d",
-                    "hash" : "0x00508bc43bad337fec8f931689f13c459625fd3451a3044cab8a0eb5b91b6a84",
-                    "mixHash" : "0x38abf3ee6a0f5df8be86bddce50016f925c81349982984e2ca0e620599223b42",
-                    "nonce" : "0x0c550d9c2b0a2d50",
+                    "hash" : "0x6d789b9f61d5a73af08a07253e1c7f91c23e8e53eaa760366765f68be7a07dda",
+                    "mixHash" : "0x88be29ae8fe4e706dc51efdbebdc62362ee20b7fe9e4008111cb509563dfc72a",
+                    "nonce" : "0xbc32f8cf47ffdda3",
                     "number" : "0x01",
                     "parentHash" : "0x83e617ae8a860ef0e35cfa2beb3b4ce296d3b94f43ddb89b174a89246c09564c",
                     "receiptTrie" : "0xc45dd0f785a76da7a9a0ded20d856d9f57a8d8b91ed6d02f4a8e69eb0fbf4ad0",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xe93e3cd4d7a84d381d3747d707090f9f4925a8eca068316764a13d605d20f499",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90355f901fca083e617ae8a860ef0e35cfa2beb3b4ce296d3b94f43ddb89b174a89246c09564ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ac51543a178e1c75ec6dd74128e8e899f3c6a8ef3a7591ddeeb845c463e4a7c5a0e93e3cd4d7a84d381d3747d707090f9f4925a8eca068316764a13d605d20f499a0c45dd0f785a76da7a9a0ded20d856d9f57a8d8b91ed6d02f4a8e69eb0fbf4ad0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cd7d8203e880a038abf3ee6a0f5df8be86bddce50016f925c81349982984e2ca0e620599223b42880c550d9c2b0a2d50f90152f9014f800184330666ad94095e7baea6a6c7c4c2dfeb977efac326af552d87846466b000b8e97fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe091ca024c875e284cdb5bd02ee60064579d37b46e80eb00aebfc677397bccad6898c93a03573aac32c636881a9af5b4c1b5978ffe06d1fbb4e7b7fd7c9af7ea9e068ce1cc0",
+                "rlp" : "0xf90355f901fca083e617ae8a860ef0e35cfa2beb3b4ce296d3b94f43ddb89b174a89246c09564ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ac51543a178e1c75ec6dd74128e8e899f3c6a8ef3a7591ddeeb845c463e4a7c5a0e93e3cd4d7a84d381d3747d707090f9f4925a8eca068316764a13d605d20f499a0c45dd0f785a76da7a9a0ded20d856d9f57a8d8b91ed6d02f4a8e69eb0fbf4ad0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cd7d8203e880a088be29ae8fe4e706dc51efdbebdc62362ee20b7fe9e4008111cb509563dfc72a88bc32f8cf47ffdda3f90152f9014f800184330666ad94095e7baea6a6c7c4c2dfeb977efac326af552d87846466b000b8e97fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe091ca024c875e284cdb5bd02ee60064579d37b46e80eb00aebfc677397bccad6898c93a03573aac32c636881a9af5b4c1b5978ffe06d1fbb4e7b7fd7c9af7ea9e068ce1cc0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a002935b487bec042de549c7389bbcd4ea7fc303d15e0f989dfe226a29d991d4bda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x00508bc43bad337fec8f931689f13c459625fd3451a3044cab8a0eb5b91b6a84",
+        "lastblockhash" : "0x6d789b9f61d5a73af08a07253e1c7f91c23e8e53eaa760366765f68be7a07dda",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest289BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest289BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest289BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xd089",
-                    "hash" : "0xaa5d4b8d00e114fcb326e9588d4eedbe0eb88286609f9baed6cacb42fbaaebad",
-                    "mixHash" : "0x32caaf7e30e0e60d4868c97eb5c392418fbf22a650a6a8ee5beaccd382ebfefe",
-                    "nonce" : "0x0aff2471847a47df",
+                    "hash" : "0xcfb9e9b090d0792c103f7036279d9d337102d6d8bc816fa1ad6a39ce6830de51",
+                    "mixHash" : "0x98523afb78641b2677de2db1bee4cf101a5c3ce901ecd94604219ed01ea7022f",
+                    "nonce" : "0xbf35f19b89b7f047",
                     "number" : "0x01",
                     "parentHash" : "0x83e617ae8a860ef0e35cfa2beb3b4ce296d3b94f43ddb89b174a89246c09564c",
                     "receiptTrie" : "0xe8b501a5d072500b8093b3f901f847c6347e6721971b4b7af576dd2b85c25c48",
-                    "stateRoot" : "0x7dc8eee2a468cbd2805ff5e22ae337250e9f6076b6561f2e47fdef9c4357cf77",
+                    "stateRoot" : "0xecabed4d0d258b0766b999291a10800987d36b9240112bfc4f2b1b81c666a73f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe93e3cd4d7a84d381d3747d707090f9f4925a8eca068316764a13d605d20f499",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90355f901fca083e617ae8a860ef0e35cfa2beb3b4ce296d3b94f43ddb89b174a89246c09564ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07dc8eee2a468cbd2805ff5e22ae337250e9f6076b6561f2e47fdef9c4357cf77a0e93e3cd4d7a84d381d3747d707090f9f4925a8eca068316764a13d605d20f499a0e8b501a5d072500b8093b3f901f847c6347e6721971b4b7af576dd2b85c25c48b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82d0898203e880a032caaf7e30e0e60d4868c97eb5c392418fbf22a650a6a8ee5beaccd382ebfefe880aff2471847a47dff90152f9014f800184330666ad94095e7baea6a6c7c4c2dfeb977efac326af552d87846466b000b8e97fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe091ca024c875e284cdb5bd02ee60064579d37b46e80eb00aebfc677397bccad6898c93a03573aac32c636881a9af5b4c1b5978ffe06d1fbb4e7b7fd7c9af7ea9e068ce1cc0",
+                "rlp" : "0xf90355f901fca083e617ae8a860ef0e35cfa2beb3b4ce296d3b94f43ddb89b174a89246c09564ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ecabed4d0d258b0766b999291a10800987d36b9240112bfc4f2b1b81c666a73fa0e93e3cd4d7a84d381d3747d707090f9f4925a8eca068316764a13d605d20f499a0e8b501a5d072500b8093b3f901f847c6347e6721971b4b7af576dd2b85c25c48b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82d0898203e880a098523afb78641b2677de2db1bee4cf101a5c3ce901ecd94604219ed01ea7022f88bf35f19b89b7f047f90152f9014f800184330666ad94095e7baea6a6c7c4c2dfeb977efac326af552d87846466b000b8e97fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe091ca024c875e284cdb5bd02ee60064579d37b46e80eb00aebfc677397bccad6898c93a03573aac32c636881a9af5b4c1b5978ffe06d1fbb4e7b7fd7c9af7ea9e068ce1cc0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a002935b487bec042de549c7389bbcd4ea7fc303d15e0f989dfe226a29d991d4bda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaa5d4b8d00e114fcb326e9588d4eedbe0eb88286609f9baed6cacb42fbaaebad",
+        "lastblockhash" : "0xcfb9e9b090d0792c103f7036279d9d337102d6d8bc816fa1ad6a39ce6830de51",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x6466b000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0955",
@@ -235,8 +228,8 @@
     "randomStatetest289BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest289BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest289BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xcd7d",
-                    "hash" : "0x0e18d9eff050bd2b319b4bdb23877456c750e984c6fe88ddffc496654ffebeff",
-                    "mixHash" : "0x92af75a17dc349a3ba6e67e426d87ea9ca43ade0c0b1b0846f915922b8e628ef",
-                    "nonce" : "0xbc7680c898a6678e",
+                    "hash" : "0x02dbe2ec9bd779886644cc72178a86cd1ac13610e443c65057e2b6cb61607692",
+                    "mixHash" : "0x38d4d278d52b95b5cb80767d505e04cd30a558f4112cc772d6e178ad52e56740",
+                    "nonce" : "0x69915776509b0472",
                     "number" : "0x01",
                     "parentHash" : "0x83e617ae8a860ef0e35cfa2beb3b4ce296d3b94f43ddb89b174a89246c09564c",
                     "receiptTrie" : "0xbd28b566f04ea8d563fe7bdcf7dcc2d2a6045fea29700806d10a23d414f6c26a",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xe93e3cd4d7a84d381d3747d707090f9f4925a8eca068316764a13d605d20f499",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90355f901fca083e617ae8a860ef0e35cfa2beb3b4ce296d3b94f43ddb89b174a89246c09564ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02d81d3ec7651c6b2a9a3d89e39ac35bc374796718f698e86f6429b02cac35624a0e93e3cd4d7a84d381d3747d707090f9f4925a8eca068316764a13d605d20f499a0bd28b566f04ea8d563fe7bdcf7dcc2d2a6045fea29700806d10a23d414f6c26ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cd7d8203e880a092af75a17dc349a3ba6e67e426d87ea9ca43ade0c0b1b0846f915922b8e628ef88bc7680c898a6678ef90152f9014f800184330666ad94095e7baea6a6c7c4c2dfeb977efac326af552d87846466b000b8e97fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe091ca024c875e284cdb5bd02ee60064579d37b46e80eb00aebfc677397bccad6898c93a03573aac32c636881a9af5b4c1b5978ffe06d1fbb4e7b7fd7c9af7ea9e068ce1cc0",
+                "rlp" : "0xf90355f901fca083e617ae8a860ef0e35cfa2beb3b4ce296d3b94f43ddb89b174a89246c09564ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02d81d3ec7651c6b2a9a3d89e39ac35bc374796718f698e86f6429b02cac35624a0e93e3cd4d7a84d381d3747d707090f9f4925a8eca068316764a13d605d20f499a0bd28b566f04ea8d563fe7bdcf7dcc2d2a6045fea29700806d10a23d414f6c26ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cd7d8203e880a038d4d278d52b95b5cb80767d505e04cd30a558f4112cc772d6e178ad52e567408869915776509b0472f90152f9014f800184330666ad94095e7baea6a6c7c4c2dfeb977efac326af552d87846466b000b8e97fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe091ca024c875e284cdb5bd02ee60064579d37b46e80eb00aebfc677397bccad6898c93a03573aac32c636881a9af5b4c1b5978ffe06d1fbb4e7b7fd7c9af7ea9e068ce1cc0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a002935b487bec042de549c7389bbcd4ea7fc303d15e0f989dfe226a29d991d4bda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0e18d9eff050bd2b319b4bdb23877456c750e984c6fe88ddffc496654ffebeff",
+        "lastblockhash" : "0x02dbe2ec9bd779886644cc72178a86cd1ac13610e443c65057e2b6cb61607692",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest289BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest289BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest289BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xcd7d",
-                    "hash" : "0x281c32126292540d0beebae93238a90ae665b559d49feb1d64c09432112215f0",
-                    "mixHash" : "0xcae371e10f06c4164d44cecee1b0c88929b0d4aa17f2a74b48dc8ed4dda4d699",
-                    "nonce" : "0x118f0ea87e0b78c5",
+                    "hash" : "0x9b34c9c08112ce51d409667e52e4cf30f9d25c89f39cf52d5ea48845a58950a7",
+                    "mixHash" : "0x859ab24acf518e93adcb67664a876688bf63d03da682cafaf90960e65bfa5f1d",
+                    "nonce" : "0xc7cb8079ee093040",
                     "number" : "0x01",
                     "parentHash" : "0x83e617ae8a860ef0e35cfa2beb3b4ce296d3b94f43ddb89b174a89246c09564c",
                     "receiptTrie" : "0xbd28b566f04ea8d563fe7bdcf7dcc2d2a6045fea29700806d10a23d414f6c26a",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xe93e3cd4d7a84d381d3747d707090f9f4925a8eca068316764a13d605d20f499",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90355f901fca083e617ae8a860ef0e35cfa2beb3b4ce296d3b94f43ddb89b174a89246c09564ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02d81d3ec7651c6b2a9a3d89e39ac35bc374796718f698e86f6429b02cac35624a0e93e3cd4d7a84d381d3747d707090f9f4925a8eca068316764a13d605d20f499a0bd28b566f04ea8d563fe7bdcf7dcc2d2a6045fea29700806d10a23d414f6c26ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cd7d8203e880a0cae371e10f06c4164d44cecee1b0c88929b0d4aa17f2a74b48dc8ed4dda4d69988118f0ea87e0b78c5f90152f9014f800184330666ad94095e7baea6a6c7c4c2dfeb977efac326af552d87846466b000b8e97fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe091ca024c875e284cdb5bd02ee60064579d37b46e80eb00aebfc677397bccad6898c93a03573aac32c636881a9af5b4c1b5978ffe06d1fbb4e7b7fd7c9af7ea9e068ce1cc0",
+                "rlp" : "0xf90355f901fca083e617ae8a860ef0e35cfa2beb3b4ce296d3b94f43ddb89b174a89246c09564ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02d81d3ec7651c6b2a9a3d89e39ac35bc374796718f698e86f6429b02cac35624a0e93e3cd4d7a84d381d3747d707090f9f4925a8eca068316764a13d605d20f499a0bd28b566f04ea8d563fe7bdcf7dcc2d2a6045fea29700806d10a23d414f6c26ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cd7d8203e880a0859ab24acf518e93adcb67664a876688bf63d03da682cafaf90960e65bfa5f1d88c7cb8079ee093040f90152f9014f800184330666ad94095e7baea6a6c7c4c2dfeb977efac326af552d87846466b000b8e97fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe091ca024c875e284cdb5bd02ee60064579d37b46e80eb00aebfc677397bccad6898c93a03573aac32c636881a9af5b4c1b5978ffe06d1fbb4e7b7fd7c9af7ea9e068ce1cc0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a002935b487bec042de549c7389bbcd4ea7fc303d15e0f989dfe226a29d991d4bda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x281c32126292540d0beebae93238a90ae665b559d49feb1d64c09432112215f0",
+        "lastblockhash" : "0x9b34c9c08112ce51d409667e52e4cf30f9d25c89f39cf52d5ea48845a58950a7",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest289BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest289BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest289BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xcd7d",
-                    "hash" : "0xaffb0b826835a1408ceb1384f79486ec824e73baa4dd51d1c7f536c1c68c9d2b",
-                    "mixHash" : "0x32e2d941f3fc7b7dc1395d5e61f5a73917079b645ba133876c44fdc7f86ed35d",
-                    "nonce" : "0x843ec033bf1b6511",
+                    "hash" : "0xdf087f53166724d7e9acc04175839204464414a88abb3412133eab7fa76e6eeb",
+                    "mixHash" : "0x1db430030ffd4ae031f05905162dd4e9d6b8aa81608431b69984b2b2e79225b3",
+                    "nonce" : "0xded99fd0abc3244f",
                     "number" : "0x01",
                     "parentHash" : "0x83e617ae8a860ef0e35cfa2beb3b4ce296d3b94f43ddb89b174a89246c09564c",
                     "receiptTrie" : "0xbd28b566f04ea8d563fe7bdcf7dcc2d2a6045fea29700806d10a23d414f6c26a",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xe93e3cd4d7a84d381d3747d707090f9f4925a8eca068316764a13d605d20f499",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90355f901fca083e617ae8a860ef0e35cfa2beb3b4ce296d3b94f43ddb89b174a89246c09564ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02d81d3ec7651c6b2a9a3d89e39ac35bc374796718f698e86f6429b02cac35624a0e93e3cd4d7a84d381d3747d707090f9f4925a8eca068316764a13d605d20f499a0bd28b566f04ea8d563fe7bdcf7dcc2d2a6045fea29700806d10a23d414f6c26ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cd7d8203e880a032e2d941f3fc7b7dc1395d5e61f5a73917079b645ba133876c44fdc7f86ed35d88843ec033bf1b6511f90152f9014f800184330666ad94095e7baea6a6c7c4c2dfeb977efac326af552d87846466b000b8e97fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe091ca024c875e284cdb5bd02ee60064579d37b46e80eb00aebfc677397bccad6898c93a03573aac32c636881a9af5b4c1b5978ffe06d1fbb4e7b7fd7c9af7ea9e068ce1cc0",
+                "rlp" : "0xf90355f901fca083e617ae8a860ef0e35cfa2beb3b4ce296d3b94f43ddb89b174a89246c09564ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02d81d3ec7651c6b2a9a3d89e39ac35bc374796718f698e86f6429b02cac35624a0e93e3cd4d7a84d381d3747d707090f9f4925a8eca068316764a13d605d20f499a0bd28b566f04ea8d563fe7bdcf7dcc2d2a6045fea29700806d10a23d414f6c26ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cd7d8203e880a01db430030ffd4ae031f05905162dd4e9d6b8aa81608431b69984b2b2e79225b388ded99fd0abc3244ff90152f9014f800184330666ad94095e7baea6a6c7c4c2dfeb977efac326af552d87846466b000b8e97fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe091ca024c875e284cdb5bd02ee60064579d37b46e80eb00aebfc677397bccad6898c93a03573aac32c636881a9af5b4c1b5978ffe06d1fbb4e7b7fd7c9af7ea9e068ce1cc0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a002935b487bec042de549c7389bbcd4ea7fc303d15e0f989dfe226a29d991d4bda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaffb0b826835a1408ceb1384f79486ec824e73baa4dd51d1c7f536c1c68c9d2b",
+        "lastblockhash" : "0xdf087f53166724d7e9acc04175839204464414a88abb3412133eab7fa76e6eeb",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest289BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest289BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest289BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xcd7d",
-                    "hash" : "0x9dd49c03c5ccf84c4a4ef6edfd86f1e1bd93bc945ee1ee7c747f56825caa12dc",
-                    "mixHash" : "0x9a91b4609e7699b465477313852867fbd634896be44c2851cce6cbcf83b03648",
-                    "nonce" : "0x17dbc175b40294cd",
+                    "hash" : "0x6b1fcab98082595e12fbc7479b8c5bc4aaa9efc5364e1dd4196f3facac7a2c21",
+                    "mixHash" : "0x9795e0f1e45a3d70c7bbe3b0b916e1fb98f3ac10a168daedda047bf3c241fb47",
+                    "nonce" : "0x8afd99ed64dfb447",
                     "number" : "0x01",
                     "parentHash" : "0x83e617ae8a860ef0e35cfa2beb3b4ce296d3b94f43ddb89b174a89246c09564c",
                     "receiptTrie" : "0xbd28b566f04ea8d563fe7bdcf7dcc2d2a6045fea29700806d10a23d414f6c26a",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xe93e3cd4d7a84d381d3747d707090f9f4925a8eca068316764a13d605d20f499",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90355f901fca083e617ae8a860ef0e35cfa2beb3b4ce296d3b94f43ddb89b174a89246c09564ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02d81d3ec7651c6b2a9a3d89e39ac35bc374796718f698e86f6429b02cac35624a0e93e3cd4d7a84d381d3747d707090f9f4925a8eca068316764a13d605d20f499a0bd28b566f04ea8d563fe7bdcf7dcc2d2a6045fea29700806d10a23d414f6c26ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cd7d8203e880a09a91b4609e7699b465477313852867fbd634896be44c2851cce6cbcf83b036488817dbc175b40294cdf90152f9014f800184330666ad94095e7baea6a6c7c4c2dfeb977efac326af552d87846466b000b8e97fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe091ca024c875e284cdb5bd02ee60064579d37b46e80eb00aebfc677397bccad6898c93a03573aac32c636881a9af5b4c1b5978ffe06d1fbb4e7b7fd7c9af7ea9e068ce1cc0",
+                "rlp" : "0xf90355f901fca083e617ae8a860ef0e35cfa2beb3b4ce296d3b94f43ddb89b174a89246c09564ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02d81d3ec7651c6b2a9a3d89e39ac35bc374796718f698e86f6429b02cac35624a0e93e3cd4d7a84d381d3747d707090f9f4925a8eca068316764a13d605d20f499a0bd28b566f04ea8d563fe7bdcf7dcc2d2a6045fea29700806d10a23d414f6c26ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82cd7d8203e880a09795e0f1e45a3d70c7bbe3b0b916e1fb98f3ac10a168daedda047bf3c241fb47888afd99ed64dfb447f90152f9014f800184330666ad94095e7baea6a6c7c4c2dfeb977efac326af552d87846466b000b8e97fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe091ca024c875e284cdb5bd02ee60064579d37b46e80eb00aebfc677397bccad6898c93a03573aac32c636881a9af5b4c1b5978ffe06d1fbb4e7b7fd7c9af7ea9e068ce1cc0",
                 "transactions" : [
                     {
                         "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a002935b487bec042de549c7389bbcd4ea7fc303d15e0f989dfe226a29d991d4bda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9dd49c03c5ccf84c4a4ef6edfd86f1e1bd93bc945ee1ee7c747f56825caa12dc",
+        "lastblockhash" : "0x6b1fcab98082595e12fbc7479b8c5bc4aaa9efc5364e1dd4196f3facac7a2c21",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest314BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest314BC.json
index db6777617..8fe26c9cb 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest314BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest314BC.json
@@ -2,8 +2,8 @@
     "randomStatetest314BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest314BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest314BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5268",
-                    "hash" : "0xbcd408e6971998d0991b8d52399b174333f1f5f6f27587ef8faabdadd5445eba",
-                    "mixHash" : "0x9984fb81d25f2c2bc4f3cec6a8baa3054754d793afe27d00d484346cf093d6b9",
-                    "nonce" : "0xcade8fa67c73d0a1",
+                    "hash" : "0x37714d96c4d3caacbdff17b945c07e7565f2fb1333ecedcfb0b7a9ea9c03163c",
+                    "mixHash" : "0x881049823e4400d1beeb9e9a71c60ff11385442dc5b4c95e0a99ae961f2aa81a",
+                    "nonce" : "0x8a48e27d6358534f",
                     "number" : "0x01",
                     "parentHash" : "0xb25ee7ce6d2618d7494b30d01ce6454fe99c4e263d22e0c87dd49a20126d2964",
                     "receiptTrie" : "0xd97e9fa4c540a47a0da01ef860511324c8e5c7d9c69bd7cf31260d895a27df34",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0b25ee7ce6d2618d7494b30d01ce6454fe99c4e263d22e0c87dd49a20126d2964a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0aca9eca40fac19a7d2fb82638e6935a63e045847a4327e431ec2047a18a15d97a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d97e9fa4c540a47a0da01ef860511324c8e5c7d9c69bd7cf31260d895a27df34b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252688203e880a09984fb81d25f2c2bc4f3cec6a8baa3054754d793afe27d00d484346cf093d6b988cade8fa67c73d0a1f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0b25ee7ce6d2618d7494b30d01ce6454fe99c4e263d22e0c87dd49a20126d2964a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0aca9eca40fac19a7d2fb82638e6935a63e045847a4327e431ec2047a18a15d97a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d97e9fa4c540a47a0da01ef860511324c8e5c7d9c69bd7cf31260d895a27df34b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252688203e880a0881049823e4400d1beeb9e9a71c60ff11385442dc5b4c95e0a99ae961f2aa81a888a48e27d6358534ff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05c718586bddadeb0167a099a19e1237fb906475d0d9486de910ea753657d4fdfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbcd408e6971998d0991b8d52399b174333f1f5f6f27587ef8faabdadd5445eba",
+        "lastblockhash" : "0x37714d96c4d3caacbdff17b945c07e7565f2fb1333ecedcfb0b7a9ea9c03163c",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest314BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest314BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest314BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5574",
-                    "hash" : "0x215c6d3e80577cf41e9b9417ec812fffaeef0d9bc99d8077b6c4cd796fdb371f",
-                    "mixHash" : "0xe36a3a7b2bf3fb76d61d0e8a88d09c8a4273b9cf04542b1db7980ed2d36ddd5e",
-                    "nonce" : "0xa6614f9c3c8183a9",
+                    "hash" : "0xeb6637cc41274fdbb3ed4a4b97c9cb57a102955104addb5346bc511570714197",
+                    "mixHash" : "0x17cc2872efac930022b4195a9953586445e5dc0b802026139e19cfb48fd3ca73",
+                    "nonce" : "0xe6eaa7fcad4d1f94",
                     "number" : "0x01",
                     "parentHash" : "0xb25ee7ce6d2618d7494b30d01ce6454fe99c4e263d22e0c87dd49a20126d2964",
                     "receiptTrie" : "0x23269020dc23bf88ec5513bcc86b71c1a7641fc54cb42a4379105926df931c17",
-                    "stateRoot" : "0x75da57e5f05cd63ea52a9e14d4559046a5b6893ee48fce84058cd2a7100ed509",
+                    "stateRoot" : "0x4f68b0f0e0521133c74a4c7fc1602d57f34eb4677d9b66fda64e0c4feb34584e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0b25ee7ce6d2618d7494b30d01ce6454fe99c4e263d22e0c87dd49a20126d2964a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a075da57e5f05cd63ea52a9e14d4559046a5b6893ee48fce84058cd2a7100ed509a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa023269020dc23bf88ec5513bcc86b71c1a7641fc54cb42a4379105926df931c17b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8255748203e880a0e36a3a7b2bf3fb76d61d0e8a88d09c8a4273b9cf04542b1db7980ed2d36ddd5e88a6614f9c3c8183a9f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0b25ee7ce6d2618d7494b30d01ce6454fe99c4e263d22e0c87dd49a20126d2964a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04f68b0f0e0521133c74a4c7fc1602d57f34eb4677d9b66fda64e0c4feb34584ea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa023269020dc23bf88ec5513bcc86b71c1a7641fc54cb42a4379105926df931c17b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8255748203e880a017cc2872efac930022b4195a9953586445e5dc0b802026139e19cfb48fd3ca7388e6eaa7fcad4d1f94f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05c718586bddadeb0167a099a19e1237fb906475d0d9486de910ea753657d4fdfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x215c6d3e80577cf41e9b9417ec812fffaeef0d9bc99d8077b6c4cd796fdb371f",
+        "lastblockhash" : "0xeb6637cc41274fdbb3ed4a4b97c9cb57a102955104addb5346bc511570714197",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x4542444041",
@@ -233,8 +226,8 @@
     "randomStatetest314BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest314BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest314BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5268",
-                    "hash" : "0xd666434453f0a61f98b2b4e9c59e6cc90d9fa571370e06bd4a41b2bfb9e6fcb3",
-                    "mixHash" : "0x7893ada219ac9be7376fdf2fd9856136a7dc26510c4500fc868099f848cdbfe2",
-                    "nonce" : "0x5b846c3d7999a83d",
+                    "hash" : "0x8fc9aacbedb0e7fa7ea1a74e87068f674a67c3b066e564e21153db44acd6a337",
+                    "mixHash" : "0xc29ae3d63505b47d22b533f99572d363eebe768f14ded505163928f910d8c286",
+                    "nonce" : "0xcaff16b139f490f9",
                     "number" : "0x01",
                     "parentHash" : "0xb25ee7ce6d2618d7494b30d01ce6454fe99c4e263d22e0c87dd49a20126d2964",
                     "receiptTrie" : "0xc02c1c8d4d606a29957c555a368f33dd6117240a3759d3aca4de15e40a049666",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0b25ee7ce6d2618d7494b30d01ce6454fe99c4e263d22e0c87dd49a20126d2964a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a035136cf0e8f6e44c276fe4925badaa2e4645dfe56237e89ef84a70555387e3c5a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0c02c1c8d4d606a29957c555a368f33dd6117240a3759d3aca4de15e40a049666b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252688203e880a07893ada219ac9be7376fdf2fd9856136a7dc26510c4500fc868099f848cdbfe2885b846c3d7999a83df865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0b25ee7ce6d2618d7494b30d01ce6454fe99c4e263d22e0c87dd49a20126d2964a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a035136cf0e8f6e44c276fe4925badaa2e4645dfe56237e89ef84a70555387e3c5a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0c02c1c8d4d606a29957c555a368f33dd6117240a3759d3aca4de15e40a049666b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252688203e880a0c29ae3d63505b47d22b533f99572d363eebe768f14ded505163928f910d8c28688caff16b139f490f9f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05c718586bddadeb0167a099a19e1237fb906475d0d9486de910ea753657d4fdfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd666434453f0a61f98b2b4e9c59e6cc90d9fa571370e06bd4a41b2bfb9e6fcb3",
+        "lastblockhash" : "0x8fc9aacbedb0e7fa7ea1a74e87068f674a67c3b066e564e21153db44acd6a337",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest314BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest314BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest314BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5268",
-                    "hash" : "0x023b970d78d8e101349c70675af2d8de2ee6c7dc906f2839dbea6a2f4dfac132",
-                    "mixHash" : "0x717914b22851ef328cd868a4bcbbf1735d8808cb20e478bdd88f05ef0b6d5fa1",
-                    "nonce" : "0x85559989ae0842c6",
+                    "hash" : "0xfa9eee15d010e945aad6e0569ca97fe0f5cdc180a8937150242c1bbaa808f373",
+                    "mixHash" : "0xf70995ee25bfc97bf4827e739bccb97ef447f4158853416c2dd471e5b7920409",
+                    "nonce" : "0xe05b6b206b686e8f",
                     "number" : "0x01",
                     "parentHash" : "0xb25ee7ce6d2618d7494b30d01ce6454fe99c4e263d22e0c87dd49a20126d2964",
                     "receiptTrie" : "0xc02c1c8d4d606a29957c555a368f33dd6117240a3759d3aca4de15e40a049666",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0b25ee7ce6d2618d7494b30d01ce6454fe99c4e263d22e0c87dd49a20126d2964a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a035136cf0e8f6e44c276fe4925badaa2e4645dfe56237e89ef84a70555387e3c5a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0c02c1c8d4d606a29957c555a368f33dd6117240a3759d3aca4de15e40a049666b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252688203e880a0717914b22851ef328cd868a4bcbbf1735d8808cb20e478bdd88f05ef0b6d5fa18885559989ae0842c6f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0b25ee7ce6d2618d7494b30d01ce6454fe99c4e263d22e0c87dd49a20126d2964a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a035136cf0e8f6e44c276fe4925badaa2e4645dfe56237e89ef84a70555387e3c5a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0c02c1c8d4d606a29957c555a368f33dd6117240a3759d3aca4de15e40a049666b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252688203e880a0f70995ee25bfc97bf4827e739bccb97ef447f4158853416c2dd471e5b792040988e05b6b206b686e8ff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05c718586bddadeb0167a099a19e1237fb906475d0d9486de910ea753657d4fdfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x023b970d78d8e101349c70675af2d8de2ee6c7dc906f2839dbea6a2f4dfac132",
+        "lastblockhash" : "0xfa9eee15d010e945aad6e0569ca97fe0f5cdc180a8937150242c1bbaa808f373",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest314BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest314BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest314BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5268",
-                    "hash" : "0xcb1233fd970ccf159f025609c903e6e56fb89bbefc8129a2b515ef68f29a6c2c",
-                    "mixHash" : "0xf10cf07f50b03efbeb39a4ba35dea68827414710bce6183ba0e0d55cd34f4287",
-                    "nonce" : "0xe391650ce781a1ae",
+                    "hash" : "0xcefd1718168aac5467566177eefd8f9418d09f7f9328ad309793aa8e9bae6a0d",
+                    "mixHash" : "0x9cedac08975cee8330d1235d2cd31da6a8de80ae8e081982c79e4df2747e047f",
+                    "nonce" : "0xaa4c9d2fd428ba9b",
                     "number" : "0x01",
                     "parentHash" : "0xb25ee7ce6d2618d7494b30d01ce6454fe99c4e263d22e0c87dd49a20126d2964",
                     "receiptTrie" : "0xc02c1c8d4d606a29957c555a368f33dd6117240a3759d3aca4de15e40a049666",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0b25ee7ce6d2618d7494b30d01ce6454fe99c4e263d22e0c87dd49a20126d2964a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a035136cf0e8f6e44c276fe4925badaa2e4645dfe56237e89ef84a70555387e3c5a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0c02c1c8d4d606a29957c555a368f33dd6117240a3759d3aca4de15e40a049666b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252688203e880a0f10cf07f50b03efbeb39a4ba35dea68827414710bce6183ba0e0d55cd34f428788e391650ce781a1aef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0b25ee7ce6d2618d7494b30d01ce6454fe99c4e263d22e0c87dd49a20126d2964a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a035136cf0e8f6e44c276fe4925badaa2e4645dfe56237e89ef84a70555387e3c5a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0c02c1c8d4d606a29957c555a368f33dd6117240a3759d3aca4de15e40a049666b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252688203e880a09cedac08975cee8330d1235d2cd31da6a8de80ae8e081982c79e4df2747e047f88aa4c9d2fd428ba9bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05c718586bddadeb0167a099a19e1237fb906475d0d9486de910ea753657d4fdfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcb1233fd970ccf159f025609c903e6e56fb89bbefc8129a2b515ef68f29a6c2c",
+        "lastblockhash" : "0xcefd1718168aac5467566177eefd8f9418d09f7f9328ad309793aa8e9bae6a0d",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest314BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest314BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest314BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5268",
-                    "hash" : "0xd737d0afbb50ccd9aaa68fa56365ff40c497f66e132e3eb490bdb2cf52bd7302",
-                    "mixHash" : "0x7d104ca255ebbd35b70eb27c71a97da43bef2f9fc38bc3af373531323c397fde",
-                    "nonce" : "0x720c18b7986c43d4",
+                    "hash" : "0x844d3bb2c25fe9539ab2622f3ea5063cf4e88e9038af2231903158e6837c8947",
+                    "mixHash" : "0x136b9f495778aadb63ca9b0fb320a3ac5fa2d977110c46d313d7b36c0022b1ce",
+                    "nonce" : "0x99160281d10cdfc1",
                     "number" : "0x01",
                     "parentHash" : "0xb25ee7ce6d2618d7494b30d01ce6454fe99c4e263d22e0c87dd49a20126d2964",
                     "receiptTrie" : "0xc02c1c8d4d606a29957c555a368f33dd6117240a3759d3aca4de15e40a049666",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0b25ee7ce6d2618d7494b30d01ce6454fe99c4e263d22e0c87dd49a20126d2964a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a035136cf0e8f6e44c276fe4925badaa2e4645dfe56237e89ef84a70555387e3c5a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0c02c1c8d4d606a29957c555a368f33dd6117240a3759d3aca4de15e40a049666b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252688203e880a07d104ca255ebbd35b70eb27c71a97da43bef2f9fc38bc3af373531323c397fde88720c18b7986c43d4f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0b25ee7ce6d2618d7494b30d01ce6454fe99c4e263d22e0c87dd49a20126d2964a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a035136cf0e8f6e44c276fe4925badaa2e4645dfe56237e89ef84a70555387e3c5a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0c02c1c8d4d606a29957c555a368f33dd6117240a3759d3aca4de15e40a049666b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252688203e880a0136b9f495778aadb63ca9b0fb320a3ac5fa2d977110c46d313d7b36c0022b1ce8899160281d10cdfc1f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05c718586bddadeb0167a099a19e1237fb906475d0d9486de910ea753657d4fdfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd737d0afbb50ccd9aaa68fa56365ff40c497f66e132e3eb490bdb2cf52bd7302",
+        "lastblockhash" : "0x844d3bb2c25fe9539ab2622f3ea5063cf4e88e9038af2231903158e6837c8947",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest317BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest317BC.json
index e0ad1d7ba..0ed8c7b72 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest317BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest317BC.json
@@ -2,8 +2,8 @@
     "randomStatetest317BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest317BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest317BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050bb4",
-                    "hash" : "0xa33fd29181ae0c84266312dc8ffa3ffd7677fba094f9a29945dbf05d8d3f035f",
-                    "mixHash" : "0x3528b380a467708baea2145a69a0217c83ad9853be70a3967b208f595441ca21",
-                    "nonce" : "0x5a0e7725acde2a9d",
+                    "hash" : "0x72710dff5355df947767b03af0bbdd16f5f5f9b7c5d87faf8efb22c2aeab69d7",
+                    "mixHash" : "0x0e99c5895bebd0c80c4596daf731f5986cb8e91dd9198a1b9f0e7130865ea14e",
+                    "nonce" : "0xa0f736f56570ce10",
                     "number" : "0x01",
                     "parentHash" : "0xb3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8",
                     "receiptTrie" : "0xe5adcdb6ced3e55272fc594d741d48c978e7e60b4dddf77bcd74ec30e64baf53",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e725a9ef07bb32ad92e4be29331475cd2eeded36c30fe52a99f70b361afe2ac4a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e5adcdb6ced3e55272fc594d741d48c978e7e60b4dddf77bcd74ec30e64baf53b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050bb48203e880a03528b380a467708baea2145a69a0217c83ad9853be70a3967b208f595441ca21885a0e7725acde2a9df865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e725a9ef07bb32ad92e4be29331475cd2eeded36c30fe52a99f70b361afe2ac4a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e5adcdb6ced3e55272fc594d741d48c978e7e60b4dddf77bcd74ec30e64baf53b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050bb48203e880a00e99c5895bebd0c80c4596daf731f5986cb8e91dd9198a1b9f0e7130865ea14e88a0f736f56570ce10f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d7c19d199901a0bbf81bbdf3abaf7c524ecbe39a32b5b68ebfeb480b518e105aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa33fd29181ae0c84266312dc8ffa3ffd7677fba094f9a29945dbf05d8d3f035f",
+        "lastblockhash" : "0x72710dff5355df947767b03af0bbdd16f5f5f9b7c5d87faf8efb22c2aeab69d7",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest317BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest317BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest317BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050a23",
-                    "hash" : "0x5320304de81382a63cd8fb8949e1a552d09a723429443543f0422cd7ec091214",
-                    "mixHash" : "0xd7e6aa38a9cc8d4692e57fa1769e4ea5889ecf190155362e09989e26e99ff1de",
-                    "nonce" : "0x8d2439820a4c7bc6",
+                    "hash" : "0x4ee712aa4099c02c807f97a0a1f7377e25bcfa0db0e6c7468c41a82025c1606e",
+                    "mixHash" : "0xdb213a10827e258d5db7eb2c715fa00791d5f58d578feec32071479ae95ca287",
+                    "nonce" : "0x6668896442f5d21a",
                     "number" : "0x01",
                     "parentHash" : "0xb3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8",
                     "receiptTrie" : "0x6c04909a647732ae0922b5e5e83bfb778644f195965c78ba58a3675df147a19e",
-                    "stateRoot" : "0x63ae0a91c00ddb3b55c20a29c3c12565b025b56e9442c2198f4b05f05aa68eaf",
+                    "stateRoot" : "0x7eb4cadd6c0a391c6544f3404d4b457bf76121994f99e8a9502411cba00ffe67",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a063ae0a91c00ddb3b55c20a29c3c12565b025b56e9442c2198f4b05f05aa68eafa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06c04909a647732ae0922b5e5e83bfb778644f195965c78ba58a3675df147a19eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050a238203e880a0d7e6aa38a9cc8d4692e57fa1769e4ea5889ecf190155362e09989e26e99ff1de888d2439820a4c7bc6f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07eb4cadd6c0a391c6544f3404d4b457bf76121994f99e8a9502411cba00ffe67a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06c04909a647732ae0922b5e5e83bfb778644f195965c78ba58a3675df147a19eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050a238203e880a0db213a10827e258d5db7eb2c715fa00791d5f58d578feec32071479ae95ca287886668896442f5d21af865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d7c19d199901a0bbf81bbdf3abaf7c524ecbe39a32b5b68ebfeb480b518e105aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5320304de81382a63cd8fb8949e1a552d09a723429443543f0422cd7ec091214",
+        "lastblockhash" : "0x4ee712aa4099c02c807f97a0a1f7377e25bcfa0db0e6c7468c41a82025c1606e",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x42444545454042415a8554f355",
@@ -233,8 +226,8 @@
     "randomStatetest317BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest317BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest317BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050bb4",
-                    "hash" : "0x452141b19dadefb200eed8134420fb2bc0d8bc14f665536251cd24d293daf0b1",
-                    "mixHash" : "0x333eb1088f87216fb215bd2e83786f4d593b98248c2aaf44fe88a828e59eee3a",
-                    "nonce" : "0x48b252f12abffc30",
+                    "hash" : "0x5ef5f781f5fd329009e289bbd574db0a98f37516df1a36c4ad11ff750782b759",
+                    "mixHash" : "0x38036e4d68a94bc3b4a2384d31866b78726cf905a6d3dcdda2427f808af4ee7d",
+                    "nonce" : "0x4c604a565ffdc3a4",
                     "number" : "0x01",
                     "parentHash" : "0xb3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8",
                     "receiptTrie" : "0x18303a743eb80a0aae70c25097d7f37372b8ea3516c257338cb13c5045a75c34",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a080c9f22c9d28575ea546363164b5e761b91831cd16dc3379a62c5179cdedfa21a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa018303a743eb80a0aae70c25097d7f37372b8ea3516c257338cb13c5045a75c34b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050bb48203e880a0333eb1088f87216fb215bd2e83786f4d593b98248c2aaf44fe88a828e59eee3a8848b252f12abffc30f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a080c9f22c9d28575ea546363164b5e761b91831cd16dc3379a62c5179cdedfa21a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa018303a743eb80a0aae70c25097d7f37372b8ea3516c257338cb13c5045a75c34b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050bb48203e880a038036e4d68a94bc3b4a2384d31866b78726cf905a6d3dcdda2427f808af4ee7d884c604a565ffdc3a4f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d7c19d199901a0bbf81bbdf3abaf7c524ecbe39a32b5b68ebfeb480b518e105aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x452141b19dadefb200eed8134420fb2bc0d8bc14f665536251cd24d293daf0b1",
+        "lastblockhash" : "0x5ef5f781f5fd329009e289bbd574db0a98f37516df1a36c4ad11ff750782b759",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest317BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest317BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest317BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050bb4",
-                    "hash" : "0xd5c9a48dbf93a6ff1ff6da51bd54510ab365d42fa88e02a5ec354917b076829e",
-                    "mixHash" : "0xd3275e1f1d00b90240608c0fc6effc55650b0f4e3c362cb641554ed7e09d5670",
-                    "nonce" : "0xea31d70fdc9678ca",
+                    "hash" : "0x756836a56687159e393589d4c7c66628663145dd2acc5481ec25a5f2dc1e4f8c",
+                    "mixHash" : "0xfb71f71df1bfa6cc12c72c6e7644477442c4d3286bbbcfed311e808941fe4aff",
+                    "nonce" : "0xb50386a31e1aeca8",
                     "number" : "0x01",
                     "parentHash" : "0xb3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8",
                     "receiptTrie" : "0x18303a743eb80a0aae70c25097d7f37372b8ea3516c257338cb13c5045a75c34",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a080c9f22c9d28575ea546363164b5e761b91831cd16dc3379a62c5179cdedfa21a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa018303a743eb80a0aae70c25097d7f37372b8ea3516c257338cb13c5045a75c34b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050bb48203e880a0d3275e1f1d00b90240608c0fc6effc55650b0f4e3c362cb641554ed7e09d567088ea31d70fdc9678caf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a080c9f22c9d28575ea546363164b5e761b91831cd16dc3379a62c5179cdedfa21a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa018303a743eb80a0aae70c25097d7f37372b8ea3516c257338cb13c5045a75c34b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050bb48203e880a0fb71f71df1bfa6cc12c72c6e7644477442c4d3286bbbcfed311e808941fe4aff88b50386a31e1aeca8f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d7c19d199901a0bbf81bbdf3abaf7c524ecbe39a32b5b68ebfeb480b518e105aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd5c9a48dbf93a6ff1ff6da51bd54510ab365d42fa88e02a5ec354917b076829e",
+        "lastblockhash" : "0x756836a56687159e393589d4c7c66628663145dd2acc5481ec25a5f2dc1e4f8c",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest317BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest317BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest317BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050b1e",
-                    "hash" : "0x2f0485f81d603395a6319a021b4c9b95dac56efdd96635a977a91fad68f6146c",
-                    "mixHash" : "0x23332b92b0c7566d9c7fcea3a21f7a41d9601a26efbc94270207c5ce5ee69e6d",
-                    "nonce" : "0x365ed9aa944320e6",
+                    "hash" : "0x375b8e747e3a62b79a67c330b6a42f2648743274d5a218c905c05232d75a9b41",
+                    "mixHash" : "0xf4d337efce0f9f043f661a27b9600613b5b3ecf05756b59d82bbc5bea1971462",
+                    "nonce" : "0xe87508c00a85b893",
                     "number" : "0x01",
                     "parentHash" : "0xb3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8",
                     "receiptTrie" : "0xde6dea443d89cac75bcaa2ac5b02bce2d3a287630297216f199fa7331f7303b5",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02f87b46a4bb82b5908c77ffeeaf6d1198f789aa456497bede35d8c0797a290e6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0de6dea443d89cac75bcaa2ac5b02bce2d3a287630297216f199fa7331f7303b5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b1e8203e880a023332b92b0c7566d9c7fcea3a21f7a41d9601a26efbc94270207c5ce5ee69e6d88365ed9aa944320e6f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02f87b46a4bb82b5908c77ffeeaf6d1198f789aa456497bede35d8c0797a290e6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0de6dea443d89cac75bcaa2ac5b02bce2d3a287630297216f199fa7331f7303b5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b1e8203e880a0f4d337efce0f9f043f661a27b9600613b5b3ecf05756b59d82bbc5bea197146288e87508c00a85b893f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d7c19d199901a0bbf81bbdf3abaf7c524ecbe39a32b5b68ebfeb480b518e105aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2f0485f81d603395a6319a021b4c9b95dac56efdd96635a977a91fad68f6146c",
+        "lastblockhash" : "0x375b8e747e3a62b79a67c330b6a42f2648743274d5a218c905c05232d75a9b41",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest317BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest317BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest317BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050b1e",
-                    "hash" : "0x7215f24f2897c3a93823ac76f2df65daa229cf9a5a9d9b6b6cd28982c8924dca",
-                    "mixHash" : "0x46c31d39b430de4d488f72e2cae84459b6aaeaf6ded082cc9d94543c1dd54ae6",
-                    "nonce" : "0x50d6855a76e08649",
+                    "hash" : "0x0f7d9b0ffb24b96160df0cc085e65dcffe716d27543dabe3ad142942c6681d97",
+                    "mixHash" : "0x5ee8012b68331da2e859d64c0f4ca4bb36b4c8387812221ded145f3b26bb96ed",
+                    "nonce" : "0xd078db7118511162",
                     "number" : "0x01",
                     "parentHash" : "0xb3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8",
                     "receiptTrie" : "0xde6dea443d89cac75bcaa2ac5b02bce2d3a287630297216f199fa7331f7303b5",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02f87b46a4bb82b5908c77ffeeaf6d1198f789aa456497bede35d8c0797a290e6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0de6dea443d89cac75bcaa2ac5b02bce2d3a287630297216f199fa7331f7303b5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b1e8203e880a046c31d39b430de4d488f72e2cae84459b6aaeaf6ded082cc9d94543c1dd54ae68850d6855a76e08649f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02f87b46a4bb82b5908c77ffeeaf6d1198f789aa456497bede35d8c0797a290e6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0de6dea443d89cac75bcaa2ac5b02bce2d3a287630297216f199fa7331f7303b5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b1e8203e880a05ee8012b68331da2e859d64c0f4ca4bb36b4c8387812221ded145f3b26bb96ed88d078db7118511162f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d7c19d199901a0bbf81bbdf3abaf7c524ecbe39a32b5b68ebfeb480b518e105aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7215f24f2897c3a93823ac76f2df65daa229cf9a5a9d9b6b6cd28982c8924dca",
+        "lastblockhash" : "0x0f7d9b0ffb24b96160df0cc085e65dcffe716d27543dabe3ad142942c6681d97",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest319BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest319BC.json
index 66dc46842..5b96b966c 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest319BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest319BC.json
@@ -2,8 +2,8 @@
     "randomStatetest319BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest319BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest319BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x055fe1",
-                    "hash" : "0x2867e4d3295f448cb662267a541039f60dc3e69e3e12a4fcf4e062c62b1f9e3c",
-                    "mixHash" : "0x5d197263851374e3c98025f854b29ce65076228c13accb7454abd4100176393f",
-                    "nonce" : "0x1efd33eea223aa9e",
+                    "hash" : "0xa8d195b4f91171e712afe205886a9bdf66b47773c8610bba4c73b32b05a658ad",
+                    "mixHash" : "0xd9e640a9744ab1acae7092b7b2592e8d29c2dfe85f7037fc0e4ca9f2e491f548",
+                    "nonce" : "0xfddc3e7a1b669cf9",
                     "number" : "0x01",
                     "parentHash" : "0xc02e655cee7d07218d91f14ce510aab24f0395fcc1928eaa1b951d97c144b928",
                     "receiptTrie" : "0xb5ea995ec24a621951118bc7d3c8649d6d7863aeacc1320f8cd51b3adb4a6849",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0c02e655cee7d07218d91f14ce510aab24f0395fcc1928eaa1b951d97c144b928a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0811f99a1a1303dd17c99448a6ec23444534ee8d76359077ddea6038225f97b06a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0b5ea995ec24a621951118bc7d3c8649d6d7863aeacc1320f8cd51b3adb4a6849b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83055fe18203e880a05d197263851374e3c98025f854b29ce65076228c13accb7454abd4100176393f881efd33eea223aa9ef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0c02e655cee7d07218d91f14ce510aab24f0395fcc1928eaa1b951d97c144b928a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0811f99a1a1303dd17c99448a6ec23444534ee8d76359077ddea6038225f97b06a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0b5ea995ec24a621951118bc7d3c8649d6d7863aeacc1320f8cd51b3adb4a6849b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83055fe18203e880a0d9e640a9744ab1acae7092b7b2592e8d29c2dfe85f7037fc0e4ca9f2e491f54888fddc3e7a1b669cf9f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08f59afd681948dc4827d75b443c8e1586bbce168a54df2bcde546fcc8a6ed60ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2867e4d3295f448cb662267a541039f60dc3e69e3e12a4fcf4e062c62b1f9e3c",
+        "lastblockhash" : "0xa8d195b4f91171e712afe205886a9bdf66b47773c8610bba4c73b32b05a658ad",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest319BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest319BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest319BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x055e4d",
-                    "hash" : "0x7458b66af0b158c73c29bae6918851bd6080b6f53103c459512ec8aa7c954cf4",
-                    "mixHash" : "0x5d9f8438528e0d36190c522794d43193ee0193d38c2543058a4396e6eead83bd",
-                    "nonce" : "0xffdfaf8c4c8ea43d",
+                    "hash" : "0x7c0d1554e3ffea93e55d925887322e74427ec9db1c2513dd40e4f6ca2f28483d",
+                    "mixHash" : "0x50e9e680aa7abead2954edbb736cad849676ffeb821d7e198bfffcfa892defdf",
+                    "nonce" : "0xd3d2940cc7032e03",
                     "number" : "0x01",
                     "parentHash" : "0xc02e655cee7d07218d91f14ce510aab24f0395fcc1928eaa1b951d97c144b928",
                     "receiptTrie" : "0x88a959120855e204acd952099ed824d824ca3e83dff395c4cbcf44d79c74f705",
-                    "stateRoot" : "0x02bbca73a69d1a584aa6acadd65fde6260eb5a48f85c8c6311bff9e309f99807",
+                    "stateRoot" : "0xe0203d630fa2cb16b589c424385c6c1a016d4a5662304819d3f570d0a5216520",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0c02e655cee7d07218d91f14ce510aab24f0395fcc1928eaa1b951d97c144b928a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a002bbca73a69d1a584aa6acadd65fde6260eb5a48f85c8c6311bff9e309f99807a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa088a959120855e204acd952099ed824d824ca3e83dff395c4cbcf44d79c74f705b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83055e4d8203e880a05d9f8438528e0d36190c522794d43193ee0193d38c2543058a4396e6eead83bd88ffdfaf8c4c8ea43df865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0c02e655cee7d07218d91f14ce510aab24f0395fcc1928eaa1b951d97c144b928a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e0203d630fa2cb16b589c424385c6c1a016d4a5662304819d3f570d0a5216520a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa088a959120855e204acd952099ed824d824ca3e83dff395c4cbcf44d79c74f705b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83055e4d8203e880a050e9e680aa7abead2954edbb736cad849676ffeb821d7e198bfffcfa892defdf88d3d2940cc7032e03f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08f59afd681948dc4827d75b443c8e1586bbce168a54df2bcde546fcc8a6ed60ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7458b66af0b158c73c29bae6918851bd6080b6f53103c459512ec8aa7c954cf4",
+        "lastblockhash" : "0x7c0d1554e3ffea93e55d925887322e74427ec9db1c2513dd40e4f6ca2f28483d",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x44404243424142915a2055",
@@ -235,8 +228,8 @@
     "randomStatetest319BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest319BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest319BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x055fe1",
-                    "hash" : "0x4b3e865e1c804fe40aecd028d817361b70d50f822f6aae7c1d55e46b93db48b7",
-                    "mixHash" : "0xe8733318c2189649887403cebd3f19204bc6a8f165f410c5134edfef10487732",
-                    "nonce" : "0x412c57055afbadad",
+                    "hash" : "0x91389c8dde332c9c0ef2298e04427edc872aa704852c8770bf68959df015108c",
+                    "mixHash" : "0x2c1eed12ba760e05c519f8e479b27e3d24ff76afc7322e3083cb95b13644c63c",
+                    "nonce" : "0x9179ee88d554bb00",
                     "number" : "0x01",
                     "parentHash" : "0xc02e655cee7d07218d91f14ce510aab24f0395fcc1928eaa1b951d97c144b928",
                     "receiptTrie" : "0xf93d9b3b2943a72d0b09950e981498f6853bbe6f29efc6528b475460ff0f5be3",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0c02e655cee7d07218d91f14ce510aab24f0395fcc1928eaa1b951d97c144b928a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b3f26ad099fa3f27948a2a5c1c47a8c8f31b5aaff54ee83369a0222074b27df6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f93d9b3b2943a72d0b09950e981498f6853bbe6f29efc6528b475460ff0f5be3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83055fe18203e880a0e8733318c2189649887403cebd3f19204bc6a8f165f410c5134edfef1048773288412c57055afbadadf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0c02e655cee7d07218d91f14ce510aab24f0395fcc1928eaa1b951d97c144b928a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b3f26ad099fa3f27948a2a5c1c47a8c8f31b5aaff54ee83369a0222074b27df6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f93d9b3b2943a72d0b09950e981498f6853bbe6f29efc6528b475460ff0f5be3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83055fe18203e880a02c1eed12ba760e05c519f8e479b27e3d24ff76afc7322e3083cb95b13644c63c889179ee88d554bb00f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08f59afd681948dc4827d75b443c8e1586bbce168a54df2bcde546fcc8a6ed60ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4b3e865e1c804fe40aecd028d817361b70d50f822f6aae7c1d55e46b93db48b7",
+        "lastblockhash" : "0x91389c8dde332c9c0ef2298e04427edc872aa704852c8770bf68959df015108c",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest319BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest319BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest319BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x055fe1",
-                    "hash" : "0x31cd5ab01197612cd503fa2209b3a9ffa752682597e43e58288e448f1ea4ea0b",
-                    "mixHash" : "0x137bfa17e084016e73de397fceb14d6626cda905458a6f96a4896351384bc88b",
-                    "nonce" : "0xd55b53eac2176da2",
+                    "hash" : "0x478ad3934d459f883015414ac318a7fdd96a268c69aeff2d278b502d80493650",
+                    "mixHash" : "0xb1b6053cf73b8a80a669e0e119460be322ce558905cdfb69ab047feaff325414",
+                    "nonce" : "0x3e90043dc219d334",
                     "number" : "0x01",
                     "parentHash" : "0xc02e655cee7d07218d91f14ce510aab24f0395fcc1928eaa1b951d97c144b928",
                     "receiptTrie" : "0xf93d9b3b2943a72d0b09950e981498f6853bbe6f29efc6528b475460ff0f5be3",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0c02e655cee7d07218d91f14ce510aab24f0395fcc1928eaa1b951d97c144b928a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b3f26ad099fa3f27948a2a5c1c47a8c8f31b5aaff54ee83369a0222074b27df6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f93d9b3b2943a72d0b09950e981498f6853bbe6f29efc6528b475460ff0f5be3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83055fe18203e880a0137bfa17e084016e73de397fceb14d6626cda905458a6f96a4896351384bc88b88d55b53eac2176da2f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0c02e655cee7d07218d91f14ce510aab24f0395fcc1928eaa1b951d97c144b928a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b3f26ad099fa3f27948a2a5c1c47a8c8f31b5aaff54ee83369a0222074b27df6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f93d9b3b2943a72d0b09950e981498f6853bbe6f29efc6528b475460ff0f5be3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83055fe18203e880a0b1b6053cf73b8a80a669e0e119460be322ce558905cdfb69ab047feaff325414883e90043dc219d334f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08f59afd681948dc4827d75b443c8e1586bbce168a54df2bcde546fcc8a6ed60ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x31cd5ab01197612cd503fa2209b3a9ffa752682597e43e58288e448f1ea4ea0b",
+        "lastblockhash" : "0x478ad3934d459f883015414ac318a7fdd96a268c69aeff2d278b502d80493650",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest319BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest319BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest319BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x055fe1",
-                    "hash" : "0x0ae6bbc998654256689840cb3b2500fd252f9bf08b4622cd7546cd002b62f946",
-                    "mixHash" : "0x01cec429e27d24958ddb047e2ac0d7cd580794936c4a8067b60a50e5c386f3d0",
-                    "nonce" : "0x29ec7ba7117a9b5b",
+                    "hash" : "0x0df9f79e1ae7a8f6e77caadfbaa6a13523586ef413fda43898fb77d446f58f59",
+                    "mixHash" : "0xfa92734d655624091400e0f690f0b950cd14fa47eb635aea60ba243e5d1b19d1",
+                    "nonce" : "0x3ad40ecb442384c5",
                     "number" : "0x01",
                     "parentHash" : "0xc02e655cee7d07218d91f14ce510aab24f0395fcc1928eaa1b951d97c144b928",
                     "receiptTrie" : "0xf93d9b3b2943a72d0b09950e981498f6853bbe6f29efc6528b475460ff0f5be3",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0c02e655cee7d07218d91f14ce510aab24f0395fcc1928eaa1b951d97c144b928a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b3f26ad099fa3f27948a2a5c1c47a8c8f31b5aaff54ee83369a0222074b27df6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f93d9b3b2943a72d0b09950e981498f6853bbe6f29efc6528b475460ff0f5be3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83055fe18203e880a001cec429e27d24958ddb047e2ac0d7cd580794936c4a8067b60a50e5c386f3d08829ec7ba7117a9b5bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0c02e655cee7d07218d91f14ce510aab24f0395fcc1928eaa1b951d97c144b928a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b3f26ad099fa3f27948a2a5c1c47a8c8f31b5aaff54ee83369a0222074b27df6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f93d9b3b2943a72d0b09950e981498f6853bbe6f29efc6528b475460ff0f5be3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83055fe18203e880a0fa92734d655624091400e0f690f0b950cd14fa47eb635aea60ba243e5d1b19d1883ad40ecb442384c5f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08f59afd681948dc4827d75b443c8e1586bbce168a54df2bcde546fcc8a6ed60ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0ae6bbc998654256689840cb3b2500fd252f9bf08b4622cd7546cd002b62f946",
+        "lastblockhash" : "0x0df9f79e1ae7a8f6e77caadfbaa6a13523586ef413fda43898fb77d446f58f59",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest319BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest319BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest319BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x055fe1",
-                    "hash" : "0xcc8ee2eafbacaace897de81bb4217a71b63d2440406d74722319ec1a6d662e7b",
-                    "mixHash" : "0x9abb96ea8cb0a6066921fafb5a2e36af335f503cb037298bdf47c23b44a7bca7",
-                    "nonce" : "0xf80329f48194e995",
+                    "hash" : "0x2d92ad5de39d6fc750651f028f8f46034bcdedd11c28a80d087185a6334dcdc7",
+                    "mixHash" : "0x8e699ab13a1f7d92709cc031058e7c883f0d4fe1c4d2f17b85832427cd0a3732",
+                    "nonce" : "0x3b2e9753f145b2be",
                     "number" : "0x01",
                     "parentHash" : "0xc02e655cee7d07218d91f14ce510aab24f0395fcc1928eaa1b951d97c144b928",
                     "receiptTrie" : "0xf93d9b3b2943a72d0b09950e981498f6853bbe6f29efc6528b475460ff0f5be3",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0c02e655cee7d07218d91f14ce510aab24f0395fcc1928eaa1b951d97c144b928a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b3f26ad099fa3f27948a2a5c1c47a8c8f31b5aaff54ee83369a0222074b27df6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f93d9b3b2943a72d0b09950e981498f6853bbe6f29efc6528b475460ff0f5be3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83055fe18203e880a09abb96ea8cb0a6066921fafb5a2e36af335f503cb037298bdf47c23b44a7bca788f80329f48194e995f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0c02e655cee7d07218d91f14ce510aab24f0395fcc1928eaa1b951d97c144b928a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b3f26ad099fa3f27948a2a5c1c47a8c8f31b5aaff54ee83369a0222074b27df6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f93d9b3b2943a72d0b09950e981498f6853bbe6f29efc6528b475460ff0f5be3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83055fe18203e880a08e699ab13a1f7d92709cc031058e7c883f0d4fe1c4d2f17b85832427cd0a3732883b2e9753f145b2bef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08f59afd681948dc4827d75b443c8e1586bbce168a54df2bcde546fcc8a6ed60ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcc8ee2eafbacaace897de81bb4217a71b63d2440406d74722319ec1a6d662e7b",
+        "lastblockhash" : "0x2d92ad5de39d6fc750651f028f8f46034bcdedd11c28a80d087185a6334dcdc7",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest330BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest330BC.json
index 809f08d7c..2f000d841 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest330BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest330BC.json
@@ -2,8 +2,8 @@
     "randomStatetest330BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest330BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest330BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc082",
-                    "hash" : "0x69276f1ddb2045d1813a3f87650337b384a1ede86fafebb922559fee4f1e6756",
-                    "mixHash" : "0x13b4f35250f54d45c9df2dc257731933e4a837d60ae733b39c6e52d0965ac869",
-                    "nonce" : "0xf2a805e6fd58bc8c",
+                    "hash" : "0x85eddfbf1a8cb718934763cbf06919878633f5bb38ea4ae1d930165d9868eece",
+                    "mixHash" : "0x30c8f5a87b146842e5f62de4f29a1b3b0c48cb9faee7073ed5441b3ddc5d21e7",
+                    "nonce" : "0x72bd5973046459d1",
                     "number" : "0x01",
                     "parentHash" : "0x0545c1a29dba9fafe274509f5db5e8c04f1a33fd310e92c899f8893836d372c0",
                     "receiptTrie" : "0x719576ea87e32296f1fabb9838ce314cff7d2eb76c4369757b455aca83e9c944",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x13293fe05ec395205d02c76b5afe496738ad9b213dcc6baf56a4c51603b0f90b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca00545c1a29dba9fafe274509f5db5e8c04f1a33fd310e92c899f8893836d372c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a054da9e39dcf70984463765f089283547a7d5f16e6a02875e51bc5065989a4c0fa013293fe05ec395205d02c76b5afe496738ad9b213dcc6baf56a4c51603b0f90ba0719576ea87e32296f1fabb9838ce314cff7d2eb76c4369757b455aca83e9c944b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c0828203e880a013b4f35250f54d45c9df2dc257731933e4a837d60ae733b39c6e52d0965ac86988f2a805e6fd58bc8cf90141f9013e8001842acfa56294095e7baea6a6c7c4c2dfeb977efac326af552d878429230dc2b8d87f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f0000000000000000000000000000000000000000000000000000000000000001547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f3235543787103c923b41a1f08805111ba03e1f33bec9fbeeb28fcfdda497e95ee88c3370ba614ca6f96ac40c60954c69c3a0605d2af161e799641032132e86d946222cedafc9f268d57cd03d7cb3afdb2e72c0",
+                "rlp" : "0xf90344f901fca00545c1a29dba9fafe274509f5db5e8c04f1a33fd310e92c899f8893836d372c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a054da9e39dcf70984463765f089283547a7d5f16e6a02875e51bc5065989a4c0fa013293fe05ec395205d02c76b5afe496738ad9b213dcc6baf56a4c51603b0f90ba0719576ea87e32296f1fabb9838ce314cff7d2eb76c4369757b455aca83e9c944b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c0828203e880a030c8f5a87b146842e5f62de4f29a1b3b0c48cb9faee7073ed5441b3ddc5d21e78872bd5973046459d1f90141f9013e8001842acfa56294095e7baea6a6c7c4c2dfeb977efac326af552d878429230dc2b8d87f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f0000000000000000000000000000000000000000000000000000000000000001547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f3235543787103c923b41a1f08805111ba03e1f33bec9fbeeb28fcfdda497e95ee88c3370ba614ca6f96ac40c60954c69c3a0605d2af161e799641032132e86d946222cedafc9f268d57cd03d7cb3afdb2e72c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f0000000000000000000000000000000000000000000000000000000000000001547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f3235543787103c923b41a1f0880511",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06de0727079133373b0b3f0404d017a270ff45c4d09d64b5eeb53aa94b269e93ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x69276f1ddb2045d1813a3f87650337b384a1ede86fafebb922559fee4f1e6756",
+        "lastblockhash" : "0x85eddfbf1a8cb718934763cbf06919878633f5bb38ea4ae1d930165d9868eece",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest330BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest330BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest330BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc38e",
-                    "hash" : "0x4ca9b39d918d116477bf5fdb818aea01965a3f9ec95a3c7340eac1de7dc11d47",
-                    "mixHash" : "0x259f490f021f9f72331c9151211d9c00f77d9d9b4af01124b88a6cad719f727e",
-                    "nonce" : "0xd381eff28dd82fcb",
+                    "hash" : "0x1425dfeaec68f720a1de41eed9b2b9450563bb2164782e8c15e184a3e42bed8f",
+                    "mixHash" : "0x7ab0a761426c8c77274bfaf458bfbdec9681df093ad1f79369179e15b9f553f9",
+                    "nonce" : "0x6fa3318b598fb01c",
                     "number" : "0x01",
                     "parentHash" : "0x0545c1a29dba9fafe274509f5db5e8c04f1a33fd310e92c899f8893836d372c0",
                     "receiptTrie" : "0x7df1e2b6cbd2a217d7578106e18c9bdf04cfb4d6200e627bf886c5b9f6cef15e",
-                    "stateRoot" : "0xb5046bdb69e755c1a8d1d44ebd48bc41e1d97bdbd1d847678b0544535a111bfd",
+                    "stateRoot" : "0x52f567129c3c13b91b465381fc247909a37443ea8ef362d683ace2a2f238ad21",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x13293fe05ec395205d02c76b5afe496738ad9b213dcc6baf56a4c51603b0f90b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca00545c1a29dba9fafe274509f5db5e8c04f1a33fd310e92c899f8893836d372c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b5046bdb69e755c1a8d1d44ebd48bc41e1d97bdbd1d847678b0544535a111bfda013293fe05ec395205d02c76b5afe496738ad9b213dcc6baf56a4c51603b0f90ba07df1e2b6cbd2a217d7578106e18c9bdf04cfb4d6200e627bf886c5b9f6cef15eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c38e8203e880a0259f490f021f9f72331c9151211d9c00f77d9d9b4af01124b88a6cad719f727e88d381eff28dd82fcbf90141f9013e8001842acfa56294095e7baea6a6c7c4c2dfeb977efac326af552d878429230dc2b8d87f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f0000000000000000000000000000000000000000000000000000000000000001547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f3235543787103c923b41a1f08805111ba03e1f33bec9fbeeb28fcfdda497e95ee88c3370ba614ca6f96ac40c60954c69c3a0605d2af161e799641032132e86d946222cedafc9f268d57cd03d7cb3afdb2e72c0",
+                "rlp" : "0xf90344f901fca00545c1a29dba9fafe274509f5db5e8c04f1a33fd310e92c899f8893836d372c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a052f567129c3c13b91b465381fc247909a37443ea8ef362d683ace2a2f238ad21a013293fe05ec395205d02c76b5afe496738ad9b213dcc6baf56a4c51603b0f90ba07df1e2b6cbd2a217d7578106e18c9bdf04cfb4d6200e627bf886c5b9f6cef15eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c38e8203e880a07ab0a761426c8c77274bfaf458bfbdec9681df093ad1f79369179e15b9f553f9886fa3318b598fb01cf90141f9013e8001842acfa56294095e7baea6a6c7c4c2dfeb977efac326af552d878429230dc2b8d87f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f0000000000000000000000000000000000000000000000000000000000000001547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f3235543787103c923b41a1f08805111ba03e1f33bec9fbeeb28fcfdda497e95ee88c3370ba614ca6f96ac40c60954c69c3a0605d2af161e799641032132e86d946222cedafc9f268d57cd03d7cb3afdb2e72c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f0000000000000000000000000000000000000000000000000000000000000001547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f3235543787103c923b41a1f0880511",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06de0727079133373b0b3f0404d017a270ff45c4d09d64b5eeb53aa94b269e93ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4ca9b39d918d116477bf5fdb818aea01965a3f9ec95a3c7340eac1de7dc11d47",
+        "lastblockhash" : "0x1425dfeaec68f720a1de41eed9b2b9450563bb2164782e8c15e184a3e42bed8f",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x29230dc2",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f0000000000000000000000000000000000000000000000000000000000000001547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f3235543787103c923b41a1f08805115560005155",
@@ -235,8 +228,8 @@
     "randomStatetest330BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest330BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest330BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc082",
-                    "hash" : "0x5ae814c4fc402216f96035ceb80b9d8f7708cba3a0af83efe1c4d75f86cb62b2",
-                    "mixHash" : "0xb0e39c38b3000126fc254394165047c80a3f104acf46a5f26932467aea574c70",
-                    "nonce" : "0x75050bffa7325035",
+                    "hash" : "0xef3a235ff3856237b00bcb5e588d057a24462aeb4173ab73dfcdea77532963af",
+                    "mixHash" : "0x93d70ce87b8429374b08f646ac3de99e8fea2eeb5e6de35ea13eaca35531da72",
+                    "nonce" : "0xbb1913f2c06e98b8",
                     "number" : "0x01",
                     "parentHash" : "0x0545c1a29dba9fafe274509f5db5e8c04f1a33fd310e92c899f8893836d372c0",
                     "receiptTrie" : "0xac3435972f960c935f92f387054fcd6d90efbf4a74aa66c2f61860084a5eb55a",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0x13293fe05ec395205d02c76b5afe496738ad9b213dcc6baf56a4c51603b0f90b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca00545c1a29dba9fafe274509f5db5e8c04f1a33fd310e92c899f8893836d372c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0924aad2fa8a90916fab7471b0308f1077892688757c7e2c3f8041bd1b38b5a45a013293fe05ec395205d02c76b5afe496738ad9b213dcc6baf56a4c51603b0f90ba0ac3435972f960c935f92f387054fcd6d90efbf4a74aa66c2f61860084a5eb55ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c0828203e880a0b0e39c38b3000126fc254394165047c80a3f104acf46a5f26932467aea574c708875050bffa7325035f90141f9013e8001842acfa56294095e7baea6a6c7c4c2dfeb977efac326af552d878429230dc2b8d87f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f0000000000000000000000000000000000000000000000000000000000000001547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f3235543787103c923b41a1f08805111ba03e1f33bec9fbeeb28fcfdda497e95ee88c3370ba614ca6f96ac40c60954c69c3a0605d2af161e799641032132e86d946222cedafc9f268d57cd03d7cb3afdb2e72c0",
+                "rlp" : "0xf90344f901fca00545c1a29dba9fafe274509f5db5e8c04f1a33fd310e92c899f8893836d372c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0924aad2fa8a90916fab7471b0308f1077892688757c7e2c3f8041bd1b38b5a45a013293fe05ec395205d02c76b5afe496738ad9b213dcc6baf56a4c51603b0f90ba0ac3435972f960c935f92f387054fcd6d90efbf4a74aa66c2f61860084a5eb55ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c0828203e880a093d70ce87b8429374b08f646ac3de99e8fea2eeb5e6de35ea13eaca35531da7288bb1913f2c06e98b8f90141f9013e8001842acfa56294095e7baea6a6c7c4c2dfeb977efac326af552d878429230dc2b8d87f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f0000000000000000000000000000000000000000000000000000000000000001547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f3235543787103c923b41a1f08805111ba03e1f33bec9fbeeb28fcfdda497e95ee88c3370ba614ca6f96ac40c60954c69c3a0605d2af161e799641032132e86d946222cedafc9f268d57cd03d7cb3afdb2e72c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f0000000000000000000000000000000000000000000000000000000000000001547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f3235543787103c923b41a1f0880511",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06de0727079133373b0b3f0404d017a270ff45c4d09d64b5eeb53aa94b269e93ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5ae814c4fc402216f96035ceb80b9d8f7708cba3a0af83efe1c4d75f86cb62b2",
+        "lastblockhash" : "0xef3a235ff3856237b00bcb5e588d057a24462aeb4173ab73dfcdea77532963af",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest330BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest330BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest330BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc082",
-                    "hash" : "0x39b5ea446c6c966c792673192f73a615ea474ce7c2af5990609b602fdb53063f",
-                    "mixHash" : "0xbfdee9b08f32321c359798f44d2fcbacb084b57af92100a2b00be81f4be73ad7",
-                    "nonce" : "0xd5045f5847f776f6",
+                    "hash" : "0xa2cf08489f0897c96a0459431685b4c906eac909b5d9895c1c5851c07ca69a2e",
+                    "mixHash" : "0xd5dcf857f3d6245b3a9b1b0c3988cfe9ec97a1e13cd9d93fc867467a8dc46216",
+                    "nonce" : "0x99e8ff3abf035822",
                     "number" : "0x01",
                     "parentHash" : "0x0545c1a29dba9fafe274509f5db5e8c04f1a33fd310e92c899f8893836d372c0",
                     "receiptTrie" : "0xac3435972f960c935f92f387054fcd6d90efbf4a74aa66c2f61860084a5eb55a",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0x13293fe05ec395205d02c76b5afe496738ad9b213dcc6baf56a4c51603b0f90b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca00545c1a29dba9fafe274509f5db5e8c04f1a33fd310e92c899f8893836d372c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0924aad2fa8a90916fab7471b0308f1077892688757c7e2c3f8041bd1b38b5a45a013293fe05ec395205d02c76b5afe496738ad9b213dcc6baf56a4c51603b0f90ba0ac3435972f960c935f92f387054fcd6d90efbf4a74aa66c2f61860084a5eb55ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c0828203e880a0bfdee9b08f32321c359798f44d2fcbacb084b57af92100a2b00be81f4be73ad788d5045f5847f776f6f90141f9013e8001842acfa56294095e7baea6a6c7c4c2dfeb977efac326af552d878429230dc2b8d87f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f0000000000000000000000000000000000000000000000000000000000000001547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f3235543787103c923b41a1f08805111ba03e1f33bec9fbeeb28fcfdda497e95ee88c3370ba614ca6f96ac40c60954c69c3a0605d2af161e799641032132e86d946222cedafc9f268d57cd03d7cb3afdb2e72c0",
+                "rlp" : "0xf90344f901fca00545c1a29dba9fafe274509f5db5e8c04f1a33fd310e92c899f8893836d372c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0924aad2fa8a90916fab7471b0308f1077892688757c7e2c3f8041bd1b38b5a45a013293fe05ec395205d02c76b5afe496738ad9b213dcc6baf56a4c51603b0f90ba0ac3435972f960c935f92f387054fcd6d90efbf4a74aa66c2f61860084a5eb55ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c0828203e880a0d5dcf857f3d6245b3a9b1b0c3988cfe9ec97a1e13cd9d93fc867467a8dc462168899e8ff3abf035822f90141f9013e8001842acfa56294095e7baea6a6c7c4c2dfeb977efac326af552d878429230dc2b8d87f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f0000000000000000000000000000000000000000000000000000000000000001547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f3235543787103c923b41a1f08805111ba03e1f33bec9fbeeb28fcfdda497e95ee88c3370ba614ca6f96ac40c60954c69c3a0605d2af161e799641032132e86d946222cedafc9f268d57cd03d7cb3afdb2e72c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f0000000000000000000000000000000000000000000000000000000000000001547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f3235543787103c923b41a1f0880511",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06de0727079133373b0b3f0404d017a270ff45c4d09d64b5eeb53aa94b269e93ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x39b5ea446c6c966c792673192f73a615ea474ce7c2af5990609b602fdb53063f",
+        "lastblockhash" : "0xa2cf08489f0897c96a0459431685b4c906eac909b5d9895c1c5851c07ca69a2e",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest330BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest330BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest330BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xbfec",
-                    "hash" : "0x152e51f82df9ef54244b6b68b3c21c7cfafcb4209e9e0577a894b55c1ae5fc91",
-                    "mixHash" : "0xcfd18d61d0c3203877213e709f1696efccb82d680ad3865aec5e482d3c28cdab",
-                    "nonce" : "0xf14a30ae018769fa",
+                    "hash" : "0x7d7258fabef142969bf6d6eaf467c16f09dea1a94dc946125eeea2bb902a7727",
+                    "mixHash" : "0xc771ca9faafbceacc4c3633554492206c161aac55ccbf1c9ce0da9fa0e2141d2",
+                    "nonce" : "0xa260cca73e883e95",
                     "number" : "0x01",
                     "parentHash" : "0x0545c1a29dba9fafe274509f5db5e8c04f1a33fd310e92c899f8893836d372c0",
                     "receiptTrie" : "0x77c4b65e40ad7303d95888c1571726bb6527f4fb473591b098b9b6fdd666af0a",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0x13293fe05ec395205d02c76b5afe496738ad9b213dcc6baf56a4c51603b0f90b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca00545c1a29dba9fafe274509f5db5e8c04f1a33fd310e92c899f8893836d372c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04bc67dbdb500866f0b56dff72dbae232de17dac69983c6d6dc9893b415bba363a013293fe05ec395205d02c76b5afe496738ad9b213dcc6baf56a4c51603b0f90ba077c4b65e40ad7303d95888c1571726bb6527f4fb473591b098b9b6fdd666af0ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bfec8203e880a0cfd18d61d0c3203877213e709f1696efccb82d680ad3865aec5e482d3c28cdab88f14a30ae018769faf90141f9013e8001842acfa56294095e7baea6a6c7c4c2dfeb977efac326af552d878429230dc2b8d87f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f0000000000000000000000000000000000000000000000000000000000000001547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f3235543787103c923b41a1f08805111ba03e1f33bec9fbeeb28fcfdda497e95ee88c3370ba614ca6f96ac40c60954c69c3a0605d2af161e799641032132e86d946222cedafc9f268d57cd03d7cb3afdb2e72c0",
+                "rlp" : "0xf90344f901fca00545c1a29dba9fafe274509f5db5e8c04f1a33fd310e92c899f8893836d372c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04bc67dbdb500866f0b56dff72dbae232de17dac69983c6d6dc9893b415bba363a013293fe05ec395205d02c76b5afe496738ad9b213dcc6baf56a4c51603b0f90ba077c4b65e40ad7303d95888c1571726bb6527f4fb473591b098b9b6fdd666af0ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bfec8203e880a0c771ca9faafbceacc4c3633554492206c161aac55ccbf1c9ce0da9fa0e2141d288a260cca73e883e95f90141f9013e8001842acfa56294095e7baea6a6c7c4c2dfeb977efac326af552d878429230dc2b8d87f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f0000000000000000000000000000000000000000000000000000000000000001547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f3235543787103c923b41a1f08805111ba03e1f33bec9fbeeb28fcfdda497e95ee88c3370ba614ca6f96ac40c60954c69c3a0605d2af161e799641032132e86d946222cedafc9f268d57cd03d7cb3afdb2e72c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f0000000000000000000000000000000000000000000000000000000000000001547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f3235543787103c923b41a1f0880511",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06de0727079133373b0b3f0404d017a270ff45c4d09d64b5eeb53aa94b269e93ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x152e51f82df9ef54244b6b68b3c21c7cfafcb4209e9e0577a894b55c1ae5fc91",
+        "lastblockhash" : "0x7d7258fabef142969bf6d6eaf467c16f09dea1a94dc946125eeea2bb902a7727",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest330BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest330BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest330BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xbfec",
-                    "hash" : "0x07d574da585b9f9c911373bcc5dd197cc626ded3eb24b192c5f1c56e34a934ff",
-                    "mixHash" : "0x8868285b8e77481cdf5b74de862c301ad0bb59ed8ba29f05bcc1e1e7019ef326",
-                    "nonce" : "0xd2e8cb40e17429ab",
+                    "hash" : "0xfef3a26933bc1aa3bde31c86f9407ca61d3434517fe118019fc726527b81b896",
+                    "mixHash" : "0x2165382299790d80439869a45253fb044585a97273e9f010da77a418b0fa00e8",
+                    "nonce" : "0xc8f39e8008062898",
                     "number" : "0x01",
                     "parentHash" : "0x0545c1a29dba9fafe274509f5db5e8c04f1a33fd310e92c899f8893836d372c0",
                     "receiptTrie" : "0x77c4b65e40ad7303d95888c1571726bb6527f4fb473591b098b9b6fdd666af0a",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0x13293fe05ec395205d02c76b5afe496738ad9b213dcc6baf56a4c51603b0f90b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca00545c1a29dba9fafe274509f5db5e8c04f1a33fd310e92c899f8893836d372c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04bc67dbdb500866f0b56dff72dbae232de17dac69983c6d6dc9893b415bba363a013293fe05ec395205d02c76b5afe496738ad9b213dcc6baf56a4c51603b0f90ba077c4b65e40ad7303d95888c1571726bb6527f4fb473591b098b9b6fdd666af0ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bfec8203e880a08868285b8e77481cdf5b74de862c301ad0bb59ed8ba29f05bcc1e1e7019ef32688d2e8cb40e17429abf90141f9013e8001842acfa56294095e7baea6a6c7c4c2dfeb977efac326af552d878429230dc2b8d87f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f0000000000000000000000000000000000000000000000000000000000000001547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f3235543787103c923b41a1f08805111ba03e1f33bec9fbeeb28fcfdda497e95ee88c3370ba614ca6f96ac40c60954c69c3a0605d2af161e799641032132e86d946222cedafc9f268d57cd03d7cb3afdb2e72c0",
+                "rlp" : "0xf90344f901fca00545c1a29dba9fafe274509f5db5e8c04f1a33fd310e92c899f8893836d372c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04bc67dbdb500866f0b56dff72dbae232de17dac69983c6d6dc9893b415bba363a013293fe05ec395205d02c76b5afe496738ad9b213dcc6baf56a4c51603b0f90ba077c4b65e40ad7303d95888c1571726bb6527f4fb473591b098b9b6fdd666af0ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bfec8203e880a02165382299790d80439869a45253fb044585a97273e9f010da77a418b0fa00e888c8f39e8008062898f90141f9013e8001842acfa56294095e7baea6a6c7c4c2dfeb977efac326af552d878429230dc2b8d87f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f0000000000000000000000000000000000000000000000000000000000000001547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f3235543787103c923b41a1f08805111ba03e1f33bec9fbeeb28fcfdda497e95ee88c3370ba614ca6f96ac40c60954c69c3a0605d2af161e799641032132e86d946222cedafc9f268d57cd03d7cb3afdb2e72c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f0000000000000000000000000000000000000000000000000000000000000001547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f3235543787103c923b41a1f0880511",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06de0727079133373b0b3f0404d017a270ff45c4d09d64b5eeb53aa94b269e93ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x07d574da585b9f9c911373bcc5dd197cc626ded3eb24b192c5f1c56e34a934ff",
+        "lastblockhash" : "0xfef3a26933bc1aa3bde31c86f9407ca61d3434517fe118019fc726527b81b896",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest331BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest331BC.json
index 89588c3f3..d99043c39 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest331BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest331BC.json
@@ -2,8 +2,8 @@
     "randomStatetest331BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest331BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest331BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb04d",
-                    "hash" : "0xc9b0b99fa8a08504a8f12af1f6f33607eba15f9fbb4f700d525f6b1b8a1348a0",
-                    "mixHash" : "0xa06f838f94db0228da8f015d1ee46870e9d973c3d4262b3d0b4dc868fc5f8056",
-                    "nonce" : "0xa1b7b099394e1f0f",
+                    "hash" : "0x4550f41cc38c0e38603946d66f5017852be473d63503a3869db4bf30b89bb0cb",
+                    "mixHash" : "0xb9f2ba55967dd73998cc75ea6577d3721b4bc81ddabba90e8a628e0edba3e79a",
+                    "nonce" : "0xf2046f46ff3cae7f",
                     "number" : "0x01",
                     "parentHash" : "0xa8350477a60c8792887859543ccc5185c33d92594ce75de07caf2e28e8ee2d27",
                     "receiptTrie" : "0x622ce7ee2828b28799128a6ce0da0d26852154d528f8225b7fd81b6f870c0749",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x8212e4c00b99117a9d4fd2186431072d4cdd08869784757c9c49195c4b4665b7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90316f901fca0a8350477a60c8792887859543ccc5185c33d92594ce75de07caf2e28e8ee2d27a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a045caf96cd034940c4bc30bc2d9a4b3a15646a7806f2402967b6ecb39aa4517bda08212e4c00b99117a9d4fd2186431072d4cdd08869784757c9c49195c4b4665b7a0622ce7ee2828b28799128a6ce0da0d26852154d528f8225b7fd81b6f870c0749b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b04d8203e880a0a06f838f94db0228da8f015d1ee46870e9d973c3d4262b3d0b4dc868fc5f805688a1b7b099394e1f0ff90113f9011080018446cdc80094095e7baea6a6c7c4c2dfeb977efac326af552d878457cbfdd8b8aa7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5067f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000013a091ba0fad2921118d24da085bd30da963ed847e6fd782a9521677430169a87c2b7b630a019f13a92f98dc4b4b07e58d7df862896595eb00e73e0b13e930c5d0cc7de412dc0",
+                "rlp" : "0xf90316f901fca0a8350477a60c8792887859543ccc5185c33d92594ce75de07caf2e28e8ee2d27a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a045caf96cd034940c4bc30bc2d9a4b3a15646a7806f2402967b6ecb39aa4517bda08212e4c00b99117a9d4fd2186431072d4cdd08869784757c9c49195c4b4665b7a0622ce7ee2828b28799128a6ce0da0d26852154d528f8225b7fd81b6f870c0749b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b04d8203e880a0b9f2ba55967dd73998cc75ea6577d3721b4bc81ddabba90e8a628e0edba3e79a88f2046f46ff3cae7ff90113f9011080018446cdc80094095e7baea6a6c7c4c2dfeb977efac326af552d878457cbfdd8b8aa7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5067f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000013a091ba0fad2921118d24da085bd30da963ed847e6fd782a9521677430169a87c2b7b630a019f13a92f98dc4b4b07e58d7df862896595eb00e73e0b13e930c5d0cc7de412dc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5067f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000013a09",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a097f79e05ce7620b04045aa55fbe2f15f62cdadfd82ce4f9666203dc10ca1d767a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc9b0b99fa8a08504a8f12af1f6f33607eba15f9fbb4f700d525f6b1b8a1348a0",
+        "lastblockhash" : "0x4550f41cc38c0e38603946d66f5017852be473d63503a3869db4bf30b89bb0cb",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest331BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest331BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest331BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb359",
-                    "hash" : "0xf1bc9f59c35ba52d5b95852c621035525e4bbb663b3cfa4c68a9abbc756b6fa7",
-                    "mixHash" : "0xf6315f69caa340ca629e1d1a1c412e11b26aee228c867e5636375532856662fb",
-                    "nonce" : "0xc883369fb55a971e",
+                    "hash" : "0x67244ed4a06448c93f8a882a5fca956843bfe1d6fc12615cf03a75d4b3d219ec",
+                    "mixHash" : "0xb2d90dd970dd9cafa8af0c8ec7ad15d83b920c1d4806d5bf641db7347ebc5d20",
+                    "nonce" : "0xb43fd22f81a3f903",
                     "number" : "0x01",
                     "parentHash" : "0xa8350477a60c8792887859543ccc5185c33d92594ce75de07caf2e28e8ee2d27",
                     "receiptTrie" : "0x411652dcdd89c7443aebf9178ff77b4a738d2bbf87611ce4f09d2e16dff0d8b9",
-                    "stateRoot" : "0x3527887c10a5a9070d77b71664702f3d14516995e29f014130150495bf52c3de",
+                    "stateRoot" : "0xee132530c6e9a185f59f60d879662dfffc3225e4eedc534846a653124ad6e7ac",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8212e4c00b99117a9d4fd2186431072d4cdd08869784757c9c49195c4b4665b7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90316f901fca0a8350477a60c8792887859543ccc5185c33d92594ce75de07caf2e28e8ee2d27a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03527887c10a5a9070d77b71664702f3d14516995e29f014130150495bf52c3dea08212e4c00b99117a9d4fd2186431072d4cdd08869784757c9c49195c4b4665b7a0411652dcdd89c7443aebf9178ff77b4a738d2bbf87611ce4f09d2e16dff0d8b9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b3598203e880a0f6315f69caa340ca629e1d1a1c412e11b26aee228c867e5636375532856662fb88c883369fb55a971ef90113f9011080018446cdc80094095e7baea6a6c7c4c2dfeb977efac326af552d878457cbfdd8b8aa7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5067f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000013a091ba0fad2921118d24da085bd30da963ed847e6fd782a9521677430169a87c2b7b630a019f13a92f98dc4b4b07e58d7df862896595eb00e73e0b13e930c5d0cc7de412dc0",
+                "rlp" : "0xf90316f901fca0a8350477a60c8792887859543ccc5185c33d92594ce75de07caf2e28e8ee2d27a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ee132530c6e9a185f59f60d879662dfffc3225e4eedc534846a653124ad6e7aca08212e4c00b99117a9d4fd2186431072d4cdd08869784757c9c49195c4b4665b7a0411652dcdd89c7443aebf9178ff77b4a738d2bbf87611ce4f09d2e16dff0d8b9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b3598203e880a0b2d90dd970dd9cafa8af0c8ec7ad15d83b920c1d4806d5bf641db7347ebc5d2088b43fd22f81a3f903f90113f9011080018446cdc80094095e7baea6a6c7c4c2dfeb977efac326af552d878457cbfdd8b8aa7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5067f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000013a091ba0fad2921118d24da085bd30da963ed847e6fd782a9521677430169a87c2b7b630a019f13a92f98dc4b4b07e58d7df862896595eb00e73e0b13e930c5d0cc7de412dc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5067f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000013a09",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a097f79e05ce7620b04045aa55fbe2f15f62cdadfd82ce4f9666203dc10ca1d767a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf1bc9f59c35ba52d5b95852c621035525e4bbb663b3cfa4c68a9abbc756b6fa7",
+        "lastblockhash" : "0x67244ed4a06448c93f8a882a5fca956843bfe1d6fc12615cf03a75d4b3d219ec",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x57cbfdd8",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5067f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000013a0960005155",
@@ -235,8 +228,8 @@
     "randomStatetest331BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest331BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest331BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb04d",
-                    "hash" : "0xf530f60f83826a3f78529d488ab4a142fd3bddc43b788811079bf70817c1cdbf",
-                    "mixHash" : "0x3ab8d7e0bbbfd7cbcc01ecc5b21f045ce2660805d8c7614b5dd6de2ac8f85d33",
-                    "nonce" : "0x348b10ca3f228d44",
+                    "hash" : "0x0f4aa738d9c0b3e205e0c49ec106a115d39578758cca60cfc0eec344451f9abf",
+                    "mixHash" : "0x0343bb318d8eab31832aa0a459418e97e1e1034b644b4d8a630a97627a5dc421",
+                    "nonce" : "0xa4cdc3f288b45989",
                     "number" : "0x01",
                     "parentHash" : "0xa8350477a60c8792887859543ccc5185c33d92594ce75de07caf2e28e8ee2d27",
                     "receiptTrie" : "0x45bf1468bbb3fa2f0bf381fadf41330c7e80014f7e3f0dc2136110d083e398be",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0x8212e4c00b99117a9d4fd2186431072d4cdd08869784757c9c49195c4b4665b7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90316f901fca0a8350477a60c8792887859543ccc5185c33d92594ce75de07caf2e28e8ee2d27a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05c02f8948a5ce578da2f25f1e59b590ab1ab30c6f3d4ffa7c0db1cc10187d2a3a08212e4c00b99117a9d4fd2186431072d4cdd08869784757c9c49195c4b4665b7a045bf1468bbb3fa2f0bf381fadf41330c7e80014f7e3f0dc2136110d083e398beb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b04d8203e880a03ab8d7e0bbbfd7cbcc01ecc5b21f045ce2660805d8c7614b5dd6de2ac8f85d3388348b10ca3f228d44f90113f9011080018446cdc80094095e7baea6a6c7c4c2dfeb977efac326af552d878457cbfdd8b8aa7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5067f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000013a091ba0fad2921118d24da085bd30da963ed847e6fd782a9521677430169a87c2b7b630a019f13a92f98dc4b4b07e58d7df862896595eb00e73e0b13e930c5d0cc7de412dc0",
+                "rlp" : "0xf90316f901fca0a8350477a60c8792887859543ccc5185c33d92594ce75de07caf2e28e8ee2d27a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05c02f8948a5ce578da2f25f1e59b590ab1ab30c6f3d4ffa7c0db1cc10187d2a3a08212e4c00b99117a9d4fd2186431072d4cdd08869784757c9c49195c4b4665b7a045bf1468bbb3fa2f0bf381fadf41330c7e80014f7e3f0dc2136110d083e398beb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b04d8203e880a00343bb318d8eab31832aa0a459418e97e1e1034b644b4d8a630a97627a5dc42188a4cdc3f288b45989f90113f9011080018446cdc80094095e7baea6a6c7c4c2dfeb977efac326af552d878457cbfdd8b8aa7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5067f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000013a091ba0fad2921118d24da085bd30da963ed847e6fd782a9521677430169a87c2b7b630a019f13a92f98dc4b4b07e58d7df862896595eb00e73e0b13e930c5d0cc7de412dc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5067f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000013a09",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a097f79e05ce7620b04045aa55fbe2f15f62cdadfd82ce4f9666203dc10ca1d767a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf530f60f83826a3f78529d488ab4a142fd3bddc43b788811079bf70817c1cdbf",
+        "lastblockhash" : "0x0f4aa738d9c0b3e205e0c49ec106a115d39578758cca60cfc0eec344451f9abf",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest331BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest331BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest331BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb04d",
-                    "hash" : "0xc251646fd423482d551fc257e3da823f8d846ed1460537f223d4fbeff5a0918d",
-                    "mixHash" : "0xd52ae70ed3b6c39e23a7ba046ecf6c3e3ffa8ed0a83c7f22ecc4616fdfeaa89a",
-                    "nonce" : "0xac11dea5d75c0165",
+                    "hash" : "0x587eb0ec3bdab4c8c8a483074aecd2edcf3701a7aaec6fcdf388432b33f328fe",
+                    "mixHash" : "0x76f3c3cc14c36b621c1bcb18639a3a2f01c999a349f37ab7ec6f195061275a1e",
+                    "nonce" : "0xeacca9ca70b25951",
                     "number" : "0x01",
                     "parentHash" : "0xa8350477a60c8792887859543ccc5185c33d92594ce75de07caf2e28e8ee2d27",
                     "receiptTrie" : "0x45bf1468bbb3fa2f0bf381fadf41330c7e80014f7e3f0dc2136110d083e398be",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0x8212e4c00b99117a9d4fd2186431072d4cdd08869784757c9c49195c4b4665b7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90316f901fca0a8350477a60c8792887859543ccc5185c33d92594ce75de07caf2e28e8ee2d27a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05c02f8948a5ce578da2f25f1e59b590ab1ab30c6f3d4ffa7c0db1cc10187d2a3a08212e4c00b99117a9d4fd2186431072d4cdd08869784757c9c49195c4b4665b7a045bf1468bbb3fa2f0bf381fadf41330c7e80014f7e3f0dc2136110d083e398beb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b04d8203e880a0d52ae70ed3b6c39e23a7ba046ecf6c3e3ffa8ed0a83c7f22ecc4616fdfeaa89a88ac11dea5d75c0165f90113f9011080018446cdc80094095e7baea6a6c7c4c2dfeb977efac326af552d878457cbfdd8b8aa7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5067f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000013a091ba0fad2921118d24da085bd30da963ed847e6fd782a9521677430169a87c2b7b630a019f13a92f98dc4b4b07e58d7df862896595eb00e73e0b13e930c5d0cc7de412dc0",
+                "rlp" : "0xf90316f901fca0a8350477a60c8792887859543ccc5185c33d92594ce75de07caf2e28e8ee2d27a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05c02f8948a5ce578da2f25f1e59b590ab1ab30c6f3d4ffa7c0db1cc10187d2a3a08212e4c00b99117a9d4fd2186431072d4cdd08869784757c9c49195c4b4665b7a045bf1468bbb3fa2f0bf381fadf41330c7e80014f7e3f0dc2136110d083e398beb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b04d8203e880a076f3c3cc14c36b621c1bcb18639a3a2f01c999a349f37ab7ec6f195061275a1e88eacca9ca70b25951f90113f9011080018446cdc80094095e7baea6a6c7c4c2dfeb977efac326af552d878457cbfdd8b8aa7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5067f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000013a091ba0fad2921118d24da085bd30da963ed847e6fd782a9521677430169a87c2b7b630a019f13a92f98dc4b4b07e58d7df862896595eb00e73e0b13e930c5d0cc7de412dc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5067f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000013a09",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a097f79e05ce7620b04045aa55fbe2f15f62cdadfd82ce4f9666203dc10ca1d767a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc251646fd423482d551fc257e3da823f8d846ed1460537f223d4fbeff5a0918d",
+        "lastblockhash" : "0x587eb0ec3bdab4c8c8a483074aecd2edcf3701a7aaec6fcdf388432b33f328fe",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest331BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest331BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest331BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb04d",
-                    "hash" : "0x5823135381de5e8504c427d0af4ae4735f23ada006cf05f594241ef0d99b5eec",
-                    "mixHash" : "0x413f18f196ebf8f9cb0d078da38d7f9095c564d7e0ad3c16711d7b48984db1bb",
-                    "nonce" : "0x6ef9975bb45f8aa5",
+                    "hash" : "0x7ab3e81f221c05db1940c2934a1567127fbc70fc13c93d5ec104a5317a4468cd",
+                    "mixHash" : "0xab4d9048e8dd5919523bc08fdb087bb9e7023f3ac2e406749dc16c6bf6b19921",
+                    "nonce" : "0x358cc51b4e29a6e5",
                     "number" : "0x01",
                     "parentHash" : "0xa8350477a60c8792887859543ccc5185c33d92594ce75de07caf2e28e8ee2d27",
                     "receiptTrie" : "0x45bf1468bbb3fa2f0bf381fadf41330c7e80014f7e3f0dc2136110d083e398be",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0x8212e4c00b99117a9d4fd2186431072d4cdd08869784757c9c49195c4b4665b7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90316f901fca0a8350477a60c8792887859543ccc5185c33d92594ce75de07caf2e28e8ee2d27a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05c02f8948a5ce578da2f25f1e59b590ab1ab30c6f3d4ffa7c0db1cc10187d2a3a08212e4c00b99117a9d4fd2186431072d4cdd08869784757c9c49195c4b4665b7a045bf1468bbb3fa2f0bf381fadf41330c7e80014f7e3f0dc2136110d083e398beb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b04d8203e880a0413f18f196ebf8f9cb0d078da38d7f9095c564d7e0ad3c16711d7b48984db1bb886ef9975bb45f8aa5f90113f9011080018446cdc80094095e7baea6a6c7c4c2dfeb977efac326af552d878457cbfdd8b8aa7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5067f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000013a091ba0fad2921118d24da085bd30da963ed847e6fd782a9521677430169a87c2b7b630a019f13a92f98dc4b4b07e58d7df862896595eb00e73e0b13e930c5d0cc7de412dc0",
+                "rlp" : "0xf90316f901fca0a8350477a60c8792887859543ccc5185c33d92594ce75de07caf2e28e8ee2d27a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05c02f8948a5ce578da2f25f1e59b590ab1ab30c6f3d4ffa7c0db1cc10187d2a3a08212e4c00b99117a9d4fd2186431072d4cdd08869784757c9c49195c4b4665b7a045bf1468bbb3fa2f0bf381fadf41330c7e80014f7e3f0dc2136110d083e398beb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b04d8203e880a0ab4d9048e8dd5919523bc08fdb087bb9e7023f3ac2e406749dc16c6bf6b1992188358cc51b4e29a6e5f90113f9011080018446cdc80094095e7baea6a6c7c4c2dfeb977efac326af552d878457cbfdd8b8aa7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5067f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000013a091ba0fad2921118d24da085bd30da963ed847e6fd782a9521677430169a87c2b7b630a019f13a92f98dc4b4b07e58d7df862896595eb00e73e0b13e930c5d0cc7de412dc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5067f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000013a09",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a097f79e05ce7620b04045aa55fbe2f15f62cdadfd82ce4f9666203dc10ca1d767a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5823135381de5e8504c427d0af4ae4735f23ada006cf05f594241ef0d99b5eec",
+        "lastblockhash" : "0x7ab3e81f221c05db1940c2934a1567127fbc70fc13c93d5ec104a5317a4468cd",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest331BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest331BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest331BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb04d",
-                    "hash" : "0x56427e31022d7608969cdd0ff9aaa0c880fceb55f0a83453a6b8da247399a66c",
-                    "mixHash" : "0xb0c558f6081fb4cb526b818397ea1177171ed183986be55f957b13b14d7162da",
-                    "nonce" : "0xfd25bc51cec1f46d",
+                    "hash" : "0xd8f88eed3816ecb5d57f9a0d6ef82063ec9551f2dc166dcbf13a2ac3673ac708",
+                    "mixHash" : "0xa9b049da8987adb927cc059da0c82b78eb68e5f440f0567620bf60a58b68d00d",
+                    "nonce" : "0xf5ad3215d2a5cb19",
                     "number" : "0x01",
                     "parentHash" : "0xa8350477a60c8792887859543ccc5185c33d92594ce75de07caf2e28e8ee2d27",
                     "receiptTrie" : "0x45bf1468bbb3fa2f0bf381fadf41330c7e80014f7e3f0dc2136110d083e398be",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0x8212e4c00b99117a9d4fd2186431072d4cdd08869784757c9c49195c4b4665b7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90316f901fca0a8350477a60c8792887859543ccc5185c33d92594ce75de07caf2e28e8ee2d27a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05c02f8948a5ce578da2f25f1e59b590ab1ab30c6f3d4ffa7c0db1cc10187d2a3a08212e4c00b99117a9d4fd2186431072d4cdd08869784757c9c49195c4b4665b7a045bf1468bbb3fa2f0bf381fadf41330c7e80014f7e3f0dc2136110d083e398beb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b04d8203e880a0b0c558f6081fb4cb526b818397ea1177171ed183986be55f957b13b14d7162da88fd25bc51cec1f46df90113f9011080018446cdc80094095e7baea6a6c7c4c2dfeb977efac326af552d878457cbfdd8b8aa7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5067f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000013a091ba0fad2921118d24da085bd30da963ed847e6fd782a9521677430169a87c2b7b630a019f13a92f98dc4b4b07e58d7df862896595eb00e73e0b13e930c5d0cc7de412dc0",
+                "rlp" : "0xf90316f901fca0a8350477a60c8792887859543ccc5185c33d92594ce75de07caf2e28e8ee2d27a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05c02f8948a5ce578da2f25f1e59b590ab1ab30c6f3d4ffa7c0db1cc10187d2a3a08212e4c00b99117a9d4fd2186431072d4cdd08869784757c9c49195c4b4665b7a045bf1468bbb3fa2f0bf381fadf41330c7e80014f7e3f0dc2136110d083e398beb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b04d8203e880a0a9b049da8987adb927cc059da0c82b78eb68e5f440f0567620bf60a58b68d00d88f5ad3215d2a5cb19f90113f9011080018446cdc80094095e7baea6a6c7c4c2dfeb977efac326af552d878457cbfdd8b8aa7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5067f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000013a091ba0fad2921118d24da085bd30da963ed847e6fd782a9521677430169a87c2b7b630a019f13a92f98dc4b4b07e58d7df862896595eb00e73e0b13e930c5d0cc7de412dc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5067f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000013a09",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a097f79e05ce7620b04045aa55fbe2f15f62cdadfd82ce4f9666203dc10ca1d767a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x56427e31022d7608969cdd0ff9aaa0c880fceb55f0a83453a6b8da247399a66c",
+        "lastblockhash" : "0xd8f88eed3816ecb5d57f9a0d6ef82063ec9551f2dc166dcbf13a2ac3673ac708",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest344BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest344BC.json
index de78c4688..c69059058 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest344BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest344BC.json
@@ -2,8 +2,8 @@
     "randomStatetest344BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest344BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest344BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8ce9",
-                    "hash" : "0x6a430cc8b3a49f401f3c4f1c2acba8df645d4e72780e44f9bc54c559d7a1d6a9",
-                    "mixHash" : "0x86044fb10b10dc45c0259e4449e5c24dea05748d268ebb740857ca034094f3f6",
-                    "nonce" : "0x5392d08c293b8573",
+                    "hash" : "0x7591254510ddd401f9699d99f21fb7963b2964e95e99edf50872d85e21eb4a70",
+                    "mixHash" : "0x03587b11fab904debd372959974febf617821acca19a20d41f206a44e0ae4e41",
+                    "nonce" : "0x8109959e9a61369c",
                     "number" : "0x01",
                     "parentHash" : "0x5a39604344d92224b752f0ccd2ddcbdd5a117cea9b5de39ffff5f5176d2e4e5b",
                     "receiptTrie" : "0x1cf4d56c26d2d218a17ec13f6852dcd5dd0f71b759f0087fc79688ca6b6daaea",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xd10252112b3b9a78a64149546aaab0e3569cbfba16b393612c9464c952247f54",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902faf901fca05a39604344d92224b752f0ccd2ddcbdd5a117cea9b5de39ffff5f5176d2e4e5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cce6983996e6eacbe4c1963395a87890191bc3c265f8fabeed19600d2e6f96a4a0d10252112b3b9a78a64149546aaab0e3569cbfba16b393612c9464c952247f54a01cf4d56c26d2d218a17ec13f6852dcd5dd0f71b759f0087fc79688ca6b6daaeab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828ce98203e880a086044fb10b10dc45c0259e4449e5c24dea05748d268ebb740857ca034094f3f6885392d08c293b8573f8f8f8f68001846b3c1f5194095e7baea6a6c7c4c2dfeb977efac326af552d87843057c563b8907f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe33405a417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8509ffda551a076d1ba003e7a47b36e78ae1e5deb4492fc686a572cd0d1f20ab8e4ce939817b960ccc4ea01f0e012bc1419d8bc0454aedbebfd8c131988f6768daa93e09cd0c0f8dece1bfc0",
+                "rlp" : "0xf902faf901fca05a39604344d92224b752f0ccd2ddcbdd5a117cea9b5de39ffff5f5176d2e4e5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cce6983996e6eacbe4c1963395a87890191bc3c265f8fabeed19600d2e6f96a4a0d10252112b3b9a78a64149546aaab0e3569cbfba16b393612c9464c952247f54a01cf4d56c26d2d218a17ec13f6852dcd5dd0f71b759f0087fc79688ca6b6daaeab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828ce98203e880a003587b11fab904debd372959974febf617821acca19a20d41f206a44e0ae4e41888109959e9a61369cf8f8f8f68001846b3c1f5194095e7baea6a6c7c4c2dfeb977efac326af552d87843057c563b8907f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe33405a417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8509ffda551a076d1ba003e7a47b36e78ae1e5deb4492fc686a572cd0d1f20ab8e4ce939817b960ccc4ea01f0e012bc1419d8bc0454aedbebfd8c131988f6768daa93e09cd0c0f8dece1bfc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe33405a417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8509ffda551a076d",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dcc4c34db91eb2a9829b5a42701a5c04a1113e6dbda9607683762ba8a112222aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6a430cc8b3a49f401f3c4f1c2acba8df645d4e72780e44f9bc54c559d7a1d6a9",
+        "lastblockhash" : "0x7591254510ddd401f9699d99f21fb7963b2964e95e99edf50872d85e21eb4a70",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000000" : {
@@ -114,8 +114,8 @@
     "randomStatetest344BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest344BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest344BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8ff5",
-                    "hash" : "0xf230267407c1e9c51602c79d62dcf65f581d1d185427a39c9f323e3393f4253b",
-                    "mixHash" : "0x228dbcc11fac7e888736f16dcc0cae9a8455a565ddae44ea9259f8230f9b11eb",
-                    "nonce" : "0xc92ac004d37fab23",
+                    "hash" : "0x180de687f547973e5af036bd586915b630dfe02ad90af34eed111fe7e5c9a793",
+                    "mixHash" : "0x621d76ed3c46da5181ff6ab9c39adddf08eb4fdb8b281733ad5ca71784f2d817",
+                    "nonce" : "0x9d3fab8fc6ee4b15",
                     "number" : "0x01",
                     "parentHash" : "0x5a39604344d92224b752f0ccd2ddcbdd5a117cea9b5de39ffff5f5176d2e4e5b",
                     "receiptTrie" : "0x1ec20a79aa75d626b1ffee6c8977b813fad7dda10b08afc5eb4526fd044587ae",
-                    "stateRoot" : "0xa0b4d19f2104feabb82ad61367f7d44b930be462b3805f45d3f7a53a9665de01",
+                    "stateRoot" : "0xe58c8238605dfe94236da9d428bfb85b32548ea3b0777c69c256d8bdff8fd0de",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd10252112b3b9a78a64149546aaab0e3569cbfba16b393612c9464c952247f54",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902faf901fca05a39604344d92224b752f0ccd2ddcbdd5a117cea9b5de39ffff5f5176d2e4e5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a0b4d19f2104feabb82ad61367f7d44b930be462b3805f45d3f7a53a9665de01a0d10252112b3b9a78a64149546aaab0e3569cbfba16b393612c9464c952247f54a01ec20a79aa75d626b1ffee6c8977b813fad7dda10b08afc5eb4526fd044587aeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828ff58203e880a0228dbcc11fac7e888736f16dcc0cae9a8455a565ddae44ea9259f8230f9b11eb88c92ac004d37fab23f8f8f8f68001846b3c1f5194095e7baea6a6c7c4c2dfeb977efac326af552d87843057c563b8907f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe33405a417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8509ffda551a076d1ba003e7a47b36e78ae1e5deb4492fc686a572cd0d1f20ab8e4ce939817b960ccc4ea01f0e012bc1419d8bc0454aedbebfd8c131988f6768daa93e09cd0c0f8dece1bfc0",
+                "rlp" : "0xf902faf901fca05a39604344d92224b752f0ccd2ddcbdd5a117cea9b5de39ffff5f5176d2e4e5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e58c8238605dfe94236da9d428bfb85b32548ea3b0777c69c256d8bdff8fd0dea0d10252112b3b9a78a64149546aaab0e3569cbfba16b393612c9464c952247f54a01ec20a79aa75d626b1ffee6c8977b813fad7dda10b08afc5eb4526fd044587aeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828ff58203e880a0621d76ed3c46da5181ff6ab9c39adddf08eb4fdb8b281733ad5ca71784f2d817889d3fab8fc6ee4b15f8f8f8f68001846b3c1f5194095e7baea6a6c7c4c2dfeb977efac326af552d87843057c563b8907f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe33405a417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8509ffda551a076d1ba003e7a47b36e78ae1e5deb4492fc686a572cd0d1f20ab8e4ce939817b960ccc4ea01f0e012bc1419d8bc0454aedbebfd8c131988f6768daa93e09cd0c0f8dece1bfc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe33405a417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8509ffda551a076d",
@@ -174,7 +174,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dcc4c34db91eb2a9829b5a42701a5c04a1113e6dbda9607683762ba8a112222aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf230267407c1e9c51602c79d62dcf65f581d1d185427a39c9f323e3393f4253b",
+        "lastblockhash" : "0x180de687f547973e5af036bd586915b630dfe02ad90af34eed111fe7e5c9a793",
         "network" : "Constantinople",
         "postState" : {
             "0x0000000000000000000000000000000000000000" : {
@@ -184,13 +184,6 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x29a2241af62c9023",
                 "code" : "0x6000355415600957005b60203560003555",
@@ -233,8 +226,8 @@
     "randomStatetest344BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest344BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest344BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8ce9",
-                    "hash" : "0x800a778abd9b63e990494c3ac188e8488015bb0a59b7142f9deb8ff4f23015fa",
-                    "mixHash" : "0xb1dbc312f5420aa784240a9eb240fdfbf9fcd66904f687737e948b9bdba80c6d",
-                    "nonce" : "0xaa25ce138055c46f",
+                    "hash" : "0xf651d31a36248b9d1d6c838ad76e6ffef241b008e904ad5080b2ee16ecd4a535",
+                    "mixHash" : "0x4e1c8eb40f77491c65cdf7c4b59ed8a25df54473b9d017a0dc5d43619f107d62",
+                    "nonce" : "0xcb182b65688c0a22",
                     "number" : "0x01",
                     "parentHash" : "0x5a39604344d92224b752f0ccd2ddcbdd5a117cea9b5de39ffff5f5176d2e4e5b",
                     "receiptTrie" : "0x948d81559e74670a85c1ee87868999741e7f939c984d62fc08ba3ad02b905fbe",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0xd10252112b3b9a78a64149546aaab0e3569cbfba16b393612c9464c952247f54",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902faf901fca05a39604344d92224b752f0ccd2ddcbdd5a117cea9b5de39ffff5f5176d2e4e5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09f21498f6c17c87664c0450c286641d5d523d0bfebccbebd74e546fc54454661a0d10252112b3b9a78a64149546aaab0e3569cbfba16b393612c9464c952247f54a0948d81559e74670a85c1ee87868999741e7f939c984d62fc08ba3ad02b905fbeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828ce98203e880a0b1dbc312f5420aa784240a9eb240fdfbf9fcd66904f687737e948b9bdba80c6d88aa25ce138055c46ff8f8f8f68001846b3c1f5194095e7baea6a6c7c4c2dfeb977efac326af552d87843057c563b8907f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe33405a417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8509ffda551a076d1ba003e7a47b36e78ae1e5deb4492fc686a572cd0d1f20ab8e4ce939817b960ccc4ea01f0e012bc1419d8bc0454aedbebfd8c131988f6768daa93e09cd0c0f8dece1bfc0",
+                "rlp" : "0xf902faf901fca05a39604344d92224b752f0ccd2ddcbdd5a117cea9b5de39ffff5f5176d2e4e5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09f21498f6c17c87664c0450c286641d5d523d0bfebccbebd74e546fc54454661a0d10252112b3b9a78a64149546aaab0e3569cbfba16b393612c9464c952247f54a0948d81559e74670a85c1ee87868999741e7f939c984d62fc08ba3ad02b905fbeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828ce98203e880a04e1c8eb40f77491c65cdf7c4b59ed8a25df54473b9d017a0dc5d43619f107d6288cb182b65688c0a22f8f8f8f68001846b3c1f5194095e7baea6a6c7c4c2dfeb977efac326af552d87843057c563b8907f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe33405a417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8509ffda551a076d1ba003e7a47b36e78ae1e5deb4492fc686a572cd0d1f20ab8e4ce939817b960ccc4ea01f0e012bc1419d8bc0454aedbebfd8c131988f6768daa93e09cd0c0f8dece1bfc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe33405a417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8509ffda551a076d",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dcc4c34db91eb2a9829b5a42701a5c04a1113e6dbda9607683762ba8a112222aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x800a778abd9b63e990494c3ac188e8488015bb0a59b7142f9deb8ff4f23015fa",
+        "lastblockhash" : "0xf651d31a36248b9d1d6c838ad76e6ffef241b008e904ad5080b2ee16ecd4a535",
         "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000000" : {
@@ -345,8 +338,8 @@
     "randomStatetest344BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest344BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest344BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8ce9",
-                    "hash" : "0x0632ea5d9b11bd38048592c9e38118eb0ee8e66c69af7ddcf93824b18dd185a0",
-                    "mixHash" : "0x6b0a4ba71e9bab8d2f00d11743f5e60012cfd45a759db194bfdf9718d48221cb",
-                    "nonce" : "0x021cb8b7e99ef0f9",
+                    "hash" : "0xaa8aed264be2dca65e4e888ac883ff0ce6b50c2b18721f1ca782d2287ac7f95e",
+                    "mixHash" : "0x0367b7c8121d41af5249ca0c11f390a75f0bbdccbbabdc70ced9b250a7289330",
+                    "nonce" : "0x694bb03532a0b322",
                     "number" : "0x01",
                     "parentHash" : "0x5a39604344d92224b752f0ccd2ddcbdd5a117cea9b5de39ffff5f5176d2e4e5b",
                     "receiptTrie" : "0x948d81559e74670a85c1ee87868999741e7f939c984d62fc08ba3ad02b905fbe",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0xd10252112b3b9a78a64149546aaab0e3569cbfba16b393612c9464c952247f54",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902faf901fca05a39604344d92224b752f0ccd2ddcbdd5a117cea9b5de39ffff5f5176d2e4e5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09f21498f6c17c87664c0450c286641d5d523d0bfebccbebd74e546fc54454661a0d10252112b3b9a78a64149546aaab0e3569cbfba16b393612c9464c952247f54a0948d81559e74670a85c1ee87868999741e7f939c984d62fc08ba3ad02b905fbeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828ce98203e880a06b0a4ba71e9bab8d2f00d11743f5e60012cfd45a759db194bfdf9718d48221cb88021cb8b7e99ef0f9f8f8f8f68001846b3c1f5194095e7baea6a6c7c4c2dfeb977efac326af552d87843057c563b8907f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe33405a417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8509ffda551a076d1ba003e7a47b36e78ae1e5deb4492fc686a572cd0d1f20ab8e4ce939817b960ccc4ea01f0e012bc1419d8bc0454aedbebfd8c131988f6768daa93e09cd0c0f8dece1bfc0",
+                "rlp" : "0xf902faf901fca05a39604344d92224b752f0ccd2ddcbdd5a117cea9b5de39ffff5f5176d2e4e5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09f21498f6c17c87664c0450c286641d5d523d0bfebccbebd74e546fc54454661a0d10252112b3b9a78a64149546aaab0e3569cbfba16b393612c9464c952247f54a0948d81559e74670a85c1ee87868999741e7f939c984d62fc08ba3ad02b905fbeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828ce98203e880a00367b7c8121d41af5249ca0c11f390a75f0bbdccbbabdc70ced9b250a728933088694bb03532a0b322f8f8f8f68001846b3c1f5194095e7baea6a6c7c4c2dfeb977efac326af552d87843057c563b8907f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe33405a417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8509ffda551a076d1ba003e7a47b36e78ae1e5deb4492fc686a572cd0d1f20ab8e4ce939817b960ccc4ea01f0e012bc1419d8bc0454aedbebfd8c131988f6768daa93e09cd0c0f8dece1bfc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe33405a417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8509ffda551a076d",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dcc4c34db91eb2a9829b5a42701a5c04a1113e6dbda9607683762ba8a112222aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0632ea5d9b11bd38048592c9e38118eb0ee8e66c69af7ddcf93824b18dd185a0",
+        "lastblockhash" : "0xaa8aed264be2dca65e4e888ac883ff0ce6b50c2b18721f1ca782d2287ac7f95e",
         "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000000" : {
@@ -457,8 +450,8 @@
     "randomStatetest344BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest344BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest344BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x3abd",
-                    "hash" : "0x0b5d5293ed83673251dcd11237be5691a189a1bfaf34440394f6b38fac44b068",
-                    "mixHash" : "0x09c13cbca0fd11dea2c90d9a7161259466083e487f150af58dea8f9c99603a56",
-                    "nonce" : "0x77a8de883b32be9d",
+                    "hash" : "0xfd32f9aa6ad4510605b410205f76622c588f53cd02d2ed4016743de246a74178",
+                    "mixHash" : "0x9168a8a7ff70fdd18587fb778a6684800775ef91ee56938839e3258037c9479e",
+                    "nonce" : "0x7464adfec8e49d06",
                     "number" : "0x01",
                     "parentHash" : "0x5a39604344d92224b752f0ccd2ddcbdd5a117cea9b5de39ffff5f5176d2e4e5b",
                     "receiptTrie" : "0xc70b10a4fb6b037cdc7523c6a92a655e7ac1a3365ba03a5dec202a19d6aa9154",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0xd10252112b3b9a78a64149546aaab0e3569cbfba16b393612c9464c952247f54",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902faf901fca05a39604344d92224b752f0ccd2ddcbdd5a117cea9b5de39ffff5f5176d2e4e5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a070f5ab635e690e01f7df6aab56ea47008a576ae9a5944ab5aa7cb7873d9e2d3aa0d10252112b3b9a78a64149546aaab0e3569cbfba16b393612c9464c952247f54a0c70b10a4fb6b037cdc7523c6a92a655e7ac1a3365ba03a5dec202a19d6aa9154b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff823abd8203e880a009c13cbca0fd11dea2c90d9a7161259466083e487f150af58dea8f9c99603a568877a8de883b32be9df8f8f8f68001846b3c1f5194095e7baea6a6c7c4c2dfeb977efac326af552d87843057c563b8907f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe33405a417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8509ffda551a076d1ba003e7a47b36e78ae1e5deb4492fc686a572cd0d1f20ab8e4ce939817b960ccc4ea01f0e012bc1419d8bc0454aedbebfd8c131988f6768daa93e09cd0c0f8dece1bfc0",
+                "rlp" : "0xf902faf901fca05a39604344d92224b752f0ccd2ddcbdd5a117cea9b5de39ffff5f5176d2e4e5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a070f5ab635e690e01f7df6aab56ea47008a576ae9a5944ab5aa7cb7873d9e2d3aa0d10252112b3b9a78a64149546aaab0e3569cbfba16b393612c9464c952247f54a0c70b10a4fb6b037cdc7523c6a92a655e7ac1a3365ba03a5dec202a19d6aa9154b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff823abd8203e880a09168a8a7ff70fdd18587fb778a6684800775ef91ee56938839e3258037c9479e887464adfec8e49d06f8f8f8f68001846b3c1f5194095e7baea6a6c7c4c2dfeb977efac326af552d87843057c563b8907f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe33405a417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8509ffda551a076d1ba003e7a47b36e78ae1e5deb4492fc686a572cd0d1f20ab8e4ce939817b960ccc4ea01f0e012bc1419d8bc0454aedbebfd8c131988f6768daa93e09cd0c0f8dece1bfc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe33405a417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8509ffda551a076d",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dcc4c34db91eb2a9829b5a42701a5c04a1113e6dbda9607683762ba8a112222aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0b5d5293ed83673251dcd11237be5691a189a1bfaf34440394f6b38fac44b068",
+        "lastblockhash" : "0xfd32f9aa6ad4510605b410205f76622c588f53cd02d2ed4016743de246a74178",
         "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000000" : {
@@ -569,8 +562,8 @@
     "randomStatetest344BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest344BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest344BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x3abd",
-                    "hash" : "0xa70b2a4b546a9bf074a14c52c505ee5265635f22b9c7b075c075d1e55773cf3c",
-                    "mixHash" : "0xdbceb9f962eb23f6d1fb8b927a6fbfc24b0412a775e05ad0ac74d618d9982030",
-                    "nonce" : "0x1342f003653c8b7d",
+                    "hash" : "0x9f2d7e7b373bedf14b71d4b9764edcc0edcdd36b8f86bae8da3f77f5beccf59f",
+                    "mixHash" : "0xa7a71f6d4c2b89f5ce6f9ee5dac6e271a1f1af67c376d6c5887a2ce81f8250e5",
+                    "nonce" : "0xfd182523cd434a01",
                     "number" : "0x01",
                     "parentHash" : "0x5a39604344d92224b752f0ccd2ddcbdd5a117cea9b5de39ffff5f5176d2e4e5b",
                     "receiptTrie" : "0xc70b10a4fb6b037cdc7523c6a92a655e7ac1a3365ba03a5dec202a19d6aa9154",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0xd10252112b3b9a78a64149546aaab0e3569cbfba16b393612c9464c952247f54",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902faf901fca05a39604344d92224b752f0ccd2ddcbdd5a117cea9b5de39ffff5f5176d2e4e5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a070f5ab635e690e01f7df6aab56ea47008a576ae9a5944ab5aa7cb7873d9e2d3aa0d10252112b3b9a78a64149546aaab0e3569cbfba16b393612c9464c952247f54a0c70b10a4fb6b037cdc7523c6a92a655e7ac1a3365ba03a5dec202a19d6aa9154b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff823abd8203e880a0dbceb9f962eb23f6d1fb8b927a6fbfc24b0412a775e05ad0ac74d618d9982030881342f003653c8b7df8f8f8f68001846b3c1f5194095e7baea6a6c7c4c2dfeb977efac326af552d87843057c563b8907f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe33405a417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8509ffda551a076d1ba003e7a47b36e78ae1e5deb4492fc686a572cd0d1f20ab8e4ce939817b960ccc4ea01f0e012bc1419d8bc0454aedbebfd8c131988f6768daa93e09cd0c0f8dece1bfc0",
+                "rlp" : "0xf902faf901fca05a39604344d92224b752f0ccd2ddcbdd5a117cea9b5de39ffff5f5176d2e4e5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a070f5ab635e690e01f7df6aab56ea47008a576ae9a5944ab5aa7cb7873d9e2d3aa0d10252112b3b9a78a64149546aaab0e3569cbfba16b393612c9464c952247f54a0c70b10a4fb6b037cdc7523c6a92a655e7ac1a3365ba03a5dec202a19d6aa9154b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff823abd8203e880a0a7a71f6d4c2b89f5ce6f9ee5dac6e271a1f1af67c376d6c5887a2ce81f8250e588fd182523cd434a01f8f8f8f68001846b3c1f5194095e7baea6a6c7c4c2dfeb977efac326af552d87843057c563b8907f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe33405a417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8509ffda551a076d1ba003e7a47b36e78ae1e5deb4492fc686a572cd0d1f20ab8e4ce939817b960ccc4ea01f0e012bc1419d8bc0454aedbebfd8c131988f6768daa93e09cd0c0f8dece1bfc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe33405a417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8509ffda551a076d",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dcc4c34db91eb2a9829b5a42701a5c04a1113e6dbda9607683762ba8a112222aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa70b2a4b546a9bf074a14c52c505ee5265635f22b9c7b075c075d1e55773cf3c",
+        "lastblockhash" : "0x9f2d7e7b373bedf14b71d4b9764edcc0edcdd36b8f86bae8da3f77f5beccf59f",
         "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest34BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest34BC.json
index f5caffa5f..3c86738a4 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest34BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest34BC.json
@@ -2,8 +2,8 @@
     "randomStatetest34BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest34BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest34BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa0a3",
-                    "hash" : "0xc12c62d1aba238fd81aedd8a21d235727b6503381a50ebdaaa739a94e2db150b",
-                    "mixHash" : "0xda765d584cc7eea22c36d3fd890a784d83c0b5b906bc0b5a7ceaf213ef6fa4ad",
-                    "nonce" : "0x2b0de2d3aaba7226",
+                    "hash" : "0xa05784ab5c16ec623ee5b28e60fd9874fdf171b66d6befd47017cd319e75432a",
+                    "mixHash" : "0x7acaba378e50a4968c7d62610bc670f8558356c0a5b356677772cfad490e14bc",
+                    "nonce" : "0x5065fa93c2fbef1b",
                     "number" : "0x01",
                     "parentHash" : "0x248f3a135627880361ac536c8ce6c6923f0b946b5f605e9e8d656848db957b1b",
                     "receiptTrie" : "0x1274af99d617b387b5fc6da7eb4e5c6f76ffa808a2d4524930c422fb4bbfa4ee",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0248f3a135627880361ac536c8ce6c6923f0b946b5f605e9e8d656848db957b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e5fbc5b4662022705be1e170ff772dc7bd659a9a193509f2e5eba4ec6f7e961ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa01274af99d617b387b5fc6da7eb4e5c6f76ffa808a2d4524930c422fb4bbfa4eeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a38203e880a0da765d584cc7eea22c36d3fd890a784d83c0b5b906bc0b5a7ceaf213ef6fa4ad882b0de2d3aaba7226f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0248f3a135627880361ac536c8ce6c6923f0b946b5f605e9e8d656848db957b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e5fbc5b4662022705be1e170ff772dc7bd659a9a193509f2e5eba4ec6f7e961ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa01274af99d617b387b5fc6da7eb4e5c6f76ffa808a2d4524930c422fb4bbfa4eeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a38203e880a07acaba378e50a4968c7d62610bc670f8558356c0a5b356677772cfad490e14bc885065fa93c2fbef1bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0eb3a71ffa7ccd4c6d1cae1142a5d80c680884cbf9ccac551fcc5466362e76074a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc12c62d1aba238fd81aedd8a21d235727b6503381a50ebdaaa739a94e2db150b",
+        "lastblockhash" : "0xa05784ab5c16ec623ee5b28e60fd9874fdf171b66d6befd47017cd319e75432a",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest34BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest34BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest34BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa6bb",
-                    "hash" : "0x25386608b77cc44e4c4b08b7b207e3564e3cf46a4da7d4ac418c6145967cdb1f",
-                    "mixHash" : "0x28c73ee8df529ebc79da5f9fdf03094c11b33f49f7768c3a6d1a7eeffdc51a98",
-                    "nonce" : "0x99fa2a95b64168a6",
+                    "hash" : "0xf027a603e5e747a3fc3022e4d41fce5a85904fb56a713d47713b6b47611b54b1",
+                    "mixHash" : "0xc65f2f1b96974823f79a9af62dbd46bab92bd7cccf1e7ca7cd5f1b1c50a5827d",
+                    "nonce" : "0xc43fe1c9c7b7578c",
                     "number" : "0x01",
                     "parentHash" : "0x248f3a135627880361ac536c8ce6c6923f0b946b5f605e9e8d656848db957b1b",
                     "receiptTrie" : "0xc87811d8e793f69d4b38c939bc4db5e91f7a3f9a1743bb424c50a9c06fe4cfaf",
-                    "stateRoot" : "0x4a69a5d54826e85473fb1e6ddb6099a017cc76bf1241acb8e26601facf3d43a5",
+                    "stateRoot" : "0xbc7f05e2d75d3b9e99a7089d558e8fbde9165f27919e21fb54b90c815de44e32",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0248f3a135627880361ac536c8ce6c6923f0b946b5f605e9e8d656848db957b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04a69a5d54826e85473fb1e6ddb6099a017cc76bf1241acb8e26601facf3d43a5a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0c87811d8e793f69d4b38c939bc4db5e91f7a3f9a1743bb424c50a9c06fe4cfafb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a6bb8203e880a028c73ee8df529ebc79da5f9fdf03094c11b33f49f7768c3a6d1a7eeffdc51a988899fa2a95b64168a6f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0248f3a135627880361ac536c8ce6c6923f0b946b5f605e9e8d656848db957b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0bc7f05e2d75d3b9e99a7089d558e8fbde9165f27919e21fb54b90c815de44e32a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0c87811d8e793f69d4b38c939bc4db5e91f7a3f9a1743bb424c50a9c06fe4cfafb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a6bb8203e880a0c65f2f1b96974823f79a9af62dbd46bab92bd7cccf1e7ca7cd5f1b1c50a5827d88c43fe1c9c7b7578cf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0eb3a71ffa7ccd4c6d1cae1142a5d80c680884cbf9ccac551fcc5466362e76074a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x25386608b77cc44e4c4b08b7b207e3564e3cf46a4da7d4ac418c6145967cdb1f",
+        "lastblockhash" : "0xf027a603e5e747a3fc3022e4d41fce5a85904fb56a713d47713b6b47611b54b1",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x444140404242420555",
@@ -235,8 +228,8 @@
     "randomStatetest34BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest34BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest34BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa0a3",
-                    "hash" : "0x41e78ad8f64a486dcb720e6764fab19a8bb523f08b629a7dfa92d0f1d2eea13d",
-                    "mixHash" : "0x98065c66993ef151c1224ca9c7f48b7a5cb447467fd3ee65c681c55fdb6a7643",
-                    "nonce" : "0x8cc079577f83349b",
+                    "hash" : "0x4ce263401973f01b4fc88b13c0a34120fa6245a40b0c8eafaf853d6234e3e4ce",
+                    "mixHash" : "0x1ae03bf5f7e242e53db6ea2282707aee29c35d7b8b057ee90c0337d48b7bdeb8",
+                    "nonce" : "0x334fedfb70b2612b",
                     "number" : "0x01",
                     "parentHash" : "0x248f3a135627880361ac536c8ce6c6923f0b946b5f605e9e8d656848db957b1b",
                     "receiptTrie" : "0x521e452d16a6c06d228c4c3da1e8d1aab69ff89e7bfcfb89af17e749686bb5a1",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0248f3a135627880361ac536c8ce6c6923f0b946b5f605e9e8d656848db957b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0aab3ee0c761a5680e1d7c9a77810f73d5cc2e9d7bf613fb3454ebbf0c8d57380a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0521e452d16a6c06d228c4c3da1e8d1aab69ff89e7bfcfb89af17e749686bb5a1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a38203e880a098065c66993ef151c1224ca9c7f48b7a5cb447467fd3ee65c681c55fdb6a7643888cc079577f83349bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0248f3a135627880361ac536c8ce6c6923f0b946b5f605e9e8d656848db957b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0aab3ee0c761a5680e1d7c9a77810f73d5cc2e9d7bf613fb3454ebbf0c8d57380a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0521e452d16a6c06d228c4c3da1e8d1aab69ff89e7bfcfb89af17e749686bb5a1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a38203e880a01ae03bf5f7e242e53db6ea2282707aee29c35d7b8b057ee90c0337d48b7bdeb888334fedfb70b2612bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0eb3a71ffa7ccd4c6d1cae1142a5d80c680884cbf9ccac551fcc5466362e76074a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x41e78ad8f64a486dcb720e6764fab19a8bb523f08b629a7dfa92d0f1d2eea13d",
+        "lastblockhash" : "0x4ce263401973f01b4fc88b13c0a34120fa6245a40b0c8eafaf853d6234e3e4ce",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest34BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest34BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest34BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa0a3",
-                    "hash" : "0xfa5bd6c7e43eec90a5544cd62c48ed1f5847e0f26a47e769cb9b923243878ba8",
-                    "mixHash" : "0x2df087523db7296aba49065092602744e52b59dd37ea96c85ff9addb00daf5fb",
-                    "nonce" : "0x2b55cb6c15cf8b83",
+                    "hash" : "0x3cf06ef57f78fee3cf6d24fade44152975dfc7bfc8fc516a79c49a1bc96469fb",
+                    "mixHash" : "0x20c7f9ff8bc3c00e6ce5011c2f12a8b58f27ad633cbb85c1b0ec132d89de878d",
+                    "nonce" : "0x968fc820422f2f51",
                     "number" : "0x01",
                     "parentHash" : "0x248f3a135627880361ac536c8ce6c6923f0b946b5f605e9e8d656848db957b1b",
                     "receiptTrie" : "0x521e452d16a6c06d228c4c3da1e8d1aab69ff89e7bfcfb89af17e749686bb5a1",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0248f3a135627880361ac536c8ce6c6923f0b946b5f605e9e8d656848db957b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0aab3ee0c761a5680e1d7c9a77810f73d5cc2e9d7bf613fb3454ebbf0c8d57380a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0521e452d16a6c06d228c4c3da1e8d1aab69ff89e7bfcfb89af17e749686bb5a1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a38203e880a02df087523db7296aba49065092602744e52b59dd37ea96c85ff9addb00daf5fb882b55cb6c15cf8b83f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0248f3a135627880361ac536c8ce6c6923f0b946b5f605e9e8d656848db957b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0aab3ee0c761a5680e1d7c9a77810f73d5cc2e9d7bf613fb3454ebbf0c8d57380a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0521e452d16a6c06d228c4c3da1e8d1aab69ff89e7bfcfb89af17e749686bb5a1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a38203e880a020c7f9ff8bc3c00e6ce5011c2f12a8b58f27ad633cbb85c1b0ec132d89de878d88968fc820422f2f51f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0eb3a71ffa7ccd4c6d1cae1142a5d80c680884cbf9ccac551fcc5466362e76074a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfa5bd6c7e43eec90a5544cd62c48ed1f5847e0f26a47e769cb9b923243878ba8",
+        "lastblockhash" : "0x3cf06ef57f78fee3cf6d24fade44152975dfc7bfc8fc516a79c49a1bc96469fb",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest34BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest34BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest34BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa0a3",
-                    "hash" : "0x70fe097a08c0b0995800da53ab80d81cb41763a3eedb808f015620a3654a858c",
-                    "mixHash" : "0x426b59ba864fa9783cb5f973e3848f497ecf2bc21179f4480847fd58a5e9a4d2",
-                    "nonce" : "0x4e88f9b88834df45",
+                    "hash" : "0x84f6bb0f4da1b7aad810bcd4225edee8000481f5018861dd424482c41366ae7c",
+                    "mixHash" : "0x6e2c220bd5d459afc8273beb2430d0f922102a8f220ec276f2b23c2628658e96",
+                    "nonce" : "0xdcced2870283b99a",
                     "number" : "0x01",
                     "parentHash" : "0x248f3a135627880361ac536c8ce6c6923f0b946b5f605e9e8d656848db957b1b",
                     "receiptTrie" : "0x521e452d16a6c06d228c4c3da1e8d1aab69ff89e7bfcfb89af17e749686bb5a1",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0248f3a135627880361ac536c8ce6c6923f0b946b5f605e9e8d656848db957b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0aab3ee0c761a5680e1d7c9a77810f73d5cc2e9d7bf613fb3454ebbf0c8d57380a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0521e452d16a6c06d228c4c3da1e8d1aab69ff89e7bfcfb89af17e749686bb5a1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a38203e880a0426b59ba864fa9783cb5f973e3848f497ecf2bc21179f4480847fd58a5e9a4d2884e88f9b88834df45f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0248f3a135627880361ac536c8ce6c6923f0b946b5f605e9e8d656848db957b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0aab3ee0c761a5680e1d7c9a77810f73d5cc2e9d7bf613fb3454ebbf0c8d57380a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0521e452d16a6c06d228c4c3da1e8d1aab69ff89e7bfcfb89af17e749686bb5a1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a38203e880a06e2c220bd5d459afc8273beb2430d0f922102a8f220ec276f2b23c2628658e9688dcced2870283b99af865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0eb3a71ffa7ccd4c6d1cae1142a5d80c680884cbf9ccac551fcc5466362e76074a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x70fe097a08c0b0995800da53ab80d81cb41763a3eedb808f015620a3654a858c",
+        "lastblockhash" : "0x84f6bb0f4da1b7aad810bcd4225edee8000481f5018861dd424482c41366ae7c",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest34BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest34BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest34BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa0a3",
-                    "hash" : "0xbba094ba5469e2300b6d1e6fb10566beb6a96d3adcd4bffe367c335008fed385",
-                    "mixHash" : "0xcd426728ed363b35dfb88cc12ef3b298fe858c3bd8ee1b85f79ce172f330e307",
-                    "nonce" : "0x686e1611ef8e6577",
+                    "hash" : "0x912dc3fda841b53c1ef0f45ddb1e3f34cd52a0257342455e125805398dd001e1",
+                    "mixHash" : "0x550986217fcb369f36abde71425b314e65051c1bc24bddf1536e9f28ef984f41",
+                    "nonce" : "0x1bedd1c29566e6b6",
                     "number" : "0x01",
                     "parentHash" : "0x248f3a135627880361ac536c8ce6c6923f0b946b5f605e9e8d656848db957b1b",
                     "receiptTrie" : "0x521e452d16a6c06d228c4c3da1e8d1aab69ff89e7bfcfb89af17e749686bb5a1",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0248f3a135627880361ac536c8ce6c6923f0b946b5f605e9e8d656848db957b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0aab3ee0c761a5680e1d7c9a77810f73d5cc2e9d7bf613fb3454ebbf0c8d57380a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0521e452d16a6c06d228c4c3da1e8d1aab69ff89e7bfcfb89af17e749686bb5a1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a38203e880a0cd426728ed363b35dfb88cc12ef3b298fe858c3bd8ee1b85f79ce172f330e30788686e1611ef8e6577f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0248f3a135627880361ac536c8ce6c6923f0b946b5f605e9e8d656848db957b1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0aab3ee0c761a5680e1d7c9a77810f73d5cc2e9d7bf613fb3454ebbf0c8d57380a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0521e452d16a6c06d228c4c3da1e8d1aab69ff89e7bfcfb89af17e749686bb5a1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a38203e880a0550986217fcb369f36abde71425b314e65051c1bc24bddf1536e9f28ef984f41881bedd1c29566e6b6f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0eb3a71ffa7ccd4c6d1cae1142a5d80c680884cbf9ccac551fcc5466362e76074a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbba094ba5469e2300b6d1e6fb10566beb6a96d3adcd4bffe367c335008fed385",
+        "lastblockhash" : "0x912dc3fda841b53c1ef0f45ddb1e3f34cd52a0257342455e125805398dd001e1",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest35BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest35BC.json
index dd2ce5d0e..fcb856423 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest35BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest35BC.json
@@ -2,8 +2,8 @@
     "randomStatetest35BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest35BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest35BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa230",
-                    "hash" : "0x5b94db9cedd280de4a358f5f7049798abfa49db88ae8549be7245ef33acd390b",
-                    "mixHash" : "0xeb8488b79a608c13549220e5138cc667353d4284763d67ef52a93850d03edd7b",
-                    "nonce" : "0xfc3c6210a6dd17a9",
+                    "hash" : "0x030e0e2b2ac210541a5e1f39cabb075641e46fce4baf5024082c739183018702",
+                    "mixHash" : "0x7b3638f542d3d7df83c212c786091916269cb553b2cb768a9946dee2e57cbf2e",
+                    "nonce" : "0xacc01440b2f3ac4f",
                     "number" : "0x01",
                     "parentHash" : "0x6903a60426e8af83719828e53153ee19c9823d097d745f0098c3272ae62a8eca",
                     "receiptTrie" : "0xe75adec5b3daf5319fa21cf1aec9808035b5d80db0732e8d8349575c54191e1f",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca06903a60426e8af83719828e53153ee19c9823d097d745f0098c3272ae62a8ecaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02508fdc11eee3bb372875ad758e12519f2059a88857b263962a88c62ad32b5bba0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e75adec5b3daf5319fa21cf1aec9808035b5d80db0732e8d8349575c54191e1fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2308203e880a0eb8488b79a608c13549220e5138cc667353d4284763d67ef52a93850d03edd7b88fc3c6210a6dd17a9f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca06903a60426e8af83719828e53153ee19c9823d097d745f0098c3272ae62a8ecaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02508fdc11eee3bb372875ad758e12519f2059a88857b263962a88c62ad32b5bba0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e75adec5b3daf5319fa21cf1aec9808035b5d80db0732e8d8349575c54191e1fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2308203e880a07b3638f542d3d7df83c212c786091916269cb553b2cb768a9946dee2e57cbf2e88acc01440b2f3ac4ff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fcf1d2716bd6563e5dd6fc7883f0ab5c092a78c4f392bd2fbcca3217358d96daa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5b94db9cedd280de4a358f5f7049798abfa49db88ae8549be7245ef33acd390b",
+        "lastblockhash" : "0x030e0e2b2ac210541a5e1f39cabb075641e46fce4baf5024082c739183018702",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest35BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest35BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest35BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa848",
-                    "hash" : "0x88fdb015ba4e1511951f3720c43a9e798dd448a72be4db22a4d496c9b8698705",
-                    "mixHash" : "0x5df1e73e14fd48323a1b31ce118366b3b6fb772f7609c6395d5897c3698d83ff",
-                    "nonce" : "0xe6a4606830142d1a",
+                    "hash" : "0xbb9c716c7f13f519fdcb7afd53675095d534483c11b17fa28e7c830327d0657f",
+                    "mixHash" : "0x6fffbc7120fb897b86ff3f3651b6aa6e6d8dec9330c24e5244426ed018ee7610",
+                    "nonce" : "0x9290cee789b15614",
                     "number" : "0x01",
                     "parentHash" : "0x6903a60426e8af83719828e53153ee19c9823d097d745f0098c3272ae62a8eca",
                     "receiptTrie" : "0x005df930b7f40a770738b43e50d3f981c42b76f7a4fe76a5d069c5a485d57f7b",
-                    "stateRoot" : "0x2c4570225d07bbb9c25f3367d77325d98e80ff9df3fb16f6e03475a5c28babe1",
+                    "stateRoot" : "0x6bb73fe75c2aee09d568467ca15d8dfbb5182e99971125212d3cbce4cfcd5362",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca06903a60426e8af83719828e53153ee19c9823d097d745f0098c3272ae62a8ecaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02c4570225d07bbb9c25f3367d77325d98e80ff9df3fb16f6e03475a5c28babe1a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0005df930b7f40a770738b43e50d3f981c42b76f7a4fe76a5d069c5a485d57f7bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a8488203e880a05df1e73e14fd48323a1b31ce118366b3b6fb772f7609c6395d5897c3698d83ff88e6a4606830142d1af865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca06903a60426e8af83719828e53153ee19c9823d097d745f0098c3272ae62a8ecaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06bb73fe75c2aee09d568467ca15d8dfbb5182e99971125212d3cbce4cfcd5362a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0005df930b7f40a770738b43e50d3f981c42b76f7a4fe76a5d069c5a485d57f7bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a8488203e880a06fffbc7120fb897b86ff3f3651b6aa6e6d8dec9330c24e5244426ed018ee7610889290cee789b15614f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fcf1d2716bd6563e5dd6fc7883f0ab5c092a78c4f392bd2fbcca3217358d96daa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x88fdb015ba4e1511951f3720c43a9e798dd448a72be4db22a4d496c9b8698705",
+        "lastblockhash" : "0xbb9c716c7f13f519fdcb7afd53675095d534483c11b17fa28e7c830327d0657f",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x42414040384145413155",
@@ -235,8 +228,8 @@
     "randomStatetest35BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest35BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest35BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa230",
-                    "hash" : "0xf9bc4fad08c58c8416129150e65f1a57dacad3db8915d9dbe50366f3c7dcba4b",
-                    "mixHash" : "0x9ece46f2b28633d5dc07924a46e421c08b5b331b5005704aec700f57971e2a94",
-                    "nonce" : "0x2e3064f1ca948c1a",
+                    "hash" : "0xee795923c8cc4180f725d49afa50a39581b9e5ead3c35b12393a2ffb0ee1b6bf",
+                    "mixHash" : "0xc92e18446c053f48a10271037ccf68083de780fcc6dbb60d64256f485ca9f0a4",
+                    "nonce" : "0x4cf435a7a03d7c37",
                     "number" : "0x01",
                     "parentHash" : "0x6903a60426e8af83719828e53153ee19c9823d097d745f0098c3272ae62a8eca",
                     "receiptTrie" : "0xae1b46b5a447c7d5c8588e00a81458130308180f5eebd3c4158f088817d98760",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca06903a60426e8af83719828e53153ee19c9823d097d745f0098c3272ae62a8ecaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00479ce19cb1f0f1177a6aa719a3244369ab344917eeb8f828a2a87c171ffbbb3a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0ae1b46b5a447c7d5c8588e00a81458130308180f5eebd3c4158f088817d98760b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2308203e880a09ece46f2b28633d5dc07924a46e421c08b5b331b5005704aec700f57971e2a94882e3064f1ca948c1af865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca06903a60426e8af83719828e53153ee19c9823d097d745f0098c3272ae62a8ecaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00479ce19cb1f0f1177a6aa719a3244369ab344917eeb8f828a2a87c171ffbbb3a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0ae1b46b5a447c7d5c8588e00a81458130308180f5eebd3c4158f088817d98760b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2308203e880a0c92e18446c053f48a10271037ccf68083de780fcc6dbb60d64256f485ca9f0a4884cf435a7a03d7c37f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fcf1d2716bd6563e5dd6fc7883f0ab5c092a78c4f392bd2fbcca3217358d96daa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf9bc4fad08c58c8416129150e65f1a57dacad3db8915d9dbe50366f3c7dcba4b",
+        "lastblockhash" : "0xee795923c8cc4180f725d49afa50a39581b9e5ead3c35b12393a2ffb0ee1b6bf",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest35BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest35BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest35BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa230",
-                    "hash" : "0x6a1206d8156d4f2e18558b54ad46e8760f2b1fedd98d8b2d4ee1cf11191a142f",
-                    "mixHash" : "0x67861c37f76c08767bfc5511a38c4ac0c7f62740e0164248f1c7373844b59caa",
-                    "nonce" : "0xf5aadf2b52597a14",
+                    "hash" : "0x79292d85b7c176405a41742599ceed798c126ae632d890af20a0692852896dcb",
+                    "mixHash" : "0x868901e71b3c4add2a81d05b086deabf9c6af64e0caa59e15010e542bd4afefd",
+                    "nonce" : "0x995dba0fd44fa516",
                     "number" : "0x01",
                     "parentHash" : "0x6903a60426e8af83719828e53153ee19c9823d097d745f0098c3272ae62a8eca",
                     "receiptTrie" : "0xae1b46b5a447c7d5c8588e00a81458130308180f5eebd3c4158f088817d98760",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca06903a60426e8af83719828e53153ee19c9823d097d745f0098c3272ae62a8ecaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00479ce19cb1f0f1177a6aa719a3244369ab344917eeb8f828a2a87c171ffbbb3a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0ae1b46b5a447c7d5c8588e00a81458130308180f5eebd3c4158f088817d98760b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2308203e880a067861c37f76c08767bfc5511a38c4ac0c7f62740e0164248f1c7373844b59caa88f5aadf2b52597a14f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca06903a60426e8af83719828e53153ee19c9823d097d745f0098c3272ae62a8ecaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00479ce19cb1f0f1177a6aa719a3244369ab344917eeb8f828a2a87c171ffbbb3a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0ae1b46b5a447c7d5c8588e00a81458130308180f5eebd3c4158f088817d98760b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2308203e880a0868901e71b3c4add2a81d05b086deabf9c6af64e0caa59e15010e542bd4afefd88995dba0fd44fa516f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fcf1d2716bd6563e5dd6fc7883f0ab5c092a78c4f392bd2fbcca3217358d96daa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6a1206d8156d4f2e18558b54ad46e8760f2b1fedd98d8b2d4ee1cf11191a142f",
+        "lastblockhash" : "0x79292d85b7c176405a41742599ceed798c126ae632d890af20a0692852896dcb",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest35BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest35BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest35BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa0b4",
-                    "hash" : "0x8e5e5642677caae5273c7f26c18a48c7537f3afc0ea49148df4549e3d5fb5a42",
-                    "mixHash" : "0xfa83eb2e9c1d7c3f6c30bb8b7831054771afcf8bb8e1c1c3f8235608a483d9a2",
-                    "nonce" : "0x41a8c6c37bee953e",
+                    "hash" : "0xf241716b835266f9a0826c6297bf5cf453ed7dd694e45b42608ea93d9aa4e5d1",
+                    "mixHash" : "0x96041e89fff7c84338433fd54d05af98e18894a8fc9df3eff57b5d4673fa4560",
+                    "nonce" : "0x8fb3ede9ddf497fa",
                     "number" : "0x01",
                     "parentHash" : "0x6903a60426e8af83719828e53153ee19c9823d097d745f0098c3272ae62a8eca",
                     "receiptTrie" : "0x5597a8b7237431be53145d76e6e1f8bab31c67d22343f55c0eeb581976c37373",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca06903a60426e8af83719828e53153ee19c9823d097d745f0098c3272ae62a8ecaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00f9bce12e183b29e99da8559f27046b8c426bc5c0a0f4389f0a34b39664edd50a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa05597a8b7237431be53145d76e6e1f8bab31c67d22343f55c0eeb581976c37373b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0b48203e880a0fa83eb2e9c1d7c3f6c30bb8b7831054771afcf8bb8e1c1c3f8235608a483d9a28841a8c6c37bee953ef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca06903a60426e8af83719828e53153ee19c9823d097d745f0098c3272ae62a8ecaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00f9bce12e183b29e99da8559f27046b8c426bc5c0a0f4389f0a34b39664edd50a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa05597a8b7237431be53145d76e6e1f8bab31c67d22343f55c0eeb581976c37373b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0b48203e880a096041e89fff7c84338433fd54d05af98e18894a8fc9df3eff57b5d4673fa4560888fb3ede9ddf497faf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fcf1d2716bd6563e5dd6fc7883f0ab5c092a78c4f392bd2fbcca3217358d96daa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8e5e5642677caae5273c7f26c18a48c7537f3afc0ea49148df4549e3d5fb5a42",
+        "lastblockhash" : "0xf241716b835266f9a0826c6297bf5cf453ed7dd694e45b42608ea93d9aa4e5d1",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest35BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest35BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest35BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa0b4",
-                    "hash" : "0xd49067444bb2725149bfe87e05222708f83078bfed4c72392af2029e0079118d",
-                    "mixHash" : "0x29fb35f2a62d7c45c75399c794bf5c5752d3a2f3635154b77d9f5090afb1b106",
-                    "nonce" : "0x2013d2b5ee661a38",
+                    "hash" : "0xfad6900d39b40aa1c6626e4e0d79cc6fdfc4778dd21c12d71e1756a6d39b273f",
+                    "mixHash" : "0x479e0847114f278633b4c8f0cb1a31183dc9ad524f9bcc5703d46f6de08513fc",
+                    "nonce" : "0xd25fb93b32c3afb0",
                     "number" : "0x01",
                     "parentHash" : "0x6903a60426e8af83719828e53153ee19c9823d097d745f0098c3272ae62a8eca",
                     "receiptTrie" : "0x5597a8b7237431be53145d76e6e1f8bab31c67d22343f55c0eeb581976c37373",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca06903a60426e8af83719828e53153ee19c9823d097d745f0098c3272ae62a8ecaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00f9bce12e183b29e99da8559f27046b8c426bc5c0a0f4389f0a34b39664edd50a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa05597a8b7237431be53145d76e6e1f8bab31c67d22343f55c0eeb581976c37373b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0b48203e880a029fb35f2a62d7c45c75399c794bf5c5752d3a2f3635154b77d9f5090afb1b106882013d2b5ee661a38f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca06903a60426e8af83719828e53153ee19c9823d097d745f0098c3272ae62a8ecaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00f9bce12e183b29e99da8559f27046b8c426bc5c0a0f4389f0a34b39664edd50a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa05597a8b7237431be53145d76e6e1f8bab31c67d22343f55c0eeb581976c37373b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0b48203e880a0479e0847114f278633b4c8f0cb1a31183dc9ad524f9bcc5703d46f6de08513fc88d25fb93b32c3afb0f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fcf1d2716bd6563e5dd6fc7883f0ab5c092a78c4f392bd2fbcca3217358d96daa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd49067444bb2725149bfe87e05222708f83078bfed4c72392af2029e0079118d",
+        "lastblockhash" : "0xfad6900d39b40aa1c6626e4e0d79cc6fdfc4778dd21c12d71e1756a6d39b273f",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest373BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest373BC.json
index 9959ab4dd..08e402cc6 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest373BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest373BC.json
@@ -2,8 +2,8 @@
     "randomStatetest373BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest373BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest373BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb7fa",
-                    "hash" : "0xdb1708b0a66c5fa99981168a129af910b653822df8e8d69b537b6d8ac8cce769",
-                    "mixHash" : "0x64d6d39479aeb905c49401fcb7338d01838f01eef8bfcd26e0a77116ee12cae3",
-                    "nonce" : "0x28b5a57315c8a389",
+                    "hash" : "0x469233e55980e6ea72128de532c2ee87b36d921419c8ca80a5a166f7cfa39c77",
+                    "mixHash" : "0x18e1d131ffeca42f5f51d477fc3820ee5024123d55f4b9fe527c00001dd86574",
+                    "nonce" : "0xa66eca30c0571138",
                     "number" : "0x01",
                     "parentHash" : "0xadfec6c969f582a15c546347090bbbc3b84a0697779a0ab958004e6d4a35f1c6",
                     "receiptTrie" : "0x4b94dfd3461a6562d21aa872d7144aaf43adb1a44f7ceac43d2fc16827be6543",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x3b2b15785f3e79684ee8e7381790a6be6517541bfe53db003aea7410f4b78cff",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0adfec6c969f582a15c546347090bbbc3b84a0697779a0ab958004e6d4a35f1c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02494d24763b4ea707a461fe25bae0c10b8f2c1ff13f6fb353a938a12d7420104a03b2b15785f3e79684ee8e7381790a6be6517541bfe53db003aea7410f4b78cffa04b94dfd3461a6562d21aa872d7144aaf43adb1a44f7ceac43d2fc16827be6543b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b7fa8203e880a064d6d39479aeb905c49401fcb7338d01838f01eef8bfcd26e0a77116ee12cae38828b5a57315c8a389f90141f9013e8001840d27387794095e7baea6a6c7c4c2dfeb977efac326af552d87842d5d1ccab8d87f0000000000000000000000000000000000000000000000000000000000000001407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f596355699a095516837a9d6f3a0308041ba08372232f30f4b5373f2365a664cf4d1955aa673876b8fbb0189aa3deaa3160c6a03adeca67493639f324b1937dd0b798268aa4c2501720fe979ee53ec416fec670c0",
+                "rlp" : "0xf90344f901fca0adfec6c969f582a15c546347090bbbc3b84a0697779a0ab958004e6d4a35f1c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02494d24763b4ea707a461fe25bae0c10b8f2c1ff13f6fb353a938a12d7420104a03b2b15785f3e79684ee8e7381790a6be6517541bfe53db003aea7410f4b78cffa04b94dfd3461a6562d21aa872d7144aaf43adb1a44f7ceac43d2fc16827be6543b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b7fa8203e880a018e1d131ffeca42f5f51d477fc3820ee5024123d55f4b9fe527c00001dd8657488a66eca30c0571138f90141f9013e8001840d27387794095e7baea6a6c7c4c2dfeb977efac326af552d87842d5d1ccab8d87f0000000000000000000000000000000000000000000000000000000000000001407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f596355699a095516837a9d6f3a0308041ba08372232f30f4b5373f2365a664cf4d1955aa673876b8fbb0189aa3deaa3160c6a03adeca67493639f324b1937dd0b798268aa4c2501720fe979ee53ec416fec670c0",
                 "transactions" : [
                     {
                         "data" : "0x7f0000000000000000000000000000000000000000000000000000000000000001407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f596355699a095516837a9d6f3a030804",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a082d4f32c6ed38f648a2f90bd59c86451bb061c531e6837c343043436d53303e8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdb1708b0a66c5fa99981168a129af910b653822df8e8d69b537b6d8ac8cce769",
+        "lastblockhash" : "0x469233e55980e6ea72128de532c2ee87b36d921419c8ca80a5a166f7cfa39c77",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest373BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest373BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest373BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xbb06",
-                    "hash" : "0x65bad2f7321da13f43e69c2e004760b6e8c17bc7848d1f3b85ed1474241d6b29",
-                    "mixHash" : "0xc01ddd02c0fb290d36e7627b8b0d4fbb8c810af911f0c8beefc3e649999ca4f2",
-                    "nonce" : "0xb3bdb219939324e7",
+                    "hash" : "0x04a4e81c75e3b3827d09366b0cc414c152185292354e165fb9742145b94bc0a9",
+                    "mixHash" : "0xb9c368ac5f4ed8e5ca61fd61d06bdfb4444991740b54df8b019b86472de6126d",
+                    "nonce" : "0x8c0a57ddd4e656b6",
                     "number" : "0x01",
                     "parentHash" : "0xadfec6c969f582a15c546347090bbbc3b84a0697779a0ab958004e6d4a35f1c6",
                     "receiptTrie" : "0xcfb90f447809990f3449e339d4ef79ada7fb9fc75aa8852d403c364a7b12bb09",
-                    "stateRoot" : "0xea74f255132b6bc5eae39d4fb70f0f1e2f10d265e3cbaa18b9f87582a99ff119",
+                    "stateRoot" : "0x1187ac3d6e1c44f4409bb751ee8539309a87edbab41ca9f974b5aa265f591e36",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3b2b15785f3e79684ee8e7381790a6be6517541bfe53db003aea7410f4b78cff",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0adfec6c969f582a15c546347090bbbc3b84a0697779a0ab958004e6d4a35f1c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ea74f255132b6bc5eae39d4fb70f0f1e2f10d265e3cbaa18b9f87582a99ff119a03b2b15785f3e79684ee8e7381790a6be6517541bfe53db003aea7410f4b78cffa0cfb90f447809990f3449e339d4ef79ada7fb9fc75aa8852d403c364a7b12bb09b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bb068203e880a0c01ddd02c0fb290d36e7627b8b0d4fbb8c810af911f0c8beefc3e649999ca4f288b3bdb219939324e7f90141f9013e8001840d27387794095e7baea6a6c7c4c2dfeb977efac326af552d87842d5d1ccab8d87f0000000000000000000000000000000000000000000000000000000000000001407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f596355699a095516837a9d6f3a0308041ba08372232f30f4b5373f2365a664cf4d1955aa673876b8fbb0189aa3deaa3160c6a03adeca67493639f324b1937dd0b798268aa4c2501720fe979ee53ec416fec670c0",
+                "rlp" : "0xf90344f901fca0adfec6c969f582a15c546347090bbbc3b84a0697779a0ab958004e6d4a35f1c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01187ac3d6e1c44f4409bb751ee8539309a87edbab41ca9f974b5aa265f591e36a03b2b15785f3e79684ee8e7381790a6be6517541bfe53db003aea7410f4b78cffa0cfb90f447809990f3449e339d4ef79ada7fb9fc75aa8852d403c364a7b12bb09b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bb068203e880a0b9c368ac5f4ed8e5ca61fd61d06bdfb4444991740b54df8b019b86472de6126d888c0a57ddd4e656b6f90141f9013e8001840d27387794095e7baea6a6c7c4c2dfeb977efac326af552d87842d5d1ccab8d87f0000000000000000000000000000000000000000000000000000000000000001407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f596355699a095516837a9d6f3a0308041ba08372232f30f4b5373f2365a664cf4d1955aa673876b8fbb0189aa3deaa3160c6a03adeca67493639f324b1937dd0b798268aa4c2501720fe979ee53ec416fec670c0",
                 "transactions" : [
                     {
                         "data" : "0x7f0000000000000000000000000000000000000000000000000000000000000001407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f596355699a095516837a9d6f3a030804",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a082d4f32c6ed38f648a2f90bd59c86451bb061c531e6837c343043436d53303e8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x65bad2f7321da13f43e69c2e004760b6e8c17bc7848d1f3b85ed1474241d6b29",
+        "lastblockhash" : "0x04a4e81c75e3b3827d09366b0cc414c152185292354e165fb9742145b94bc0a9",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x2d5d1cca",
                 "code" : "0x7f0000000000000000000000000000000000000000000000000000000000000001407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f596355699a095516837a9d6f3a03080460005155",
@@ -235,8 +228,8 @@
     "randomStatetest373BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest373BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest373BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb7fa",
-                    "hash" : "0x1263a554fb4d0137e88717cc26d48e3fa0e9595acdd62cf4b89ccf0eb8bd433c",
-                    "mixHash" : "0x0da780df51e2c176d0b58b340f33a2e7591afa647b0252049b3c20d6f5e82628",
-                    "nonce" : "0x5dd2fcd57ad2d9a7",
+                    "hash" : "0x2928dbcb5c9fda3e1d5ea35cffb1813738711a90822580777bb87e7c8a8fcfd2",
+                    "mixHash" : "0x5d6fd4eb4ff0a1c270a0873f77ca99d9f30efa0cc56395264ecc12740b36bf7b",
+                    "nonce" : "0x98aa9a2ecaaf9435",
                     "number" : "0x01",
                     "parentHash" : "0xadfec6c969f582a15c546347090bbbc3b84a0697779a0ab958004e6d4a35f1c6",
                     "receiptTrie" : "0x9ab9e40551d4903538ef0f25eda60e7b15147be1b98755a2a0b3c730a752340e",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0x3b2b15785f3e79684ee8e7381790a6be6517541bfe53db003aea7410f4b78cff",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0adfec6c969f582a15c546347090bbbc3b84a0697779a0ab958004e6d4a35f1c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08a41d72d6c9e72a4a31be57e60f89386308ec307a00c27fd52afac89ce2e42d9a03b2b15785f3e79684ee8e7381790a6be6517541bfe53db003aea7410f4b78cffa09ab9e40551d4903538ef0f25eda60e7b15147be1b98755a2a0b3c730a752340eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b7fa8203e880a00da780df51e2c176d0b58b340f33a2e7591afa647b0252049b3c20d6f5e82628885dd2fcd57ad2d9a7f90141f9013e8001840d27387794095e7baea6a6c7c4c2dfeb977efac326af552d87842d5d1ccab8d87f0000000000000000000000000000000000000000000000000000000000000001407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f596355699a095516837a9d6f3a0308041ba08372232f30f4b5373f2365a664cf4d1955aa673876b8fbb0189aa3deaa3160c6a03adeca67493639f324b1937dd0b798268aa4c2501720fe979ee53ec416fec670c0",
+                "rlp" : "0xf90344f901fca0adfec6c969f582a15c546347090bbbc3b84a0697779a0ab958004e6d4a35f1c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08a41d72d6c9e72a4a31be57e60f89386308ec307a00c27fd52afac89ce2e42d9a03b2b15785f3e79684ee8e7381790a6be6517541bfe53db003aea7410f4b78cffa09ab9e40551d4903538ef0f25eda60e7b15147be1b98755a2a0b3c730a752340eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b7fa8203e880a05d6fd4eb4ff0a1c270a0873f77ca99d9f30efa0cc56395264ecc12740b36bf7b8898aa9a2ecaaf9435f90141f9013e8001840d27387794095e7baea6a6c7c4c2dfeb977efac326af552d87842d5d1ccab8d87f0000000000000000000000000000000000000000000000000000000000000001407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f596355699a095516837a9d6f3a0308041ba08372232f30f4b5373f2365a664cf4d1955aa673876b8fbb0189aa3deaa3160c6a03adeca67493639f324b1937dd0b798268aa4c2501720fe979ee53ec416fec670c0",
                 "transactions" : [
                     {
                         "data" : "0x7f0000000000000000000000000000000000000000000000000000000000000001407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f596355699a095516837a9d6f3a030804",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a082d4f32c6ed38f648a2f90bd59c86451bb061c531e6837c343043436d53303e8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1263a554fb4d0137e88717cc26d48e3fa0e9595acdd62cf4b89ccf0eb8bd433c",
+        "lastblockhash" : "0x2928dbcb5c9fda3e1d5ea35cffb1813738711a90822580777bb87e7c8a8fcfd2",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest373BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest373BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest373BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb7fa",
-                    "hash" : "0xab10d6ce50f18141559781eda88e6adab3ef85b7657401bfd4a255a8ff70a199",
-                    "mixHash" : "0x47697e192da2507ae5c6e2d0033bb76ce91212d3e231540bfd5042660b556566",
-                    "nonce" : "0x35d1d5e6448244d6",
+                    "hash" : "0xc9230a39e16503a463eabfe4150d393802a496fa2653dd10f9de04327470b9cd",
+                    "mixHash" : "0x8feef876d68a50c9735fe673009068a37578c648d488826ae5c596325ea7154e",
+                    "nonce" : "0x9e6ee486de12c98d",
                     "number" : "0x01",
                     "parentHash" : "0xadfec6c969f582a15c546347090bbbc3b84a0697779a0ab958004e6d4a35f1c6",
                     "receiptTrie" : "0x9ab9e40551d4903538ef0f25eda60e7b15147be1b98755a2a0b3c730a752340e",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0x3b2b15785f3e79684ee8e7381790a6be6517541bfe53db003aea7410f4b78cff",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0adfec6c969f582a15c546347090bbbc3b84a0697779a0ab958004e6d4a35f1c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08a41d72d6c9e72a4a31be57e60f89386308ec307a00c27fd52afac89ce2e42d9a03b2b15785f3e79684ee8e7381790a6be6517541bfe53db003aea7410f4b78cffa09ab9e40551d4903538ef0f25eda60e7b15147be1b98755a2a0b3c730a752340eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b7fa8203e880a047697e192da2507ae5c6e2d0033bb76ce91212d3e231540bfd5042660b5565668835d1d5e6448244d6f90141f9013e8001840d27387794095e7baea6a6c7c4c2dfeb977efac326af552d87842d5d1ccab8d87f0000000000000000000000000000000000000000000000000000000000000001407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f596355699a095516837a9d6f3a0308041ba08372232f30f4b5373f2365a664cf4d1955aa673876b8fbb0189aa3deaa3160c6a03adeca67493639f324b1937dd0b798268aa4c2501720fe979ee53ec416fec670c0",
+                "rlp" : "0xf90344f901fca0adfec6c969f582a15c546347090bbbc3b84a0697779a0ab958004e6d4a35f1c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08a41d72d6c9e72a4a31be57e60f89386308ec307a00c27fd52afac89ce2e42d9a03b2b15785f3e79684ee8e7381790a6be6517541bfe53db003aea7410f4b78cffa09ab9e40551d4903538ef0f25eda60e7b15147be1b98755a2a0b3c730a752340eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b7fa8203e880a08feef876d68a50c9735fe673009068a37578c648d488826ae5c596325ea7154e889e6ee486de12c98df90141f9013e8001840d27387794095e7baea6a6c7c4c2dfeb977efac326af552d87842d5d1ccab8d87f0000000000000000000000000000000000000000000000000000000000000001407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f596355699a095516837a9d6f3a0308041ba08372232f30f4b5373f2365a664cf4d1955aa673876b8fbb0189aa3deaa3160c6a03adeca67493639f324b1937dd0b798268aa4c2501720fe979ee53ec416fec670c0",
                 "transactions" : [
                     {
                         "data" : "0x7f0000000000000000000000000000000000000000000000000000000000000001407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f596355699a095516837a9d6f3a030804",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a082d4f32c6ed38f648a2f90bd59c86451bb061c531e6837c343043436d53303e8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xab10d6ce50f18141559781eda88e6adab3ef85b7657401bfd4a255a8ff70a199",
+        "lastblockhash" : "0xc9230a39e16503a463eabfe4150d393802a496fa2653dd10f9de04327470b9cd",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest373BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest373BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest373BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb7fa",
-                    "hash" : "0xc29326fe997a30fff76ecd56443d670b4a5fed539ef82c6a30fae259473cd08e",
-                    "mixHash" : "0xe6b81f71928ffdbe904db7c2f143723be3783f7cfea3bb31c871f4923bad8593",
-                    "nonce" : "0x3ec9ede48742274a",
+                    "hash" : "0x507c564f0b4ed330ddfabd0ac5c143630ac588bfb3ff0a523337f82afc83c637",
+                    "mixHash" : "0x498be622974ba4230976b11d3a5fc588b2a97f55b1d55656dfc56cc4d3cf8923",
+                    "nonce" : "0xdcbdf1dc55141f14",
                     "number" : "0x01",
                     "parentHash" : "0xadfec6c969f582a15c546347090bbbc3b84a0697779a0ab958004e6d4a35f1c6",
                     "receiptTrie" : "0x9ab9e40551d4903538ef0f25eda60e7b15147be1b98755a2a0b3c730a752340e",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0x3b2b15785f3e79684ee8e7381790a6be6517541bfe53db003aea7410f4b78cff",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0adfec6c969f582a15c546347090bbbc3b84a0697779a0ab958004e6d4a35f1c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08a41d72d6c9e72a4a31be57e60f89386308ec307a00c27fd52afac89ce2e42d9a03b2b15785f3e79684ee8e7381790a6be6517541bfe53db003aea7410f4b78cffa09ab9e40551d4903538ef0f25eda60e7b15147be1b98755a2a0b3c730a752340eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b7fa8203e880a0e6b81f71928ffdbe904db7c2f143723be3783f7cfea3bb31c871f4923bad8593883ec9ede48742274af90141f9013e8001840d27387794095e7baea6a6c7c4c2dfeb977efac326af552d87842d5d1ccab8d87f0000000000000000000000000000000000000000000000000000000000000001407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f596355699a095516837a9d6f3a0308041ba08372232f30f4b5373f2365a664cf4d1955aa673876b8fbb0189aa3deaa3160c6a03adeca67493639f324b1937dd0b798268aa4c2501720fe979ee53ec416fec670c0",
+                "rlp" : "0xf90344f901fca0adfec6c969f582a15c546347090bbbc3b84a0697779a0ab958004e6d4a35f1c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08a41d72d6c9e72a4a31be57e60f89386308ec307a00c27fd52afac89ce2e42d9a03b2b15785f3e79684ee8e7381790a6be6517541bfe53db003aea7410f4b78cffa09ab9e40551d4903538ef0f25eda60e7b15147be1b98755a2a0b3c730a752340eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b7fa8203e880a0498be622974ba4230976b11d3a5fc588b2a97f55b1d55656dfc56cc4d3cf892388dcbdf1dc55141f14f90141f9013e8001840d27387794095e7baea6a6c7c4c2dfeb977efac326af552d87842d5d1ccab8d87f0000000000000000000000000000000000000000000000000000000000000001407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f596355699a095516837a9d6f3a0308041ba08372232f30f4b5373f2365a664cf4d1955aa673876b8fbb0189aa3deaa3160c6a03adeca67493639f324b1937dd0b798268aa4c2501720fe979ee53ec416fec670c0",
                 "transactions" : [
                     {
                         "data" : "0x7f0000000000000000000000000000000000000000000000000000000000000001407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f596355699a095516837a9d6f3a030804",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a082d4f32c6ed38f648a2f90bd59c86451bb061c531e6837c343043436d53303e8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc29326fe997a30fff76ecd56443d670b4a5fed539ef82c6a30fae259473cd08e",
+        "lastblockhash" : "0x507c564f0b4ed330ddfabd0ac5c143630ac588bfb3ff0a523337f82afc83c637",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest373BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest373BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest373BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb7fa",
-                    "hash" : "0xedf5b47bb6e692a7447345939309f0962bab37a30ad595ac89314b76aa42276b",
-                    "mixHash" : "0xe20a5e15963705a82db80197fd2987151f4926b7c99da9b08edf8046ed9357c6",
-                    "nonce" : "0xc761638c6df0450f",
+                    "hash" : "0x181d2f781b2a30c8d3d0b31aebe8d9419fc48952e88e69523eed1d96f47acd9f",
+                    "mixHash" : "0xa0d881905e8043eac109cf3cdd1557893ecbbbf627af8d59201b2e8242814f89",
+                    "nonce" : "0x2b92960cdf2b5c34",
                     "number" : "0x01",
                     "parentHash" : "0xadfec6c969f582a15c546347090bbbc3b84a0697779a0ab958004e6d4a35f1c6",
                     "receiptTrie" : "0x9ab9e40551d4903538ef0f25eda60e7b15147be1b98755a2a0b3c730a752340e",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0x3b2b15785f3e79684ee8e7381790a6be6517541bfe53db003aea7410f4b78cff",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0adfec6c969f582a15c546347090bbbc3b84a0697779a0ab958004e6d4a35f1c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08a41d72d6c9e72a4a31be57e60f89386308ec307a00c27fd52afac89ce2e42d9a03b2b15785f3e79684ee8e7381790a6be6517541bfe53db003aea7410f4b78cffa09ab9e40551d4903538ef0f25eda60e7b15147be1b98755a2a0b3c730a752340eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b7fa8203e880a0e20a5e15963705a82db80197fd2987151f4926b7c99da9b08edf8046ed9357c688c761638c6df0450ff90141f9013e8001840d27387794095e7baea6a6c7c4c2dfeb977efac326af552d87842d5d1ccab8d87f0000000000000000000000000000000000000000000000000000000000000001407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f596355699a095516837a9d6f3a0308041ba08372232f30f4b5373f2365a664cf4d1955aa673876b8fbb0189aa3deaa3160c6a03adeca67493639f324b1937dd0b798268aa4c2501720fe979ee53ec416fec670c0",
+                "rlp" : "0xf90344f901fca0adfec6c969f582a15c546347090bbbc3b84a0697779a0ab958004e6d4a35f1c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08a41d72d6c9e72a4a31be57e60f89386308ec307a00c27fd52afac89ce2e42d9a03b2b15785f3e79684ee8e7381790a6be6517541bfe53db003aea7410f4b78cffa09ab9e40551d4903538ef0f25eda60e7b15147be1b98755a2a0b3c730a752340eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b7fa8203e880a0a0d881905e8043eac109cf3cdd1557893ecbbbf627af8d59201b2e8242814f89882b92960cdf2b5c34f90141f9013e8001840d27387794095e7baea6a6c7c4c2dfeb977efac326af552d87842d5d1ccab8d87f0000000000000000000000000000000000000000000000000000000000000001407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f596355699a095516837a9d6f3a0308041ba08372232f30f4b5373f2365a664cf4d1955aa673876b8fbb0189aa3deaa3160c6a03adeca67493639f324b1937dd0b798268aa4c2501720fe979ee53ec416fec670c0",
                 "transactions" : [
                     {
                         "data" : "0x7f0000000000000000000000000000000000000000000000000000000000000001407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f596355699a095516837a9d6f3a030804",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a082d4f32c6ed38f648a2f90bd59c86451bb061c531e6837c343043436d53303e8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xedf5b47bb6e692a7447345939309f0962bab37a30ad595ac89314b76aa42276b",
+        "lastblockhash" : "0x181d2f781b2a30c8d3d0b31aebe8d9419fc48952e88e69523eed1d96f47acd9f",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest374BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest374BC.json
index 86bd31cc8..6108bed69 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest374BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest374BC.json
@@ -2,8 +2,8 @@
     "randomStatetest374BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest374BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest374BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb8fb",
-                    "hash" : "0x5ecccfce499303e13b513960c9695940742f36bb97310368f9e8a5ecd089e698",
-                    "mixHash" : "0x919eae1aea0f7106009030bc3c0e070126c87d4b61bc24cb5d1a1b4568d48497",
-                    "nonce" : "0xd2a8eaa472a01aa8",
+                    "hash" : "0x1d5e6c8849c6cecad1b9cf8882f4ca479e5b36db53ef546539a15ba268d33de9",
+                    "mixHash" : "0x9651334e69d35d7d5a83c8e9bb3151acb5cebbd091390e3c04033697ccfcdbc1",
+                    "nonce" : "0xd1af3be44426a8c0",
                     "number" : "0x01",
                     "parentHash" : "0x72963981b9c68a6d83d6848a137cd66e6dc75cb80491a374fea7ada400d9242e",
                     "receiptTrie" : "0x80246ab61e4686a9969b02d642838084e11ad387f741133782893a1be68327f3",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x1c7897ca2aa387c8dd062b770621ef03a5c9df4c7fbb9581e12232d3d18b75f4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca072963981b9c68a6d83d6848a137cd66e6dc75cb80491a374fea7ada400d9242ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d45344e17c08d24125a2880987528e85172b51db0729b619fef35a13b305f5d9a01c7897ca2aa387c8dd062b770621ef03a5c9df4c7fbb9581e12232d3d18b75f4a080246ab61e4686a9969b02d642838084e11ad387f741133782893a1be68327f3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b8fb8203e880a0919eae1aea0f7106009030bc3c0e070126c87d4b61bc24cb5d1a1b4568d4849788d2a8eaa472a01aa8f90121f9011e8001845d2eb07294095e7baea6a6c7c4c2dfeb977efac326af552d878415991063b8b87f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c35041406fa33a526031796e8c18836f61367c881ba0ab94f3feef9215fb8f97a1d04c39e760ca035724847d75626d69107549951568a04749c868521bf90bbab48dd2d8bdb941c01651347e0f5184f272e3d7dad1833cc0",
+                "rlp" : "0xf90324f901fca072963981b9c68a6d83d6848a137cd66e6dc75cb80491a374fea7ada400d9242ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d45344e17c08d24125a2880987528e85172b51db0729b619fef35a13b305f5d9a01c7897ca2aa387c8dd062b770621ef03a5c9df4c7fbb9581e12232d3d18b75f4a080246ab61e4686a9969b02d642838084e11ad387f741133782893a1be68327f3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b8fb8203e880a09651334e69d35d7d5a83c8e9bb3151acb5cebbd091390e3c04033697ccfcdbc188d1af3be44426a8c0f90121f9011e8001845d2eb07294095e7baea6a6c7c4c2dfeb977efac326af552d878415991063b8b87f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c35041406fa33a526031796e8c18836f61367c881ba0ab94f3feef9215fb8f97a1d04c39e760ca035724847d75626d69107549951568a04749c868521bf90bbab48dd2d8bdb941c01651347e0f5184f272e3d7dad1833cc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c35041406fa33a526031796e8c18836f61367c88",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a059cb6d8aefcd53e7d1733b571e6aeaab9102170941375efa40eb6a68af70f2aaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5ecccfce499303e13b513960c9695940742f36bb97310368f9e8a5ecd089e698",
+        "lastblockhash" : "0x1d5e6c8849c6cecad1b9cf8882f4ca479e5b36db53ef546539a15ba268d33de9",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest374BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest374BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest374BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xbc07",
-                    "hash" : "0x99cb5f4ecf2442cf30d761cbbe53a798ed57524577474af03bc7a2d1d0b32161",
-                    "mixHash" : "0x052124aebbab9b84a2f3bacd0fd0c1870fef23c7ce935e9dcacc78b4413233f9",
-                    "nonce" : "0x3a86829c2c9a3b7f",
+                    "hash" : "0xfacfc0a94242c64b1113f616325814e9a4963fb289c873b42ab370f49bad4fe8",
+                    "mixHash" : "0xd6590997ae0f55f8d415d93067963bc6f37002edf72704a79ab81cf1d8938d74",
+                    "nonce" : "0x89234c8dc3f9633a",
                     "number" : "0x01",
                     "parentHash" : "0x72963981b9c68a6d83d6848a137cd66e6dc75cb80491a374fea7ada400d9242e",
                     "receiptTrie" : "0x3a904704d69cd20b2b96fe28b074ba40e61f68ac1c91e7893e154cb9c8bbc5ed",
-                    "stateRoot" : "0x05c3e92c8ed85c61efa54dd5d292af0fa65bfc7ff5a35a77603b5999194746f1",
+                    "stateRoot" : "0xec7da0ee4cd5f537b457104bf0341301b3bcc18df96633c1642cb45d461b96ac",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1c7897ca2aa387c8dd062b770621ef03a5c9df4c7fbb9581e12232d3d18b75f4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca072963981b9c68a6d83d6848a137cd66e6dc75cb80491a374fea7ada400d9242ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a005c3e92c8ed85c61efa54dd5d292af0fa65bfc7ff5a35a77603b5999194746f1a01c7897ca2aa387c8dd062b770621ef03a5c9df4c7fbb9581e12232d3d18b75f4a03a904704d69cd20b2b96fe28b074ba40e61f68ac1c91e7893e154cb9c8bbc5edb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bc078203e880a0052124aebbab9b84a2f3bacd0fd0c1870fef23c7ce935e9dcacc78b4413233f9883a86829c2c9a3b7ff90121f9011e8001845d2eb07294095e7baea6a6c7c4c2dfeb977efac326af552d878415991063b8b87f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c35041406fa33a526031796e8c18836f61367c881ba0ab94f3feef9215fb8f97a1d04c39e760ca035724847d75626d69107549951568a04749c868521bf90bbab48dd2d8bdb941c01651347e0f5184f272e3d7dad1833cc0",
+                "rlp" : "0xf90324f901fca072963981b9c68a6d83d6848a137cd66e6dc75cb80491a374fea7ada400d9242ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ec7da0ee4cd5f537b457104bf0341301b3bcc18df96633c1642cb45d461b96aca01c7897ca2aa387c8dd062b770621ef03a5c9df4c7fbb9581e12232d3d18b75f4a03a904704d69cd20b2b96fe28b074ba40e61f68ac1c91e7893e154cb9c8bbc5edb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bc078203e880a0d6590997ae0f55f8d415d93067963bc6f37002edf72704a79ab81cf1d8938d748889234c8dc3f9633af90121f9011e8001845d2eb07294095e7baea6a6c7c4c2dfeb977efac326af552d878415991063b8b87f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c35041406fa33a526031796e8c18836f61367c881ba0ab94f3feef9215fb8f97a1d04c39e760ca035724847d75626d69107549951568a04749c868521bf90bbab48dd2d8bdb941c01651347e0f5184f272e3d7dad1833cc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c35041406fa33a526031796e8c18836f61367c88",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a059cb6d8aefcd53e7d1733b571e6aeaab9102170941375efa40eb6a68af70f2aaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x99cb5f4ecf2442cf30d761cbbe53a798ed57524577474af03bc7a2d1d0b32161",
+        "lastblockhash" : "0xfacfc0a94242c64b1113f616325814e9a4963fb289c873b42ab370f49bad4fe8",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x15991063",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c35041406fa33a526031796e8c18836f61367c885560005155",
@@ -235,8 +228,8 @@
     "randomStatetest374BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest374BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest374BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb8fb",
-                    "hash" : "0x694222b40141415f5f126454017afc066d805b1145c0f8288cddc74ed256646e",
-                    "mixHash" : "0x514b7329181df78f1cd0ffa489b2529eeb68151cac049fe82ae7a83ebee2b1a1",
-                    "nonce" : "0xead9bc3e350eecd9",
+                    "hash" : "0x222ab9e0c6d77e06a7bee6404cccfb117b32b2a80d845a384f2e6afe10182472",
+                    "mixHash" : "0xc8928f107f793e96e91299283d7a55e21b2ac4bd130d328c2cc7add35de7b7b4",
+                    "nonce" : "0xac55111721e5bca2",
                     "number" : "0x01",
                     "parentHash" : "0x72963981b9c68a6d83d6848a137cd66e6dc75cb80491a374fea7ada400d9242e",
                     "receiptTrie" : "0xf7d14c00d9f162cbca303be27c7a3ede375ab19c9e372a70ae7bd17742c9fc8f",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0x1c7897ca2aa387c8dd062b770621ef03a5c9df4c7fbb9581e12232d3d18b75f4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca072963981b9c68a6d83d6848a137cd66e6dc75cb80491a374fea7ada400d9242ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04c6980f849011b3e6ab53edd8d6ff8cd078f285205b3d74b05384e6a7efddddea01c7897ca2aa387c8dd062b770621ef03a5c9df4c7fbb9581e12232d3d18b75f4a0f7d14c00d9f162cbca303be27c7a3ede375ab19c9e372a70ae7bd17742c9fc8fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b8fb8203e880a0514b7329181df78f1cd0ffa489b2529eeb68151cac049fe82ae7a83ebee2b1a188ead9bc3e350eecd9f90121f9011e8001845d2eb07294095e7baea6a6c7c4c2dfeb977efac326af552d878415991063b8b87f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c35041406fa33a526031796e8c18836f61367c881ba0ab94f3feef9215fb8f97a1d04c39e760ca035724847d75626d69107549951568a04749c868521bf90bbab48dd2d8bdb941c01651347e0f5184f272e3d7dad1833cc0",
+                "rlp" : "0xf90324f901fca072963981b9c68a6d83d6848a137cd66e6dc75cb80491a374fea7ada400d9242ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04c6980f849011b3e6ab53edd8d6ff8cd078f285205b3d74b05384e6a7efddddea01c7897ca2aa387c8dd062b770621ef03a5c9df4c7fbb9581e12232d3d18b75f4a0f7d14c00d9f162cbca303be27c7a3ede375ab19c9e372a70ae7bd17742c9fc8fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b8fb8203e880a0c8928f107f793e96e91299283d7a55e21b2ac4bd130d328c2cc7add35de7b7b488ac55111721e5bca2f90121f9011e8001845d2eb07294095e7baea6a6c7c4c2dfeb977efac326af552d878415991063b8b87f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c35041406fa33a526031796e8c18836f61367c881ba0ab94f3feef9215fb8f97a1d04c39e760ca035724847d75626d69107549951568a04749c868521bf90bbab48dd2d8bdb941c01651347e0f5184f272e3d7dad1833cc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c35041406fa33a526031796e8c18836f61367c88",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a059cb6d8aefcd53e7d1733b571e6aeaab9102170941375efa40eb6a68af70f2aaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x694222b40141415f5f126454017afc066d805b1145c0f8288cddc74ed256646e",
+        "lastblockhash" : "0x222ab9e0c6d77e06a7bee6404cccfb117b32b2a80d845a384f2e6afe10182472",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest374BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest374BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest374BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb8fb",
-                    "hash" : "0x2124b9fb4a10db022fded65970fe24f0cc4597fde81c6e68f2a11db6d0f37bb0",
-                    "mixHash" : "0x88165199d92e48e5f062f6e977186a6d629026b25e3a41ac4cdd83f0ce9ed452",
-                    "nonce" : "0x06edfe48a595f2bd",
+                    "hash" : "0x940d6b0ca186d37eee5260746ecae8c564a2d3028feb8c405b113ccb5bb84d25",
+                    "mixHash" : "0x998844f469d09b76adc8b9a285c62a7a7bc6a90e86847a52e4eb9b39e5468aea",
+                    "nonce" : "0x0dea52a71ee4b19b",
                     "number" : "0x01",
                     "parentHash" : "0x72963981b9c68a6d83d6848a137cd66e6dc75cb80491a374fea7ada400d9242e",
                     "receiptTrie" : "0xf7d14c00d9f162cbca303be27c7a3ede375ab19c9e372a70ae7bd17742c9fc8f",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0x1c7897ca2aa387c8dd062b770621ef03a5c9df4c7fbb9581e12232d3d18b75f4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca072963981b9c68a6d83d6848a137cd66e6dc75cb80491a374fea7ada400d9242ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04c6980f849011b3e6ab53edd8d6ff8cd078f285205b3d74b05384e6a7efddddea01c7897ca2aa387c8dd062b770621ef03a5c9df4c7fbb9581e12232d3d18b75f4a0f7d14c00d9f162cbca303be27c7a3ede375ab19c9e372a70ae7bd17742c9fc8fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b8fb8203e880a088165199d92e48e5f062f6e977186a6d629026b25e3a41ac4cdd83f0ce9ed4528806edfe48a595f2bdf90121f9011e8001845d2eb07294095e7baea6a6c7c4c2dfeb977efac326af552d878415991063b8b87f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c35041406fa33a526031796e8c18836f61367c881ba0ab94f3feef9215fb8f97a1d04c39e760ca035724847d75626d69107549951568a04749c868521bf90bbab48dd2d8bdb941c01651347e0f5184f272e3d7dad1833cc0",
+                "rlp" : "0xf90324f901fca072963981b9c68a6d83d6848a137cd66e6dc75cb80491a374fea7ada400d9242ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04c6980f849011b3e6ab53edd8d6ff8cd078f285205b3d74b05384e6a7efddddea01c7897ca2aa387c8dd062b770621ef03a5c9df4c7fbb9581e12232d3d18b75f4a0f7d14c00d9f162cbca303be27c7a3ede375ab19c9e372a70ae7bd17742c9fc8fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b8fb8203e880a0998844f469d09b76adc8b9a285c62a7a7bc6a90e86847a52e4eb9b39e5468aea880dea52a71ee4b19bf90121f9011e8001845d2eb07294095e7baea6a6c7c4c2dfeb977efac326af552d878415991063b8b87f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c35041406fa33a526031796e8c18836f61367c881ba0ab94f3feef9215fb8f97a1d04c39e760ca035724847d75626d69107549951568a04749c868521bf90bbab48dd2d8bdb941c01651347e0f5184f272e3d7dad1833cc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c35041406fa33a526031796e8c18836f61367c88",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a059cb6d8aefcd53e7d1733b571e6aeaab9102170941375efa40eb6a68af70f2aaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2124b9fb4a10db022fded65970fe24f0cc4597fde81c6e68f2a11db6d0f37bb0",
+        "lastblockhash" : "0x940d6b0ca186d37eee5260746ecae8c564a2d3028feb8c405b113ccb5bb84d25",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest374BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest374BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest374BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb8fb",
-                    "hash" : "0xe8bc862696e9995d79c84c75a05c8f4483abd29a8ae2271952df9bd8c0596fef",
-                    "mixHash" : "0x40892590370ab9ec89cd3eacd29ceb9a1ffc463e9183445df1933ba873c90e87",
-                    "nonce" : "0xca3b634300b39775",
+                    "hash" : "0xa312d6667e927f07910fa2a2cb6899445df1a28a80a0bddf55a25f9370bd2b19",
+                    "mixHash" : "0xf5a0df91b86ebd5c893eb3de4c299b5a1b54a21f0adcae0a077acb2ae9b3fa0f",
+                    "nonce" : "0xb571d18190e191fa",
                     "number" : "0x01",
                     "parentHash" : "0x72963981b9c68a6d83d6848a137cd66e6dc75cb80491a374fea7ada400d9242e",
                     "receiptTrie" : "0xf7d14c00d9f162cbca303be27c7a3ede375ab19c9e372a70ae7bd17742c9fc8f",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0x1c7897ca2aa387c8dd062b770621ef03a5c9df4c7fbb9581e12232d3d18b75f4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca072963981b9c68a6d83d6848a137cd66e6dc75cb80491a374fea7ada400d9242ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04c6980f849011b3e6ab53edd8d6ff8cd078f285205b3d74b05384e6a7efddddea01c7897ca2aa387c8dd062b770621ef03a5c9df4c7fbb9581e12232d3d18b75f4a0f7d14c00d9f162cbca303be27c7a3ede375ab19c9e372a70ae7bd17742c9fc8fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b8fb8203e880a040892590370ab9ec89cd3eacd29ceb9a1ffc463e9183445df1933ba873c90e8788ca3b634300b39775f90121f9011e8001845d2eb07294095e7baea6a6c7c4c2dfeb977efac326af552d878415991063b8b87f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c35041406fa33a526031796e8c18836f61367c881ba0ab94f3feef9215fb8f97a1d04c39e760ca035724847d75626d69107549951568a04749c868521bf90bbab48dd2d8bdb941c01651347e0f5184f272e3d7dad1833cc0",
+                "rlp" : "0xf90324f901fca072963981b9c68a6d83d6848a137cd66e6dc75cb80491a374fea7ada400d9242ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04c6980f849011b3e6ab53edd8d6ff8cd078f285205b3d74b05384e6a7efddddea01c7897ca2aa387c8dd062b770621ef03a5c9df4c7fbb9581e12232d3d18b75f4a0f7d14c00d9f162cbca303be27c7a3ede375ab19c9e372a70ae7bd17742c9fc8fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b8fb8203e880a0f5a0df91b86ebd5c893eb3de4c299b5a1b54a21f0adcae0a077acb2ae9b3fa0f88b571d18190e191faf90121f9011e8001845d2eb07294095e7baea6a6c7c4c2dfeb977efac326af552d878415991063b8b87f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c35041406fa33a526031796e8c18836f61367c881ba0ab94f3feef9215fb8f97a1d04c39e760ca035724847d75626d69107549951568a04749c868521bf90bbab48dd2d8bdb941c01651347e0f5184f272e3d7dad1833cc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c35041406fa33a526031796e8c18836f61367c88",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a059cb6d8aefcd53e7d1733b571e6aeaab9102170941375efa40eb6a68af70f2aaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe8bc862696e9995d79c84c75a05c8f4483abd29a8ae2271952df9bd8c0596fef",
+        "lastblockhash" : "0xa312d6667e927f07910fa2a2cb6899445df1a28a80a0bddf55a25f9370bd2b19",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest374BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest374BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest374BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb8fb",
-                    "hash" : "0x71e306fb972baf5d651860562febcced1cb4dd38d092fcbcc59838318635c194",
-                    "mixHash" : "0x3b2cc54e314060fa3b87baca5a29feca4f91be80753c7a9897e6a150b7f1291e",
-                    "nonce" : "0xc9eae124c870b923",
+                    "hash" : "0x4dc5e5520ec5333bc76060785baf7ec85058574ab31eaa9faeeecf967a6e1791",
+                    "mixHash" : "0x37389f35915d9516b50bf9d5de68c680765851110954427f2729df783dd0bbb1",
+                    "nonce" : "0x4337de9c608b4436",
                     "number" : "0x01",
                     "parentHash" : "0x72963981b9c68a6d83d6848a137cd66e6dc75cb80491a374fea7ada400d9242e",
                     "receiptTrie" : "0xf7d14c00d9f162cbca303be27c7a3ede375ab19c9e372a70ae7bd17742c9fc8f",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0x1c7897ca2aa387c8dd062b770621ef03a5c9df4c7fbb9581e12232d3d18b75f4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca072963981b9c68a6d83d6848a137cd66e6dc75cb80491a374fea7ada400d9242ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04c6980f849011b3e6ab53edd8d6ff8cd078f285205b3d74b05384e6a7efddddea01c7897ca2aa387c8dd062b770621ef03a5c9df4c7fbb9581e12232d3d18b75f4a0f7d14c00d9f162cbca303be27c7a3ede375ab19c9e372a70ae7bd17742c9fc8fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b8fb8203e880a03b2cc54e314060fa3b87baca5a29feca4f91be80753c7a9897e6a150b7f1291e88c9eae124c870b923f90121f9011e8001845d2eb07294095e7baea6a6c7c4c2dfeb977efac326af552d878415991063b8b87f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c35041406fa33a526031796e8c18836f61367c881ba0ab94f3feef9215fb8f97a1d04c39e760ca035724847d75626d69107549951568a04749c868521bf90bbab48dd2d8bdb941c01651347e0f5184f272e3d7dad1833cc0",
+                "rlp" : "0xf90324f901fca072963981b9c68a6d83d6848a137cd66e6dc75cb80491a374fea7ada400d9242ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04c6980f849011b3e6ab53edd8d6ff8cd078f285205b3d74b05384e6a7efddddea01c7897ca2aa387c8dd062b770621ef03a5c9df4c7fbb9581e12232d3d18b75f4a0f7d14c00d9f162cbca303be27c7a3ede375ab19c9e372a70ae7bd17742c9fc8fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b8fb8203e880a037389f35915d9516b50bf9d5de68c680765851110954427f2729df783dd0bbb1884337de9c608b4436f90121f9011e8001845d2eb07294095e7baea6a6c7c4c2dfeb977efac326af552d878415991063b8b87f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c35041406fa33a526031796e8c18836f61367c881ba0ab94f3feef9215fb8f97a1d04c39e760ca035724847d75626d69107549951568a04749c868521bf90bbab48dd2d8bdb941c01651347e0f5184f272e3d7dad1833cc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c35041406fa33a526031796e8c18836f61367c88",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a059cb6d8aefcd53e7d1733b571e6aeaab9102170941375efa40eb6a68af70f2aaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x71e306fb972baf5d651860562febcced1cb4dd38d092fcbcc59838318635c194",
+        "lastblockhash" : "0x4dc5e5520ec5333bc76060785baf7ec85058574ab31eaa9faeeecf967a6e1791",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest390BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest390BC.json
index 5fdcbd77b..7f15c4313 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest390BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest390BC.json
@@ -2,8 +2,8 @@
     "randomStatetest390BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest390BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest390BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc3fc",
-                    "hash" : "0xc884588098122e5edd284cc267c45c877af916d6c87a6ce9776e0b02b9b9799b",
-                    "mixHash" : "0x96e4248a90765924a271fe63a33c5703fa05704273f35efe275da84994d77087",
-                    "nonce" : "0x17fdd6768b08eda9",
+                    "hash" : "0x160b4a05e14f61370834c264372d4451db1116fa82fd411b40127fcddd0e7328",
+                    "mixHash" : "0x3b36d40769562be6141550cbd4ce50c5f26e1a768664d0d8d7fa374317b3ac0b",
+                    "nonce" : "0xe6b703b354fc5650",
                     "number" : "0x01",
                     "parentHash" : "0xc26ede3dba534dd3adf0723d2813aa24ea97f07e03c99285f1dff0a5f4a50295",
                     "receiptTrie" : "0x1589bba6c25a0726120d58dba155ff1db0579c118a8672e90af561c98d181c57",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xa8843f5e6adfd51649fa19792207e1366f45fd90a68ab81f721eeaac75e6e0f7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0c26ede3dba534dd3adf0723d2813aa24ea97f07e03c99285f1dff0a5f4a50295a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06d0e9efd0eb316c11e306cae7f2d34df814fea5d92272544b1acff293060d3bea0a8843f5e6adfd51649fa19792207e1366f45fd90a68ab81f721eeaac75e6e0f7a01589bba6c25a0726120d58dba155ff1db0579c118a8672e90af561c98d181c57b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c3fc8203e880a096e4248a90765924a271fe63a33c5703fa05704273f35efe275da84994d770878817fdd6768b08eda9f90141f9013e80018465aa7fb694095e7baea6a6c7c4c2dfeb977efac326af552d87845be3f769b8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff406f6c6b30816c7a0412415a0414179b631ba05729e51880981b1a869fbd16eacec72f1a8572a3b5d573e968fc77ecf5d8dabca04e42f5f0e707055afdc92d07ab979be83dd9322984628873704fb25bf2eb9c5dc0",
+                "rlp" : "0xf90344f901fca0c26ede3dba534dd3adf0723d2813aa24ea97f07e03c99285f1dff0a5f4a50295a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06d0e9efd0eb316c11e306cae7f2d34df814fea5d92272544b1acff293060d3bea0a8843f5e6adfd51649fa19792207e1366f45fd90a68ab81f721eeaac75e6e0f7a01589bba6c25a0726120d58dba155ff1db0579c118a8672e90af561c98d181c57b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c3fc8203e880a03b36d40769562be6141550cbd4ce50c5f26e1a768664d0d8d7fa374317b3ac0b88e6b703b354fc5650f90141f9013e80018465aa7fb694095e7baea6a6c7c4c2dfeb977efac326af552d87845be3f769b8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff406f6c6b30816c7a0412415a0414179b631ba05729e51880981b1a869fbd16eacec72f1a8572a3b5d573e968fc77ecf5d8dabca04e42f5f0e707055afdc92d07ab979be83dd9322984628873704fb25bf2eb9c5dc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff406f6c6b30816c7a0412415a0414179b63",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09ea4c54666e8cd9fabaf7ccc0b048459d67c05e9c5dda61da5437a652f813db6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc884588098122e5edd284cc267c45c877af916d6c87a6ce9776e0b02b9b9799b",
+        "lastblockhash" : "0x160b4a05e14f61370834c264372d4451db1116fa82fd411b40127fcddd0e7328",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest390BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest390BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest390BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc708",
-                    "hash" : "0x06df02ef8e0e3311a2b662e18e24baa2faf72d765c05204963685cdb2b99a55d",
-                    "mixHash" : "0xd467e31f537c83316ac25df3d5bcc61cc68cfa432e06b96737b11a9d4e116e7e",
-                    "nonce" : "0x97d628648e0a165d",
+                    "hash" : "0xe4c0c7c01ea99e8a887c9d48c3ba02e7ed51f5791fc198b942a4c56c6983d0db",
+                    "mixHash" : "0xc6b22166e66cdf9db163f2d1377a1fe52086e5bbc5f8afdac465eb331b79e6dc",
+                    "nonce" : "0x0b27478ef2e8b383",
                     "number" : "0x01",
                     "parentHash" : "0xc26ede3dba534dd3adf0723d2813aa24ea97f07e03c99285f1dff0a5f4a50295",
                     "receiptTrie" : "0x93674cc949449cb19d224ae8eedd5529ef95a72aa97ed05d1f9addb73380dcc3",
-                    "stateRoot" : "0xd38f99aaad2a6d8afcbdbe90da3eb6c8b39b6ede8b3c0c522843db9081e635b2",
+                    "stateRoot" : "0x161783714d6ea3b400e28e4244528445399e989235b1c2ccb48849d0cdde71a3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa8843f5e6adfd51649fa19792207e1366f45fd90a68ab81f721eeaac75e6e0f7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0c26ede3dba534dd3adf0723d2813aa24ea97f07e03c99285f1dff0a5f4a50295a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d38f99aaad2a6d8afcbdbe90da3eb6c8b39b6ede8b3c0c522843db9081e635b2a0a8843f5e6adfd51649fa19792207e1366f45fd90a68ab81f721eeaac75e6e0f7a093674cc949449cb19d224ae8eedd5529ef95a72aa97ed05d1f9addb73380dcc3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c7088203e880a0d467e31f537c83316ac25df3d5bcc61cc68cfa432e06b96737b11a9d4e116e7e8897d628648e0a165df90141f9013e80018465aa7fb694095e7baea6a6c7c4c2dfeb977efac326af552d87845be3f769b8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff406f6c6b30816c7a0412415a0414179b631ba05729e51880981b1a869fbd16eacec72f1a8572a3b5d573e968fc77ecf5d8dabca04e42f5f0e707055afdc92d07ab979be83dd9322984628873704fb25bf2eb9c5dc0",
+                "rlp" : "0xf90344f901fca0c26ede3dba534dd3adf0723d2813aa24ea97f07e03c99285f1dff0a5f4a50295a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0161783714d6ea3b400e28e4244528445399e989235b1c2ccb48849d0cdde71a3a0a8843f5e6adfd51649fa19792207e1366f45fd90a68ab81f721eeaac75e6e0f7a093674cc949449cb19d224ae8eedd5529ef95a72aa97ed05d1f9addb73380dcc3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c7088203e880a0c6b22166e66cdf9db163f2d1377a1fe52086e5bbc5f8afdac465eb331b79e6dc880b27478ef2e8b383f90141f9013e80018465aa7fb694095e7baea6a6c7c4c2dfeb977efac326af552d87845be3f769b8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff406f6c6b30816c7a0412415a0414179b631ba05729e51880981b1a869fbd16eacec72f1a8572a3b5d573e968fc77ecf5d8dabca04e42f5f0e707055afdc92d07ab979be83dd9322984628873704fb25bf2eb9c5dc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff406f6c6b30816c7a0412415a0414179b63",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09ea4c54666e8cd9fabaf7ccc0b048459d67c05e9c5dda61da5437a652f813db6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x06df02ef8e0e3311a2b662e18e24baa2faf72d765c05204963685cdb2b99a55d",
+        "lastblockhash" : "0xe4c0c7c01ea99e8a887c9d48c3ba02e7ed51f5791fc198b942a4c56c6983d0db",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x5be3f769",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff406f6c6b30816c7a0412415a0414179b635560005155",
@@ -235,8 +228,8 @@
     "randomStatetest390BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest390BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest390BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc3fc",
-                    "hash" : "0xa2ef740f543b9521212007714c04d3c5f950c23908eadb8fb7193144192d94b2",
-                    "mixHash" : "0xb486f4efeae64aa6bdab49f496bc4498838ca6059ea0baf50f0ca9409ede8bea",
-                    "nonce" : "0xf65912cba5774fd3",
+                    "hash" : "0xe03f7f2098b462487014677ae55dc29edeef87e373e934a0c737ca7a5e2a02ba",
+                    "mixHash" : "0x5d01bfea6b258010ed14a31bb8b6de89d3b52046161838327a72b7b8e8631e23",
+                    "nonce" : "0xed49780cf9724cf1",
                     "number" : "0x01",
                     "parentHash" : "0xc26ede3dba534dd3adf0723d2813aa24ea97f07e03c99285f1dff0a5f4a50295",
                     "receiptTrie" : "0x9c809f6fdff022f092b2559c5b2cc7ee70de93f4a34dc53596c167c12697d04c",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xa8843f5e6adfd51649fa19792207e1366f45fd90a68ab81f721eeaac75e6e0f7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0c26ede3dba534dd3adf0723d2813aa24ea97f07e03c99285f1dff0a5f4a50295a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fb607c1db80d84c00119b0feb339234431d0e98ab6c14ac20bf9db80ec23b8eaa0a8843f5e6adfd51649fa19792207e1366f45fd90a68ab81f721eeaac75e6e0f7a09c809f6fdff022f092b2559c5b2cc7ee70de93f4a34dc53596c167c12697d04cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c3fc8203e880a0b486f4efeae64aa6bdab49f496bc4498838ca6059ea0baf50f0ca9409ede8bea88f65912cba5774fd3f90141f9013e80018465aa7fb694095e7baea6a6c7c4c2dfeb977efac326af552d87845be3f769b8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff406f6c6b30816c7a0412415a0414179b631ba05729e51880981b1a869fbd16eacec72f1a8572a3b5d573e968fc77ecf5d8dabca04e42f5f0e707055afdc92d07ab979be83dd9322984628873704fb25bf2eb9c5dc0",
+                "rlp" : "0xf90344f901fca0c26ede3dba534dd3adf0723d2813aa24ea97f07e03c99285f1dff0a5f4a50295a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fb607c1db80d84c00119b0feb339234431d0e98ab6c14ac20bf9db80ec23b8eaa0a8843f5e6adfd51649fa19792207e1366f45fd90a68ab81f721eeaac75e6e0f7a09c809f6fdff022f092b2559c5b2cc7ee70de93f4a34dc53596c167c12697d04cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c3fc8203e880a05d01bfea6b258010ed14a31bb8b6de89d3b52046161838327a72b7b8e8631e2388ed49780cf9724cf1f90141f9013e80018465aa7fb694095e7baea6a6c7c4c2dfeb977efac326af552d87845be3f769b8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff406f6c6b30816c7a0412415a0414179b631ba05729e51880981b1a869fbd16eacec72f1a8572a3b5d573e968fc77ecf5d8dabca04e42f5f0e707055afdc92d07ab979be83dd9322984628873704fb25bf2eb9c5dc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff406f6c6b30816c7a0412415a0414179b63",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09ea4c54666e8cd9fabaf7ccc0b048459d67c05e9c5dda61da5437a652f813db6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa2ef740f543b9521212007714c04d3c5f950c23908eadb8fb7193144192d94b2",
+        "lastblockhash" : "0xe03f7f2098b462487014677ae55dc29edeef87e373e934a0c737ca7a5e2a02ba",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest390BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest390BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest390BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc3fc",
-                    "hash" : "0x8ca39757065c5784491bbc1a03171916ca71f81f54ac8ab2d15888cd4608833d",
-                    "mixHash" : "0xd55b9c20b7099394fe7964daea45a2a1e9ec4b542703b9cc9b3ee5195b0de91c",
-                    "nonce" : "0xbd462e68062a8514",
+                    "hash" : "0xa5a5e7426c41c398b2adb82326b634ff43711b70cfa1ea82ae584514d902e04b",
+                    "mixHash" : "0xe644d5d2ea267bdc20f83fa5a5626c89d63cfa93f43e84dcc9662fd9a6eb58ee",
+                    "nonce" : "0x5c19087846c5b1d8",
                     "number" : "0x01",
                     "parentHash" : "0xc26ede3dba534dd3adf0723d2813aa24ea97f07e03c99285f1dff0a5f4a50295",
                     "receiptTrie" : "0x9c809f6fdff022f092b2559c5b2cc7ee70de93f4a34dc53596c167c12697d04c",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xa8843f5e6adfd51649fa19792207e1366f45fd90a68ab81f721eeaac75e6e0f7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0c26ede3dba534dd3adf0723d2813aa24ea97f07e03c99285f1dff0a5f4a50295a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fb607c1db80d84c00119b0feb339234431d0e98ab6c14ac20bf9db80ec23b8eaa0a8843f5e6adfd51649fa19792207e1366f45fd90a68ab81f721eeaac75e6e0f7a09c809f6fdff022f092b2559c5b2cc7ee70de93f4a34dc53596c167c12697d04cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c3fc8203e880a0d55b9c20b7099394fe7964daea45a2a1e9ec4b542703b9cc9b3ee5195b0de91c88bd462e68062a8514f90141f9013e80018465aa7fb694095e7baea6a6c7c4c2dfeb977efac326af552d87845be3f769b8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff406f6c6b30816c7a0412415a0414179b631ba05729e51880981b1a869fbd16eacec72f1a8572a3b5d573e968fc77ecf5d8dabca04e42f5f0e707055afdc92d07ab979be83dd9322984628873704fb25bf2eb9c5dc0",
+                "rlp" : "0xf90344f901fca0c26ede3dba534dd3adf0723d2813aa24ea97f07e03c99285f1dff0a5f4a50295a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fb607c1db80d84c00119b0feb339234431d0e98ab6c14ac20bf9db80ec23b8eaa0a8843f5e6adfd51649fa19792207e1366f45fd90a68ab81f721eeaac75e6e0f7a09c809f6fdff022f092b2559c5b2cc7ee70de93f4a34dc53596c167c12697d04cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c3fc8203e880a0e644d5d2ea267bdc20f83fa5a5626c89d63cfa93f43e84dcc9662fd9a6eb58ee885c19087846c5b1d8f90141f9013e80018465aa7fb694095e7baea6a6c7c4c2dfeb977efac326af552d87845be3f769b8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff406f6c6b30816c7a0412415a0414179b631ba05729e51880981b1a869fbd16eacec72f1a8572a3b5d573e968fc77ecf5d8dabca04e42f5f0e707055afdc92d07ab979be83dd9322984628873704fb25bf2eb9c5dc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff406f6c6b30816c7a0412415a0414179b63",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09ea4c54666e8cd9fabaf7ccc0b048459d67c05e9c5dda61da5437a652f813db6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8ca39757065c5784491bbc1a03171916ca71f81f54ac8ab2d15888cd4608833d",
+        "lastblockhash" : "0xa5a5e7426c41c398b2adb82326b634ff43711b70cfa1ea82ae584514d902e04b",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest390BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest390BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest390BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc3fc",
-                    "hash" : "0x72609e7be56ab81bb722696b1d419fa3cb003033ff3220f35b6e95405285ef2c",
-                    "mixHash" : "0xc37bfa211be874083ac93833f360667d900ca65deabffe70a05b9eed2388f701",
-                    "nonce" : "0x2cc891f1f38bd6da",
+                    "hash" : "0x42efbfce97b06647107edd34365f1e2d791609d946ea02c85ebfda67ea768484",
+                    "mixHash" : "0x2f166ce070400f4277dbc1e0ec3d6c49b2ba16d2fa5a80ce6d89ededade6a537",
+                    "nonce" : "0xb20fc6c769d61e7a",
                     "number" : "0x01",
                     "parentHash" : "0xc26ede3dba534dd3adf0723d2813aa24ea97f07e03c99285f1dff0a5f4a50295",
                     "receiptTrie" : "0x9c809f6fdff022f092b2559c5b2cc7ee70de93f4a34dc53596c167c12697d04c",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xa8843f5e6adfd51649fa19792207e1366f45fd90a68ab81f721eeaac75e6e0f7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0c26ede3dba534dd3adf0723d2813aa24ea97f07e03c99285f1dff0a5f4a50295a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fb607c1db80d84c00119b0feb339234431d0e98ab6c14ac20bf9db80ec23b8eaa0a8843f5e6adfd51649fa19792207e1366f45fd90a68ab81f721eeaac75e6e0f7a09c809f6fdff022f092b2559c5b2cc7ee70de93f4a34dc53596c167c12697d04cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c3fc8203e880a0c37bfa211be874083ac93833f360667d900ca65deabffe70a05b9eed2388f701882cc891f1f38bd6daf90141f9013e80018465aa7fb694095e7baea6a6c7c4c2dfeb977efac326af552d87845be3f769b8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff406f6c6b30816c7a0412415a0414179b631ba05729e51880981b1a869fbd16eacec72f1a8572a3b5d573e968fc77ecf5d8dabca04e42f5f0e707055afdc92d07ab979be83dd9322984628873704fb25bf2eb9c5dc0",
+                "rlp" : "0xf90344f901fca0c26ede3dba534dd3adf0723d2813aa24ea97f07e03c99285f1dff0a5f4a50295a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fb607c1db80d84c00119b0feb339234431d0e98ab6c14ac20bf9db80ec23b8eaa0a8843f5e6adfd51649fa19792207e1366f45fd90a68ab81f721eeaac75e6e0f7a09c809f6fdff022f092b2559c5b2cc7ee70de93f4a34dc53596c167c12697d04cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c3fc8203e880a02f166ce070400f4277dbc1e0ec3d6c49b2ba16d2fa5a80ce6d89ededade6a53788b20fc6c769d61e7af90141f9013e80018465aa7fb694095e7baea6a6c7c4c2dfeb977efac326af552d87845be3f769b8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff406f6c6b30816c7a0412415a0414179b631ba05729e51880981b1a869fbd16eacec72f1a8572a3b5d573e968fc77ecf5d8dabca04e42f5f0e707055afdc92d07ab979be83dd9322984628873704fb25bf2eb9c5dc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff406f6c6b30816c7a0412415a0414179b63",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09ea4c54666e8cd9fabaf7ccc0b048459d67c05e9c5dda61da5437a652f813db6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x72609e7be56ab81bb722696b1d419fa3cb003033ff3220f35b6e95405285ef2c",
+        "lastblockhash" : "0x42efbfce97b06647107edd34365f1e2d791609d946ea02c85ebfda67ea768484",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest390BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.eaf96907.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest390BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest390BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc3fc",
-                    "hash" : "0xb008b576b66a19289fdb01a85b75aa6861386f089823307dad10a7b875fc0cae",
-                    "mixHash" : "0xe18073aed371b1fdc41a97e6a7ab5d7041981ab21357f6206f08d3414297fe9a",
-                    "nonce" : "0xf303420924189113",
+                    "hash" : "0xba208b7b68537986d6c7b820520bcde10209e26683dce29ceb89f3154d53138b",
+                    "mixHash" : "0x834418c9b2adab2d2a7cf152171c4ef652b1b543aad829bd485de5d2d4836bc8",
+                    "nonce" : "0x62bee576942ab704",
                     "number" : "0x01",
                     "parentHash" : "0xc26ede3dba534dd3adf0723d2813aa24ea97f07e03c99285f1dff0a5f4a50295",
                     "receiptTrie" : "0x9c809f6fdff022f092b2559c5b2cc7ee70de93f4a34dc53596c167c12697d04c",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xa8843f5e6adfd51649fa19792207e1366f45fd90a68ab81f721eeaac75e6e0f7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0c26ede3dba534dd3adf0723d2813aa24ea97f07e03c99285f1dff0a5f4a50295a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fb607c1db80d84c00119b0feb339234431d0e98ab6c14ac20bf9db80ec23b8eaa0a8843f5e6adfd51649fa19792207e1366f45fd90a68ab81f721eeaac75e6e0f7a09c809f6fdff022f092b2559c5b2cc7ee70de93f4a34dc53596c167c12697d04cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c3fc8203e880a0e18073aed371b1fdc41a97e6a7ab5d7041981ab21357f6206f08d3414297fe9a88f303420924189113f90141f9013e80018465aa7fb694095e7baea6a6c7c4c2dfeb977efac326af552d87845be3f769b8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff406f6c6b30816c7a0412415a0414179b631ba05729e51880981b1a869fbd16eacec72f1a8572a3b5d573e968fc77ecf5d8dabca04e42f5f0e707055afdc92d07ab979be83dd9322984628873704fb25bf2eb9c5dc0",
+                "rlp" : "0xf90344f901fca0c26ede3dba534dd3adf0723d2813aa24ea97f07e03c99285f1dff0a5f4a50295a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fb607c1db80d84c00119b0feb339234431d0e98ab6c14ac20bf9db80ec23b8eaa0a8843f5e6adfd51649fa19792207e1366f45fd90a68ab81f721eeaac75e6e0f7a09c809f6fdff022f092b2559c5b2cc7ee70de93f4a34dc53596c167c12697d04cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c3fc8203e880a0834418c9b2adab2d2a7cf152171c4ef652b1b543aad829bd485de5d2d4836bc88862bee576942ab704f90141f9013e80018465aa7fb694095e7baea6a6c7c4c2dfeb977efac326af552d87845be3f769b8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff406f6c6b30816c7a0412415a0414179b631ba05729e51880981b1a869fbd16eacec72f1a8572a3b5d573e968fc77ecf5d8dabca04e42f5f0e707055afdc92d07ab979be83dd9322984628873704fb25bf2eb9c5dc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff406f6c6b30816c7a0412415a0414179b63",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09ea4c54666e8cd9fabaf7ccc0b048459d67c05e9c5dda61da5437a652f813db6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb008b576b66a19289fdb01a85b75aa6861386f089823307dad10a7b875fc0cae",
+        "lastblockhash" : "0xba208b7b68537986d6c7b820520bcde10209e26683dce29ceb89f3154d53138b",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest392BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest392BC.json
index bb931c51f..1bc62b2f9 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest392BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest392BC.json
@@ -2,8 +2,8 @@
     "randomStatetest392BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest392BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest392BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa219",
-                    "hash" : "0xec5e2bdcfe740c2e0412e2e211d0f3dd6edd709a9db144d69c5b9cd64afe3589",
-                    "mixHash" : "0x81523a7a3aa12171b3f2fa0d87c35709d2f82103725c626688fb0c4f2cb4e267",
-                    "nonce" : "0x29a3c7199644b5da",
+                    "hash" : "0x3826ad69427bbca256d8f45a079dae59ec3fc9c7b5a8781b20133542c6e337d0",
+                    "mixHash" : "0x4ff11560faf9a8105ca19ae65ceb69a341fec18ea4159e0ca85a10ba9df13eb3",
+                    "nonce" : "0x9aef39e41a4024aa",
                     "number" : "0x01",
                     "parentHash" : "0xfed7f643bcc5f85024c7be5dbe4bf3144495ad6f6f9b9af7a640d25225d3e23e",
                     "receiptTrie" : "0x4fcdc20b84e590e0576514da1ea8eced745a6788d26353c7b86e3ca3d112ad25",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0fed7f643bcc5f85024c7be5dbe4bf3144495ad6f6f9b9af7a640d25225d3e23ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a073fbf4a7e602fb7a40a4eb526db366001fccb1c5517091a6dcc1f2dd8b9f0cb2a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa04fcdc20b84e590e0576514da1ea8eced745a6788d26353c7b86e3ca3d112ad25b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2198203e880a081523a7a3aa12171b3f2fa0d87c35709d2f82103725c626688fb0c4f2cb4e2678829a3c7199644b5daf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0fed7f643bcc5f85024c7be5dbe4bf3144495ad6f6f9b9af7a640d25225d3e23ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a073fbf4a7e602fb7a40a4eb526db366001fccb1c5517091a6dcc1f2dd8b9f0cb2a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa04fcdc20b84e590e0576514da1ea8eced745a6788d26353c7b86e3ca3d112ad25b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2198203e880a04ff11560faf9a8105ca19ae65ceb69a341fec18ea4159e0ca85a10ba9df13eb3889aef39e41a4024aaf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e4591bd7b086a77c4ff9bd04e7a3dfc5f0239ff479ffd56b116d329f6bfe5234a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xec5e2bdcfe740c2e0412e2e211d0f3dd6edd709a9db144d69c5b9cd64afe3589",
+        "lastblockhash" : "0x3826ad69427bbca256d8f45a079dae59ec3fc9c7b5a8781b20133542c6e337d0",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest392BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest392BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest392BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa525",
-                    "hash" : "0x1abf2950b56fdd73fbaa0e1f96ad8b05665ab38a1325a821a9cdf37da884fb84",
-                    "mixHash" : "0xcf61bb46b9bfaf1095ab97812f4499efe06e98aaf30c8302bc212204077bdd67",
-                    "nonce" : "0x59a5c36efaefbb76",
+                    "hash" : "0x923b2a69109349f87e31c872f66dc7717134a932342f34765061ed1cbe9187f1",
+                    "mixHash" : "0xfa3c3e982893aff12858a64574e0aba5d4d121098df77feea3cf309d6cfd1468",
+                    "nonce" : "0x19d3a0c36fac93c6",
                     "number" : "0x01",
                     "parentHash" : "0xfed7f643bcc5f85024c7be5dbe4bf3144495ad6f6f9b9af7a640d25225d3e23e",
                     "receiptTrie" : "0x3651bb304befea6cf9831b82e3a72ebcfd5db6d4cfd2c14f28e88f7ad52a2c97",
-                    "stateRoot" : "0x920dce439b0b74d2f41d44f5e7b820bc6a935b3dc96f9cbe1577fac8abea7482",
+                    "stateRoot" : "0x08bdde6d3408ff84e432f2607c1d0bc6640fd4e908e6242faa2dccae82cc5801",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0fed7f643bcc5f85024c7be5dbe4bf3144495ad6f6f9b9af7a640d25225d3e23ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0920dce439b0b74d2f41d44f5e7b820bc6a935b3dc96f9cbe1577fac8abea7482a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa03651bb304befea6cf9831b82e3a72ebcfd5db6d4cfd2c14f28e88f7ad52a2c97b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a5258203e880a0cf61bb46b9bfaf1095ab97812f4499efe06e98aaf30c8302bc212204077bdd678859a5c36efaefbb76f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0fed7f643bcc5f85024c7be5dbe4bf3144495ad6f6f9b9af7a640d25225d3e23ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a008bdde6d3408ff84e432f2607c1d0bc6640fd4e908e6242faa2dccae82cc5801a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa03651bb304befea6cf9831b82e3a72ebcfd5db6d4cfd2c14f28e88f7ad52a2c97b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a5258203e880a0fa3c3e982893aff12858a64574e0aba5d4d121098df77feea3cf309d6cfd14688819d3a0c36fac93c6f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e4591bd7b086a77c4ff9bd04e7a3dfc5f0239ff479ffd56b116d329f6bfe5234a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1abf2950b56fdd73fbaa0e1f96ad8b05665ab38a1325a821a9cdf37da884fb84",
+        "lastblockhash" : "0x923b2a69109349f87e31c872f66dc7717134a932342f34765061ed1cbe9187f1",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x424061434444413155",
@@ -235,8 +228,8 @@
     "randomStatetest392BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest392BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest392BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa219",
-                    "hash" : "0xb3b07c64dd1a423fb241dee831d155dfc2c16928869ce724314491f80fd9d77a",
-                    "mixHash" : "0x4b4756242bfeb71f5b04e2d112014d35f60c42a02408ea4d29d537759945482d",
-                    "nonce" : "0x2e88b09d08f2bb9d",
+                    "hash" : "0xbd75dd8b32636fc550975b36cf6da49d8d1fd7130085a1b43ddec5aa8d649685",
+                    "mixHash" : "0x7b055c9616fdd460adaf9eea016e3940369dc00772be70a7a6a1ad131d1840fb",
+                    "nonce" : "0xeae5ab5b48906bdf",
                     "number" : "0x01",
                     "parentHash" : "0xfed7f643bcc5f85024c7be5dbe4bf3144495ad6f6f9b9af7a640d25225d3e23e",
                     "receiptTrie" : "0x6f0a4172ca656a62e3bbb28bf584bea9ec9c0177b33b414bac4062fb6e484de2",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0fed7f643bcc5f85024c7be5dbe4bf3144495ad6f6f9b9af7a640d25225d3e23ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fe9f5bf916317c357497a53d2d56991c5e6ae55ee1bd0ccf7d8b742cdd54402ba0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06f0a4172ca656a62e3bbb28bf584bea9ec9c0177b33b414bac4062fb6e484de2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2198203e880a04b4756242bfeb71f5b04e2d112014d35f60c42a02408ea4d29d537759945482d882e88b09d08f2bb9df865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0fed7f643bcc5f85024c7be5dbe4bf3144495ad6f6f9b9af7a640d25225d3e23ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fe9f5bf916317c357497a53d2d56991c5e6ae55ee1bd0ccf7d8b742cdd54402ba0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06f0a4172ca656a62e3bbb28bf584bea9ec9c0177b33b414bac4062fb6e484de2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2198203e880a07b055c9616fdd460adaf9eea016e3940369dc00772be70a7a6a1ad131d1840fb88eae5ab5b48906bdff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e4591bd7b086a77c4ff9bd04e7a3dfc5f0239ff479ffd56b116d329f6bfe5234a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb3b07c64dd1a423fb241dee831d155dfc2c16928869ce724314491f80fd9d77a",
+        "lastblockhash" : "0xbd75dd8b32636fc550975b36cf6da49d8d1fd7130085a1b43ddec5aa8d649685",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest392BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest392BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest392BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa219",
-                    "hash" : "0x49aca15db5433402905a43e828a6f8431a58bfe359bdeefd9d18c4ae33885579",
-                    "mixHash" : "0x1bddd5d93b515bb0b0a7c9408cd6f6cf4a797d691c31b260ab9e3232c6323ca4",
-                    "nonce" : "0x4ebad3012d079358",
+                    "hash" : "0x80ead2023d032f0acc6ed0315c3c3a32190dbc68d86cbfe58e2db2cbab9cf6fc",
+                    "mixHash" : "0x1282f920c3bbf030521d1f07cf498f78c4c795fcb9e396d3dc9cc6ac191a9d78",
+                    "nonce" : "0x86ffb7ee730ea77d",
                     "number" : "0x01",
                     "parentHash" : "0xfed7f643bcc5f85024c7be5dbe4bf3144495ad6f6f9b9af7a640d25225d3e23e",
                     "receiptTrie" : "0x6f0a4172ca656a62e3bbb28bf584bea9ec9c0177b33b414bac4062fb6e484de2",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0fed7f643bcc5f85024c7be5dbe4bf3144495ad6f6f9b9af7a640d25225d3e23ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fe9f5bf916317c357497a53d2d56991c5e6ae55ee1bd0ccf7d8b742cdd54402ba0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06f0a4172ca656a62e3bbb28bf584bea9ec9c0177b33b414bac4062fb6e484de2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2198203e880a01bddd5d93b515bb0b0a7c9408cd6f6cf4a797d691c31b260ab9e3232c6323ca4884ebad3012d079358f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0fed7f643bcc5f85024c7be5dbe4bf3144495ad6f6f9b9af7a640d25225d3e23ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fe9f5bf916317c357497a53d2d56991c5e6ae55ee1bd0ccf7d8b742cdd54402ba0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06f0a4172ca656a62e3bbb28bf584bea9ec9c0177b33b414bac4062fb6e484de2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2198203e880a01282f920c3bbf030521d1f07cf498f78c4c795fcb9e396d3dc9cc6ac191a9d788886ffb7ee730ea77df865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e4591bd7b086a77c4ff9bd04e7a3dfc5f0239ff479ffd56b116d329f6bfe5234a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x49aca15db5433402905a43e828a6f8431a58bfe359bdeefd9d18c4ae33885579",
+        "lastblockhash" : "0x80ead2023d032f0acc6ed0315c3c3a32190dbc68d86cbfe58e2db2cbab9cf6fc",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest392BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest392BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest392BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa09d",
-                    "hash" : "0x5e08ec7f712b42eccaa83177be6611a09132e29ec488a42529854c068ca9ca41",
-                    "mixHash" : "0x9c81d5b5d2bb1ab3b311ee5f217387591a806648cc0b66c061e920f37ced4a51",
-                    "nonce" : "0x0f7ad8b0433d4795",
+                    "hash" : "0x516e44fffdce091e379a66f768978c2640f72a49fdd63cdaf1feba1e1af73ccd",
+                    "mixHash" : "0x50dd532ed6ee41516cdbd409cfde5cce716fc07c3a09c9deb5557dcf381c233a",
+                    "nonce" : "0x758e9cdc0fbc2612",
                     "number" : "0x01",
                     "parentHash" : "0xfed7f643bcc5f85024c7be5dbe4bf3144495ad6f6f9b9af7a640d25225d3e23e",
                     "receiptTrie" : "0xa8027b29438ad7ca79301809ed7b3d1aaf339e71886313a7e8c608d867159f47",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0fed7f643bcc5f85024c7be5dbe4bf3144495ad6f6f9b9af7a640d25225d3e23ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a053f0438dfb64b530ddbd68acb769f556c86d176ae49158f72efa467f05e14476a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0a8027b29438ad7ca79301809ed7b3d1aaf339e71886313a7e8c608d867159f47b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a09d8203e880a09c81d5b5d2bb1ab3b311ee5f217387591a806648cc0b66c061e920f37ced4a51880f7ad8b0433d4795f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0fed7f643bcc5f85024c7be5dbe4bf3144495ad6f6f9b9af7a640d25225d3e23ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a053f0438dfb64b530ddbd68acb769f556c86d176ae49158f72efa467f05e14476a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0a8027b29438ad7ca79301809ed7b3d1aaf339e71886313a7e8c608d867159f47b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a09d8203e880a050dd532ed6ee41516cdbd409cfde5cce716fc07c3a09c9deb5557dcf381c233a88758e9cdc0fbc2612f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e4591bd7b086a77c4ff9bd04e7a3dfc5f0239ff479ffd56b116d329f6bfe5234a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5e08ec7f712b42eccaa83177be6611a09132e29ec488a42529854c068ca9ca41",
+        "lastblockhash" : "0x516e44fffdce091e379a66f768978c2640f72a49fdd63cdaf1feba1e1af73ccd",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest392BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest392BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest392BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa09d",
-                    "hash" : "0xf8d99bfe677b29f0bb60d84fa2354a549475f941de2ddda81affff9a719c974f",
-                    "mixHash" : "0x7ed541ef43d2ac6ffd7e5424f9456ad7f3402670cfa0bfaac3ee4c0d5cecfd52",
-                    "nonce" : "0x2e2e127f1331c111",
+                    "hash" : "0x9b6c25b2a151dde612092e68731aaec72c8bb582260d5244c812c34617a5e85d",
+                    "mixHash" : "0x9f6a0bcf15bf50fa537ef8c1bc4bb3fbedeef3bee014f12059cbc062fa147884",
+                    "nonce" : "0xf76f81afa58ad04e",
                     "number" : "0x01",
                     "parentHash" : "0xfed7f643bcc5f85024c7be5dbe4bf3144495ad6f6f9b9af7a640d25225d3e23e",
                     "receiptTrie" : "0xa8027b29438ad7ca79301809ed7b3d1aaf339e71886313a7e8c608d867159f47",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0fed7f643bcc5f85024c7be5dbe4bf3144495ad6f6f9b9af7a640d25225d3e23ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a053f0438dfb64b530ddbd68acb769f556c86d176ae49158f72efa467f05e14476a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0a8027b29438ad7ca79301809ed7b3d1aaf339e71886313a7e8c608d867159f47b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a09d8203e880a07ed541ef43d2ac6ffd7e5424f9456ad7f3402670cfa0bfaac3ee4c0d5cecfd52882e2e127f1331c111f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0fed7f643bcc5f85024c7be5dbe4bf3144495ad6f6f9b9af7a640d25225d3e23ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a053f0438dfb64b530ddbd68acb769f556c86d176ae49158f72efa467f05e14476a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0a8027b29438ad7ca79301809ed7b3d1aaf339e71886313a7e8c608d867159f47b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a09d8203e880a09f6a0bcf15bf50fa537ef8c1bc4bb3fbedeef3bee014f12059cbc062fa14788488f76f81afa58ad04ef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e4591bd7b086a77c4ff9bd04e7a3dfc5f0239ff479ffd56b116d329f6bfe5234a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf8d99bfe677b29f0bb60d84fa2354a549475f941de2ddda81affff9a719c974f",
+        "lastblockhash" : "0x9b6c25b2a151dde612092e68731aaec72c8bb582260d5244c812c34617a5e85d",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest394BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest394BC.json
index 183f9f085..8afcd6ac7 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest394BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest394BC.json
@@ -2,8 +2,8 @@
     "randomStatetest394BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest394BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest394BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050b36",
-                    "hash" : "0x746bd3eecac21a1ce51e527aefd99363902cbef5c4951da7fe6b5538a4fe1d11",
-                    "mixHash" : "0x50eeefe99e823f9b53a235c61b8be4895d01586cc2b5d944f5f6ec13689808c5",
-                    "nonce" : "0xcd1f8157cf9f0c16",
+                    "hash" : "0x04649e611db828d7286c2e67c3b59f981ac5939d91b38184c3793fe0c0fc883b",
+                    "mixHash" : "0xb1f2827e6b95028e5c0a030ac3c64b3930acfda3a981b578972a4eb61a53a679",
+                    "nonce" : "0x1ffa72935efaa499",
                     "number" : "0x01",
                     "parentHash" : "0x541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8",
                     "receiptTrie" : "0x2efadadc9ed165d01fe26152f14a20566f864eb6d88942c936ddb68b270e002f",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05cf04879eec16275f0457bd08b00f20b7ef5a0848dfbc9f29e47f554e33c4c6ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02efadadc9ed165d01fe26152f14a20566f864eb6d88942c936ddb68b270e002fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b368203e880a050eeefe99e823f9b53a235c61b8be4895d01586cc2b5d944f5f6ec13689808c588cd1f8157cf9f0c16f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05cf04879eec16275f0457bd08b00f20b7ef5a0848dfbc9f29e47f554e33c4c6ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02efadadc9ed165d01fe26152f14a20566f864eb6d88942c936ddb68b270e002fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b368203e880a0b1f2827e6b95028e5c0a030ac3c64b3930acfda3a981b578972a4eb61a53a679881ffa72935efaa499f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fa7dbc75f73526469655ae0b1e034d63c524995bd936ecd4a3ba005346d836caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x746bd3eecac21a1ce51e527aefd99363902cbef5c4951da7fe6b5538a4fe1d11",
+        "lastblockhash" : "0x04649e611db828d7286c2e67c3b59f981ac5939d91b38184c3793fe0c0fc883b",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest394BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest394BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest394BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x05114e",
-                    "hash" : "0x02ba18c3fd2e35dbc8f1371d7cb32ea7c6779ef27bdcce63b3c242fac3c8b04c",
-                    "mixHash" : "0x9045deef200684ef873c7ca0dd8be4b7a721cdd4d6dc7f22a4849e4cfcc9a69f",
-                    "nonce" : "0xcfc5df3255b0bfe2",
+                    "hash" : "0x8d5e4a98697086f07f57f6fa167247976bffe357c5d3b23f3ff461cdf2d79522",
+                    "mixHash" : "0xe6bbd2f1ef4c9c0bd038a683f5daf9e72baebfbdcaddde4ad907cd213b031f0d",
+                    "nonce" : "0x334128b630cf9290",
                     "number" : "0x01",
                     "parentHash" : "0x541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8",
                     "receiptTrie" : "0x419a63641656551ec116adae1315b1ebafc9cd93e8c592edc3bf8e15f1e96973",
-                    "stateRoot" : "0x6968adc4838962092fadc23d3da89122133954745bb99298452482b494edbc09",
+                    "stateRoot" : "0xdc42574e0e35e3d2c036e015287e0aeab9b3bcb59e72baf431a4653b95bd4d7a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06968adc4838962092fadc23d3da89122133954745bb99298452482b494edbc09a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0419a63641656551ec116adae1315b1ebafc9cd93e8c592edc3bf8e15f1e96973b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8305114e8203e880a09045deef200684ef873c7ca0dd8be4b7a721cdd4d6dc7f22a4849e4cfcc9a69f88cfc5df3255b0bfe2f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dc42574e0e35e3d2c036e015287e0aeab9b3bcb59e72baf431a4653b95bd4d7aa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0419a63641656551ec116adae1315b1ebafc9cd93e8c592edc3bf8e15f1e96973b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8305114e8203e880a0e6bbd2f1ef4c9c0bd038a683f5daf9e72baebfbdcaddde4ad907cd213b031f0d88334128b630cf9290f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fa7dbc75f73526469655ae0b1e034d63c524995bd936ecd4a3ba005346d836caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x02ba18c3fd2e35dbc8f1371d7cb32ea7c6779ef27bdcce63b3c242fac3c8b04c",
+        "lastblockhash" : "0x8d5e4a98697086f07f57f6fa167247976bffe357c5d3b23f3ff461cdf2d79522",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x45415a42409140435a53821af355",
@@ -233,8 +226,8 @@
     "randomStatetest394BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest394BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest394BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050b36",
-                    "hash" : "0x78354fbda845cc4a16b3f34128cb91f777ec52b3c02cce35efb3c8f15455d659",
-                    "mixHash" : "0x02d15c1a6dabf42fc264bd130437ab79cedaa563a52336a8680c0c557ea182a2",
-                    "nonce" : "0x09501199d021956b",
+                    "hash" : "0x7808388dab6ea47b8ff5bba79b0939d0dd483ea3a81f2ad2ee9dde96b5d88494",
+                    "mixHash" : "0x43ae1127dbb7a1fe8b7b1c28d2273e33a9648cf370fda1ae0e252dcd9fb4f839",
+                    "nonce" : "0x82f01584472c455a",
                     "number" : "0x01",
                     "parentHash" : "0x541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8",
                     "receiptTrie" : "0x90a2de22cdc8341141cf8cbf9aeaa3247e9c3a048e71b743211eebed4df5fc2b",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ea2ae8e29e0fbb81a37df5c563501c28674837e3251c8885e2660b75a27743f1a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa090a2de22cdc8341141cf8cbf9aeaa3247e9c3a048e71b743211eebed4df5fc2bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b368203e880a002d15c1a6dabf42fc264bd130437ab79cedaa563a52336a8680c0c557ea182a28809501199d021956bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ea2ae8e29e0fbb81a37df5c563501c28674837e3251c8885e2660b75a27743f1a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa090a2de22cdc8341141cf8cbf9aeaa3247e9c3a048e71b743211eebed4df5fc2bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b368203e880a043ae1127dbb7a1fe8b7b1c28d2273e33a9648cf370fda1ae0e252dcd9fb4f8398882f01584472c455af865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fa7dbc75f73526469655ae0b1e034d63c524995bd936ecd4a3ba005346d836caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x78354fbda845cc4a16b3f34128cb91f777ec52b3c02cce35efb3c8f15455d659",
+        "lastblockhash" : "0x7808388dab6ea47b8ff5bba79b0939d0dd483ea3a81f2ad2ee9dde96b5d88494",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest394BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest394BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest394BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050b36",
-                    "hash" : "0xd47356662ce17b3feae76ac5647e780d6c992e14703ad0f0070ee8d29e26d4a9",
-                    "mixHash" : "0x0934625018e35ce0c1e9c95b99bed9af569acd72af7f17f03718ea37c1bf08df",
-                    "nonce" : "0x7132664ee46e53ea",
+                    "hash" : "0x0bb64843e370d6776bc22a91bb07c35bbea92424c27652ef4b63f64f1daf8958",
+                    "mixHash" : "0x29b24693668157f6c1da954156adc65c7452a0439753e50949fedcc7973b6e05",
+                    "nonce" : "0x16c58b33fd4c6ad2",
                     "number" : "0x01",
                     "parentHash" : "0x541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8",
                     "receiptTrie" : "0x90a2de22cdc8341141cf8cbf9aeaa3247e9c3a048e71b743211eebed4df5fc2b",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ea2ae8e29e0fbb81a37df5c563501c28674837e3251c8885e2660b75a27743f1a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa090a2de22cdc8341141cf8cbf9aeaa3247e9c3a048e71b743211eebed4df5fc2bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b368203e880a00934625018e35ce0c1e9c95b99bed9af569acd72af7f17f03718ea37c1bf08df887132664ee46e53eaf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ea2ae8e29e0fbb81a37df5c563501c28674837e3251c8885e2660b75a27743f1a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa090a2de22cdc8341141cf8cbf9aeaa3247e9c3a048e71b743211eebed4df5fc2bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b368203e880a029b24693668157f6c1da954156adc65c7452a0439753e50949fedcc7973b6e058816c58b33fd4c6ad2f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fa7dbc75f73526469655ae0b1e034d63c524995bd936ecd4a3ba005346d836caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd47356662ce17b3feae76ac5647e780d6c992e14703ad0f0070ee8d29e26d4a9",
+        "lastblockhash" : "0x0bb64843e370d6776bc22a91bb07c35bbea92424c27652ef4b63f64f1daf8958",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest394BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest394BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest394BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050b36",
-                    "hash" : "0xa1ac7f949cfcdc0d9f396b584d525e798bfe59390fec66c86526c2900642a99b",
-                    "mixHash" : "0x54f7adfc97f01e66bbb038b9d10f9597a0aa89164628b681062721a63fa3de2e",
-                    "nonce" : "0x8eb6b2f878827bad",
+                    "hash" : "0x290b146e8df86377a75a4f3368ce6cf171472dbd22d0ea91652085585be67ca7",
+                    "mixHash" : "0x8692392fbcaa98b448c0c2f15a96996189a701a6b2c5b4f9bcc464449f27c734",
+                    "nonce" : "0x7dc0777ab1b12630",
                     "number" : "0x01",
                     "parentHash" : "0x541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8",
                     "receiptTrie" : "0x90a2de22cdc8341141cf8cbf9aeaa3247e9c3a048e71b743211eebed4df5fc2b",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ea2ae8e29e0fbb81a37df5c563501c28674837e3251c8885e2660b75a27743f1a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa090a2de22cdc8341141cf8cbf9aeaa3247e9c3a048e71b743211eebed4df5fc2bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b368203e880a054f7adfc97f01e66bbb038b9d10f9597a0aa89164628b681062721a63fa3de2e888eb6b2f878827badf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ea2ae8e29e0fbb81a37df5c563501c28674837e3251c8885e2660b75a27743f1a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa090a2de22cdc8341141cf8cbf9aeaa3247e9c3a048e71b743211eebed4df5fc2bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b368203e880a08692392fbcaa98b448c0c2f15a96996189a701a6b2c5b4f9bcc464449f27c734887dc0777ab1b12630f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fa7dbc75f73526469655ae0b1e034d63c524995bd936ecd4a3ba005346d836caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa1ac7f949cfcdc0d9f396b584d525e798bfe59390fec66c86526c2900642a99b",
+        "lastblockhash" : "0x290b146e8df86377a75a4f3368ce6cf171472dbd22d0ea91652085585be67ca7",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest394BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest394BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest394BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050b36",
-                    "hash" : "0x9b2a4ffde60aa4f1d8f9ad5b1c58154f6428c4f824690648655623f5b21b2ddc",
-                    "mixHash" : "0x18ba2ed8e79b5bec6b8806ecb263cf6c928556af1811b1a2bdd6ff5a0df7db82",
-                    "nonce" : "0x992e7d025d4e6393",
+                    "hash" : "0x4baee747555400c4621df7061687b23f3c7c9ee26609b3ecaa937bb43e1f48fb",
+                    "mixHash" : "0x6189e4a5df23696fb230347cf2369956b26fa977f3b34239d5d1df252090f5cd",
+                    "nonce" : "0x39e0d1d1e37452b2",
                     "number" : "0x01",
                     "parentHash" : "0x541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8",
                     "receiptTrie" : "0x90a2de22cdc8341141cf8cbf9aeaa3247e9c3a048e71b743211eebed4df5fc2b",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ea2ae8e29e0fbb81a37df5c563501c28674837e3251c8885e2660b75a27743f1a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa090a2de22cdc8341141cf8cbf9aeaa3247e9c3a048e71b743211eebed4df5fc2bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b368203e880a018ba2ed8e79b5bec6b8806ecb263cf6c928556af1811b1a2bdd6ff5a0df7db8288992e7d025d4e6393f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ea2ae8e29e0fbb81a37df5c563501c28674837e3251c8885e2660b75a27743f1a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa090a2de22cdc8341141cf8cbf9aeaa3247e9c3a048e71b743211eebed4df5fc2bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b368203e880a06189e4a5df23696fb230347cf2369956b26fa977f3b34239d5d1df252090f5cd8839e0d1d1e37452b2f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fa7dbc75f73526469655ae0b1e034d63c524995bd936ecd4a3ba005346d836caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9b2a4ffde60aa4f1d8f9ad5b1c58154f6428c4f824690648655623f5b21b2ddc",
+        "lastblockhash" : "0x4baee747555400c4621df7061687b23f3c7c9ee26609b3ecaa937bb43e1f48fb",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest400BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest400BC.json
index b1f91f44a..2bf92da24 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest400BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest400BC.json
@@ -2,8 +2,8 @@
     "randomStatetest400BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest400BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest400BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb8fd",
-                    "hash" : "0xc14e01e5326a812bf4a48ded90fd57861ef424951da644d1416e3189be7b0fd8",
-                    "mixHash" : "0x0fcf2c70f5ce6e11d50a2c79a3f487901a1f13f9be7f2fda039afc085dfe34bc",
-                    "nonce" : "0xe668dd0a1e95f2a6",
+                    "hash" : "0xd72f12da7782118bac3297d14248c177d5afb0d5d284013661642a558ab81311",
+                    "mixHash" : "0x8ea869c113dc33a0ff53f4fa0a11a544df4cfcef5c90680b3ce9891c1a858a6f",
+                    "nonce" : "0xef37d151c02a5369",
                     "number" : "0x01",
                     "parentHash" : "0x25e2be7599a7ddc8c4e7da1d35da671e51a8e3bbede094a997c41faccc35c0ce",
                     "receiptTrie" : "0x4843c74299df006e9fbd8b31a384d8ae178df7be9eb6752b3cd8a77cdaab059c",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x6b14982423f64dd80b352499ed76b9c5c86a3873d40090ac16b0dc5d01767a10",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90364f901fca025e2be7599a7ddc8c4e7da1d35da671e51a8e3bbede094a997c41faccc35c0cea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a080f66022c11180cea062a042a31c75b0af9ce86fa4dc7dec2cee8bfead1d9fe1a06b14982423f64dd80b352499ed76b9c5c86a3873d40090ac16b0dc5d01767a10a04843c74299df006e9fbd8b31a384d8ae178df7be9eb6752b3cd8a77cdaab059cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b8fd8203e880a00fcf2c70f5ce6e11d50a2c79a3f487901a1f13f9be7f2fda039afc085dfe34bc88e668dd0a1e95f2a6f90161f9015e800184545bb71794095e7baea6a6c7c4c2dfeb977efac326af552d8784457b0c8ab8f87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f945442a01208626f86ad8f8b1701601ca01e339488939daeb89bbaa4f936c3570a068f2c6eb88fe4efd4d1df542199d28fa0052d9c67361b66b4129bba0a31d1a751736d318ede83f531ef1a59e7bd58e524c0",
+                "rlp" : "0xf90364f901fca025e2be7599a7ddc8c4e7da1d35da671e51a8e3bbede094a997c41faccc35c0cea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a080f66022c11180cea062a042a31c75b0af9ce86fa4dc7dec2cee8bfead1d9fe1a06b14982423f64dd80b352499ed76b9c5c86a3873d40090ac16b0dc5d01767a10a04843c74299df006e9fbd8b31a384d8ae178df7be9eb6752b3cd8a77cdaab059cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b8fd8203e880a08ea869c113dc33a0ff53f4fa0a11a544df4cfcef5c90680b3ce9891c1a858a6f88ef37d151c02a5369f90161f9015e800184545bb71794095e7baea6a6c7c4c2dfeb977efac326af552d8784457b0c8ab8f87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f945442a01208626f86ad8f8b1701601ca01e339488939daeb89bbaa4f936c3570a068f2c6eb88fe4efd4d1df542199d28fa0052d9c67361b66b4129bba0a31d1a751736d318ede83f531ef1a59e7bd58e524c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f945442a01208626f86ad8f8b170160",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dba3bd605b6dc2c420cf06bec799177d14b860b4f600029103f753a30746a831a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc14e01e5326a812bf4a48ded90fd57861ef424951da644d1416e3189be7b0fd8",
+        "lastblockhash" : "0xd72f12da7782118bac3297d14248c177d5afb0d5d284013661642a558ab81311",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest400BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest400BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest400BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xbc09",
-                    "hash" : "0xe030e3f25ee70422c1863d000f578852ccbd733e101e1d6b8a3311f588ee0e42",
-                    "mixHash" : "0x3e4b4a75e03daa04caa7f5faa8e38b0d42afbedc8d5ac6862c39244b69ef4fce",
-                    "nonce" : "0x3d7ba3a4721e5a74",
+                    "hash" : "0x581f744092df322337ed63fd7c45284b5e42cd0b163f95f4942864df934c1480",
+                    "mixHash" : "0x9047bff83379c030f9ee2921a12e6a28effd4e4c3b89b44f37bc462df59c4692",
+                    "nonce" : "0xd0e68a6110ed2c6b",
                     "number" : "0x01",
                     "parentHash" : "0x25e2be7599a7ddc8c4e7da1d35da671e51a8e3bbede094a997c41faccc35c0ce",
                     "receiptTrie" : "0x8b34b8e87627154d06c9bd1ea8d285fec416737738c7c131ed5d65a49b29ecf7",
-                    "stateRoot" : "0x634fe08a5dadd9a06b123ae8cd9e97b719b30311d5cb4cacaca98a0535362386",
+                    "stateRoot" : "0xf2ea7b213c384d0fca945378e293e8e8d9078ce190f15591cc782a93cb1568ab",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6b14982423f64dd80b352499ed76b9c5c86a3873d40090ac16b0dc5d01767a10",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90364f901fca025e2be7599a7ddc8c4e7da1d35da671e51a8e3bbede094a997c41faccc35c0cea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0634fe08a5dadd9a06b123ae8cd9e97b719b30311d5cb4cacaca98a0535362386a06b14982423f64dd80b352499ed76b9c5c86a3873d40090ac16b0dc5d01767a10a08b34b8e87627154d06c9bd1ea8d285fec416737738c7c131ed5d65a49b29ecf7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bc098203e880a03e4b4a75e03daa04caa7f5faa8e38b0d42afbedc8d5ac6862c39244b69ef4fce883d7ba3a4721e5a74f90161f9015e800184545bb71794095e7baea6a6c7c4c2dfeb977efac326af552d8784457b0c8ab8f87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f945442a01208626f86ad8f8b1701601ca01e339488939daeb89bbaa4f936c3570a068f2c6eb88fe4efd4d1df542199d28fa0052d9c67361b66b4129bba0a31d1a751736d318ede83f531ef1a59e7bd58e524c0",
+                "rlp" : "0xf90364f901fca025e2be7599a7ddc8c4e7da1d35da671e51a8e3bbede094a997c41faccc35c0cea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f2ea7b213c384d0fca945378e293e8e8d9078ce190f15591cc782a93cb1568aba06b14982423f64dd80b352499ed76b9c5c86a3873d40090ac16b0dc5d01767a10a08b34b8e87627154d06c9bd1ea8d285fec416737738c7c131ed5d65a49b29ecf7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bc098203e880a09047bff83379c030f9ee2921a12e6a28effd4e4c3b89b44f37bc462df59c469288d0e68a6110ed2c6bf90161f9015e800184545bb71794095e7baea6a6c7c4c2dfeb977efac326af552d8784457b0c8ab8f87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f945442a01208626f86ad8f8b1701601ca01e339488939daeb89bbaa4f936c3570a068f2c6eb88fe4efd4d1df542199d28fa0052d9c67361b66b4129bba0a31d1a751736d318ede83f531ef1a59e7bd58e524c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f945442a01208626f86ad8f8b170160",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dba3bd605b6dc2c420cf06bec799177d14b860b4f600029103f753a30746a831a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe030e3f25ee70422c1863d000f578852ccbd733e101e1d6b8a3311f588ee0e42",
+        "lastblockhash" : "0x581f744092df322337ed63fd7c45284b5e42cd0b163f95f4942864df934c1480",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x457b0c8a",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f945442a01208626f86ad8f8b1701605560005155",
@@ -235,8 +228,8 @@
     "randomStatetest400BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest400BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest400BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb8fd",
-                    "hash" : "0x332c778381499ca6de9ea171430d55d2a17c446c6e4664f25c1011edaf5e28d1",
-                    "mixHash" : "0x491c6d96f20c45541e0697c896d9af6b82268d56424a877149ceceeb618fb61d",
-                    "nonce" : "0x60b2d11708b106dd",
+                    "hash" : "0x6a48411c7cd2d1cdceb1101339cf8a646cf1d4dae3e2f68900773d31cfcb3e86",
+                    "mixHash" : "0xa516ae03f21abb2600a23f80cd8e4af59959fe9391cf26cd6519acdedd652297",
+                    "nonce" : "0x236e266cad913c18",
                     "number" : "0x01",
                     "parentHash" : "0x25e2be7599a7ddc8c4e7da1d35da671e51a8e3bbede094a997c41faccc35c0ce",
                     "receiptTrie" : "0x54fa33b887b135301734878f1613e9fe559ff938a131f8cb53c3b88430a5f511",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0x6b14982423f64dd80b352499ed76b9c5c86a3873d40090ac16b0dc5d01767a10",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90364f901fca025e2be7599a7ddc8c4e7da1d35da671e51a8e3bbede094a997c41faccc35c0cea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ad05b00d8d85e6ac89d15f16ef947f847e6c3eea964e59fc5d0b7048bbc541dca06b14982423f64dd80b352499ed76b9c5c86a3873d40090ac16b0dc5d01767a10a054fa33b887b135301734878f1613e9fe559ff938a131f8cb53c3b88430a5f511b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b8fd8203e880a0491c6d96f20c45541e0697c896d9af6b82268d56424a877149ceceeb618fb61d8860b2d11708b106ddf90161f9015e800184545bb71794095e7baea6a6c7c4c2dfeb977efac326af552d8784457b0c8ab8f87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f945442a01208626f86ad8f8b1701601ca01e339488939daeb89bbaa4f936c3570a068f2c6eb88fe4efd4d1df542199d28fa0052d9c67361b66b4129bba0a31d1a751736d318ede83f531ef1a59e7bd58e524c0",
+                "rlp" : "0xf90364f901fca025e2be7599a7ddc8c4e7da1d35da671e51a8e3bbede094a997c41faccc35c0cea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ad05b00d8d85e6ac89d15f16ef947f847e6c3eea964e59fc5d0b7048bbc541dca06b14982423f64dd80b352499ed76b9c5c86a3873d40090ac16b0dc5d01767a10a054fa33b887b135301734878f1613e9fe559ff938a131f8cb53c3b88430a5f511b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b8fd8203e880a0a516ae03f21abb2600a23f80cd8e4af59959fe9391cf26cd6519acdedd65229788236e266cad913c18f90161f9015e800184545bb71794095e7baea6a6c7c4c2dfeb977efac326af552d8784457b0c8ab8f87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f945442a01208626f86ad8f8b1701601ca01e339488939daeb89bbaa4f936c3570a068f2c6eb88fe4efd4d1df542199d28fa0052d9c67361b66b4129bba0a31d1a751736d318ede83f531ef1a59e7bd58e524c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f945442a01208626f86ad8f8b170160",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dba3bd605b6dc2c420cf06bec799177d14b860b4f600029103f753a30746a831a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x332c778381499ca6de9ea171430d55d2a17c446c6e4664f25c1011edaf5e28d1",
+        "lastblockhash" : "0x6a48411c7cd2d1cdceb1101339cf8a646cf1d4dae3e2f68900773d31cfcb3e86",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest400BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest400BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest400BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb8fd",
-                    "hash" : "0x0ed9d76ab9fe355143cc04e0d8b19516a8628d9a35d72fab29eeca040e77ba72",
-                    "mixHash" : "0xe56e12208b462330a10881e448b42d4991b165f6075962c2c97407c70f4eeddb",
-                    "nonce" : "0x80307283b4e4089a",
+                    "hash" : "0x4d2bf9bc84e325c019c08cb08a72484fd999af8cb8af5b9ec6b962afca9550dc",
+                    "mixHash" : "0x8a997f763a887a5437f75d09fe94346c71d6d1d2e34c92ca6692bf4802d3fea1",
+                    "nonce" : "0x8625921c7953d1a3",
                     "number" : "0x01",
                     "parentHash" : "0x25e2be7599a7ddc8c4e7da1d35da671e51a8e3bbede094a997c41faccc35c0ce",
                     "receiptTrie" : "0x54fa33b887b135301734878f1613e9fe559ff938a131f8cb53c3b88430a5f511",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0x6b14982423f64dd80b352499ed76b9c5c86a3873d40090ac16b0dc5d01767a10",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90364f901fca025e2be7599a7ddc8c4e7da1d35da671e51a8e3bbede094a997c41faccc35c0cea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ad05b00d8d85e6ac89d15f16ef947f847e6c3eea964e59fc5d0b7048bbc541dca06b14982423f64dd80b352499ed76b9c5c86a3873d40090ac16b0dc5d01767a10a054fa33b887b135301734878f1613e9fe559ff938a131f8cb53c3b88430a5f511b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b8fd8203e880a0e56e12208b462330a10881e448b42d4991b165f6075962c2c97407c70f4eeddb8880307283b4e4089af90161f9015e800184545bb71794095e7baea6a6c7c4c2dfeb977efac326af552d8784457b0c8ab8f87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f945442a01208626f86ad8f8b1701601ca01e339488939daeb89bbaa4f936c3570a068f2c6eb88fe4efd4d1df542199d28fa0052d9c67361b66b4129bba0a31d1a751736d318ede83f531ef1a59e7bd58e524c0",
+                "rlp" : "0xf90364f901fca025e2be7599a7ddc8c4e7da1d35da671e51a8e3bbede094a997c41faccc35c0cea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ad05b00d8d85e6ac89d15f16ef947f847e6c3eea964e59fc5d0b7048bbc541dca06b14982423f64dd80b352499ed76b9c5c86a3873d40090ac16b0dc5d01767a10a054fa33b887b135301734878f1613e9fe559ff938a131f8cb53c3b88430a5f511b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b8fd8203e880a08a997f763a887a5437f75d09fe94346c71d6d1d2e34c92ca6692bf4802d3fea1888625921c7953d1a3f90161f9015e800184545bb71794095e7baea6a6c7c4c2dfeb977efac326af552d8784457b0c8ab8f87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f945442a01208626f86ad8f8b1701601ca01e339488939daeb89bbaa4f936c3570a068f2c6eb88fe4efd4d1df542199d28fa0052d9c67361b66b4129bba0a31d1a751736d318ede83f531ef1a59e7bd58e524c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f945442a01208626f86ad8f8b170160",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dba3bd605b6dc2c420cf06bec799177d14b860b4f600029103f753a30746a831a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0ed9d76ab9fe355143cc04e0d8b19516a8628d9a35d72fab29eeca040e77ba72",
+        "lastblockhash" : "0x4d2bf9bc84e325c019c08cb08a72484fd999af8cb8af5b9ec6b962afca9550dc",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest400BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest400BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest400BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb8fd",
-                    "hash" : "0xa0e8f0e3604cad69a556951a137444106b46cfa41f157d820db3ff4e81b1e998",
-                    "mixHash" : "0xaffd7b4fc6cfb8100d36454cbed675823dc7c78831187d15e2d99404f1d9f5b0",
-                    "nonce" : "0xbf906c391554d2f6",
+                    "hash" : "0x590739fdfb681d71615ccf11f3d0f510ad39992287e55991e4e2893e43073b7d",
+                    "mixHash" : "0x8fa240d0b142e4ad55e65ddd990ae3629c4e2ccd1fa4974c66e398da2bb8f811",
+                    "nonce" : "0x7a2195506b002cb2",
                     "number" : "0x01",
                     "parentHash" : "0x25e2be7599a7ddc8c4e7da1d35da671e51a8e3bbede094a997c41faccc35c0ce",
                     "receiptTrie" : "0x54fa33b887b135301734878f1613e9fe559ff938a131f8cb53c3b88430a5f511",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0x6b14982423f64dd80b352499ed76b9c5c86a3873d40090ac16b0dc5d01767a10",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90364f901fca025e2be7599a7ddc8c4e7da1d35da671e51a8e3bbede094a997c41faccc35c0cea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ad05b00d8d85e6ac89d15f16ef947f847e6c3eea964e59fc5d0b7048bbc541dca06b14982423f64dd80b352499ed76b9c5c86a3873d40090ac16b0dc5d01767a10a054fa33b887b135301734878f1613e9fe559ff938a131f8cb53c3b88430a5f511b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b8fd8203e880a0affd7b4fc6cfb8100d36454cbed675823dc7c78831187d15e2d99404f1d9f5b088bf906c391554d2f6f90161f9015e800184545bb71794095e7baea6a6c7c4c2dfeb977efac326af552d8784457b0c8ab8f87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f945442a01208626f86ad8f8b1701601ca01e339488939daeb89bbaa4f936c3570a068f2c6eb88fe4efd4d1df542199d28fa0052d9c67361b66b4129bba0a31d1a751736d318ede83f531ef1a59e7bd58e524c0",
+                "rlp" : "0xf90364f901fca025e2be7599a7ddc8c4e7da1d35da671e51a8e3bbede094a997c41faccc35c0cea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ad05b00d8d85e6ac89d15f16ef947f847e6c3eea964e59fc5d0b7048bbc541dca06b14982423f64dd80b352499ed76b9c5c86a3873d40090ac16b0dc5d01767a10a054fa33b887b135301734878f1613e9fe559ff938a131f8cb53c3b88430a5f511b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b8fd8203e880a08fa240d0b142e4ad55e65ddd990ae3629c4e2ccd1fa4974c66e398da2bb8f811887a2195506b002cb2f90161f9015e800184545bb71794095e7baea6a6c7c4c2dfeb977efac326af552d8784457b0c8ab8f87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f945442a01208626f86ad8f8b1701601ca01e339488939daeb89bbaa4f936c3570a068f2c6eb88fe4efd4d1df542199d28fa0052d9c67361b66b4129bba0a31d1a751736d318ede83f531ef1a59e7bd58e524c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f945442a01208626f86ad8f8b170160",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dba3bd605b6dc2c420cf06bec799177d14b860b4f600029103f753a30746a831a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa0e8f0e3604cad69a556951a137444106b46cfa41f157d820db3ff4e81b1e998",
+        "lastblockhash" : "0x590739fdfb681d71615ccf11f3d0f510ad39992287e55991e4e2893e43073b7d",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest400BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest400BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest400BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb8fd",
-                    "hash" : "0xb0ee6c9536358a7824f77821e4f3db38bcf88654e18053ad38ff6eb7eea0285d",
-                    "mixHash" : "0xff17aa1ed44209e4e9d80e46352e6c1541df679608bf7e6ac740f9120ff1a058",
-                    "nonce" : "0x08c62417be78d3a2",
+                    "hash" : "0x9aa2a8364aac45f8c02c5b5fa19a395ed86c0080caa92b87cb92cbdd942dbfff",
+                    "mixHash" : "0x5d425745506837c8773c04ca1fdfd10f5dd4fa1e2951e1fbe33800a2a197245d",
+                    "nonce" : "0xcd360db57cfa197d",
                     "number" : "0x01",
                     "parentHash" : "0x25e2be7599a7ddc8c4e7da1d35da671e51a8e3bbede094a997c41faccc35c0ce",
                     "receiptTrie" : "0x54fa33b887b135301734878f1613e9fe559ff938a131f8cb53c3b88430a5f511",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0x6b14982423f64dd80b352499ed76b9c5c86a3873d40090ac16b0dc5d01767a10",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90364f901fca025e2be7599a7ddc8c4e7da1d35da671e51a8e3bbede094a997c41faccc35c0cea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ad05b00d8d85e6ac89d15f16ef947f847e6c3eea964e59fc5d0b7048bbc541dca06b14982423f64dd80b352499ed76b9c5c86a3873d40090ac16b0dc5d01767a10a054fa33b887b135301734878f1613e9fe559ff938a131f8cb53c3b88430a5f511b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b8fd8203e880a0ff17aa1ed44209e4e9d80e46352e6c1541df679608bf7e6ac740f9120ff1a0588808c62417be78d3a2f90161f9015e800184545bb71794095e7baea6a6c7c4c2dfeb977efac326af552d8784457b0c8ab8f87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f945442a01208626f86ad8f8b1701601ca01e339488939daeb89bbaa4f936c3570a068f2c6eb88fe4efd4d1df542199d28fa0052d9c67361b66b4129bba0a31d1a751736d318ede83f531ef1a59e7bd58e524c0",
+                "rlp" : "0xf90364f901fca025e2be7599a7ddc8c4e7da1d35da671e51a8e3bbede094a997c41faccc35c0cea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ad05b00d8d85e6ac89d15f16ef947f847e6c3eea964e59fc5d0b7048bbc541dca06b14982423f64dd80b352499ed76b9c5c86a3873d40090ac16b0dc5d01767a10a054fa33b887b135301734878f1613e9fe559ff938a131f8cb53c3b88430a5f511b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b8fd8203e880a05d425745506837c8773c04ca1fdfd10f5dd4fa1e2951e1fbe33800a2a197245d88cd360db57cfa197df90161f9015e800184545bb71794095e7baea6a6c7c4c2dfeb977efac326af552d8784457b0c8ab8f87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f945442a01208626f86ad8f8b1701601ca01e339488939daeb89bbaa4f936c3570a068f2c6eb88fe4efd4d1df542199d28fa0052d9c67361b66b4129bba0a31d1a751736d318ede83f531ef1a59e7bd58e524c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f945442a01208626f86ad8f8b170160",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dba3bd605b6dc2c420cf06bec799177d14b860b4f600029103f753a30746a831a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb0ee6c9536358a7824f77821e4f3db38bcf88654e18053ad38ff6eb7eea0285d",
+        "lastblockhash" : "0x9aa2a8364aac45f8c02c5b5fa19a395ed86c0080caa92b87cb92cbdd942dbfff",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest403BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest403BC.json
index 281841557..dc9530d55 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest403BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest403BC.json
@@ -2,8 +2,8 @@
     "randomStatetest403BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest403BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest403BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa725",
-                    "hash" : "0x0f75a979f1ca100367724ba034744771b98290dbdf4808fce25467a7c15ca0d9",
-                    "mixHash" : "0xc238d8da2f81cc4c948b8a44e7b675e1c6f687ac4b148c525ea810e2e96e6433",
-                    "nonce" : "0x308cd08ed5f2afc7",
+                    "hash" : "0x1fc22b70930b3e9504337a246b8a8125f64e2e5b3a3d199fa3cf377fe4763d23",
+                    "mixHash" : "0x452ee3cf098ff2a8f0de1cc4e0e0ad8c153a9989dc2bfb4d56de16dc22a2c12a",
+                    "nonce" : "0x1e26a6977eefc33c",
                     "number" : "0x01",
                     "parentHash" : "0x998cd9cf6a6f0a7769b1a38bb7f56465fb6f07dab1db60aae4ee76076d5364e2",
                     "receiptTrie" : "0x182b77689b0a53e33940133d8ad1381747ae34576e6f584e8490f6ca6743ff82",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0998cd9cf6a6f0a7769b1a38bb7f56465fb6f07dab1db60aae4ee76076d5364e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a062fc33406dc2240a7370e66ec848acc82993e464a8a7a1c72799080051954aeda0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0182b77689b0a53e33940133d8ad1381747ae34576e6f584e8490f6ca6743ff82b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a7258203e880a0c238d8da2f81cc4c948b8a44e7b675e1c6f687ac4b148c525ea810e2e96e643388308cd08ed5f2afc7f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0998cd9cf6a6f0a7769b1a38bb7f56465fb6f07dab1db60aae4ee76076d5364e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a062fc33406dc2240a7370e66ec848acc82993e464a8a7a1c72799080051954aeda0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0182b77689b0a53e33940133d8ad1381747ae34576e6f584e8490f6ca6743ff82b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a7258203e880a0452ee3cf098ff2a8f0de1cc4e0e0ad8c153a9989dc2bfb4d56de16dc22a2c12a881e26a6977eefc33cf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a043e611d2bdaa98d31524ba44f5d405fb8af43e78785dbe1f9e73ed061eeaac86a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0f75a979f1ca100367724ba034744771b98290dbdf4808fce25467a7c15ca0d9",
+        "lastblockhash" : "0x1fc22b70930b3e9504337a246b8a8125f64e2e5b3a3d199fa3cf377fe4763d23",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest403BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest403BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest403BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xad3d",
-                    "hash" : "0x72b8c5b955b7022d5999864d10b57bdb5b40b27f497bb1d40b64f17f1a041e61",
-                    "mixHash" : "0xd74287e8abc266745bc13387813035c3099e464ee784f6cc2d0e384e2e59d4e6",
-                    "nonce" : "0x999598d120f246fd",
+                    "hash" : "0x0b64fcdabdc8150c2456864bbd1e26857b49af8790c37aa977584d9f9fbab113",
+                    "mixHash" : "0x4d1fd1d93a341b9bd94a9d3deaf9da781e66ac43383cf31426167b6d68ffe808",
+                    "nonce" : "0xdea76debb45c7f01",
                     "number" : "0x01",
                     "parentHash" : "0x998cd9cf6a6f0a7769b1a38bb7f56465fb6f07dab1db60aae4ee76076d5364e2",
                     "receiptTrie" : "0xdbf2f157342e72f7926ab81294da382013e6da2b841852ac471acb2a1c3daae4",
-                    "stateRoot" : "0x7d3558b280e36b975542b4b2d7f3adcaf1a1f2f4f01821f9c98b12a4b37e1011",
+                    "stateRoot" : "0xb1c5abedff8925684cd655d40df150900a268b4d959ef14019bb297fc5dd55b1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0998cd9cf6a6f0a7769b1a38bb7f56465fb6f07dab1db60aae4ee76076d5364e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07d3558b280e36b975542b4b2d7f3adcaf1a1f2f4f01821f9c98b12a4b37e1011a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0dbf2f157342e72f7926ab81294da382013e6da2b841852ac471acb2a1c3daae4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82ad3d8203e880a0d74287e8abc266745bc13387813035c3099e464ee784f6cc2d0e384e2e59d4e688999598d120f246fdf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0998cd9cf6a6f0a7769b1a38bb7f56465fb6f07dab1db60aae4ee76076d5364e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b1c5abedff8925684cd655d40df150900a268b4d959ef14019bb297fc5dd55b1a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0dbf2f157342e72f7926ab81294da382013e6da2b841852ac471acb2a1c3daae4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82ad3d8203e880a04d1fd1d93a341b9bd94a9d3deaf9da781e66ac43383cf31426167b6d68ffe80888dea76debb45c7f01f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a043e611d2bdaa98d31524ba44f5d405fb8af43e78785dbe1f9e73ed061eeaac86a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x72b8c5b955b7022d5999864d10b57bdb5b40b27f497bb1d40b64f17f1a041e61",
+        "lastblockhash" : "0x0b64fcdabdc8150c2456864bbd1e26857b49af8790c37aa977584d9f9fbab113",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x36416045454040410a922055",
@@ -235,8 +228,8 @@
     "randomStatetest403BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest403BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest403BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa225",
-                    "hash" : "0x84e87efb7ec2f19d524775ded9853822ff976c1d92548f80e293a1d600668e54",
-                    "mixHash" : "0x273ced01583181c7b3a12cd3edae5a110d14900358ad750919af60c064391697",
-                    "nonce" : "0x09db067ac5235111",
+                    "hash" : "0xe33847702866825ebb0ce410d0d29bd96e04aaee3d5484fc3cd144192ad1c4e1",
+                    "mixHash" : "0x62dd6451906e6f120af28ed1f9901e021da8d66a9c9118833213eeda7b562b35",
+                    "nonce" : "0x8879a92ae79590fd",
                     "number" : "0x01",
                     "parentHash" : "0x998cd9cf6a6f0a7769b1a38bb7f56465fb6f07dab1db60aae4ee76076d5364e2",
                     "receiptTrie" : "0xf0217bb268ecdb3c7670414c1b63b9bf3f4a0a4a57963994eceb0acb448fe025",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0998cd9cf6a6f0a7769b1a38bb7f56465fb6f07dab1db60aae4ee76076d5364e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a069f5beaaf038b193e725b324e40cf6262fdff79375b3cb5178f9947cbf3ee4a5a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f0217bb268ecdb3c7670414c1b63b9bf3f4a0a4a57963994eceb0acb448fe025b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2258203e880a0273ced01583181c7b3a12cd3edae5a110d14900358ad750919af60c0643916978809db067ac5235111f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0998cd9cf6a6f0a7769b1a38bb7f56465fb6f07dab1db60aae4ee76076d5364e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a069f5beaaf038b193e725b324e40cf6262fdff79375b3cb5178f9947cbf3ee4a5a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f0217bb268ecdb3c7670414c1b63b9bf3f4a0a4a57963994eceb0acb448fe025b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2258203e880a062dd6451906e6f120af28ed1f9901e021da8d66a9c9118833213eeda7b562b35888879a92ae79590fdf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a043e611d2bdaa98d31524ba44f5d405fb8af43e78785dbe1f9e73ed061eeaac86a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x84e87efb7ec2f19d524775ded9853822ff976c1d92548f80e293a1d600668e54",
+        "lastblockhash" : "0xe33847702866825ebb0ce410d0d29bd96e04aaee3d5484fc3cd144192ad1c4e1",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest403BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest403BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest403BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa725",
-                    "hash" : "0xe7787dab6506e784c35d8795d89488174ce2c42ef225937ad96661c4dcf0b93a",
-                    "mixHash" : "0xf9740bd835ff548586f9affd20044b7b9b72cb3942a31a25ffd25a86b85c8527",
-                    "nonce" : "0x3a447b48329da169",
+                    "hash" : "0xe4fbfa9dd721bc8049fda96f4f051546437fcce8a32bdad516b09ff6d740fff1",
+                    "mixHash" : "0xb6d9c794bbeb8191f70f0849e5f9c9d613b551fb04e78662d973107b4dcc3f1f",
+                    "nonce" : "0x86dc7d2c9e20b40b",
                     "number" : "0x01",
                     "parentHash" : "0x998cd9cf6a6f0a7769b1a38bb7f56465fb6f07dab1db60aae4ee76076d5364e2",
                     "receiptTrie" : "0x3b05f76ec42efee7b9fa0042e57e519ca057dac5cf5cfd237a6a50dbedadfa40",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0998cd9cf6a6f0a7769b1a38bb7f56465fb6f07dab1db60aae4ee76076d5364e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01b04356dec585134df51bd633b02dade1b37fef94a637a23d1dbb14da05a449ea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa03b05f76ec42efee7b9fa0042e57e519ca057dac5cf5cfd237a6a50dbedadfa40b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a7258203e880a0f9740bd835ff548586f9affd20044b7b9b72cb3942a31a25ffd25a86b85c8527883a447b48329da169f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0998cd9cf6a6f0a7769b1a38bb7f56465fb6f07dab1db60aae4ee76076d5364e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01b04356dec585134df51bd633b02dade1b37fef94a637a23d1dbb14da05a449ea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa03b05f76ec42efee7b9fa0042e57e519ca057dac5cf5cfd237a6a50dbedadfa40b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a7258203e880a0b6d9c794bbeb8191f70f0849e5f9c9d613b551fb04e78662d973107b4dcc3f1f8886dc7d2c9e20b40bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a043e611d2bdaa98d31524ba44f5d405fb8af43e78785dbe1f9e73ed061eeaac86a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe7787dab6506e784c35d8795d89488174ce2c42ef225937ad96661c4dcf0b93a",
+        "lastblockhash" : "0xe4fbfa9dd721bc8049fda96f4f051546437fcce8a32bdad516b09ff6d740fff1",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest403BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest403BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest403BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa225",
-                    "hash" : "0xbabf9fbb7a374505d30fbbb2aa4104115248c729ae97691bf50414107128c76f",
-                    "mixHash" : "0xdd6994a5eaa62e37bc29ce1f9d4b7e1ef97b9103bfc5799e32687920d93b3a08",
-                    "nonce" : "0x16b773c66607bd29",
+                    "hash" : "0xd7c41c67815fbad1a7a8db13f1d2636942e3d15e31e5141da0ac407706bc7434",
+                    "mixHash" : "0x81091146f92d2b9e479eeb0d040bc2d40f8d87a282cec7b3ac3537e0ba9157fd",
+                    "nonce" : "0x168dcd96f5ad4d5b",
                     "number" : "0x01",
                     "parentHash" : "0x998cd9cf6a6f0a7769b1a38bb7f56465fb6f07dab1db60aae4ee76076d5364e2",
                     "receiptTrie" : "0xf0217bb268ecdb3c7670414c1b63b9bf3f4a0a4a57963994eceb0acb448fe025",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0998cd9cf6a6f0a7769b1a38bb7f56465fb6f07dab1db60aae4ee76076d5364e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a069f5beaaf038b193e725b324e40cf6262fdff79375b3cb5178f9947cbf3ee4a5a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f0217bb268ecdb3c7670414c1b63b9bf3f4a0a4a57963994eceb0acb448fe025b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2258203e880a0dd6994a5eaa62e37bc29ce1f9d4b7e1ef97b9103bfc5799e32687920d93b3a088816b773c66607bd29f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0998cd9cf6a6f0a7769b1a38bb7f56465fb6f07dab1db60aae4ee76076d5364e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a069f5beaaf038b193e725b324e40cf6262fdff79375b3cb5178f9947cbf3ee4a5a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f0217bb268ecdb3c7670414c1b63b9bf3f4a0a4a57963994eceb0acb448fe025b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2258203e880a081091146f92d2b9e479eeb0d040bc2d40f8d87a282cec7b3ac3537e0ba9157fd88168dcd96f5ad4d5bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a043e611d2bdaa98d31524ba44f5d405fb8af43e78785dbe1f9e73ed061eeaac86a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbabf9fbb7a374505d30fbbb2aa4104115248c729ae97691bf50414107128c76f",
+        "lastblockhash" : "0xd7c41c67815fbad1a7a8db13f1d2636942e3d15e31e5141da0ac407706bc7434",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest403BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest403BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest403BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa225",
-                    "hash" : "0xbb2a4e31ca8de2d4450c9f572653fdf0870c852474dc13bec9f66c4432c3e3cb",
-                    "mixHash" : "0x8365c68798fa535cf71ccd00612d0ef0a6903af2318c8b0c321f65f9877d56ee",
-                    "nonce" : "0xe25244f1303ea6c8",
+                    "hash" : "0x0b42397d95161721e363697055313fcd57a87a92eafc0a0c7f9adb4086e48d50",
+                    "mixHash" : "0xf379086cba5ca3d4253d7c84d1fb972ed937f5706411ab0f17fa4e5283da1a8f",
+                    "nonce" : "0xaf5944943b36cf87",
                     "number" : "0x01",
                     "parentHash" : "0x998cd9cf6a6f0a7769b1a38bb7f56465fb6f07dab1db60aae4ee76076d5364e2",
                     "receiptTrie" : "0xf0217bb268ecdb3c7670414c1b63b9bf3f4a0a4a57963994eceb0acb448fe025",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0998cd9cf6a6f0a7769b1a38bb7f56465fb6f07dab1db60aae4ee76076d5364e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a069f5beaaf038b193e725b324e40cf6262fdff79375b3cb5178f9947cbf3ee4a5a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f0217bb268ecdb3c7670414c1b63b9bf3f4a0a4a57963994eceb0acb448fe025b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2258203e880a08365c68798fa535cf71ccd00612d0ef0a6903af2318c8b0c321f65f9877d56ee88e25244f1303ea6c8f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0998cd9cf6a6f0a7769b1a38bb7f56465fb6f07dab1db60aae4ee76076d5364e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a069f5beaaf038b193e725b324e40cf6262fdff79375b3cb5178f9947cbf3ee4a5a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f0217bb268ecdb3c7670414c1b63b9bf3f4a0a4a57963994eceb0acb448fe025b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2258203e880a0f379086cba5ca3d4253d7c84d1fb972ed937f5706411ab0f17fa4e5283da1a8f88af5944943b36cf87f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a043e611d2bdaa98d31524ba44f5d405fb8af43e78785dbe1f9e73ed061eeaac86a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbb2a4e31ca8de2d4450c9f572653fdf0870c852474dc13bec9f66c4432c3e3cb",
+        "lastblockhash" : "0x0b42397d95161721e363697055313fcd57a87a92eafc0a0c7f9adb4086e48d50",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest40BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest40BC.json
index b3fe81b3a..36b7fa07d 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest40BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest40BC.json
@@ -2,8 +2,8 @@
     "randomStatetest40BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest40BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest40BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xfac2",
-                    "hash" : "0x11c47e713694a5af7ef1f7169f55815112364822ea421e92db69eca05311b38e",
-                    "mixHash" : "0x35c011afa01b926d958b9bf3273468eb20e0b0965e997a9be41311b09e105207",
-                    "nonce" : "0xf8040e2e0e9e1de2",
+                    "hash" : "0x19ed2254a0033ab3ae20f726d7d2f7f7ca49f8416f49aa92040084eaa5d25a75",
+                    "mixHash" : "0xb0075b9447f23e6cc3f4cd610a7bc7474bdb6df5b900d29f5a8aa697dc535ea6",
+                    "nonce" : "0xe7b6702a1f33a061",
                     "number" : "0x01",
                     "parentHash" : "0x4b80a6816c3ee5eb015e31230d37ca768d2adc02875d5a9e20f2a50529992f08",
                     "receiptTrie" : "0xce77faf2479953882ed37f5197196a598d5ee881cb3c79d70ed0bfddb81bc14d",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xae977c5f2d0295fb384043c347880e7fb3ba739a7f9e1a963a80286426991e70",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90335f901fca04b80a6816c3ee5eb015e31230d37ca768d2adc02875d5a9e20f2a50529992f08a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07c8accf39b43e1cf9a6aac3d6aae22d8379491ea73f3f60f8166f517441977cca0ae977c5f2d0295fb384043c347880e7fb3ba739a7f9e1a963a80286426991e70a0ce77faf2479953882ed37f5197196a598d5ee881cb3c79d70ed0bfddb81bc14db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82fac28203e880a035c011afa01b926d958b9bf3273468eb20e0b0965e997a9be41311b09e10520788f8040e2e0e9e1de2f90132f9012f80018408f1878494095e7baea6a6c7c4c2dfeb977efac326af552d878435a22465b8c9427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40371ba015f745a024368a609b0d907c8ade4283cfffe82b9e7a865b1037dbc99199f8d0a0539cd96384cc70979edfd7d9d1be97180c829b5c548c6de9308bfceeb8456907c0",
+                "rlp" : "0xf90335f901fca04b80a6816c3ee5eb015e31230d37ca768d2adc02875d5a9e20f2a50529992f08a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07c8accf39b43e1cf9a6aac3d6aae22d8379491ea73f3f60f8166f517441977cca0ae977c5f2d0295fb384043c347880e7fb3ba739a7f9e1a963a80286426991e70a0ce77faf2479953882ed37f5197196a598d5ee881cb3c79d70ed0bfddb81bc14db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82fac28203e880a0b0075b9447f23e6cc3f4cd610a7bc7474bdb6df5b900d29f5a8aa697dc535ea688e7b6702a1f33a061f90132f9012f80018408f1878494095e7baea6a6c7c4c2dfeb977efac326af552d878435a22465b8c9427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40371ba015f745a024368a609b0d907c8ade4283cfffe82b9e7a865b1037dbc99199f8d0a0539cd96384cc70979edfd7d9d1be97180c829b5c548c6de9308bfceeb8456907c0",
                 "transactions" : [
                     {
                         "data" : "0x427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4037",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a088521d138adabe1e203d709cb91e90bb109391d3d7f7e21344c646f288e94263a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x11c47e713694a5af7ef1f7169f55815112364822ea421e92db69eca05311b38e",
+        "lastblockhash" : "0x19ed2254a0033ab3ae20f726d7d2f7f7ca49f8416f49aa92040084eaa5d25a75",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest40BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest40BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest40BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xfdce",
-                    "hash" : "0xb7fdbc78f492d4ae28601af6e22572e62fad45cea2d968ef2e81e8eb968ec163",
-                    "mixHash" : "0xeb2989c8282a8f308256c34bf08af959996fd373b549ea3a211116ee9327f2b5",
-                    "nonce" : "0xa9d9dc5a81afbc05",
+                    "hash" : "0x63ce95dd6785649fa07a3c5a1cc4e61a8d17daf019ed11c0972b6a2f7ecb986a",
+                    "mixHash" : "0x5171aa6a22ea0efd31c5da3f1b8f526cc4ff42bea6d41dd65fa06665a52ca86d",
+                    "nonce" : "0xf2ba3232ab985715",
                     "number" : "0x01",
                     "parentHash" : "0x4b80a6816c3ee5eb015e31230d37ca768d2adc02875d5a9e20f2a50529992f08",
                     "receiptTrie" : "0x992f64c26f9264787eeb16fca411757d6eb1937a79ef7e85d00f58bbbdfa663f",
-                    "stateRoot" : "0x85a149dc374a69a8415e33ba66a3a27ce732cc79801701d01e97568d06956876",
+                    "stateRoot" : "0x56506d00be810693d9ef3a54f9b5e3e2653fc3a6d47093751ddc8250b1620eae",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xae977c5f2d0295fb384043c347880e7fb3ba739a7f9e1a963a80286426991e70",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90335f901fca04b80a6816c3ee5eb015e31230d37ca768d2adc02875d5a9e20f2a50529992f08a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a085a149dc374a69a8415e33ba66a3a27ce732cc79801701d01e97568d06956876a0ae977c5f2d0295fb384043c347880e7fb3ba739a7f9e1a963a80286426991e70a0992f64c26f9264787eeb16fca411757d6eb1937a79ef7e85d00f58bbbdfa663fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82fdce8203e880a0eb2989c8282a8f308256c34bf08af959996fd373b549ea3a211116ee9327f2b588a9d9dc5a81afbc05f90132f9012f80018408f1878494095e7baea6a6c7c4c2dfeb977efac326af552d878435a22465b8c9427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40371ba015f745a024368a609b0d907c8ade4283cfffe82b9e7a865b1037dbc99199f8d0a0539cd96384cc70979edfd7d9d1be97180c829b5c548c6de9308bfceeb8456907c0",
+                "rlp" : "0xf90335f901fca04b80a6816c3ee5eb015e31230d37ca768d2adc02875d5a9e20f2a50529992f08a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a056506d00be810693d9ef3a54f9b5e3e2653fc3a6d47093751ddc8250b1620eaea0ae977c5f2d0295fb384043c347880e7fb3ba739a7f9e1a963a80286426991e70a0992f64c26f9264787eeb16fca411757d6eb1937a79ef7e85d00f58bbbdfa663fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82fdce8203e880a05171aa6a22ea0efd31c5da3f1b8f526cc4ff42bea6d41dd65fa06665a52ca86d88f2ba3232ab985715f90132f9012f80018408f1878494095e7baea6a6c7c4c2dfeb977efac326af552d878435a22465b8c9427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40371ba015f745a024368a609b0d907c8ade4283cfffe82b9e7a865b1037dbc99199f8d0a0539cd96384cc70979edfd7d9d1be97180c829b5c548c6de9308bfceeb8456907c0",
                 "transactions" : [
                     {
                         "data" : "0x427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4037",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a088521d138adabe1e203d709cb91e90bb109391d3d7f7e21344c646f288e94263a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb7fdbc78f492d4ae28601af6e22572e62fad45cea2d968ef2e81e8eb968ec163",
+        "lastblockhash" : "0x63ce95dd6785649fa07a3c5a1cc4e61a8d17daf019ed11c0972b6a2f7ecb986a",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x35a22465",
                 "code" : "0x427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff403760005155",
@@ -235,8 +228,8 @@
     "randomStatetest40BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest40BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest40BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xfac2",
-                    "hash" : "0x6ed770dd4399cae188e52189e8f7bb189e7b225769f04ed9fdb4cca75f00cdc7",
-                    "mixHash" : "0xd3ad1dd4d473147c322114382c09e08c6145b590b8bb0ce10df01ca00bfb8199",
-                    "nonce" : "0xf9497f6595812cb9",
+                    "hash" : "0x5b99d94ae2ee25094b7733b74474789a1f6360c81e462ee9ca4835af11b54765",
+                    "mixHash" : "0x200d11540e0dc92856d45270b506db8464904d46af0d774e55cadf748bf8740a",
+                    "nonce" : "0x9c55f806d965d800",
                     "number" : "0x01",
                     "parentHash" : "0x4b80a6816c3ee5eb015e31230d37ca768d2adc02875d5a9e20f2a50529992f08",
                     "receiptTrie" : "0x73b0c603b69cafe0602e40098e5f2bba18e8bdb8a09ddc1f2ed375943e95ef09",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xae977c5f2d0295fb384043c347880e7fb3ba739a7f9e1a963a80286426991e70",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90335f901fca04b80a6816c3ee5eb015e31230d37ca768d2adc02875d5a9e20f2a50529992f08a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a015ba6244a0fb4fe17e3c8eb2c0906fe621641b9f42b1f4a2874d867b412b583da0ae977c5f2d0295fb384043c347880e7fb3ba739a7f9e1a963a80286426991e70a073b0c603b69cafe0602e40098e5f2bba18e8bdb8a09ddc1f2ed375943e95ef09b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82fac28203e880a0d3ad1dd4d473147c322114382c09e08c6145b590b8bb0ce10df01ca00bfb819988f9497f6595812cb9f90132f9012f80018408f1878494095e7baea6a6c7c4c2dfeb977efac326af552d878435a22465b8c9427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40371ba015f745a024368a609b0d907c8ade4283cfffe82b9e7a865b1037dbc99199f8d0a0539cd96384cc70979edfd7d9d1be97180c829b5c548c6de9308bfceeb8456907c0",
+                "rlp" : "0xf90335f901fca04b80a6816c3ee5eb015e31230d37ca768d2adc02875d5a9e20f2a50529992f08a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a015ba6244a0fb4fe17e3c8eb2c0906fe621641b9f42b1f4a2874d867b412b583da0ae977c5f2d0295fb384043c347880e7fb3ba739a7f9e1a963a80286426991e70a073b0c603b69cafe0602e40098e5f2bba18e8bdb8a09ddc1f2ed375943e95ef09b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82fac28203e880a0200d11540e0dc92856d45270b506db8464904d46af0d774e55cadf748bf8740a889c55f806d965d800f90132f9012f80018408f1878494095e7baea6a6c7c4c2dfeb977efac326af552d878435a22465b8c9427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40371ba015f745a024368a609b0d907c8ade4283cfffe82b9e7a865b1037dbc99199f8d0a0539cd96384cc70979edfd7d9d1be97180c829b5c548c6de9308bfceeb8456907c0",
                 "transactions" : [
                     {
                         "data" : "0x427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4037",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a088521d138adabe1e203d709cb91e90bb109391d3d7f7e21344c646f288e94263a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6ed770dd4399cae188e52189e8f7bb189e7b225769f04ed9fdb4cca75f00cdc7",
+        "lastblockhash" : "0x5b99d94ae2ee25094b7733b74474789a1f6360c81e462ee9ca4835af11b54765",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest40BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest40BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest40BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xfac2",
-                    "hash" : "0x887a25b74ba99f9b6295ac3732f74f7a4b950588a61b9baa04393345642a6134",
-                    "mixHash" : "0x65008fffd281365527d9a349be0afe12df35fe14a9b9e16b11a57dab7ee13d50",
-                    "nonce" : "0x4011fa3cabd11f5f",
+                    "hash" : "0x030702189619e28fb97fdc360a3d4b085032c22b8a71149c13cd744a1c952e12",
+                    "mixHash" : "0x352b97500f6da3c7b5c246c23225a5ab4f1e50cbe7a0a130074f13c34db51289",
+                    "nonce" : "0x2e3e339f721ba8f6",
                     "number" : "0x01",
                     "parentHash" : "0x4b80a6816c3ee5eb015e31230d37ca768d2adc02875d5a9e20f2a50529992f08",
                     "receiptTrie" : "0x73b0c603b69cafe0602e40098e5f2bba18e8bdb8a09ddc1f2ed375943e95ef09",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xae977c5f2d0295fb384043c347880e7fb3ba739a7f9e1a963a80286426991e70",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90335f901fca04b80a6816c3ee5eb015e31230d37ca768d2adc02875d5a9e20f2a50529992f08a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a015ba6244a0fb4fe17e3c8eb2c0906fe621641b9f42b1f4a2874d867b412b583da0ae977c5f2d0295fb384043c347880e7fb3ba739a7f9e1a963a80286426991e70a073b0c603b69cafe0602e40098e5f2bba18e8bdb8a09ddc1f2ed375943e95ef09b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82fac28203e880a065008fffd281365527d9a349be0afe12df35fe14a9b9e16b11a57dab7ee13d50884011fa3cabd11f5ff90132f9012f80018408f1878494095e7baea6a6c7c4c2dfeb977efac326af552d878435a22465b8c9427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40371ba015f745a024368a609b0d907c8ade4283cfffe82b9e7a865b1037dbc99199f8d0a0539cd96384cc70979edfd7d9d1be97180c829b5c548c6de9308bfceeb8456907c0",
+                "rlp" : "0xf90335f901fca04b80a6816c3ee5eb015e31230d37ca768d2adc02875d5a9e20f2a50529992f08a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a015ba6244a0fb4fe17e3c8eb2c0906fe621641b9f42b1f4a2874d867b412b583da0ae977c5f2d0295fb384043c347880e7fb3ba739a7f9e1a963a80286426991e70a073b0c603b69cafe0602e40098e5f2bba18e8bdb8a09ddc1f2ed375943e95ef09b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82fac28203e880a0352b97500f6da3c7b5c246c23225a5ab4f1e50cbe7a0a130074f13c34db51289882e3e339f721ba8f6f90132f9012f80018408f1878494095e7baea6a6c7c4c2dfeb977efac326af552d878435a22465b8c9427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40371ba015f745a024368a609b0d907c8ade4283cfffe82b9e7a865b1037dbc99199f8d0a0539cd96384cc70979edfd7d9d1be97180c829b5c548c6de9308bfceeb8456907c0",
                 "transactions" : [
                     {
                         "data" : "0x427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4037",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a088521d138adabe1e203d709cb91e90bb109391d3d7f7e21344c646f288e94263a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x887a25b74ba99f9b6295ac3732f74f7a4b950588a61b9baa04393345642a6134",
+        "lastblockhash" : "0x030702189619e28fb97fdc360a3d4b085032c22b8a71149c13cd744a1c952e12",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest40BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest40BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest40BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xfac2",
-                    "hash" : "0x95648378a8e4583141f7cc5e9d5582a335a983c2b225673dba78728cb6399e69",
-                    "mixHash" : "0x83982a1991f220ad662a2f0dec718b1834dc1944e85b93edbe73897a0ada93cb",
-                    "nonce" : "0xd38a322047a45ae7",
+                    "hash" : "0xc64c5cccf4ddeee33335dd5363d2e785cc596dc98153c3da95500a8777cc04b6",
+                    "mixHash" : "0x235174dcdf4d3afa7e655f86e1d295697e86e43a41ae397c68247689084ac56e",
+                    "nonce" : "0x1e68f8d9bd449ad6",
                     "number" : "0x01",
                     "parentHash" : "0x4b80a6816c3ee5eb015e31230d37ca768d2adc02875d5a9e20f2a50529992f08",
                     "receiptTrie" : "0x73b0c603b69cafe0602e40098e5f2bba18e8bdb8a09ddc1f2ed375943e95ef09",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xae977c5f2d0295fb384043c347880e7fb3ba739a7f9e1a963a80286426991e70",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90335f901fca04b80a6816c3ee5eb015e31230d37ca768d2adc02875d5a9e20f2a50529992f08a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a015ba6244a0fb4fe17e3c8eb2c0906fe621641b9f42b1f4a2874d867b412b583da0ae977c5f2d0295fb384043c347880e7fb3ba739a7f9e1a963a80286426991e70a073b0c603b69cafe0602e40098e5f2bba18e8bdb8a09ddc1f2ed375943e95ef09b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82fac28203e880a083982a1991f220ad662a2f0dec718b1834dc1944e85b93edbe73897a0ada93cb88d38a322047a45ae7f90132f9012f80018408f1878494095e7baea6a6c7c4c2dfeb977efac326af552d878435a22465b8c9427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40371ba015f745a024368a609b0d907c8ade4283cfffe82b9e7a865b1037dbc99199f8d0a0539cd96384cc70979edfd7d9d1be97180c829b5c548c6de9308bfceeb8456907c0",
+                "rlp" : "0xf90335f901fca04b80a6816c3ee5eb015e31230d37ca768d2adc02875d5a9e20f2a50529992f08a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a015ba6244a0fb4fe17e3c8eb2c0906fe621641b9f42b1f4a2874d867b412b583da0ae977c5f2d0295fb384043c347880e7fb3ba739a7f9e1a963a80286426991e70a073b0c603b69cafe0602e40098e5f2bba18e8bdb8a09ddc1f2ed375943e95ef09b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82fac28203e880a0235174dcdf4d3afa7e655f86e1d295697e86e43a41ae397c68247689084ac56e881e68f8d9bd449ad6f90132f9012f80018408f1878494095e7baea6a6c7c4c2dfeb977efac326af552d878435a22465b8c9427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40371ba015f745a024368a609b0d907c8ade4283cfffe82b9e7a865b1037dbc99199f8d0a0539cd96384cc70979edfd7d9d1be97180c829b5c548c6de9308bfceeb8456907c0",
                 "transactions" : [
                     {
                         "data" : "0x427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4037",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a088521d138adabe1e203d709cb91e90bb109391d3d7f7e21344c646f288e94263a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x95648378a8e4583141f7cc5e9d5582a335a983c2b225673dba78728cb6399e69",
+        "lastblockhash" : "0xc64c5cccf4ddeee33335dd5363d2e785cc596dc98153c3da95500a8777cc04b6",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest40BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest40BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest40BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xfac2",
-                    "hash" : "0xb876745c2d7d3b260f1d7847e6afb538918dbb3abbfb880448f23befb2b07373",
-                    "mixHash" : "0x0b9520b0cd0c69c05381314b73748dadc6447457bfb746c053d6795f7adf8a09",
-                    "nonce" : "0x118f99a03f1bd0de",
+                    "hash" : "0xa35cee65b0e9e27e2e44c3e3e73f674475c2713522c4707815232ff161a368f5",
+                    "mixHash" : "0x53ca1a9acd259d01bd64ed1d0314422c3b28b1edb3fbee99bd57cfed7f37f364",
+                    "nonce" : "0xa6bfad39ffb5f35e",
                     "number" : "0x01",
                     "parentHash" : "0x4b80a6816c3ee5eb015e31230d37ca768d2adc02875d5a9e20f2a50529992f08",
                     "receiptTrie" : "0x73b0c603b69cafe0602e40098e5f2bba18e8bdb8a09ddc1f2ed375943e95ef09",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xae977c5f2d0295fb384043c347880e7fb3ba739a7f9e1a963a80286426991e70",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90335f901fca04b80a6816c3ee5eb015e31230d37ca768d2adc02875d5a9e20f2a50529992f08a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a015ba6244a0fb4fe17e3c8eb2c0906fe621641b9f42b1f4a2874d867b412b583da0ae977c5f2d0295fb384043c347880e7fb3ba739a7f9e1a963a80286426991e70a073b0c603b69cafe0602e40098e5f2bba18e8bdb8a09ddc1f2ed375943e95ef09b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82fac28203e880a00b9520b0cd0c69c05381314b73748dadc6447457bfb746c053d6795f7adf8a0988118f99a03f1bd0def90132f9012f80018408f1878494095e7baea6a6c7c4c2dfeb977efac326af552d878435a22465b8c9427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40371ba015f745a024368a609b0d907c8ade4283cfffe82b9e7a865b1037dbc99199f8d0a0539cd96384cc70979edfd7d9d1be97180c829b5c548c6de9308bfceeb8456907c0",
+                "rlp" : "0xf90335f901fca04b80a6816c3ee5eb015e31230d37ca768d2adc02875d5a9e20f2a50529992f08a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a015ba6244a0fb4fe17e3c8eb2c0906fe621641b9f42b1f4a2874d867b412b583da0ae977c5f2d0295fb384043c347880e7fb3ba739a7f9e1a963a80286426991e70a073b0c603b69cafe0602e40098e5f2bba18e8bdb8a09ddc1f2ed375943e95ef09b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82fac28203e880a053ca1a9acd259d01bd64ed1d0314422c3b28b1edb3fbee99bd57cfed7f37f36488a6bfad39ffb5f35ef90132f9012f80018408f1878494095e7baea6a6c7c4c2dfeb977efac326af552d878435a22465b8c9427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40371ba015f745a024368a609b0d907c8ade4283cfffe82b9e7a865b1037dbc99199f8d0a0539cd96384cc70979edfd7d9d1be97180c829b5c548c6de9308bfceeb8456907c0",
                 "transactions" : [
                     {
                         "data" : "0x427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4037",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a088521d138adabe1e203d709cb91e90bb109391d3d7f7e21344c646f288e94263a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb876745c2d7d3b260f1d7847e6afb538918dbb3abbfb880448f23befb2b07373",
+        "lastblockhash" : "0xa35cee65b0e9e27e2e44c3e3e73f674475c2713522c4707815232ff161a368f5",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest427BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest427BC.json
index 7d1d8f213..2fe76a4ac 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest427BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest427BC.json
@@ -2,8 +2,8 @@
     "randomStatetest427BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest427BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest427BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x679b",
-                    "hash" : "0x620328c94a0474d1d8110e74d7b31810bf85c7edb7ef0955afd0ae6a86d05dc0",
-                    "mixHash" : "0xf143aa4d788cd1da79f9e15d65f53a7961fee2b42e2baeb2150e5a032d72cfb8",
-                    "nonce" : "0x155e89e832a0ceed",
+                    "hash" : "0x68d5aa255f89ed337a8b4195c1ca08d0b326a874e813ec52040eefb7d37fb2d8",
+                    "mixHash" : "0x37b8f4452f7b2710a043a21d5ce81c3004b5698496a426cbec2c2e8b6d211d92",
+                    "nonce" : "0x8543011e308d85b2",
                     "number" : "0x01",
                     "parentHash" : "0x5355a89b3e5d4d9a473930fe86be1da01cb8d013fe62c0c605fc69cefa4778c7",
                     "receiptTrie" : "0x771d1070433bf572a591419051b9137451e92e017f2fff38eb6a877ef7560a0e",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xa942af1582b362899dda6b9fd462b6e3263ab35bbd2047da46a6dbae5a3956d8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90336f901fca05355a89b3e5d4d9a473930fe86be1da01cb8d013fe62c0c605fc69cefa4778c7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00c5e6253b86c743f3a458527dfe9f9ebfb6a217da9800e40aa0ea6fb4670e8b2a0a942af1582b362899dda6b9fd462b6e3263ab35bbd2047da46a6dbae5a3956d8a0771d1070433bf572a591419051b9137451e92e017f2fff38eb6a877ef7560a0eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82679b8203e880a0f143aa4d788cd1da79f9e15d65f53a7961fee2b42e2baeb2150e5a032d72cfb888155e89e832a0ceedf90133f9013080018440a9516094095e7baea6a6c7c4c2dfeb977efac326af552d87841f9cbb18b8ca7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff72781ca09320154e2b4ce5e7cf606713a07b33c7f7f75f6001e6748c02745da0adee5422a079b603e6a6d3326506745e72560605f66d5d23465b0dd811b842aaeb2e0289f7c0",
+                "rlp" : "0xf90336f901fca05355a89b3e5d4d9a473930fe86be1da01cb8d013fe62c0c605fc69cefa4778c7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00c5e6253b86c743f3a458527dfe9f9ebfb6a217da9800e40aa0ea6fb4670e8b2a0a942af1582b362899dda6b9fd462b6e3263ab35bbd2047da46a6dbae5a3956d8a0771d1070433bf572a591419051b9137451e92e017f2fff38eb6a877ef7560a0eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82679b8203e880a037b8f4452f7b2710a043a21d5ce81c3004b5698496a426cbec2c2e8b6d211d92888543011e308d85b2f90133f9013080018440a9516094095e7baea6a6c7c4c2dfeb977efac326af552d87841f9cbb18b8ca7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff72781ca09320154e2b4ce5e7cf606713a07b33c7f7f75f6001e6748c02745da0adee5422a079b603e6a6d3326506745e72560605f66d5d23465b0dd811b842aaeb2e0289f7c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7278",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04bab370ce914057ca8151b59505d772882222807c84f5c2285e2c2645adaa54ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x620328c94a0474d1d8110e74d7b31810bf85c7edb7ef0955afd0ae6a86d05dc0",
+        "lastblockhash" : "0x68d5aa255f89ed337a8b4195c1ca08d0b326a874e813ec52040eefb7d37fb2d8",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest427BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest427BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest427BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6aa7",
-                    "hash" : "0xbb1dfeada96e293a9ad182d03b1c4a710775381b90765b9e601f34cd698bdda9",
-                    "mixHash" : "0x8defce7097a2911c2f7e5c6a9db73ecd3a96f0e4d60909bd293d69dbb71b063c",
-                    "nonce" : "0x6e1b374b95e5b1dc",
+                    "hash" : "0x3262cfc622091761387342e4425c3197c88fbad36349dfdde950bdbbdc725731",
+                    "mixHash" : "0xf0e6900c6ec8e20342730adce5e2dd575c97b2658f38207c6390aad6e9b51827",
+                    "nonce" : "0x12e6df5098e9c198",
                     "number" : "0x01",
                     "parentHash" : "0x5355a89b3e5d4d9a473930fe86be1da01cb8d013fe62c0c605fc69cefa4778c7",
                     "receiptTrie" : "0x8ac56eb06ab0a2efa47b29303ed93553485b7cd3f8a727a0fba6c9a39c38c3f3",
-                    "stateRoot" : "0xe74923aa4fa8d65c8a1b9133cb51806e863288fb627bfd468c00a1ccc127ba17",
+                    "stateRoot" : "0x15f9638281da1adacccd911ce74aab22c4c9fd488e867eebe33be77696e30487",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa942af1582b362899dda6b9fd462b6e3263ab35bbd2047da46a6dbae5a3956d8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90336f901fca05355a89b3e5d4d9a473930fe86be1da01cb8d013fe62c0c605fc69cefa4778c7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e74923aa4fa8d65c8a1b9133cb51806e863288fb627bfd468c00a1ccc127ba17a0a942af1582b362899dda6b9fd462b6e3263ab35bbd2047da46a6dbae5a3956d8a08ac56eb06ab0a2efa47b29303ed93553485b7cd3f8a727a0fba6c9a39c38c3f3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826aa78203e880a08defce7097a2911c2f7e5c6a9db73ecd3a96f0e4d60909bd293d69dbb71b063c886e1b374b95e5b1dcf90133f9013080018440a9516094095e7baea6a6c7c4c2dfeb977efac326af552d87841f9cbb18b8ca7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff72781ca09320154e2b4ce5e7cf606713a07b33c7f7f75f6001e6748c02745da0adee5422a079b603e6a6d3326506745e72560605f66d5d23465b0dd811b842aaeb2e0289f7c0",
+                "rlp" : "0xf90336f901fca05355a89b3e5d4d9a473930fe86be1da01cb8d013fe62c0c605fc69cefa4778c7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a015f9638281da1adacccd911ce74aab22c4c9fd488e867eebe33be77696e30487a0a942af1582b362899dda6b9fd462b6e3263ab35bbd2047da46a6dbae5a3956d8a08ac56eb06ab0a2efa47b29303ed93553485b7cd3f8a727a0fba6c9a39c38c3f3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826aa78203e880a0f0e6900c6ec8e20342730adce5e2dd575c97b2658f38207c6390aad6e9b518278812e6df5098e9c198f90133f9013080018440a9516094095e7baea6a6c7c4c2dfeb977efac326af552d87841f9cbb18b8ca7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff72781ca09320154e2b4ce5e7cf606713a07b33c7f7f75f6001e6748c02745da0adee5422a079b603e6a6d3326506745e72560605f66d5d23465b0dd811b842aaeb2e0289f7c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7278",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04bab370ce914057ca8151b59505d772882222807c84f5c2285e2c2645adaa54ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbb1dfeada96e293a9ad182d03b1c4a710775381b90765b9e601f34cd698bdda9",
+        "lastblockhash" : "0x3262cfc622091761387342e4425c3197c88fbad36349dfdde950bdbbdc725731",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1f9cbb18",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff72785560005155",
@@ -233,8 +226,8 @@
     "randomStatetest427BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest427BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest427BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x679b",
-                    "hash" : "0xc7dcc3041dc4e928b07613473d5bfe65e96366f33fc6492b541120b736335714",
-                    "mixHash" : "0x4112ceb50526e25567a657c02f601d46ae78453636b5107fd36f1fe958cabd56",
-                    "nonce" : "0xc724ae7488e53ddc",
+                    "hash" : "0x15ff4a64a532f8a3913aa1788e3dc17105020cc520bcf531511e6a5badfe438a",
+                    "mixHash" : "0xf608e44b23989b0c935abae0c2a3f5dc895077402376420f896b0b34e0704e96",
+                    "nonce" : "0xacc54965e4feebf8",
                     "number" : "0x01",
                     "parentHash" : "0x5355a89b3e5d4d9a473930fe86be1da01cb8d013fe62c0c605fc69cefa4778c7",
                     "receiptTrie" : "0x45e554773f25acf8d9bbb43d3011cbe8a6ad152538eb29739d6f019a9a702736",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0xa942af1582b362899dda6b9fd462b6e3263ab35bbd2047da46a6dbae5a3956d8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90336f901fca05355a89b3e5d4d9a473930fe86be1da01cb8d013fe62c0c605fc69cefa4778c7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dc38a9de656ad9cf658374ca6b77b7f4d8215752ae61c1adb8caf6ff1b9b179ca0a942af1582b362899dda6b9fd462b6e3263ab35bbd2047da46a6dbae5a3956d8a045e554773f25acf8d9bbb43d3011cbe8a6ad152538eb29739d6f019a9a702736b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82679b8203e880a04112ceb50526e25567a657c02f601d46ae78453636b5107fd36f1fe958cabd5688c724ae7488e53ddcf90133f9013080018440a9516094095e7baea6a6c7c4c2dfeb977efac326af552d87841f9cbb18b8ca7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff72781ca09320154e2b4ce5e7cf606713a07b33c7f7f75f6001e6748c02745da0adee5422a079b603e6a6d3326506745e72560605f66d5d23465b0dd811b842aaeb2e0289f7c0",
+                "rlp" : "0xf90336f901fca05355a89b3e5d4d9a473930fe86be1da01cb8d013fe62c0c605fc69cefa4778c7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dc38a9de656ad9cf658374ca6b77b7f4d8215752ae61c1adb8caf6ff1b9b179ca0a942af1582b362899dda6b9fd462b6e3263ab35bbd2047da46a6dbae5a3956d8a045e554773f25acf8d9bbb43d3011cbe8a6ad152538eb29739d6f019a9a702736b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82679b8203e880a0f608e44b23989b0c935abae0c2a3f5dc895077402376420f896b0b34e0704e9688acc54965e4feebf8f90133f9013080018440a9516094095e7baea6a6c7c4c2dfeb977efac326af552d87841f9cbb18b8ca7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff72781ca09320154e2b4ce5e7cf606713a07b33c7f7f75f6001e6748c02745da0adee5422a079b603e6a6d3326506745e72560605f66d5d23465b0dd811b842aaeb2e0289f7c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7278",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04bab370ce914057ca8151b59505d772882222807c84f5c2285e2c2645adaa54ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc7dcc3041dc4e928b07613473d5bfe65e96366f33fc6492b541120b736335714",
+        "lastblockhash" : "0x15ff4a64a532f8a3913aa1788e3dc17105020cc520bcf531511e6a5badfe438a",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest427BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest427BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest427BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x679b",
-                    "hash" : "0x779db1b88284241c8c61ad6af5b700871012297bc75feda901091a313f251920",
-                    "mixHash" : "0xf8f84d52e2ba985323fdceb26e798de83c1d4e1bf4a69541aa42fe43efac64b9",
-                    "nonce" : "0xeb80a13dc47133a5",
+                    "hash" : "0x1e3b3c6edaa69509126b528b41ffe96de1e01af942c7374d33f12ea81e38a611",
+                    "mixHash" : "0x58c581e7fd40176f308d4758edee7cf7276029b474c365f1d8a6e2162edc4be6",
+                    "nonce" : "0xa4f044925dcff16d",
                     "number" : "0x01",
                     "parentHash" : "0x5355a89b3e5d4d9a473930fe86be1da01cb8d013fe62c0c605fc69cefa4778c7",
                     "receiptTrie" : "0x45e554773f25acf8d9bbb43d3011cbe8a6ad152538eb29739d6f019a9a702736",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0xa942af1582b362899dda6b9fd462b6e3263ab35bbd2047da46a6dbae5a3956d8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90336f901fca05355a89b3e5d4d9a473930fe86be1da01cb8d013fe62c0c605fc69cefa4778c7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dc38a9de656ad9cf658374ca6b77b7f4d8215752ae61c1adb8caf6ff1b9b179ca0a942af1582b362899dda6b9fd462b6e3263ab35bbd2047da46a6dbae5a3956d8a045e554773f25acf8d9bbb43d3011cbe8a6ad152538eb29739d6f019a9a702736b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82679b8203e880a0f8f84d52e2ba985323fdceb26e798de83c1d4e1bf4a69541aa42fe43efac64b988eb80a13dc47133a5f90133f9013080018440a9516094095e7baea6a6c7c4c2dfeb977efac326af552d87841f9cbb18b8ca7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff72781ca09320154e2b4ce5e7cf606713a07b33c7f7f75f6001e6748c02745da0adee5422a079b603e6a6d3326506745e72560605f66d5d23465b0dd811b842aaeb2e0289f7c0",
+                "rlp" : "0xf90336f901fca05355a89b3e5d4d9a473930fe86be1da01cb8d013fe62c0c605fc69cefa4778c7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dc38a9de656ad9cf658374ca6b77b7f4d8215752ae61c1adb8caf6ff1b9b179ca0a942af1582b362899dda6b9fd462b6e3263ab35bbd2047da46a6dbae5a3956d8a045e554773f25acf8d9bbb43d3011cbe8a6ad152538eb29739d6f019a9a702736b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82679b8203e880a058c581e7fd40176f308d4758edee7cf7276029b474c365f1d8a6e2162edc4be688a4f044925dcff16df90133f9013080018440a9516094095e7baea6a6c7c4c2dfeb977efac326af552d87841f9cbb18b8ca7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff72781ca09320154e2b4ce5e7cf606713a07b33c7f7f75f6001e6748c02745da0adee5422a079b603e6a6d3326506745e72560605f66d5d23465b0dd811b842aaeb2e0289f7c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7278",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04bab370ce914057ca8151b59505d772882222807c84f5c2285e2c2645adaa54ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x779db1b88284241c8c61ad6af5b700871012297bc75feda901091a313f251920",
+        "lastblockhash" : "0x1e3b3c6edaa69509126b528b41ffe96de1e01af942c7374d33f12ea81e38a611",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest427BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest427BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest427BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x679b",
-                    "hash" : "0xfbc3510d2d1319e4157e6aecd62387ca01c2da2b28ae4f6883e95dcc0d15ad9a",
-                    "mixHash" : "0x5557e9a6023dff54755d9323ca7b2f80470e337485d276fd1fc994b89d32b872",
-                    "nonce" : "0x0172b754fff4dab6",
+                    "hash" : "0xc0c53ff1b78194c6ae09714cc2bc76e4caee72da30f63d145c10b800b894c0c5",
+                    "mixHash" : "0xeedb649d2afc1a823808636b7b470c77cfde092609ea1eb70382a1a18e94035d",
+                    "nonce" : "0x71e1f528c5241482",
                     "number" : "0x01",
                     "parentHash" : "0x5355a89b3e5d4d9a473930fe86be1da01cb8d013fe62c0c605fc69cefa4778c7",
                     "receiptTrie" : "0x45e554773f25acf8d9bbb43d3011cbe8a6ad152538eb29739d6f019a9a702736",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0xa942af1582b362899dda6b9fd462b6e3263ab35bbd2047da46a6dbae5a3956d8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90336f901fca05355a89b3e5d4d9a473930fe86be1da01cb8d013fe62c0c605fc69cefa4778c7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dc38a9de656ad9cf658374ca6b77b7f4d8215752ae61c1adb8caf6ff1b9b179ca0a942af1582b362899dda6b9fd462b6e3263ab35bbd2047da46a6dbae5a3956d8a045e554773f25acf8d9bbb43d3011cbe8a6ad152538eb29739d6f019a9a702736b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82679b8203e880a05557e9a6023dff54755d9323ca7b2f80470e337485d276fd1fc994b89d32b872880172b754fff4dab6f90133f9013080018440a9516094095e7baea6a6c7c4c2dfeb977efac326af552d87841f9cbb18b8ca7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff72781ca09320154e2b4ce5e7cf606713a07b33c7f7f75f6001e6748c02745da0adee5422a079b603e6a6d3326506745e72560605f66d5d23465b0dd811b842aaeb2e0289f7c0",
+                "rlp" : "0xf90336f901fca05355a89b3e5d4d9a473930fe86be1da01cb8d013fe62c0c605fc69cefa4778c7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dc38a9de656ad9cf658374ca6b77b7f4d8215752ae61c1adb8caf6ff1b9b179ca0a942af1582b362899dda6b9fd462b6e3263ab35bbd2047da46a6dbae5a3956d8a045e554773f25acf8d9bbb43d3011cbe8a6ad152538eb29739d6f019a9a702736b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82679b8203e880a0eedb649d2afc1a823808636b7b470c77cfde092609ea1eb70382a1a18e94035d8871e1f528c5241482f90133f9013080018440a9516094095e7baea6a6c7c4c2dfeb977efac326af552d87841f9cbb18b8ca7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff72781ca09320154e2b4ce5e7cf606713a07b33c7f7f75f6001e6748c02745da0adee5422a079b603e6a6d3326506745e72560605f66d5d23465b0dd811b842aaeb2e0289f7c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7278",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04bab370ce914057ca8151b59505d772882222807c84f5c2285e2c2645adaa54ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfbc3510d2d1319e4157e6aecd62387ca01c2da2b28ae4f6883e95dcc0d15ad9a",
+        "lastblockhash" : "0xc0c53ff1b78194c6ae09714cc2bc76e4caee72da30f63d145c10b800b894c0c5",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest427BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest427BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest427BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x679b",
-                    "hash" : "0x5d7b2cafa8935911c695719ee1934eadaf863a74e3c13d2a93da5d1e0ebd2247",
-                    "mixHash" : "0x9cb0354f318e8c199629e1faa89df83bb29d94da3e699c9af231426f18863056",
-                    "nonce" : "0x30c8906f11575279",
+                    "hash" : "0xb17d2975509e950dca51055832183fa9085839f05a6dc772313fb04e8a025dc2",
+                    "mixHash" : "0x22550be3645550316b32d983367d8568391a694b857d1ed8cb5033dca006a175",
+                    "nonce" : "0x18711eb6a2afc7e8",
                     "number" : "0x01",
                     "parentHash" : "0x5355a89b3e5d4d9a473930fe86be1da01cb8d013fe62c0c605fc69cefa4778c7",
                     "receiptTrie" : "0x45e554773f25acf8d9bbb43d3011cbe8a6ad152538eb29739d6f019a9a702736",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0xa942af1582b362899dda6b9fd462b6e3263ab35bbd2047da46a6dbae5a3956d8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90336f901fca05355a89b3e5d4d9a473930fe86be1da01cb8d013fe62c0c605fc69cefa4778c7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dc38a9de656ad9cf658374ca6b77b7f4d8215752ae61c1adb8caf6ff1b9b179ca0a942af1582b362899dda6b9fd462b6e3263ab35bbd2047da46a6dbae5a3956d8a045e554773f25acf8d9bbb43d3011cbe8a6ad152538eb29739d6f019a9a702736b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82679b8203e880a09cb0354f318e8c199629e1faa89df83bb29d94da3e699c9af231426f188630568830c8906f11575279f90133f9013080018440a9516094095e7baea6a6c7c4c2dfeb977efac326af552d87841f9cbb18b8ca7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff72781ca09320154e2b4ce5e7cf606713a07b33c7f7f75f6001e6748c02745da0adee5422a079b603e6a6d3326506745e72560605f66d5d23465b0dd811b842aaeb2e0289f7c0",
+                "rlp" : "0xf90336f901fca05355a89b3e5d4d9a473930fe86be1da01cb8d013fe62c0c605fc69cefa4778c7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dc38a9de656ad9cf658374ca6b77b7f4d8215752ae61c1adb8caf6ff1b9b179ca0a942af1582b362899dda6b9fd462b6e3263ab35bbd2047da46a6dbae5a3956d8a045e554773f25acf8d9bbb43d3011cbe8a6ad152538eb29739d6f019a9a702736b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82679b8203e880a022550be3645550316b32d983367d8568391a694b857d1ed8cb5033dca006a1758818711eb6a2afc7e8f90133f9013080018440a9516094095e7baea6a6c7c4c2dfeb977efac326af552d87841f9cbb18b8ca7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff72781ca09320154e2b4ce5e7cf606713a07b33c7f7f75f6001e6748c02745da0adee5422a079b603e6a6d3326506745e72560605f66d5d23465b0dd811b842aaeb2e0289f7c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7278",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04bab370ce914057ca8151b59505d772882222807c84f5c2285e2c2645adaa54ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5d7b2cafa8935911c695719ee1934eadaf863a74e3c13d2a93da5d1e0ebd2247",
+        "lastblockhash" : "0xb17d2975509e950dca51055832183fa9085839f05a6dc772313fb04e8a025dc2",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest431BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest431BC.json
index f477d4ec0..981fc889c 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest431BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest431BC.json
@@ -2,8 +2,8 @@
     "randomStatetest431BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest431BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest431BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xe8a2",
-                    "hash" : "0x1aa7d421a7f307fb58c58bfaf27f1ac7f94ab034980809e6b9688f66f4fe3eb8",
-                    "mixHash" : "0xb908779d8441d1ab2b425c279dfdd6b898f6c80948ab370ce1cc7675a0ab67bd",
-                    "nonce" : "0x5d2139ef141bdd23",
+                    "hash" : "0x4cb2ec3f03e0fc4cfacad1263899c269150fe8b703fb9885bb4c012256f6d38b",
+                    "mixHash" : "0x9cda2fd7a7a7b4113e7820a1b8f6c04e074f3fb912c583bae18e0ce8f3a028d1",
+                    "nonce" : "0x36633d726a784930",
                     "number" : "0x01",
                     "parentHash" : "0x64ce8a5a23f104ea15d89a77341f3add7a792d217ee10b3ec5edd49bc0889ffc",
                     "receiptTrie" : "0x23da36ee0eba48ced853b61623ac2cf782704a751e9c005cd5d32a05d981f949",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x0019e38ffaa68d2f987f151fd0b164c1852f12637e905b0af428510c8862dac3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90338f901fca064ce8a5a23f104ea15d89a77341f3add7a792d217ee10b3ec5edd49bc0889ffca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f2cb26f5f146f770d2a1137993f25035d529cebbb5395e104c8d08b585ba31e1a00019e38ffaa68d2f987f151fd0b164c1852f12637e905b0af428510c8862dac3a023da36ee0eba48ced853b61623ac2cf782704a751e9c005cd5d32a05d981f949b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82e8a28203e880a0b908779d8441d1ab2b425c279dfdd6b898f6c80948ab370ce1cc7675a0ab67bd885d2139ef141bdd23f90135f901328001840527a87b94095e7baea6a6c7c4c2dfeb977efac326af552d8784423dc88ab8cc7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000040313715608f1ba008624e3cbe4a82fee9d61938c3458667dc7adc6cc071a809e0e8502b3068f5b7a025e30d5b52aefcf437a1cce073ee1d2e9df6af4094d2951aab7f9428cfb4bdcbc0",
+                "rlp" : "0xf90338f901fca064ce8a5a23f104ea15d89a77341f3add7a792d217ee10b3ec5edd49bc0889ffca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f2cb26f5f146f770d2a1137993f25035d529cebbb5395e104c8d08b585ba31e1a00019e38ffaa68d2f987f151fd0b164c1852f12637e905b0af428510c8862dac3a023da36ee0eba48ced853b61623ac2cf782704a751e9c005cd5d32a05d981f949b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82e8a28203e880a09cda2fd7a7a7b4113e7820a1b8f6c04e074f3fb912c583bae18e0ce8f3a028d18836633d726a784930f90135f901328001840527a87b94095e7baea6a6c7c4c2dfeb977efac326af552d8784423dc88ab8cc7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000040313715608f1ba008624e3cbe4a82fee9d61938c3458667dc7adc6cc071a809e0e8502b3068f5b7a025e30d5b52aefcf437a1cce073ee1d2e9df6af4094d2951aab7f9428cfb4bdcbc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000040313715608f",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e49cb8d6a556056a19cab25d6f26def44a65534fc563d93aaa0b42e5a0c5e908a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1aa7d421a7f307fb58c58bfaf27f1ac7f94ab034980809e6b9688f66f4fe3eb8",
+        "lastblockhash" : "0x4cb2ec3f03e0fc4cfacad1263899c269150fe8b703fb9885bb4c012256f6d38b",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest431BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest431BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest431BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xebae",
-                    "hash" : "0x8a6a8cf33972e4a5591561bbfd8e4592caba7952a55f98e6fe983eb42357d8db",
-                    "mixHash" : "0x073cc2b256d23ec85befd434eff36aed82d1e2d81ee0b2661a9f971c90993d14",
-                    "nonce" : "0xfa58728be3e0ac92",
+                    "hash" : "0x247e203e0699b23d61ec8dead8c4fbbc63679a96adf6729aac1879d9a83de6f3",
+                    "mixHash" : "0x90c5106688c3fd0e0131bc6d47384d817ebdee6908faa1dbe1c522f8d945a28b",
+                    "nonce" : "0x33e234f7c8bd239b",
                     "number" : "0x01",
                     "parentHash" : "0x64ce8a5a23f104ea15d89a77341f3add7a792d217ee10b3ec5edd49bc0889ffc",
                     "receiptTrie" : "0x677097fffefd8829d4ce155d1efc27a5c192c4dbabe404efde1e6d0a60ee1c11",
-                    "stateRoot" : "0xf135828d06e4495e2a2a72cd1abe16773bd9ee3f4572ab9e66d6bbd93bd4a9bd",
+                    "stateRoot" : "0x61c16140f65e5b77f11006b02613ddb1ae93298ec8d2b465fe67b68be2d7e444",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0019e38ffaa68d2f987f151fd0b164c1852f12637e905b0af428510c8862dac3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90338f901fca064ce8a5a23f104ea15d89a77341f3add7a792d217ee10b3ec5edd49bc0889ffca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f135828d06e4495e2a2a72cd1abe16773bd9ee3f4572ab9e66d6bbd93bd4a9bda00019e38ffaa68d2f987f151fd0b164c1852f12637e905b0af428510c8862dac3a0677097fffefd8829d4ce155d1efc27a5c192c4dbabe404efde1e6d0a60ee1c11b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82ebae8203e880a0073cc2b256d23ec85befd434eff36aed82d1e2d81ee0b2661a9f971c90993d1488fa58728be3e0ac92f90135f901328001840527a87b94095e7baea6a6c7c4c2dfeb977efac326af552d8784423dc88ab8cc7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000040313715608f1ba008624e3cbe4a82fee9d61938c3458667dc7adc6cc071a809e0e8502b3068f5b7a025e30d5b52aefcf437a1cce073ee1d2e9df6af4094d2951aab7f9428cfb4bdcbc0",
+                "rlp" : "0xf90338f901fca064ce8a5a23f104ea15d89a77341f3add7a792d217ee10b3ec5edd49bc0889ffca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a061c16140f65e5b77f11006b02613ddb1ae93298ec8d2b465fe67b68be2d7e444a00019e38ffaa68d2f987f151fd0b164c1852f12637e905b0af428510c8862dac3a0677097fffefd8829d4ce155d1efc27a5c192c4dbabe404efde1e6d0a60ee1c11b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82ebae8203e880a090c5106688c3fd0e0131bc6d47384d817ebdee6908faa1dbe1c522f8d945a28b8833e234f7c8bd239bf90135f901328001840527a87b94095e7baea6a6c7c4c2dfeb977efac326af552d8784423dc88ab8cc7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000040313715608f1ba008624e3cbe4a82fee9d61938c3458667dc7adc6cc071a809e0e8502b3068f5b7a025e30d5b52aefcf437a1cce073ee1d2e9df6af4094d2951aab7f9428cfb4bdcbc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000040313715608f",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e49cb8d6a556056a19cab25d6f26def44a65534fc563d93aaa0b42e5a0c5e908a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8a6a8cf33972e4a5591561bbfd8e4592caba7952a55f98e6fe983eb42357d8db",
+        "lastblockhash" : "0x247e203e0699b23d61ec8dead8c4fbbc63679a96adf6729aac1879d9a83de6f3",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x423dc88a",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000040313715608f60005155",
@@ -235,8 +228,8 @@
     "randomStatetest431BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest431BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest431BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xe8a2",
-                    "hash" : "0x8b3d97d190248a926f05345189184161dbde677aa6ab3af2c683db93d6a73ffe",
-                    "mixHash" : "0x16c1edbbbc9d5c04507454afef90b9958c72f26933c4b698d86cce9fcbca1b3a",
-                    "nonce" : "0x876fd8ac4f352631",
+                    "hash" : "0x577a74cee59cc7c9451e9183892ba1c8878a2588fd3203e0800bd43818f96dbf",
+                    "mixHash" : "0x63e23ed7ab14a6bd13c810523d9cae5cf991dd160d331ee39592547b0966021c",
+                    "nonce" : "0x73c88ffa3339b1cf",
                     "number" : "0x01",
                     "parentHash" : "0x64ce8a5a23f104ea15d89a77341f3add7a792d217ee10b3ec5edd49bc0889ffc",
                     "receiptTrie" : "0xc4e13c858dc2e8bdcc370a7df8e1e4a040b7f83ca019141a3fc3be178417519f",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0x0019e38ffaa68d2f987f151fd0b164c1852f12637e905b0af428510c8862dac3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90338f901fca064ce8a5a23f104ea15d89a77341f3add7a792d217ee10b3ec5edd49bc0889ffca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a091c0faae2e30f8107508d6a02db2b639fa3620acffe7f400ee919ccee3ef5ba1a00019e38ffaa68d2f987f151fd0b164c1852f12637e905b0af428510c8862dac3a0c4e13c858dc2e8bdcc370a7df8e1e4a040b7f83ca019141a3fc3be178417519fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82e8a28203e880a016c1edbbbc9d5c04507454afef90b9958c72f26933c4b698d86cce9fcbca1b3a88876fd8ac4f352631f90135f901328001840527a87b94095e7baea6a6c7c4c2dfeb977efac326af552d8784423dc88ab8cc7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000040313715608f1ba008624e3cbe4a82fee9d61938c3458667dc7adc6cc071a809e0e8502b3068f5b7a025e30d5b52aefcf437a1cce073ee1d2e9df6af4094d2951aab7f9428cfb4bdcbc0",
+                "rlp" : "0xf90338f901fca064ce8a5a23f104ea15d89a77341f3add7a792d217ee10b3ec5edd49bc0889ffca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a091c0faae2e30f8107508d6a02db2b639fa3620acffe7f400ee919ccee3ef5ba1a00019e38ffaa68d2f987f151fd0b164c1852f12637e905b0af428510c8862dac3a0c4e13c858dc2e8bdcc370a7df8e1e4a040b7f83ca019141a3fc3be178417519fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82e8a28203e880a063e23ed7ab14a6bd13c810523d9cae5cf991dd160d331ee39592547b0966021c8873c88ffa3339b1cff90135f901328001840527a87b94095e7baea6a6c7c4c2dfeb977efac326af552d8784423dc88ab8cc7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000040313715608f1ba008624e3cbe4a82fee9d61938c3458667dc7adc6cc071a809e0e8502b3068f5b7a025e30d5b52aefcf437a1cce073ee1d2e9df6af4094d2951aab7f9428cfb4bdcbc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000040313715608f",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e49cb8d6a556056a19cab25d6f26def44a65534fc563d93aaa0b42e5a0c5e908a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8b3d97d190248a926f05345189184161dbde677aa6ab3af2c683db93d6a73ffe",
+        "lastblockhash" : "0x577a74cee59cc7c9451e9183892ba1c8878a2588fd3203e0800bd43818f96dbf",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest431BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest431BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest431BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xe8a2",
-                    "hash" : "0xc7d8ec4273cd27b53f0b02e2662a553c391d46c87fbe7be34cf2bfe5b93e3b5b",
-                    "mixHash" : "0xda510f05eb642c3622ad595bb9670625ec8b0e84db793d70e59a3fb4701b61b0",
-                    "nonce" : "0xd18ca8c3113a6557",
+                    "hash" : "0x00e720ab7fe874b6f8c5e1a5696ce6d11cef89b13f70df5749b7acd178c672a7",
+                    "mixHash" : "0xa35d2617ac7540e00207941e7b50b48710a54cd7a431c7fabac64f2a32e16af2",
+                    "nonce" : "0xd158b982c1153e52",
                     "number" : "0x01",
                     "parentHash" : "0x64ce8a5a23f104ea15d89a77341f3add7a792d217ee10b3ec5edd49bc0889ffc",
                     "receiptTrie" : "0xc4e13c858dc2e8bdcc370a7df8e1e4a040b7f83ca019141a3fc3be178417519f",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0x0019e38ffaa68d2f987f151fd0b164c1852f12637e905b0af428510c8862dac3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90338f901fca064ce8a5a23f104ea15d89a77341f3add7a792d217ee10b3ec5edd49bc0889ffca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a091c0faae2e30f8107508d6a02db2b639fa3620acffe7f400ee919ccee3ef5ba1a00019e38ffaa68d2f987f151fd0b164c1852f12637e905b0af428510c8862dac3a0c4e13c858dc2e8bdcc370a7df8e1e4a040b7f83ca019141a3fc3be178417519fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82e8a28203e880a0da510f05eb642c3622ad595bb9670625ec8b0e84db793d70e59a3fb4701b61b088d18ca8c3113a6557f90135f901328001840527a87b94095e7baea6a6c7c4c2dfeb977efac326af552d8784423dc88ab8cc7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000040313715608f1ba008624e3cbe4a82fee9d61938c3458667dc7adc6cc071a809e0e8502b3068f5b7a025e30d5b52aefcf437a1cce073ee1d2e9df6af4094d2951aab7f9428cfb4bdcbc0",
+                "rlp" : "0xf90338f901fca064ce8a5a23f104ea15d89a77341f3add7a792d217ee10b3ec5edd49bc0889ffca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a091c0faae2e30f8107508d6a02db2b639fa3620acffe7f400ee919ccee3ef5ba1a00019e38ffaa68d2f987f151fd0b164c1852f12637e905b0af428510c8862dac3a0c4e13c858dc2e8bdcc370a7df8e1e4a040b7f83ca019141a3fc3be178417519fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82e8a28203e880a0a35d2617ac7540e00207941e7b50b48710a54cd7a431c7fabac64f2a32e16af288d158b982c1153e52f90135f901328001840527a87b94095e7baea6a6c7c4c2dfeb977efac326af552d8784423dc88ab8cc7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000040313715608f1ba008624e3cbe4a82fee9d61938c3458667dc7adc6cc071a809e0e8502b3068f5b7a025e30d5b52aefcf437a1cce073ee1d2e9df6af4094d2951aab7f9428cfb4bdcbc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000040313715608f",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e49cb8d6a556056a19cab25d6f26def44a65534fc563d93aaa0b42e5a0c5e908a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc7d8ec4273cd27b53f0b02e2662a553c391d46c87fbe7be34cf2bfe5b93e3b5b",
+        "lastblockhash" : "0x00e720ab7fe874b6f8c5e1a5696ce6d11cef89b13f70df5749b7acd178c672a7",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest431BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest431BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest431BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xe726",
-                    "hash" : "0x045e40d7644cb388ee57636e62b3c0d57c81f2d5094637ec9ddb1d90eefc6f28",
-                    "mixHash" : "0x9630fa0554d32027e222234ca8af2b233d5d8ccc89f7b68b154edb5c6e911a3f",
-                    "nonce" : "0xdf0c7738e0d57c5e",
+                    "hash" : "0x62fbb85acf01a59d2ca394b3aeb6d64f5274c23433843d9805c6cd786d70ccd5",
+                    "mixHash" : "0xb54e120710fa3400a81a93576195692490b5505b28a20302c0f64828f2ad9782",
+                    "nonce" : "0x6a05042e3d0c52db",
                     "number" : "0x01",
                     "parentHash" : "0x64ce8a5a23f104ea15d89a77341f3add7a792d217ee10b3ec5edd49bc0889ffc",
                     "receiptTrie" : "0x8dc037f92c26b2efb2720329a18f4d6fc1f75c879bf62cdd3c84dfed92da47a9",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0x0019e38ffaa68d2f987f151fd0b164c1852f12637e905b0af428510c8862dac3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90338f901fca064ce8a5a23f104ea15d89a77341f3add7a792d217ee10b3ec5edd49bc0889ffca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a027bd0031282a8e999a9649b63950df895709aceba1bf98e0c1b64bafeda59fb3a00019e38ffaa68d2f987f151fd0b164c1852f12637e905b0af428510c8862dac3a08dc037f92c26b2efb2720329a18f4d6fc1f75c879bf62cdd3c84dfed92da47a9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82e7268203e880a09630fa0554d32027e222234ca8af2b233d5d8ccc89f7b68b154edb5c6e911a3f88df0c7738e0d57c5ef90135f901328001840527a87b94095e7baea6a6c7c4c2dfeb977efac326af552d8784423dc88ab8cc7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000040313715608f1ba008624e3cbe4a82fee9d61938c3458667dc7adc6cc071a809e0e8502b3068f5b7a025e30d5b52aefcf437a1cce073ee1d2e9df6af4094d2951aab7f9428cfb4bdcbc0",
+                "rlp" : "0xf90338f901fca064ce8a5a23f104ea15d89a77341f3add7a792d217ee10b3ec5edd49bc0889ffca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a027bd0031282a8e999a9649b63950df895709aceba1bf98e0c1b64bafeda59fb3a00019e38ffaa68d2f987f151fd0b164c1852f12637e905b0af428510c8862dac3a08dc037f92c26b2efb2720329a18f4d6fc1f75c879bf62cdd3c84dfed92da47a9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82e7268203e880a0b54e120710fa3400a81a93576195692490b5505b28a20302c0f64828f2ad9782886a05042e3d0c52dbf90135f901328001840527a87b94095e7baea6a6c7c4c2dfeb977efac326af552d8784423dc88ab8cc7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000040313715608f1ba008624e3cbe4a82fee9d61938c3458667dc7adc6cc071a809e0e8502b3068f5b7a025e30d5b52aefcf437a1cce073ee1d2e9df6af4094d2951aab7f9428cfb4bdcbc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000040313715608f",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e49cb8d6a556056a19cab25d6f26def44a65534fc563d93aaa0b42e5a0c5e908a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x045e40d7644cb388ee57636e62b3c0d57c81f2d5094637ec9ddb1d90eefc6f28",
+        "lastblockhash" : "0x62fbb85acf01a59d2ca394b3aeb6d64f5274c23433843d9805c6cd786d70ccd5",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest431BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest431BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest431BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xe726",
-                    "hash" : "0x3ed058e6020e314e1cf38568e481a26fa748905b1afb194047078fbb484bdfa3",
-                    "mixHash" : "0x954ab3f6d3e861af2570276c2acfb21e5729d3015e8870747a32c2cf679d136e",
-                    "nonce" : "0x2d50b369516631f5",
+                    "hash" : "0xf4bc28f4b255f98d4e2fea69d0bd3cd5cc9029c03ebc8c224ded7781353ba500",
+                    "mixHash" : "0xd0da610a875dd11019347937aff22c75975991050074b8837a265a509e056a5f",
+                    "nonce" : "0x0d719b7fa9ac3e58",
                     "number" : "0x01",
                     "parentHash" : "0x64ce8a5a23f104ea15d89a77341f3add7a792d217ee10b3ec5edd49bc0889ffc",
                     "receiptTrie" : "0x8dc037f92c26b2efb2720329a18f4d6fc1f75c879bf62cdd3c84dfed92da47a9",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0x0019e38ffaa68d2f987f151fd0b164c1852f12637e905b0af428510c8862dac3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90338f901fca064ce8a5a23f104ea15d89a77341f3add7a792d217ee10b3ec5edd49bc0889ffca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a027bd0031282a8e999a9649b63950df895709aceba1bf98e0c1b64bafeda59fb3a00019e38ffaa68d2f987f151fd0b164c1852f12637e905b0af428510c8862dac3a08dc037f92c26b2efb2720329a18f4d6fc1f75c879bf62cdd3c84dfed92da47a9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82e7268203e880a0954ab3f6d3e861af2570276c2acfb21e5729d3015e8870747a32c2cf679d136e882d50b369516631f5f90135f901328001840527a87b94095e7baea6a6c7c4c2dfeb977efac326af552d8784423dc88ab8cc7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000040313715608f1ba008624e3cbe4a82fee9d61938c3458667dc7adc6cc071a809e0e8502b3068f5b7a025e30d5b52aefcf437a1cce073ee1d2e9df6af4094d2951aab7f9428cfb4bdcbc0",
+                "rlp" : "0xf90338f901fca064ce8a5a23f104ea15d89a77341f3add7a792d217ee10b3ec5edd49bc0889ffca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a027bd0031282a8e999a9649b63950df895709aceba1bf98e0c1b64bafeda59fb3a00019e38ffaa68d2f987f151fd0b164c1852f12637e905b0af428510c8862dac3a08dc037f92c26b2efb2720329a18f4d6fc1f75c879bf62cdd3c84dfed92da47a9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82e7268203e880a0d0da610a875dd11019347937aff22c75975991050074b8837a265a509e056a5f880d719b7fa9ac3e58f90135f901328001840527a87b94095e7baea6a6c7c4c2dfeb977efac326af552d8784423dc88ab8cc7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000040313715608f1ba008624e3cbe4a82fee9d61938c3458667dc7adc6cc071a809e0e8502b3068f5b7a025e30d5b52aefcf437a1cce073ee1d2e9df6af4094d2951aab7f9428cfb4bdcbc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000040313715608f",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e49cb8d6a556056a19cab25d6f26def44a65534fc563d93aaa0b42e5a0c5e908a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3ed058e6020e314e1cf38568e481a26fa748905b1afb194047078fbb484bdfa3",
+        "lastblockhash" : "0xf4bc28f4b255f98d4e2fea69d0bd3cd5cc9029c03ebc8c224ded7781353ba500",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest432BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest432BC.json
index b856c3b14..450f6e46a 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest432BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest432BC.json
@@ -2,8 +2,8 @@
     "randomStatetest432BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest432BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest432BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6cc7",
-                    "hash" : "0xe1d67164209c3ee6739eafcc71b882841639ea591da36c84abf831dd6b42cae3",
-                    "mixHash" : "0x853484a99344d381983593e577c465dbca63228778eb07fa8b7d2fd328daf29b",
-                    "nonce" : "0xddce41c4e3e213b9",
+                    "hash" : "0x3e1a48360d0ab257da49e56f1b960bac0658128638129527147fde9056446499",
+                    "mixHash" : "0x1f2b102fef5d8335543855a165bf53140b7d04b49801b6f9243015c5bc832df2",
+                    "nonce" : "0x77d72e92cca4a075",
                     "number" : "0x01",
                     "parentHash" : "0xd24151291b8e6704268fe6dea7efee84f8202c11da5204fda52ad1d215c54610",
                     "receiptTrie" : "0x83104154fe87f5bd011fd1ed8e92a9c5f5e27312f975228de8b5c2a09e22cf9f",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xb68302a852fb54c3feb4c20529e3110100060e2a634e646ddf6a17649dc3ef50",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9035cf901fca0d24151291b8e6704268fe6dea7efee84f8202c11da5204fda52ad1d215c54610a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00f9ced5ce5d5c50093402bed5cda2bd8eaa02120acfb5d9bdf8c64d97013a282a0b68302a852fb54c3feb4c20529e3110100060e2a634e646ddf6a17649dc3ef50a083104154fe87f5bd011fd1ed8e92a9c5f5e27312f975228de8b5c2a09e22cf9fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826cc78203e880a0853484a99344d381983593e577c465dbca63228778eb07fa8b7d2fd328daf29b88ddce41c4e3e213b9f90159f901568001840f965a5a94095e7baea6a6c7c4c2dfeb977efac326af552d87840fc428f1b8f07f0000000000000000000000000000000000000000000000000000000000000000407f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0904517241a273071ba043f09eda2d9d74c41a444ce0e159738608d22ed6becc566bbb469665c89b56eca0506cbb232757c23afdb60c163eef27b70b31b253775b91ceeb1f2bae5b0cad62c0",
+                "rlp" : "0xf9035cf901fca0d24151291b8e6704268fe6dea7efee84f8202c11da5204fda52ad1d215c54610a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00f9ced5ce5d5c50093402bed5cda2bd8eaa02120acfb5d9bdf8c64d97013a282a0b68302a852fb54c3feb4c20529e3110100060e2a634e646ddf6a17649dc3ef50a083104154fe87f5bd011fd1ed8e92a9c5f5e27312f975228de8b5c2a09e22cf9fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826cc78203e880a01f2b102fef5d8335543855a165bf53140b7d04b49801b6f9243015c5bc832df28877d72e92cca4a075f90159f901568001840f965a5a94095e7baea6a6c7c4c2dfeb977efac326af552d87840fc428f1b8f07f0000000000000000000000000000000000000000000000000000000000000000407f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0904517241a273071ba043f09eda2d9d74c41a444ce0e159738608d22ed6becc566bbb469665c89b56eca0506cbb232757c23afdb60c163eef27b70b31b253775b91ceeb1f2bae5b0cad62c0",
                 "transactions" : [
                     {
                         "data" : "0x7f0000000000000000000000000000000000000000000000000000000000000000407f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0904517241a27307",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0da4ee7e135ef3e291d9d76be609b65b0e478110f552a5fbd233a83bd962c6e1fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe1d67164209c3ee6739eafcc71b882841639ea591da36c84abf831dd6b42cae3",
+        "lastblockhash" : "0x3e1a48360d0ab257da49e56f1b960bac0658128638129527147fde9056446499",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest432BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest432BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest432BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6fd3",
-                    "hash" : "0x47b36c47ed551e649666b74c911ab4afc3e6bc8ee91bfe58eb0f2af130e9f7be",
-                    "mixHash" : "0xb3225d96f1571adda76e612f38f9cb79cbc874579dbf9615c88c95a9b1af9504",
-                    "nonce" : "0x032bce4d3cc27691",
+                    "hash" : "0x58761ad7b454170991dcbd4601903d4bd1c185464bcc4f88aa0b2852a430f594",
+                    "mixHash" : "0x286a41a75ca3784ea71894bb41919cf6c31eb8124a914ac27451bb13262e73aa",
+                    "nonce" : "0xd4fc5099a8a16e41",
                     "number" : "0x01",
                     "parentHash" : "0xd24151291b8e6704268fe6dea7efee84f8202c11da5204fda52ad1d215c54610",
                     "receiptTrie" : "0xce47568d0f94fbcf211536239c79b6493d7bb3e242c4c25a83b2386c80be7348",
-                    "stateRoot" : "0xb7c7d105ec3bce86dfa9c027e811f79bead4fd0772748d7fef2cee6bfdac1d38",
+                    "stateRoot" : "0xfd50093a07ca17e1f34e5f938cb98d2351ee7bf2d947be51c8845dfc6484526f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb68302a852fb54c3feb4c20529e3110100060e2a634e646ddf6a17649dc3ef50",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9035cf901fca0d24151291b8e6704268fe6dea7efee84f8202c11da5204fda52ad1d215c54610a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b7c7d105ec3bce86dfa9c027e811f79bead4fd0772748d7fef2cee6bfdac1d38a0b68302a852fb54c3feb4c20529e3110100060e2a634e646ddf6a17649dc3ef50a0ce47568d0f94fbcf211536239c79b6493d7bb3e242c4c25a83b2386c80be7348b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826fd38203e880a0b3225d96f1571adda76e612f38f9cb79cbc874579dbf9615c88c95a9b1af950488032bce4d3cc27691f90159f901568001840f965a5a94095e7baea6a6c7c4c2dfeb977efac326af552d87840fc428f1b8f07f0000000000000000000000000000000000000000000000000000000000000000407f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0904517241a273071ba043f09eda2d9d74c41a444ce0e159738608d22ed6becc566bbb469665c89b56eca0506cbb232757c23afdb60c163eef27b70b31b253775b91ceeb1f2bae5b0cad62c0",
+                "rlp" : "0xf9035cf901fca0d24151291b8e6704268fe6dea7efee84f8202c11da5204fda52ad1d215c54610a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fd50093a07ca17e1f34e5f938cb98d2351ee7bf2d947be51c8845dfc6484526fa0b68302a852fb54c3feb4c20529e3110100060e2a634e646ddf6a17649dc3ef50a0ce47568d0f94fbcf211536239c79b6493d7bb3e242c4c25a83b2386c80be7348b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826fd38203e880a0286a41a75ca3784ea71894bb41919cf6c31eb8124a914ac27451bb13262e73aa88d4fc5099a8a16e41f90159f901568001840f965a5a94095e7baea6a6c7c4c2dfeb977efac326af552d87840fc428f1b8f07f0000000000000000000000000000000000000000000000000000000000000000407f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0904517241a273071ba043f09eda2d9d74c41a444ce0e159738608d22ed6becc566bbb469665c89b56eca0506cbb232757c23afdb60c163eef27b70b31b253775b91ceeb1f2bae5b0cad62c0",
                 "transactions" : [
                     {
                         "data" : "0x7f0000000000000000000000000000000000000000000000000000000000000000407f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0904517241a27307",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0da4ee7e135ef3e291d9d76be609b65b0e478110f552a5fbd233a83bd962c6e1fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x47b36c47ed551e649666b74c911ab4afc3e6bc8ee91bfe58eb0f2af130e9f7be",
+        "lastblockhash" : "0x58761ad7b454170991dcbd4601903d4bd1c185464bcc4f88aa0b2852a430f594",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0fc428f1",
                 "code" : "0x7f0000000000000000000000000000000000000000000000000000000000000000407f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0904517241a27307",
@@ -233,8 +226,8 @@
     "randomStatetest432BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest432BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest432BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6cc7",
-                    "hash" : "0x3c0fa6f32ccaf579674ee11f11d1e1d5dea9de3db95e70ed771f837e4098ed0e",
-                    "mixHash" : "0xe81de39d63542356ec6cb6524a38304725a6fb5f6e1ef7c9e7987d6e215a9c7a",
-                    "nonce" : "0xf2bf4a57d4a0d2f3",
+                    "hash" : "0x121fbc19314926544065dd5de17b80379795efdff12ade4afb6194a81751c6c8",
+                    "mixHash" : "0x307cf90c0fc3bfb19a5697a93dee88ba95697d166804a5c249560b060d4b90a5",
+                    "nonce" : "0xef8572f77ecd43b9",
                     "number" : "0x01",
                     "parentHash" : "0xd24151291b8e6704268fe6dea7efee84f8202c11da5204fda52ad1d215c54610",
                     "receiptTrie" : "0x84fac58a05c9185a999ca3d8575e9125663637d9ef36ea05fe66c84a1c5ff9be",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0xb68302a852fb54c3feb4c20529e3110100060e2a634e646ddf6a17649dc3ef50",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9035cf901fca0d24151291b8e6704268fe6dea7efee84f8202c11da5204fda52ad1d215c54610a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0de5bc078fd84ab1b4832eb0fe7d205ebb7a88482cacf1a23cfac55b9a0f51a34a0b68302a852fb54c3feb4c20529e3110100060e2a634e646ddf6a17649dc3ef50a084fac58a05c9185a999ca3d8575e9125663637d9ef36ea05fe66c84a1c5ff9beb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826cc78203e880a0e81de39d63542356ec6cb6524a38304725a6fb5f6e1ef7c9e7987d6e215a9c7a88f2bf4a57d4a0d2f3f90159f901568001840f965a5a94095e7baea6a6c7c4c2dfeb977efac326af552d87840fc428f1b8f07f0000000000000000000000000000000000000000000000000000000000000000407f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0904517241a273071ba043f09eda2d9d74c41a444ce0e159738608d22ed6becc566bbb469665c89b56eca0506cbb232757c23afdb60c163eef27b70b31b253775b91ceeb1f2bae5b0cad62c0",
+                "rlp" : "0xf9035cf901fca0d24151291b8e6704268fe6dea7efee84f8202c11da5204fda52ad1d215c54610a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0de5bc078fd84ab1b4832eb0fe7d205ebb7a88482cacf1a23cfac55b9a0f51a34a0b68302a852fb54c3feb4c20529e3110100060e2a634e646ddf6a17649dc3ef50a084fac58a05c9185a999ca3d8575e9125663637d9ef36ea05fe66c84a1c5ff9beb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826cc78203e880a0307cf90c0fc3bfb19a5697a93dee88ba95697d166804a5c249560b060d4b90a588ef8572f77ecd43b9f90159f901568001840f965a5a94095e7baea6a6c7c4c2dfeb977efac326af552d87840fc428f1b8f07f0000000000000000000000000000000000000000000000000000000000000000407f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0904517241a273071ba043f09eda2d9d74c41a444ce0e159738608d22ed6becc566bbb469665c89b56eca0506cbb232757c23afdb60c163eef27b70b31b253775b91ceeb1f2bae5b0cad62c0",
                 "transactions" : [
                     {
                         "data" : "0x7f0000000000000000000000000000000000000000000000000000000000000000407f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0904517241a27307",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0da4ee7e135ef3e291d9d76be609b65b0e478110f552a5fbd233a83bd962c6e1fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3c0fa6f32ccaf579674ee11f11d1e1d5dea9de3db95e70ed771f837e4098ed0e",
+        "lastblockhash" : "0x121fbc19314926544065dd5de17b80379795efdff12ade4afb6194a81751c6c8",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest432BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest432BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest432BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6cc7",
-                    "hash" : "0x45dfd5e88eb328cbdc2b1adce9de1b2830fd8cc0b6521345f83430e22004e16f",
-                    "mixHash" : "0x1ec6c6e74260904cc44790c9ff350f8a19e3e0f230638193a7bd74f20df42dfc",
-                    "nonce" : "0x43f33782d6c76df1",
+                    "hash" : "0xc4a66f94acd4ff2303b466add49255614b12b86faed649f8765d563e9e859b94",
+                    "mixHash" : "0x3a9458701f49dd0f55a202ce31cda1e0a19af221ef586cf5655ecb957260ab16",
+                    "nonce" : "0xff26f3d29a414a95",
                     "number" : "0x01",
                     "parentHash" : "0xd24151291b8e6704268fe6dea7efee84f8202c11da5204fda52ad1d215c54610",
                     "receiptTrie" : "0x84fac58a05c9185a999ca3d8575e9125663637d9ef36ea05fe66c84a1c5ff9be",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0xb68302a852fb54c3feb4c20529e3110100060e2a634e646ddf6a17649dc3ef50",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9035cf901fca0d24151291b8e6704268fe6dea7efee84f8202c11da5204fda52ad1d215c54610a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0de5bc078fd84ab1b4832eb0fe7d205ebb7a88482cacf1a23cfac55b9a0f51a34a0b68302a852fb54c3feb4c20529e3110100060e2a634e646ddf6a17649dc3ef50a084fac58a05c9185a999ca3d8575e9125663637d9ef36ea05fe66c84a1c5ff9beb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826cc78203e880a01ec6c6e74260904cc44790c9ff350f8a19e3e0f230638193a7bd74f20df42dfc8843f33782d6c76df1f90159f901568001840f965a5a94095e7baea6a6c7c4c2dfeb977efac326af552d87840fc428f1b8f07f0000000000000000000000000000000000000000000000000000000000000000407f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0904517241a273071ba043f09eda2d9d74c41a444ce0e159738608d22ed6becc566bbb469665c89b56eca0506cbb232757c23afdb60c163eef27b70b31b253775b91ceeb1f2bae5b0cad62c0",
+                "rlp" : "0xf9035cf901fca0d24151291b8e6704268fe6dea7efee84f8202c11da5204fda52ad1d215c54610a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0de5bc078fd84ab1b4832eb0fe7d205ebb7a88482cacf1a23cfac55b9a0f51a34a0b68302a852fb54c3feb4c20529e3110100060e2a634e646ddf6a17649dc3ef50a084fac58a05c9185a999ca3d8575e9125663637d9ef36ea05fe66c84a1c5ff9beb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826cc78203e880a03a9458701f49dd0f55a202ce31cda1e0a19af221ef586cf5655ecb957260ab1688ff26f3d29a414a95f90159f901568001840f965a5a94095e7baea6a6c7c4c2dfeb977efac326af552d87840fc428f1b8f07f0000000000000000000000000000000000000000000000000000000000000000407f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0904517241a273071ba043f09eda2d9d74c41a444ce0e159738608d22ed6becc566bbb469665c89b56eca0506cbb232757c23afdb60c163eef27b70b31b253775b91ceeb1f2bae5b0cad62c0",
                 "transactions" : [
                     {
                         "data" : "0x7f0000000000000000000000000000000000000000000000000000000000000000407f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0904517241a27307",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0da4ee7e135ef3e291d9d76be609b65b0e478110f552a5fbd233a83bd962c6e1fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x45dfd5e88eb328cbdc2b1adce9de1b2830fd8cc0b6521345f83430e22004e16f",
+        "lastblockhash" : "0xc4a66f94acd4ff2303b466add49255614b12b86faed649f8765d563e9e859b94",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest432BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest432BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest432BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6cc7",
-                    "hash" : "0x19ba1c21a0845db9e17fc13b70d2b88433b98038338c80d50723b757a8b09727",
-                    "mixHash" : "0xf970d8f52efc87ec530ef9d80405738ae084c64232aac3921235eb164a3b3ff8",
-                    "nonce" : "0x3b726c93604daf07",
+                    "hash" : "0x66405940952e6f2fee441756aae09618eaa4020e441cf77ab8569a9f2fd7ebe9",
+                    "mixHash" : "0xf3d60c97fe3967649ac16d21b679d9f70c2162fc3f4680291a0cb353ad383969",
+                    "nonce" : "0xa34189e4dc1ab38c",
                     "number" : "0x01",
                     "parentHash" : "0xd24151291b8e6704268fe6dea7efee84f8202c11da5204fda52ad1d215c54610",
                     "receiptTrie" : "0x84fac58a05c9185a999ca3d8575e9125663637d9ef36ea05fe66c84a1c5ff9be",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0xb68302a852fb54c3feb4c20529e3110100060e2a634e646ddf6a17649dc3ef50",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9035cf901fca0d24151291b8e6704268fe6dea7efee84f8202c11da5204fda52ad1d215c54610a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0de5bc078fd84ab1b4832eb0fe7d205ebb7a88482cacf1a23cfac55b9a0f51a34a0b68302a852fb54c3feb4c20529e3110100060e2a634e646ddf6a17649dc3ef50a084fac58a05c9185a999ca3d8575e9125663637d9ef36ea05fe66c84a1c5ff9beb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826cc78203e880a0f970d8f52efc87ec530ef9d80405738ae084c64232aac3921235eb164a3b3ff8883b726c93604daf07f90159f901568001840f965a5a94095e7baea6a6c7c4c2dfeb977efac326af552d87840fc428f1b8f07f0000000000000000000000000000000000000000000000000000000000000000407f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0904517241a273071ba043f09eda2d9d74c41a444ce0e159738608d22ed6becc566bbb469665c89b56eca0506cbb232757c23afdb60c163eef27b70b31b253775b91ceeb1f2bae5b0cad62c0",
+                "rlp" : "0xf9035cf901fca0d24151291b8e6704268fe6dea7efee84f8202c11da5204fda52ad1d215c54610a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0de5bc078fd84ab1b4832eb0fe7d205ebb7a88482cacf1a23cfac55b9a0f51a34a0b68302a852fb54c3feb4c20529e3110100060e2a634e646ddf6a17649dc3ef50a084fac58a05c9185a999ca3d8575e9125663637d9ef36ea05fe66c84a1c5ff9beb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826cc78203e880a0f3d60c97fe3967649ac16d21b679d9f70c2162fc3f4680291a0cb353ad38396988a34189e4dc1ab38cf90159f901568001840f965a5a94095e7baea6a6c7c4c2dfeb977efac326af552d87840fc428f1b8f07f0000000000000000000000000000000000000000000000000000000000000000407f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0904517241a273071ba043f09eda2d9d74c41a444ce0e159738608d22ed6becc566bbb469665c89b56eca0506cbb232757c23afdb60c163eef27b70b31b253775b91ceeb1f2bae5b0cad62c0",
                 "transactions" : [
                     {
                         "data" : "0x7f0000000000000000000000000000000000000000000000000000000000000000407f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0904517241a27307",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0da4ee7e135ef3e291d9d76be609b65b0e478110f552a5fbd233a83bd962c6e1fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x19ba1c21a0845db9e17fc13b70d2b88433b98038338c80d50723b757a8b09727",
+        "lastblockhash" : "0x66405940952e6f2fee441756aae09618eaa4020e441cf77ab8569a9f2fd7ebe9",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest432BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest432BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest432BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6cc7",
-                    "hash" : "0x8a615bccbb24c47b55de8ece8a3476985dd675722bca9d114250d53c36bf48bc",
-                    "mixHash" : "0x72e03a22bb747fb74cbece4f5c0de5cfa96d7fc688e63f173240c60ae21f9521",
-                    "nonce" : "0x13ab977ef4a5a4a0",
+                    "hash" : "0xd4007d814d314040805fa210d64abebc6018ecd1edff8ebb2947de841f8299e6",
+                    "mixHash" : "0x0c1765b4a519861f1fe448213166e04f74d8c5c1f00089000e6003d8f724fc04",
+                    "nonce" : "0x41b7ca51a4d17ce7",
                     "number" : "0x01",
                     "parentHash" : "0xd24151291b8e6704268fe6dea7efee84f8202c11da5204fda52ad1d215c54610",
                     "receiptTrie" : "0x84fac58a05c9185a999ca3d8575e9125663637d9ef36ea05fe66c84a1c5ff9be",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0xb68302a852fb54c3feb4c20529e3110100060e2a634e646ddf6a17649dc3ef50",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9035cf901fca0d24151291b8e6704268fe6dea7efee84f8202c11da5204fda52ad1d215c54610a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0de5bc078fd84ab1b4832eb0fe7d205ebb7a88482cacf1a23cfac55b9a0f51a34a0b68302a852fb54c3feb4c20529e3110100060e2a634e646ddf6a17649dc3ef50a084fac58a05c9185a999ca3d8575e9125663637d9ef36ea05fe66c84a1c5ff9beb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826cc78203e880a072e03a22bb747fb74cbece4f5c0de5cfa96d7fc688e63f173240c60ae21f95218813ab977ef4a5a4a0f90159f901568001840f965a5a94095e7baea6a6c7c4c2dfeb977efac326af552d87840fc428f1b8f07f0000000000000000000000000000000000000000000000000000000000000000407f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0904517241a273071ba043f09eda2d9d74c41a444ce0e159738608d22ed6becc566bbb469665c89b56eca0506cbb232757c23afdb60c163eef27b70b31b253775b91ceeb1f2bae5b0cad62c0",
+                "rlp" : "0xf9035cf901fca0d24151291b8e6704268fe6dea7efee84f8202c11da5204fda52ad1d215c54610a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0de5bc078fd84ab1b4832eb0fe7d205ebb7a88482cacf1a23cfac55b9a0f51a34a0b68302a852fb54c3feb4c20529e3110100060e2a634e646ddf6a17649dc3ef50a084fac58a05c9185a999ca3d8575e9125663637d9ef36ea05fe66c84a1c5ff9beb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826cc78203e880a00c1765b4a519861f1fe448213166e04f74d8c5c1f00089000e6003d8f724fc048841b7ca51a4d17ce7f90159f901568001840f965a5a94095e7baea6a6c7c4c2dfeb977efac326af552d87840fc428f1b8f07f0000000000000000000000000000000000000000000000000000000000000000407f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0904517241a273071ba043f09eda2d9d74c41a444ce0e159738608d22ed6becc566bbb469665c89b56eca0506cbb232757c23afdb60c163eef27b70b31b253775b91ceeb1f2bae5b0cad62c0",
                 "transactions" : [
                     {
                         "data" : "0x7f0000000000000000000000000000000000000000000000000000000000000000407f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0904517241a27307",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0da4ee7e135ef3e291d9d76be609b65b0e478110f552a5fbd233a83bd962c6e1fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8a615bccbb24c47b55de8ece8a3476985dd675722bca9d114250d53c36bf48bc",
+        "lastblockhash" : "0xd4007d814d314040805fa210d64abebc6018ecd1edff8ebb2947de841f8299e6",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest434BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest434BC.json
index ac53b3a71..85cbcfb8c 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest434BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest434BC.json
@@ -2,8 +2,8 @@
     "randomStatetest434BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest434BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest434BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xbc29",
-                    "hash" : "0xc41764e89ed5b8f296c92438a82c1232b2ff835ab5589c7421ae66ee22db53e1",
-                    "mixHash" : "0xb8ef6485839cd16b427d946c33944baa85ab21eb2e854f5063f35a6179580d40",
-                    "nonce" : "0xe46ebe551a02bc58",
+                    "hash" : "0xb81630524efa82478c0a39691d10f5dccf37c392ecf76f7dfb6625ed41229d2d",
+                    "mixHash" : "0xe9c2c6bf912513398a80a72380ef779f0c2e8fdd0cebb690010569439d6398e9",
+                    "nonce" : "0x0b8c5840b7d3187f",
                     "number" : "0x01",
                     "parentHash" : "0x8befa087298b41da6713018fa9268d3af350cda6aa79a2eb6ecca61acc8f72b3",
                     "receiptTrie" : "0x645b875e5a4f073964e1c0636659e9b84e15049320c5bf674c83fdb3ddc72b1e",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xf606b1d3575e48881a517fe5ac5e64515b734c3ffa159940d42cf0067927305a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90342f901fca08befa087298b41da6713018fa9268d3af350cda6aa79a2eb6ecca61acc8f72b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01ab9f8ebf32bfd25472a4c2ee6c54b1fdf2a7f06e5427afc0c10e8cd05c509d4a0f606b1d3575e48881a517fe5ac5e64515b734c3ffa159940d42cf0067927305aa0645b875e5a4f073964e1c0636659e9b84e15049320c5bf674c83fdb3ddc72b1eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bc298203e880a0b8ef6485839cd16b427d946c33944baa85ab21eb2e854f5063f35a6179580d4088e46ebe551a02bc58f9013ff9013c8001847178c09494095e7baea6a6c7c4c2dfeb977efac326af552d87843684af3db8d67f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5f30264613617a2975a6857606f551ca0877d353724fb6800ddeff2ce291800141b1e827cbe4e6b1775e98ed5a156d81ba058e98a7125198baf76cc0cad8a7b84c9652f7ac6c634655e9104f468df6d59e9c0",
+                "rlp" : "0xf90342f901fca08befa087298b41da6713018fa9268d3af350cda6aa79a2eb6ecca61acc8f72b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01ab9f8ebf32bfd25472a4c2ee6c54b1fdf2a7f06e5427afc0c10e8cd05c509d4a0f606b1d3575e48881a517fe5ac5e64515b734c3ffa159940d42cf0067927305aa0645b875e5a4f073964e1c0636659e9b84e15049320c5bf674c83fdb3ddc72b1eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bc298203e880a0e9c2c6bf912513398a80a72380ef779f0c2e8fdd0cebb690010569439d6398e9880b8c5840b7d3187ff9013ff9013c8001847178c09494095e7baea6a6c7c4c2dfeb977efac326af552d87843684af3db8d67f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5f30264613617a2975a6857606f551ca0877d353724fb6800ddeff2ce291800141b1e827cbe4e6b1775e98ed5a156d81ba058e98a7125198baf76cc0cad8a7b84c9652f7ac6c634655e9104f468df6d59e9c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5f30264613617a2975a6857606f55",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07f172197846bc31d838420b2216439233ffba142cd6d1233981e106036b5fcefa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc41764e89ed5b8f296c92438a82c1232b2ff835ab5589c7421ae66ee22db53e1",
+        "lastblockhash" : "0xb81630524efa82478c0a39691d10f5dccf37c392ecf76f7dfb6625ed41229d2d",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest434BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest434BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest434BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xbf35",
-                    "hash" : "0xce6b06ae201ec700c71395d01cd947f5e1f497bb2f1192e0562b7764662613c4",
-                    "mixHash" : "0x851b35308735c67eee1ea2bdad86a0ea8954dce99f4ad1a82368805d647fc699",
-                    "nonce" : "0xda196fb3d5b42b85",
+                    "hash" : "0x5609f4845de20ee8190c5ed75614994ca0ca09fd042d679f0ddb160fbd647fbc",
+                    "mixHash" : "0xab4b00092ae289e6ad6cf355bbb46d7885aeab85cd2f72b9c561220269cb67d8",
+                    "nonce" : "0x5ab37ae2363b84c2",
                     "number" : "0x01",
                     "parentHash" : "0x8befa087298b41da6713018fa9268d3af350cda6aa79a2eb6ecca61acc8f72b3",
                     "receiptTrie" : "0xff0c65056c53cfb1e6e2eb4f4e4c247b3727f86ad2075c4611bfbf20b27dfd35",
-                    "stateRoot" : "0x8d2e8addd71d8acf22f694d445bd966211ac884a6cdd1365444c259081ef1988",
+                    "stateRoot" : "0xc79a8ab1c931056d4d4e4cb30fdd56a525b506cc42a47c3c00837d9548561f5a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf606b1d3575e48881a517fe5ac5e64515b734c3ffa159940d42cf0067927305a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90342f901fca08befa087298b41da6713018fa9268d3af350cda6aa79a2eb6ecca61acc8f72b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08d2e8addd71d8acf22f694d445bd966211ac884a6cdd1365444c259081ef1988a0f606b1d3575e48881a517fe5ac5e64515b734c3ffa159940d42cf0067927305aa0ff0c65056c53cfb1e6e2eb4f4e4c247b3727f86ad2075c4611bfbf20b27dfd35b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bf358203e880a0851b35308735c67eee1ea2bdad86a0ea8954dce99f4ad1a82368805d647fc69988da196fb3d5b42b85f9013ff9013c8001847178c09494095e7baea6a6c7c4c2dfeb977efac326af552d87843684af3db8d67f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5f30264613617a2975a6857606f551ca0877d353724fb6800ddeff2ce291800141b1e827cbe4e6b1775e98ed5a156d81ba058e98a7125198baf76cc0cad8a7b84c9652f7ac6c634655e9104f468df6d59e9c0",
+                "rlp" : "0xf90342f901fca08befa087298b41da6713018fa9268d3af350cda6aa79a2eb6ecca61acc8f72b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c79a8ab1c931056d4d4e4cb30fdd56a525b506cc42a47c3c00837d9548561f5aa0f606b1d3575e48881a517fe5ac5e64515b734c3ffa159940d42cf0067927305aa0ff0c65056c53cfb1e6e2eb4f4e4c247b3727f86ad2075c4611bfbf20b27dfd35b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bf358203e880a0ab4b00092ae289e6ad6cf355bbb46d7885aeab85cd2f72b9c561220269cb67d8885ab37ae2363b84c2f9013ff9013c8001847178c09494095e7baea6a6c7c4c2dfeb977efac326af552d87843684af3db8d67f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5f30264613617a2975a6857606f551ca0877d353724fb6800ddeff2ce291800141b1e827cbe4e6b1775e98ed5a156d81ba058e98a7125198baf76cc0cad8a7b84c9652f7ac6c634655e9104f468df6d59e9c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5f30264613617a2975a6857606f55",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07f172197846bc31d838420b2216439233ffba142cd6d1233981e106036b5fcefa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xce6b06ae201ec700c71395d01cd947f5e1f497bb2f1192e0562b7764662613c4",
+        "lastblockhash" : "0x5609f4845de20ee8190c5ed75614994ca0ca09fd042d679f0ddb160fbd647fbc",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x3684af3d",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5f30264613617a2975a6857606f5560005155",
@@ -235,8 +228,8 @@
     "randomStatetest434BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest434BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest434BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xbc29",
-                    "hash" : "0x0bed9d5109b2cd97eb0cc4b011ba4460b6f5628924966faa7cbf7137046f09c4",
-                    "mixHash" : "0x34792b587a2ccd737c5a246eaa4f6e7ee2487f08852f8f92d0a5f5ff5c70f15c",
-                    "nonce" : "0x871fa0cdf27b8c7a",
+                    "hash" : "0x567b998155ae00216e479cf6fbae9f26539d3ee0db227d30dd9c9292bcfff499",
+                    "mixHash" : "0x909c503622b08376503d2255cd25cbf6ddd3e6a40daa16c429b04ed02ab0d980",
+                    "nonce" : "0x2d46dc8fac3fae91",
                     "number" : "0x01",
                     "parentHash" : "0x8befa087298b41da6713018fa9268d3af350cda6aa79a2eb6ecca61acc8f72b3",
                     "receiptTrie" : "0x46155cb688df890c438168234fe0e34064cbbcb799957feabc5af69a66c481ce",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xf606b1d3575e48881a517fe5ac5e64515b734c3ffa159940d42cf0067927305a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90342f901fca08befa087298b41da6713018fa9268d3af350cda6aa79a2eb6ecca61acc8f72b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0012839bdf8e53dac2abf1d1d071f258b3e8fef1384ee8a143f328d0e4542c2d4a0f606b1d3575e48881a517fe5ac5e64515b734c3ffa159940d42cf0067927305aa046155cb688df890c438168234fe0e34064cbbcb799957feabc5af69a66c481ceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bc298203e880a034792b587a2ccd737c5a246eaa4f6e7ee2487f08852f8f92d0a5f5ff5c70f15c88871fa0cdf27b8c7af9013ff9013c8001847178c09494095e7baea6a6c7c4c2dfeb977efac326af552d87843684af3db8d67f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5f30264613617a2975a6857606f551ca0877d353724fb6800ddeff2ce291800141b1e827cbe4e6b1775e98ed5a156d81ba058e98a7125198baf76cc0cad8a7b84c9652f7ac6c634655e9104f468df6d59e9c0",
+                "rlp" : "0xf90342f901fca08befa087298b41da6713018fa9268d3af350cda6aa79a2eb6ecca61acc8f72b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0012839bdf8e53dac2abf1d1d071f258b3e8fef1384ee8a143f328d0e4542c2d4a0f606b1d3575e48881a517fe5ac5e64515b734c3ffa159940d42cf0067927305aa046155cb688df890c438168234fe0e34064cbbcb799957feabc5af69a66c481ceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bc298203e880a0909c503622b08376503d2255cd25cbf6ddd3e6a40daa16c429b04ed02ab0d980882d46dc8fac3fae91f9013ff9013c8001847178c09494095e7baea6a6c7c4c2dfeb977efac326af552d87843684af3db8d67f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5f30264613617a2975a6857606f551ca0877d353724fb6800ddeff2ce291800141b1e827cbe4e6b1775e98ed5a156d81ba058e98a7125198baf76cc0cad8a7b84c9652f7ac6c634655e9104f468df6d59e9c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5f30264613617a2975a6857606f55",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07f172197846bc31d838420b2216439233ffba142cd6d1233981e106036b5fcefa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0bed9d5109b2cd97eb0cc4b011ba4460b6f5628924966faa7cbf7137046f09c4",
+        "lastblockhash" : "0x567b998155ae00216e479cf6fbae9f26539d3ee0db227d30dd9c9292bcfff499",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest434BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest434BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest434BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xbc29",
-                    "hash" : "0xab16dd705194877d99135a6116d5ecc3687ccff9741173f80c7807dd411bfbdf",
-                    "mixHash" : "0xef223ace9e8ecb48673db64106e612616719377b56ed7d4b32d9140c55b0a3a8",
-                    "nonce" : "0x32c86f7ea12ff03a",
+                    "hash" : "0x990fadbe9beb342a74bd8e76ea833fb88a44b01eac913524df7d58c63b80a51e",
+                    "mixHash" : "0xd64d763f79743d9132562e01ae734f1861eb6fb935d126ea20b23e0857c8e7fd",
+                    "nonce" : "0x219fda4c09b447d4",
                     "number" : "0x01",
                     "parentHash" : "0x8befa087298b41da6713018fa9268d3af350cda6aa79a2eb6ecca61acc8f72b3",
                     "receiptTrie" : "0x46155cb688df890c438168234fe0e34064cbbcb799957feabc5af69a66c481ce",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xf606b1d3575e48881a517fe5ac5e64515b734c3ffa159940d42cf0067927305a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90342f901fca08befa087298b41da6713018fa9268d3af350cda6aa79a2eb6ecca61acc8f72b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0012839bdf8e53dac2abf1d1d071f258b3e8fef1384ee8a143f328d0e4542c2d4a0f606b1d3575e48881a517fe5ac5e64515b734c3ffa159940d42cf0067927305aa046155cb688df890c438168234fe0e34064cbbcb799957feabc5af69a66c481ceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bc298203e880a0ef223ace9e8ecb48673db64106e612616719377b56ed7d4b32d9140c55b0a3a88832c86f7ea12ff03af9013ff9013c8001847178c09494095e7baea6a6c7c4c2dfeb977efac326af552d87843684af3db8d67f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5f30264613617a2975a6857606f551ca0877d353724fb6800ddeff2ce291800141b1e827cbe4e6b1775e98ed5a156d81ba058e98a7125198baf76cc0cad8a7b84c9652f7ac6c634655e9104f468df6d59e9c0",
+                "rlp" : "0xf90342f901fca08befa087298b41da6713018fa9268d3af350cda6aa79a2eb6ecca61acc8f72b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0012839bdf8e53dac2abf1d1d071f258b3e8fef1384ee8a143f328d0e4542c2d4a0f606b1d3575e48881a517fe5ac5e64515b734c3ffa159940d42cf0067927305aa046155cb688df890c438168234fe0e34064cbbcb799957feabc5af69a66c481ceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bc298203e880a0d64d763f79743d9132562e01ae734f1861eb6fb935d126ea20b23e0857c8e7fd88219fda4c09b447d4f9013ff9013c8001847178c09494095e7baea6a6c7c4c2dfeb977efac326af552d87843684af3db8d67f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5f30264613617a2975a6857606f551ca0877d353724fb6800ddeff2ce291800141b1e827cbe4e6b1775e98ed5a156d81ba058e98a7125198baf76cc0cad8a7b84c9652f7ac6c634655e9104f468df6d59e9c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5f30264613617a2975a6857606f55",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07f172197846bc31d838420b2216439233ffba142cd6d1233981e106036b5fcefa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xab16dd705194877d99135a6116d5ecc3687ccff9741173f80c7807dd411bfbdf",
+        "lastblockhash" : "0x990fadbe9beb342a74bd8e76ea833fb88a44b01eac913524df7d58c63b80a51e",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest434BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest434BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest434BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xbc29",
-                    "hash" : "0x0aa0a9cb616ab038fc1e63e870985e663347b8ee8af4f45dff654ff33e4c540d",
-                    "mixHash" : "0x845aaf3225b394f23c2c4d27e9aa843434d6aedb773410dbd07e96fbd896c962",
-                    "nonce" : "0x97316ab766d81691",
+                    "hash" : "0xfd35f7c796542708b834d49978a28e5d6dc1abc4c47a3af04c2754f55636001a",
+                    "mixHash" : "0x8ea0d1482408c3d48fe054ce11e20117e276f8b31dd5787d3264118e2a18633d",
+                    "nonce" : "0x0af470d6e2e68cf8",
                     "number" : "0x01",
                     "parentHash" : "0x8befa087298b41da6713018fa9268d3af350cda6aa79a2eb6ecca61acc8f72b3",
                     "receiptTrie" : "0x46155cb688df890c438168234fe0e34064cbbcb799957feabc5af69a66c481ce",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xf606b1d3575e48881a517fe5ac5e64515b734c3ffa159940d42cf0067927305a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90342f901fca08befa087298b41da6713018fa9268d3af350cda6aa79a2eb6ecca61acc8f72b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0012839bdf8e53dac2abf1d1d071f258b3e8fef1384ee8a143f328d0e4542c2d4a0f606b1d3575e48881a517fe5ac5e64515b734c3ffa159940d42cf0067927305aa046155cb688df890c438168234fe0e34064cbbcb799957feabc5af69a66c481ceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bc298203e880a0845aaf3225b394f23c2c4d27e9aa843434d6aedb773410dbd07e96fbd896c9628897316ab766d81691f9013ff9013c8001847178c09494095e7baea6a6c7c4c2dfeb977efac326af552d87843684af3db8d67f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5f30264613617a2975a6857606f551ca0877d353724fb6800ddeff2ce291800141b1e827cbe4e6b1775e98ed5a156d81ba058e98a7125198baf76cc0cad8a7b84c9652f7ac6c634655e9104f468df6d59e9c0",
+                "rlp" : "0xf90342f901fca08befa087298b41da6713018fa9268d3af350cda6aa79a2eb6ecca61acc8f72b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0012839bdf8e53dac2abf1d1d071f258b3e8fef1384ee8a143f328d0e4542c2d4a0f606b1d3575e48881a517fe5ac5e64515b734c3ffa159940d42cf0067927305aa046155cb688df890c438168234fe0e34064cbbcb799957feabc5af69a66c481ceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bc298203e880a08ea0d1482408c3d48fe054ce11e20117e276f8b31dd5787d3264118e2a18633d880af470d6e2e68cf8f9013ff9013c8001847178c09494095e7baea6a6c7c4c2dfeb977efac326af552d87843684af3db8d67f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5f30264613617a2975a6857606f551ca0877d353724fb6800ddeff2ce291800141b1e827cbe4e6b1775e98ed5a156d81ba058e98a7125198baf76cc0cad8a7b84c9652f7ac6c634655e9104f468df6d59e9c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5f30264613617a2975a6857606f55",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07f172197846bc31d838420b2216439233ffba142cd6d1233981e106036b5fcefa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0aa0a9cb616ab038fc1e63e870985e663347b8ee8af4f45dff654ff33e4c540d",
+        "lastblockhash" : "0xfd35f7c796542708b834d49978a28e5d6dc1abc4c47a3af04c2754f55636001a",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest434BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest434BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest434BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xbc29",
-                    "hash" : "0xca653e3a11030c2f73da61d722e925233d9a13664c99dfe6e8df6774dedeb00a",
-                    "mixHash" : "0x3aa47f6fe20e7a13b84048f7c48ed189a6e20758eed4f3eb51e07877bce079f3",
-                    "nonce" : "0xbe23d76eb33c454d",
+                    "hash" : "0xeb6004218fae1ade2d44392590632f98d3aa18bb31b17c116a4e26b21c470cbb",
+                    "mixHash" : "0xb31deb181a861b0f2c8a300fc5c3e148d395f787b6b52bbcd5b458bcde488477",
+                    "nonce" : "0x3867ac14e3fdb7e1",
                     "number" : "0x01",
                     "parentHash" : "0x8befa087298b41da6713018fa9268d3af350cda6aa79a2eb6ecca61acc8f72b3",
                     "receiptTrie" : "0x46155cb688df890c438168234fe0e34064cbbcb799957feabc5af69a66c481ce",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xf606b1d3575e48881a517fe5ac5e64515b734c3ffa159940d42cf0067927305a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90342f901fca08befa087298b41da6713018fa9268d3af350cda6aa79a2eb6ecca61acc8f72b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0012839bdf8e53dac2abf1d1d071f258b3e8fef1384ee8a143f328d0e4542c2d4a0f606b1d3575e48881a517fe5ac5e64515b734c3ffa159940d42cf0067927305aa046155cb688df890c438168234fe0e34064cbbcb799957feabc5af69a66c481ceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bc298203e880a03aa47f6fe20e7a13b84048f7c48ed189a6e20758eed4f3eb51e07877bce079f388be23d76eb33c454df9013ff9013c8001847178c09494095e7baea6a6c7c4c2dfeb977efac326af552d87843684af3db8d67f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5f30264613617a2975a6857606f551ca0877d353724fb6800ddeff2ce291800141b1e827cbe4e6b1775e98ed5a156d81ba058e98a7125198baf76cc0cad8a7b84c9652f7ac6c634655e9104f468df6d59e9c0",
+                "rlp" : "0xf90342f901fca08befa087298b41da6713018fa9268d3af350cda6aa79a2eb6ecca61acc8f72b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0012839bdf8e53dac2abf1d1d071f258b3e8fef1384ee8a143f328d0e4542c2d4a0f606b1d3575e48881a517fe5ac5e64515b734c3ffa159940d42cf0067927305aa046155cb688df890c438168234fe0e34064cbbcb799957feabc5af69a66c481ceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bc298203e880a0b31deb181a861b0f2c8a300fc5c3e148d395f787b6b52bbcd5b458bcde488477883867ac14e3fdb7e1f9013ff9013c8001847178c09494095e7baea6a6c7c4c2dfeb977efac326af552d87843684af3db8d67f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5f30264613617a2975a6857606f551ca0877d353724fb6800ddeff2ce291800141b1e827cbe4e6b1775e98ed5a156d81ba058e98a7125198baf76cc0cad8a7b84c9652f7ac6c634655e9104f468df6d59e9c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5f30264613617a2975a6857606f55",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07f172197846bc31d838420b2216439233ffba142cd6d1233981e106036b5fcefa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xca653e3a11030c2f73da61d722e925233d9a13664c99dfe6e8df6774dedeb00a",
+        "lastblockhash" : "0xeb6004218fae1ade2d44392590632f98d3aa18bb31b17c116a4e26b21c470cbb",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest44BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest44BC.json
index 6ede91a62..2234e9921 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest44BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest44BC.json
@@ -2,8 +2,8 @@
     "randomStatetest44BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest44BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest44BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa0fb",
-                    "hash" : "0x6a0b1f62e8738c266d9d86e0ab0bf9cf229f6103b1128662f26b0711904b6ddc",
-                    "mixHash" : "0x5a0762aba0e96d9eaf063cbb29397b0ab1b9583f2e3f454c63a67739d5b61c8b",
-                    "nonce" : "0xb2886318835b8565",
+                    "hash" : "0xc305ef61570575f7b3dc54e8cd734e3fff9ea2fdf441ff9a051535c219c7d300",
+                    "mixHash" : "0x88b5c35c41916295b8eec93ad024737f17fd9dfc8ebae011bff49e19ee9c53fd",
+                    "nonce" : "0xd4452f5191654697",
                     "number" : "0x01",
                     "parentHash" : "0x701aef8ae23ef6ad1bde61f826f38083151a674631f4086d3bab9d2e0e4f4f73",
                     "receiptTrie" : "0x9d49b390bbeb5613d768a06b9c93223e96da6141bda9f918ae3b5cc4d24b71b0",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0701aef8ae23ef6ad1bde61f826f38083151a674631f4086d3bab9d2e0e4f4f73a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ffc5bf21e9f9d43d41494479ba83a3218cc25a3050f0c6e8a9dd78ac03eb3a07a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa09d49b390bbeb5613d768a06b9c93223e96da6141bda9f918ae3b5cc4d24b71b0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0fb8203e880a05a0762aba0e96d9eaf063cbb29397b0ab1b9583f2e3f454c63a67739d5b61c8b88b2886318835b8565f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0701aef8ae23ef6ad1bde61f826f38083151a674631f4086d3bab9d2e0e4f4f73a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ffc5bf21e9f9d43d41494479ba83a3218cc25a3050f0c6e8a9dd78ac03eb3a07a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa09d49b390bbeb5613d768a06b9c93223e96da6141bda9f918ae3b5cc4d24b71b0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0fb8203e880a088b5c35c41916295b8eec93ad024737f17fd9dfc8ebae011bff49e19ee9c53fd88d4452f5191654697f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f8fa5f0ab8f483a0ab82da8378696735368e3562acfdbdfe40b9723a06b807f6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6a0b1f62e8738c266d9d86e0ab0bf9cf229f6103b1128662f26b0711904b6ddc",
+        "lastblockhash" : "0xc305ef61570575f7b3dc54e8cd734e3fff9ea2fdf441ff9a051535c219c7d300",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest44BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest44BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest44BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa407",
-                    "hash" : "0x4ba02f591255f7b4adab3c43078f392c8e88ece8ac3aaac1c0a5a3b8045d7d5f",
-                    "mixHash" : "0xd2a21ecc9b3434a438987046bdfd608dc3f9104b6f676fb14d14fe74737fe899",
-                    "nonce" : "0x4e04580465de5096",
+                    "hash" : "0xad12f76be0bb2af011c1ac510ab1cdea72b42f009e0d3f164c09af819a9fef4d",
+                    "mixHash" : "0xff37789ff4f888b9ec7771ef0622374240cfcd2009928598a9b2deb6be2e55f8",
+                    "nonce" : "0x9bd0703ec4968cd0",
                     "number" : "0x01",
                     "parentHash" : "0x701aef8ae23ef6ad1bde61f826f38083151a674631f4086d3bab9d2e0e4f4f73",
                     "receiptTrie" : "0x930180ad684d00ac4220a248b23a7e17f349db5d783a05040c4ac20acef57000",
-                    "stateRoot" : "0xc6aa6620614b7e6c2d495c9fc6f640dd775d7eb818686b085374e32c86e0cf66",
+                    "stateRoot" : "0x2fb96f5b0cde4e573d3650780611fe4ccd5f5a5b7ecbe6ec3a10534d79b89bf4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0701aef8ae23ef6ad1bde61f826f38083151a674631f4086d3bab9d2e0e4f4f73a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c6aa6620614b7e6c2d495c9fc6f640dd775d7eb818686b085374e32c86e0cf66a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0930180ad684d00ac4220a248b23a7e17f349db5d783a05040c4ac20acef57000b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a4078203e880a0d2a21ecc9b3434a438987046bdfd608dc3f9104b6f676fb14d14fe74737fe899884e04580465de5096f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0701aef8ae23ef6ad1bde61f826f38083151a674631f4086d3bab9d2e0e4f4f73a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02fb96f5b0cde4e573d3650780611fe4ccd5f5a5b7ecbe6ec3a10534d79b89bf4a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0930180ad684d00ac4220a248b23a7e17f349db5d783a05040c4ac20acef57000b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a4078203e880a0ff37789ff4f888b9ec7771ef0622374240cfcd2009928598a9b2deb6be2e55f8889bd0703ec4968cd0f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f8fa5f0ab8f483a0ab82da8378696735368e3562acfdbdfe40b9723a06b807f6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4ba02f591255f7b4adab3c43078f392c8e88ece8ac3aaac1c0a5a3b8045d7d5f",
+        "lastblockhash" : "0xad12f76be0bb2af011c1ac510ab1cdea72b42f009e0d3f164c09af819a9fef4d",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x4240444141454542530855",
@@ -235,8 +228,8 @@
     "randomStatetest44BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest44BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest44BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa0fb",
-                    "hash" : "0xe90c10ad1f143f132c1b4da9aa9abf5533debca6ed4052ca7bb8dcfef8337a89",
-                    "mixHash" : "0x2be8552f16156aa8492a26dffec7613bf0a5a659dc880e210fbe5d132f4e6cb1",
-                    "nonce" : "0x19c8e7b360d6ba47",
+                    "hash" : "0x9b0fc54e3ff4825f39dccbaead6dcab14be213cf81c41a738a4dea6bb6377801",
+                    "mixHash" : "0x68062fd9e518b4a342b75df5fc0219b92117e39c1df9cd6d1db946843569313a",
+                    "nonce" : "0x137af05631fdb079",
                     "number" : "0x01",
                     "parentHash" : "0x701aef8ae23ef6ad1bde61f826f38083151a674631f4086d3bab9d2e0e4f4f73",
                     "receiptTrie" : "0x893dfbb1cbd0f97a8788838b8bc9838ec0278c608295e47096b08ed952a79bde",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0701aef8ae23ef6ad1bde61f826f38083151a674631f4086d3bab9d2e0e4f4f73a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a042c42249f5e77079b333051810b809614fca08b1fa50d422160252ea3d104162a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0893dfbb1cbd0f97a8788838b8bc9838ec0278c608295e47096b08ed952a79bdeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0fb8203e880a02be8552f16156aa8492a26dffec7613bf0a5a659dc880e210fbe5d132f4e6cb18819c8e7b360d6ba47f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0701aef8ae23ef6ad1bde61f826f38083151a674631f4086d3bab9d2e0e4f4f73a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a042c42249f5e77079b333051810b809614fca08b1fa50d422160252ea3d104162a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0893dfbb1cbd0f97a8788838b8bc9838ec0278c608295e47096b08ed952a79bdeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0fb8203e880a068062fd9e518b4a342b75df5fc0219b92117e39c1df9cd6d1db946843569313a88137af05631fdb079f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f8fa5f0ab8f483a0ab82da8378696735368e3562acfdbdfe40b9723a06b807f6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe90c10ad1f143f132c1b4da9aa9abf5533debca6ed4052ca7bb8dcfef8337a89",
+        "lastblockhash" : "0x9b0fc54e3ff4825f39dccbaead6dcab14be213cf81c41a738a4dea6bb6377801",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest44BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest44BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest44BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa0fb",
-                    "hash" : "0x4a345caa1fd1a4a010dc6027a49573034157817f979e69f61067a3ea19b304c7",
-                    "mixHash" : "0xb3ac6639c7c3d7f88ce9d809734dd6415aee11e92a64e5542233f03b2d1ff0b4",
-                    "nonce" : "0x551de76632931f4e",
+                    "hash" : "0xe3f2a93578d5d369a5e27df160fa3c189985d7fbb0f9234e3ca1b946a6b21b03",
+                    "mixHash" : "0x72399b0910bc6ffb77342f670506d9da052bb7b9c6f3c3046744202ed5464bfc",
+                    "nonce" : "0x6aafc6d5368a36ec",
                     "number" : "0x01",
                     "parentHash" : "0x701aef8ae23ef6ad1bde61f826f38083151a674631f4086d3bab9d2e0e4f4f73",
                     "receiptTrie" : "0x893dfbb1cbd0f97a8788838b8bc9838ec0278c608295e47096b08ed952a79bde",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0701aef8ae23ef6ad1bde61f826f38083151a674631f4086d3bab9d2e0e4f4f73a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a042c42249f5e77079b333051810b809614fca08b1fa50d422160252ea3d104162a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0893dfbb1cbd0f97a8788838b8bc9838ec0278c608295e47096b08ed952a79bdeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0fb8203e880a0b3ac6639c7c3d7f88ce9d809734dd6415aee11e92a64e5542233f03b2d1ff0b488551de76632931f4ef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0701aef8ae23ef6ad1bde61f826f38083151a674631f4086d3bab9d2e0e4f4f73a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a042c42249f5e77079b333051810b809614fca08b1fa50d422160252ea3d104162a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0893dfbb1cbd0f97a8788838b8bc9838ec0278c608295e47096b08ed952a79bdeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0fb8203e880a072399b0910bc6ffb77342f670506d9da052bb7b9c6f3c3046744202ed5464bfc886aafc6d5368a36ecf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f8fa5f0ab8f483a0ab82da8378696735368e3562acfdbdfe40b9723a06b807f6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4a345caa1fd1a4a010dc6027a49573034157817f979e69f61067a3ea19b304c7",
+        "lastblockhash" : "0xe3f2a93578d5d369a5e27df160fa3c189985d7fbb0f9234e3ca1b946a6b21b03",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest44BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest44BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest44BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa0fb",
-                    "hash" : "0x04c044a2e0e249b8dcc4e355b713d423f9247e5e033908ba44e756708363d984",
-                    "mixHash" : "0xba99f98acbe3fb22b8e80c9465f71753432d3cf9f9c2a900ef922ad75541bf95",
-                    "nonce" : "0x97e4a5238e4954fc",
+                    "hash" : "0xf46e3e65a7a24a43f23099cf0e91377403c77476c05f8785fb9f603f8d6bdb8c",
+                    "mixHash" : "0x1fc87162d94d6d7a7a5cba3bc9fd41467fc981cdc4c80a8527bd606c4377da94",
+                    "nonce" : "0xb8c72b1b56556e1d",
                     "number" : "0x01",
                     "parentHash" : "0x701aef8ae23ef6ad1bde61f826f38083151a674631f4086d3bab9d2e0e4f4f73",
                     "receiptTrie" : "0x893dfbb1cbd0f97a8788838b8bc9838ec0278c608295e47096b08ed952a79bde",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0701aef8ae23ef6ad1bde61f826f38083151a674631f4086d3bab9d2e0e4f4f73a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a042c42249f5e77079b333051810b809614fca08b1fa50d422160252ea3d104162a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0893dfbb1cbd0f97a8788838b8bc9838ec0278c608295e47096b08ed952a79bdeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0fb8203e880a0ba99f98acbe3fb22b8e80c9465f71753432d3cf9f9c2a900ef922ad75541bf958897e4a5238e4954fcf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0701aef8ae23ef6ad1bde61f826f38083151a674631f4086d3bab9d2e0e4f4f73a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a042c42249f5e77079b333051810b809614fca08b1fa50d422160252ea3d104162a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0893dfbb1cbd0f97a8788838b8bc9838ec0278c608295e47096b08ed952a79bdeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0fb8203e880a01fc87162d94d6d7a7a5cba3bc9fd41467fc981cdc4c80a8527bd606c4377da9488b8c72b1b56556e1df865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f8fa5f0ab8f483a0ab82da8378696735368e3562acfdbdfe40b9723a06b807f6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x04c044a2e0e249b8dcc4e355b713d423f9247e5e033908ba44e756708363d984",
+        "lastblockhash" : "0xf46e3e65a7a24a43f23099cf0e91377403c77476c05f8785fb9f603f8d6bdb8c",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest44BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest44BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest44BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa0fb",
-                    "hash" : "0xe955d0485ba58522d93494b1f30d5c649520c64ca5df278c405ae350e1a8939c",
-                    "mixHash" : "0xa3c9c7ba60b16bddf0781061eab54b3fa8bc69878437a11528ef1bd4325ba457",
-                    "nonce" : "0x11cc97d35366482b",
+                    "hash" : "0x70d5935823c02a4b9090e96563db1e013d775bd21faf3ae2d5b0fc0562facd34",
+                    "mixHash" : "0x1c99e1fcc3407284dde216df25a331f0a3ec29a82268915eab9caf6d9d23a859",
+                    "nonce" : "0x70d8840989f3b6ba",
                     "number" : "0x01",
                     "parentHash" : "0x701aef8ae23ef6ad1bde61f826f38083151a674631f4086d3bab9d2e0e4f4f73",
                     "receiptTrie" : "0x893dfbb1cbd0f97a8788838b8bc9838ec0278c608295e47096b08ed952a79bde",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0701aef8ae23ef6ad1bde61f826f38083151a674631f4086d3bab9d2e0e4f4f73a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a042c42249f5e77079b333051810b809614fca08b1fa50d422160252ea3d104162a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0893dfbb1cbd0f97a8788838b8bc9838ec0278c608295e47096b08ed952a79bdeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0fb8203e880a0a3c9c7ba60b16bddf0781061eab54b3fa8bc69878437a11528ef1bd4325ba4578811cc97d35366482bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0701aef8ae23ef6ad1bde61f826f38083151a674631f4086d3bab9d2e0e4f4f73a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a042c42249f5e77079b333051810b809614fca08b1fa50d422160252ea3d104162a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0893dfbb1cbd0f97a8788838b8bc9838ec0278c608295e47096b08ed952a79bdeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0fb8203e880a01c99e1fcc3407284dde216df25a331f0a3ec29a82268915eab9caf6d9d23a8598870d8840989f3b6baf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f8fa5f0ab8f483a0ab82da8378696735368e3562acfdbdfe40b9723a06b807f6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe955d0485ba58522d93494b1f30d5c649520c64ca5df278c405ae350e1a8939c",
+        "lastblockhash" : "0x70d5935823c02a4b9090e96563db1e013d775bd21faf3ae2d5b0fc0562facd34",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest453BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest453BC.json
index c1289db29..c540f303b 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest453BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest453BC.json
@@ -2,8 +2,8 @@
     "randomStatetest453BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest453BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest453BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6bc9",
-                    "hash" : "0xbee6e17243720d4c9af883695e5982a9ad689d3d6cb7a2af086b92313d6d3547",
-                    "mixHash" : "0xcf51730ed1ef380aa8d30305bccd910f14ea1ad6586af46f3593ffe46cba8bfc",
-                    "nonce" : "0xe98a5b51261243c2",
+                    "hash" : "0xfb3ab13863e1f5fe09e5c3ff29729e5322fc7f80d5692a5e437b6acfc976ffa6",
+                    "mixHash" : "0x7788dfe59ca0ddc6e27fefdec48ff97b68c830f6c2bcde4ac8628f459f68d4a7",
+                    "nonce" : "0x16a4a9ce21efc397",
                     "number" : "0x01",
                     "parentHash" : "0xbe1e4666572519766756480dc43e2f2f507b41c6d93141cfd68727bf5e118a92",
                     "receiptTrie" : "0xc4b9e606082cf54f3ffb400d64ff7c0741590eac6e71972c05aafd0076689554",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xbf42045eb493f8fe79782d59d5049a4723437c82517d0ce0929e652cb6e40d1f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90322f901fca0be1e4666572519766756480dc43e2f2f507b41c6d93141cfd68727bf5e118a92a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06332d3734c3ec677a688077325312c1bc8af60c64a1a86b6626fd7ecc19b726ba0bf42045eb493f8fe79782d59d5049a4723437c82517d0ce0929e652cb6e40d1fa0c4b9e606082cf54f3ffb400d64ff7c0741590eac6e71972c05aafd0076689554b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826bc98203e880a0cf51730ed1ef380aa8d30305bccd910f14ea1ad6586af46f3593ffe46cba8bfc88e98a5b51261243c2f9011ff9011c80018458081ed194095e7baea6a6c7c4c2dfeb977efac326af552d878478c0cc9ab8b6457f000000000000000000000000000000000000000000000000000000000000c350457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097f0000000000000000000000000000000000000000000000000000000000000001a0407907a0609ba280596c733c391ca0d80f391923de0fc98275f4316294e2ba3d01b46fc96015a674f521972ccf7713a038a495bd84fa2bcfbe7f7dc47ff5a2b2e362e15177fe40d999c414d41bceef28c0",
+                "rlp" : "0xf90322f901fca0be1e4666572519766756480dc43e2f2f507b41c6d93141cfd68727bf5e118a92a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06332d3734c3ec677a688077325312c1bc8af60c64a1a86b6626fd7ecc19b726ba0bf42045eb493f8fe79782d59d5049a4723437c82517d0ce0929e652cb6e40d1fa0c4b9e606082cf54f3ffb400d64ff7c0741590eac6e71972c05aafd0076689554b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826bc98203e880a07788dfe59ca0ddc6e27fefdec48ff97b68c830f6c2bcde4ac8628f459f68d4a78816a4a9ce21efc397f9011ff9011c80018458081ed194095e7baea6a6c7c4c2dfeb977efac326af552d878478c0cc9ab8b6457f000000000000000000000000000000000000000000000000000000000000c350457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097f0000000000000000000000000000000000000000000000000000000000000001a0407907a0609ba280596c733c391ca0d80f391923de0fc98275f4316294e2ba3d01b46fc96015a674f521972ccf7713a038a495bd84fa2bcfbe7f7dc47ff5a2b2e362e15177fe40d999c414d41bceef28c0",
                 "transactions" : [
                     {
                         "data" : "0x457f000000000000000000000000000000000000000000000000000000000000c350457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097f0000000000000000000000000000000000000000000000000000000000000001a0407907a0609ba280596c733c39",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c68875c84bc96e82c15392565870d549ff14ebf0080b2cccd348a44e260265e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbee6e17243720d4c9af883695e5982a9ad689d3d6cb7a2af086b92313d6d3547",
+        "lastblockhash" : "0xfb3ab13863e1f5fe09e5c3ff29729e5322fc7f80d5692a5e437b6acfc976ffa6",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest453BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest453BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest453BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6ed5",
-                    "hash" : "0x4ea436e075af868c6ae2e821f5d82cd7cbb6a5771b89b1473a9a08d78eba9807",
-                    "mixHash" : "0xd1fac91200970f64426be1838b33e468afaa28216e432971d2619d413c28770b",
-                    "nonce" : "0xa4c4340d6ed2ddd5",
+                    "hash" : "0x80cfccb6d0f586d67c627c6472727e2223fa3dff069048f8b6616667ebd23350",
+                    "mixHash" : "0x3ee436e838d6fd84eb1a368560539d174b3794a82dd64c89c4e028184596d19c",
+                    "nonce" : "0x01be5f616113f831",
                     "number" : "0x01",
                     "parentHash" : "0xbe1e4666572519766756480dc43e2f2f507b41c6d93141cfd68727bf5e118a92",
                     "receiptTrie" : "0x9483d7534bfd732be2f8990a7d4d3988c30c193db2cb5d06e357694d683a4108",
-                    "stateRoot" : "0xc30fa25ae94b947fb81f3d6e098c2856c5d988f6c7c2596411ef62795f733127",
+                    "stateRoot" : "0x33d6ea050371368071265daacb8ef25719ae2cadc5f775613ba6fcf230e3e8ae",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbf42045eb493f8fe79782d59d5049a4723437c82517d0ce0929e652cb6e40d1f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90322f901fca0be1e4666572519766756480dc43e2f2f507b41c6d93141cfd68727bf5e118a92a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c30fa25ae94b947fb81f3d6e098c2856c5d988f6c7c2596411ef62795f733127a0bf42045eb493f8fe79782d59d5049a4723437c82517d0ce0929e652cb6e40d1fa09483d7534bfd732be2f8990a7d4d3988c30c193db2cb5d06e357694d683a4108b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826ed58203e880a0d1fac91200970f64426be1838b33e468afaa28216e432971d2619d413c28770b88a4c4340d6ed2ddd5f9011ff9011c80018458081ed194095e7baea6a6c7c4c2dfeb977efac326af552d878478c0cc9ab8b6457f000000000000000000000000000000000000000000000000000000000000c350457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097f0000000000000000000000000000000000000000000000000000000000000001a0407907a0609ba280596c733c391ca0d80f391923de0fc98275f4316294e2ba3d01b46fc96015a674f521972ccf7713a038a495bd84fa2bcfbe7f7dc47ff5a2b2e362e15177fe40d999c414d41bceef28c0",
+                "rlp" : "0xf90322f901fca0be1e4666572519766756480dc43e2f2f507b41c6d93141cfd68727bf5e118a92a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a033d6ea050371368071265daacb8ef25719ae2cadc5f775613ba6fcf230e3e8aea0bf42045eb493f8fe79782d59d5049a4723437c82517d0ce0929e652cb6e40d1fa09483d7534bfd732be2f8990a7d4d3988c30c193db2cb5d06e357694d683a4108b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826ed58203e880a03ee436e838d6fd84eb1a368560539d174b3794a82dd64c89c4e028184596d19c8801be5f616113f831f9011ff9011c80018458081ed194095e7baea6a6c7c4c2dfeb977efac326af552d878478c0cc9ab8b6457f000000000000000000000000000000000000000000000000000000000000c350457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097f0000000000000000000000000000000000000000000000000000000000000001a0407907a0609ba280596c733c391ca0d80f391923de0fc98275f4316294e2ba3d01b46fc96015a674f521972ccf7713a038a495bd84fa2bcfbe7f7dc47ff5a2b2e362e15177fe40d999c414d41bceef28c0",
                 "transactions" : [
                     {
                         "data" : "0x457f000000000000000000000000000000000000000000000000000000000000c350457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097f0000000000000000000000000000000000000000000000000000000000000001a0407907a0609ba280596c733c39",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c68875c84bc96e82c15392565870d549ff14ebf0080b2cccd348a44e260265e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4ea436e075af868c6ae2e821f5d82cd7cbb6a5771b89b1473a9a08d78eba9807",
+        "lastblockhash" : "0x80cfccb6d0f586d67c627c6472727e2223fa3dff069048f8b6616667ebd23350",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x78c0cc9a",
                 "code" : "0x457f000000000000000000000000000000000000000000000000000000000000c350457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097f0000000000000000000000000000000000000000000000000000000000000001a0407907a0609ba280596c733c3960005155",
@@ -233,8 +226,8 @@
     "randomStatetest453BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest453BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest453BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6bc9",
-                    "hash" : "0xd3556c892963b5973168eeabdaabd56fb3fe1d1a822e82ac1b5f94dc5564399e",
-                    "mixHash" : "0xe66377d551b0301efb1bda36c617d99e9e04890b4170f83fbf86df4262f8fde9",
-                    "nonce" : "0xe20e348e8090d8e0",
+                    "hash" : "0x88afd760f8a31dc712ee3ea0b93dd03736fe5b6f58be5cb511b497fd91e45894",
+                    "mixHash" : "0xa6b372ae5f8d03b51424ab9d10610fbdc14a5f226dc51fb4c6739a545d74c773",
+                    "nonce" : "0xa15d23bcd71e1ff8",
                     "number" : "0x01",
                     "parentHash" : "0xbe1e4666572519766756480dc43e2f2f507b41c6d93141cfd68727bf5e118a92",
                     "receiptTrie" : "0x300d16b1713dc5d6a22f3eebb1111c6f1505a93af99a5a5835b90fe7c1e48385",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0xbf42045eb493f8fe79782d59d5049a4723437c82517d0ce0929e652cb6e40d1f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90322f901fca0be1e4666572519766756480dc43e2f2f507b41c6d93141cfd68727bf5e118a92a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cdd39529d49fc6b93c4f6ce971b4ad5e8f8223e4fafe059e98efd19551cfda23a0bf42045eb493f8fe79782d59d5049a4723437c82517d0ce0929e652cb6e40d1fa0300d16b1713dc5d6a22f3eebb1111c6f1505a93af99a5a5835b90fe7c1e48385b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826bc98203e880a0e66377d551b0301efb1bda36c617d99e9e04890b4170f83fbf86df4262f8fde988e20e348e8090d8e0f9011ff9011c80018458081ed194095e7baea6a6c7c4c2dfeb977efac326af552d878478c0cc9ab8b6457f000000000000000000000000000000000000000000000000000000000000c350457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097f0000000000000000000000000000000000000000000000000000000000000001a0407907a0609ba280596c733c391ca0d80f391923de0fc98275f4316294e2ba3d01b46fc96015a674f521972ccf7713a038a495bd84fa2bcfbe7f7dc47ff5a2b2e362e15177fe40d999c414d41bceef28c0",
+                "rlp" : "0xf90322f901fca0be1e4666572519766756480dc43e2f2f507b41c6d93141cfd68727bf5e118a92a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cdd39529d49fc6b93c4f6ce971b4ad5e8f8223e4fafe059e98efd19551cfda23a0bf42045eb493f8fe79782d59d5049a4723437c82517d0ce0929e652cb6e40d1fa0300d16b1713dc5d6a22f3eebb1111c6f1505a93af99a5a5835b90fe7c1e48385b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826bc98203e880a0a6b372ae5f8d03b51424ab9d10610fbdc14a5f226dc51fb4c6739a545d74c77388a15d23bcd71e1ff8f9011ff9011c80018458081ed194095e7baea6a6c7c4c2dfeb977efac326af552d878478c0cc9ab8b6457f000000000000000000000000000000000000000000000000000000000000c350457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097f0000000000000000000000000000000000000000000000000000000000000001a0407907a0609ba280596c733c391ca0d80f391923de0fc98275f4316294e2ba3d01b46fc96015a674f521972ccf7713a038a495bd84fa2bcfbe7f7dc47ff5a2b2e362e15177fe40d999c414d41bceef28c0",
                 "transactions" : [
                     {
                         "data" : "0x457f000000000000000000000000000000000000000000000000000000000000c350457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097f0000000000000000000000000000000000000000000000000000000000000001a0407907a0609ba280596c733c39",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c68875c84bc96e82c15392565870d549ff14ebf0080b2cccd348a44e260265e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd3556c892963b5973168eeabdaabd56fb3fe1d1a822e82ac1b5f94dc5564399e",
+        "lastblockhash" : "0x88afd760f8a31dc712ee3ea0b93dd03736fe5b6f58be5cb511b497fd91e45894",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest453BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest453BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest453BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6bc9",
-                    "hash" : "0xe74be6b51686de04318a0383c91d14290e687063629c9b100178b70c8687af6b",
-                    "mixHash" : "0x685be78f23ac7905bdc9ca74ccde497e2f12b2030d5b6f666f6a1050162df45e",
-                    "nonce" : "0x61908537dafef7ab",
+                    "hash" : "0x410eff82806a8f1a5dfb4d9b3d7cf83b3200eb5e09a8a76f9e64e3802f251bee",
+                    "mixHash" : "0xe953071ce0be78a934d7a9f7119f192061d80d136760958d66c943d30ff157df",
+                    "nonce" : "0x325942d70214c84d",
                     "number" : "0x01",
                     "parentHash" : "0xbe1e4666572519766756480dc43e2f2f507b41c6d93141cfd68727bf5e118a92",
                     "receiptTrie" : "0x300d16b1713dc5d6a22f3eebb1111c6f1505a93af99a5a5835b90fe7c1e48385",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0xbf42045eb493f8fe79782d59d5049a4723437c82517d0ce0929e652cb6e40d1f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90322f901fca0be1e4666572519766756480dc43e2f2f507b41c6d93141cfd68727bf5e118a92a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cdd39529d49fc6b93c4f6ce971b4ad5e8f8223e4fafe059e98efd19551cfda23a0bf42045eb493f8fe79782d59d5049a4723437c82517d0ce0929e652cb6e40d1fa0300d16b1713dc5d6a22f3eebb1111c6f1505a93af99a5a5835b90fe7c1e48385b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826bc98203e880a0685be78f23ac7905bdc9ca74ccde497e2f12b2030d5b6f666f6a1050162df45e8861908537dafef7abf9011ff9011c80018458081ed194095e7baea6a6c7c4c2dfeb977efac326af552d878478c0cc9ab8b6457f000000000000000000000000000000000000000000000000000000000000c350457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097f0000000000000000000000000000000000000000000000000000000000000001a0407907a0609ba280596c733c391ca0d80f391923de0fc98275f4316294e2ba3d01b46fc96015a674f521972ccf7713a038a495bd84fa2bcfbe7f7dc47ff5a2b2e362e15177fe40d999c414d41bceef28c0",
+                "rlp" : "0xf90322f901fca0be1e4666572519766756480dc43e2f2f507b41c6d93141cfd68727bf5e118a92a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cdd39529d49fc6b93c4f6ce971b4ad5e8f8223e4fafe059e98efd19551cfda23a0bf42045eb493f8fe79782d59d5049a4723437c82517d0ce0929e652cb6e40d1fa0300d16b1713dc5d6a22f3eebb1111c6f1505a93af99a5a5835b90fe7c1e48385b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826bc98203e880a0e953071ce0be78a934d7a9f7119f192061d80d136760958d66c943d30ff157df88325942d70214c84df9011ff9011c80018458081ed194095e7baea6a6c7c4c2dfeb977efac326af552d878478c0cc9ab8b6457f000000000000000000000000000000000000000000000000000000000000c350457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097f0000000000000000000000000000000000000000000000000000000000000001a0407907a0609ba280596c733c391ca0d80f391923de0fc98275f4316294e2ba3d01b46fc96015a674f521972ccf7713a038a495bd84fa2bcfbe7f7dc47ff5a2b2e362e15177fe40d999c414d41bceef28c0",
                 "transactions" : [
                     {
                         "data" : "0x457f000000000000000000000000000000000000000000000000000000000000c350457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097f0000000000000000000000000000000000000000000000000000000000000001a0407907a0609ba280596c733c39",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c68875c84bc96e82c15392565870d549ff14ebf0080b2cccd348a44e260265e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe74be6b51686de04318a0383c91d14290e687063629c9b100178b70c8687af6b",
+        "lastblockhash" : "0x410eff82806a8f1a5dfb4d9b3d7cf83b3200eb5e09a8a76f9e64e3802f251bee",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest453BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest453BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest453BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6bc9",
-                    "hash" : "0x560e1f17c7099fcccc66b69e3831f5555fb96b7ba1b807b4cc1bac8c60bf4b64",
-                    "mixHash" : "0x639ed3b92d4c6182b69a701493ca01def09f1147122d6c43f1136b04d1210a31",
-                    "nonce" : "0xaa9f33ff4e9be09a",
+                    "hash" : "0x6a5159efa7c8def6c539cea6e8f7816dcf18079b1df82590bb243fe015e2c210",
+                    "mixHash" : "0x2910dc481f8ee1f82b4ceb02a191bbc9770b5c96fd7e371122315bd1fdda0451",
+                    "nonce" : "0x8e62dd308db3c7a1",
                     "number" : "0x01",
                     "parentHash" : "0xbe1e4666572519766756480dc43e2f2f507b41c6d93141cfd68727bf5e118a92",
                     "receiptTrie" : "0x300d16b1713dc5d6a22f3eebb1111c6f1505a93af99a5a5835b90fe7c1e48385",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0xbf42045eb493f8fe79782d59d5049a4723437c82517d0ce0929e652cb6e40d1f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90322f901fca0be1e4666572519766756480dc43e2f2f507b41c6d93141cfd68727bf5e118a92a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cdd39529d49fc6b93c4f6ce971b4ad5e8f8223e4fafe059e98efd19551cfda23a0bf42045eb493f8fe79782d59d5049a4723437c82517d0ce0929e652cb6e40d1fa0300d16b1713dc5d6a22f3eebb1111c6f1505a93af99a5a5835b90fe7c1e48385b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826bc98203e880a0639ed3b92d4c6182b69a701493ca01def09f1147122d6c43f1136b04d1210a3188aa9f33ff4e9be09af9011ff9011c80018458081ed194095e7baea6a6c7c4c2dfeb977efac326af552d878478c0cc9ab8b6457f000000000000000000000000000000000000000000000000000000000000c350457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097f0000000000000000000000000000000000000000000000000000000000000001a0407907a0609ba280596c733c391ca0d80f391923de0fc98275f4316294e2ba3d01b46fc96015a674f521972ccf7713a038a495bd84fa2bcfbe7f7dc47ff5a2b2e362e15177fe40d999c414d41bceef28c0",
+                "rlp" : "0xf90322f901fca0be1e4666572519766756480dc43e2f2f507b41c6d93141cfd68727bf5e118a92a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cdd39529d49fc6b93c4f6ce971b4ad5e8f8223e4fafe059e98efd19551cfda23a0bf42045eb493f8fe79782d59d5049a4723437c82517d0ce0929e652cb6e40d1fa0300d16b1713dc5d6a22f3eebb1111c6f1505a93af99a5a5835b90fe7c1e48385b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826bc98203e880a02910dc481f8ee1f82b4ceb02a191bbc9770b5c96fd7e371122315bd1fdda0451888e62dd308db3c7a1f9011ff9011c80018458081ed194095e7baea6a6c7c4c2dfeb977efac326af552d878478c0cc9ab8b6457f000000000000000000000000000000000000000000000000000000000000c350457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097f0000000000000000000000000000000000000000000000000000000000000001a0407907a0609ba280596c733c391ca0d80f391923de0fc98275f4316294e2ba3d01b46fc96015a674f521972ccf7713a038a495bd84fa2bcfbe7f7dc47ff5a2b2e362e15177fe40d999c414d41bceef28c0",
                 "transactions" : [
                     {
                         "data" : "0x457f000000000000000000000000000000000000000000000000000000000000c350457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097f0000000000000000000000000000000000000000000000000000000000000001a0407907a0609ba280596c733c39",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c68875c84bc96e82c15392565870d549ff14ebf0080b2cccd348a44e260265e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x560e1f17c7099fcccc66b69e3831f5555fb96b7ba1b807b4cc1bac8c60bf4b64",
+        "lastblockhash" : "0x6a5159efa7c8def6c539cea6e8f7816dcf18079b1df82590bb243fe015e2c210",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest453BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest453BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest453BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6bc9",
-                    "hash" : "0xfad142d2826b13b8d19506c092c3a47ecce5fde07344c0a59f1e5f72f6bc63b8",
-                    "mixHash" : "0x15ce4b0e56823ddf8e25b5554da81b5618b88b274997847d3adb1556d80e7303",
-                    "nonce" : "0x2eaf44f09dd1ef67",
+                    "hash" : "0x4d777f0b8eca7970d4bf2e26d70f0e2135e18075ad1795b8c55cb969da97b04a",
+                    "mixHash" : "0x255b046d4e5fe20b84c31c6dbb45c5f6a3bf3d851058b307b159dddd1673e3a8",
+                    "nonce" : "0x54383c5de0d970c4",
                     "number" : "0x01",
                     "parentHash" : "0xbe1e4666572519766756480dc43e2f2f507b41c6d93141cfd68727bf5e118a92",
                     "receiptTrie" : "0x300d16b1713dc5d6a22f3eebb1111c6f1505a93af99a5a5835b90fe7c1e48385",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0xbf42045eb493f8fe79782d59d5049a4723437c82517d0ce0929e652cb6e40d1f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90322f901fca0be1e4666572519766756480dc43e2f2f507b41c6d93141cfd68727bf5e118a92a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cdd39529d49fc6b93c4f6ce971b4ad5e8f8223e4fafe059e98efd19551cfda23a0bf42045eb493f8fe79782d59d5049a4723437c82517d0ce0929e652cb6e40d1fa0300d16b1713dc5d6a22f3eebb1111c6f1505a93af99a5a5835b90fe7c1e48385b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826bc98203e880a015ce4b0e56823ddf8e25b5554da81b5618b88b274997847d3adb1556d80e7303882eaf44f09dd1ef67f9011ff9011c80018458081ed194095e7baea6a6c7c4c2dfeb977efac326af552d878478c0cc9ab8b6457f000000000000000000000000000000000000000000000000000000000000c350457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097f0000000000000000000000000000000000000000000000000000000000000001a0407907a0609ba280596c733c391ca0d80f391923de0fc98275f4316294e2ba3d01b46fc96015a674f521972ccf7713a038a495bd84fa2bcfbe7f7dc47ff5a2b2e362e15177fe40d999c414d41bceef28c0",
+                "rlp" : "0xf90322f901fca0be1e4666572519766756480dc43e2f2f507b41c6d93141cfd68727bf5e118a92a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cdd39529d49fc6b93c4f6ce971b4ad5e8f8223e4fafe059e98efd19551cfda23a0bf42045eb493f8fe79782d59d5049a4723437c82517d0ce0929e652cb6e40d1fa0300d16b1713dc5d6a22f3eebb1111c6f1505a93af99a5a5835b90fe7c1e48385b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826bc98203e880a0255b046d4e5fe20b84c31c6dbb45c5f6a3bf3d851058b307b159dddd1673e3a88854383c5de0d970c4f9011ff9011c80018458081ed194095e7baea6a6c7c4c2dfeb977efac326af552d878478c0cc9ab8b6457f000000000000000000000000000000000000000000000000000000000000c350457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097f0000000000000000000000000000000000000000000000000000000000000001a0407907a0609ba280596c733c391ca0d80f391923de0fc98275f4316294e2ba3d01b46fc96015a674f521972ccf7713a038a495bd84fa2bcfbe7f7dc47ff5a2b2e362e15177fe40d999c414d41bceef28c0",
                 "transactions" : [
                     {
                         "data" : "0x457f000000000000000000000000000000000000000000000000000000000000c350457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097f0000000000000000000000000000000000000000000000000000000000000001a0407907a0609ba280596c733c39",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c68875c84bc96e82c15392565870d549ff14ebf0080b2cccd348a44e260265e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfad142d2826b13b8d19506c092c3a47ecce5fde07344c0a59f1e5f72f6bc63b8",
+        "lastblockhash" : "0x4d777f0b8eca7970d4bf2e26d70f0e2135e18075ad1795b8c55cb969da97b04a",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest459BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest459BC.json
index 2ad375cc8..151fa4ac6 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest459BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest459BC.json
@@ -2,8 +2,8 @@
     "randomStatetest459BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest459BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest459BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa096",
-                    "hash" : "0xd97ad89663f0bd419730408f5f4d67eb173dc2b399f85a711b647de335e2df70",
-                    "mixHash" : "0x8ce5d9994953935920f8321f6eaa9382a1c5681aaab9670312077ecff8bb01af",
-                    "nonce" : "0x2e6ce07ab677011e",
+                    "hash" : "0x3ec7d0de56fe8e366b3034c8769486fe91e75fabd94e3510e71c61c1915dd89d",
+                    "mixHash" : "0x07711928709bfb276b7f79a07cb8506e83564ce71b881e0a527cf8aca909123d",
+                    "nonce" : "0xedafff51c0c4db29",
                     "number" : "0x01",
                     "parentHash" : "0xd5212e81cf6de22edb3b835767b6d1ce12cb6a9b60b7f4996ba8ad340185dede",
                     "receiptTrie" : "0x8a53e9ab087a9a9694f2b26a3cffce7b0c860614f89cc48d27b72b0cb3128c0a",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0d5212e81cf6de22edb3b835767b6d1ce12cb6a9b60b7f4996ba8ad340185dedea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a072384024dbb383eb8c12935b1a7c6c7b677e63a63901f8da198bf6af64c77faaa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa08a53e9ab087a9a9694f2b26a3cffce7b0c860614f89cc48d27b72b0cb3128c0ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0968203e880a08ce5d9994953935920f8321f6eaa9382a1c5681aaab9670312077ecff8bb01af882e6ce07ab677011ef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0d5212e81cf6de22edb3b835767b6d1ce12cb6a9b60b7f4996ba8ad340185dedea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a072384024dbb383eb8c12935b1a7c6c7b677e63a63901f8da198bf6af64c77faaa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa08a53e9ab087a9a9694f2b26a3cffce7b0c860614f89cc48d27b72b0cb3128c0ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0968203e880a007711928709bfb276b7f79a07cb8506e83564ce71b881e0a527cf8aca909123d88edafff51c0c4db29f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c71588ce8ca8b2e6cca390c56b6b9112305a50cea569fd105f503c2a9355af9ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd97ad89663f0bd419730408f5f4d67eb173dc2b399f85a711b647de335e2df70",
+        "lastblockhash" : "0x3ec7d0de56fe8e366b3034c8769486fe91e75fabd94e3510e71c61c1915dd89d",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest459BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest459BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest459BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa3a2",
-                    "hash" : "0x9aa2f865651f8690470984f9160f2ece24c5e9cae0580c583514eb52eaf25ce0",
-                    "mixHash" : "0x3a8b342c96ee02de2740007c5f2198008711dd3f857f2a0537ed58c53fe50777",
-                    "nonce" : "0xc634c649f152ff37",
+                    "hash" : "0x1647799bdddd799696b6b8f5d511996410b0e659e1d5572cd3b12263b1eb8720",
+                    "mixHash" : "0xf0c85a18aaf14808c72f08dec69936fdeaace9d208632cc53a2be35f8ba8bd00",
+                    "nonce" : "0x0985b3ac099edafd",
                     "number" : "0x01",
                     "parentHash" : "0xd5212e81cf6de22edb3b835767b6d1ce12cb6a9b60b7f4996ba8ad340185dede",
                     "receiptTrie" : "0xf0e54a5f3c88a2e5f836165884b2c32945a0c1c8c94bd3cde7ea67bf5b5a67e9",
-                    "stateRoot" : "0x359ffa2605c1105fede71f9436af09f0f79cb9dd78c2827fd1bf06fc3dd68bdc",
+                    "stateRoot" : "0xaeb07fd2af79beaf2a193f7dd430441a9d2edb024b56b45be867f4b9654a36b1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0d5212e81cf6de22edb3b835767b6d1ce12cb6a9b60b7f4996ba8ad340185dedea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0359ffa2605c1105fede71f9436af09f0f79cb9dd78c2827fd1bf06fc3dd68bdca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f0e54a5f3c88a2e5f836165884b2c32945a0c1c8c94bd3cde7ea67bf5b5a67e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a3a28203e880a03a8b342c96ee02de2740007c5f2198008711dd3f857f2a0537ed58c53fe5077788c634c649f152ff37f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0d5212e81cf6de22edb3b835767b6d1ce12cb6a9b60b7f4996ba8ad340185dedea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0aeb07fd2af79beaf2a193f7dd430441a9d2edb024b56b45be867f4b9654a36b1a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f0e54a5f3c88a2e5f836165884b2c32945a0c1c8c94bd3cde7ea67bf5b5a67e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a3a28203e880a0f0c85a18aaf14808c72f08dec69936fdeaace9d208632cc53a2be35f8ba8bd00880985b3ac099edafdf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c71588ce8ca8b2e6cca390c56b6b9112305a50cea569fd105f503c2a9355af9ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9aa2f865651f8690470984f9160f2ece24c5e9cae0580c583514eb52eaf25ce0",
+        "lastblockhash" : "0x1647799bdddd799696b6b8f5d511996410b0e659e1d5572cd3b12263b1eb8720",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x45414240454145450855",
@@ -235,8 +228,8 @@
     "randomStatetest459BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest459BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest459BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa096",
-                    "hash" : "0xbf3cfb1d8c6d691e7271266f8ed6341c61b6810fe0da9ec44642a3a0ab63ab53",
-                    "mixHash" : "0x4d8e07a50b7374768d7117c87bc295bd52790a6dc7c0d68bb784589bbec6d0b4",
-                    "nonce" : "0x73e6a2c415203b24",
+                    "hash" : "0x085c0765b514e0f1949b74551e26f396b584c4252cf87c174f30ce0680cb337d",
+                    "mixHash" : "0x7f9b2607cd48872c2a0c12f32dc4f91475e17f3c035c785a3036497fa3082356",
+                    "nonce" : "0xc752c4e4b7d3c350",
                     "number" : "0x01",
                     "parentHash" : "0xd5212e81cf6de22edb3b835767b6d1ce12cb6a9b60b7f4996ba8ad340185dede",
                     "receiptTrie" : "0x64cc0a48c60a51aeb837e6f1a92f33d90b7062581afb25fea73c37b9f6b59f92",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0d5212e81cf6de22edb3b835767b6d1ce12cb6a9b60b7f4996ba8ad340185dedea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a30c37b678435b8b309e2b381fa8a13505e33f8249c7147c64c92a5c24e0e914a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa064cc0a48c60a51aeb837e6f1a92f33d90b7062581afb25fea73c37b9f6b59f92b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0968203e880a04d8e07a50b7374768d7117c87bc295bd52790a6dc7c0d68bb784589bbec6d0b48873e6a2c415203b24f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0d5212e81cf6de22edb3b835767b6d1ce12cb6a9b60b7f4996ba8ad340185dedea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a30c37b678435b8b309e2b381fa8a13505e33f8249c7147c64c92a5c24e0e914a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa064cc0a48c60a51aeb837e6f1a92f33d90b7062581afb25fea73c37b9f6b59f92b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0968203e880a07f9b2607cd48872c2a0c12f32dc4f91475e17f3c035c785a3036497fa308235688c752c4e4b7d3c350f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c71588ce8ca8b2e6cca390c56b6b9112305a50cea569fd105f503c2a9355af9ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbf3cfb1d8c6d691e7271266f8ed6341c61b6810fe0da9ec44642a3a0ab63ab53",
+        "lastblockhash" : "0x085c0765b514e0f1949b74551e26f396b584c4252cf87c174f30ce0680cb337d",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest459BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest459BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest459BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa096",
-                    "hash" : "0x373916c042cc54081d2e552b8295b42c96c1086654e68bb4bb0f4b7d913e82bd",
-                    "mixHash" : "0xdf519181b3501b7a8c98d25aadeddceda7df414e44b6a1644080b0e3892d53b9",
-                    "nonce" : "0x005729aae4fabd72",
+                    "hash" : "0x1d566bc43efb5013224bfa628a1716f779c4300e9fab88b5f71bd14d42b4f30e",
+                    "mixHash" : "0xec4476ae6c846106ff6ae3a74df21ca8d3106ddb298ccd17f93456906dd74011",
+                    "nonce" : "0xb08968d0bbd65096",
                     "number" : "0x01",
                     "parentHash" : "0xd5212e81cf6de22edb3b835767b6d1ce12cb6a9b60b7f4996ba8ad340185dede",
                     "receiptTrie" : "0x64cc0a48c60a51aeb837e6f1a92f33d90b7062581afb25fea73c37b9f6b59f92",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0d5212e81cf6de22edb3b835767b6d1ce12cb6a9b60b7f4996ba8ad340185dedea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a30c37b678435b8b309e2b381fa8a13505e33f8249c7147c64c92a5c24e0e914a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa064cc0a48c60a51aeb837e6f1a92f33d90b7062581afb25fea73c37b9f6b59f92b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0968203e880a0df519181b3501b7a8c98d25aadeddceda7df414e44b6a1644080b0e3892d53b988005729aae4fabd72f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0d5212e81cf6de22edb3b835767b6d1ce12cb6a9b60b7f4996ba8ad340185dedea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a30c37b678435b8b309e2b381fa8a13505e33f8249c7147c64c92a5c24e0e914a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa064cc0a48c60a51aeb837e6f1a92f33d90b7062581afb25fea73c37b9f6b59f92b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0968203e880a0ec4476ae6c846106ff6ae3a74df21ca8d3106ddb298ccd17f93456906dd7401188b08968d0bbd65096f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c71588ce8ca8b2e6cca390c56b6b9112305a50cea569fd105f503c2a9355af9ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x373916c042cc54081d2e552b8295b42c96c1086654e68bb4bb0f4b7d913e82bd",
+        "lastblockhash" : "0x1d566bc43efb5013224bfa628a1716f779c4300e9fab88b5f71bd14d42b4f30e",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest459BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest459BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest459BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa096",
-                    "hash" : "0x96ff77da93ab547c991677b33bc97b279e3f9e4b455307fa6195a65150c3afc4",
-                    "mixHash" : "0x066aaf377ed2734f2d33602f36929a678953c146da68424fdff66fc562ae1997",
-                    "nonce" : "0xd270d500bce8dc12",
+                    "hash" : "0xffc03b2c2e7abba3ca2cc0a934c5025329208d33a193eea7419da9a2e0fcd0d5",
+                    "mixHash" : "0x48d5807f45fa68756c497c7993f9824d4009ab201a86bd380f877ce72bf7f9f4",
+                    "nonce" : "0x02f6cfc041c157d3",
                     "number" : "0x01",
                     "parentHash" : "0xd5212e81cf6de22edb3b835767b6d1ce12cb6a9b60b7f4996ba8ad340185dede",
                     "receiptTrie" : "0x64cc0a48c60a51aeb837e6f1a92f33d90b7062581afb25fea73c37b9f6b59f92",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0d5212e81cf6de22edb3b835767b6d1ce12cb6a9b60b7f4996ba8ad340185dedea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a30c37b678435b8b309e2b381fa8a13505e33f8249c7147c64c92a5c24e0e914a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa064cc0a48c60a51aeb837e6f1a92f33d90b7062581afb25fea73c37b9f6b59f92b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0968203e880a0066aaf377ed2734f2d33602f36929a678953c146da68424fdff66fc562ae199788d270d500bce8dc12f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0d5212e81cf6de22edb3b835767b6d1ce12cb6a9b60b7f4996ba8ad340185dedea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a30c37b678435b8b309e2b381fa8a13505e33f8249c7147c64c92a5c24e0e914a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa064cc0a48c60a51aeb837e6f1a92f33d90b7062581afb25fea73c37b9f6b59f92b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0968203e880a048d5807f45fa68756c497c7993f9824d4009ab201a86bd380f877ce72bf7f9f48802f6cfc041c157d3f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c71588ce8ca8b2e6cca390c56b6b9112305a50cea569fd105f503c2a9355af9ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x96ff77da93ab547c991677b33bc97b279e3f9e4b455307fa6195a65150c3afc4",
+        "lastblockhash" : "0xffc03b2c2e7abba3ca2cc0a934c5025329208d33a193eea7419da9a2e0fcd0d5",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest459BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest459BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest459BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa096",
-                    "hash" : "0x455eee89c230df976e8de88a5660d6bc00b6d7b9dc27636bb26511616dcab77a",
-                    "mixHash" : "0x8cf9db5950f2ff4155a93fff3ea98f996c893e9b4bd81d2ded167bfee6aa5d87",
-                    "nonce" : "0x3e1ec75dafff1db0",
+                    "hash" : "0x76384e410e1483c86a29ff9bb7ae2de979b416cb8e167adde455f5532119be42",
+                    "mixHash" : "0xb2229bef11a7bbded1df4788e182576d0035faa12a61b713d9dc72a5a800eb61",
+                    "nonce" : "0x9ab6f02f137669ac",
                     "number" : "0x01",
                     "parentHash" : "0xd5212e81cf6de22edb3b835767b6d1ce12cb6a9b60b7f4996ba8ad340185dede",
                     "receiptTrie" : "0x64cc0a48c60a51aeb837e6f1a92f33d90b7062581afb25fea73c37b9f6b59f92",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0d5212e81cf6de22edb3b835767b6d1ce12cb6a9b60b7f4996ba8ad340185dedea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a30c37b678435b8b309e2b381fa8a13505e33f8249c7147c64c92a5c24e0e914a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa064cc0a48c60a51aeb837e6f1a92f33d90b7062581afb25fea73c37b9f6b59f92b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0968203e880a08cf9db5950f2ff4155a93fff3ea98f996c893e9b4bd81d2ded167bfee6aa5d87883e1ec75dafff1db0f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0d5212e81cf6de22edb3b835767b6d1ce12cb6a9b60b7f4996ba8ad340185dedea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a30c37b678435b8b309e2b381fa8a13505e33f8249c7147c64c92a5c24e0e914a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa064cc0a48c60a51aeb837e6f1a92f33d90b7062581afb25fea73c37b9f6b59f92b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0968203e880a0b2229bef11a7bbded1df4788e182576d0035faa12a61b713d9dc72a5a800eb61889ab6f02f137669acf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c71588ce8ca8b2e6cca390c56b6b9112305a50cea569fd105f503c2a9355af9ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x455eee89c230df976e8de88a5660d6bc00b6d7b9dc27636bb26511616dcab77a",
+        "lastblockhash" : "0x76384e410e1483c86a29ff9bb7ae2de979b416cb8e167adde455f5532119be42",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest463BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest463BC.json
index 75eb40f70..784cbb56c 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest463BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest463BC.json
@@ -2,8 +2,8 @@
     "randomStatetest463BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest463BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest463BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x011f6c",
-                    "hash" : "0x37e592a35c8d8b61de8f7540383dc7c5c3d933cf8d2f66b052bf56c9496d94a8",
-                    "mixHash" : "0x792550726ad74bc431ed2b5dbac49972813f85da2b767ea7f1ae6290598651cb",
-                    "nonce" : "0xa64b5871519fb175",
+                    "hash" : "0x2d93021b3f759ba7b54379f7f18548409b9e86fbf144ef97811f87367da74515",
+                    "mixHash" : "0xafd447e6080a4c7d31f7269b3dd3018f2e69fa8872c350f802d2b98df7f4967c",
+                    "nonce" : "0x90b9b3e21686f51d",
                     "number" : "0x01",
                     "parentHash" : "0xb6e2a2c237d5efb01b27633081b0728131987e2efd4a4a931d54bd76fd40aedd",
                     "receiptTrie" : "0x6e497a9b8deb4cc24f5baafb106b6d8f0db9077158d5c7171dfe10dad41f5d91",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0b6e2a2c237d5efb01b27633081b0728131987e2efd4a4a931d54bd76fd40aedda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00a8f827423c5669d4b8b574ed3e49ecef7f15e5f59d90deecfbfa7b9caf6fa9ea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06e497a9b8deb4cc24f5baafb106b6d8f0db9077158d5c7171dfe10dad41f5d91b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011f6c8203e880a0792550726ad74bc431ed2b5dbac49972813f85da2b767ea7f1ae6290598651cb88a64b5871519fb175f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0b6e2a2c237d5efb01b27633081b0728131987e2efd4a4a931d54bd76fd40aedda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00a8f827423c5669d4b8b574ed3e49ecef7f15e5f59d90deecfbfa7b9caf6fa9ea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06e497a9b8deb4cc24f5baafb106b6d8f0db9077158d5c7171dfe10dad41f5d91b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011f6c8203e880a0afd447e6080a4c7d31f7269b3dd3018f2e69fa8872c350f802d2b98df7f4967c8890b9b3e21686f51df865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0db2db3f011235462454573fd9e0431d48a562f8f6c4fcbe18f5f808fb775c21ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x37e592a35c8d8b61de8f7540383dc7c5c3d933cf8d2f66b052bf56c9496d94a8",
+        "lastblockhash" : "0x2d93021b3f759ba7b54379f7f18548409b9e86fbf144ef97811f87367da74515",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest463BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest463BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest463BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x012278",
-                    "hash" : "0xd17e25c52b97664f5a53b0d65601285c3a417590dabdd84c299d370ee9d30c47",
-                    "mixHash" : "0x1d5d521975262e2da81b9c4eec24d548f2eec74884540c7bad7919d78c93ae14",
-                    "nonce" : "0x6273b75203f78c4d",
+                    "hash" : "0x1652ba6e16165cbf6d134f6b719f3dd6bd4cd137ae8e5c6018a0b68a25cabc29",
+                    "mixHash" : "0x688a249afe24592964aed1904890facac0f807ea29f3cbd7ff9f5eaa24a0f68a",
+                    "nonce" : "0x0f89b4d3ba395b7d",
                     "number" : "0x01",
                     "parentHash" : "0xb6e2a2c237d5efb01b27633081b0728131987e2efd4a4a931d54bd76fd40aedd",
                     "receiptTrie" : "0x00b3d066ae06c17cc885d85ce339585a38c7cd241665456a5b7a162c685bad84",
-                    "stateRoot" : "0x136df19c114bf6da9d0c92df54e3b7b7d75979b75518488bbd883c59f7fd6182",
+                    "stateRoot" : "0x5e30da10d44657830a139a5b2a19b2d1637b2396185e96e527f6922b512c4ee5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0b6e2a2c237d5efb01b27633081b0728131987e2efd4a4a931d54bd76fd40aedda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0136df19c114bf6da9d0c92df54e3b7b7d75979b75518488bbd883c59f7fd6182a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa000b3d066ae06c17cc885d85ce339585a38c7cd241665456a5b7a162c685bad84b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830122788203e880a01d5d521975262e2da81b9c4eec24d548f2eec74884540c7bad7919d78c93ae14886273b75203f78c4df865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0b6e2a2c237d5efb01b27633081b0728131987e2efd4a4a931d54bd76fd40aedda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05e30da10d44657830a139a5b2a19b2d1637b2396185e96e527f6922b512c4ee5a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa000b3d066ae06c17cc885d85ce339585a38c7cd241665456a5b7a162c685bad84b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830122788203e880a0688a249afe24592964aed1904890facac0f807ea29f3cbd7ff9f5eaa24a0f68a880f89b4d3ba395b7df865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0db2db3f011235462454573fd9e0431d48a562f8f6c4fcbe18f5f808fb775c21ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd17e25c52b97664f5a53b0d65601285c3a417590dabdd84c299d370ee9d30c47",
+        "lastblockhash" : "0x1652ba6e16165cbf6d134f6b719f3dd6bd4cd137ae8e5c6018a0b68a25cabc29",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x4344434041424243f27a",
@@ -233,8 +226,8 @@
     "randomStatetest463BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest463BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest463BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x011f6c",
-                    "hash" : "0xf2297ce0437a3d067b5e8b8623a666c7b286fd30af73565f8115556f4fdc1e51",
-                    "mixHash" : "0xba879b011746b786e6213e5a17e1d72f4541680d6a3b21f66542c4d01dd2efce",
-                    "nonce" : "0xd16b51bd44af17ca",
+                    "hash" : "0x854a38fbbcc7d41bb938aab361ae89c868d3fa7b2a8902a8963686e65d8b72ed",
+                    "mixHash" : "0xffc988d5c255c6a2272adb2cf3d2afdd8e6f3acdaed1899ef2f2c45eb1667329",
+                    "nonce" : "0xbbccd7a426e1025b",
                     "number" : "0x01",
                     "parentHash" : "0xb6e2a2c237d5efb01b27633081b0728131987e2efd4a4a931d54bd76fd40aedd",
                     "receiptTrie" : "0xc8f9c1cad2d961caa811f29b896a34c30793724af2b6133bc1b10ec51307f5b9",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0b6e2a2c237d5efb01b27633081b0728131987e2efd4a4a931d54bd76fd40aedda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0808031eef6a2aee0481fdc434951cc04f8a8e18895b38198d52b3862fdb79b06a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0c8f9c1cad2d961caa811f29b896a34c30793724af2b6133bc1b10ec51307f5b9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011f6c8203e880a0ba879b011746b786e6213e5a17e1d72f4541680d6a3b21f66542c4d01dd2efce88d16b51bd44af17caf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0b6e2a2c237d5efb01b27633081b0728131987e2efd4a4a931d54bd76fd40aedda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0808031eef6a2aee0481fdc434951cc04f8a8e18895b38198d52b3862fdb79b06a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0c8f9c1cad2d961caa811f29b896a34c30793724af2b6133bc1b10ec51307f5b9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011f6c8203e880a0ffc988d5c255c6a2272adb2cf3d2afdd8e6f3acdaed1899ef2f2c45eb166732988bbccd7a426e1025bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0db2db3f011235462454573fd9e0431d48a562f8f6c4fcbe18f5f808fb775c21ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf2297ce0437a3d067b5e8b8623a666c7b286fd30af73565f8115556f4fdc1e51",
+        "lastblockhash" : "0x854a38fbbcc7d41bb938aab361ae89c868d3fa7b2a8902a8963686e65d8b72ed",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest463BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest463BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest463BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x011f6c",
-                    "hash" : "0x7ab8e4c88debd36b65d3aa4172bac70498550fe785333a043c2bee19f318ffcf",
-                    "mixHash" : "0x199fbbe23bfb896b5e4814e8a32125881e80d4d89d96e49182a42e5d52a60408",
-                    "nonce" : "0xc545ec41ddf776d6",
+                    "hash" : "0xda88b9a4f853d1ebe9d487c7293ae56a4733eea739fbf4fb7e86ac033e5d62ea",
+                    "mixHash" : "0xd5d90a570e6d07571ed1ee15f74f9f7891ffd084438b3ef8b483702c5cb6b639",
+                    "nonce" : "0xe9906f85955deaa7",
                     "number" : "0x01",
                     "parentHash" : "0xb6e2a2c237d5efb01b27633081b0728131987e2efd4a4a931d54bd76fd40aedd",
                     "receiptTrie" : "0xc8f9c1cad2d961caa811f29b896a34c30793724af2b6133bc1b10ec51307f5b9",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0b6e2a2c237d5efb01b27633081b0728131987e2efd4a4a931d54bd76fd40aedda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0808031eef6a2aee0481fdc434951cc04f8a8e18895b38198d52b3862fdb79b06a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0c8f9c1cad2d961caa811f29b896a34c30793724af2b6133bc1b10ec51307f5b9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011f6c8203e880a0199fbbe23bfb896b5e4814e8a32125881e80d4d89d96e49182a42e5d52a6040888c545ec41ddf776d6f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0b6e2a2c237d5efb01b27633081b0728131987e2efd4a4a931d54bd76fd40aedda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0808031eef6a2aee0481fdc434951cc04f8a8e18895b38198d52b3862fdb79b06a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0c8f9c1cad2d961caa811f29b896a34c30793724af2b6133bc1b10ec51307f5b9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011f6c8203e880a0d5d90a570e6d07571ed1ee15f74f9f7891ffd084438b3ef8b483702c5cb6b63988e9906f85955deaa7f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0db2db3f011235462454573fd9e0431d48a562f8f6c4fcbe18f5f808fb775c21ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7ab8e4c88debd36b65d3aa4172bac70498550fe785333a043c2bee19f318ffcf",
+        "lastblockhash" : "0xda88b9a4f853d1ebe9d487c7293ae56a4733eea739fbf4fb7e86ac033e5d62ea",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest463BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest463BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest463BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x011cd8",
-                    "hash" : "0x3cd5ea937476ac53190827408a1d212dbc8587100836820b6823e7a5f1aca997",
-                    "mixHash" : "0xc1c0f26b3f619e0918e1be6f9a0dcb0c4b6075d4287b737fd4eee8807bdef329",
-                    "nonce" : "0x857ee0be68ce6c30",
+                    "hash" : "0xc1374b2829f3202fa2821f9c4dbdfe48b2b65cddf141a6ae4d434457c6c26dc7",
+                    "mixHash" : "0xdba89c83c8c81d55966a5f7fab01894f80110b0466f267bf73c7a1fdd344e57d",
+                    "nonce" : "0x447433a3df2e96ea",
                     "number" : "0x01",
                     "parentHash" : "0xb6e2a2c237d5efb01b27633081b0728131987e2efd4a4a931d54bd76fd40aedd",
                     "receiptTrie" : "0xbb8e841f669747e47675dc0b488641395aaaa95c219adc1092ea3c655e95f861",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0b6e2a2c237d5efb01b27633081b0728131987e2efd4a4a931d54bd76fd40aedda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03a999eb01aafd23b35dff08b409aaf83306ebe699ca380bdd5c68654bb2027e3a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0bb8e841f669747e47675dc0b488641395aaaa95c219adc1092ea3c655e95f861b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011cd88203e880a0c1c0f26b3f619e0918e1be6f9a0dcb0c4b6075d4287b737fd4eee8807bdef32988857ee0be68ce6c30f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0b6e2a2c237d5efb01b27633081b0728131987e2efd4a4a931d54bd76fd40aedda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03a999eb01aafd23b35dff08b409aaf83306ebe699ca380bdd5c68654bb2027e3a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0bb8e841f669747e47675dc0b488641395aaaa95c219adc1092ea3c655e95f861b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011cd88203e880a0dba89c83c8c81d55966a5f7fab01894f80110b0466f267bf73c7a1fdd344e57d88447433a3df2e96eaf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0db2db3f011235462454573fd9e0431d48a562f8f6c4fcbe18f5f808fb775c21ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3cd5ea937476ac53190827408a1d212dbc8587100836820b6823e7a5f1aca997",
+        "lastblockhash" : "0xc1374b2829f3202fa2821f9c4dbdfe48b2b65cddf141a6ae4d434457c6c26dc7",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest463BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest463BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest463BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x011cd8",
-                    "hash" : "0x88ac39cff78decef6414680209271de0565408d477a07692b467e9a6a88c8e2c",
-                    "mixHash" : "0x0218821b26e3b700e352104cbf5f148c25a7ec5a4b70f49122737494fafbfffc",
-                    "nonce" : "0xf34a02eeb8100be4",
+                    "hash" : "0x5a3f0ac03d547e584600130e285a265eaa1c11b7b1a5f59d6229d71dca051edc",
+                    "mixHash" : "0x4cec1f3cf7bcbb2a2662988b6b64b3e4dfefcf6039ecc0b062331eafc22a4b5e",
+                    "nonce" : "0x966bf2c82a93e8f9",
                     "number" : "0x01",
                     "parentHash" : "0xb6e2a2c237d5efb01b27633081b0728131987e2efd4a4a931d54bd76fd40aedd",
                     "receiptTrie" : "0xbb8e841f669747e47675dc0b488641395aaaa95c219adc1092ea3c655e95f861",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0b6e2a2c237d5efb01b27633081b0728131987e2efd4a4a931d54bd76fd40aedda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03a999eb01aafd23b35dff08b409aaf83306ebe699ca380bdd5c68654bb2027e3a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0bb8e841f669747e47675dc0b488641395aaaa95c219adc1092ea3c655e95f861b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011cd88203e880a00218821b26e3b700e352104cbf5f148c25a7ec5a4b70f49122737494fafbfffc88f34a02eeb8100be4f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0b6e2a2c237d5efb01b27633081b0728131987e2efd4a4a931d54bd76fd40aedda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03a999eb01aafd23b35dff08b409aaf83306ebe699ca380bdd5c68654bb2027e3a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0bb8e841f669747e47675dc0b488641395aaaa95c219adc1092ea3c655e95f861b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011cd88203e880a04cec1f3cf7bcbb2a2662988b6b64b3e4dfefcf6039ecc0b062331eafc22a4b5e88966bf2c82a93e8f9f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0db2db3f011235462454573fd9e0431d48a562f8f6c4fcbe18f5f808fb775c21ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x88ac39cff78decef6414680209271de0565408d477a07692b467e9a6a88c8e2c",
+        "lastblockhash" : "0x5a3f0ac03d547e584600130e285a265eaa1c11b7b1a5f59d6229d71dca051edc",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest479BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest479BC.json
index 1af061474..75404f1f0 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest479BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest479BC.json
@@ -2,8 +2,8 @@
     "randomStatetest479BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest479BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest479BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6851",
-                    "hash" : "0xc650b17669843dca4cd2bfa07d436999b79a6facab8fdd6427fe0c70863a6b7f",
-                    "mixHash" : "0x333077192b51e9e6f1aa1df36717188d5db5635a7d0ea973f822905e174deb16",
-                    "nonce" : "0x7d95fad9d07c5166",
+                    "hash" : "0x4b04c971fa94af71186a4047d82b88ea5f73fbf9f249438165c738614a346c0e",
+                    "mixHash" : "0x7e7e4f19e2c47b0d7ea9ea7f654f74ac2fe0890898d12fb362e550e24320355c",
+                    "nonce" : "0x4160b842d758b83f",
                     "number" : "0x01",
                     "parentHash" : "0x856a33d36638cf6d25458ec3714206a2bf5e4d3177a3e6b45fea49660ead9836",
                     "receiptTrie" : "0x422fbad2a86d54b261419ccc26245fd4b231c4cbb9672d7a66eeb56bc32d3255",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x69da25177e32add3ac9612ea901e2ffea753058328732e3ce0b57c578cd7342d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9035bf901fca0856a33d36638cf6d25458ec3714206a2bf5e4d3177a3e6b45fea49660ead9836a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09fad6e8abe66dea72df53df73208febdaf04643991b8b664f4af187ba90462e0a069da25177e32add3ac9612ea901e2ffea753058328732e3ce0b57c578cd7342da0422fbad2a86d54b261419ccc26245fd4b231c4cbb9672d7a66eeb56bc32d3255b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8268518203e880a0333077192b51e9e6f1aa1df36717188d5db5635a7d0ea973f822905e174deb16887d95fad9d07c5166f90158f901558001844ebcbc6d94095e7baea6a6c7c4c2dfeb977efac326af552d87846f4a6daeb8ef7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3504035820b5079891ba028ed84d23b8fa8ebff2e23d7d59d3b03381ed3cfa35cc95b98f4b1d22971fc1ca01f546feae23f946d5b29975517b9359d7636681b9252ec786daedfd9a0ba5d91c0",
+                "rlp" : "0xf9035bf901fca0856a33d36638cf6d25458ec3714206a2bf5e4d3177a3e6b45fea49660ead9836a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09fad6e8abe66dea72df53df73208febdaf04643991b8b664f4af187ba90462e0a069da25177e32add3ac9612ea901e2ffea753058328732e3ce0b57c578cd7342da0422fbad2a86d54b261419ccc26245fd4b231c4cbb9672d7a66eeb56bc32d3255b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8268518203e880a07e7e4f19e2c47b0d7ea9ea7f654f74ac2fe0890898d12fb362e550e24320355c884160b842d758b83ff90158f901558001844ebcbc6d94095e7baea6a6c7c4c2dfeb977efac326af552d87846f4a6daeb8ef7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3504035820b5079891ba028ed84d23b8fa8ebff2e23d7d59d3b03381ed3cfa35cc95b98f4b1d22971fc1ca01f546feae23f946d5b29975517b9359d7636681b9252ec786daedfd9a0ba5d91c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3504035820b507989",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a64ed377a9c6c615eb2bfde3f422917fad26b0fb5819f5908fcaf0d00c28defca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc650b17669843dca4cd2bfa07d436999b79a6facab8fdd6427fe0c70863a6b7f",
+        "lastblockhash" : "0x4b04c971fa94af71186a4047d82b88ea5f73fbf9f249438165c738614a346c0e",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest479BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest479BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest479BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6e69",
-                    "hash" : "0xd99b3da4fac6c9606e84da99999dd0ea364ea3fd3e0373451f6eb6edbbc911c4",
-                    "mixHash" : "0x8764ad4c807cef35d71a448a681ef3b37f246d7d559644772e41e9bc17a21cc7",
-                    "nonce" : "0xdf86eec8f7fcb29e",
+                    "hash" : "0x1c4f9576215e24696be02026ddd9bae2439f23de022fb48a2f3edba57f5569fe",
+                    "mixHash" : "0x9a3c4a586359b10307cc75366ae2a8de47b96629ff6adf3a92b443eb8c93e365",
+                    "nonce" : "0xcb04a06e8847379a",
                     "number" : "0x01",
                     "parentHash" : "0x856a33d36638cf6d25458ec3714206a2bf5e4d3177a3e6b45fea49660ead9836",
                     "receiptTrie" : "0x988473b10543aa1f9a78b0b83284bef6dd4b14e9cbab51f7798c662c4737f84f",
-                    "stateRoot" : "0x300d6ae65981c212e4192f14bfa4d07dd8dc21eb93d2dcf1afb5718c63ca14bc",
+                    "stateRoot" : "0x62a5013a037f51e3aa12e4a6457084f4ccf2b6ae001cd53311b866e4fe3d98c7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x69da25177e32add3ac9612ea901e2ffea753058328732e3ce0b57c578cd7342d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9035bf901fca0856a33d36638cf6d25458ec3714206a2bf5e4d3177a3e6b45fea49660ead9836a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0300d6ae65981c212e4192f14bfa4d07dd8dc21eb93d2dcf1afb5718c63ca14bca069da25177e32add3ac9612ea901e2ffea753058328732e3ce0b57c578cd7342da0988473b10543aa1f9a78b0b83284bef6dd4b14e9cbab51f7798c662c4737f84fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826e698203e880a08764ad4c807cef35d71a448a681ef3b37f246d7d559644772e41e9bc17a21cc788df86eec8f7fcb29ef90158f901558001844ebcbc6d94095e7baea6a6c7c4c2dfeb977efac326af552d87846f4a6daeb8ef7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3504035820b5079891ba028ed84d23b8fa8ebff2e23d7d59d3b03381ed3cfa35cc95b98f4b1d22971fc1ca01f546feae23f946d5b29975517b9359d7636681b9252ec786daedfd9a0ba5d91c0",
+                "rlp" : "0xf9035bf901fca0856a33d36638cf6d25458ec3714206a2bf5e4d3177a3e6b45fea49660ead9836a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a062a5013a037f51e3aa12e4a6457084f4ccf2b6ae001cd53311b866e4fe3d98c7a069da25177e32add3ac9612ea901e2ffea753058328732e3ce0b57c578cd7342da0988473b10543aa1f9a78b0b83284bef6dd4b14e9cbab51f7798c662c4737f84fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826e698203e880a09a3c4a586359b10307cc75366ae2a8de47b96629ff6adf3a92b443eb8c93e36588cb04a06e8847379af90158f901558001844ebcbc6d94095e7baea6a6c7c4c2dfeb977efac326af552d87846f4a6daeb8ef7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3504035820b5079891ba028ed84d23b8fa8ebff2e23d7d59d3b03381ed3cfa35cc95b98f4b1d22971fc1ca01f546feae23f946d5b29975517b9359d7636681b9252ec786daedfd9a0ba5d91c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3504035820b507989",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a64ed377a9c6c615eb2bfde3f422917fad26b0fb5819f5908fcaf0d00c28defca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd99b3da4fac6c9606e84da99999dd0ea364ea3fd3e0373451f6eb6edbbc911c4",
+        "lastblockhash" : "0x1c4f9576215e24696be02026ddd9bae2439f23de022fb48a2f3edba57f5569fe",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x6f4a6dae",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3504035820b5079895560005155",
@@ -233,8 +226,8 @@
     "randomStatetest479BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest479BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest479BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6851",
-                    "hash" : "0xe997174b71fecb43c25ee19e0f90ad24625ad6c408100869d340e3ce8b0aca24",
-                    "mixHash" : "0xc51d7ba78cdc902e6242cfdad1cd3df7fe05ce7cafd7e211782ec06cb9799b47",
-                    "nonce" : "0x50f236eef1c7108a",
+                    "hash" : "0xd744d93302fb22aa82981b2b73c0b4aa00b4a2f15595266aa5dfea429163a3a8",
+                    "mixHash" : "0xa528a76c3599a6a199ec37ce341c5d52bf8c604184d1463faf39b3980358cda3",
+                    "nonce" : "0x0ef2dc54a2b40c11",
                     "number" : "0x01",
                     "parentHash" : "0x856a33d36638cf6d25458ec3714206a2bf5e4d3177a3e6b45fea49660ead9836",
                     "receiptTrie" : "0x9a97aa5df6b287bf9f08a64f6a64c2ad9d6415be51bfe69ccefc5cc25c47d822",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0x69da25177e32add3ac9612ea901e2ffea753058328732e3ce0b57c578cd7342d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9035bf901fca0856a33d36638cf6d25458ec3714206a2bf5e4d3177a3e6b45fea49660ead9836a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02217bab70ea93376c729c54aa7e919c816e4d506d769f71863705d2acc7f4e3ea069da25177e32add3ac9612ea901e2ffea753058328732e3ce0b57c578cd7342da09a97aa5df6b287bf9f08a64f6a64c2ad9d6415be51bfe69ccefc5cc25c47d822b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8268518203e880a0c51d7ba78cdc902e6242cfdad1cd3df7fe05ce7cafd7e211782ec06cb9799b478850f236eef1c7108af90158f901558001844ebcbc6d94095e7baea6a6c7c4c2dfeb977efac326af552d87846f4a6daeb8ef7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3504035820b5079891ba028ed84d23b8fa8ebff2e23d7d59d3b03381ed3cfa35cc95b98f4b1d22971fc1ca01f546feae23f946d5b29975517b9359d7636681b9252ec786daedfd9a0ba5d91c0",
+                "rlp" : "0xf9035bf901fca0856a33d36638cf6d25458ec3714206a2bf5e4d3177a3e6b45fea49660ead9836a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02217bab70ea93376c729c54aa7e919c816e4d506d769f71863705d2acc7f4e3ea069da25177e32add3ac9612ea901e2ffea753058328732e3ce0b57c578cd7342da09a97aa5df6b287bf9f08a64f6a64c2ad9d6415be51bfe69ccefc5cc25c47d822b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8268518203e880a0a528a76c3599a6a199ec37ce341c5d52bf8c604184d1463faf39b3980358cda3880ef2dc54a2b40c11f90158f901558001844ebcbc6d94095e7baea6a6c7c4c2dfeb977efac326af552d87846f4a6daeb8ef7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3504035820b5079891ba028ed84d23b8fa8ebff2e23d7d59d3b03381ed3cfa35cc95b98f4b1d22971fc1ca01f546feae23f946d5b29975517b9359d7636681b9252ec786daedfd9a0ba5d91c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3504035820b507989",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a64ed377a9c6c615eb2bfde3f422917fad26b0fb5819f5908fcaf0d00c28defca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe997174b71fecb43c25ee19e0f90ad24625ad6c408100869d340e3ce8b0aca24",
+        "lastblockhash" : "0xd744d93302fb22aa82981b2b73c0b4aa00b4a2f15595266aa5dfea429163a3a8",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest479BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest479BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest479BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6851",
-                    "hash" : "0x2129561b88cfa725a996ffc53853834cf08b4020f9c5d9cd07c0978ddf189ec5",
-                    "mixHash" : "0xb402d883a9ebec65ddf4eaeb1f7a781b9164225f9eefea91da1eff42ab5f1238",
-                    "nonce" : "0xe7bc749237c9eed2",
+                    "hash" : "0x4b5f0f9b62f6555b7740d91d7c82c5975ca90c41eaf05daf03700c86bab2213c",
+                    "mixHash" : "0x137d10d7cfb8fee769ec85cbb47b4c1b1cf1bb4d3d5d9e8ff9cf39cc4764c58f",
+                    "nonce" : "0xb376049cf84b2fbd",
                     "number" : "0x01",
                     "parentHash" : "0x856a33d36638cf6d25458ec3714206a2bf5e4d3177a3e6b45fea49660ead9836",
                     "receiptTrie" : "0x9a97aa5df6b287bf9f08a64f6a64c2ad9d6415be51bfe69ccefc5cc25c47d822",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0x69da25177e32add3ac9612ea901e2ffea753058328732e3ce0b57c578cd7342d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9035bf901fca0856a33d36638cf6d25458ec3714206a2bf5e4d3177a3e6b45fea49660ead9836a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02217bab70ea93376c729c54aa7e919c816e4d506d769f71863705d2acc7f4e3ea069da25177e32add3ac9612ea901e2ffea753058328732e3ce0b57c578cd7342da09a97aa5df6b287bf9f08a64f6a64c2ad9d6415be51bfe69ccefc5cc25c47d822b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8268518203e880a0b402d883a9ebec65ddf4eaeb1f7a781b9164225f9eefea91da1eff42ab5f123888e7bc749237c9eed2f90158f901558001844ebcbc6d94095e7baea6a6c7c4c2dfeb977efac326af552d87846f4a6daeb8ef7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3504035820b5079891ba028ed84d23b8fa8ebff2e23d7d59d3b03381ed3cfa35cc95b98f4b1d22971fc1ca01f546feae23f946d5b29975517b9359d7636681b9252ec786daedfd9a0ba5d91c0",
+                "rlp" : "0xf9035bf901fca0856a33d36638cf6d25458ec3714206a2bf5e4d3177a3e6b45fea49660ead9836a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02217bab70ea93376c729c54aa7e919c816e4d506d769f71863705d2acc7f4e3ea069da25177e32add3ac9612ea901e2ffea753058328732e3ce0b57c578cd7342da09a97aa5df6b287bf9f08a64f6a64c2ad9d6415be51bfe69ccefc5cc25c47d822b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8268518203e880a0137d10d7cfb8fee769ec85cbb47b4c1b1cf1bb4d3d5d9e8ff9cf39cc4764c58f88b376049cf84b2fbdf90158f901558001844ebcbc6d94095e7baea6a6c7c4c2dfeb977efac326af552d87846f4a6daeb8ef7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3504035820b5079891ba028ed84d23b8fa8ebff2e23d7d59d3b03381ed3cfa35cc95b98f4b1d22971fc1ca01f546feae23f946d5b29975517b9359d7636681b9252ec786daedfd9a0ba5d91c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3504035820b507989",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a64ed377a9c6c615eb2bfde3f422917fad26b0fb5819f5908fcaf0d00c28defca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2129561b88cfa725a996ffc53853834cf08b4020f9c5d9cd07c0978ddf189ec5",
+        "lastblockhash" : "0x4b5f0f9b62f6555b7740d91d7c82c5975ca90c41eaf05daf03700c86bab2213c",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest479BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest479BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest479BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6851",
-                    "hash" : "0x5c6121cfb9a0a7a7909c436bfa61cd1dc9ee96e6e9218a0f4f8beae7a8d7325b",
-                    "mixHash" : "0x14157525a6ea23838beb843e10f0106618d5ee178402042c38bcd2f0ec9ce4ec",
-                    "nonce" : "0xc6bfb2c9950cbf36",
+                    "hash" : "0x9e9a5801be55c5b986f24c4388887f2dd880b1c6da563e9ed8d9dfa086c652bd",
+                    "mixHash" : "0x791118191d4777aea7a5d0bb3c09411e8b977b723a2cb2af1d8c350aca83e270",
+                    "nonce" : "0xd0c3e5a0353c7b6a",
                     "number" : "0x01",
                     "parentHash" : "0x856a33d36638cf6d25458ec3714206a2bf5e4d3177a3e6b45fea49660ead9836",
                     "receiptTrie" : "0x9a97aa5df6b287bf9f08a64f6a64c2ad9d6415be51bfe69ccefc5cc25c47d822",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0x69da25177e32add3ac9612ea901e2ffea753058328732e3ce0b57c578cd7342d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9035bf901fca0856a33d36638cf6d25458ec3714206a2bf5e4d3177a3e6b45fea49660ead9836a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02217bab70ea93376c729c54aa7e919c816e4d506d769f71863705d2acc7f4e3ea069da25177e32add3ac9612ea901e2ffea753058328732e3ce0b57c578cd7342da09a97aa5df6b287bf9f08a64f6a64c2ad9d6415be51bfe69ccefc5cc25c47d822b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8268518203e880a014157525a6ea23838beb843e10f0106618d5ee178402042c38bcd2f0ec9ce4ec88c6bfb2c9950cbf36f90158f901558001844ebcbc6d94095e7baea6a6c7c4c2dfeb977efac326af552d87846f4a6daeb8ef7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3504035820b5079891ba028ed84d23b8fa8ebff2e23d7d59d3b03381ed3cfa35cc95b98f4b1d22971fc1ca01f546feae23f946d5b29975517b9359d7636681b9252ec786daedfd9a0ba5d91c0",
+                "rlp" : "0xf9035bf901fca0856a33d36638cf6d25458ec3714206a2bf5e4d3177a3e6b45fea49660ead9836a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02217bab70ea93376c729c54aa7e919c816e4d506d769f71863705d2acc7f4e3ea069da25177e32add3ac9612ea901e2ffea753058328732e3ce0b57c578cd7342da09a97aa5df6b287bf9f08a64f6a64c2ad9d6415be51bfe69ccefc5cc25c47d822b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8268518203e880a0791118191d4777aea7a5d0bb3c09411e8b977b723a2cb2af1d8c350aca83e27088d0c3e5a0353c7b6af90158f901558001844ebcbc6d94095e7baea6a6c7c4c2dfeb977efac326af552d87846f4a6daeb8ef7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3504035820b5079891ba028ed84d23b8fa8ebff2e23d7d59d3b03381ed3cfa35cc95b98f4b1d22971fc1ca01f546feae23f946d5b29975517b9359d7636681b9252ec786daedfd9a0ba5d91c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3504035820b507989",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a64ed377a9c6c615eb2bfde3f422917fad26b0fb5819f5908fcaf0d00c28defca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5c6121cfb9a0a7a7909c436bfa61cd1dc9ee96e6e9218a0f4f8beae7a8d7325b",
+        "lastblockhash" : "0x9e9a5801be55c5b986f24c4388887f2dd880b1c6da563e9ed8d9dfa086c652bd",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest479BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest479BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest479BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6851",
-                    "hash" : "0x356564d266ae32ddb3a55685872a77174af83faefcd2b5283e10e19d9664bbed",
-                    "mixHash" : "0x217f49e49d8be49ccbe99edca160c10f3701b471cbc1963324682219a5d57ff6",
-                    "nonce" : "0x7ec4bca6021a6851",
+                    "hash" : "0x87c470c8eee016dae4024d947a5a9dddfc468824d2ad7a9330ad081d42a42298",
+                    "mixHash" : "0xaa4ed03ee8a437f26c6ab5154f43a85b5dfbd91dd4436d4657e0e8d8a336a97e",
+                    "nonce" : "0xb5268643d32f8504",
                     "number" : "0x01",
                     "parentHash" : "0x856a33d36638cf6d25458ec3714206a2bf5e4d3177a3e6b45fea49660ead9836",
                     "receiptTrie" : "0x9a97aa5df6b287bf9f08a64f6a64c2ad9d6415be51bfe69ccefc5cc25c47d822",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0x69da25177e32add3ac9612ea901e2ffea753058328732e3ce0b57c578cd7342d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9035bf901fca0856a33d36638cf6d25458ec3714206a2bf5e4d3177a3e6b45fea49660ead9836a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02217bab70ea93376c729c54aa7e919c816e4d506d769f71863705d2acc7f4e3ea069da25177e32add3ac9612ea901e2ffea753058328732e3ce0b57c578cd7342da09a97aa5df6b287bf9f08a64f6a64c2ad9d6415be51bfe69ccefc5cc25c47d822b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8268518203e880a0217f49e49d8be49ccbe99edca160c10f3701b471cbc1963324682219a5d57ff6887ec4bca6021a6851f90158f901558001844ebcbc6d94095e7baea6a6c7c4c2dfeb977efac326af552d87846f4a6daeb8ef7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3504035820b5079891ba028ed84d23b8fa8ebff2e23d7d59d3b03381ed3cfa35cc95b98f4b1d22971fc1ca01f546feae23f946d5b29975517b9359d7636681b9252ec786daedfd9a0ba5d91c0",
+                "rlp" : "0xf9035bf901fca0856a33d36638cf6d25458ec3714206a2bf5e4d3177a3e6b45fea49660ead9836a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02217bab70ea93376c729c54aa7e919c816e4d506d769f71863705d2acc7f4e3ea069da25177e32add3ac9612ea901e2ffea753058328732e3ce0b57c578cd7342da09a97aa5df6b287bf9f08a64f6a64c2ad9d6415be51bfe69ccefc5cc25c47d822b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8268518203e880a0aa4ed03ee8a437f26c6ab5154f43a85b5dfbd91dd4436d4657e0e8d8a336a97e88b5268643d32f8504f90158f901558001844ebcbc6d94095e7baea6a6c7c4c2dfeb977efac326af552d87846f4a6daeb8ef7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3504035820b5079891ba028ed84d23b8fa8ebff2e23d7d59d3b03381ed3cfa35cc95b98f4b1d22971fc1ca01f546feae23f946d5b29975517b9359d7636681b9252ec786daedfd9a0ba5d91c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3504035820b507989",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a64ed377a9c6c615eb2bfde3f422917fad26b0fb5819f5908fcaf0d00c28defca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x356564d266ae32ddb3a55685872a77174af83faefcd2b5283e10e19d9664bbed",
+        "lastblockhash" : "0x87c470c8eee016dae4024d947a5a9dddfc468824d2ad7a9330ad081d42a42298",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest486BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest486BC.json
index 2a9df1cc1..ea14dae77 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest486BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest486BC.json
@@ -2,8 +2,8 @@
     "randomStatetest486BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest486BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest486BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa1e2",
-                    "hash" : "0xf16eeda20080901bab7a4021b555a7bec6f1715e8e6160c39ee147bd0240c875",
-                    "mixHash" : "0x24e47752bacab3a206757508089090696dd19e1430d17b292dc81987c06951c0",
-                    "nonce" : "0x3ded3742afe2607f",
+                    "hash" : "0xdce244e4149ec351c3c859d60596ae0776ad9c7fc5ca053a615c7ba7d27800c6",
+                    "mixHash" : "0xd4146ad55775a55b4f312ac433bc76fd20f61b4bc0c44e36277290e4b9bc6040",
+                    "nonce" : "0x921fedf361f8f9d2",
                     "number" : "0x01",
                     "parentHash" : "0x054bf1254678705aa2a435ec1e56a74f57ccb64819106d36eba3c1f50544b324",
                     "receiptTrie" : "0x334943afaaa35662f5de93417c34239ff6df4c3e225a7d5ed8f6bd686db3d4d1",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0054bf1254678705aa2a435ec1e56a74f57ccb64819106d36eba3c1f50544b324a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01aa66ac1d0e98aee538751a08536c0a6188463f07133f5d5b448b79e1d89099ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0334943afaaa35662f5de93417c34239ff6df4c3e225a7d5ed8f6bd686db3d4d1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1e28203e880a024e47752bacab3a206757508089090696dd19e1430d17b292dc81987c06951c0883ded3742afe2607ff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0054bf1254678705aa2a435ec1e56a74f57ccb64819106d36eba3c1f50544b324a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01aa66ac1d0e98aee538751a08536c0a6188463f07133f5d5b448b79e1d89099ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0334943afaaa35662f5de93417c34239ff6df4c3e225a7d5ed8f6bd686db3d4d1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1e28203e880a0d4146ad55775a55b4f312ac433bc76fd20f61b4bc0c44e36277290e4b9bc604088921fedf361f8f9d2f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0890300d8c171b4920fa96d6dfdc2755ef77141c8f48c9e98c37ecbef5287d2e5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf16eeda20080901bab7a4021b555a7bec6f1715e8e6160c39ee147bd0240c875",
+        "lastblockhash" : "0xdce244e4149ec351c3c859d60596ae0776ad9c7fc5ca053a615c7ba7d27800c6",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest486BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest486BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest486BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa7fa",
-                    "hash" : "0x696c7172fb226217473720cc391534e010be39bf306a6c2a1e525cbc9e1a9ffc",
-                    "mixHash" : "0x8c92df8f88482cdbc106f4f15c9b3f2accdfcd94089f65d692418c566147bd66",
-                    "nonce" : "0xf700eae9a3320985",
+                    "hash" : "0x6d050e3948feab3442142aac38ce57ffaaa92868de001c1ba7ed6e673a8e7fca",
+                    "mixHash" : "0xe1d1d52df236dececc1ec6fef0070c3322c8baa5881f15f0c9a8a9e7d3418060",
+                    "nonce" : "0xbcd73bb971d9a6a5",
                     "number" : "0x01",
                     "parentHash" : "0x054bf1254678705aa2a435ec1e56a74f57ccb64819106d36eba3c1f50544b324",
                     "receiptTrie" : "0x21b0606caac257ebcbeb06dc7269b3d40fdb00b3e232a2707b00c7b14eed157b",
-                    "stateRoot" : "0x6b6850348634e59e3bb41c05225a2372a6df98130b8d8bac1d6ece3b40c1cf3b",
+                    "stateRoot" : "0xf479cf8c70f65b3db9de7bb78b6732736ac8be69121e5828213fb2fa1445b2bc",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0054bf1254678705aa2a435ec1e56a74f57ccb64819106d36eba3c1f50544b324a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06b6850348634e59e3bb41c05225a2372a6df98130b8d8bac1d6ece3b40c1cf3ba0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa021b0606caac257ebcbeb06dc7269b3d40fdb00b3e232a2707b00c7b14eed157bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a7fa8203e880a08c92df8f88482cdbc106f4f15c9b3f2accdfcd94089f65d692418c566147bd6688f700eae9a3320985f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0054bf1254678705aa2a435ec1e56a74f57ccb64819106d36eba3c1f50544b324a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f479cf8c70f65b3db9de7bb78b6732736ac8be69121e5828213fb2fa1445b2bca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa021b0606caac257ebcbeb06dc7269b3d40fdb00b3e232a2707b00c7b14eed157bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a7fa8203e880a0e1d1d52df236dececc1ec6fef0070c3322c8baa5881f15f0c9a8a9e7d341806088bcd73bb971d9a6a5f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0890300d8c171b4920fa96d6dfdc2755ef77141c8f48c9e98c37ecbef5287d2e5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x696c7172fb226217473720cc391534e010be39bf306a6c2a1e525cbc9e1a9ffc",
+        "lastblockhash" : "0x6d050e3948feab3442142aac38ce57ffaaa92868de001c1ba7ed6e673a8e7fca",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x4434404341424140203855",
@@ -235,8 +228,8 @@
     "randomStatetest486BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest486BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest486BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa1e2",
-                    "hash" : "0xa04bc80cb898be53edcf4cfe0e3ce51628a77ecda44cb42170c6b142985017be",
-                    "mixHash" : "0x41ef71e3693499a5781b2755fb16e7fb3518a426d4fc248358d27b1c03967495",
-                    "nonce" : "0x4291c60ebb5230e8",
+                    "hash" : "0xeba8a03e3a2e8b8afff0b9d5d292e68f838462d9b338c4486a716c99efded59b",
+                    "mixHash" : "0x33e7a9bba83cc9105ac9e39d0584581ec2f6e27c4d2f548ea8b1f3a29e25debd",
+                    "nonce" : "0x8912387b194272c6",
                     "number" : "0x01",
                     "parentHash" : "0x054bf1254678705aa2a435ec1e56a74f57ccb64819106d36eba3c1f50544b324",
                     "receiptTrie" : "0x7dc2e1ecd1fb6d11a7fefa2c650c44e569c477ed34e6cd6479a8588a8d1f16c1",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0054bf1254678705aa2a435ec1e56a74f57ccb64819106d36eba3c1f50544b324a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01c2645b310016f937f6fc82aefde792479bd197a6119146b09505537f8b99d1ea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa07dc2e1ecd1fb6d11a7fefa2c650c44e569c477ed34e6cd6479a8588a8d1f16c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1e28203e880a041ef71e3693499a5781b2755fb16e7fb3518a426d4fc248358d27b1c03967495884291c60ebb5230e8f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0054bf1254678705aa2a435ec1e56a74f57ccb64819106d36eba3c1f50544b324a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01c2645b310016f937f6fc82aefde792479bd197a6119146b09505537f8b99d1ea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa07dc2e1ecd1fb6d11a7fefa2c650c44e569c477ed34e6cd6479a8588a8d1f16c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1e28203e880a033e7a9bba83cc9105ac9e39d0584581ec2f6e27c4d2f548ea8b1f3a29e25debd888912387b194272c6f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0890300d8c171b4920fa96d6dfdc2755ef77141c8f48c9e98c37ecbef5287d2e5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa04bc80cb898be53edcf4cfe0e3ce51628a77ecda44cb42170c6b142985017be",
+        "lastblockhash" : "0xeba8a03e3a2e8b8afff0b9d5d292e68f838462d9b338c4486a716c99efded59b",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest486BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest486BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest486BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa1e2",
-                    "hash" : "0x6d1ab1ef4ef68d3f2429034771ac0ca544b03e95f7bd660a0ac1d58aade5528e",
-                    "mixHash" : "0xf6c528b75efd7749185120893b1106f75e76d3892561be253716cd6b6323ce39",
-                    "nonce" : "0xb3fa5f795ee1e054",
+                    "hash" : "0xc74c74e939540035e42e9ac1e8395e37d8c71239faca19e68ec0ede48442360b",
+                    "mixHash" : "0xcc67fdc4ea09af0d6093e8793c88c4ab3c3ddb0fdf7155102eb803cdf6a3efad",
+                    "nonce" : "0xa93b426912d8f988",
                     "number" : "0x01",
                     "parentHash" : "0x054bf1254678705aa2a435ec1e56a74f57ccb64819106d36eba3c1f50544b324",
                     "receiptTrie" : "0x7dc2e1ecd1fb6d11a7fefa2c650c44e569c477ed34e6cd6479a8588a8d1f16c1",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0054bf1254678705aa2a435ec1e56a74f57ccb64819106d36eba3c1f50544b324a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01c2645b310016f937f6fc82aefde792479bd197a6119146b09505537f8b99d1ea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa07dc2e1ecd1fb6d11a7fefa2c650c44e569c477ed34e6cd6479a8588a8d1f16c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1e28203e880a0f6c528b75efd7749185120893b1106f75e76d3892561be253716cd6b6323ce3988b3fa5f795ee1e054f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0054bf1254678705aa2a435ec1e56a74f57ccb64819106d36eba3c1f50544b324a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01c2645b310016f937f6fc82aefde792479bd197a6119146b09505537f8b99d1ea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa07dc2e1ecd1fb6d11a7fefa2c650c44e569c477ed34e6cd6479a8588a8d1f16c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1e28203e880a0cc67fdc4ea09af0d6093e8793c88c4ab3c3ddb0fdf7155102eb803cdf6a3efad88a93b426912d8f988f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0890300d8c171b4920fa96d6dfdc2755ef77141c8f48c9e98c37ecbef5287d2e5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6d1ab1ef4ef68d3f2429034771ac0ca544b03e95f7bd660a0ac1d58aade5528e",
+        "lastblockhash" : "0xc74c74e939540035e42e9ac1e8395e37d8c71239faca19e68ec0ede48442360b",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest486BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest486BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest486BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa1e2",
-                    "hash" : "0x388ad1719e485cfcf65c5c15b23a0a39788d65b7062d55c118cd5e4e6cd255ee",
-                    "mixHash" : "0x45935ac1f7e803928562e537fef5c8b6b25b4942f5f6164d76c2298a1bc9a4c8",
-                    "nonce" : "0x97dd80b692b63f46",
+                    "hash" : "0xeb670154e3a2da4fc28bd34f2530470a9b258cf87a1a707695d707507f90cd7c",
+                    "mixHash" : "0x0d0e32bb68c328bbc31c4762b97614b9669f76ab8191ac6ba68bbb5a510ed5af",
+                    "nonce" : "0xb47e89b00b220341",
                     "number" : "0x01",
                     "parentHash" : "0x054bf1254678705aa2a435ec1e56a74f57ccb64819106d36eba3c1f50544b324",
                     "receiptTrie" : "0x7dc2e1ecd1fb6d11a7fefa2c650c44e569c477ed34e6cd6479a8588a8d1f16c1",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0054bf1254678705aa2a435ec1e56a74f57ccb64819106d36eba3c1f50544b324a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01c2645b310016f937f6fc82aefde792479bd197a6119146b09505537f8b99d1ea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa07dc2e1ecd1fb6d11a7fefa2c650c44e569c477ed34e6cd6479a8588a8d1f16c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1e28203e880a045935ac1f7e803928562e537fef5c8b6b25b4942f5f6164d76c2298a1bc9a4c88897dd80b692b63f46f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0054bf1254678705aa2a435ec1e56a74f57ccb64819106d36eba3c1f50544b324a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01c2645b310016f937f6fc82aefde792479bd197a6119146b09505537f8b99d1ea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa07dc2e1ecd1fb6d11a7fefa2c650c44e569c477ed34e6cd6479a8588a8d1f16c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1e28203e880a00d0e32bb68c328bbc31c4762b97614b9669f76ab8191ac6ba68bbb5a510ed5af88b47e89b00b220341f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0890300d8c171b4920fa96d6dfdc2755ef77141c8f48c9e98c37ecbef5287d2e5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x388ad1719e485cfcf65c5c15b23a0a39788d65b7062d55c118cd5e4e6cd255ee",
+        "lastblockhash" : "0xeb670154e3a2da4fc28bd34f2530470a9b258cf87a1a707695d707507f90cd7c",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest486BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest486BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest486BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa1e2",
-                    "hash" : "0xc0dd1facccbdd81c4efcb0e18af6d6e4581b6abb7e5acd1121c8ebb22cd0c964",
-                    "mixHash" : "0xcbd3eb4309f4b6ec509a48bc1ac8d44f95a64fe9f60d1ffa5a6ae00fb4b664e0",
-                    "nonce" : "0x143179f24eed2187",
+                    "hash" : "0xe1bce1d3e03b12f8bf56d20c0814714100b2aac0249c9ee98f22b7b7d329aac0",
+                    "mixHash" : "0xcfd5fa06da2be4f0c35f647b9a8d1d16470b4dca550016e4cf456438e55759cb",
+                    "nonce" : "0x5276a13beeb87ba3",
                     "number" : "0x01",
                     "parentHash" : "0x054bf1254678705aa2a435ec1e56a74f57ccb64819106d36eba3c1f50544b324",
                     "receiptTrie" : "0x7dc2e1ecd1fb6d11a7fefa2c650c44e569c477ed34e6cd6479a8588a8d1f16c1",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0054bf1254678705aa2a435ec1e56a74f57ccb64819106d36eba3c1f50544b324a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01c2645b310016f937f6fc82aefde792479bd197a6119146b09505537f8b99d1ea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa07dc2e1ecd1fb6d11a7fefa2c650c44e569c477ed34e6cd6479a8588a8d1f16c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1e28203e880a0cbd3eb4309f4b6ec509a48bc1ac8d44f95a64fe9f60d1ffa5a6ae00fb4b664e088143179f24eed2187f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0054bf1254678705aa2a435ec1e56a74f57ccb64819106d36eba3c1f50544b324a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01c2645b310016f937f6fc82aefde792479bd197a6119146b09505537f8b99d1ea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa07dc2e1ecd1fb6d11a7fefa2c650c44e569c477ed34e6cd6479a8588a8d1f16c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1e28203e880a0cfd5fa06da2be4f0c35f647b9a8d1d16470b4dca550016e4cf456438e55759cb885276a13beeb87ba3f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0890300d8c171b4920fa96d6dfdc2755ef77141c8f48c9e98c37ecbef5287d2e5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc0dd1facccbdd81c4efcb0e18af6d6e4581b6abb7e5acd1121c8ebb22cd0c964",
+        "lastblockhash" : "0xe1bce1d3e03b12f8bf56d20c0814714100b2aac0249c9ee98f22b7b7d329aac0",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest490BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest490BC.json
index 3f829568f..a0da4e00d 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest490BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest490BC.json
@@ -2,8 +2,8 @@
     "randomStatetest490BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest490BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest490BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa21e",
-                    "hash" : "0x362809d53f2a5864222616def56e6ec76d57dbbeee516a5ca4561c095e81783a",
-                    "mixHash" : "0x12b2b3be2817d25265ebb455af17afa04575a3c4132654844afad393ed961f49",
-                    "nonce" : "0x91984b4706f6746c",
+                    "hash" : "0xe0dbd02dab4ab61edda20c69741aa02e5102f7b34b319c4db3cee54e2a140791",
+                    "mixHash" : "0x611ac1dd09d311165bbb3ff4c128b68d34fe59c07a8d72fb551b0f75b99964bf",
+                    "nonce" : "0xf659bb09bad1f7ca",
                     "number" : "0x01",
                     "parentHash" : "0x3970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32",
                     "receiptTrie" : "0x0a856964c0231fd244b5839cd9cac232ee57dbf5254664eb88381117a032965d",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca03970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0688e9976a4db3a1d2728328d7003f5edeb293ee13f045a0daa7a7280f3cb2b98a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa00a856964c0231fd244b5839cd9cac232ee57dbf5254664eb88381117a032965db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a21e8203e880a012b2b3be2817d25265ebb455af17afa04575a3c4132654844afad393ed961f498891984b4706f6746cf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca03970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0688e9976a4db3a1d2728328d7003f5edeb293ee13f045a0daa7a7280f3cb2b98a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa00a856964c0231fd244b5839cd9cac232ee57dbf5254664eb88381117a032965db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a21e8203e880a0611ac1dd09d311165bbb3ff4c128b68d34fe59c07a8d72fb551b0f75b99964bf88f659bb09bad1f7caf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0662f0fdbcd5c78c2665055cba8b2034152d118f8a576c6c9594f6a35fbc49d72a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x362809d53f2a5864222616def56e6ec76d57dbbeee516a5ca4561c095e81783a",
+        "lastblockhash" : "0xe0dbd02dab4ab61edda20c69741aa02e5102f7b34b319c4db3cee54e2a140791",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest490BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest490BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest490BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa52a",
-                    "hash" : "0x3354dbeadfc0c7318c777b22254482df485f63067c0d5228666b74c9ee8dd499",
-                    "mixHash" : "0x8e4f93688f4ddadb50e5c06b995d8719cde1e12e8757b77cba7dd1f5037ad1d9",
-                    "nonce" : "0x7a6457d40c73cf35",
+                    "hash" : "0x7414cb3426285f135ef2e74d314dd6d1eae44e8811fa80751d2eb71d78039211",
+                    "mixHash" : "0x8e9e51e0fd71061deb172b2ca8c00ec82094aa4bc224b8955511a2cbfcee89cb",
+                    "nonce" : "0x08c10636cf994667",
                     "number" : "0x01",
                     "parentHash" : "0x3970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32",
                     "receiptTrie" : "0x3a932e30db6c53ccd93717e5aecadec06b4ba45981fb0d697df1c7ba766480b5",
-                    "stateRoot" : "0x81dba19921fecc5a675b8a4c0a61a55009c72f945a3ef5f7cd53f7c6e8f1d3a1",
+                    "stateRoot" : "0x86cd7e64cc42fc10d5775d6c037d16c6b027aaee65aa94fa7889f3ea8bd05681",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca03970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a081dba19921fecc5a675b8a4c0a61a55009c72f945a3ef5f7cd53f7c6e8f1d3a1a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa03a932e30db6c53ccd93717e5aecadec06b4ba45981fb0d697df1c7ba766480b5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a52a8203e880a08e4f93688f4ddadb50e5c06b995d8719cde1e12e8757b77cba7dd1f5037ad1d9887a6457d40c73cf35f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca03970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a086cd7e64cc42fc10d5775d6c037d16c6b027aaee65aa94fa7889f3ea8bd05681a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa03a932e30db6c53ccd93717e5aecadec06b4ba45981fb0d697df1c7ba766480b5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a52a8203e880a08e9e51e0fd71061deb172b2ca8c00ec82094aa4bc224b8955511a2cbfcee89cb8808c10636cf994667f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0662f0fdbcd5c78c2665055cba8b2034152d118f8a576c6c9594f6a35fbc49d72a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3354dbeadfc0c7318c777b22254482df485f63067c0d5228666b74c9ee8dd499",
+        "lastblockhash" : "0x7414cb3426285f135ef2e74d314dd6d1eae44e8811fa80751d2eb71d78039211",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x42444143404341413155",
@@ -235,8 +228,8 @@
     "randomStatetest490BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest490BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest490BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa21e",
-                    "hash" : "0x2643af1050ceb86acee535e15324107f1c33b63bf45de31f3dd555c57860c8f5",
-                    "mixHash" : "0x75176ea4995c832d55b534e7a4f54b88101edc958fbe4e43a782ec35fdbd7272",
-                    "nonce" : "0x9838562f8845d31a",
+                    "hash" : "0xa7614df18bedb51e26f75e719294cc4e5839f648d2c615c68b728bcf86d01f08",
+                    "mixHash" : "0x0c4dcc59105b48830a5cb882439b6355ea9279f0a56665a476dda3f204e565ab",
+                    "nonce" : "0x0f426f97f90bce2f",
                     "number" : "0x01",
                     "parentHash" : "0x3970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32",
                     "receiptTrie" : "0x017ccc0e1105d6e7efa7e962b9129b8cb5730ca957636192cd70a1bd187186a0",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca03970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e572203d910f303d4c3381106a262e6c0e94cc1f4c0ce209d01873c0d4b18746a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0017ccc0e1105d6e7efa7e962b9129b8cb5730ca957636192cd70a1bd187186a0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a21e8203e880a075176ea4995c832d55b534e7a4f54b88101edc958fbe4e43a782ec35fdbd7272889838562f8845d31af865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca03970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e572203d910f303d4c3381106a262e6c0e94cc1f4c0ce209d01873c0d4b18746a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0017ccc0e1105d6e7efa7e962b9129b8cb5730ca957636192cd70a1bd187186a0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a21e8203e880a00c4dcc59105b48830a5cb882439b6355ea9279f0a56665a476dda3f204e565ab880f426f97f90bce2ff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0662f0fdbcd5c78c2665055cba8b2034152d118f8a576c6c9594f6a35fbc49d72a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2643af1050ceb86acee535e15324107f1c33b63bf45de31f3dd555c57860c8f5",
+        "lastblockhash" : "0xa7614df18bedb51e26f75e719294cc4e5839f648d2c615c68b728bcf86d01f08",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest490BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest490BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest490BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa21e",
-                    "hash" : "0xff951b54420ee405221235b924720c564f9caa2dcbd4e438fe814b2d52a26d28",
-                    "mixHash" : "0x650414d8dba6737c38da1e3e91fa3844ebc8a2ed345e0928449f58aad257ca6d",
-                    "nonce" : "0xcdf77cd0ef30b7d2",
+                    "hash" : "0x09ac6a0e4d95be88685d125d499a025298f46035891b24308620f632c47fa285",
+                    "mixHash" : "0xa992c27fa1b676a941b5b55400fafae4384306d2982372fee5b400ba8684a83a",
+                    "nonce" : "0x2f932790c3fe905e",
                     "number" : "0x01",
                     "parentHash" : "0x3970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32",
                     "receiptTrie" : "0x017ccc0e1105d6e7efa7e962b9129b8cb5730ca957636192cd70a1bd187186a0",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca03970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e572203d910f303d4c3381106a262e6c0e94cc1f4c0ce209d01873c0d4b18746a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0017ccc0e1105d6e7efa7e962b9129b8cb5730ca957636192cd70a1bd187186a0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a21e8203e880a0650414d8dba6737c38da1e3e91fa3844ebc8a2ed345e0928449f58aad257ca6d88cdf77cd0ef30b7d2f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca03970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e572203d910f303d4c3381106a262e6c0e94cc1f4c0ce209d01873c0d4b18746a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0017ccc0e1105d6e7efa7e962b9129b8cb5730ca957636192cd70a1bd187186a0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a21e8203e880a0a992c27fa1b676a941b5b55400fafae4384306d2982372fee5b400ba8684a83a882f932790c3fe905ef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0662f0fdbcd5c78c2665055cba8b2034152d118f8a576c6c9594f6a35fbc49d72a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xff951b54420ee405221235b924720c564f9caa2dcbd4e438fe814b2d52a26d28",
+        "lastblockhash" : "0x09ac6a0e4d95be88685d125d499a025298f46035891b24308620f632c47fa285",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest490BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest490BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest490BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa0a2",
-                    "hash" : "0x74d2eff62fa5cb7dae62b23cac838f3eb42ca64f623a87a734f30be25825b04b",
-                    "mixHash" : "0xec5ca923c9a95eb10d697846308ab7fdae41e6b33817e61bc056c2a41ac05366",
-                    "nonce" : "0x22a44136d2f6951f",
+                    "hash" : "0x5f0355c77e962472337e102219af9f17df8362724be78151f2ed9b63fac87c2a",
+                    "mixHash" : "0xa4ca83fc7f0fdcf68d976c42f71c9e09e0004519b93fbce5b86c9670a16418a4",
+                    "nonce" : "0xd48419f8375c55ae",
                     "number" : "0x01",
                     "parentHash" : "0x3970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32",
                     "receiptTrie" : "0x12e333ae0b6125db0f462acfb82e35d36f3d9435fbe593725c07b6c7f1029e68",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca03970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04aa9ff137758b8694c13723b648a71c0f4db05bac466dc42db52d5fb13586f36a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa012e333ae0b6125db0f462acfb82e35d36f3d9435fbe593725c07b6c7f1029e68b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a28203e880a0ec5ca923c9a95eb10d697846308ab7fdae41e6b33817e61bc056c2a41ac053668822a44136d2f6951ff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca03970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04aa9ff137758b8694c13723b648a71c0f4db05bac466dc42db52d5fb13586f36a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa012e333ae0b6125db0f462acfb82e35d36f3d9435fbe593725c07b6c7f1029e68b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a28203e880a0a4ca83fc7f0fdcf68d976c42f71c9e09e0004519b93fbce5b86c9670a16418a488d48419f8375c55aef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0662f0fdbcd5c78c2665055cba8b2034152d118f8a576c6c9594f6a35fbc49d72a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x74d2eff62fa5cb7dae62b23cac838f3eb42ca64f623a87a734f30be25825b04b",
+        "lastblockhash" : "0x5f0355c77e962472337e102219af9f17df8362724be78151f2ed9b63fac87c2a",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest490BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest490BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest490BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa0a2",
-                    "hash" : "0x5fa9e14dae0816d856a6252ab7acdad5704e6240b9d974431afcc9e4be405570",
-                    "mixHash" : "0xab549bb3d476356507c0fee0cfeee35215068998349c325f969cee46f7ee7910",
-                    "nonce" : "0x16dee5185218f405",
+                    "hash" : "0xf24f6e4552a6325ad320495ce93fe2a5033f3793d28f90d2209cfd41c2b25ddb",
+                    "mixHash" : "0x3c067e340b9c94ad090de8ce35ac5423d9c23704628580b2decfe3a4be62afdc",
+                    "nonce" : "0x51dbaa7db30c1824",
                     "number" : "0x01",
                     "parentHash" : "0x3970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32",
                     "receiptTrie" : "0x12e333ae0b6125db0f462acfb82e35d36f3d9435fbe593725c07b6c7f1029e68",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca03970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04aa9ff137758b8694c13723b648a71c0f4db05bac466dc42db52d5fb13586f36a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa012e333ae0b6125db0f462acfb82e35d36f3d9435fbe593725c07b6c7f1029e68b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a28203e880a0ab549bb3d476356507c0fee0cfeee35215068998349c325f969cee46f7ee79108816dee5185218f405f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca03970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04aa9ff137758b8694c13723b648a71c0f4db05bac466dc42db52d5fb13586f36a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa012e333ae0b6125db0f462acfb82e35d36f3d9435fbe593725c07b6c7f1029e68b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a28203e880a03c067e340b9c94ad090de8ce35ac5423d9c23704628580b2decfe3a4be62afdc8851dbaa7db30c1824f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0662f0fdbcd5c78c2665055cba8b2034152d118f8a576c6c9594f6a35fbc49d72a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5fa9e14dae0816d856a6252ab7acdad5704e6240b9d974431afcc9e4be405570",
+        "lastblockhash" : "0xf24f6e4552a6325ad320495ce93fe2a5033f3793d28f90d2209cfd41c2b25ddb",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest492BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest492BC.json
index a383d9fa8..df88d058d 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest492BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest492BC.json
@@ -2,8 +2,8 @@
     "randomStatetest492BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest492BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest492BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x011fb9",
-                    "hash" : "0xc6ec9c9f5762571f23a82116a2a653dbea1b84b29876f4a555545d60040ba8db",
-                    "mixHash" : "0x4203c0f622ebcaa4a4776deb7b4ef13f4132bf113dd2f7573b7cc8bf21c16d14",
-                    "nonce" : "0x51e735c0a43adfd0",
+                    "hash" : "0xc06eda2ad86d283dbfa75294d82b6817c57eab3b46ec5a21fadf87931cfbd07b",
+                    "mixHash" : "0x786a4fcef5326b8804c742d2fdb52bdcb684bfc85be592cfd93ea5836820c447",
+                    "nonce" : "0xc4f869a9b1e478f2",
                     "number" : "0x01",
                     "parentHash" : "0xd7c1251fc4509d40efedfb4588822abc3b0a2e9776b068032c80679c206e1e36",
                     "receiptTrie" : "0x55c0f460e0f6bc34b608cc5a5932584b02e8d49618f45feb6598cc309f8878df",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xd316135664de2265832e9cfe45fedf50a9332b5b72af55b725c2808848718961",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90359f901fda0d7c1251fc4509d40efedfb4588822abc3b0a2e9776b068032c80679c206e1e36a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f8a9a7c6c70f0094dbece050367cc191e4350efb02aa9b5eaa6fdc8ecf1a9345a0d316135664de2265832e9cfe45fedf50a9332b5b72af55b725c2808848718961a055c0f460e0f6bc34b608cc5a5932584b02e8d49618f45feb6598cc309f8878dfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011fb98203e880a04203c0f622ebcaa4a4776deb7b4ef13f4132bf113dd2f7573b7cc8bf21c16d148851e735c0a43adfd0f90155f901528001840cbaba2994095e7baea6a6c7c4c2dfeb977efac326af552d878460a7b846b8ec7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09165b831ca0783bab1d30896755955127c0f978f30127ef3917124b07aa506da34681a91747a00c944f8a55f2f1d4c99df3032c25b6f02f133e131e3e696030072e383fd5f297c0",
+                "rlp" : "0xf90359f901fda0d7c1251fc4509d40efedfb4588822abc3b0a2e9776b068032c80679c206e1e36a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f8a9a7c6c70f0094dbece050367cc191e4350efb02aa9b5eaa6fdc8ecf1a9345a0d316135664de2265832e9cfe45fedf50a9332b5b72af55b725c2808848718961a055c0f460e0f6bc34b608cc5a5932584b02e8d49618f45feb6598cc309f8878dfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011fb98203e880a0786a4fcef5326b8804c742d2fdb52bdcb684bfc85be592cfd93ea5836820c44788c4f869a9b1e478f2f90155f901528001840cbaba2994095e7baea6a6c7c4c2dfeb977efac326af552d878460a7b846b8ec7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09165b831ca0783bab1d30896755955127c0f978f30127ef3917124b07aa506da34681a91747a00c944f8a55f2f1d4c99df3032c25b6f02f133e131e3e696030072e383fd5f297c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09165b83",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09e5b65d5b5f2410051d50d15f5e44cc4a600c9fdacf84de1864236bb91486598a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc6ec9c9f5762571f23a82116a2a653dbea1b84b29876f4a555545d60040ba8db",
+        "lastblockhash" : "0xc06eda2ad86d283dbfa75294d82b6817c57eab3b46ec5a21fadf87931cfbd07b",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -116,8 +116,8 @@
     "randomStatetest492BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest492BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest492BCFiller.json"
         },
         "blocks" : [
             {
@@ -128,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x0122c5",
-                    "hash" : "0xc95e5686ec81c4a21f3a00c7d2e764290b53f41ffc87ed8865df7d795d6e7a05",
-                    "mixHash" : "0xace22187ac8d4c4201df2f59314a3a7d820284cb7e39615a52fd2ef03a56163b",
-                    "nonce" : "0x8ef7cd6505d16034",
+                    "hash" : "0x485cc54163d02d2399e1fe1ea7eb9f50fbad6492033aa3a646e0f5d58953cba8",
+                    "mixHash" : "0x2559cc40722c214be8a9a3bafeb4bd4af9b71082eb88a6fda1be3e4ef8a995f0",
+                    "nonce" : "0x4811b09f52d41b53",
                     "number" : "0x01",
                     "parentHash" : "0xd7c1251fc4509d40efedfb4588822abc3b0a2e9776b068032c80679c206e1e36",
                     "receiptTrie" : "0xcba625f346154b3143abc406806b358e89323c3ceabe67dd1a35f45182db264f",
-                    "stateRoot" : "0xfdff9af1d80e49cab6590bf2c66e223800f3c1c9e7b136ece4275ec2441e7e4c",
+                    "stateRoot" : "0x93f136b5ac8ec3332204ee18b8c67d4a3541364810a02d85c922b3465283de36",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd316135664de2265832e9cfe45fedf50a9332b5b72af55b725c2808848718961",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90359f901fda0d7c1251fc4509d40efedfb4588822abc3b0a2e9776b068032c80679c206e1e36a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fdff9af1d80e49cab6590bf2c66e223800f3c1c9e7b136ece4275ec2441e7e4ca0d316135664de2265832e9cfe45fedf50a9332b5b72af55b725c2808848718961a0cba625f346154b3143abc406806b358e89323c3ceabe67dd1a35f45182db264fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830122c58203e880a0ace22187ac8d4c4201df2f59314a3a7d820284cb7e39615a52fd2ef03a56163b888ef7cd6505d16034f90155f901528001840cbaba2994095e7baea6a6c7c4c2dfeb977efac326af552d878460a7b846b8ec7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09165b831ca0783bab1d30896755955127c0f978f30127ef3917124b07aa506da34681a91747a00c944f8a55f2f1d4c99df3032c25b6f02f133e131e3e696030072e383fd5f297c0",
+                "rlp" : "0xf90359f901fda0d7c1251fc4509d40efedfb4588822abc3b0a2e9776b068032c80679c206e1e36a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a093f136b5ac8ec3332204ee18b8c67d4a3541364810a02d85c922b3465283de36a0d316135664de2265832e9cfe45fedf50a9332b5b72af55b725c2808848718961a0cba625f346154b3143abc406806b358e89323c3ceabe67dd1a35f45182db264fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830122c58203e880a02559cc40722c214be8a9a3bafeb4bd4af9b71082eb88a6fda1be3e4ef8a995f0884811b09f52d41b53f90155f901528001840cbaba2994095e7baea6a6c7c4c2dfeb977efac326af552d878460a7b846b8ec7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09165b831ca0783bab1d30896755955127c0f978f30127ef3917124b07aa506da34681a91747a00c944f8a55f2f1d4c99df3032c25b6f02f133e131e3e696030072e383fd5f297c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09165b83",
@@ -176,16 +176,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09e5b65d5b5f2410051d50d15f5e44cc4a600c9fdacf84de1864236bb91486598a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc95e5686ec81c4a21f3a00c7d2e764290b53f41ffc87ed8865df7d795d6e7a05",
+        "lastblockhash" : "0x485cc54163d02d2399e1fe1ea7eb9f50fbad6492033aa3a646e0f5d58953cba8",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x60a7b846",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09165b835560005155",
@@ -237,8 +230,8 @@
     "randomStatetest492BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest492BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest492BCFiller.json"
         },
         "blocks" : [
             {
@@ -249,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x011fb9",
-                    "hash" : "0x9785cece769fad10e94f291df52dff9cf74fff7d20a4b00a0e2cd73ed02bde56",
-                    "mixHash" : "0xd88399a5086db587f0d8da7396202525ace0c3962820b1ce23a340cefe0947c8",
-                    "nonce" : "0x33160d101b0e9cf6",
+                    "hash" : "0x3b1a3a216f0f41561a434edf2c401a9dac33866bf253affcb4ef8a91dd8c30ee",
+                    "mixHash" : "0x769a5da3b2373cbc36a1e786aae9b3f473172c8e8fd8de59caff76680871792a",
+                    "nonce" : "0x8fcd735b3178495b",
                     "number" : "0x01",
                     "parentHash" : "0xd7c1251fc4509d40efedfb4588822abc3b0a2e9776b068032c80679c206e1e36",
                     "receiptTrie" : "0xbde9dfa8ca8f4c200802730b5822d7a06d7ccc04e97b123779d15aaa01edc368",
@@ -260,7 +253,7 @@
                     "transactionsTrie" : "0xd316135664de2265832e9cfe45fedf50a9332b5b72af55b725c2808848718961",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90359f901fda0d7c1251fc4509d40efedfb4588822abc3b0a2e9776b068032c80679c206e1e36a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0be7ee00c18c03417fe0805fa42cbb76f85dbc7ca17d04146f93bcdb59bea0f6ca0d316135664de2265832e9cfe45fedf50a9332b5b72af55b725c2808848718961a0bde9dfa8ca8f4c200802730b5822d7a06d7ccc04e97b123779d15aaa01edc368b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011fb98203e880a0d88399a5086db587f0d8da7396202525ace0c3962820b1ce23a340cefe0947c88833160d101b0e9cf6f90155f901528001840cbaba2994095e7baea6a6c7c4c2dfeb977efac326af552d878460a7b846b8ec7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09165b831ca0783bab1d30896755955127c0f978f30127ef3917124b07aa506da34681a91747a00c944f8a55f2f1d4c99df3032c25b6f02f133e131e3e696030072e383fd5f297c0",
+                "rlp" : "0xf90359f901fda0d7c1251fc4509d40efedfb4588822abc3b0a2e9776b068032c80679c206e1e36a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0be7ee00c18c03417fe0805fa42cbb76f85dbc7ca17d04146f93bcdb59bea0f6ca0d316135664de2265832e9cfe45fedf50a9332b5b72af55b725c2808848718961a0bde9dfa8ca8f4c200802730b5822d7a06d7ccc04e97b123779d15aaa01edc368b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011fb98203e880a0769a5da3b2373cbc36a1e786aae9b3f473172c8e8fd8de59caff76680871792a888fcd735b3178495bf90155f901528001840cbaba2994095e7baea6a6c7c4c2dfeb977efac326af552d878460a7b846b8ec7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09165b831ca0783bab1d30896755955127c0f978f30127ef3917124b07aa506da34681a91747a00c944f8a55f2f1d4c99df3032c25b6f02f133e131e3e696030072e383fd5f297c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09165b83",
@@ -297,7 +290,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09e5b65d5b5f2410051d50d15f5e44cc4a600c9fdacf84de1864236bb91486598a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9785cece769fad10e94f291df52dff9cf74fff7d20a4b00a0e2cd73ed02bde56",
+        "lastblockhash" : "0x3b1a3a216f0f41561a434edf2c401a9dac33866bf253affcb4ef8a91dd8c30ee",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -351,8 +344,8 @@
     "randomStatetest492BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest492BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest492BCFiller.json"
         },
         "blocks" : [
             {
@@ -363,9 +356,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x011fb9",
-                    "hash" : "0xaf227c57e4bf020afbaa4c0fb51e61672b50f9f9b1a6a31d6e75d76e9072f95b",
-                    "mixHash" : "0x283ccd7a09ee61b9fdb4558a86c82e3d60632b10e8fdc8088c6d065c347a39e6",
-                    "nonce" : "0x45850e50e89a9b4e",
+                    "hash" : "0xa3ac5e9f457b46682537246088b87a28d21d6ea79a6771e7b3779f50da826032",
+                    "mixHash" : "0x35bbabaeffdf225e76a3d8d707601149d5225ba6fa2bbd1332a7fc515504d9d5",
+                    "nonce" : "0xfddea6e380dde78d",
                     "number" : "0x01",
                     "parentHash" : "0xd7c1251fc4509d40efedfb4588822abc3b0a2e9776b068032c80679c206e1e36",
                     "receiptTrie" : "0xbde9dfa8ca8f4c200802730b5822d7a06d7ccc04e97b123779d15aaa01edc368",
@@ -374,7 +367,7 @@
                     "transactionsTrie" : "0xd316135664de2265832e9cfe45fedf50a9332b5b72af55b725c2808848718961",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90359f901fda0d7c1251fc4509d40efedfb4588822abc3b0a2e9776b068032c80679c206e1e36a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0be7ee00c18c03417fe0805fa42cbb76f85dbc7ca17d04146f93bcdb59bea0f6ca0d316135664de2265832e9cfe45fedf50a9332b5b72af55b725c2808848718961a0bde9dfa8ca8f4c200802730b5822d7a06d7ccc04e97b123779d15aaa01edc368b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011fb98203e880a0283ccd7a09ee61b9fdb4558a86c82e3d60632b10e8fdc8088c6d065c347a39e68845850e50e89a9b4ef90155f901528001840cbaba2994095e7baea6a6c7c4c2dfeb977efac326af552d878460a7b846b8ec7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09165b831ca0783bab1d30896755955127c0f978f30127ef3917124b07aa506da34681a91747a00c944f8a55f2f1d4c99df3032c25b6f02f133e131e3e696030072e383fd5f297c0",
+                "rlp" : "0xf90359f901fda0d7c1251fc4509d40efedfb4588822abc3b0a2e9776b068032c80679c206e1e36a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0be7ee00c18c03417fe0805fa42cbb76f85dbc7ca17d04146f93bcdb59bea0f6ca0d316135664de2265832e9cfe45fedf50a9332b5b72af55b725c2808848718961a0bde9dfa8ca8f4c200802730b5822d7a06d7ccc04e97b123779d15aaa01edc368b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011fb98203e880a035bbabaeffdf225e76a3d8d707601149d5225ba6fa2bbd1332a7fc515504d9d588fddea6e380dde78df90155f901528001840cbaba2994095e7baea6a6c7c4c2dfeb977efac326af552d878460a7b846b8ec7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09165b831ca0783bab1d30896755955127c0f978f30127ef3917124b07aa506da34681a91747a00c944f8a55f2f1d4c99df3032c25b6f02f133e131e3e696030072e383fd5f297c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09165b83",
@@ -411,7 +404,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09e5b65d5b5f2410051d50d15f5e44cc4a600c9fdacf84de1864236bb91486598a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaf227c57e4bf020afbaa4c0fb51e61672b50f9f9b1a6a31d6e75d76e9072f95b",
+        "lastblockhash" : "0xa3ac5e9f457b46682537246088b87a28d21d6ea79a6771e7b3779f50da826032",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -465,8 +458,8 @@
     "randomStatetest492BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest492BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest492BCFiller.json"
         },
         "blocks" : [
             {
@@ -477,9 +470,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x011fb9",
-                    "hash" : "0x8ed999bef36b45399bc81559ffbb10f5ca4369479f933c6c769707cefa34acf8",
-                    "mixHash" : "0x523b5fe4201e274e96a2fea4c004e45e73bfb72ec375ffe8f28571746def67ea",
-                    "nonce" : "0x965b5e0d9a14f26c",
+                    "hash" : "0x159127946d3ce6d26e1ff533c56fb9aa3e494c2003e9a4ebf2f79f285811da16",
+                    "mixHash" : "0xfd93bef4f00d6d5bb6e355643c002fed48e7be24cc3c3b40256eac93f8987e3c",
+                    "nonce" : "0x78f2e71bbee944a0",
                     "number" : "0x01",
                     "parentHash" : "0xd7c1251fc4509d40efedfb4588822abc3b0a2e9776b068032c80679c206e1e36",
                     "receiptTrie" : "0xbde9dfa8ca8f4c200802730b5822d7a06d7ccc04e97b123779d15aaa01edc368",
@@ -488,7 +481,7 @@
                     "transactionsTrie" : "0xd316135664de2265832e9cfe45fedf50a9332b5b72af55b725c2808848718961",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90359f901fda0d7c1251fc4509d40efedfb4588822abc3b0a2e9776b068032c80679c206e1e36a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0be7ee00c18c03417fe0805fa42cbb76f85dbc7ca17d04146f93bcdb59bea0f6ca0d316135664de2265832e9cfe45fedf50a9332b5b72af55b725c2808848718961a0bde9dfa8ca8f4c200802730b5822d7a06d7ccc04e97b123779d15aaa01edc368b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011fb98203e880a0523b5fe4201e274e96a2fea4c004e45e73bfb72ec375ffe8f28571746def67ea88965b5e0d9a14f26cf90155f901528001840cbaba2994095e7baea6a6c7c4c2dfeb977efac326af552d878460a7b846b8ec7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09165b831ca0783bab1d30896755955127c0f978f30127ef3917124b07aa506da34681a91747a00c944f8a55f2f1d4c99df3032c25b6f02f133e131e3e696030072e383fd5f297c0",
+                "rlp" : "0xf90359f901fda0d7c1251fc4509d40efedfb4588822abc3b0a2e9776b068032c80679c206e1e36a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0be7ee00c18c03417fe0805fa42cbb76f85dbc7ca17d04146f93bcdb59bea0f6ca0d316135664de2265832e9cfe45fedf50a9332b5b72af55b725c2808848718961a0bde9dfa8ca8f4c200802730b5822d7a06d7ccc04e97b123779d15aaa01edc368b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011fb98203e880a0fd93bef4f00d6d5bb6e355643c002fed48e7be24cc3c3b40256eac93f8987e3c8878f2e71bbee944a0f90155f901528001840cbaba2994095e7baea6a6c7c4c2dfeb977efac326af552d878460a7b846b8ec7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09165b831ca0783bab1d30896755955127c0f978f30127ef3917124b07aa506da34681a91747a00c944f8a55f2f1d4c99df3032c25b6f02f133e131e3e696030072e383fd5f297c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09165b83",
@@ -525,7 +518,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09e5b65d5b5f2410051d50d15f5e44cc4a600c9fdacf84de1864236bb91486598a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8ed999bef36b45399bc81559ffbb10f5ca4369479f933c6c769707cefa34acf8",
+        "lastblockhash" : "0x159127946d3ce6d26e1ff533c56fb9aa3e494c2003e9a4ebf2f79f285811da16",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -579,8 +572,8 @@
     "randomStatetest492BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest492BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest492BCFiller.json"
         },
         "blocks" : [
             {
@@ -591,9 +584,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x011fb9",
-                    "hash" : "0x185291f8022508d57ee15e1e0daed3502e026d2571057f55951e254575d01753",
-                    "mixHash" : "0xd8228fc3e0f80480f7e7eb78b3d40d1ca2d314991af2d3a8c9d5a12ae34002df",
-                    "nonce" : "0x61c6ba70cb48d7c9",
+                    "hash" : "0x7e1632ab663e4e0b6a9a9fb92690467f184cf2aaaccc7267e26918bbca02c8a2",
+                    "mixHash" : "0x475d374c103a8521ac3c7a9aea43529b2b7c1f0963afc4e8c4ace76f73f6af7c",
+                    "nonce" : "0xcbd076043b3aef73",
                     "number" : "0x01",
                     "parentHash" : "0xd7c1251fc4509d40efedfb4588822abc3b0a2e9776b068032c80679c206e1e36",
                     "receiptTrie" : "0xbde9dfa8ca8f4c200802730b5822d7a06d7ccc04e97b123779d15aaa01edc368",
@@ -602,7 +595,7 @@
                     "transactionsTrie" : "0xd316135664de2265832e9cfe45fedf50a9332b5b72af55b725c2808848718961",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90359f901fda0d7c1251fc4509d40efedfb4588822abc3b0a2e9776b068032c80679c206e1e36a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0be7ee00c18c03417fe0805fa42cbb76f85dbc7ca17d04146f93bcdb59bea0f6ca0d316135664de2265832e9cfe45fedf50a9332b5b72af55b725c2808848718961a0bde9dfa8ca8f4c200802730b5822d7a06d7ccc04e97b123779d15aaa01edc368b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011fb98203e880a0d8228fc3e0f80480f7e7eb78b3d40d1ca2d314991af2d3a8c9d5a12ae34002df8861c6ba70cb48d7c9f90155f901528001840cbaba2994095e7baea6a6c7c4c2dfeb977efac326af552d878460a7b846b8ec7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09165b831ca0783bab1d30896755955127c0f978f30127ef3917124b07aa506da34681a91747a00c944f8a55f2f1d4c99df3032c25b6f02f133e131e3e696030072e383fd5f297c0",
+                "rlp" : "0xf90359f901fda0d7c1251fc4509d40efedfb4588822abc3b0a2e9776b068032c80679c206e1e36a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0be7ee00c18c03417fe0805fa42cbb76f85dbc7ca17d04146f93bcdb59bea0f6ca0d316135664de2265832e9cfe45fedf50a9332b5b72af55b725c2808848718961a0bde9dfa8ca8f4c200802730b5822d7a06d7ccc04e97b123779d15aaa01edc368b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011fb98203e880a0475d374c103a8521ac3c7a9aea43529b2b7c1f0963afc4e8c4ace76f73f6af7c88cbd076043b3aef73f90155f901528001840cbaba2994095e7baea6a6c7c4c2dfeb977efac326af552d878460a7b846b8ec7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09165b831ca0783bab1d30896755955127c0f978f30127ef3917124b07aa506da34681a91747a00c944f8a55f2f1d4c99df3032c25b6f02f133e131e3e696030072e383fd5f297c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09165b83",
@@ -639,7 +632,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09e5b65d5b5f2410051d50d15f5e44cc4a600c9fdacf84de1864236bb91486598a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x185291f8022508d57ee15e1e0daed3502e026d2571057f55951e254575d01753",
+        "lastblockhash" : "0x7e1632ab663e4e0b6a9a9fb92690467f184cf2aaaccc7267e26918bbca02c8a2",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest515BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest515BC.json
index 0a67f9379..dc34ee10f 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest515BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest515BC.json
@@ -2,8 +2,8 @@
     "randomStatetest515BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest515BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest515BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xbf3b",
-                    "hash" : "0xb2da14bae9ecaa797d0c2e0933fb9f6c61fc15c3a213075cfee09635a7848af6",
-                    "mixHash" : "0x57058e9f82a6fefab90d74f0ac4a4bf476eadaaf143323f4151f9d650f50f859",
-                    "nonce" : "0x33e2e61547720933",
+                    "hash" : "0x845c4fa45385f31a3e60f377eaa3db7bc547d2dabec2e6cb83a896f5ffedacfc",
+                    "mixHash" : "0x2a6ce6ed588efcae42b2e6c383dace3ac6018913f25b16d37a1efd3abe8f1003",
+                    "nonce" : "0x6cbeafa80ee5f014",
                     "number" : "0x01",
                     "parentHash" : "0xecfcecc096a186bdf7c9523993676df6cb2850ed89328d491839dacf929b5f19",
                     "receiptTrie" : "0x35d1cabb9cd4edb472881ad9cf5eaef8067bc4747c2b6c666f7dbac7cf6c42a3",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x1491d4b225a168a9d87370d7cfdc82e7be40c7ee35198ef517eb290b5d59d86b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca0ecfcecc096a186bdf7c9523993676df6cb2850ed89328d491839dacf929b5f19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a7ad3b710a911096bfbb445567f19fdc6fcf637016cb6af0343e9c6eabf61d01a01491d4b225a168a9d87370d7cfdc82e7be40c7ee35198ef517eb290b5d59d86ba035d1cabb9cd4edb472881ad9cf5eaef8067bc4747c2b6c666f7dbac7cf6c42a3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bf3b8203e880a057058e9f82a6fefab90d74f0ac4a4bf476eadaaf143323f4151f9d650f50f8598833e2e61547720933f90121f9011e8001844c5a39d894095e7baea6a6c7c4c2dfeb977efac326af552d878442115f6ab8b8437f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f9283944569657e135a7e38997986951ca077c29ee8572ba2c768ab9a5bfefb87cd704b8330ad6582f28dd5696ab47e125aa02c1beeb7e2800e240e31b475f71a00a89f8f2e92697ecd86d9fe47addcfca0ecc0",
+                "rlp" : "0xf90324f901fca0ecfcecc096a186bdf7c9523993676df6cb2850ed89328d491839dacf929b5f19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a7ad3b710a911096bfbb445567f19fdc6fcf637016cb6af0343e9c6eabf61d01a01491d4b225a168a9d87370d7cfdc82e7be40c7ee35198ef517eb290b5d59d86ba035d1cabb9cd4edb472881ad9cf5eaef8067bc4747c2b6c666f7dbac7cf6c42a3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bf3b8203e880a02a6ce6ed588efcae42b2e6c383dace3ac6018913f25b16d37a1efd3abe8f1003886cbeafa80ee5f014f90121f9011e8001844c5a39d894095e7baea6a6c7c4c2dfeb977efac326af552d878442115f6ab8b8437f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f9283944569657e135a7e38997986951ca077c29ee8572ba2c768ab9a5bfefb87cd704b8330ad6582f28dd5696ab47e125aa02c1beeb7e2800e240e31b475f71a00a89f8f2e92697ecd86d9fe47addcfca0ecc0",
                 "transactions" : [
                     {
                         "data" : "0x437f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f9283944569657e135a7e3899798695",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09249187a36f29db3f7ece2a38646eb713b2269283f6b0dfa9ae299afa69937e8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb2da14bae9ecaa797d0c2e0933fb9f6c61fc15c3a213075cfee09635a7848af6",
+        "lastblockhash" : "0x845c4fa45385f31a3e60f377eaa3db7bc547d2dabec2e6cb83a896f5ffedacfc",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest515BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest515BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest515BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc247",
-                    "hash" : "0xc9037b188b093a9ff1ba2aee72a0a63799c6df6e0b917e8f3acf1765b4d72176",
-                    "mixHash" : "0x7da83e05428cedf01f7121a97f9077cb68f419b12863a62c1fa35e106fe14d94",
-                    "nonce" : "0x20cf4bfcf34a115d",
+                    "hash" : "0x5d10638f409a5a62a15bdadb31116c208f8235b4a6158a71edc90d7b3262c6ec",
+                    "mixHash" : "0x603eb6d048b74d69b96c5c91e1db589c98fdcd1f7b9b6a938d9fbffdd7b3b6dc",
+                    "nonce" : "0xd1cecb5fe00cf963",
                     "number" : "0x01",
                     "parentHash" : "0xecfcecc096a186bdf7c9523993676df6cb2850ed89328d491839dacf929b5f19",
                     "receiptTrie" : "0x59e4214766aaad3fb13261c1fd8d912f59202c6e17a37652df1e53ef8c236a42",
-                    "stateRoot" : "0x1e5644e361bc43bd8277ff8ef6e988e64893c77bc15dac06c49c1a262334b6d5",
+                    "stateRoot" : "0x7a27787918d7190c33935c89f55338b33a5d99fb8c675e08a430fbd75870eaeb",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1491d4b225a168a9d87370d7cfdc82e7be40c7ee35198ef517eb290b5d59d86b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca0ecfcecc096a186bdf7c9523993676df6cb2850ed89328d491839dacf929b5f19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01e5644e361bc43bd8277ff8ef6e988e64893c77bc15dac06c49c1a262334b6d5a01491d4b225a168a9d87370d7cfdc82e7be40c7ee35198ef517eb290b5d59d86ba059e4214766aaad3fb13261c1fd8d912f59202c6e17a37652df1e53ef8c236a42b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c2478203e880a07da83e05428cedf01f7121a97f9077cb68f419b12863a62c1fa35e106fe14d948820cf4bfcf34a115df90121f9011e8001844c5a39d894095e7baea6a6c7c4c2dfeb977efac326af552d878442115f6ab8b8437f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f9283944569657e135a7e38997986951ca077c29ee8572ba2c768ab9a5bfefb87cd704b8330ad6582f28dd5696ab47e125aa02c1beeb7e2800e240e31b475f71a00a89f8f2e92697ecd86d9fe47addcfca0ecc0",
+                "rlp" : "0xf90324f901fca0ecfcecc096a186bdf7c9523993676df6cb2850ed89328d491839dacf929b5f19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07a27787918d7190c33935c89f55338b33a5d99fb8c675e08a430fbd75870eaeba01491d4b225a168a9d87370d7cfdc82e7be40c7ee35198ef517eb290b5d59d86ba059e4214766aaad3fb13261c1fd8d912f59202c6e17a37652df1e53ef8c236a42b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c2478203e880a0603eb6d048b74d69b96c5c91e1db589c98fdcd1f7b9b6a938d9fbffdd7b3b6dc88d1cecb5fe00cf963f90121f9011e8001844c5a39d894095e7baea6a6c7c4c2dfeb977efac326af552d878442115f6ab8b8437f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f9283944569657e135a7e38997986951ca077c29ee8572ba2c768ab9a5bfefb87cd704b8330ad6582f28dd5696ab47e125aa02c1beeb7e2800e240e31b475f71a00a89f8f2e92697ecd86d9fe47addcfca0ecc0",
                 "transactions" : [
                     {
                         "data" : "0x437f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f9283944569657e135a7e3899798695",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09249187a36f29db3f7ece2a38646eb713b2269283f6b0dfa9ae299afa69937e8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc9037b188b093a9ff1ba2aee72a0a63799c6df6e0b917e8f3acf1765b4d72176",
+        "lastblockhash" : "0x5d10638f409a5a62a15bdadb31116c208f8235b4a6158a71edc90d7b3262c6ec",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x42115f6a",
                 "code" : "0x437f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f9283944569657e135a7e38997986955560005155",
@@ -235,8 +228,8 @@
     "randomStatetest515BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest515BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest515BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xbf3b",
-                    "hash" : "0xccaf6eb3549eee4df7fda35a300ff03b9b586ad0b9db8a120569096b5a507893",
-                    "mixHash" : "0x7fcc147898cdd85ca5f9cdadd722bcd111cb1456e3d16f4d490978ef6b5b55de",
-                    "nonce" : "0x4edf2d45345a44e0",
+                    "hash" : "0x9b717c8fb88de3d549cca26aa03a8eda68a470ea4eb24aadd0ed0e7d3799ca37",
+                    "mixHash" : "0xa2ffa41253dc71113cda3a0d97cf1bc2c8d58510add4c3d5cf6197d34d4bd47b",
+                    "nonce" : "0xb63d29caf92405f3",
                     "number" : "0x01",
                     "parentHash" : "0xecfcecc096a186bdf7c9523993676df6cb2850ed89328d491839dacf929b5f19",
                     "receiptTrie" : "0x29393560f7501838284d5560a594ee2592d9079a922103791338a1d176e7e7aa",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0x1491d4b225a168a9d87370d7cfdc82e7be40c7ee35198ef517eb290b5d59d86b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca0ecfcecc096a186bdf7c9523993676df6cb2850ed89328d491839dacf929b5f19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a089efe1e774e06148aa336870ced1f238a4a01a75d83171a1e9cb566ee54eb446a01491d4b225a168a9d87370d7cfdc82e7be40c7ee35198ef517eb290b5d59d86ba029393560f7501838284d5560a594ee2592d9079a922103791338a1d176e7e7aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bf3b8203e880a07fcc147898cdd85ca5f9cdadd722bcd111cb1456e3d16f4d490978ef6b5b55de884edf2d45345a44e0f90121f9011e8001844c5a39d894095e7baea6a6c7c4c2dfeb977efac326af552d878442115f6ab8b8437f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f9283944569657e135a7e38997986951ca077c29ee8572ba2c768ab9a5bfefb87cd704b8330ad6582f28dd5696ab47e125aa02c1beeb7e2800e240e31b475f71a00a89f8f2e92697ecd86d9fe47addcfca0ecc0",
+                "rlp" : "0xf90324f901fca0ecfcecc096a186bdf7c9523993676df6cb2850ed89328d491839dacf929b5f19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a089efe1e774e06148aa336870ced1f238a4a01a75d83171a1e9cb566ee54eb446a01491d4b225a168a9d87370d7cfdc82e7be40c7ee35198ef517eb290b5d59d86ba029393560f7501838284d5560a594ee2592d9079a922103791338a1d176e7e7aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bf3b8203e880a0a2ffa41253dc71113cda3a0d97cf1bc2c8d58510add4c3d5cf6197d34d4bd47b88b63d29caf92405f3f90121f9011e8001844c5a39d894095e7baea6a6c7c4c2dfeb977efac326af552d878442115f6ab8b8437f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f9283944569657e135a7e38997986951ca077c29ee8572ba2c768ab9a5bfefb87cd704b8330ad6582f28dd5696ab47e125aa02c1beeb7e2800e240e31b475f71a00a89f8f2e92697ecd86d9fe47addcfca0ecc0",
                 "transactions" : [
                     {
                         "data" : "0x437f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f9283944569657e135a7e3899798695",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09249187a36f29db3f7ece2a38646eb713b2269283f6b0dfa9ae299afa69937e8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xccaf6eb3549eee4df7fda35a300ff03b9b586ad0b9db8a120569096b5a507893",
+        "lastblockhash" : "0x9b717c8fb88de3d549cca26aa03a8eda68a470ea4eb24aadd0ed0e7d3799ca37",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest515BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest515BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest515BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xbf3b",
-                    "hash" : "0x2cd8640ec576416ea35cc1be358bb99356db3a29d9842fbe01313c0649b23c96",
-                    "mixHash" : "0x00048b366d89d567f6ac1771aac7d31840e0bf059062078b0d99116366dffa5f",
-                    "nonce" : "0xb93ea4e9cf7a3fe6",
+                    "hash" : "0x3a09fc772816bd58214f727c27405bf9eccfa64f2ca6dd750f900347d9bba290",
+                    "mixHash" : "0x45fb1bab63083fb4855c1e0ef03c1eaad4ef6f0d1a17d2f349d50fb394a12d7a",
+                    "nonce" : "0xaa07243ee61fba27",
                     "number" : "0x01",
                     "parentHash" : "0xecfcecc096a186bdf7c9523993676df6cb2850ed89328d491839dacf929b5f19",
                     "receiptTrie" : "0x29393560f7501838284d5560a594ee2592d9079a922103791338a1d176e7e7aa",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0x1491d4b225a168a9d87370d7cfdc82e7be40c7ee35198ef517eb290b5d59d86b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca0ecfcecc096a186bdf7c9523993676df6cb2850ed89328d491839dacf929b5f19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a089efe1e774e06148aa336870ced1f238a4a01a75d83171a1e9cb566ee54eb446a01491d4b225a168a9d87370d7cfdc82e7be40c7ee35198ef517eb290b5d59d86ba029393560f7501838284d5560a594ee2592d9079a922103791338a1d176e7e7aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bf3b8203e880a000048b366d89d567f6ac1771aac7d31840e0bf059062078b0d99116366dffa5f88b93ea4e9cf7a3fe6f90121f9011e8001844c5a39d894095e7baea6a6c7c4c2dfeb977efac326af552d878442115f6ab8b8437f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f9283944569657e135a7e38997986951ca077c29ee8572ba2c768ab9a5bfefb87cd704b8330ad6582f28dd5696ab47e125aa02c1beeb7e2800e240e31b475f71a00a89f8f2e92697ecd86d9fe47addcfca0ecc0",
+                "rlp" : "0xf90324f901fca0ecfcecc096a186bdf7c9523993676df6cb2850ed89328d491839dacf929b5f19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a089efe1e774e06148aa336870ced1f238a4a01a75d83171a1e9cb566ee54eb446a01491d4b225a168a9d87370d7cfdc82e7be40c7ee35198ef517eb290b5d59d86ba029393560f7501838284d5560a594ee2592d9079a922103791338a1d176e7e7aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bf3b8203e880a045fb1bab63083fb4855c1e0ef03c1eaad4ef6f0d1a17d2f349d50fb394a12d7a88aa07243ee61fba27f90121f9011e8001844c5a39d894095e7baea6a6c7c4c2dfeb977efac326af552d878442115f6ab8b8437f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f9283944569657e135a7e38997986951ca077c29ee8572ba2c768ab9a5bfefb87cd704b8330ad6582f28dd5696ab47e125aa02c1beeb7e2800e240e31b475f71a00a89f8f2e92697ecd86d9fe47addcfca0ecc0",
                 "transactions" : [
                     {
                         "data" : "0x437f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f9283944569657e135a7e3899798695",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09249187a36f29db3f7ece2a38646eb713b2269283f6b0dfa9ae299afa69937e8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2cd8640ec576416ea35cc1be358bb99356db3a29d9842fbe01313c0649b23c96",
+        "lastblockhash" : "0x3a09fc772816bd58214f727c27405bf9eccfa64f2ca6dd750f900347d9bba290",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest515BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest515BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest515BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xbf3b",
-                    "hash" : "0x70309089a558a027b327204abf7fa2a503ea321f4ef968543b3f927fa2683f18",
-                    "mixHash" : "0x14f480ec4fb37cc42d59d7749e19eb696e4380d115b9e86de0411a515970c7f4",
-                    "nonce" : "0x7f37b21e6906b337",
+                    "hash" : "0x13592fb4224bede90ed4c273b921953dc7f3d3e4e2a7d160540c4ee5ea8beca9",
+                    "mixHash" : "0x09d029db5e38685505314913fbd0f117482ab4a92cf0e0624e8d8533461ea435",
+                    "nonce" : "0x78ae9be42cc8fa61",
                     "number" : "0x01",
                     "parentHash" : "0xecfcecc096a186bdf7c9523993676df6cb2850ed89328d491839dacf929b5f19",
                     "receiptTrie" : "0x29393560f7501838284d5560a594ee2592d9079a922103791338a1d176e7e7aa",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0x1491d4b225a168a9d87370d7cfdc82e7be40c7ee35198ef517eb290b5d59d86b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca0ecfcecc096a186bdf7c9523993676df6cb2850ed89328d491839dacf929b5f19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a089efe1e774e06148aa336870ced1f238a4a01a75d83171a1e9cb566ee54eb446a01491d4b225a168a9d87370d7cfdc82e7be40c7ee35198ef517eb290b5d59d86ba029393560f7501838284d5560a594ee2592d9079a922103791338a1d176e7e7aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bf3b8203e880a014f480ec4fb37cc42d59d7749e19eb696e4380d115b9e86de0411a515970c7f4887f37b21e6906b337f90121f9011e8001844c5a39d894095e7baea6a6c7c4c2dfeb977efac326af552d878442115f6ab8b8437f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f9283944569657e135a7e38997986951ca077c29ee8572ba2c768ab9a5bfefb87cd704b8330ad6582f28dd5696ab47e125aa02c1beeb7e2800e240e31b475f71a00a89f8f2e92697ecd86d9fe47addcfca0ecc0",
+                "rlp" : "0xf90324f901fca0ecfcecc096a186bdf7c9523993676df6cb2850ed89328d491839dacf929b5f19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a089efe1e774e06148aa336870ced1f238a4a01a75d83171a1e9cb566ee54eb446a01491d4b225a168a9d87370d7cfdc82e7be40c7ee35198ef517eb290b5d59d86ba029393560f7501838284d5560a594ee2592d9079a922103791338a1d176e7e7aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bf3b8203e880a009d029db5e38685505314913fbd0f117482ab4a92cf0e0624e8d8533461ea4358878ae9be42cc8fa61f90121f9011e8001844c5a39d894095e7baea6a6c7c4c2dfeb977efac326af552d878442115f6ab8b8437f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f9283944569657e135a7e38997986951ca077c29ee8572ba2c768ab9a5bfefb87cd704b8330ad6582f28dd5696ab47e125aa02c1beeb7e2800e240e31b475f71a00a89f8f2e92697ecd86d9fe47addcfca0ecc0",
                 "transactions" : [
                     {
                         "data" : "0x437f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f9283944569657e135a7e3899798695",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09249187a36f29db3f7ece2a38646eb713b2269283f6b0dfa9ae299afa69937e8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x70309089a558a027b327204abf7fa2a503ea321f4ef968543b3f927fa2683f18",
+        "lastblockhash" : "0x13592fb4224bede90ed4c273b921953dc7f3d3e4e2a7d160540c4ee5ea8beca9",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest515BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest515BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest515BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xbf3b",
-                    "hash" : "0x3bd1496fcb7a5b1ed80a097d251fe5c6af02f1030397c0ea7d07104cb4c82fe1",
-                    "mixHash" : "0x1cfd752c88066ea8b22e055825ccef7a5c7517dcaea419cb8a4a3ee4ea2b8920",
-                    "nonce" : "0xf4b030e627c4c34f",
+                    "hash" : "0x8f73ac59008a3478f6d4399be1e6b415882cd900004164b5587549fee7550b00",
+                    "mixHash" : "0xef45e48c8504def0bc5d5adae9f2af1ea262e15c1f3cc1af06d7ba43eca961c4",
+                    "nonce" : "0xe9d7be390302ab40",
                     "number" : "0x01",
                     "parentHash" : "0xecfcecc096a186bdf7c9523993676df6cb2850ed89328d491839dacf929b5f19",
                     "receiptTrie" : "0x29393560f7501838284d5560a594ee2592d9079a922103791338a1d176e7e7aa",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0x1491d4b225a168a9d87370d7cfdc82e7be40c7ee35198ef517eb290b5d59d86b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca0ecfcecc096a186bdf7c9523993676df6cb2850ed89328d491839dacf929b5f19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a089efe1e774e06148aa336870ced1f238a4a01a75d83171a1e9cb566ee54eb446a01491d4b225a168a9d87370d7cfdc82e7be40c7ee35198ef517eb290b5d59d86ba029393560f7501838284d5560a594ee2592d9079a922103791338a1d176e7e7aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bf3b8203e880a01cfd752c88066ea8b22e055825ccef7a5c7517dcaea419cb8a4a3ee4ea2b892088f4b030e627c4c34ff90121f9011e8001844c5a39d894095e7baea6a6c7c4c2dfeb977efac326af552d878442115f6ab8b8437f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f9283944569657e135a7e38997986951ca077c29ee8572ba2c768ab9a5bfefb87cd704b8330ad6582f28dd5696ab47e125aa02c1beeb7e2800e240e31b475f71a00a89f8f2e92697ecd86d9fe47addcfca0ecc0",
+                "rlp" : "0xf90324f901fca0ecfcecc096a186bdf7c9523993676df6cb2850ed89328d491839dacf929b5f19a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a089efe1e774e06148aa336870ced1f238a4a01a75d83171a1e9cb566ee54eb446a01491d4b225a168a9d87370d7cfdc82e7be40c7ee35198ef517eb290b5d59d86ba029393560f7501838284d5560a594ee2592d9079a922103791338a1d176e7e7aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bf3b8203e880a0ef45e48c8504def0bc5d5adae9f2af1ea262e15c1f3cc1af06d7ba43eca961c488e9d7be390302ab40f90121f9011e8001844c5a39d894095e7baea6a6c7c4c2dfeb977efac326af552d878442115f6ab8b8437f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f9283944569657e135a7e38997986951ca077c29ee8572ba2c768ab9a5bfefb87cd704b8330ad6582f28dd5696ab47e125aa02c1beeb7e2800e240e31b475f71a00a89f8f2e92697ecd86d9fe47addcfca0ecc0",
                 "transactions" : [
                     {
                         "data" : "0x437f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f9283944569657e135a7e3899798695",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09249187a36f29db3f7ece2a38646eb713b2269283f6b0dfa9ae299afa69937e8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3bd1496fcb7a5b1ed80a097d251fe5c6af02f1030397c0ea7d07104cb4c82fe1",
+        "lastblockhash" : "0x8f73ac59008a3478f6d4399be1e6b415882cd900004164b5587549fee7550b00",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest522BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest522BC.json
index 0e6169803..ae4fa2ed6 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest522BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest522BC.json
@@ -2,8 +2,8 @@
     "randomStatetest522BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest522BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest522BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x68c7",
-                    "hash" : "0x3a29e5437b9ba8bb497c15b769148e6ffac8062e369f76e1cfb9c7ad05a20a62",
-                    "mixHash" : "0xc3f191738892b6e39ea0a69afffd8f6c16d280daaa97e6e96b96d29aa859584a",
-                    "nonce" : "0x31c7e0a2c742674e",
+                    "hash" : "0x7961e95aab0e9c4dea5854e5cc35eb172c8ec1483cf4cf8cfac4084cafd8de69",
+                    "mixHash" : "0x946996e6c51b57010e1a5387f8e0a1d04e38b92945d28ccf8fc52191373cdd0d",
+                    "nonce" : "0x070ec75edb988960",
                     "number" : "0x01",
                     "parentHash" : "0xf9c01febe910601e6f3dc318b4c37287ebb52fdcfb453b9b9448ae15a96978d9",
                     "receiptTrie" : "0x1afe14235691225affcbe914e7b3951c968a08e81a13c9591cc038b130d5b04d",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0f9c01febe910601e6f3dc318b4c37287ebb52fdcfb453b9b9448ae15a96978d9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a098e7ab52e80200a053d743d7ffe7bcc42a3df53e4713ef3a8c4e854c9caabadea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa01afe14235691225affcbe914e7b3951c968a08e81a13c9591cc038b130d5b04db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8268c78203e880a0c3f191738892b6e39ea0a69afffd8f6c16d280daaa97e6e96b96d29aa859584a8831c7e0a2c742674ef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0f9c01febe910601e6f3dc318b4c37287ebb52fdcfb453b9b9448ae15a96978d9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a098e7ab52e80200a053d743d7ffe7bcc42a3df53e4713ef3a8c4e854c9caabadea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa01afe14235691225affcbe914e7b3951c968a08e81a13c9591cc038b130d5b04db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8268c78203e880a0946996e6c51b57010e1a5387f8e0a1d04e38b92945d28ccf8fc52191373cdd0d88070ec75edb988960f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b53baff9b563ff38b8756c98979d705b6ac3934ded54bd09dfe2e70057099707a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3a29e5437b9ba8bb497c15b769148e6ffac8062e369f76e1cfb9c7ad05a20a62",
+        "lastblockhash" : "0x7961e95aab0e9c4dea5854e5cc35eb172c8ec1483cf4cf8cfac4084cafd8de69",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest522BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest522BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest522BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6edf",
-                    "hash" : "0x4a4033cff23cfebbbba5a23e667ed91462a68673a3915302a1c0f4380640ec41",
-                    "mixHash" : "0xe605c0033936c18d7bc8a078df7c075258705d1dcc6cf73b05d73dc1620773e2",
-                    "nonce" : "0x0a3e7f83f69bada0",
+                    "hash" : "0x04bf90524ba49b7e98d25215a5d1e0128eb46fa261147d192b30fd9fe4977015",
+                    "mixHash" : "0x893353639ecd1fabeca335239219ca29427aa292a68bf8fc7f94ea7c36c488c0",
+                    "nonce" : "0x290ec8d4005c007b",
                     "number" : "0x01",
                     "parentHash" : "0xf9c01febe910601e6f3dc318b4c37287ebb52fdcfb453b9b9448ae15a96978d9",
                     "receiptTrie" : "0x84ab49457806086ce63627a6ebcf5a9cda0618fe97191e8c34f1b3eaeb36fc4e",
-                    "stateRoot" : "0x200d6c09ba9258d00c217b0d97c9388cc4687ef84bb9e1effbb96e88d7d1d5c5",
+                    "stateRoot" : "0xeb69771dfbaa3d51e8ce8ac6ca89e09595dbe17d806a332f4ea677488e4772a3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0f9c01febe910601e6f3dc318b4c37287ebb52fdcfb453b9b9448ae15a96978d9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0200d6c09ba9258d00c217b0d97c9388cc4687ef84bb9e1effbb96e88d7d1d5c5a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa084ab49457806086ce63627a6ebcf5a9cda0618fe97191e8c34f1b3eaeb36fc4eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826edf8203e880a0e605c0033936c18d7bc8a078df7c075258705d1dcc6cf73b05d73dc1620773e2880a3e7f83f69bada0f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0f9c01febe910601e6f3dc318b4c37287ebb52fdcfb453b9b9448ae15a96978d9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0eb69771dfbaa3d51e8ce8ac6ca89e09595dbe17d806a332f4ea677488e4772a3a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa084ab49457806086ce63627a6ebcf5a9cda0618fe97191e8c34f1b3eaeb36fc4eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826edf8203e880a0893353639ecd1fabeca335239219ca29427aa292a68bf8fc7f94ea7c36c488c088290ec8d4005c007bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b53baff9b563ff38b8756c98979d705b6ac3934ded54bd09dfe2e70057099707a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4a4033cff23cfebbbba5a23e667ed91462a68673a3915302a1c0f4380640ec41",
+        "lastblockhash" : "0x04bf90524ba49b7e98d25215a5d1e0128eb46fa261147d192b30fd9fe4977015",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x43444042454340443b8155",
@@ -233,8 +226,8 @@
     "randomStatetest522BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest522BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest522BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x68c7",
-                    "hash" : "0x4f9d5dbcb8a9cc3eac12c5443792739e09c0f8ba700d338597b444eddc639ba0",
-                    "mixHash" : "0xdc50e79ddb06cecf805997fa18dba9a018f45812bac6d050eda6b2440a402eb4",
-                    "nonce" : "0xdb06949e4ef60047",
+                    "hash" : "0xbdf22cf2da00569fd473ba7222bf3dbe06d7d29685b712ce7c5b23d72f5cdbeb",
+                    "mixHash" : "0x6819765f05e03f9936ada1c1efac75d1d6fd495991742d0097c5918d478ef67f",
+                    "nonce" : "0xad1b33e676638d94",
                     "number" : "0x01",
                     "parentHash" : "0xf9c01febe910601e6f3dc318b4c37287ebb52fdcfb453b9b9448ae15a96978d9",
                     "receiptTrie" : "0x9e8da85d13391c535ad07ca2eb32e15cf02f02d2c17e286fab7209bbdde0a98f",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0f9c01febe910601e6f3dc318b4c37287ebb52fdcfb453b9b9448ae15a96978d9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07588f7319c74d1c3268bcf9deb094b060a9bd06682b1d7cf57e08f39782161f7a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa09e8da85d13391c535ad07ca2eb32e15cf02f02d2c17e286fab7209bbdde0a98fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8268c78203e880a0dc50e79ddb06cecf805997fa18dba9a018f45812bac6d050eda6b2440a402eb488db06949e4ef60047f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0f9c01febe910601e6f3dc318b4c37287ebb52fdcfb453b9b9448ae15a96978d9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07588f7319c74d1c3268bcf9deb094b060a9bd06682b1d7cf57e08f39782161f7a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa09e8da85d13391c535ad07ca2eb32e15cf02f02d2c17e286fab7209bbdde0a98fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8268c78203e880a06819765f05e03f9936ada1c1efac75d1d6fd495991742d0097c5918d478ef67f88ad1b33e676638d94f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b53baff9b563ff38b8756c98979d705b6ac3934ded54bd09dfe2e70057099707a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4f9d5dbcb8a9cc3eac12c5443792739e09c0f8ba700d338597b444eddc639ba0",
+        "lastblockhash" : "0xbdf22cf2da00569fd473ba7222bf3dbe06d7d29685b712ce7c5b23d72f5cdbeb",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest522BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest522BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest522BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x68c7",
-                    "hash" : "0xd79ccf768e5d04dbb5cc7f045c932c59228c547692599710b673f0b1abcacb83",
-                    "mixHash" : "0x011fa22c4e426b4e7fb8eb0a1ba36071ea9e7c666ab222118553b28b867ee95d",
-                    "nonce" : "0xf8759bd1eb9a8f07",
+                    "hash" : "0xd90624c1614e63e3d899c7e83e48654f5572fbe860f544bfa81f484ad2eec7ef",
+                    "mixHash" : "0xdab3c2a11d025170d89e500ed8320f155757e0f3addfe9c22d42cdf5526b58ef",
+                    "nonce" : "0x3242b0eae56d47be",
                     "number" : "0x01",
                     "parentHash" : "0xf9c01febe910601e6f3dc318b4c37287ebb52fdcfb453b9b9448ae15a96978d9",
                     "receiptTrie" : "0x9e8da85d13391c535ad07ca2eb32e15cf02f02d2c17e286fab7209bbdde0a98f",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0f9c01febe910601e6f3dc318b4c37287ebb52fdcfb453b9b9448ae15a96978d9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07588f7319c74d1c3268bcf9deb094b060a9bd06682b1d7cf57e08f39782161f7a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa09e8da85d13391c535ad07ca2eb32e15cf02f02d2c17e286fab7209bbdde0a98fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8268c78203e880a0011fa22c4e426b4e7fb8eb0a1ba36071ea9e7c666ab222118553b28b867ee95d88f8759bd1eb9a8f07f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0f9c01febe910601e6f3dc318b4c37287ebb52fdcfb453b9b9448ae15a96978d9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07588f7319c74d1c3268bcf9deb094b060a9bd06682b1d7cf57e08f39782161f7a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa09e8da85d13391c535ad07ca2eb32e15cf02f02d2c17e286fab7209bbdde0a98fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8268c78203e880a0dab3c2a11d025170d89e500ed8320f155757e0f3addfe9c22d42cdf5526b58ef883242b0eae56d47bef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b53baff9b563ff38b8756c98979d705b6ac3934ded54bd09dfe2e70057099707a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd79ccf768e5d04dbb5cc7f045c932c59228c547692599710b673f0b1abcacb83",
+        "lastblockhash" : "0xd90624c1614e63e3d899c7e83e48654f5572fbe860f544bfa81f484ad2eec7ef",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest522BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest522BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest522BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x661f",
-                    "hash" : "0xa51eecc4c78c1c02cdf477dc73269cdeb5b1c1d9efbfb5d046a128c5f937e40a",
-                    "mixHash" : "0xc877b83714fa2415d58914c1bc1685077da27ff9d2f8b9a1632579c51833a7d8",
-                    "nonce" : "0x786965ac1abb83ca",
+                    "hash" : "0xbd06bb732e2941146c6d98540fce534696915b570e2cb612d72864a9bbe58d69",
+                    "mixHash" : "0xc6e7b67cdd3c9a248ea1f4f5d816be707922606eb18f50a41f82110801517549",
+                    "nonce" : "0xcc9254ec302d2a64",
                     "number" : "0x01",
                     "parentHash" : "0xf9c01febe910601e6f3dc318b4c37287ebb52fdcfb453b9b9448ae15a96978d9",
                     "receiptTrie" : "0xfebe98089b2cca0f56309012cd584e8009de24039a24cdb5b54eda25d8768049",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0f9c01febe910601e6f3dc318b4c37287ebb52fdcfb453b9b9448ae15a96978d9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0499e2b242d7c5ff4577b5f13034306a36e6d8b1e4f9fc44d58943942bcc78d7fa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0febe98089b2cca0f56309012cd584e8009de24039a24cdb5b54eda25d8768049b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82661f8203e880a0c877b83714fa2415d58914c1bc1685077da27ff9d2f8b9a1632579c51833a7d888786965ac1abb83caf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0f9c01febe910601e6f3dc318b4c37287ebb52fdcfb453b9b9448ae15a96978d9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0499e2b242d7c5ff4577b5f13034306a36e6d8b1e4f9fc44d58943942bcc78d7fa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0febe98089b2cca0f56309012cd584e8009de24039a24cdb5b54eda25d8768049b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82661f8203e880a0c6e7b67cdd3c9a248ea1f4f5d816be707922606eb18f50a41f8211080151754988cc9254ec302d2a64f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b53baff9b563ff38b8756c98979d705b6ac3934ded54bd09dfe2e70057099707a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa51eecc4c78c1c02cdf477dc73269cdeb5b1c1d9efbfb5d046a128c5f937e40a",
+        "lastblockhash" : "0xbd06bb732e2941146c6d98540fce534696915b570e2cb612d72864a9bbe58d69",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest522BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest522BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest522BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x661f",
-                    "hash" : "0x09c05646f141ea1e93f190906451eb1a891884d286ab8a3380c0a9915ba60873",
-                    "mixHash" : "0x6a4c09a2731203480e7ce67bb2dc9309784d19266f84ea42a7321d9904898fde",
-                    "nonce" : "0xc2ce6a147dcee81e",
+                    "hash" : "0x710fb38f28cbc663029a0026d4bf77c8b0929e1dbfa3cb3bb7e8837bc6a0bcf6",
+                    "mixHash" : "0xe9afedb185c646e83109a373ffffef04305e25587ad074d511c5b66241bac843",
+                    "nonce" : "0x0e0eaade986ba143",
                     "number" : "0x01",
                     "parentHash" : "0xf9c01febe910601e6f3dc318b4c37287ebb52fdcfb453b9b9448ae15a96978d9",
                     "receiptTrie" : "0xfebe98089b2cca0f56309012cd584e8009de24039a24cdb5b54eda25d8768049",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0f9c01febe910601e6f3dc318b4c37287ebb52fdcfb453b9b9448ae15a96978d9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0499e2b242d7c5ff4577b5f13034306a36e6d8b1e4f9fc44d58943942bcc78d7fa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0febe98089b2cca0f56309012cd584e8009de24039a24cdb5b54eda25d8768049b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82661f8203e880a06a4c09a2731203480e7ce67bb2dc9309784d19266f84ea42a7321d9904898fde88c2ce6a147dcee81ef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0f9c01febe910601e6f3dc318b4c37287ebb52fdcfb453b9b9448ae15a96978d9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0499e2b242d7c5ff4577b5f13034306a36e6d8b1e4f9fc44d58943942bcc78d7fa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0febe98089b2cca0f56309012cd584e8009de24039a24cdb5b54eda25d8768049b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82661f8203e880a0e9afedb185c646e83109a373ffffef04305e25587ad074d511c5b66241bac843880e0eaade986ba143f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b53baff9b563ff38b8756c98979d705b6ac3934ded54bd09dfe2e70057099707a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x09c05646f141ea1e93f190906451eb1a891884d286ab8a3380c0a9915ba60873",
+        "lastblockhash" : "0x710fb38f28cbc663029a0026d4bf77c8b0929e1dbfa3cb3bb7e8837bc6a0bcf6",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest529BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest529BC.json
index a58dc1e1b..9358e9f6d 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest529BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest529BC.json
@@ -2,8 +2,8 @@
     "randomStatetest529BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest529BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest529BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa4c0",
-                    "hash" : "0xd522e0a37b3c4846139b4aab90270bba23938b41773695684d1f899e5e9dc5b4",
-                    "mixHash" : "0x07a3d42e1e82848657f50e3cea2f16e4bc29afa4d2c68259db37be96c850011c",
-                    "nonce" : "0x27d51583fba0f505",
+                    "hash" : "0x83e2bdcc67564db52c038d546e206fb7490a20a106c1eef365869edc58d97a92",
+                    "mixHash" : "0x57ac894ebddd88f85a8cebcf0aa0c6bb0f4cdf79164dc850f205cf31bc04c963",
+                    "nonce" : "0x7c6236087c57b99f",
                     "number" : "0x01",
                     "parentHash" : "0x2c7c4cfabf3ad56f24723d764bac32050ac240c47d389cf93b04f191c88519ca",
                     "receiptTrie" : "0x50ebdc992ef875692e766cd363b25541db83c0f89edd88f6d6048bc9d8dbb326",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca02c7c4cfabf3ad56f24723d764bac32050ac240c47d389cf93b04f191c88519caa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06867bcbd4a6d5a2db9825ede3e6ddd1d424af2b7b66c9d13d2063e472ada6313a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa050ebdc992ef875692e766cd363b25541db83c0f89edd88f6d6048bc9d8dbb326b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000040000000000000000000000000000000000000000000008302000001887fffffffffffffff82a4c08203e880a007a3d42e1e82848657f50e3cea2f16e4bc29afa4d2c68259db37be96c850011c8827d51583fba0f505f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca02c7c4cfabf3ad56f24723d764bac32050ac240c47d389cf93b04f191c88519caa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06867bcbd4a6d5a2db9825ede3e6ddd1d424af2b7b66c9d13d2063e472ada6313a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa050ebdc992ef875692e766cd363b25541db83c0f89edd88f6d6048bc9d8dbb326b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000040000000000000000000000000000000000000000000008302000001887fffffffffffffff82a4c08203e880a057ac894ebddd88f85a8cebcf0aa0c6bb0f4cdf79164dc850f205cf31bc04c963887c6236087c57b99ff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c99412fefb1789fb79590978ac17dfb536a9337a8732e9c19eef52529d0ee374a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd522e0a37b3c4846139b4aab90270bba23938b41773695684d1f899e5e9dc5b4",
+        "lastblockhash" : "0x83e2bdcc67564db52c038d546e206fb7490a20a106c1eef365869edc58d97a92",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest529BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest529BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest529BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa7cc",
-                    "hash" : "0x4b9745af4b448e4f1c2409d32e2bdfd44bddfa22f4caa97434fb51908b63c4c4",
-                    "mixHash" : "0xaf954ef4b1d97cf53a2a64468c6029997b9b96aedc2ca326da31673dc79132d9",
-                    "nonce" : "0x0efd691f8217f6f6",
+                    "hash" : "0xd5a8b05fe0c3f41054029433ca35adf4264adab9c6722e3fbaf304e687d817e5",
+                    "mixHash" : "0x56742cd26f0383e92be0730e4dec475085ba571fd8d6754e40000f1220cd8d3b",
+                    "nonce" : "0x23b3fdc09437ffbf",
                     "number" : "0x01",
                     "parentHash" : "0x2c7c4cfabf3ad56f24723d764bac32050ac240c47d389cf93b04f191c88519ca",
                     "receiptTrie" : "0x7c374df2ac56038ab20368e1c957047342c4be881a237f687b3cffc660fa0708",
-                    "stateRoot" : "0xdcd7a43d1247c3049a59ea4efac39340238cc99cb3e45afb1fac75b96910c091",
+                    "stateRoot" : "0xa23bbe571f469b4f40b4173dc6d6c2367d1a0f2f2b0675f903b982dd6c7407d7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca02c7c4cfabf3ad56f24723d764bac32050ac240c47d389cf93b04f191c88519caa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dcd7a43d1247c3049a59ea4efac39340238cc99cb3e45afb1fac75b96910c091a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa07c374df2ac56038ab20368e1c957047342c4be881a237f687b3cffc660fa0708b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000040000000000000000000000000000000000000000000008302000001887fffffffffffffff82a7cc8203e880a0af954ef4b1d97cf53a2a64468c6029997b9b96aedc2ca326da31673dc79132d9880efd691f8217f6f6f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca02c7c4cfabf3ad56f24723d764bac32050ac240c47d389cf93b04f191c88519caa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a23bbe571f469b4f40b4173dc6d6c2367d1a0f2f2b0675f903b982dd6c7407d7a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa07c374df2ac56038ab20368e1c957047342c4be881a237f687b3cffc660fa0708b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000040000000000000000000000000000000000000000000008302000001887fffffffffffffff82a7cc8203e880a056742cd26f0383e92be0730e4dec475085ba571fd8d6754e40000f1220cd8d3b8823b3fdc09437ffbff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c99412fefb1789fb79590978ac17dfb536a9337a8732e9c19eef52529d0ee374a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4b9745af4b448e4f1c2409d32e2bdfd44bddfa22f4caa97434fb51908b63c4c4",
+        "lastblockhash" : "0xd5a8b05fe0c3f41054029433ca35adf4264adab9c6722e3fbaf304e687d817e5",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x4445434244444044a158205855",
@@ -235,8 +228,8 @@
     "randomStatetest529BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest529BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest529BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa4c0",
-                    "hash" : "0xdc6771d547a81007eea931fdf62c1da323c932a49d0a5daa003aa715d95c4926",
-                    "mixHash" : "0x592d04bb03a39683e19b00923423db2b08517bf97ec0cb03525fe1f9fc522cbd",
-                    "nonce" : "0x740ca3becdd4abe9",
+                    "hash" : "0x3c6d64231a25f0da12e859ed0d3d4e554b73fc6cb105fda236718a6ed4c7415f",
+                    "mixHash" : "0xf0d1d2ee411a5b5a4d24f5ce7da4c1deb97199e37c167895b99e460e0adcbeab",
+                    "nonce" : "0x21f4656e11099d17",
                     "number" : "0x01",
                     "parentHash" : "0x2c7c4cfabf3ad56f24723d764bac32050ac240c47d389cf93b04f191c88519ca",
                     "receiptTrie" : "0xd142db5111ea5091f05fb33334eb9746e029f0125803be6b5f980b50953201e6",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca02c7c4cfabf3ad56f24723d764bac32050ac240c47d389cf93b04f191c88519caa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07942b02c07657fdf75f2d22b369a8f4d49f82ee343b988cbb3f8795522c65903a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d142db5111ea5091f05fb33334eb9746e029f0125803be6b5f980b50953201e6b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000040000000000000000000000000000000000000000000008302000001887fffffffffffffff82a4c08203e880a0592d04bb03a39683e19b00923423db2b08517bf97ec0cb03525fe1f9fc522cbd88740ca3becdd4abe9f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca02c7c4cfabf3ad56f24723d764bac32050ac240c47d389cf93b04f191c88519caa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07942b02c07657fdf75f2d22b369a8f4d49f82ee343b988cbb3f8795522c65903a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d142db5111ea5091f05fb33334eb9746e029f0125803be6b5f980b50953201e6b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000040000000000000000000000000000000000000000000008302000001887fffffffffffffff82a4c08203e880a0f0d1d2ee411a5b5a4d24f5ce7da4c1deb97199e37c167895b99e460e0adcbeab8821f4656e11099d17f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c99412fefb1789fb79590978ac17dfb536a9337a8732e9c19eef52529d0ee374a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdc6771d547a81007eea931fdf62c1da323c932a49d0a5daa003aa715d95c4926",
+        "lastblockhash" : "0x3c6d64231a25f0da12e859ed0d3d4e554b73fc6cb105fda236718a6ed4c7415f",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest529BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest529BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest529BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa4c0",
-                    "hash" : "0x83eb6324c9535d1edf0a2105ed50e0dd195091b8c398ebea8a3253b05fe27814",
-                    "mixHash" : "0x1f286e74fb97df9b62c5c6ba5bf6f74a97cd83741bf8f31c976a43de28ebfa83",
-                    "nonce" : "0x8692c13ff9dc1e46",
+                    "hash" : "0x0dc5475ad6c1254324a5bdaa98f066ce88d8349e6de3915051d2bdb4eb2c075d",
+                    "mixHash" : "0xa53049729d31e9379652bfdb0c60fa62f992ed81debf497873926d043af69fa5",
+                    "nonce" : "0x8da8f0227ccde0d9",
                     "number" : "0x01",
                     "parentHash" : "0x2c7c4cfabf3ad56f24723d764bac32050ac240c47d389cf93b04f191c88519ca",
                     "receiptTrie" : "0xd142db5111ea5091f05fb33334eb9746e029f0125803be6b5f980b50953201e6",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca02c7c4cfabf3ad56f24723d764bac32050ac240c47d389cf93b04f191c88519caa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07942b02c07657fdf75f2d22b369a8f4d49f82ee343b988cbb3f8795522c65903a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d142db5111ea5091f05fb33334eb9746e029f0125803be6b5f980b50953201e6b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000040000000000000000000000000000000000000000000008302000001887fffffffffffffff82a4c08203e880a01f286e74fb97df9b62c5c6ba5bf6f74a97cd83741bf8f31c976a43de28ebfa83888692c13ff9dc1e46f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca02c7c4cfabf3ad56f24723d764bac32050ac240c47d389cf93b04f191c88519caa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07942b02c07657fdf75f2d22b369a8f4d49f82ee343b988cbb3f8795522c65903a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d142db5111ea5091f05fb33334eb9746e029f0125803be6b5f980b50953201e6b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000040000000000000000000000000000000000000000000008302000001887fffffffffffffff82a4c08203e880a0a53049729d31e9379652bfdb0c60fa62f992ed81debf497873926d043af69fa5888da8f0227ccde0d9f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c99412fefb1789fb79590978ac17dfb536a9337a8732e9c19eef52529d0ee374a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x83eb6324c9535d1edf0a2105ed50e0dd195091b8c398ebea8a3253b05fe27814",
+        "lastblockhash" : "0x0dc5475ad6c1254324a5bdaa98f066ce88d8349e6de3915051d2bdb4eb2c075d",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest529BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest529BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest529BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa4c0",
-                    "hash" : "0x8a11423288a157ba17ed3d43eb069c479d1cd5c7ae6678c0eadaa30f0c4aa26e",
-                    "mixHash" : "0xbfc301daa77f7ba6724ecef2d49b2001aa4936cfc61317648af7906afba8df93",
-                    "nonce" : "0xba9e0d152c99d677",
+                    "hash" : "0xe63e659e345f633d84494b8ee25ddade3eea783dd586920f29ea783460eaff94",
+                    "mixHash" : "0x568f07cdb5ef6e14a387f5ce1b2e5499697af527a905ef5b4e05db945ad00f21",
+                    "nonce" : "0x4a548768ab8d55cf",
                     "number" : "0x01",
                     "parentHash" : "0x2c7c4cfabf3ad56f24723d764bac32050ac240c47d389cf93b04f191c88519ca",
                     "receiptTrie" : "0xd142db5111ea5091f05fb33334eb9746e029f0125803be6b5f980b50953201e6",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca02c7c4cfabf3ad56f24723d764bac32050ac240c47d389cf93b04f191c88519caa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07942b02c07657fdf75f2d22b369a8f4d49f82ee343b988cbb3f8795522c65903a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d142db5111ea5091f05fb33334eb9746e029f0125803be6b5f980b50953201e6b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000040000000000000000000000000000000000000000000008302000001887fffffffffffffff82a4c08203e880a0bfc301daa77f7ba6724ecef2d49b2001aa4936cfc61317648af7906afba8df9388ba9e0d152c99d677f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca02c7c4cfabf3ad56f24723d764bac32050ac240c47d389cf93b04f191c88519caa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07942b02c07657fdf75f2d22b369a8f4d49f82ee343b988cbb3f8795522c65903a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d142db5111ea5091f05fb33334eb9746e029f0125803be6b5f980b50953201e6b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000040000000000000000000000000000000000000000000008302000001887fffffffffffffff82a4c08203e880a0568f07cdb5ef6e14a387f5ce1b2e5499697af527a905ef5b4e05db945ad00f21884a548768ab8d55cff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c99412fefb1789fb79590978ac17dfb536a9337a8732e9c19eef52529d0ee374a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8a11423288a157ba17ed3d43eb069c479d1cd5c7ae6678c0eadaa30f0c4aa26e",
+        "lastblockhash" : "0xe63e659e345f633d84494b8ee25ddade3eea783dd586920f29ea783460eaff94",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest529BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest529BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest529BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa4c0",
-                    "hash" : "0xdb6927c647a791f7ed939a9eee30328f62fe71ad5b96eecb196bd47286a5b371",
-                    "mixHash" : "0x2419266c165d11847682d69e361eb63363176835027be2fee3948090ec00ca97",
-                    "nonce" : "0xf1b01f36245c7696",
+                    "hash" : "0xc2bd5b6e0ccb3a521a639d3c8c2ef1558975acac282ccfc81c2afd8bd4e30954",
+                    "mixHash" : "0x7da36c1c788abea4b5ab96b26a3f85a731f5b4237337e9c5d4ce91f7e5217c89",
+                    "nonce" : "0x8157c1d4c1973440",
                     "number" : "0x01",
                     "parentHash" : "0x2c7c4cfabf3ad56f24723d764bac32050ac240c47d389cf93b04f191c88519ca",
                     "receiptTrie" : "0xd142db5111ea5091f05fb33334eb9746e029f0125803be6b5f980b50953201e6",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca02c7c4cfabf3ad56f24723d764bac32050ac240c47d389cf93b04f191c88519caa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07942b02c07657fdf75f2d22b369a8f4d49f82ee343b988cbb3f8795522c65903a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d142db5111ea5091f05fb33334eb9746e029f0125803be6b5f980b50953201e6b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000040000000000000000000000000000000000000000000008302000001887fffffffffffffff82a4c08203e880a02419266c165d11847682d69e361eb63363176835027be2fee3948090ec00ca9788f1b01f36245c7696f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca02c7c4cfabf3ad56f24723d764bac32050ac240c47d389cf93b04f191c88519caa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07942b02c07657fdf75f2d22b369a8f4d49f82ee343b988cbb3f8795522c65903a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d142db5111ea5091f05fb33334eb9746e029f0125803be6b5f980b50953201e6b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000040000000000000000000000000000000000000000000008302000001887fffffffffffffff82a4c08203e880a07da36c1c788abea4b5ab96b26a3f85a731f5b4237337e9c5d4ce91f7e5217c89888157c1d4c1973440f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c99412fefb1789fb79590978ac17dfb536a9337a8732e9c19eef52529d0ee374a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdb6927c647a791f7ed939a9eee30328f62fe71ad5b96eecb196bd47286a5b371",
+        "lastblockhash" : "0xc2bd5b6e0ccb3a521a639d3c8c2ef1558975acac282ccfc81c2afd8bd4e30954",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest530BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest530BC.json
index 57c93d79e..add7bf830 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest530BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest530BC.json
@@ -2,8 +2,8 @@
     "randomStatetest530BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest530BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest530BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb676",
-                    "hash" : "0xdd098dfeba86c6ed458527815209e891476872de58bb85809afbde8468c6579b",
-                    "mixHash" : "0xf6ec08e3454f66661caf16cb0ca45046986771bdf5fb982b2c96b15d094a0481",
-                    "nonce" : "0x93cf1886910f3eb9",
+                    "hash" : "0x2293da2baa4f4cd05454c9ad05a2f7da8d4dbc0a89cdec225f48078e21f23e38",
+                    "mixHash" : "0xf9078ab5f1d6160f549b68a83a45831fa44e04e4393cea5b8d14634fcc0fa6c6",
+                    "nonce" : "0x3fd9ad3675ab06de",
                     "number" : "0x01",
                     "parentHash" : "0x250fa76e1ea2c9ff2ddafa2d2ea315f451a5bd419cfc5bd9290a78260707d09d",
                     "receiptTrie" : "0xf6588d333ffe7e14634892e37ac71fa148c29c15581917a8001010bb3c4a5f96",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x48de4cf2b01be77edf7b145d46417d830a80aa00c3394d2242ffbc3b613948d6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90323f901fca0250fa76e1ea2c9ff2ddafa2d2ea315f451a5bd419cfc5bd9290a78260707d09da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c98f0aa1422750dd7a62b2c998ac1ba20555db98d71afdd0be3649bb1817203fa048de4cf2b01be77edf7b145d46417d830a80aa00c3394d2242ffbc3b613948d6a0f6588d333ffe7e14634892e37ac71fa148c29c15581917a8001010bb3c4a5f96b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b6768203e880a0f6ec08e3454f66661caf16cb0ca45046986771bdf5fb982b2c96b15d094a04818893cf1886910f3eb9f90120f9011d8001840c9be3c494095e7baea6a6c7c4c2dfeb977efac326af552d87847085d0e4b8b77f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5127fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000406fa36f44a1623c178c05749f036a50571ca0d02b2e71e5276734b3e82c5e4cc85c3767fb28e25d31592290f689ff9872868ba07fc9d55a61c505e7cfcb3e4f4601d72375ad8fa199aba57848433951af9f9b6bc0",
+                "rlp" : "0xf90323f901fca0250fa76e1ea2c9ff2ddafa2d2ea315f451a5bd419cfc5bd9290a78260707d09da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c98f0aa1422750dd7a62b2c998ac1ba20555db98d71afdd0be3649bb1817203fa048de4cf2b01be77edf7b145d46417d830a80aa00c3394d2242ffbc3b613948d6a0f6588d333ffe7e14634892e37ac71fa148c29c15581917a8001010bb3c4a5f96b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b6768203e880a0f9078ab5f1d6160f549b68a83a45831fa44e04e4393cea5b8d14634fcc0fa6c6883fd9ad3675ab06def90120f9011d8001840c9be3c494095e7baea6a6c7c4c2dfeb977efac326af552d87847085d0e4b8b77f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5127fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000406fa36f44a1623c178c05749f036a50571ca0d02b2e71e5276734b3e82c5e4cc85c3767fb28e25d31592290f689ff9872868ba07fc9d55a61c505e7cfcb3e4f4601d72375ad8fa199aba57848433951af9f9b6bc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5127fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000406fa36f44a1623c178c05749f036a5057",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08593a4dcb00d5946f9ed5b75ff0e33958f752c3aebde7977974b089534cba4efa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdd098dfeba86c6ed458527815209e891476872de58bb85809afbde8468c6579b",
+        "lastblockhash" : "0x2293da2baa4f4cd05454c9ad05a2f7da8d4dbc0a89cdec225f48078e21f23e38",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest530BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest530BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest530BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb982",
-                    "hash" : "0x627f2c827063a3a7fcf8ce2a9e530b03bd78c3f7b8467cdec5bdb35f94bd3299",
-                    "mixHash" : "0x1ffe196fff9a3e2729b18e015181e80be66dc8f87efe8d96f1e918cbaf72dbdd",
-                    "nonce" : "0x3e9745a8e5c02d9e",
+                    "hash" : "0xf716906cc071a982ca201ad958b50b699338bd20542699d33e7c8ed9917ee6a2",
+                    "mixHash" : "0xa3d34c2fc385ccd1214e514eb1785cab606fbf65cf5326f810db8419526cdf85",
+                    "nonce" : "0xc2b91de272eb95ad",
                     "number" : "0x01",
                     "parentHash" : "0x250fa76e1ea2c9ff2ddafa2d2ea315f451a5bd419cfc5bd9290a78260707d09d",
                     "receiptTrie" : "0x646b4e56c114edac7c74adf18dbc2228dc40f9e5179f5b98836abba7dbe6d8ff",
-                    "stateRoot" : "0x7c4b606d9a4204cb9fe4075cb55c3b30c3c5fb52deae303c20cc754d57e2c43a",
+                    "stateRoot" : "0x448175461fdc9b00636f4d3aa074724fb3c5b2258cb8eb0c3fe8075731b547e5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x48de4cf2b01be77edf7b145d46417d830a80aa00c3394d2242ffbc3b613948d6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90323f901fca0250fa76e1ea2c9ff2ddafa2d2ea315f451a5bd419cfc5bd9290a78260707d09da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07c4b606d9a4204cb9fe4075cb55c3b30c3c5fb52deae303c20cc754d57e2c43aa048de4cf2b01be77edf7b145d46417d830a80aa00c3394d2242ffbc3b613948d6a0646b4e56c114edac7c74adf18dbc2228dc40f9e5179f5b98836abba7dbe6d8ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b9828203e880a01ffe196fff9a3e2729b18e015181e80be66dc8f87efe8d96f1e918cbaf72dbdd883e9745a8e5c02d9ef90120f9011d8001840c9be3c494095e7baea6a6c7c4c2dfeb977efac326af552d87847085d0e4b8b77f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5127fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000406fa36f44a1623c178c05749f036a50571ca0d02b2e71e5276734b3e82c5e4cc85c3767fb28e25d31592290f689ff9872868ba07fc9d55a61c505e7cfcb3e4f4601d72375ad8fa199aba57848433951af9f9b6bc0",
+                "rlp" : "0xf90323f901fca0250fa76e1ea2c9ff2ddafa2d2ea315f451a5bd419cfc5bd9290a78260707d09da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0448175461fdc9b00636f4d3aa074724fb3c5b2258cb8eb0c3fe8075731b547e5a048de4cf2b01be77edf7b145d46417d830a80aa00c3394d2242ffbc3b613948d6a0646b4e56c114edac7c74adf18dbc2228dc40f9e5179f5b98836abba7dbe6d8ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b9828203e880a0a3d34c2fc385ccd1214e514eb1785cab606fbf65cf5326f810db8419526cdf8588c2b91de272eb95adf90120f9011d8001840c9be3c494095e7baea6a6c7c4c2dfeb977efac326af552d87847085d0e4b8b77f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5127fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000406fa36f44a1623c178c05749f036a50571ca0d02b2e71e5276734b3e82c5e4cc85c3767fb28e25d31592290f689ff9872868ba07fc9d55a61c505e7cfcb3e4f4601d72375ad8fa199aba57848433951af9f9b6bc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5127fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000406fa36f44a1623c178c05749f036a5057",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08593a4dcb00d5946f9ed5b75ff0e33958f752c3aebde7977974b089534cba4efa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x627f2c827063a3a7fcf8ce2a9e530b03bd78c3f7b8467cdec5bdb35f94bd3299",
+        "lastblockhash" : "0xf716906cc071a982ca201ad958b50b699338bd20542699d33e7c8ed9917ee6a2",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x7085d0e4",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5127fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000406fa36f44a1623c178c05749f036a50575560005155",
@@ -235,8 +228,8 @@
     "randomStatetest530BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest530BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest530BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb676",
-                    "hash" : "0x4ecb683b8737f6989acf4d1295b5f6e87d9e0c56173409284246116bcbf98b44",
-                    "mixHash" : "0x8f85292cce33c887fb394921e4122be56327016f6bd6a4465627f6131898c851",
-                    "nonce" : "0xa4f3f923d06d6276",
+                    "hash" : "0xa1a8cf4342618cdd44a8c04b47f299e25cba4373a88795cc3c3cb7ab30e6b086",
+                    "mixHash" : "0xc0c27ccdd1f0113ae261924c9018b94b3b8b1586a53f4f07efd55e697b713ac1",
+                    "nonce" : "0xe2643e6ef4b96c4d",
                     "number" : "0x01",
                     "parentHash" : "0x250fa76e1ea2c9ff2ddafa2d2ea315f451a5bd419cfc5bd9290a78260707d09d",
                     "receiptTrie" : "0xe45ce49f45824a7aececa4f918261244c0e11e909f6817e18b71234bd112a437",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0x48de4cf2b01be77edf7b145d46417d830a80aa00c3394d2242ffbc3b613948d6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90323f901fca0250fa76e1ea2c9ff2ddafa2d2ea315f451a5bd419cfc5bd9290a78260707d09da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00e1edc15affc17d4a804a4af5bc3b72d9dead39732ce05228844432a77209eeda048de4cf2b01be77edf7b145d46417d830a80aa00c3394d2242ffbc3b613948d6a0e45ce49f45824a7aececa4f918261244c0e11e909f6817e18b71234bd112a437b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b6768203e880a08f85292cce33c887fb394921e4122be56327016f6bd6a4465627f6131898c85188a4f3f923d06d6276f90120f9011d8001840c9be3c494095e7baea6a6c7c4c2dfeb977efac326af552d87847085d0e4b8b77f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5127fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000406fa36f44a1623c178c05749f036a50571ca0d02b2e71e5276734b3e82c5e4cc85c3767fb28e25d31592290f689ff9872868ba07fc9d55a61c505e7cfcb3e4f4601d72375ad8fa199aba57848433951af9f9b6bc0",
+                "rlp" : "0xf90323f901fca0250fa76e1ea2c9ff2ddafa2d2ea315f451a5bd419cfc5bd9290a78260707d09da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00e1edc15affc17d4a804a4af5bc3b72d9dead39732ce05228844432a77209eeda048de4cf2b01be77edf7b145d46417d830a80aa00c3394d2242ffbc3b613948d6a0e45ce49f45824a7aececa4f918261244c0e11e909f6817e18b71234bd112a437b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b6768203e880a0c0c27ccdd1f0113ae261924c9018b94b3b8b1586a53f4f07efd55e697b713ac188e2643e6ef4b96c4df90120f9011d8001840c9be3c494095e7baea6a6c7c4c2dfeb977efac326af552d87847085d0e4b8b77f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5127fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000406fa36f44a1623c178c05749f036a50571ca0d02b2e71e5276734b3e82c5e4cc85c3767fb28e25d31592290f689ff9872868ba07fc9d55a61c505e7cfcb3e4f4601d72375ad8fa199aba57848433951af9f9b6bc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5127fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000406fa36f44a1623c178c05749f036a5057",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08593a4dcb00d5946f9ed5b75ff0e33958f752c3aebde7977974b089534cba4efa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4ecb683b8737f6989acf4d1295b5f6e87d9e0c56173409284246116bcbf98b44",
+        "lastblockhash" : "0xa1a8cf4342618cdd44a8c04b47f299e25cba4373a88795cc3c3cb7ab30e6b086",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest530BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest530BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest530BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb676",
-                    "hash" : "0x29d62d99aa5591bd49cc6c26e5bfdcfdc3a2bef53a1f4776df53ebafc731c354",
-                    "mixHash" : "0x15b2f15fdeb86b15894ae6dd61fe0d9f2cd7ad4c4fca2a3a5425b86bc5e85834",
-                    "nonce" : "0x66d89f53f9cc3732",
+                    "hash" : "0x6ad1a06cc2c90b1946ca96ca6b9fa1d9310664a2afa5a819d6e6aed312fed05b",
+                    "mixHash" : "0xd5bddf277e0905128d56bf88724c9e4ce852e37f018748b0852b23d8f9ac03f2",
+                    "nonce" : "0x69d92c90bff553b8",
                     "number" : "0x01",
                     "parentHash" : "0x250fa76e1ea2c9ff2ddafa2d2ea315f451a5bd419cfc5bd9290a78260707d09d",
                     "receiptTrie" : "0xe45ce49f45824a7aececa4f918261244c0e11e909f6817e18b71234bd112a437",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0x48de4cf2b01be77edf7b145d46417d830a80aa00c3394d2242ffbc3b613948d6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90323f901fca0250fa76e1ea2c9ff2ddafa2d2ea315f451a5bd419cfc5bd9290a78260707d09da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00e1edc15affc17d4a804a4af5bc3b72d9dead39732ce05228844432a77209eeda048de4cf2b01be77edf7b145d46417d830a80aa00c3394d2242ffbc3b613948d6a0e45ce49f45824a7aececa4f918261244c0e11e909f6817e18b71234bd112a437b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b6768203e880a015b2f15fdeb86b15894ae6dd61fe0d9f2cd7ad4c4fca2a3a5425b86bc5e858348866d89f53f9cc3732f90120f9011d8001840c9be3c494095e7baea6a6c7c4c2dfeb977efac326af552d87847085d0e4b8b77f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5127fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000406fa36f44a1623c178c05749f036a50571ca0d02b2e71e5276734b3e82c5e4cc85c3767fb28e25d31592290f689ff9872868ba07fc9d55a61c505e7cfcb3e4f4601d72375ad8fa199aba57848433951af9f9b6bc0",
+                "rlp" : "0xf90323f901fca0250fa76e1ea2c9ff2ddafa2d2ea315f451a5bd419cfc5bd9290a78260707d09da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00e1edc15affc17d4a804a4af5bc3b72d9dead39732ce05228844432a77209eeda048de4cf2b01be77edf7b145d46417d830a80aa00c3394d2242ffbc3b613948d6a0e45ce49f45824a7aececa4f918261244c0e11e909f6817e18b71234bd112a437b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b6768203e880a0d5bddf277e0905128d56bf88724c9e4ce852e37f018748b0852b23d8f9ac03f28869d92c90bff553b8f90120f9011d8001840c9be3c494095e7baea6a6c7c4c2dfeb977efac326af552d87847085d0e4b8b77f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5127fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000406fa36f44a1623c178c05749f036a50571ca0d02b2e71e5276734b3e82c5e4cc85c3767fb28e25d31592290f689ff9872868ba07fc9d55a61c505e7cfcb3e4f4601d72375ad8fa199aba57848433951af9f9b6bc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5127fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000406fa36f44a1623c178c05749f036a5057",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08593a4dcb00d5946f9ed5b75ff0e33958f752c3aebde7977974b089534cba4efa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x29d62d99aa5591bd49cc6c26e5bfdcfdc3a2bef53a1f4776df53ebafc731c354",
+        "lastblockhash" : "0x6ad1a06cc2c90b1946ca96ca6b9fa1d9310664a2afa5a819d6e6aed312fed05b",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest530BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest530BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest530BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb676",
-                    "hash" : "0x86efe616c6425fc97b40e2269dd211c1a76da051e1179076fd5cbe338d39ffe4",
-                    "mixHash" : "0xa618aa25fbc8f763a5b56aaadd63650e8bb363c2caf0b0e4e2243362c8ded144",
-                    "nonce" : "0x02785b5a9a01cde3",
+                    "hash" : "0xb9e874f1b15f9e8d3d26fc7477602cc966b6e14eb15272069e81f0a15424a73a",
+                    "mixHash" : "0x744c51ff1fc9ba1cfeab5d187c70d9ca921fe15bc1cffdbd5d4b4c61deae431b",
+                    "nonce" : "0xd456388173f8e6b2",
                     "number" : "0x01",
                     "parentHash" : "0x250fa76e1ea2c9ff2ddafa2d2ea315f451a5bd419cfc5bd9290a78260707d09d",
                     "receiptTrie" : "0xe45ce49f45824a7aececa4f918261244c0e11e909f6817e18b71234bd112a437",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0x48de4cf2b01be77edf7b145d46417d830a80aa00c3394d2242ffbc3b613948d6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90323f901fca0250fa76e1ea2c9ff2ddafa2d2ea315f451a5bd419cfc5bd9290a78260707d09da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00e1edc15affc17d4a804a4af5bc3b72d9dead39732ce05228844432a77209eeda048de4cf2b01be77edf7b145d46417d830a80aa00c3394d2242ffbc3b613948d6a0e45ce49f45824a7aececa4f918261244c0e11e909f6817e18b71234bd112a437b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b6768203e880a0a618aa25fbc8f763a5b56aaadd63650e8bb363c2caf0b0e4e2243362c8ded1448802785b5a9a01cde3f90120f9011d8001840c9be3c494095e7baea6a6c7c4c2dfeb977efac326af552d87847085d0e4b8b77f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5127fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000406fa36f44a1623c178c05749f036a50571ca0d02b2e71e5276734b3e82c5e4cc85c3767fb28e25d31592290f689ff9872868ba07fc9d55a61c505e7cfcb3e4f4601d72375ad8fa199aba57848433951af9f9b6bc0",
+                "rlp" : "0xf90323f901fca0250fa76e1ea2c9ff2ddafa2d2ea315f451a5bd419cfc5bd9290a78260707d09da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00e1edc15affc17d4a804a4af5bc3b72d9dead39732ce05228844432a77209eeda048de4cf2b01be77edf7b145d46417d830a80aa00c3394d2242ffbc3b613948d6a0e45ce49f45824a7aececa4f918261244c0e11e909f6817e18b71234bd112a437b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b6768203e880a0744c51ff1fc9ba1cfeab5d187c70d9ca921fe15bc1cffdbd5d4b4c61deae431b88d456388173f8e6b2f90120f9011d8001840c9be3c494095e7baea6a6c7c4c2dfeb977efac326af552d87847085d0e4b8b77f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5127fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000406fa36f44a1623c178c05749f036a50571ca0d02b2e71e5276734b3e82c5e4cc85c3767fb28e25d31592290f689ff9872868ba07fc9d55a61c505e7cfcb3e4f4601d72375ad8fa199aba57848433951af9f9b6bc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5127fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000406fa36f44a1623c178c05749f036a5057",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08593a4dcb00d5946f9ed5b75ff0e33958f752c3aebde7977974b089534cba4efa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x86efe616c6425fc97b40e2269dd211c1a76da051e1179076fd5cbe338d39ffe4",
+        "lastblockhash" : "0xb9e874f1b15f9e8d3d26fc7477602cc966b6e14eb15272069e81f0a15424a73a",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest530BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest530BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest530BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb676",
-                    "hash" : "0x5fe17c5660f2d513f1509826b336f485ff1a3c9159faa5ded2854dea97d705fd",
-                    "mixHash" : "0x778fa188cff81402e1a8db5cf9e78ef9020cd7225f0ad25cc0e166e98a7ace92",
-                    "nonce" : "0x2ddf1f297432c48e",
+                    "hash" : "0x6d88362439f56cf2226954c3520549f57f14fd9b819c9626f0f4e0dea76733a9",
+                    "mixHash" : "0x4f1c5ea2c0634040a18726cdcfd0ba90e47e920d1ce890501982a02a7ca19cae",
+                    "nonce" : "0x4784c647ab698024",
                     "number" : "0x01",
                     "parentHash" : "0x250fa76e1ea2c9ff2ddafa2d2ea315f451a5bd419cfc5bd9290a78260707d09d",
                     "receiptTrie" : "0xe45ce49f45824a7aececa4f918261244c0e11e909f6817e18b71234bd112a437",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0x48de4cf2b01be77edf7b145d46417d830a80aa00c3394d2242ffbc3b613948d6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90323f901fca0250fa76e1ea2c9ff2ddafa2d2ea315f451a5bd419cfc5bd9290a78260707d09da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00e1edc15affc17d4a804a4af5bc3b72d9dead39732ce05228844432a77209eeda048de4cf2b01be77edf7b145d46417d830a80aa00c3394d2242ffbc3b613948d6a0e45ce49f45824a7aececa4f918261244c0e11e909f6817e18b71234bd112a437b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b6768203e880a0778fa188cff81402e1a8db5cf9e78ef9020cd7225f0ad25cc0e166e98a7ace92882ddf1f297432c48ef90120f9011d8001840c9be3c494095e7baea6a6c7c4c2dfeb977efac326af552d87847085d0e4b8b77f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5127fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000406fa36f44a1623c178c05749f036a50571ca0d02b2e71e5276734b3e82c5e4cc85c3767fb28e25d31592290f689ff9872868ba07fc9d55a61c505e7cfcb3e4f4601d72375ad8fa199aba57848433951af9f9b6bc0",
+                "rlp" : "0xf90323f901fca0250fa76e1ea2c9ff2ddafa2d2ea315f451a5bd419cfc5bd9290a78260707d09da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00e1edc15affc17d4a804a4af5bc3b72d9dead39732ce05228844432a77209eeda048de4cf2b01be77edf7b145d46417d830a80aa00c3394d2242ffbc3b613948d6a0e45ce49f45824a7aececa4f918261244c0e11e909f6817e18b71234bd112a437b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b6768203e880a04f1c5ea2c0634040a18726cdcfd0ba90e47e920d1ce890501982a02a7ca19cae884784c647ab698024f90120f9011d8001840c9be3c494095e7baea6a6c7c4c2dfeb977efac326af552d87847085d0e4b8b77f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5127fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000406fa36f44a1623c178c05749f036a50571ca0d02b2e71e5276734b3e82c5e4cc85c3767fb28e25d31592290f689ff9872868ba07fc9d55a61c505e7cfcb3e4f4601d72375ad8fa199aba57848433951af9f9b6bc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5127fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000406fa36f44a1623c178c05749f036a5057",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08593a4dcb00d5946f9ed5b75ff0e33958f752c3aebde7977974b089534cba4efa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5fe17c5660f2d513f1509826b336f485ff1a3c9159faa5ded2854dea97d705fd",
+        "lastblockhash" : "0x6d88362439f56cf2226954c3520549f57f14fd9b819c9626f0f4e0dea76733a9",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest540BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest540BC.json
index 0faa3754d..ef8e59ef3 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest540BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest540BC.json
@@ -2,8 +2,8 @@
     "randomStatetest540BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest540BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest540BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa34e",
-                    "hash" : "0x55ab3d0475d56591a30b16c9dc8e2db9d2672a7e1d4864e329eee843e3ffd925",
-                    "mixHash" : "0xde17f4682ae5b4d294791a1fd86de897dbfbdceead50c069c8c20e1d94126c8f",
-                    "nonce" : "0x20c627c5d006d6fb",
+                    "hash" : "0x2f7a87fbf2dc4c52768beec9a27b007f92a294734752910863ab164f2cd17bad",
+                    "mixHash" : "0xeb59aa30571820f803c603374598ca376f4584302c7812bc7cf99696a6d66da7",
+                    "nonce" : "0xad5ac450333a07b0",
                     "number" : "0x01",
                     "parentHash" : "0x5922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fb",
                     "receiptTrie" : "0xddf6bc3ffed700c751d2c2dd5b00c8a46d1d13f8e0deffdda9b03a39cb60ee65",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca05922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0db8e3c1b2a47de0d5cb763b4b7d72edad808412493c59b0bcb7f618dbebec3a6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0ddf6bc3ffed700c751d2c2dd5b00c8a46d1d13f8e0deffdda9b03a39cb60ee65b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a34e8203e880a0de17f4682ae5b4d294791a1fd86de897dbfbdceead50c069c8c20e1d94126c8f8820c627c5d006d6fbf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca05922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0db8e3c1b2a47de0d5cb763b4b7d72edad808412493c59b0bcb7f618dbebec3a6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0ddf6bc3ffed700c751d2c2dd5b00c8a46d1d13f8e0deffdda9b03a39cb60ee65b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a34e8203e880a0eb59aa30571820f803c603374598ca376f4584302c7812bc7cf99696a6d66da788ad5ac450333a07b0f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a142bc0eea3bb5b88210c60ee22bf3599be9073de49237f01ae771fc3e309708a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x55ab3d0475d56591a30b16c9dc8e2db9d2672a7e1d4864e329eee843e3ffd925",
+        "lastblockhash" : "0x2f7a87fbf2dc4c52768beec9a27b007f92a294734752910863ab164f2cd17bad",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest540BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest540BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest540BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa65a",
-                    "hash" : "0xaa2ca3851590b1eaeda31e33b6fb488dac371503bbb14dd6a2c1457729df957e",
-                    "mixHash" : "0xc7baecb64f26846ffd66eb95216d9b967ed608d08f3187088de9ad7cbc2ac28f",
-                    "nonce" : "0x8ba08bcda16a23d1",
+                    "hash" : "0xf82ad124d65df1fda1ddd82c3812f6ee134e687de2dcc3712509e9675c86d15a",
+                    "mixHash" : "0xb4a19c5ec47da7611c489318274553e3587af6c2c26c2d2b361cc1a3e96d0bfb",
+                    "nonce" : "0x4dffec43341184b3",
                     "number" : "0x01",
                     "parentHash" : "0x5922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fb",
                     "receiptTrie" : "0x62198ea1331ca4ba9969811b3f4d11dbb07ab154dc4c293056b264c3454c7386",
-                    "stateRoot" : "0xe341a57128b3898be52b17dbdc4f5f691134d644a7cd2a05ff7ef18b55ec353b",
+                    "stateRoot" : "0xd8713ab78ad5ace13675746d6be8955775b5a9e741824fffbfaa339ad957b7b1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca05922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e341a57128b3898be52b17dbdc4f5f691134d644a7cd2a05ff7ef18b55ec353ba0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa062198ea1331ca4ba9969811b3f4d11dbb07ab154dc4c293056b264c3454c7386b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a65a8203e880a0c7baecb64f26846ffd66eb95216d9b967ed608d08f3187088de9ad7cbc2ac28f888ba08bcda16a23d1f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca05922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d8713ab78ad5ace13675746d6be8955775b5a9e741824fffbfaa339ad957b7b1a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa062198ea1331ca4ba9969811b3f4d11dbb07ab154dc4c293056b264c3454c7386b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a65a8203e880a0b4a19c5ec47da7611c489318274553e3587af6c2c26c2d2b361cc1a3e96d0bfb884dffec43341184b3f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a142bc0eea3bb5b88210c60ee22bf3599be9073de49237f01ae771fc3e309708a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaa2ca3851590b1eaeda31e33b6fb488dac371503bbb14dd6a2c1457729df957e",
+        "lastblockhash" : "0xf82ad124d65df1fda1ddd82c3812f6ee134e687de2dcc3712509e9675c86d15a",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x414144401a0745423b55",
@@ -235,8 +228,8 @@
     "randomStatetest540BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest540BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest540BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa34e",
-                    "hash" : "0xf3678a579b532516a96b80e6526efea677f33e2ac461593e78240769b582d149",
-                    "mixHash" : "0x0e16e1c110f9ada6e48c1b359d985278ccdfc717ac5dd3c5ec40485c1c25d7a9",
-                    "nonce" : "0xd3d3ac4ff2b0048e",
+                    "hash" : "0xf1682cd45a52b9e269252b0f520a46fb41c7e395eef789a85c564a8d8dc71ecc",
+                    "mixHash" : "0xb4d5fd2cc8bfdcb880e2239d1758c9387805bfa7f4a630efc2e043067a2a9627",
+                    "nonce" : "0xca138798e50250d9",
                     "number" : "0x01",
                     "parentHash" : "0x5922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fb",
                     "receiptTrie" : "0xa30b2f2dddc3c3fc61338f915e8cec1359ae88d8dbbab126ed1867155aa11626",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca05922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0be45f0d54f34643e0415e6a8cb470e42555ef6d8d2fb96359727e62219fea597a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0a30b2f2dddc3c3fc61338f915e8cec1359ae88d8dbbab126ed1867155aa11626b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a34e8203e880a00e16e1c110f9ada6e48c1b359d985278ccdfc717ac5dd3c5ec40485c1c25d7a988d3d3ac4ff2b0048ef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca05922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0be45f0d54f34643e0415e6a8cb470e42555ef6d8d2fb96359727e62219fea597a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0a30b2f2dddc3c3fc61338f915e8cec1359ae88d8dbbab126ed1867155aa11626b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a34e8203e880a0b4d5fd2cc8bfdcb880e2239d1758c9387805bfa7f4a630efc2e043067a2a962788ca138798e50250d9f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a142bc0eea3bb5b88210c60ee22bf3599be9073de49237f01ae771fc3e309708a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf3678a579b532516a96b80e6526efea677f33e2ac461593e78240769b582d149",
+        "lastblockhash" : "0xf1682cd45a52b9e269252b0f520a46fb41c7e395eef789a85c564a8d8dc71ecc",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest540BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest540BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest540BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa34e",
-                    "hash" : "0x4ef1da15cc98a703277f8ae3f77772ffc62114a28a8b80561e9d6c8e65a8e51d",
-                    "mixHash" : "0xd4f2f563c5b7b7b36e39b946b775e10051142720edaa7927a832b7fb6d85f17d",
-                    "nonce" : "0x2f1767b603396e7b",
+                    "hash" : "0x38d051445f8ea515297cad6e14093f6174756cc6d4e6ab066ba8ab79a2580d21",
+                    "mixHash" : "0x1ecbbcebae38913fa9bb48462b1ca5ac334472c3c7adf291963f921c6c13edc6",
+                    "nonce" : "0xb1658038d616597b",
                     "number" : "0x01",
                     "parentHash" : "0x5922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fb",
                     "receiptTrie" : "0xa30b2f2dddc3c3fc61338f915e8cec1359ae88d8dbbab126ed1867155aa11626",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca05922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0be45f0d54f34643e0415e6a8cb470e42555ef6d8d2fb96359727e62219fea597a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0a30b2f2dddc3c3fc61338f915e8cec1359ae88d8dbbab126ed1867155aa11626b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a34e8203e880a0d4f2f563c5b7b7b36e39b946b775e10051142720edaa7927a832b7fb6d85f17d882f1767b603396e7bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca05922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0be45f0d54f34643e0415e6a8cb470e42555ef6d8d2fb96359727e62219fea597a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0a30b2f2dddc3c3fc61338f915e8cec1359ae88d8dbbab126ed1867155aa11626b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a34e8203e880a01ecbbcebae38913fa9bb48462b1ca5ac334472c3c7adf291963f921c6c13edc688b1658038d616597bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a142bc0eea3bb5b88210c60ee22bf3599be9073de49237f01ae771fc3e309708a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4ef1da15cc98a703277f8ae3f77772ffc62114a28a8b80561e9d6c8e65a8e51d",
+        "lastblockhash" : "0x38d051445f8ea515297cad6e14093f6174756cc6d4e6ab066ba8ab79a2580d21",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest540BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest540BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest540BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa0a6",
-                    "hash" : "0x11e4c450892b520105bc19cfce9676dd251eba2b5a66a08b95afcf9640b44ba1",
-                    "mixHash" : "0x0218810654e9654138707bad6d95d5a831dc278b44f4ae6d5cb21e3c2179754f",
-                    "nonce" : "0x89c58d466c248ac5",
+                    "hash" : "0x9f0ec82dca530f50ffaaa7c78ded2f5fb1257ce58fbeb8e5d4882b5ebcd76881",
+                    "mixHash" : "0x929bb46f3b2d712de6835b345a9e9e2463f3d6190297c0df2962601acb75b621",
+                    "nonce" : "0xa7b15b06a0d06592",
                     "number" : "0x01",
                     "parentHash" : "0x5922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fb",
                     "receiptTrie" : "0x6687a71b5ead8c47b9adb6baaa0800f613925a7f8590bd8c52a2d3577e99752f",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca05922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09de40bf700537de94ceb6b498237ea6d0f1d181c21a2c427de6cea80f647a638a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06687a71b5ead8c47b9adb6baaa0800f613925a7f8590bd8c52a2d3577e99752fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a68203e880a00218810654e9654138707bad6d95d5a831dc278b44f4ae6d5cb21e3c2179754f8889c58d466c248ac5f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca05922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09de40bf700537de94ceb6b498237ea6d0f1d181c21a2c427de6cea80f647a638a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06687a71b5ead8c47b9adb6baaa0800f613925a7f8590bd8c52a2d3577e99752fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a68203e880a0929bb46f3b2d712de6835b345a9e9e2463f3d6190297c0df2962601acb75b62188a7b15b06a0d06592f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a142bc0eea3bb5b88210c60ee22bf3599be9073de49237f01ae771fc3e309708a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x11e4c450892b520105bc19cfce9676dd251eba2b5a66a08b95afcf9640b44ba1",
+        "lastblockhash" : "0x9f0ec82dca530f50ffaaa7c78ded2f5fb1257ce58fbeb8e5d4882b5ebcd76881",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest540BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest540BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest540BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa0a6",
-                    "hash" : "0x04ec1d945548090e242c82fb6164afa9cdde87e453a84bbe1feda4849a5d6f6b",
-                    "mixHash" : "0x5d5852add5004ed5814deb84923af77ed728137bb6c8c8b42f48f17c20289439",
-                    "nonce" : "0xe8462a001d0fff44",
+                    "hash" : "0x782aaac6fc28242d756dc9fa60f4a769f75d8cf16201d99725eb5a5eab4a993a",
+                    "mixHash" : "0x01a304fdf55d4f1bba5aa8660b13d78a964f0c27c5693cbad91d234fcbb94062",
+                    "nonce" : "0xb0f52425d8555726",
                     "number" : "0x01",
                     "parentHash" : "0x5922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fb",
                     "receiptTrie" : "0x6687a71b5ead8c47b9adb6baaa0800f613925a7f8590bd8c52a2d3577e99752f",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca05922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09de40bf700537de94ceb6b498237ea6d0f1d181c21a2c427de6cea80f647a638a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06687a71b5ead8c47b9adb6baaa0800f613925a7f8590bd8c52a2d3577e99752fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a68203e880a05d5852add5004ed5814deb84923af77ed728137bb6c8c8b42f48f17c2028943988e8462a001d0fff44f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca05922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09de40bf700537de94ceb6b498237ea6d0f1d181c21a2c427de6cea80f647a638a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06687a71b5ead8c47b9adb6baaa0800f613925a7f8590bd8c52a2d3577e99752fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a68203e880a001a304fdf55d4f1bba5aa8660b13d78a964f0c27c5693cbad91d234fcbb9406288b0f52425d8555726f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a142bc0eea3bb5b88210c60ee22bf3599be9073de49237f01ae771fc3e309708a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x04ec1d945548090e242c82fb6164afa9cdde87e453a84bbe1feda4849a5d6f6b",
+        "lastblockhash" : "0x782aaac6fc28242d756dc9fa60f4a769f75d8cf16201d99725eb5a5eab4a993a",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest551BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest551BC.json
index be766bedd..ec5d27562 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest551BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest551BC.json
@@ -2,8 +2,8 @@
     "randomStatetest551BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest551BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest551BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc4bc",
-                    "hash" : "0x30865a844ee92b16a8c03fdaf5be7060bbdc767d4c7745ea7039b7c069d37fbd",
-                    "mixHash" : "0x51994cc2837aec2f869f0a0ce0842e04918965b0d6249fb73d4dc9663a383101",
-                    "nonce" : "0x17aaa5a39530d9da",
+                    "hash" : "0xe3ef3cb79ce1da458d4ac78823c4f0a4b917974b58340f3505a905377a51d87f",
+                    "mixHash" : "0x85e373ee59235746ffd8b50872371dc562b5390383e1748e86ede89008657f8d",
+                    "nonce" : "0xb9c9be0c1d802fdb",
                     "number" : "0x01",
                     "parentHash" : "0xcef7fb54161272e2983470c26c0f1b2d4ba7659e5633127bd6b1789622816482",
                     "receiptTrie" : "0x27d817f67a69f21a2bfffb5a4db15183060c3bdbefdee3e898aee74e59673d98",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x8b8e228b78b33dc5068074862e76b43e3ac5f72822756bbda5093bd1facd1e97",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0cef7fb54161272e2983470c26c0f1b2d4ba7659e5633127bd6b1789622816482a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e29ad3fe7ffa7e3abf40178560a3323138a4012ddbda9f0fe04554fdcca0c7d4a08b8e228b78b33dc5068074862e76b43e3ac5f72822756bbda5093bd1facd1e97a027d817f67a69f21a2bfffb5a4db15183060c3bdbefdee3e898aee74e59673d98b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c4bc8203e880a051994cc2837aec2f869f0a0ce0842e04918965b0d6249fb73d4dc9663a3831018817aaa5a39530d9daf90141f9013e80018431359ea294095e7baea6a6c7c4c2dfeb977efac326af552d878438df83ffb8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f68809e688f8d9841318b806c046a6e1ba03267db5ff0c7cf94cdb7e0c47c88719c9c5dcf7a5d6290d198856e6e3b3f5e29a06783cc5f439728213c5354ba5b11bdb47b0f272865f3ec4e229ca70945f0a54cc0",
+                "rlp" : "0xf90344f901fca0cef7fb54161272e2983470c26c0f1b2d4ba7659e5633127bd6b1789622816482a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e29ad3fe7ffa7e3abf40178560a3323138a4012ddbda9f0fe04554fdcca0c7d4a08b8e228b78b33dc5068074862e76b43e3ac5f72822756bbda5093bd1facd1e97a027d817f67a69f21a2bfffb5a4db15183060c3bdbefdee3e898aee74e59673d98b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c4bc8203e880a085e373ee59235746ffd8b50872371dc562b5390383e1748e86ede89008657f8d88b9c9be0c1d802fdbf90141f9013e80018431359ea294095e7baea6a6c7c4c2dfeb977efac326af552d878438df83ffb8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f68809e688f8d9841318b806c046a6e1ba03267db5ff0c7cf94cdb7e0c47c88719c9c5dcf7a5d6290d198856e6e3b3f5e29a06783cc5f439728213c5354ba5b11bdb47b0f272865f3ec4e229ca70945f0a54cc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f68809e688f8d9841318b806c046a6e",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00439d14146ad49c41be2b531e50ef8192c8e801df0033b261730cac4a9238f80a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x30865a844ee92b16a8c03fdaf5be7060bbdc767d4c7745ea7039b7c069d37fbd",
+        "lastblockhash" : "0xe3ef3cb79ce1da458d4ac78823c4f0a4b917974b58340f3505a905377a51d87f",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest551BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest551BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest551BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc7c8",
-                    "hash" : "0x1efe887803672f8bb433243dae9c932d1bc3b0effe8384dbe8e5b50e48263398",
-                    "mixHash" : "0x0db6e0fdb91d38490bfe37b2a5a19bfe27f9ddf8f459c54091e6af8cdef953ca",
-                    "nonce" : "0xed494cfc2a378e39",
+                    "hash" : "0x4aa5be588c234b1a7da41e3dec61fc9116adf62823d655204ecd6852213d55fa",
+                    "mixHash" : "0xbb0721f12c5642eb6728c739e793036ef6307ee08037d606aa3bea6e3757f066",
+                    "nonce" : "0xcc050e258b710c3c",
                     "number" : "0x01",
                     "parentHash" : "0xcef7fb54161272e2983470c26c0f1b2d4ba7659e5633127bd6b1789622816482",
                     "receiptTrie" : "0x3bfcaaead481acd199daf4ecf368d60d4062d8ec86fd904eb826371f133b4888",
-                    "stateRoot" : "0x7a97dc0f88b629ab8f1046e87c32207b8f2652d456852e34a7cfbc7ef84bb4cd",
+                    "stateRoot" : "0x63e6aee0560eaca4807acf9d49c0e858d1f1cd82c9731ea48b811c90c655a068",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8b8e228b78b33dc5068074862e76b43e3ac5f72822756bbda5093bd1facd1e97",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0cef7fb54161272e2983470c26c0f1b2d4ba7659e5633127bd6b1789622816482a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07a97dc0f88b629ab8f1046e87c32207b8f2652d456852e34a7cfbc7ef84bb4cda08b8e228b78b33dc5068074862e76b43e3ac5f72822756bbda5093bd1facd1e97a03bfcaaead481acd199daf4ecf368d60d4062d8ec86fd904eb826371f133b4888b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c7c88203e880a00db6e0fdb91d38490bfe37b2a5a19bfe27f9ddf8f459c54091e6af8cdef953ca88ed494cfc2a378e39f90141f9013e80018431359ea294095e7baea6a6c7c4c2dfeb977efac326af552d878438df83ffb8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f68809e688f8d9841318b806c046a6e1ba03267db5ff0c7cf94cdb7e0c47c88719c9c5dcf7a5d6290d198856e6e3b3f5e29a06783cc5f439728213c5354ba5b11bdb47b0f272865f3ec4e229ca70945f0a54cc0",
+                "rlp" : "0xf90344f901fca0cef7fb54161272e2983470c26c0f1b2d4ba7659e5633127bd6b1789622816482a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a063e6aee0560eaca4807acf9d49c0e858d1f1cd82c9731ea48b811c90c655a068a08b8e228b78b33dc5068074862e76b43e3ac5f72822756bbda5093bd1facd1e97a03bfcaaead481acd199daf4ecf368d60d4062d8ec86fd904eb826371f133b4888b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c7c88203e880a0bb0721f12c5642eb6728c739e793036ef6307ee08037d606aa3bea6e3757f06688cc050e258b710c3cf90141f9013e80018431359ea294095e7baea6a6c7c4c2dfeb977efac326af552d878438df83ffb8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f68809e688f8d9841318b806c046a6e1ba03267db5ff0c7cf94cdb7e0c47c88719c9c5dcf7a5d6290d198856e6e3b3f5e29a06783cc5f439728213c5354ba5b11bdb47b0f272865f3ec4e229ca70945f0a54cc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f68809e688f8d9841318b806c046a6e",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00439d14146ad49c41be2b531e50ef8192c8e801df0033b261730cac4a9238f80a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1efe887803672f8bb433243dae9c932d1bc3b0effe8384dbe8e5b50e48263398",
+        "lastblockhash" : "0x4aa5be588c234b1a7da41e3dec61fc9116adf62823d655204ecd6852213d55fa",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x38df83ff",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f68809e688f8d9841318b806c046a6e5560005155",
@@ -235,8 +228,8 @@
     "randomStatetest551BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest551BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest551BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc4bc",
-                    "hash" : "0xf69440e9994f8ffbb0337f1145e236a350eae321e9cfd2dd1b22b6b20e7997ce",
-                    "mixHash" : "0x319853fee2d77f9ac6000c46075b3b7d25fb4e2bd3448a208df0a0d884ce5cf3",
-                    "nonce" : "0x245504c2f0158be4",
+                    "hash" : "0x73119541dd54695c4c5be74feda56d6ccd1ae613d1914c3f90738750d6bbf3ac",
+                    "mixHash" : "0xb10c6db1d0507b9ee812a325a015422512047434e262e2423eae2634eee87c0a",
+                    "nonce" : "0xe65853face4207a5",
                     "number" : "0x01",
                     "parentHash" : "0xcef7fb54161272e2983470c26c0f1b2d4ba7659e5633127bd6b1789622816482",
                     "receiptTrie" : "0x85be1180aca39e014058c31dd46ff29d2172d6c73fbd021159fa77b27640c0d6",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0x8b8e228b78b33dc5068074862e76b43e3ac5f72822756bbda5093bd1facd1e97",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0cef7fb54161272e2983470c26c0f1b2d4ba7659e5633127bd6b1789622816482a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cecd7bbf49b1e11e9e0ca8474cefc7c6b8e2b0cd5ab21c63cfb23ff7e7ff25f2a08b8e228b78b33dc5068074862e76b43e3ac5f72822756bbda5093bd1facd1e97a085be1180aca39e014058c31dd46ff29d2172d6c73fbd021159fa77b27640c0d6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c4bc8203e880a0319853fee2d77f9ac6000c46075b3b7d25fb4e2bd3448a208df0a0d884ce5cf388245504c2f0158be4f90141f9013e80018431359ea294095e7baea6a6c7c4c2dfeb977efac326af552d878438df83ffb8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f68809e688f8d9841318b806c046a6e1ba03267db5ff0c7cf94cdb7e0c47c88719c9c5dcf7a5d6290d198856e6e3b3f5e29a06783cc5f439728213c5354ba5b11bdb47b0f272865f3ec4e229ca70945f0a54cc0",
+                "rlp" : "0xf90344f901fca0cef7fb54161272e2983470c26c0f1b2d4ba7659e5633127bd6b1789622816482a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cecd7bbf49b1e11e9e0ca8474cefc7c6b8e2b0cd5ab21c63cfb23ff7e7ff25f2a08b8e228b78b33dc5068074862e76b43e3ac5f72822756bbda5093bd1facd1e97a085be1180aca39e014058c31dd46ff29d2172d6c73fbd021159fa77b27640c0d6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c4bc8203e880a0b10c6db1d0507b9ee812a325a015422512047434e262e2423eae2634eee87c0a88e65853face4207a5f90141f9013e80018431359ea294095e7baea6a6c7c4c2dfeb977efac326af552d878438df83ffb8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f68809e688f8d9841318b806c046a6e1ba03267db5ff0c7cf94cdb7e0c47c88719c9c5dcf7a5d6290d198856e6e3b3f5e29a06783cc5f439728213c5354ba5b11bdb47b0f272865f3ec4e229ca70945f0a54cc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f68809e688f8d9841318b806c046a6e",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00439d14146ad49c41be2b531e50ef8192c8e801df0033b261730cac4a9238f80a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf69440e9994f8ffbb0337f1145e236a350eae321e9cfd2dd1b22b6b20e7997ce",
+        "lastblockhash" : "0x73119541dd54695c4c5be74feda56d6ccd1ae613d1914c3f90738750d6bbf3ac",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest551BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest551BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest551BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc4bc",
-                    "hash" : "0x3ab717fe879b481388a7b2f3b789de8a8e1b87473367dacf187e801347a23c73",
-                    "mixHash" : "0x74ddb1dd1fa30c49667bcf40200f594b4abfc19bb46e896699556e53286a9eb1",
-                    "nonce" : "0x0911d28bf17431ba",
+                    "hash" : "0xd318b7d2612de043511ec23c70eb99327b594e52365ac6b3444e22f92239fdb3",
+                    "mixHash" : "0x06afe9e1ccf943920a479f9f3e4b90f6f12e37f1d8417a822da7913ad4bf816e",
+                    "nonce" : "0x49ceddeb8562bc34",
                     "number" : "0x01",
                     "parentHash" : "0xcef7fb54161272e2983470c26c0f1b2d4ba7659e5633127bd6b1789622816482",
                     "receiptTrie" : "0x85be1180aca39e014058c31dd46ff29d2172d6c73fbd021159fa77b27640c0d6",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0x8b8e228b78b33dc5068074862e76b43e3ac5f72822756bbda5093bd1facd1e97",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0cef7fb54161272e2983470c26c0f1b2d4ba7659e5633127bd6b1789622816482a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cecd7bbf49b1e11e9e0ca8474cefc7c6b8e2b0cd5ab21c63cfb23ff7e7ff25f2a08b8e228b78b33dc5068074862e76b43e3ac5f72822756bbda5093bd1facd1e97a085be1180aca39e014058c31dd46ff29d2172d6c73fbd021159fa77b27640c0d6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c4bc8203e880a074ddb1dd1fa30c49667bcf40200f594b4abfc19bb46e896699556e53286a9eb1880911d28bf17431baf90141f9013e80018431359ea294095e7baea6a6c7c4c2dfeb977efac326af552d878438df83ffb8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f68809e688f8d9841318b806c046a6e1ba03267db5ff0c7cf94cdb7e0c47c88719c9c5dcf7a5d6290d198856e6e3b3f5e29a06783cc5f439728213c5354ba5b11bdb47b0f272865f3ec4e229ca70945f0a54cc0",
+                "rlp" : "0xf90344f901fca0cef7fb54161272e2983470c26c0f1b2d4ba7659e5633127bd6b1789622816482a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cecd7bbf49b1e11e9e0ca8474cefc7c6b8e2b0cd5ab21c63cfb23ff7e7ff25f2a08b8e228b78b33dc5068074862e76b43e3ac5f72822756bbda5093bd1facd1e97a085be1180aca39e014058c31dd46ff29d2172d6c73fbd021159fa77b27640c0d6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c4bc8203e880a006afe9e1ccf943920a479f9f3e4b90f6f12e37f1d8417a822da7913ad4bf816e8849ceddeb8562bc34f90141f9013e80018431359ea294095e7baea6a6c7c4c2dfeb977efac326af552d878438df83ffb8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f68809e688f8d9841318b806c046a6e1ba03267db5ff0c7cf94cdb7e0c47c88719c9c5dcf7a5d6290d198856e6e3b3f5e29a06783cc5f439728213c5354ba5b11bdb47b0f272865f3ec4e229ca70945f0a54cc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f68809e688f8d9841318b806c046a6e",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00439d14146ad49c41be2b531e50ef8192c8e801df0033b261730cac4a9238f80a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3ab717fe879b481388a7b2f3b789de8a8e1b87473367dacf187e801347a23c73",
+        "lastblockhash" : "0xd318b7d2612de043511ec23c70eb99327b594e52365ac6b3444e22f92239fdb3",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest551BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest551BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest551BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc4bc",
-                    "hash" : "0x71b2802b9843752c5703283b6867e45967d69672863fdf59034e9f70d2af4e6d",
-                    "mixHash" : "0x4cdad4d3209a5a692ae6b816fbe79ede27450a7ba00a6df1c0f188dde54f159b",
-                    "nonce" : "0x23da40404100009f",
+                    "hash" : "0xdfb15327bf9bfdbbefeea0cf93ab87cff05ac89f8c6aabe33f6a0fc191a0ffda",
+                    "mixHash" : "0x8aa40d905b7ac0c0c7a5c7eca952fbd42c1003dd7a72c426715439329306a2e9",
+                    "nonce" : "0x18fcea47103e56ac",
                     "number" : "0x01",
                     "parentHash" : "0xcef7fb54161272e2983470c26c0f1b2d4ba7659e5633127bd6b1789622816482",
                     "receiptTrie" : "0x85be1180aca39e014058c31dd46ff29d2172d6c73fbd021159fa77b27640c0d6",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0x8b8e228b78b33dc5068074862e76b43e3ac5f72822756bbda5093bd1facd1e97",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0cef7fb54161272e2983470c26c0f1b2d4ba7659e5633127bd6b1789622816482a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cecd7bbf49b1e11e9e0ca8474cefc7c6b8e2b0cd5ab21c63cfb23ff7e7ff25f2a08b8e228b78b33dc5068074862e76b43e3ac5f72822756bbda5093bd1facd1e97a085be1180aca39e014058c31dd46ff29d2172d6c73fbd021159fa77b27640c0d6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c4bc8203e880a04cdad4d3209a5a692ae6b816fbe79ede27450a7ba00a6df1c0f188dde54f159b8823da40404100009ff90141f9013e80018431359ea294095e7baea6a6c7c4c2dfeb977efac326af552d878438df83ffb8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f68809e688f8d9841318b806c046a6e1ba03267db5ff0c7cf94cdb7e0c47c88719c9c5dcf7a5d6290d198856e6e3b3f5e29a06783cc5f439728213c5354ba5b11bdb47b0f272865f3ec4e229ca70945f0a54cc0",
+                "rlp" : "0xf90344f901fca0cef7fb54161272e2983470c26c0f1b2d4ba7659e5633127bd6b1789622816482a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cecd7bbf49b1e11e9e0ca8474cefc7c6b8e2b0cd5ab21c63cfb23ff7e7ff25f2a08b8e228b78b33dc5068074862e76b43e3ac5f72822756bbda5093bd1facd1e97a085be1180aca39e014058c31dd46ff29d2172d6c73fbd021159fa77b27640c0d6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c4bc8203e880a08aa40d905b7ac0c0c7a5c7eca952fbd42c1003dd7a72c426715439329306a2e98818fcea47103e56acf90141f9013e80018431359ea294095e7baea6a6c7c4c2dfeb977efac326af552d878438df83ffb8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f68809e688f8d9841318b806c046a6e1ba03267db5ff0c7cf94cdb7e0c47c88719c9c5dcf7a5d6290d198856e6e3b3f5e29a06783cc5f439728213c5354ba5b11bdb47b0f272865f3ec4e229ca70945f0a54cc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f68809e688f8d9841318b806c046a6e",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00439d14146ad49c41be2b531e50ef8192c8e801df0033b261730cac4a9238f80a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x71b2802b9843752c5703283b6867e45967d69672863fdf59034e9f70d2af4e6d",
+        "lastblockhash" : "0xdfb15327bf9bfdbbefeea0cf93ab87cff05ac89f8c6aabe33f6a0fc191a0ffda",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest551BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest551BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest551BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc4bc",
-                    "hash" : "0x4113ece076f91a4dab974057d1d3cc4fead56f04c6a08b0b99bf39adeaf5e1c1",
-                    "mixHash" : "0x424b09e5013899ca835fabc58566ccaf3c3bb3651f67ceec91ae40db595fe01a",
-                    "nonce" : "0xdc29f398e27210dc",
+                    "hash" : "0xa165405eb4330864cb8cbc9d266c328e5f9cfa766d1305903de070ecf5ce6793",
+                    "mixHash" : "0xbe1748f4a3cb0261e700ce0fe5e58728bd43276f32359888687a496f32ed86c7",
+                    "nonce" : "0xc06539b57f31245a",
                     "number" : "0x01",
                     "parentHash" : "0xcef7fb54161272e2983470c26c0f1b2d4ba7659e5633127bd6b1789622816482",
                     "receiptTrie" : "0x85be1180aca39e014058c31dd46ff29d2172d6c73fbd021159fa77b27640c0d6",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0x8b8e228b78b33dc5068074862e76b43e3ac5f72822756bbda5093bd1facd1e97",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0cef7fb54161272e2983470c26c0f1b2d4ba7659e5633127bd6b1789622816482a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cecd7bbf49b1e11e9e0ca8474cefc7c6b8e2b0cd5ab21c63cfb23ff7e7ff25f2a08b8e228b78b33dc5068074862e76b43e3ac5f72822756bbda5093bd1facd1e97a085be1180aca39e014058c31dd46ff29d2172d6c73fbd021159fa77b27640c0d6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c4bc8203e880a0424b09e5013899ca835fabc58566ccaf3c3bb3651f67ceec91ae40db595fe01a88dc29f398e27210dcf90141f9013e80018431359ea294095e7baea6a6c7c4c2dfeb977efac326af552d878438df83ffb8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f68809e688f8d9841318b806c046a6e1ba03267db5ff0c7cf94cdb7e0c47c88719c9c5dcf7a5d6290d198856e6e3b3f5e29a06783cc5f439728213c5354ba5b11bdb47b0f272865f3ec4e229ca70945f0a54cc0",
+                "rlp" : "0xf90344f901fca0cef7fb54161272e2983470c26c0f1b2d4ba7659e5633127bd6b1789622816482a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cecd7bbf49b1e11e9e0ca8474cefc7c6b8e2b0cd5ab21c63cfb23ff7e7ff25f2a08b8e228b78b33dc5068074862e76b43e3ac5f72822756bbda5093bd1facd1e97a085be1180aca39e014058c31dd46ff29d2172d6c73fbd021159fa77b27640c0d6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c4bc8203e880a0be1748f4a3cb0261e700ce0fe5e58728bd43276f32359888687a496f32ed86c788c06539b57f31245af90141f9013e80018431359ea294095e7baea6a6c7c4c2dfeb977efac326af552d878438df83ffb8d87f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f68809e688f8d9841318b806c046a6e1ba03267db5ff0c7cf94cdb7e0c47c88719c9c5dcf7a5d6290d198856e6e3b3f5e29a06783cc5f439728213c5354ba5b11bdb47b0f272865f3ec4e229ca70945f0a54cc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f68809e688f8d9841318b806c046a6e",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00439d14146ad49c41be2b531e50ef8192c8e801df0033b261730cac4a9238f80a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4113ece076f91a4dab974057d1d3cc4fead56f04c6a08b0b99bf39adeaf5e1c1",
+        "lastblockhash" : "0xa165405eb4330864cb8cbc9d266c328e5f9cfa766d1305903de070ecf5ce6793",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest557BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest557BC.json
index 4b0510476..8750b3403 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest557BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest557BC.json
@@ -2,8 +2,8 @@
     "randomStatetest557BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest557BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest557BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa218",
-                    "hash" : "0x85dc403c9f6dcd59e8a5f29ceda3044d75324e53e84caf6e67dd18194530738d",
-                    "mixHash" : "0xa448ea596235a9af6462b10f42834384ca61a3b553bbc3ae7dbf1ef8bcdd92fe",
-                    "nonce" : "0xf3b7855c69a57c15",
+                    "hash" : "0x6285b7954c0147eb4796af92dbc2eacc4ef4c5da34ab4d0acc57a47aa1308a6f",
+                    "mixHash" : "0xde988a50f7906eb0dd00478c4592458f4aef2674b6e2f90ccc24c5dcf6559d0f",
+                    "nonce" : "0x72dc2d6eb6975a98",
                     "number" : "0x01",
                     "parentHash" : "0x3713626906cf7cc0c435c0222585b64754db3cd0f582eb735b222dad6fef8e49",
                     "receiptTrie" : "0x6899214c67b8a4ef38e0acce95cb3fc91d1ee7eccac59fbddbef1a3269e3d840",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca03713626906cf7cc0c435c0222585b64754db3cd0f582eb735b222dad6fef8e49a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a072a30f523a83b831a51c0595cb3813db4277043d1e6e9f8fd1a69b6b723fff17a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06899214c67b8a4ef38e0acce95cb3fc91d1ee7eccac59fbddbef1a3269e3d840b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2188203e880a0a448ea596235a9af6462b10f42834384ca61a3b553bbc3ae7dbf1ef8bcdd92fe88f3b7855c69a57c15f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca03713626906cf7cc0c435c0222585b64754db3cd0f582eb735b222dad6fef8e49a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a072a30f523a83b831a51c0595cb3813db4277043d1e6e9f8fd1a69b6b723fff17a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06899214c67b8a4ef38e0acce95cb3fc91d1ee7eccac59fbddbef1a3269e3d840b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2188203e880a0de988a50f7906eb0dd00478c4592458f4aef2674b6e2f90ccc24c5dcf6559d0f8872dc2d6eb6975a98f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a082d3558f1cfb62075fd716298628941c56f6bf454fffb387176e8af6079d8a9ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x85dc403c9f6dcd59e8a5f29ceda3044d75324e53e84caf6e67dd18194530738d",
+        "lastblockhash" : "0x6285b7954c0147eb4796af92dbc2eacc4ef4c5da34ab4d0acc57a47aa1308a6f",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest557BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest557BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest557BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa524",
-                    "hash" : "0x41d6d0f4552b20b6d861d56397cdadb018cc4ae684c30ccc56df430e6ebf6247",
-                    "mixHash" : "0xf31dfe571571480b35b77011aefa5ab7ff649fe345c70bdab040a0ed14028269",
-                    "nonce" : "0xc4904dd1e38af708",
+                    "hash" : "0xc2c09e568f4d0c48317f95aa67c6645589ff357445fb361d69051e01b079d5c1",
+                    "mixHash" : "0x8f7252eb5dc1f50eb8f059b34d3bf6d7bde9466bb8b64722c3306706d9078d88",
+                    "nonce" : "0xa886f42e0438691c",
                     "number" : "0x01",
                     "parentHash" : "0x3713626906cf7cc0c435c0222585b64754db3cd0f582eb735b222dad6fef8e49",
                     "receiptTrie" : "0x0cdfed66484fa8a192c2be587587233b7b6ca83fcf65826a8d5bef1f5f06bdb8",
-                    "stateRoot" : "0xb863a88fe2917f63434f3844b6fb76e3d41964b1bf3cf55cacf044d4640bea63",
+                    "stateRoot" : "0x9071bcbd71f8fe5a2dc59b89149c78b85e8d3088f857bc647d0d93b371918dec",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca03713626906cf7cc0c435c0222585b64754db3cd0f582eb735b222dad6fef8e49a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b863a88fe2917f63434f3844b6fb76e3d41964b1bf3cf55cacf044d4640bea63a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa00cdfed66484fa8a192c2be587587233b7b6ca83fcf65826a8d5bef1f5f06bdb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a5248203e880a0f31dfe571571480b35b77011aefa5ab7ff649fe345c70bdab040a0ed1402826988c4904dd1e38af708f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca03713626906cf7cc0c435c0222585b64754db3cd0f582eb735b222dad6fef8e49a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09071bcbd71f8fe5a2dc59b89149c78b85e8d3088f857bc647d0d93b371918deca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa00cdfed66484fa8a192c2be587587233b7b6ca83fcf65826a8d5bef1f5f06bdb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a5248203e880a08f7252eb5dc1f50eb8f059b34d3bf6d7bde9466bb8b64722c3306706d9078d8888a886f42e0438691cf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a082d3558f1cfb62075fd716298628941c56f6bf454fffb387176e8af6079d8a9ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x41d6d0f4552b20b6d861d56397cdadb018cc4ae684c30ccc56df430e6ebf6247",
+        "lastblockhash" : "0xc2c09e568f4d0c48317f95aa67c6645589ff357445fb361d69051e01b079d5c1",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x45404141314155",
@@ -235,8 +228,8 @@
     "randomStatetest557BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest557BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest557BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa218",
-                    "hash" : "0xf10c3e2a17f1a89fe541aecc0f4cdab5c02bb23b47c1feb4f54cf496b0a8f1a9",
-                    "mixHash" : "0xc55b9af5a60c8c3c994d038053c46c888796acbe1747dd995ed33f7c55cc728a",
-                    "nonce" : "0x74c6889922e08fb0",
+                    "hash" : "0x82ddac3bf6749b537e6d369ae7ac95ca16d30aab41d25124559088cb6210a4b1",
+                    "mixHash" : "0xcdee168b055bb0615bf568d101797696054e38c8d3c655406dbf073f0b73fc70",
+                    "nonce" : "0xf6c6af97e2e9b8b0",
                     "number" : "0x01",
                     "parentHash" : "0x3713626906cf7cc0c435c0222585b64754db3cd0f582eb735b222dad6fef8e49",
                     "receiptTrie" : "0x598f3786e947a34677708b549cf59dde01742ef523fd662f771ce49ecba72f7a",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca03713626906cf7cc0c435c0222585b64754db3cd0f582eb735b222dad6fef8e49a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00282a39423a94d87fbbec471638bf027d0393b76c772023cb6e3c49871aa1e16a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0598f3786e947a34677708b549cf59dde01742ef523fd662f771ce49ecba72f7ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2188203e880a0c55b9af5a60c8c3c994d038053c46c888796acbe1747dd995ed33f7c55cc728a8874c6889922e08fb0f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca03713626906cf7cc0c435c0222585b64754db3cd0f582eb735b222dad6fef8e49a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00282a39423a94d87fbbec471638bf027d0393b76c772023cb6e3c49871aa1e16a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0598f3786e947a34677708b549cf59dde01742ef523fd662f771ce49ecba72f7ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2188203e880a0cdee168b055bb0615bf568d101797696054e38c8d3c655406dbf073f0b73fc7088f6c6af97e2e9b8b0f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a082d3558f1cfb62075fd716298628941c56f6bf454fffb387176e8af6079d8a9ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf10c3e2a17f1a89fe541aecc0f4cdab5c02bb23b47c1feb4f54cf496b0a8f1a9",
+        "lastblockhash" : "0x82ddac3bf6749b537e6d369ae7ac95ca16d30aab41d25124559088cb6210a4b1",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest557BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest557BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest557BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa218",
-                    "hash" : "0x162a25217271b02f08e8eb5cbe1b39e061c100e694a03393d5eed48dd1c3b07d",
-                    "mixHash" : "0x104254da7a8068e24dffab178aed0a3bf3b65bd31ec421646bc1228ad0a7dbd2",
-                    "nonce" : "0xa593757d285b8c50",
+                    "hash" : "0x4f9b3d852499f3b8e15591320d0406db78bdb21732712cc1ec0957e8aec843ff",
+                    "mixHash" : "0x06d1ea0f3a8d5f55f4b0d390bb647a1cd1e4c8a1c999d0b6a3fc970705a1ebc3",
+                    "nonce" : "0x5ebbf26684d224b1",
                     "number" : "0x01",
                     "parentHash" : "0x3713626906cf7cc0c435c0222585b64754db3cd0f582eb735b222dad6fef8e49",
                     "receiptTrie" : "0x598f3786e947a34677708b549cf59dde01742ef523fd662f771ce49ecba72f7a",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca03713626906cf7cc0c435c0222585b64754db3cd0f582eb735b222dad6fef8e49a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00282a39423a94d87fbbec471638bf027d0393b76c772023cb6e3c49871aa1e16a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0598f3786e947a34677708b549cf59dde01742ef523fd662f771ce49ecba72f7ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2188203e880a0104254da7a8068e24dffab178aed0a3bf3b65bd31ec421646bc1228ad0a7dbd288a593757d285b8c50f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca03713626906cf7cc0c435c0222585b64754db3cd0f582eb735b222dad6fef8e49a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00282a39423a94d87fbbec471638bf027d0393b76c772023cb6e3c49871aa1e16a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0598f3786e947a34677708b549cf59dde01742ef523fd662f771ce49ecba72f7ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2188203e880a006d1ea0f3a8d5f55f4b0d390bb647a1cd1e4c8a1c999d0b6a3fc970705a1ebc3885ebbf26684d224b1f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a082d3558f1cfb62075fd716298628941c56f6bf454fffb387176e8af6079d8a9ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x162a25217271b02f08e8eb5cbe1b39e061c100e694a03393d5eed48dd1c3b07d",
+        "lastblockhash" : "0x4f9b3d852499f3b8e15591320d0406db78bdb21732712cc1ec0957e8aec843ff",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest557BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest557BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest557BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa09c",
-                    "hash" : "0x8b23c6401b323d7bb27d710258448ce8fa1c563210e5d89e361d615251b19191",
-                    "mixHash" : "0xf843a183075e67b42d3b05f0f3d52e05912c29cdb64eb27ec13460def79c53bd",
-                    "nonce" : "0x7a385b4481058877",
+                    "hash" : "0x0f2f68f8b68896aded76016030d87b61ecc2e0df2fffc1c9b2206c724837931f",
+                    "mixHash" : "0x7c15d72992a10258046523328aca2784f87b2628e8bd7eefe400e38e1a8db642",
+                    "nonce" : "0x5c3b149654284c0d",
                     "number" : "0x01",
                     "parentHash" : "0x3713626906cf7cc0c435c0222585b64754db3cd0f582eb735b222dad6fef8e49",
                     "receiptTrie" : "0x40c1b1411bec4b4fc18075e9aa5d95921d99c01360d3ad60d45591e57c5d07a7",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca03713626906cf7cc0c435c0222585b64754db3cd0f582eb735b222dad6fef8e49a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a077d268aaa4d5d5674a4ce3e9dd6a47e0db07c9e7cf09f5ff49c319e27090106aa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa040c1b1411bec4b4fc18075e9aa5d95921d99c01360d3ad60d45591e57c5d07a7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a09c8203e880a0f843a183075e67b42d3b05f0f3d52e05912c29cdb64eb27ec13460def79c53bd887a385b4481058877f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca03713626906cf7cc0c435c0222585b64754db3cd0f582eb735b222dad6fef8e49a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a077d268aaa4d5d5674a4ce3e9dd6a47e0db07c9e7cf09f5ff49c319e27090106aa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa040c1b1411bec4b4fc18075e9aa5d95921d99c01360d3ad60d45591e57c5d07a7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a09c8203e880a07c15d72992a10258046523328aca2784f87b2628e8bd7eefe400e38e1a8db642885c3b149654284c0df865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a082d3558f1cfb62075fd716298628941c56f6bf454fffb387176e8af6079d8a9ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8b23c6401b323d7bb27d710258448ce8fa1c563210e5d89e361d615251b19191",
+        "lastblockhash" : "0x0f2f68f8b68896aded76016030d87b61ecc2e0df2fffc1c9b2206c724837931f",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest557BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest557BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest557BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa09c",
-                    "hash" : "0x2e3f0110382a379cd4d0632af4bc323ccbfa24f84a56359ad2e20795b4b0721c",
-                    "mixHash" : "0x82ad0a271b921073a2a4c0d2828a518a3d3f454138e9eeb1c8ff84b8a2b933af",
-                    "nonce" : "0xb4053a3613bd3545",
+                    "hash" : "0x7c36b02b74419ea7de0c9350043154a1376cd7b324204c212dfe54bf48e3da80",
+                    "mixHash" : "0x1726b28a067c27788ef417ff161a74d6b427ceb080aed09c3601c06c98019df1",
+                    "nonce" : "0x524e443ed3d7a049",
                     "number" : "0x01",
                     "parentHash" : "0x3713626906cf7cc0c435c0222585b64754db3cd0f582eb735b222dad6fef8e49",
                     "receiptTrie" : "0x40c1b1411bec4b4fc18075e9aa5d95921d99c01360d3ad60d45591e57c5d07a7",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca03713626906cf7cc0c435c0222585b64754db3cd0f582eb735b222dad6fef8e49a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a077d268aaa4d5d5674a4ce3e9dd6a47e0db07c9e7cf09f5ff49c319e27090106aa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa040c1b1411bec4b4fc18075e9aa5d95921d99c01360d3ad60d45591e57c5d07a7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a09c8203e880a082ad0a271b921073a2a4c0d2828a518a3d3f454138e9eeb1c8ff84b8a2b933af88b4053a3613bd3545f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca03713626906cf7cc0c435c0222585b64754db3cd0f582eb735b222dad6fef8e49a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a077d268aaa4d5d5674a4ce3e9dd6a47e0db07c9e7cf09f5ff49c319e27090106aa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa040c1b1411bec4b4fc18075e9aa5d95921d99c01360d3ad60d45591e57c5d07a7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a09c8203e880a01726b28a067c27788ef417ff161a74d6b427ceb080aed09c3601c06c98019df188524e443ed3d7a049f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a082d3558f1cfb62075fd716298628941c56f6bf454fffb387176e8af6079d8a9ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2e3f0110382a379cd4d0632af4bc323ccbfa24f84a56359ad2e20795b4b0721c",
+        "lastblockhash" : "0x7c36b02b74419ea7de0c9350043154a1376cd7b324204c212dfe54bf48e3da80",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest561BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest561BC.json
index d5c351056..fe42a74b2 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest561BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest561BC.json
@@ -2,8 +2,8 @@
     "randomStatetest561BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest561BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest561BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa08c",
-                    "hash" : "0x0539a6103d0acd4a4389df98e15d7a34fad4c40efb8621eff6b9de288102808f",
-                    "mixHash" : "0xf1a60c33db9108140260da76884e52c6a629ad7bf366d91d833847012dcb846d",
-                    "nonce" : "0x10f3a6a44967f9c4",
+                    "hash" : "0x4d12c6fb4835288f64a3760a745be019cf30860ff916bb930c3c73be86d7956d",
+                    "mixHash" : "0x759ee40bb4b7bca565e0a2cfb814775f70b4d492545434359b41dd8a3401cbd9",
+                    "nonce" : "0xd64b83ee413fafb0",
                     "number" : "0x01",
                     "parentHash" : "0x384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033",
                     "receiptTrie" : "0xec6c9a098dd708f028cffc0e03093dd498325c10e8ed4ea593ae128fd3f4c0f3",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03b08b1b5947b615e057cc162ced2d3af4d34be6d2da99923459e8bec314fef03a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0ec6c9a098dd708f028cffc0e03093dd498325c10e8ed4ea593ae128fd3f4c0f3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a08c8203e880a0f1a60c33db9108140260da76884e52c6a629ad7bf366d91d833847012dcb846d8810f3a6a44967f9c4f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03b08b1b5947b615e057cc162ced2d3af4d34be6d2da99923459e8bec314fef03a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0ec6c9a098dd708f028cffc0e03093dd498325c10e8ed4ea593ae128fd3f4c0f3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a08c8203e880a0759ee40bb4b7bca565e0a2cfb814775f70b4d492545434359b41dd8a3401cbd988d64b83ee413fafb0f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0077d6845a3afc9a7b6a75de98bd525cf9778d0705a69a8f0045c1bdc76cd5737a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0539a6103d0acd4a4389df98e15d7a34fad4c40efb8621eff6b9de288102808f",
+        "lastblockhash" : "0x4d12c6fb4835288f64a3760a745be019cf30860ff916bb930c3c73be86d7956d",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest561BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest561BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest561BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa398",
-                    "hash" : "0x9955ea6ad01ad58c98ddb5a86205e0c11343d61702ce8dc3e32cdb652f07e51f",
-                    "mixHash" : "0xf421c24ed29598ecfc270cdcbf9a41b74a66320a483eadb65d069e74be7236e5",
-                    "nonce" : "0xde12636d68a71c2d",
+                    "hash" : "0xf66aeeb59138e615e25ca55920b3ba1014a2dba821241232fd41285faf801c97",
+                    "mixHash" : "0xcee8cbdbeb52dcad7d3413bb945ab8dd598740f3e5b5e7b8cf0b367a61626eef",
+                    "nonce" : "0x032f1787fdc7358e",
                     "number" : "0x01",
                     "parentHash" : "0x384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033",
                     "receiptTrie" : "0x570853c43d6b64d5b467e414a81bea341a63a3f426b17b226ebce034d4664108",
-                    "stateRoot" : "0xabf532a97823a607343d0c5d9254484446e08fcd9a801d744f438c9870d57478",
+                    "stateRoot" : "0x9b7dbca274b4c2d9c9403c15a9969dba31ffbb7d29e133da5efb905d588b68e3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0abf532a97823a607343d0c5d9254484446e08fcd9a801d744f438c9870d57478a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0570853c43d6b64d5b467e414a81bea341a63a3f426b17b226ebce034d4664108b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a3988203e880a0f421c24ed29598ecfc270cdcbf9a41b74a66320a483eadb65d069e74be7236e588de12636d68a71c2df865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09b7dbca274b4c2d9c9403c15a9969dba31ffbb7d29e133da5efb905d588b68e3a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0570853c43d6b64d5b467e414a81bea341a63a3f426b17b226ebce034d4664108b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a3988203e880a0cee8cbdbeb52dcad7d3413bb945ab8dd598740f3e5b5e7b8cf0b367a61626eef88032f1787fdc7358ef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0077d6845a3afc9a7b6a75de98bd525cf9778d0705a69a8f0045c1bdc76cd5737a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9955ea6ad01ad58c98ddb5a86205e0c11343d61702ce8dc3e32cdb652f07e51f",
+        "lastblockhash" : "0xf66aeeb59138e615e25ca55920b3ba1014a2dba821241232fd41285faf801c97",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x4145424544414055",
@@ -235,8 +228,8 @@
     "randomStatetest561BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest561BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest561BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa08c",
-                    "hash" : "0xa0f8cedc9cf99aaddf110a53752ea869106503d07ad2b6fd26b3e5ffbd26d4c5",
-                    "mixHash" : "0xd25f7f0b9508e894aab2cd406dcf949110501091c7b4ef3845ac2e19de646486",
-                    "nonce" : "0xaac13eb809d75a97",
+                    "hash" : "0x31f56645e8cfc5e27d3d14accb62a6547531c3e133e6c2f8b77bdc502b143232",
+                    "mixHash" : "0xd51a735809c6588bad81a54e5a3f81066c14b1dd36a3c76d8d1e939b337383c0",
+                    "nonce" : "0x5211ebc2c25ba290",
                     "number" : "0x01",
                     "parentHash" : "0x384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033",
                     "receiptTrie" : "0xd10ab5fc07464c0fe7bf3a2b05580a54fd3af61e52fc886ac2239b082c80f664",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03e097e8641373d291282968d357fd18b1522c66eb1aca86801c095f6925c8f47a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d10ab5fc07464c0fe7bf3a2b05580a54fd3af61e52fc886ac2239b082c80f664b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a08c8203e880a0d25f7f0b9508e894aab2cd406dcf949110501091c7b4ef3845ac2e19de64648688aac13eb809d75a97f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03e097e8641373d291282968d357fd18b1522c66eb1aca86801c095f6925c8f47a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d10ab5fc07464c0fe7bf3a2b05580a54fd3af61e52fc886ac2239b082c80f664b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a08c8203e880a0d51a735809c6588bad81a54e5a3f81066c14b1dd36a3c76d8d1e939b337383c0885211ebc2c25ba290f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0077d6845a3afc9a7b6a75de98bd525cf9778d0705a69a8f0045c1bdc76cd5737a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa0f8cedc9cf99aaddf110a53752ea869106503d07ad2b6fd26b3e5ffbd26d4c5",
+        "lastblockhash" : "0x31f56645e8cfc5e27d3d14accb62a6547531c3e133e6c2f8b77bdc502b143232",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest561BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest561BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest561BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa08c",
-                    "hash" : "0x3debdd9e1167b088183624fad67db14f5c23776b7a18c9289b555205d4946f04",
-                    "mixHash" : "0x4a00fcc53deff602a0bffff6e721223490dcd27cd89dc0b30b1ebf31c1944b49",
-                    "nonce" : "0x38b15e8ce99a0eaa",
+                    "hash" : "0x99030f09f20ce474f59ba5f82bccf78bb797533a400414d3dea34c7365d428c5",
+                    "mixHash" : "0x65543d59356dd11b9d1f1fb8d3c03b0f575ad2bdd261c7d11a98f78c78745075",
+                    "nonce" : "0x57c67c30a55093c9",
                     "number" : "0x01",
                     "parentHash" : "0x384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033",
                     "receiptTrie" : "0xd10ab5fc07464c0fe7bf3a2b05580a54fd3af61e52fc886ac2239b082c80f664",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03e097e8641373d291282968d357fd18b1522c66eb1aca86801c095f6925c8f47a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d10ab5fc07464c0fe7bf3a2b05580a54fd3af61e52fc886ac2239b082c80f664b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a08c8203e880a04a00fcc53deff602a0bffff6e721223490dcd27cd89dc0b30b1ebf31c1944b498838b15e8ce99a0eaaf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03e097e8641373d291282968d357fd18b1522c66eb1aca86801c095f6925c8f47a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d10ab5fc07464c0fe7bf3a2b05580a54fd3af61e52fc886ac2239b082c80f664b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a08c8203e880a065543d59356dd11b9d1f1fb8d3c03b0f575ad2bdd261c7d11a98f78c787450758857c67c30a55093c9f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0077d6845a3afc9a7b6a75de98bd525cf9778d0705a69a8f0045c1bdc76cd5737a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3debdd9e1167b088183624fad67db14f5c23776b7a18c9289b555205d4946f04",
+        "lastblockhash" : "0x99030f09f20ce474f59ba5f82bccf78bb797533a400414d3dea34c7365d428c5",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest561BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest561BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest561BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa08c",
-                    "hash" : "0xe3bde0519c13ddb4834c2bc4ee7b67a29e1b6afbf94f7c8050570558294a7b15",
-                    "mixHash" : "0xc382f8d661b21df136033a2f410bb9f81d403da6d4a3e0a553266f02098a7d85",
-                    "nonce" : "0x33d3d2f3bcf6677a",
+                    "hash" : "0x004e857c77d998e12e3fc9d3e1b295abdb8a6aee24eb72cf8780e679f312f124",
+                    "mixHash" : "0xdb37d1d82b483e4c51e881fa699542b0b99107689d2a111177f2e9632656c7bb",
+                    "nonce" : "0x7563872220b018d3",
                     "number" : "0x01",
                     "parentHash" : "0x384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033",
                     "receiptTrie" : "0xd10ab5fc07464c0fe7bf3a2b05580a54fd3af61e52fc886ac2239b082c80f664",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03e097e8641373d291282968d357fd18b1522c66eb1aca86801c095f6925c8f47a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d10ab5fc07464c0fe7bf3a2b05580a54fd3af61e52fc886ac2239b082c80f664b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a08c8203e880a0c382f8d661b21df136033a2f410bb9f81d403da6d4a3e0a553266f02098a7d858833d3d2f3bcf6677af865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03e097e8641373d291282968d357fd18b1522c66eb1aca86801c095f6925c8f47a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d10ab5fc07464c0fe7bf3a2b05580a54fd3af61e52fc886ac2239b082c80f664b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a08c8203e880a0db37d1d82b483e4c51e881fa699542b0b99107689d2a111177f2e9632656c7bb887563872220b018d3f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0077d6845a3afc9a7b6a75de98bd525cf9778d0705a69a8f0045c1bdc76cd5737a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe3bde0519c13ddb4834c2bc4ee7b67a29e1b6afbf94f7c8050570558294a7b15",
+        "lastblockhash" : "0x004e857c77d998e12e3fc9d3e1b295abdb8a6aee24eb72cf8780e679f312f124",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest561BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest561BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest561BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa08c",
-                    "hash" : "0xd76d7600104765e9b0134df519cbaaab45391e7ae0393187131345decc76a7c2",
-                    "mixHash" : "0x91f4dae5d81d2dfa5d519d4f740115fe340971c25233b3854ca86a3c7bd3f689",
-                    "nonce" : "0xfde7bda04c3ad4c4",
+                    "hash" : "0x9ddbffaeb461cf2ac1d94f5b83a8c881a23aeba20c4aa54506d18b866bde9a5a",
+                    "mixHash" : "0xff056d53d8e58615c29fbf6d94a4c383293925be7da89dc80ebc0934ef7efaf0",
+                    "nonce" : "0x4a9e50e6057cc7e1",
                     "number" : "0x01",
                     "parentHash" : "0x384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033",
                     "receiptTrie" : "0xd10ab5fc07464c0fe7bf3a2b05580a54fd3af61e52fc886ac2239b082c80f664",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03e097e8641373d291282968d357fd18b1522c66eb1aca86801c095f6925c8f47a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d10ab5fc07464c0fe7bf3a2b05580a54fd3af61e52fc886ac2239b082c80f664b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a08c8203e880a091f4dae5d81d2dfa5d519d4f740115fe340971c25233b3854ca86a3c7bd3f68988fde7bda04c3ad4c4f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03e097e8641373d291282968d357fd18b1522c66eb1aca86801c095f6925c8f47a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d10ab5fc07464c0fe7bf3a2b05580a54fd3af61e52fc886ac2239b082c80f664b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a08c8203e880a0ff056d53d8e58615c29fbf6d94a4c383293925be7da89dc80ebc0934ef7efaf0884a9e50e6057cc7e1f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0077d6845a3afc9a7b6a75de98bd525cf9778d0705a69a8f0045c1bdc76cd5737a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd76d7600104765e9b0134df519cbaaab45391e7ae0393187131345decc76a7c2",
+        "lastblockhash" : "0x9ddbffaeb461cf2ac1d94f5b83a8c881a23aeba20c4aa54506d18b866bde9a5a",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest568BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest568BC.json
index f85daac5e..0b39ee767 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest568BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest568BC.json
@@ -2,8 +2,8 @@
     "randomStatetest568BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest568BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest568BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050bb4",
-                    "hash" : "0x30a118cdcece9283963be1bc9b762b03d5e30823b5574e6ad8c825daf3d1ad01",
-                    "mixHash" : "0x7fedf541ef220ec56eedccba238fef2cd16d38b1d1b115924e3b085ee1c939b7",
-                    "nonce" : "0xe4fad26438bc831b",
+                    "hash" : "0x4d9af819c0c39fcd7b36fb1a557095c98881d0836585ede849fdbc7997408059",
+                    "mixHash" : "0xd7edd8def5fd6e86fa032ca97a56289ed491ee23cd1b51b0d2c274fc50d1d0ee",
+                    "nonce" : "0x6988ff7e95f079d1",
                     "number" : "0x01",
                     "parentHash" : "0xb3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8",
                     "receiptTrie" : "0xe5adcdb6ced3e55272fc594d741d48c978e7e60b4dddf77bcd74ec30e64baf53",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e725a9ef07bb32ad92e4be29331475cd2eeded36c30fe52a99f70b361afe2ac4a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e5adcdb6ced3e55272fc594d741d48c978e7e60b4dddf77bcd74ec30e64baf53b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050bb48203e880a07fedf541ef220ec56eedccba238fef2cd16d38b1d1b115924e3b085ee1c939b788e4fad26438bc831bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e725a9ef07bb32ad92e4be29331475cd2eeded36c30fe52a99f70b361afe2ac4a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e5adcdb6ced3e55272fc594d741d48c978e7e60b4dddf77bcd74ec30e64baf53b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050bb48203e880a0d7edd8def5fd6e86fa032ca97a56289ed491ee23cd1b51b0d2c274fc50d1d0ee886988ff7e95f079d1f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d7c19d199901a0bbf81bbdf3abaf7c524ecbe39a32b5b68ebfeb480b518e105aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x30a118cdcece9283963be1bc9b762b03d5e30823b5574e6ad8c825daf3d1ad01",
+        "lastblockhash" : "0x4d9af819c0c39fcd7b36fb1a557095c98881d0836585ede849fdbc7997408059",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest568BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest568BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest568BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050a23",
-                    "hash" : "0xa797c1133190a5c29866c5f59a135325a1b66583d877ad5c10b66087b68c5895",
-                    "mixHash" : "0x7dc2dd7204808e803c96a9c70bd65c21970709356c2c515c3f93aad2bb84ce67",
-                    "nonce" : "0x6363d82ec34125fd",
+                    "hash" : "0x5b5b39e54c94d4e6f95e4617feeaad0e2e96cc233d7c9f5c21150aa561128c84",
+                    "mixHash" : "0x27ddab935920b403010916adeac1fe09ce4f915bc4d40d307b077369659ee7bf",
+                    "nonce" : "0x3d9bf67472e83e62",
                     "number" : "0x01",
                     "parentHash" : "0xb3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8",
                     "receiptTrie" : "0x6c04909a647732ae0922b5e5e83bfb778644f195965c78ba58a3675df147a19e",
-                    "stateRoot" : "0x63ae0a91c00ddb3b55c20a29c3c12565b025b56e9442c2198f4b05f05aa68eaf",
+                    "stateRoot" : "0x7eb4cadd6c0a391c6544f3404d4b457bf76121994f99e8a9502411cba00ffe67",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a063ae0a91c00ddb3b55c20a29c3c12565b025b56e9442c2198f4b05f05aa68eafa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06c04909a647732ae0922b5e5e83bfb778644f195965c78ba58a3675df147a19eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050a238203e880a07dc2dd7204808e803c96a9c70bd65c21970709356c2c515c3f93aad2bb84ce67886363d82ec34125fdf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07eb4cadd6c0a391c6544f3404d4b457bf76121994f99e8a9502411cba00ffe67a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06c04909a647732ae0922b5e5e83bfb778644f195965c78ba58a3675df147a19eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050a238203e880a027ddab935920b403010916adeac1fe09ce4f915bc4d40d307b077369659ee7bf883d9bf67472e83e62f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d7c19d199901a0bbf81bbdf3abaf7c524ecbe39a32b5b68ebfeb480b518e105aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa797c1133190a5c29866c5f59a135325a1b66583d877ad5c10b66087b68c5895",
+        "lastblockhash" : "0x5b5b39e54c94d4e6f95e4617feeaad0e2e96cc233d7c9f5c21150aa561128c84",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x42444545454042415a8554f355",
@@ -233,8 +226,8 @@
     "randomStatetest568BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest568BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest568BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050bb4",
-                    "hash" : "0x966d8d64b306d4414c12d7c073f5ce7cce7a587b622059fef6ca15bd35c76394",
-                    "mixHash" : "0xb1fbda82672c7524153248308010dcdfedbfc0a718167877a6bb2f7bae71d094",
-                    "nonce" : "0xfb84a4c529cdac9a",
+                    "hash" : "0xe77a5631e600b78c54261e7dc9acd534a6dab35dda9d9977e33c342717d96bad",
+                    "mixHash" : "0x39610f7098e56b952fe2692d6d58746689d40464795c0214e7189073d25c31d7",
+                    "nonce" : "0x614e4b50fd557b18",
                     "number" : "0x01",
                     "parentHash" : "0xb3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8",
                     "receiptTrie" : "0x18303a743eb80a0aae70c25097d7f37372b8ea3516c257338cb13c5045a75c34",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a080c9f22c9d28575ea546363164b5e761b91831cd16dc3379a62c5179cdedfa21a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa018303a743eb80a0aae70c25097d7f37372b8ea3516c257338cb13c5045a75c34b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050bb48203e880a0b1fbda82672c7524153248308010dcdfedbfc0a718167877a6bb2f7bae71d09488fb84a4c529cdac9af865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a080c9f22c9d28575ea546363164b5e761b91831cd16dc3379a62c5179cdedfa21a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa018303a743eb80a0aae70c25097d7f37372b8ea3516c257338cb13c5045a75c34b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050bb48203e880a039610f7098e56b952fe2692d6d58746689d40464795c0214e7189073d25c31d788614e4b50fd557b18f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d7c19d199901a0bbf81bbdf3abaf7c524ecbe39a32b5b68ebfeb480b518e105aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x966d8d64b306d4414c12d7c073f5ce7cce7a587b622059fef6ca15bd35c76394",
+        "lastblockhash" : "0xe77a5631e600b78c54261e7dc9acd534a6dab35dda9d9977e33c342717d96bad",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest568BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest568BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest568BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050bb4",
-                    "hash" : "0x4961cc3d90d2a486dadd6822812605bf4b13f3411de503960e78de7c3f70ec34",
-                    "mixHash" : "0xa2f8a2d7b7f222c886898b8d8689abb92b42335a4c7d6c614724f7d64865da95",
-                    "nonce" : "0x57c1c80072c4ca13",
+                    "hash" : "0xcce0cc672383470ccfcebf7950ef788b6f1cf075ab3abd22e39ae3984426e3e0",
+                    "mixHash" : "0x5f3409f1310fc59b6ad823730d02b643eec5b833f962d38cf7790c8484b3dde7",
+                    "nonce" : "0x7756948ef6a29651",
                     "number" : "0x01",
                     "parentHash" : "0xb3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8",
                     "receiptTrie" : "0x18303a743eb80a0aae70c25097d7f37372b8ea3516c257338cb13c5045a75c34",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a080c9f22c9d28575ea546363164b5e761b91831cd16dc3379a62c5179cdedfa21a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa018303a743eb80a0aae70c25097d7f37372b8ea3516c257338cb13c5045a75c34b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050bb48203e880a0a2f8a2d7b7f222c886898b8d8689abb92b42335a4c7d6c614724f7d64865da958857c1c80072c4ca13f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a080c9f22c9d28575ea546363164b5e761b91831cd16dc3379a62c5179cdedfa21a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa018303a743eb80a0aae70c25097d7f37372b8ea3516c257338cb13c5045a75c34b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050bb48203e880a05f3409f1310fc59b6ad823730d02b643eec5b833f962d38cf7790c8484b3dde7887756948ef6a29651f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d7c19d199901a0bbf81bbdf3abaf7c524ecbe39a32b5b68ebfeb480b518e105aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4961cc3d90d2a486dadd6822812605bf4b13f3411de503960e78de7c3f70ec34",
+        "lastblockhash" : "0xcce0cc672383470ccfcebf7950ef788b6f1cf075ab3abd22e39ae3984426e3e0",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest568BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest568BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest568BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050b1e",
-                    "hash" : "0x22f6203f27034cfc597927c4d9f4cf8e1113de058c1b7f8b9149c7d3cf98ae3a",
-                    "mixHash" : "0x707e3a26331312bf61a55ae570216ecc428818f7b307cdd4a33e7405dce7205b",
-                    "nonce" : "0x01d6ab3b70d35576",
+                    "hash" : "0x8d062a99e25c9c6d0f7b4e76e125a1d32e709d0096cecebab0fb24f313d0df0d",
+                    "mixHash" : "0x1478cf48ff0beb9a98ea3a0b979434f00502fa969e888022dd5aabe91574bc51",
+                    "nonce" : "0x68525c9035333adc",
                     "number" : "0x01",
                     "parentHash" : "0xb3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8",
                     "receiptTrie" : "0xde6dea443d89cac75bcaa2ac5b02bce2d3a287630297216f199fa7331f7303b5",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02f87b46a4bb82b5908c77ffeeaf6d1198f789aa456497bede35d8c0797a290e6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0de6dea443d89cac75bcaa2ac5b02bce2d3a287630297216f199fa7331f7303b5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b1e8203e880a0707e3a26331312bf61a55ae570216ecc428818f7b307cdd4a33e7405dce7205b8801d6ab3b70d35576f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02f87b46a4bb82b5908c77ffeeaf6d1198f789aa456497bede35d8c0797a290e6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0de6dea443d89cac75bcaa2ac5b02bce2d3a287630297216f199fa7331f7303b5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b1e8203e880a01478cf48ff0beb9a98ea3a0b979434f00502fa969e888022dd5aabe91574bc518868525c9035333adcf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d7c19d199901a0bbf81bbdf3abaf7c524ecbe39a32b5b68ebfeb480b518e105aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x22f6203f27034cfc597927c4d9f4cf8e1113de058c1b7f8b9149c7d3cf98ae3a",
+        "lastblockhash" : "0x8d062a99e25c9c6d0f7b4e76e125a1d32e709d0096cecebab0fb24f313d0df0d",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest568BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest568BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest568BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050b1e",
-                    "hash" : "0xd2e4194edc3274a0a561f46c96f4337c87533850d37744a938402519cba20c3d",
-                    "mixHash" : "0x9acffa5a85b3537051e009669999bee34e0ce4419266d666d00571179250fde8",
-                    "nonce" : "0x3d1fa8c8fa385554",
+                    "hash" : "0x994b49dd263d3d1b843dff87fd6dc527f6827a0bf6ca2f8d47d3f716a790d665",
+                    "mixHash" : "0x18adf0ad49c602127adf78fc2daedae68618b8f5146ae0f644cb198f36e9d2de",
+                    "nonce" : "0x8adf2d8c27c999fc",
                     "number" : "0x01",
                     "parentHash" : "0xb3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8",
                     "receiptTrie" : "0xde6dea443d89cac75bcaa2ac5b02bce2d3a287630297216f199fa7331f7303b5",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02f87b46a4bb82b5908c77ffeeaf6d1198f789aa456497bede35d8c0797a290e6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0de6dea443d89cac75bcaa2ac5b02bce2d3a287630297216f199fa7331f7303b5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b1e8203e880a09acffa5a85b3537051e009669999bee34e0ce4419266d666d00571179250fde8883d1fa8c8fa385554f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02f87b46a4bb82b5908c77ffeeaf6d1198f789aa456497bede35d8c0797a290e6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0de6dea443d89cac75bcaa2ac5b02bce2d3a287630297216f199fa7331f7303b5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b1e8203e880a018adf0ad49c602127adf78fc2daedae68618b8f5146ae0f644cb198f36e9d2de888adf2d8c27c999fcf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d7c19d199901a0bbf81bbdf3abaf7c524ecbe39a32b5b68ebfeb480b518e105aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd2e4194edc3274a0a561f46c96f4337c87533850d37744a938402519cba20c3d",
+        "lastblockhash" : "0x994b49dd263d3d1b843dff87fd6dc527f6827a0bf6ca2f8d47d3f716a790d665",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest56BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest56BC.json
index 249fc7301..deded36e5 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest56BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest56BC.json
@@ -2,8 +2,8 @@
     "randomStatetest56BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest56BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest56BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa1e7",
-                    "hash" : "0xc1b0997c695fd3e5f1f1a1c1281d812d7ad17f4f5698255db27bd3c00aaef80c",
-                    "mixHash" : "0xd52c4f2dea3008d25535a464143c0ca23f5bdda007eddfc011caad452cda7668",
-                    "nonce" : "0xb2004f258006b3bf",
+                    "hash" : "0x00e00a9d69c60ee958a8aa187a1da1cbd7def2ac78ee6373b95f9c588c271032",
+                    "mixHash" : "0xe05fabc13caedcec9af560700c331dcb35577bf4fa18b49b99c68bf57dc9fbcf",
+                    "nonce" : "0x63334de92a488fc2",
                     "number" : "0x01",
                     "parentHash" : "0x79e302f74bc9d57f51360329de3120366524689b24c1f33de5885315af69b327",
                     "receiptTrie" : "0x81fee7fb29bc324172b18f1ed3c30fb54c872c32256ab7d0394d387e8e1173a0",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca079e302f74bc9d57f51360329de3120366524689b24c1f33de5885315af69b327a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a030e01b2a5074af673dfd8b5c2509bea21bc944e4ab93503c90bbed9bc653401fa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa081fee7fb29bc324172b18f1ed3c30fb54c872c32256ab7d0394d387e8e1173a0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1e78203e880a0d52c4f2dea3008d25535a464143c0ca23f5bdda007eddfc011caad452cda766888b2004f258006b3bff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca079e302f74bc9d57f51360329de3120366524689b24c1f33de5885315af69b327a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a030e01b2a5074af673dfd8b5c2509bea21bc944e4ab93503c90bbed9bc653401fa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa081fee7fb29bc324172b18f1ed3c30fb54c872c32256ab7d0394d387e8e1173a0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1e78203e880a0e05fabc13caedcec9af560700c331dcb35577bf4fa18b49b99c68bf57dc9fbcf8863334de92a488fc2f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0760d291bb006c30ddb709700d2be874e04f4010a969b653ddaaaa4d6544bb98da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc1b0997c695fd3e5f1f1a1c1281d812d7ad17f4f5698255db27bd3c00aaef80c",
+        "lastblockhash" : "0x00e00a9d69c60ee958a8aa187a1da1cbd7def2ac78ee6373b95f9c588c271032",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest56BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest56BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest56BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa7ff",
-                    "hash" : "0xf220bf9b20812d76979459de3fd155388cae8b1100343b1b89d7451e51499a68",
-                    "mixHash" : "0x2c9c513e427d849467520a97e0b43eebd891c7577cce88ee2453a3aa42d4774d",
-                    "nonce" : "0x09ab827bcb56888e",
+                    "hash" : "0xa11345a328ea9599e4e172cabcf167f8184d190662faab0b4383878b8cf3c480",
+                    "mixHash" : "0x53e3a939744e39d40c548f7aae15b3c8613e26e31adada72bb72ca19e6a0ba54",
+                    "nonce" : "0x4bdc39fc7d8dc74b",
                     "number" : "0x01",
                     "parentHash" : "0x79e302f74bc9d57f51360329de3120366524689b24c1f33de5885315af69b327",
                     "receiptTrie" : "0xba01a244adfae82db75efb2f3ddf0b520fdfddaf4d65f00aefee8aedd81c4ed4",
-                    "stateRoot" : "0x8f467db658a3670b31749ed5ede208f6279c3746e7b72c8453df3ecc882ee6e7",
+                    "stateRoot" : "0xc4dba36bed1be1660e8859265d7922365fd0839486a5fdb7a70fe12c99a2068c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca079e302f74bc9d57f51360329de3120366524689b24c1f33de5885315af69b327a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08f467db658a3670b31749ed5ede208f6279c3746e7b72c8453df3ecc882ee6e7a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0ba01a244adfae82db75efb2f3ddf0b520fdfddaf4d65f00aefee8aedd81c4ed4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a7ff8203e880a02c9c513e427d849467520a97e0b43eebd891c7577cce88ee2453a3aa42d4774d8809ab827bcb56888ef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca079e302f74bc9d57f51360329de3120366524689b24c1f33de5885315af69b327a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c4dba36bed1be1660e8859265d7922365fd0839486a5fdb7a70fe12c99a2068ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0ba01a244adfae82db75efb2f3ddf0b520fdfddaf4d65f00aefee8aedd81c4ed4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a7ff8203e880a053e3a939744e39d40c548f7aae15b3c8613e26e31adada72bb72ca19e6a0ba54884bdc39fc7d8dc74bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0760d291bb006c30ddb709700d2be874e04f4010a969b653ddaaaa4d6544bb98da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf220bf9b20812d76979459de3fd155388cae8b1100343b1b89d7451e51499a68",
+        "lastblockhash" : "0xa11345a328ea9599e4e172cabcf167f8184d190662faab0b4383878b8cf3c480",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x584143404243404107204155",
@@ -235,8 +228,8 @@
     "randomStatetest56BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest56BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest56BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa1e7",
-                    "hash" : "0x78d7d5eaf492923cbfb3f407815ca495d42a833edd1134c66b02354c447fdd6b",
-                    "mixHash" : "0xfd3dc0b7d86c19456eff8d02bc017d34c4b9eb463115d25cea32682909809c6e",
-                    "nonce" : "0xe24853573faf67b7",
+                    "hash" : "0x62799afc69132747946808821b1aab08a2b6b65bc7d300e0e5b2af5be2ba7eed",
+                    "mixHash" : "0x26881b7e887491df29b9196f5c162c4cc80bb425f2bcc43b2f67d56f3c181f4c",
+                    "nonce" : "0x499fe78d22bf4897",
                     "number" : "0x01",
                     "parentHash" : "0x79e302f74bc9d57f51360329de3120366524689b24c1f33de5885315af69b327",
                     "receiptTrie" : "0xf17ddd7b9dedaad8066b01a217448b274f9bf3baa2c0a7c131747bb6c83949dc",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca079e302f74bc9d57f51360329de3120366524689b24c1f33de5885315af69b327a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a043eca5e9a09b4d9e1f6b2e69a3737a0c92550f7343c311891fa06004502efc43a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f17ddd7b9dedaad8066b01a217448b274f9bf3baa2c0a7c131747bb6c83949dcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1e78203e880a0fd3dc0b7d86c19456eff8d02bc017d34c4b9eb463115d25cea32682909809c6e88e24853573faf67b7f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca079e302f74bc9d57f51360329de3120366524689b24c1f33de5885315af69b327a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a043eca5e9a09b4d9e1f6b2e69a3737a0c92550f7343c311891fa06004502efc43a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f17ddd7b9dedaad8066b01a217448b274f9bf3baa2c0a7c131747bb6c83949dcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1e78203e880a026881b7e887491df29b9196f5c162c4cc80bb425f2bcc43b2f67d56f3c181f4c88499fe78d22bf4897f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0760d291bb006c30ddb709700d2be874e04f4010a969b653ddaaaa4d6544bb98da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x78d7d5eaf492923cbfb3f407815ca495d42a833edd1134c66b02354c447fdd6b",
+        "lastblockhash" : "0x62799afc69132747946808821b1aab08a2b6b65bc7d300e0e5b2af5be2ba7eed",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest56BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest56BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest56BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa1e7",
-                    "hash" : "0xbad5ca4bd828de2b2cbb726c1bf5760ed56ee06425d6a9b3cc33a5850ee0df3f",
-                    "mixHash" : "0xd129307638ed695d7ffa6f9e8d118aa17f46dd8a0970ccc97f79dd96af6e92dc",
-                    "nonce" : "0x45868bc11732f7b5",
+                    "hash" : "0xc6ff06a500ba14c5ed9a0b2b85d500fbfdc0bae59e12ad74c2d120a5c1ab549e",
+                    "mixHash" : "0x8e03a2e257283410346876aff737c294a9697cb235b55669c13b44977585888d",
+                    "nonce" : "0x0e614c946ad6f01e",
                     "number" : "0x01",
                     "parentHash" : "0x79e302f74bc9d57f51360329de3120366524689b24c1f33de5885315af69b327",
                     "receiptTrie" : "0xf17ddd7b9dedaad8066b01a217448b274f9bf3baa2c0a7c131747bb6c83949dc",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca079e302f74bc9d57f51360329de3120366524689b24c1f33de5885315af69b327a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a043eca5e9a09b4d9e1f6b2e69a3737a0c92550f7343c311891fa06004502efc43a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f17ddd7b9dedaad8066b01a217448b274f9bf3baa2c0a7c131747bb6c83949dcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1e78203e880a0d129307638ed695d7ffa6f9e8d118aa17f46dd8a0970ccc97f79dd96af6e92dc8845868bc11732f7b5f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca079e302f74bc9d57f51360329de3120366524689b24c1f33de5885315af69b327a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a043eca5e9a09b4d9e1f6b2e69a3737a0c92550f7343c311891fa06004502efc43a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f17ddd7b9dedaad8066b01a217448b274f9bf3baa2c0a7c131747bb6c83949dcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1e78203e880a08e03a2e257283410346876aff737c294a9697cb235b55669c13b44977585888d880e614c946ad6f01ef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0760d291bb006c30ddb709700d2be874e04f4010a969b653ddaaaa4d6544bb98da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbad5ca4bd828de2b2cbb726c1bf5760ed56ee06425d6a9b3cc33a5850ee0df3f",
+        "lastblockhash" : "0xc6ff06a500ba14c5ed9a0b2b85d500fbfdc0bae59e12ad74c2d120a5c1ab549e",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest56BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest56BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest56BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa1e7",
-                    "hash" : "0x5d020924579f36852eb015750d1145552b2c7d517615303e8a43576dc55152d2",
-                    "mixHash" : "0x81d7ca12454905270dbb2c0d75fd037eb4ca9bfb3d06237acfac19f764cb60c3",
-                    "nonce" : "0xf4abf2273230e46b",
+                    "hash" : "0xc5e009936a111d73bbec7c07d4a6551731b983886b1bb982445b395063dd5dc3",
+                    "mixHash" : "0xfe6bcdfd126e43787fcc9130a06b5c9e694c064c29df4d07d22582df84ee1b08",
+                    "nonce" : "0x2b6b7570770973e4",
                     "number" : "0x01",
                     "parentHash" : "0x79e302f74bc9d57f51360329de3120366524689b24c1f33de5885315af69b327",
                     "receiptTrie" : "0xf17ddd7b9dedaad8066b01a217448b274f9bf3baa2c0a7c131747bb6c83949dc",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca079e302f74bc9d57f51360329de3120366524689b24c1f33de5885315af69b327a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a043eca5e9a09b4d9e1f6b2e69a3737a0c92550f7343c311891fa06004502efc43a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f17ddd7b9dedaad8066b01a217448b274f9bf3baa2c0a7c131747bb6c83949dcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1e78203e880a081d7ca12454905270dbb2c0d75fd037eb4ca9bfb3d06237acfac19f764cb60c388f4abf2273230e46bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca079e302f74bc9d57f51360329de3120366524689b24c1f33de5885315af69b327a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a043eca5e9a09b4d9e1f6b2e69a3737a0c92550f7343c311891fa06004502efc43a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f17ddd7b9dedaad8066b01a217448b274f9bf3baa2c0a7c131747bb6c83949dcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1e78203e880a0fe6bcdfd126e43787fcc9130a06b5c9e694c064c29df4d07d22582df84ee1b08882b6b7570770973e4f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0760d291bb006c30ddb709700d2be874e04f4010a969b653ddaaaa4d6544bb98da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5d020924579f36852eb015750d1145552b2c7d517615303e8a43576dc55152d2",
+        "lastblockhash" : "0xc5e009936a111d73bbec7c07d4a6551731b983886b1bb982445b395063dd5dc3",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest56BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest56BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest56BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa1e7",
-                    "hash" : "0xe982b999d1b26f5b83498672cbcc39f3b0f70b1fe614091808ab6fc3cf412b4a",
-                    "mixHash" : "0xdc6cb98fd8bdd8c1bf73fc7939c1ac5427c9db4746e1a6210b41b98c06b6a17a",
-                    "nonce" : "0x1d34c43a54e4c43d",
+                    "hash" : "0x9af2df9008c922c82fbb848fd9ba6296ec36bea4e6e978fe1bef5c040830c87f",
+                    "mixHash" : "0x02ae1c5a8ef48302531f9cb7e0a04b43adc4d6d94218f0a2cf518663a1eb903d",
+                    "nonce" : "0x461c73bc8b6640c8",
                     "number" : "0x01",
                     "parentHash" : "0x79e302f74bc9d57f51360329de3120366524689b24c1f33de5885315af69b327",
                     "receiptTrie" : "0xf17ddd7b9dedaad8066b01a217448b274f9bf3baa2c0a7c131747bb6c83949dc",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca079e302f74bc9d57f51360329de3120366524689b24c1f33de5885315af69b327a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a043eca5e9a09b4d9e1f6b2e69a3737a0c92550f7343c311891fa06004502efc43a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f17ddd7b9dedaad8066b01a217448b274f9bf3baa2c0a7c131747bb6c83949dcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1e78203e880a0dc6cb98fd8bdd8c1bf73fc7939c1ac5427c9db4746e1a6210b41b98c06b6a17a881d34c43a54e4c43df865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca079e302f74bc9d57f51360329de3120366524689b24c1f33de5885315af69b327a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a043eca5e9a09b4d9e1f6b2e69a3737a0c92550f7343c311891fa06004502efc43a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f17ddd7b9dedaad8066b01a217448b274f9bf3baa2c0a7c131747bb6c83949dcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1e78203e880a002ae1c5a8ef48302531f9cb7e0a04b43adc4d6d94218f0a2cf518663a1eb903d88461c73bc8b6640c8f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0760d291bb006c30ddb709700d2be874e04f4010a969b653ddaaaa4d6544bb98da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe982b999d1b26f5b83498672cbcc39f3b0f70b1fe614091808ab6fc3cf412b4a",
+        "lastblockhash" : "0x9af2df9008c922c82fbb848fd9ba6296ec36bea4e6e978fe1bef5c040830c87f",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest570BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest570BC.json
index 7150b8463..f8f15cfaf 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest570BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest570BC.json
@@ -2,8 +2,8 @@
     "randomStatetest570BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest570BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest570BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb3f5",
-                    "hash" : "0x0422c7fc4932ebd9145543332f60773d3743692ef99c8c309ff5ebf11f6a9161",
-                    "mixHash" : "0x52ff70fc054d3c1379bc5f849340d699fd37a51e939d2af6fe59e905c1db5018",
-                    "nonce" : "0x3f0a2d5981a3d002",
+                    "hash" : "0x639ac846604f4b3e4f2eb31c4f6d69127627449074280a405cf576811958a236",
+                    "mixHash" : "0xb58f824ac1c03925d2f86d486391e5f5f794fb27cfbf54069ed473a02ec5ed6f",
+                    "nonce" : "0x3809bc9b8b0772fb",
                     "number" : "0x01",
                     "parentHash" : "0xaa3c396facb1ee19d8dd3404ad580fa167abb13429b16c3b4f6851346d4b0446",
                     "receiptTrie" : "0x9b98cbbdf26410a3ecd45a5478da5e67c35230551a58278aacfbb328e7a702ba",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xb266679e9ff0d1379af4989c6385f24ee6a486d3ae876e01142c00acedd08478",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90323f901fca0aa3c396facb1ee19d8dd3404ad580fa167abb13429b16c3b4f6851346d4b0446a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06fb5643898092f93700374c6e6cb8596a431795c8d6d03a9def45a53123a04cda0b266679e9ff0d1379af4989c6385f24ee6a486d3ae876e01142c00acedd08478a09b98cbbdf26410a3ecd45a5478da5e67c35230551a58278aacfbb328e7a702bab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b3f58203e880a052ff70fc054d3c1379bc5f849340d699fd37a51e939d2af6fe59e905c1db5018883f0a2d5981a3d002f90120f9011d800184011f145994095e7baea6a6c7c4c2dfeb977efac326af552d87840e17cd7cb8b77f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000001000000000000000000000000000000000000000041406f91956111508460735b825f545807801ba0b14ff6737b9edf4fe279ccd17181747dd3a79e2149029ce93409055a74f1ee92a01f612c3e9010a03ccf3d594e05a3cbf731bde937c8103b5fd904ff922def384fc0",
+                "rlp" : "0xf90323f901fca0aa3c396facb1ee19d8dd3404ad580fa167abb13429b16c3b4f6851346d4b0446a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06fb5643898092f93700374c6e6cb8596a431795c8d6d03a9def45a53123a04cda0b266679e9ff0d1379af4989c6385f24ee6a486d3ae876e01142c00acedd08478a09b98cbbdf26410a3ecd45a5478da5e67c35230551a58278aacfbb328e7a702bab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b3f58203e880a0b58f824ac1c03925d2f86d486391e5f5f794fb27cfbf54069ed473a02ec5ed6f883809bc9b8b0772fbf90120f9011d800184011f145994095e7baea6a6c7c4c2dfeb977efac326af552d87840e17cd7cb8b77f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000001000000000000000000000000000000000000000041406f91956111508460735b825f545807801ba0b14ff6737b9edf4fe279ccd17181747dd3a79e2149029ce93409055a74f1ee92a01f612c3e9010a03ccf3d594e05a3cbf731bde937c8103b5fd904ff922def384fc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000001000000000000000000000000000000000000000041406f91956111508460735b825f54580780",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03174ac1becd93ad81feae6dfdb43be98c7c1c3880362ff6c4f6acc6cc022f848a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0422c7fc4932ebd9145543332f60773d3743692ef99c8c309ff5ebf11f6a9161",
+        "lastblockhash" : "0x639ac846604f4b3e4f2eb31c4f6d69127627449074280a405cf576811958a236",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest570BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest570BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest570BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb701",
-                    "hash" : "0xf9c7ed3d5876f97175ee90226e6a735deac4801c9bc9dbbaf98cb04c08cdb25f",
-                    "mixHash" : "0xc0882536198886149895ba419e744e77b95d8599df3538ad90030a4c34af348f",
-                    "nonce" : "0xd60fce17990b9748",
+                    "hash" : "0xc5e867e3e255cc940da253c8d0761d2a97391c10dc293c0ac17d8f5c54495f5e",
+                    "mixHash" : "0xd4ce500398f56b4461f49d569481847af6cd74edb5c125707ce388833ea8f521",
+                    "nonce" : "0x00925a90883ad645",
                     "number" : "0x01",
                     "parentHash" : "0xaa3c396facb1ee19d8dd3404ad580fa167abb13429b16c3b4f6851346d4b0446",
                     "receiptTrie" : "0xe1c333e6b0d1c08339d00ff148957444751396be3779e2fda6a035f63bbfc330",
-                    "stateRoot" : "0xbc2acb9363ea44e859cd57e588aac4609b25caafb56a0e052fc2f29c501c6648",
+                    "stateRoot" : "0x950540d87f5b595b1cad42759bfebcfdb65a4f3ee79d9109b08b6c83637a8394",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb266679e9ff0d1379af4989c6385f24ee6a486d3ae876e01142c00acedd08478",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90323f901fca0aa3c396facb1ee19d8dd3404ad580fa167abb13429b16c3b4f6851346d4b0446a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0bc2acb9363ea44e859cd57e588aac4609b25caafb56a0e052fc2f29c501c6648a0b266679e9ff0d1379af4989c6385f24ee6a486d3ae876e01142c00acedd08478a0e1c333e6b0d1c08339d00ff148957444751396be3779e2fda6a035f63bbfc330b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b7018203e880a0c0882536198886149895ba419e744e77b95d8599df3538ad90030a4c34af348f88d60fce17990b9748f90120f9011d800184011f145994095e7baea6a6c7c4c2dfeb977efac326af552d87840e17cd7cb8b77f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000001000000000000000000000000000000000000000041406f91956111508460735b825f545807801ba0b14ff6737b9edf4fe279ccd17181747dd3a79e2149029ce93409055a74f1ee92a01f612c3e9010a03ccf3d594e05a3cbf731bde937c8103b5fd904ff922def384fc0",
+                "rlp" : "0xf90323f901fca0aa3c396facb1ee19d8dd3404ad580fa167abb13429b16c3b4f6851346d4b0446a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0950540d87f5b595b1cad42759bfebcfdb65a4f3ee79d9109b08b6c83637a8394a0b266679e9ff0d1379af4989c6385f24ee6a486d3ae876e01142c00acedd08478a0e1c333e6b0d1c08339d00ff148957444751396be3779e2fda6a035f63bbfc330b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b7018203e880a0d4ce500398f56b4461f49d569481847af6cd74edb5c125707ce388833ea8f5218800925a90883ad645f90120f9011d800184011f145994095e7baea6a6c7c4c2dfeb977efac326af552d87840e17cd7cb8b77f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000001000000000000000000000000000000000000000041406f91956111508460735b825f545807801ba0b14ff6737b9edf4fe279ccd17181747dd3a79e2149029ce93409055a74f1ee92a01f612c3e9010a03ccf3d594e05a3cbf731bde937c8103b5fd904ff922def384fc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000001000000000000000000000000000000000000000041406f91956111508460735b825f54580780",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03174ac1becd93ad81feae6dfdb43be98c7c1c3880362ff6c4f6acc6cc022f848a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf9c7ed3d5876f97175ee90226e6a735deac4801c9bc9dbbaf98cb04c08cdb25f",
+        "lastblockhash" : "0xc5e867e3e255cc940da253c8d0761d2a97391c10dc293c0ac17d8f5c54495f5e",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0e17cd7c",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000001000000000000000000000000000000000000000041406f91956111508460735b825f545807805560005155",
@@ -235,8 +228,8 @@
     "randomStatetest570BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest570BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest570BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb3f5",
-                    "hash" : "0xd07b89be0ef0685f85c91b16ef4055290803e44aceae02ceb6b8a17994683126",
-                    "mixHash" : "0xebf50acf45ff8ded8bd8882d4f93161eb9bbff71197563fec0c1603d523591bd",
-                    "nonce" : "0x2fb8b5bbeec022c4",
+                    "hash" : "0x6359c255d504e6107fdf4337e2ee0d186d5168662eede6022d29590f0c44a4bf",
+                    "mixHash" : "0x107f01906d9ca496bc5f1e558b4f71d7286f99c175baae7f45a7495578f2441d",
+                    "nonce" : "0xc58f7948a410ced1",
                     "number" : "0x01",
                     "parentHash" : "0xaa3c396facb1ee19d8dd3404ad580fa167abb13429b16c3b4f6851346d4b0446",
                     "receiptTrie" : "0xf7fd2d2f41bfaaf3e0e8a72ef86efc6886c55aacc31b09a1f3326917d3d011e3",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xb266679e9ff0d1379af4989c6385f24ee6a486d3ae876e01142c00acedd08478",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90323f901fca0aa3c396facb1ee19d8dd3404ad580fa167abb13429b16c3b4f6851346d4b0446a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0067739ba32236340442b1372c1345c51f2b8919fa786d5e6e574a69fe072b15ca0b266679e9ff0d1379af4989c6385f24ee6a486d3ae876e01142c00acedd08478a0f7fd2d2f41bfaaf3e0e8a72ef86efc6886c55aacc31b09a1f3326917d3d011e3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b3f58203e880a0ebf50acf45ff8ded8bd8882d4f93161eb9bbff71197563fec0c1603d523591bd882fb8b5bbeec022c4f90120f9011d800184011f145994095e7baea6a6c7c4c2dfeb977efac326af552d87840e17cd7cb8b77f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000001000000000000000000000000000000000000000041406f91956111508460735b825f545807801ba0b14ff6737b9edf4fe279ccd17181747dd3a79e2149029ce93409055a74f1ee92a01f612c3e9010a03ccf3d594e05a3cbf731bde937c8103b5fd904ff922def384fc0",
+                "rlp" : "0xf90323f901fca0aa3c396facb1ee19d8dd3404ad580fa167abb13429b16c3b4f6851346d4b0446a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0067739ba32236340442b1372c1345c51f2b8919fa786d5e6e574a69fe072b15ca0b266679e9ff0d1379af4989c6385f24ee6a486d3ae876e01142c00acedd08478a0f7fd2d2f41bfaaf3e0e8a72ef86efc6886c55aacc31b09a1f3326917d3d011e3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b3f58203e880a0107f01906d9ca496bc5f1e558b4f71d7286f99c175baae7f45a7495578f2441d88c58f7948a410ced1f90120f9011d800184011f145994095e7baea6a6c7c4c2dfeb977efac326af552d87840e17cd7cb8b77f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000001000000000000000000000000000000000000000041406f91956111508460735b825f545807801ba0b14ff6737b9edf4fe279ccd17181747dd3a79e2149029ce93409055a74f1ee92a01f612c3e9010a03ccf3d594e05a3cbf731bde937c8103b5fd904ff922def384fc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000001000000000000000000000000000000000000000041406f91956111508460735b825f54580780",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03174ac1becd93ad81feae6dfdb43be98c7c1c3880362ff6c4f6acc6cc022f848a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd07b89be0ef0685f85c91b16ef4055290803e44aceae02ceb6b8a17994683126",
+        "lastblockhash" : "0x6359c255d504e6107fdf4337e2ee0d186d5168662eede6022d29590f0c44a4bf",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest570BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest570BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest570BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb3f5",
-                    "hash" : "0x579cb0c0457e05924e5c250e70427c2f4b4ae6f911ab7db4e521e28a0481f509",
-                    "mixHash" : "0x061b71c15f1796b96ee0ffa7cfd8708c23071cb81fef36ebc6b273d337d04563",
-                    "nonce" : "0x508728fc26f754f0",
+                    "hash" : "0xec8acaf977207ad02f3ab4d7191bfd8be648ca200cc4ab722b39f8a3423ddf83",
+                    "mixHash" : "0x02308fbd3543321bf150299e96222bdcbb6adcc802c7baa66ead6309c6a26a53",
+                    "nonce" : "0x16f497420d87f894",
                     "number" : "0x01",
                     "parentHash" : "0xaa3c396facb1ee19d8dd3404ad580fa167abb13429b16c3b4f6851346d4b0446",
                     "receiptTrie" : "0xf7fd2d2f41bfaaf3e0e8a72ef86efc6886c55aacc31b09a1f3326917d3d011e3",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xb266679e9ff0d1379af4989c6385f24ee6a486d3ae876e01142c00acedd08478",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90323f901fca0aa3c396facb1ee19d8dd3404ad580fa167abb13429b16c3b4f6851346d4b0446a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0067739ba32236340442b1372c1345c51f2b8919fa786d5e6e574a69fe072b15ca0b266679e9ff0d1379af4989c6385f24ee6a486d3ae876e01142c00acedd08478a0f7fd2d2f41bfaaf3e0e8a72ef86efc6886c55aacc31b09a1f3326917d3d011e3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b3f58203e880a0061b71c15f1796b96ee0ffa7cfd8708c23071cb81fef36ebc6b273d337d0456388508728fc26f754f0f90120f9011d800184011f145994095e7baea6a6c7c4c2dfeb977efac326af552d87840e17cd7cb8b77f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000001000000000000000000000000000000000000000041406f91956111508460735b825f545807801ba0b14ff6737b9edf4fe279ccd17181747dd3a79e2149029ce93409055a74f1ee92a01f612c3e9010a03ccf3d594e05a3cbf731bde937c8103b5fd904ff922def384fc0",
+                "rlp" : "0xf90323f901fca0aa3c396facb1ee19d8dd3404ad580fa167abb13429b16c3b4f6851346d4b0446a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0067739ba32236340442b1372c1345c51f2b8919fa786d5e6e574a69fe072b15ca0b266679e9ff0d1379af4989c6385f24ee6a486d3ae876e01142c00acedd08478a0f7fd2d2f41bfaaf3e0e8a72ef86efc6886c55aacc31b09a1f3326917d3d011e3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b3f58203e880a002308fbd3543321bf150299e96222bdcbb6adcc802c7baa66ead6309c6a26a538816f497420d87f894f90120f9011d800184011f145994095e7baea6a6c7c4c2dfeb977efac326af552d87840e17cd7cb8b77f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000001000000000000000000000000000000000000000041406f91956111508460735b825f545807801ba0b14ff6737b9edf4fe279ccd17181747dd3a79e2149029ce93409055a74f1ee92a01f612c3e9010a03ccf3d594e05a3cbf731bde937c8103b5fd904ff922def384fc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000001000000000000000000000000000000000000000041406f91956111508460735b825f54580780",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03174ac1becd93ad81feae6dfdb43be98c7c1c3880362ff6c4f6acc6cc022f848a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x579cb0c0457e05924e5c250e70427c2f4b4ae6f911ab7db4e521e28a0481f509",
+        "lastblockhash" : "0xec8acaf977207ad02f3ab4d7191bfd8be648ca200cc4ab722b39f8a3423ddf83",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest570BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest570BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest570BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb3f5",
-                    "hash" : "0xfe205c1b013c25aa856cf322a9e1ae885e0778a10a682072408b2bc19277dece",
-                    "mixHash" : "0x6f80b9fd0764107039d8803d1320afb0d2d24d25fc4ea68c90bf7fc875cfe086",
-                    "nonce" : "0xcdcbd626809358a7",
+                    "hash" : "0x4767f3f17348fd311ac181d5eecd2ef3d1a5686c5b3430aeb40e4305dd4bb00d",
+                    "mixHash" : "0xf04212c527f6b429086fad5a6d072414fe576fc7182285ed11af80cd21d699ee",
+                    "nonce" : "0x196a9ae48a5d9b0f",
                     "number" : "0x01",
                     "parentHash" : "0xaa3c396facb1ee19d8dd3404ad580fa167abb13429b16c3b4f6851346d4b0446",
                     "receiptTrie" : "0xf7fd2d2f41bfaaf3e0e8a72ef86efc6886c55aacc31b09a1f3326917d3d011e3",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xb266679e9ff0d1379af4989c6385f24ee6a486d3ae876e01142c00acedd08478",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90323f901fca0aa3c396facb1ee19d8dd3404ad580fa167abb13429b16c3b4f6851346d4b0446a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0067739ba32236340442b1372c1345c51f2b8919fa786d5e6e574a69fe072b15ca0b266679e9ff0d1379af4989c6385f24ee6a486d3ae876e01142c00acedd08478a0f7fd2d2f41bfaaf3e0e8a72ef86efc6886c55aacc31b09a1f3326917d3d011e3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b3f58203e880a06f80b9fd0764107039d8803d1320afb0d2d24d25fc4ea68c90bf7fc875cfe08688cdcbd626809358a7f90120f9011d800184011f145994095e7baea6a6c7c4c2dfeb977efac326af552d87840e17cd7cb8b77f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000001000000000000000000000000000000000000000041406f91956111508460735b825f545807801ba0b14ff6737b9edf4fe279ccd17181747dd3a79e2149029ce93409055a74f1ee92a01f612c3e9010a03ccf3d594e05a3cbf731bde937c8103b5fd904ff922def384fc0",
+                "rlp" : "0xf90323f901fca0aa3c396facb1ee19d8dd3404ad580fa167abb13429b16c3b4f6851346d4b0446a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0067739ba32236340442b1372c1345c51f2b8919fa786d5e6e574a69fe072b15ca0b266679e9ff0d1379af4989c6385f24ee6a486d3ae876e01142c00acedd08478a0f7fd2d2f41bfaaf3e0e8a72ef86efc6886c55aacc31b09a1f3326917d3d011e3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b3f58203e880a0f04212c527f6b429086fad5a6d072414fe576fc7182285ed11af80cd21d699ee88196a9ae48a5d9b0ff90120f9011d800184011f145994095e7baea6a6c7c4c2dfeb977efac326af552d87840e17cd7cb8b77f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000001000000000000000000000000000000000000000041406f91956111508460735b825f545807801ba0b14ff6737b9edf4fe279ccd17181747dd3a79e2149029ce93409055a74f1ee92a01f612c3e9010a03ccf3d594e05a3cbf731bde937c8103b5fd904ff922def384fc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000001000000000000000000000000000000000000000041406f91956111508460735b825f54580780",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03174ac1becd93ad81feae6dfdb43be98c7c1c3880362ff6c4f6acc6cc022f848a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfe205c1b013c25aa856cf322a9e1ae885e0778a10a682072408b2bc19277dece",
+        "lastblockhash" : "0x4767f3f17348fd311ac181d5eecd2ef3d1a5686c5b3430aeb40e4305dd4bb00d",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest570BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest570BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest570BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb3f5",
-                    "hash" : "0x335705029f2c2885bdccf4764ac9a1013df346711a1a9ea35d872d82fbdca6c3",
-                    "mixHash" : "0xc7b00f608da5894bee401861c46395572940258d8ca581e6307b4575f2d85d5a",
-                    "nonce" : "0xb93a9150d9c973c3",
+                    "hash" : "0x9f87d67fba875e2795be18ac59b9c6a33f4537391a60299ea9c8829cdc6c6ab8",
+                    "mixHash" : "0x1c1b10a8262fa6b22adf2f147cd4cd68ee9308086022a48963e25714fda59880",
+                    "nonce" : "0x1ef8b33e275c77df",
                     "number" : "0x01",
                     "parentHash" : "0xaa3c396facb1ee19d8dd3404ad580fa167abb13429b16c3b4f6851346d4b0446",
                     "receiptTrie" : "0xf7fd2d2f41bfaaf3e0e8a72ef86efc6886c55aacc31b09a1f3326917d3d011e3",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xb266679e9ff0d1379af4989c6385f24ee6a486d3ae876e01142c00acedd08478",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90323f901fca0aa3c396facb1ee19d8dd3404ad580fa167abb13429b16c3b4f6851346d4b0446a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0067739ba32236340442b1372c1345c51f2b8919fa786d5e6e574a69fe072b15ca0b266679e9ff0d1379af4989c6385f24ee6a486d3ae876e01142c00acedd08478a0f7fd2d2f41bfaaf3e0e8a72ef86efc6886c55aacc31b09a1f3326917d3d011e3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b3f58203e880a0c7b00f608da5894bee401861c46395572940258d8ca581e6307b4575f2d85d5a88b93a9150d9c973c3f90120f9011d800184011f145994095e7baea6a6c7c4c2dfeb977efac326af552d87840e17cd7cb8b77f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000001000000000000000000000000000000000000000041406f91956111508460735b825f545807801ba0b14ff6737b9edf4fe279ccd17181747dd3a79e2149029ce93409055a74f1ee92a01f612c3e9010a03ccf3d594e05a3cbf731bde937c8103b5fd904ff922def384fc0",
+                "rlp" : "0xf90323f901fca0aa3c396facb1ee19d8dd3404ad580fa167abb13429b16c3b4f6851346d4b0446a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0067739ba32236340442b1372c1345c51f2b8919fa786d5e6e574a69fe072b15ca0b266679e9ff0d1379af4989c6385f24ee6a486d3ae876e01142c00acedd08478a0f7fd2d2f41bfaaf3e0e8a72ef86efc6886c55aacc31b09a1f3326917d3d011e3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b3f58203e880a01c1b10a8262fa6b22adf2f147cd4cd68ee9308086022a48963e25714fda59880881ef8b33e275c77dff90120f9011d800184011f145994095e7baea6a6c7c4c2dfeb977efac326af552d87840e17cd7cb8b77f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000001000000000000000000000000000000000000000041406f91956111508460735b825f545807801ba0b14ff6737b9edf4fe279ccd17181747dd3a79e2149029ce93409055a74f1ee92a01f612c3e9010a03ccf3d594e05a3cbf731bde937c8103b5fd904ff922def384fc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000001000000000000000000000000000000000000000041406f91956111508460735b825f54580780",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03174ac1becd93ad81feae6dfdb43be98c7c1c3880362ff6c4f6acc6cc022f848a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x335705029f2c2885bdccf4764ac9a1013df346711a1a9ea35d872d82fbdca6c3",
+        "lastblockhash" : "0x9f87d67fba875e2795be18ac59b9c6a33f4537391a60299ea9c8829cdc6c6ab8",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest590BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest590BC.json
index 223adf6b1..20fad6f2b 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest590BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest590BC.json
@@ -2,8 +2,8 @@
     "randomStatetest590BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest590BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest590BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb73c",
-                    "hash" : "0x0c745e8aa2f8409bf736b25ad6585e9fd63146b7b5e992fb3809adc8940a8a62",
-                    "mixHash" : "0x5c1ea8902ca18e17c4764558f13e55196243e7ca0f98fb8c9714f79608317967",
-                    "nonce" : "0x642f7d323fbe0a23",
+                    "hash" : "0xcc22109ff1eb7c2550136768fc797fdf41239bdb14c55d533e3d00b440410da9",
+                    "mixHash" : "0x50ce07cb554fc23fcf40335d79abf27d32a0599e83185b0e427132bcb25f03ca",
+                    "nonce" : "0x0e769368bb423adf",
                     "number" : "0x01",
                     "parentHash" : "0xfc0182073f4f279b39b2eb1854ae4279e385de988bd527009bc882c22d3789dc",
                     "receiptTrie" : "0xf8496ce7711011e9aff032127094c78e479c9593fe170181b05c05b68f4ed22e",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xa199d8d2b1e60fff4e8f095ba4db52d038499041c571054ba07f02fe67886f7a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0fc0182073f4f279b39b2eb1854ae4279e385de988bd527009bc882c22d3789dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01d14f40696e8fb4f80a8d742569fc05d6da6d754e4f9100663b3985216bbc4c1a0a199d8d2b1e60fff4e8f095ba4db52d038499041c571054ba07f02fe67886f7aa0f8496ce7711011e9aff032127094c78e479c9593fe170181b05c05b68f4ed22eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b73c8203e880a05c1ea8902ca18e17c4764558f13e55196243e7ca0f98fb8c9714f7960831796788642f7d323fbe0a23f90141f9013e800184417d1e4094095e7baea6a6c7c4c2dfeb977efac326af552d8784033eda36b8d8447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006fa05a3119539f6760654232763893401ba07f43b4b2956b9495d9a6462cfac52848bb6a04e301d53bdb64fbada7f2e48b36a0207ec13da3bc9e541d1eea96bd55c94fc52605782335e8f3a1766134b7f447a0c0",
+                "rlp" : "0xf90344f901fca0fc0182073f4f279b39b2eb1854ae4279e385de988bd527009bc882c22d3789dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01d14f40696e8fb4f80a8d742569fc05d6da6d754e4f9100663b3985216bbc4c1a0a199d8d2b1e60fff4e8f095ba4db52d038499041c571054ba07f02fe67886f7aa0f8496ce7711011e9aff032127094c78e479c9593fe170181b05c05b68f4ed22eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b73c8203e880a050ce07cb554fc23fcf40335d79abf27d32a0599e83185b0e427132bcb25f03ca880e769368bb423adff90141f9013e800184417d1e4094095e7baea6a6c7c4c2dfeb977efac326af552d8784033eda36b8d8447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006fa05a3119539f6760654232763893401ba07f43b4b2956b9495d9a6462cfac52848bb6a04e301d53bdb64fbada7f2e48b36a0207ec13da3bc9e541d1eea96bd55c94fc52605782335e8f3a1766134b7f447a0c0",
                 "transactions" : [
                     {
                         "data" : "0x447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006fa05a3119539f676065423276389340",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0897055189846d87c6d1f7c07a4a0896d337edcc5b6203d34396f72377a4a8d12a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0c745e8aa2f8409bf736b25ad6585e9fd63146b7b5e992fb3809adc8940a8a62",
+        "lastblockhash" : "0xcc22109ff1eb7c2550136768fc797fdf41239bdb14c55d533e3d00b440410da9",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest590BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest590BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest590BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xba48",
-                    "hash" : "0xc0e36e3be8633aa30b33d1ced74b9d640700b9f611903f2b42eff4157a8ecb2b",
-                    "mixHash" : "0x1cbe34dd979f04fd13cd097d8fe6af86c76ff5df3aa8a5111fb2dd102a5cf4bd",
-                    "nonce" : "0x7589904143dafb39",
+                    "hash" : "0xbea7da298980e07c44e5894b218dcafc3efaf07e6ead35336f88e995704d41a1",
+                    "mixHash" : "0x185c465259328b9c11bd2ec48fd2396ae68e70c5554579eb012b18ee8e1bdfbd",
+                    "nonce" : "0x16b329d4cd483a94",
                     "number" : "0x01",
                     "parentHash" : "0xfc0182073f4f279b39b2eb1854ae4279e385de988bd527009bc882c22d3789dc",
                     "receiptTrie" : "0x5c4d08eadfda256fb446db9c48bc3a6cdea3ae1ebb6bdb832a7b4df53119b250",
-                    "stateRoot" : "0x8365e657be820ead25c4d4dd7f0c1c8e257fe5450209af71e3391ab86daef6a6",
+                    "stateRoot" : "0x5685b15a08ba748a8eb7562e28462d50082e28968e34a545dfecc1b60a34a55b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa199d8d2b1e60fff4e8f095ba4db52d038499041c571054ba07f02fe67886f7a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0fc0182073f4f279b39b2eb1854ae4279e385de988bd527009bc882c22d3789dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08365e657be820ead25c4d4dd7f0c1c8e257fe5450209af71e3391ab86daef6a6a0a199d8d2b1e60fff4e8f095ba4db52d038499041c571054ba07f02fe67886f7aa05c4d08eadfda256fb446db9c48bc3a6cdea3ae1ebb6bdb832a7b4df53119b250b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82ba488203e880a01cbe34dd979f04fd13cd097d8fe6af86c76ff5df3aa8a5111fb2dd102a5cf4bd887589904143dafb39f90141f9013e800184417d1e4094095e7baea6a6c7c4c2dfeb977efac326af552d8784033eda36b8d8447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006fa05a3119539f6760654232763893401ba07f43b4b2956b9495d9a6462cfac52848bb6a04e301d53bdb64fbada7f2e48b36a0207ec13da3bc9e541d1eea96bd55c94fc52605782335e8f3a1766134b7f447a0c0",
+                "rlp" : "0xf90344f901fca0fc0182073f4f279b39b2eb1854ae4279e385de988bd527009bc882c22d3789dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05685b15a08ba748a8eb7562e28462d50082e28968e34a545dfecc1b60a34a55ba0a199d8d2b1e60fff4e8f095ba4db52d038499041c571054ba07f02fe67886f7aa05c4d08eadfda256fb446db9c48bc3a6cdea3ae1ebb6bdb832a7b4df53119b250b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82ba488203e880a0185c465259328b9c11bd2ec48fd2396ae68e70c5554579eb012b18ee8e1bdfbd8816b329d4cd483a94f90141f9013e800184417d1e4094095e7baea6a6c7c4c2dfeb977efac326af552d8784033eda36b8d8447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006fa05a3119539f6760654232763893401ba07f43b4b2956b9495d9a6462cfac52848bb6a04e301d53bdb64fbada7f2e48b36a0207ec13da3bc9e541d1eea96bd55c94fc52605782335e8f3a1766134b7f447a0c0",
                 "transactions" : [
                     {
                         "data" : "0x447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006fa05a3119539f676065423276389340",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0897055189846d87c6d1f7c07a4a0896d337edcc5b6203d34396f72377a4a8d12a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc0e36e3be8633aa30b33d1ced74b9d640700b9f611903f2b42eff4157a8ecb2b",
+        "lastblockhash" : "0xbea7da298980e07c44e5894b218dcafc3efaf07e6ead35336f88e995704d41a1",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x033eda36",
                 "code" : "0x447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006fa05a3119539f6760654232763893405560005155",
@@ -235,8 +228,8 @@
     "randomStatetest590BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest590BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest590BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb73c",
-                    "hash" : "0x3cb67bd5fa72078950a42a8c44549b4d343bd5af1ae291ccd12f24665713a295",
-                    "mixHash" : "0x928af0da83b7f9341f6f92e0f175dd58072ea8b85102214c7ac199540b1bacfb",
-                    "nonce" : "0x65d482078a39219b",
+                    "hash" : "0x5d00c47b783c9c1bdacc06751c8bcacaa016b081809e8f4079886ea663262447",
+                    "mixHash" : "0xcca21af76402559b01efde3afd3adcc94d64668654be55d0a9f17cab2a7580a4",
+                    "nonce" : "0x321345f600f23d6d",
                     "number" : "0x01",
                     "parentHash" : "0xfc0182073f4f279b39b2eb1854ae4279e385de988bd527009bc882c22d3789dc",
                     "receiptTrie" : "0xad01bf83ca9db59317a859106007d593a9247a81775b1686d05a71cf1cee0353",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xa199d8d2b1e60fff4e8f095ba4db52d038499041c571054ba07f02fe67886f7a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0fc0182073f4f279b39b2eb1854ae4279e385de988bd527009bc882c22d3789dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0bfacf8f5e8c41bf169da54ef7a272d2b86c179bb07f358435cc132cb92925baca0a199d8d2b1e60fff4e8f095ba4db52d038499041c571054ba07f02fe67886f7aa0ad01bf83ca9db59317a859106007d593a9247a81775b1686d05a71cf1cee0353b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b73c8203e880a0928af0da83b7f9341f6f92e0f175dd58072ea8b85102214c7ac199540b1bacfb8865d482078a39219bf90141f9013e800184417d1e4094095e7baea6a6c7c4c2dfeb977efac326af552d8784033eda36b8d8447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006fa05a3119539f6760654232763893401ba07f43b4b2956b9495d9a6462cfac52848bb6a04e301d53bdb64fbada7f2e48b36a0207ec13da3bc9e541d1eea96bd55c94fc52605782335e8f3a1766134b7f447a0c0",
+                "rlp" : "0xf90344f901fca0fc0182073f4f279b39b2eb1854ae4279e385de988bd527009bc882c22d3789dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0bfacf8f5e8c41bf169da54ef7a272d2b86c179bb07f358435cc132cb92925baca0a199d8d2b1e60fff4e8f095ba4db52d038499041c571054ba07f02fe67886f7aa0ad01bf83ca9db59317a859106007d593a9247a81775b1686d05a71cf1cee0353b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b73c8203e880a0cca21af76402559b01efde3afd3adcc94d64668654be55d0a9f17cab2a7580a488321345f600f23d6df90141f9013e800184417d1e4094095e7baea6a6c7c4c2dfeb977efac326af552d8784033eda36b8d8447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006fa05a3119539f6760654232763893401ba07f43b4b2956b9495d9a6462cfac52848bb6a04e301d53bdb64fbada7f2e48b36a0207ec13da3bc9e541d1eea96bd55c94fc52605782335e8f3a1766134b7f447a0c0",
                 "transactions" : [
                     {
                         "data" : "0x447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006fa05a3119539f676065423276389340",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0897055189846d87c6d1f7c07a4a0896d337edcc5b6203d34396f72377a4a8d12a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3cb67bd5fa72078950a42a8c44549b4d343bd5af1ae291ccd12f24665713a295",
+        "lastblockhash" : "0x5d00c47b783c9c1bdacc06751c8bcacaa016b081809e8f4079886ea663262447",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest590BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest590BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest590BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb73c",
-                    "hash" : "0x41eb5cbacf2d99b856b20b59b3847721d53167ff430f0731a18529549da6ec86",
-                    "mixHash" : "0x465499c28c1ce812c9afcb954c602f99070c6d109b37570dfc5d70e09fb57ae0",
-                    "nonce" : "0x6fd7b334397fc100",
+                    "hash" : "0x61f835a152263765a1344335b961c326c091e04a2e19edc2bdf87377f675a999",
+                    "mixHash" : "0xe69d7897e4379c38a246d249617e608b5d143de3d23005c6c3eec04aa385df82",
+                    "nonce" : "0x69df9728988e1ffd",
                     "number" : "0x01",
                     "parentHash" : "0xfc0182073f4f279b39b2eb1854ae4279e385de988bd527009bc882c22d3789dc",
                     "receiptTrie" : "0xad01bf83ca9db59317a859106007d593a9247a81775b1686d05a71cf1cee0353",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xa199d8d2b1e60fff4e8f095ba4db52d038499041c571054ba07f02fe67886f7a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0fc0182073f4f279b39b2eb1854ae4279e385de988bd527009bc882c22d3789dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0bfacf8f5e8c41bf169da54ef7a272d2b86c179bb07f358435cc132cb92925baca0a199d8d2b1e60fff4e8f095ba4db52d038499041c571054ba07f02fe67886f7aa0ad01bf83ca9db59317a859106007d593a9247a81775b1686d05a71cf1cee0353b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b73c8203e880a0465499c28c1ce812c9afcb954c602f99070c6d109b37570dfc5d70e09fb57ae0886fd7b334397fc100f90141f9013e800184417d1e4094095e7baea6a6c7c4c2dfeb977efac326af552d8784033eda36b8d8447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006fa05a3119539f6760654232763893401ba07f43b4b2956b9495d9a6462cfac52848bb6a04e301d53bdb64fbada7f2e48b36a0207ec13da3bc9e541d1eea96bd55c94fc52605782335e8f3a1766134b7f447a0c0",
+                "rlp" : "0xf90344f901fca0fc0182073f4f279b39b2eb1854ae4279e385de988bd527009bc882c22d3789dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0bfacf8f5e8c41bf169da54ef7a272d2b86c179bb07f358435cc132cb92925baca0a199d8d2b1e60fff4e8f095ba4db52d038499041c571054ba07f02fe67886f7aa0ad01bf83ca9db59317a859106007d593a9247a81775b1686d05a71cf1cee0353b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b73c8203e880a0e69d7897e4379c38a246d249617e608b5d143de3d23005c6c3eec04aa385df828869df9728988e1ffdf90141f9013e800184417d1e4094095e7baea6a6c7c4c2dfeb977efac326af552d8784033eda36b8d8447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006fa05a3119539f6760654232763893401ba07f43b4b2956b9495d9a6462cfac52848bb6a04e301d53bdb64fbada7f2e48b36a0207ec13da3bc9e541d1eea96bd55c94fc52605782335e8f3a1766134b7f447a0c0",
                 "transactions" : [
                     {
                         "data" : "0x447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006fa05a3119539f676065423276389340",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0897055189846d87c6d1f7c07a4a0896d337edcc5b6203d34396f72377a4a8d12a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x41eb5cbacf2d99b856b20b59b3847721d53167ff430f0731a18529549da6ec86",
+        "lastblockhash" : "0x61f835a152263765a1344335b961c326c091e04a2e19edc2bdf87377f675a999",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest590BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest590BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest590BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb73c",
-                    "hash" : "0xbff701cde2bcfd23c625e93ce2dd2024e54c22eb2bf33b2049f027e0b3029d34",
-                    "mixHash" : "0x8a268dd5f46c932d2abb8b3d602880c1ed64ab0adb644ea815f1c749f78cf48c",
-                    "nonce" : "0x5ac9d8e65d77ff5b",
+                    "hash" : "0xef627ce4d6504a11061c1bc4bea3abfde49e851fef3040d5738166eaa39f3a2a",
+                    "mixHash" : "0xde41b99a84807cd25da29137a850e69873e7d7564916eecfe68ff2ae02025880",
+                    "nonce" : "0x3d0cfd0004c277e4",
                     "number" : "0x01",
                     "parentHash" : "0xfc0182073f4f279b39b2eb1854ae4279e385de988bd527009bc882c22d3789dc",
                     "receiptTrie" : "0xad01bf83ca9db59317a859106007d593a9247a81775b1686d05a71cf1cee0353",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xa199d8d2b1e60fff4e8f095ba4db52d038499041c571054ba07f02fe67886f7a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0fc0182073f4f279b39b2eb1854ae4279e385de988bd527009bc882c22d3789dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0bfacf8f5e8c41bf169da54ef7a272d2b86c179bb07f358435cc132cb92925baca0a199d8d2b1e60fff4e8f095ba4db52d038499041c571054ba07f02fe67886f7aa0ad01bf83ca9db59317a859106007d593a9247a81775b1686d05a71cf1cee0353b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b73c8203e880a08a268dd5f46c932d2abb8b3d602880c1ed64ab0adb644ea815f1c749f78cf48c885ac9d8e65d77ff5bf90141f9013e800184417d1e4094095e7baea6a6c7c4c2dfeb977efac326af552d8784033eda36b8d8447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006fa05a3119539f6760654232763893401ba07f43b4b2956b9495d9a6462cfac52848bb6a04e301d53bdb64fbada7f2e48b36a0207ec13da3bc9e541d1eea96bd55c94fc52605782335e8f3a1766134b7f447a0c0",
+                "rlp" : "0xf90344f901fca0fc0182073f4f279b39b2eb1854ae4279e385de988bd527009bc882c22d3789dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0bfacf8f5e8c41bf169da54ef7a272d2b86c179bb07f358435cc132cb92925baca0a199d8d2b1e60fff4e8f095ba4db52d038499041c571054ba07f02fe67886f7aa0ad01bf83ca9db59317a859106007d593a9247a81775b1686d05a71cf1cee0353b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b73c8203e880a0de41b99a84807cd25da29137a850e69873e7d7564916eecfe68ff2ae02025880883d0cfd0004c277e4f90141f9013e800184417d1e4094095e7baea6a6c7c4c2dfeb977efac326af552d8784033eda36b8d8447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006fa05a3119539f6760654232763893401ba07f43b4b2956b9495d9a6462cfac52848bb6a04e301d53bdb64fbada7f2e48b36a0207ec13da3bc9e541d1eea96bd55c94fc52605782335e8f3a1766134b7f447a0c0",
                 "transactions" : [
                     {
                         "data" : "0x447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006fa05a3119539f676065423276389340",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0897055189846d87c6d1f7c07a4a0896d337edcc5b6203d34396f72377a4a8d12a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbff701cde2bcfd23c625e93ce2dd2024e54c22eb2bf33b2049f027e0b3029d34",
+        "lastblockhash" : "0xef627ce4d6504a11061c1bc4bea3abfde49e851fef3040d5738166eaa39f3a2a",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest590BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest590BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest590BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb73c",
-                    "hash" : "0xc6feb64d31480df3edfc04192bb1882cac1735a2b00a11a66d3c3897fe74952b",
-                    "mixHash" : "0x82ac8c7f3c1461e60cc6d2908cc826828fbacced7427cb54a59132bde5dd57f4",
-                    "nonce" : "0x78ec0f56ba758057",
+                    "hash" : "0x4bc61608155ae4854581a8b32fe008e01d63fc2f3b0d58bc83211ef608f17aca",
+                    "mixHash" : "0xf26b0d022bc7f50b1a957f44dc485ebd56909f0078af1041e8fe65d618326907",
+                    "nonce" : "0xbddbdc8dd114dc1d",
                     "number" : "0x01",
                     "parentHash" : "0xfc0182073f4f279b39b2eb1854ae4279e385de988bd527009bc882c22d3789dc",
                     "receiptTrie" : "0xad01bf83ca9db59317a859106007d593a9247a81775b1686d05a71cf1cee0353",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xa199d8d2b1e60fff4e8f095ba4db52d038499041c571054ba07f02fe67886f7a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca0fc0182073f4f279b39b2eb1854ae4279e385de988bd527009bc882c22d3789dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0bfacf8f5e8c41bf169da54ef7a272d2b86c179bb07f358435cc132cb92925baca0a199d8d2b1e60fff4e8f095ba4db52d038499041c571054ba07f02fe67886f7aa0ad01bf83ca9db59317a859106007d593a9247a81775b1686d05a71cf1cee0353b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b73c8203e880a082ac8c7f3c1461e60cc6d2908cc826828fbacced7427cb54a59132bde5dd57f48878ec0f56ba758057f90141f9013e800184417d1e4094095e7baea6a6c7c4c2dfeb977efac326af552d8784033eda36b8d8447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006fa05a3119539f6760654232763893401ba07f43b4b2956b9495d9a6462cfac52848bb6a04e301d53bdb64fbada7f2e48b36a0207ec13da3bc9e541d1eea96bd55c94fc52605782335e8f3a1766134b7f447a0c0",
+                "rlp" : "0xf90344f901fca0fc0182073f4f279b39b2eb1854ae4279e385de988bd527009bc882c22d3789dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0bfacf8f5e8c41bf169da54ef7a272d2b86c179bb07f358435cc132cb92925baca0a199d8d2b1e60fff4e8f095ba4db52d038499041c571054ba07f02fe67886f7aa0ad01bf83ca9db59317a859106007d593a9247a81775b1686d05a71cf1cee0353b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b73c8203e880a0f26b0d022bc7f50b1a957f44dc485ebd56909f0078af1041e8fe65d61832690788bddbdc8dd114dc1df90141f9013e800184417d1e4094095e7baea6a6c7c4c2dfeb977efac326af552d8784033eda36b8d8447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006fa05a3119539f6760654232763893401ba07f43b4b2956b9495d9a6462cfac52848bb6a04e301d53bdb64fbada7f2e48b36a0207ec13da3bc9e541d1eea96bd55c94fc52605782335e8f3a1766134b7f447a0c0",
                 "transactions" : [
                     {
                         "data" : "0x447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006fa05a3119539f676065423276389340",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0897055189846d87c6d1f7c07a4a0896d337edcc5b6203d34396f72377a4a8d12a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc6feb64d31480df3edfc04192bb1882cac1735a2b00a11a66d3c3897fe74952b",
+        "lastblockhash" : "0x4bc61608155ae4854581a8b32fe008e01d63fc2f3b0d58bc83211ef608f17aca",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest591BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest591BC.json
index 5b23f7fac..49c30615e 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest591BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest591BC.json
@@ -2,8 +2,8 @@
     "randomStatetest591BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest591BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest591BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa21a",
-                    "hash" : "0x94756feba924c2a8cd5302b20c39f48c6f3a174604ebb6a87322936bce505493",
-                    "mixHash" : "0x4cff49e31170a5924f787d42dc38803d4c9bee71e691a641784ea21342dcc550",
-                    "nonce" : "0x88f6dffacf40d0dc",
+                    "hash" : "0x6e2941d494e721212cd4969109c8c01ea41597057c031316514e43217f59952e",
+                    "mixHash" : "0xa40a0f6273a54d2ffd1154f22a2ed89abf94e0b3e05acd6d68fc0c25086aa969",
+                    "nonce" : "0xa80d677a92af16a2",
                     "number" : "0x01",
                     "parentHash" : "0x00787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502e",
                     "receiptTrie" : "0x858500082c477d41c3f7e9da9412ab5082fcbb069c16fdc6668e6b5abd8b7879",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca000787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09514ccd9a357762e7888851c58f06ecb265e11e5f6b362818aff8448cfb72d02a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0858500082c477d41c3f7e9da9412ab5082fcbb069c16fdc6668e6b5abd8b7879b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a21a8203e880a04cff49e31170a5924f787d42dc38803d4c9bee71e691a641784ea21342dcc5508888f6dffacf40d0dcf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca000787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09514ccd9a357762e7888851c58f06ecb265e11e5f6b362818aff8448cfb72d02a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0858500082c477d41c3f7e9da9412ab5082fcbb069c16fdc6668e6b5abd8b7879b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a21a8203e880a0a40a0f6273a54d2ffd1154f22a2ed89abf94e0b3e05acd6d68fc0c25086aa96988a80d677a92af16a2f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08829a0e8b2ab725f5b3389d995bad79a5e256efeab20b9865cbd30960d159168a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x94756feba924c2a8cd5302b20c39f48c6f3a174604ebb6a87322936bce505493",
+        "lastblockhash" : "0x6e2941d494e721212cd4969109c8c01ea41597057c031316514e43217f59952e",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest591BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest591BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest591BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa526",
-                    "hash" : "0x3dc79a2584bcece750566bb237d2c6d6e99832e9ed22014ac24c8e3498785951",
-                    "mixHash" : "0xe42ec28e6f486170f9425ac43e0431834661573160ae5ceddd9a202ee80b3f54",
-                    "nonce" : "0x3851ecd478e32f54",
+                    "hash" : "0x205bbd91ce3f543d6e3c9c3e2035b036ce985a9449aec01f6aaa99047add98a7",
+                    "mixHash" : "0x431f61f1879635ec67e444df3e095750e43b4a6a8edaa26fedd01d5b67f355be",
+                    "nonce" : "0xbb4e22c555ced505",
                     "number" : "0x01",
                     "parentHash" : "0x00787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502e",
                     "receiptTrie" : "0xf00f91fee2b9e35246cee19318048be010b4bf680274de853fc75972729abd9e",
-                    "stateRoot" : "0x33880c845245449bf950db13c19c13668cdd49142c043755167a5b3e628ca199",
+                    "stateRoot" : "0x30cbf2ed6078ca6d426afa44aa467ab52045dabf048aee2ed33a6bb9f61003e8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca000787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a033880c845245449bf950db13c19c13668cdd49142c043755167a5b3e628ca199a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f00f91fee2b9e35246cee19318048be010b4bf680274de853fc75972729abd9eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a5268203e880a0e42ec28e6f486170f9425ac43e0431834661573160ae5ceddd9a202ee80b3f54883851ecd478e32f54f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca000787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a030cbf2ed6078ca6d426afa44aa467ab52045dabf048aee2ed33a6bb9f61003e8a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f00f91fee2b9e35246cee19318048be010b4bf680274de853fc75972729abd9eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a5268203e880a0431f61f1879635ec67e444df3e095750e43b4a6a8edaa26fedd01d5b67f355be88bb4e22c555ced505f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08829a0e8b2ab725f5b3389d995bad79a5e256efeab20b9865cbd30960d159168a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3dc79a2584bcece750566bb237d2c6d6e99832e9ed22014ac24c8e3498785951",
+        "lastblockhash" : "0x205bbd91ce3f543d6e3c9c3e2035b036ce985a9449aec01f6aaa99047add98a7",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x4444424131424055",
@@ -235,8 +228,8 @@
     "randomStatetest591BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest591BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest591BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa21a",
-                    "hash" : "0xa9c9ffc0499dc67f1c0a699d229168655f559050cfcdba924cbd4b5302004b55",
-                    "mixHash" : "0x7d05adc04a7052300cfd41681026b221bc505b6c5acfbcb8ad8dd1da8868920e",
-                    "nonce" : "0x962918b7ce0c9293",
+                    "hash" : "0xce66f76be31ccc7721f0ecda1fab5268ed70d4d7973e73a6cdcb1871349152be",
+                    "mixHash" : "0xd2dd403a9055f4edaae9f8c4be8d425790ae84f72449da526706e38340f52607",
+                    "nonce" : "0x9aebe7730dbbdf1f",
                     "number" : "0x01",
                     "parentHash" : "0x00787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502e",
                     "receiptTrie" : "0xd822ecddbd2d999cd93b333b34d132e46011608c1fa7d2e84fb0d75c5f592082",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca000787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fd3caf694f9632f84159e9a8e85fb7a2d820a769bcfbe0daef65862bf88346a9a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d822ecddbd2d999cd93b333b34d132e46011608c1fa7d2e84fb0d75c5f592082b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a21a8203e880a07d05adc04a7052300cfd41681026b221bc505b6c5acfbcb8ad8dd1da8868920e88962918b7ce0c9293f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca000787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fd3caf694f9632f84159e9a8e85fb7a2d820a769bcfbe0daef65862bf88346a9a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d822ecddbd2d999cd93b333b34d132e46011608c1fa7d2e84fb0d75c5f592082b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a21a8203e880a0d2dd403a9055f4edaae9f8c4be8d425790ae84f72449da526706e38340f52607889aebe7730dbbdf1ff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08829a0e8b2ab725f5b3389d995bad79a5e256efeab20b9865cbd30960d159168a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa9c9ffc0499dc67f1c0a699d229168655f559050cfcdba924cbd4b5302004b55",
+        "lastblockhash" : "0xce66f76be31ccc7721f0ecda1fab5268ed70d4d7973e73a6cdcb1871349152be",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest591BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest591BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest591BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa21a",
-                    "hash" : "0x0247845224ba0d073260bda1928cb2c915eb50e8726c98cdbacac369e57d9e71",
-                    "mixHash" : "0x9dd69dce1726c538ff1aceb8ef9716bacf641d9855365251023431516a945a8c",
-                    "nonce" : "0x6cec2978fae6efe2",
+                    "hash" : "0x5f0f4fce2ec5b50442b27e81365c4c24ccabcd603ce33b2b5eee3eaf2097078b",
+                    "mixHash" : "0xaf0bef4c3c54189c7b259ab4befe74ba62664de51699c3310aac20f1c5cf4bdb",
+                    "nonce" : "0xd937be5ce223b64f",
                     "number" : "0x01",
                     "parentHash" : "0x00787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502e",
                     "receiptTrie" : "0xd822ecddbd2d999cd93b333b34d132e46011608c1fa7d2e84fb0d75c5f592082",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca000787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fd3caf694f9632f84159e9a8e85fb7a2d820a769bcfbe0daef65862bf88346a9a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d822ecddbd2d999cd93b333b34d132e46011608c1fa7d2e84fb0d75c5f592082b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a21a8203e880a09dd69dce1726c538ff1aceb8ef9716bacf641d9855365251023431516a945a8c886cec2978fae6efe2f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca000787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fd3caf694f9632f84159e9a8e85fb7a2d820a769bcfbe0daef65862bf88346a9a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d822ecddbd2d999cd93b333b34d132e46011608c1fa7d2e84fb0d75c5f592082b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a21a8203e880a0af0bef4c3c54189c7b259ab4befe74ba62664de51699c3310aac20f1c5cf4bdb88d937be5ce223b64ff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08829a0e8b2ab725f5b3389d995bad79a5e256efeab20b9865cbd30960d159168a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0247845224ba0d073260bda1928cb2c915eb50e8726c98cdbacac369e57d9e71",
+        "lastblockhash" : "0x5f0f4fce2ec5b50442b27e81365c4c24ccabcd603ce33b2b5eee3eaf2097078b",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest591BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest591BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest591BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa09e",
-                    "hash" : "0xf5554fd7fa05b1a5feaf90a1710da4279c26a44b0b6ae7e3b58a90a2cd6e3540",
-                    "mixHash" : "0x82bf630bc7014afa1a09aa2fcab13d1c5a444fc0505bacdd9868ca53e6c94482",
-                    "nonce" : "0x05b99750c430f6d1",
+                    "hash" : "0xe277049be36a309ef11fcd2dbc85f59d6158749a2255e4444621f87547312279",
+                    "mixHash" : "0x50ad1708c36b7af618b260809278dcfe3a1647589520f1453c60ce9c3dfb4d8d",
+                    "nonce" : "0x21279eab36cfacda",
                     "number" : "0x01",
                     "parentHash" : "0x00787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502e",
                     "receiptTrie" : "0x63b3f94fea0203781392a67dc031a64d0023e7a31d96b572ec23dcbd879a08f1",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca000787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a067c80a8a3b70eabcf92b67e437643d1e60d0976d9705eae352e7ad18decf0a78a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa063b3f94fea0203781392a67dc031a64d0023e7a31d96b572ec23dcbd879a08f1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a09e8203e880a082bf630bc7014afa1a09aa2fcab13d1c5a444fc0505bacdd9868ca53e6c944828805b99750c430f6d1f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca000787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a067c80a8a3b70eabcf92b67e437643d1e60d0976d9705eae352e7ad18decf0a78a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa063b3f94fea0203781392a67dc031a64d0023e7a31d96b572ec23dcbd879a08f1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a09e8203e880a050ad1708c36b7af618b260809278dcfe3a1647589520f1453c60ce9c3dfb4d8d8821279eab36cfacdaf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08829a0e8b2ab725f5b3389d995bad79a5e256efeab20b9865cbd30960d159168a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf5554fd7fa05b1a5feaf90a1710da4279c26a44b0b6ae7e3b58a90a2cd6e3540",
+        "lastblockhash" : "0xe277049be36a309ef11fcd2dbc85f59d6158749a2255e4444621f87547312279",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest591BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest591BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest591BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa09e",
-                    "hash" : "0x791ed946d1c8dca654ab068d04230be3c3d1a514c72f3605e6a9a3c70a8643cb",
-                    "mixHash" : "0x6bec2b2bc56ebceef5db4e194f5abb06a3f4eba4ddea3864c52a4325a67820c1",
-                    "nonce" : "0x2859921b304778a6",
+                    "hash" : "0xd7064c917cf8029847851d22c6794b8c6513b5ecb0651d3309779041a657adf5",
+                    "mixHash" : "0x21da3065d77227f467c8e9c74e22036df3b30b027a61017f3fdbd46328ffa46a",
+                    "nonce" : "0x8b3547ca6d4b1199",
                     "number" : "0x01",
                     "parentHash" : "0x00787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502e",
                     "receiptTrie" : "0x63b3f94fea0203781392a67dc031a64d0023e7a31d96b572ec23dcbd879a08f1",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca000787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a067c80a8a3b70eabcf92b67e437643d1e60d0976d9705eae352e7ad18decf0a78a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa063b3f94fea0203781392a67dc031a64d0023e7a31d96b572ec23dcbd879a08f1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a09e8203e880a06bec2b2bc56ebceef5db4e194f5abb06a3f4eba4ddea3864c52a4325a67820c1882859921b304778a6f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca000787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a067c80a8a3b70eabcf92b67e437643d1e60d0976d9705eae352e7ad18decf0a78a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa063b3f94fea0203781392a67dc031a64d0023e7a31d96b572ec23dcbd879a08f1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a09e8203e880a021da3065d77227f467c8e9c74e22036df3b30b027a61017f3fdbd46328ffa46a888b3547ca6d4b1199f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08829a0e8b2ab725f5b3389d995bad79a5e256efeab20b9865cbd30960d159168a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x791ed946d1c8dca654ab068d04230be3c3d1a514c72f3605e6a9a3c70a8643cb",
+        "lastblockhash" : "0xd7064c917cf8029847851d22c6794b8c6513b5ecb0651d3309779041a657adf5",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest593BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest593BC.json
index 88b314200..c3e3c9b5b 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest593BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest593BC.json
@@ -2,8 +2,8 @@
     "randomStatetest593BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest593BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest593BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb47c",
-                    "hash" : "0x44d1e9c23d786d3282f3e449604b0f4b5f4a6e5e6bf0ba7ae35b9b11281c0cf0",
-                    "mixHash" : "0x8a5e62501e0b88160f366498be98ae39e00ef891c79d03b182206543bb9fd8b9",
-                    "nonce" : "0xed090d4375ef0fea",
+                    "hash" : "0xb34e2903d4a156b599ec32b0974b9d8e52a02ced0cc763c0d3d70db48c94ed6b",
+                    "mixHash" : "0xbdd039c7290325d1393dbbc4bafdd0656e28b586657737e7badbc97aff4bf2c0",
+                    "nonce" : "0xcd5ad87c3516b80f",
                     "number" : "0x01",
                     "parentHash" : "0x8fdf477f53fcebff875e66f92b165dfbb5609f515b62f1c2782c06454715c8d6",
                     "receiptTrie" : "0x09fb1c3c98833fe3922fa18af42b9db3d900b1409cdc1b86ba0bd790772460be",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x9cb06d2ce88c48f00a56dfb313055a37d50878163fdbaba20c604d43b550a94b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca08fdf477f53fcebff875e66f92b165dfbb5609f515b62f1c2782c06454715c8d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a078ea2be9f24c377c743c655451b0633670d13845a126c1c6e5fcdaa27b8c190ca09cb06d2ce88c48f00a56dfb313055a37d50878163fdbaba20c604d43b550a94ba009fb1c3c98833fe3922fa18af42b9db3d900b1409cdc1b86ba0bd790772460beb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b47c8203e880a08a5e62501e0b88160f366498be98ae39e00ef891c79d03b182206543bb9fd8b988ed090d4375ef0feaf90141f9013e8001844750f79294095e7baea6a6c7c4c2dfeb977efac326af552d87842f319ca2b8d87f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f81106e9d739b9e608e8b9c8308977c1ba079b84ff497e763a0664ea3fea1459dea2d941fa248e34cca6f1fb968a5b9702ea006f8a71e43fa9d3d5de994514cf45748a2efe56bc2a96ff7a31e938b45cbf822c0",
+                "rlp" : "0xf90344f901fca08fdf477f53fcebff875e66f92b165dfbb5609f515b62f1c2782c06454715c8d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a078ea2be9f24c377c743c655451b0633670d13845a126c1c6e5fcdaa27b8c190ca09cb06d2ce88c48f00a56dfb313055a37d50878163fdbaba20c604d43b550a94ba009fb1c3c98833fe3922fa18af42b9db3d900b1409cdc1b86ba0bd790772460beb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b47c8203e880a0bdd039c7290325d1393dbbc4bafdd0656e28b586657737e7badbc97aff4bf2c088cd5ad87c3516b80ff90141f9013e8001844750f79294095e7baea6a6c7c4c2dfeb977efac326af552d87842f319ca2b8d87f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f81106e9d739b9e608e8b9c8308977c1ba079b84ff497e763a0664ea3fea1459dea2d941fa248e34cca6f1fb968a5b9702ea006f8a71e43fa9d3d5de994514cf45748a2efe56bc2a96ff7a31e938b45cbf822c0",
                 "transactions" : [
                     {
                         "data" : "0x7f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f81106e9d739b9e608e8b9c8308977c",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f929243c759d118d4254d60c49e3bf72276b981374d6aba2cb447f81ea82f6d5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x44d1e9c23d786d3282f3e449604b0f4b5f4a6e5e6bf0ba7ae35b9b11281c0cf0",
+        "lastblockhash" : "0xb34e2903d4a156b599ec32b0974b9d8e52a02ced0cc763c0d3d70db48c94ed6b",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest593BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest593BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest593BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb788",
-                    "hash" : "0x62af10bf15bb7031d6e2a53c505c104234186831381c79dfc2eff8d2ceb06fb8",
-                    "mixHash" : "0x7467ef3b061f4904c4776f213040d556dfac0e64f05f36c00bf4bf211ff50ba3",
-                    "nonce" : "0x153187b1df982206",
+                    "hash" : "0x3172df27b2c430553a36e5b85e550b2bff2023cc7c8d7530a8dbf9a587195977",
+                    "mixHash" : "0xbfa06b69c4f6cfdff4372c9a500a0e7cce80e0bccf5b15eef97b05f98300fcc9",
+                    "nonce" : "0x3e9e6a93912e7220",
                     "number" : "0x01",
                     "parentHash" : "0x8fdf477f53fcebff875e66f92b165dfbb5609f515b62f1c2782c06454715c8d6",
                     "receiptTrie" : "0x55b8f33fdb33a374d35eda3d3661e36426c3620d8116dae7ae8e7a448bc09984",
-                    "stateRoot" : "0x379d74cf3e5829324a0cf403be5767fd7c2049384aa4266934e22a127222cb22",
+                    "stateRoot" : "0xb130b756ea4c308aff0358e267f738571bbae1166fa77cdbcd30b982d38517a5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9cb06d2ce88c48f00a56dfb313055a37d50878163fdbaba20c604d43b550a94b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca08fdf477f53fcebff875e66f92b165dfbb5609f515b62f1c2782c06454715c8d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0379d74cf3e5829324a0cf403be5767fd7c2049384aa4266934e22a127222cb22a09cb06d2ce88c48f00a56dfb313055a37d50878163fdbaba20c604d43b550a94ba055b8f33fdb33a374d35eda3d3661e36426c3620d8116dae7ae8e7a448bc09984b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b7888203e880a07467ef3b061f4904c4776f213040d556dfac0e64f05f36c00bf4bf211ff50ba388153187b1df982206f90141f9013e8001844750f79294095e7baea6a6c7c4c2dfeb977efac326af552d87842f319ca2b8d87f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f81106e9d739b9e608e8b9c8308977c1ba079b84ff497e763a0664ea3fea1459dea2d941fa248e34cca6f1fb968a5b9702ea006f8a71e43fa9d3d5de994514cf45748a2efe56bc2a96ff7a31e938b45cbf822c0",
+                "rlp" : "0xf90344f901fca08fdf477f53fcebff875e66f92b165dfbb5609f515b62f1c2782c06454715c8d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b130b756ea4c308aff0358e267f738571bbae1166fa77cdbcd30b982d38517a5a09cb06d2ce88c48f00a56dfb313055a37d50878163fdbaba20c604d43b550a94ba055b8f33fdb33a374d35eda3d3661e36426c3620d8116dae7ae8e7a448bc09984b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b7888203e880a0bfa06b69c4f6cfdff4372c9a500a0e7cce80e0bccf5b15eef97b05f98300fcc9883e9e6a93912e7220f90141f9013e8001844750f79294095e7baea6a6c7c4c2dfeb977efac326af552d87842f319ca2b8d87f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f81106e9d739b9e608e8b9c8308977c1ba079b84ff497e763a0664ea3fea1459dea2d941fa248e34cca6f1fb968a5b9702ea006f8a71e43fa9d3d5de994514cf45748a2efe56bc2a96ff7a31e938b45cbf822c0",
                 "transactions" : [
                     {
                         "data" : "0x7f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f81106e9d739b9e608e8b9c8308977c",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f929243c759d118d4254d60c49e3bf72276b981374d6aba2cb447f81ea82f6d5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x62af10bf15bb7031d6e2a53c505c104234186831381c79dfc2eff8d2ceb06fb8",
+        "lastblockhash" : "0x3172df27b2c430553a36e5b85e550b2bff2023cc7c8d7530a8dbf9a587195977",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x2f319ca2",
                 "code" : "0x7f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f81106e9d739b9e608e8b9c8308977c5560005155",
@@ -235,8 +228,8 @@
     "randomStatetest593BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest593BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest593BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb47c",
-                    "hash" : "0xc8addc8a8518d1c2c4ed900874f7172ab7ceecd26e4a19c400dc1bcc6e98ea1b",
-                    "mixHash" : "0x7269a701ca9f2c5cf0618cad75ae420fc4856cdece36be2bfc110d007b3a478d",
-                    "nonce" : "0x1736c7bc46c1772d",
+                    "hash" : "0x10d1d27ad1da02abc38fb6c5cad434aaf909f6d39f97b494ae10adf3fb6f750d",
+                    "mixHash" : "0x65fe123aea7bd0deaff499565b875768f11e33a7fe2bfe5e7d8d28f8ba77a5e8",
+                    "nonce" : "0xca991ddddb10efd4",
                     "number" : "0x01",
                     "parentHash" : "0x8fdf477f53fcebff875e66f92b165dfbb5609f515b62f1c2782c06454715c8d6",
                     "receiptTrie" : "0x49f32bc313c84e8ed595717d0f3d6d2e5cfdd7d1c1259bff2892da161579950d",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0x9cb06d2ce88c48f00a56dfb313055a37d50878163fdbaba20c604d43b550a94b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca08fdf477f53fcebff875e66f92b165dfbb5609f515b62f1c2782c06454715c8d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03cea926a3f2c4be6a8a4e5dea916cb26d0aeaca36a9e785014d0da993f0a8898a09cb06d2ce88c48f00a56dfb313055a37d50878163fdbaba20c604d43b550a94ba049f32bc313c84e8ed595717d0f3d6d2e5cfdd7d1c1259bff2892da161579950db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b47c8203e880a07269a701ca9f2c5cf0618cad75ae420fc4856cdece36be2bfc110d007b3a478d881736c7bc46c1772df90141f9013e8001844750f79294095e7baea6a6c7c4c2dfeb977efac326af552d87842f319ca2b8d87f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f81106e9d739b9e608e8b9c8308977c1ba079b84ff497e763a0664ea3fea1459dea2d941fa248e34cca6f1fb968a5b9702ea006f8a71e43fa9d3d5de994514cf45748a2efe56bc2a96ff7a31e938b45cbf822c0",
+                "rlp" : "0xf90344f901fca08fdf477f53fcebff875e66f92b165dfbb5609f515b62f1c2782c06454715c8d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03cea926a3f2c4be6a8a4e5dea916cb26d0aeaca36a9e785014d0da993f0a8898a09cb06d2ce88c48f00a56dfb313055a37d50878163fdbaba20c604d43b550a94ba049f32bc313c84e8ed595717d0f3d6d2e5cfdd7d1c1259bff2892da161579950db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b47c8203e880a065fe123aea7bd0deaff499565b875768f11e33a7fe2bfe5e7d8d28f8ba77a5e888ca991ddddb10efd4f90141f9013e8001844750f79294095e7baea6a6c7c4c2dfeb977efac326af552d87842f319ca2b8d87f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f81106e9d739b9e608e8b9c8308977c1ba079b84ff497e763a0664ea3fea1459dea2d941fa248e34cca6f1fb968a5b9702ea006f8a71e43fa9d3d5de994514cf45748a2efe56bc2a96ff7a31e938b45cbf822c0",
                 "transactions" : [
                     {
                         "data" : "0x7f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f81106e9d739b9e608e8b9c8308977c",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f929243c759d118d4254d60c49e3bf72276b981374d6aba2cb447f81ea82f6d5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc8addc8a8518d1c2c4ed900874f7172ab7ceecd26e4a19c400dc1bcc6e98ea1b",
+        "lastblockhash" : "0x10d1d27ad1da02abc38fb6c5cad434aaf909f6d39f97b494ae10adf3fb6f750d",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest593BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest593BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest593BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb47c",
-                    "hash" : "0x8d55e995f0a48a947700af166c769432a4d44b05e76326b4856f346b69a82da8",
-                    "mixHash" : "0x733950c90447455409bed8dd65115026598b940b76915b5720eb9791b8f4da81",
-                    "nonce" : "0xe2b595d4f545994d",
+                    "hash" : "0x08ec68a89e6208701727ffdfbc9f44795975e55d6b65cddb15caf4665991ad42",
+                    "mixHash" : "0xd0b296bd1e5e6bef684d34119b74fda569295323195d1ce461c4df62bc71d74d",
+                    "nonce" : "0xe7d9570e3dd5719d",
                     "number" : "0x01",
                     "parentHash" : "0x8fdf477f53fcebff875e66f92b165dfbb5609f515b62f1c2782c06454715c8d6",
                     "receiptTrie" : "0x49f32bc313c84e8ed595717d0f3d6d2e5cfdd7d1c1259bff2892da161579950d",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0x9cb06d2ce88c48f00a56dfb313055a37d50878163fdbaba20c604d43b550a94b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca08fdf477f53fcebff875e66f92b165dfbb5609f515b62f1c2782c06454715c8d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03cea926a3f2c4be6a8a4e5dea916cb26d0aeaca36a9e785014d0da993f0a8898a09cb06d2ce88c48f00a56dfb313055a37d50878163fdbaba20c604d43b550a94ba049f32bc313c84e8ed595717d0f3d6d2e5cfdd7d1c1259bff2892da161579950db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b47c8203e880a0733950c90447455409bed8dd65115026598b940b76915b5720eb9791b8f4da8188e2b595d4f545994df90141f9013e8001844750f79294095e7baea6a6c7c4c2dfeb977efac326af552d87842f319ca2b8d87f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f81106e9d739b9e608e8b9c8308977c1ba079b84ff497e763a0664ea3fea1459dea2d941fa248e34cca6f1fb968a5b9702ea006f8a71e43fa9d3d5de994514cf45748a2efe56bc2a96ff7a31e938b45cbf822c0",
+                "rlp" : "0xf90344f901fca08fdf477f53fcebff875e66f92b165dfbb5609f515b62f1c2782c06454715c8d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03cea926a3f2c4be6a8a4e5dea916cb26d0aeaca36a9e785014d0da993f0a8898a09cb06d2ce88c48f00a56dfb313055a37d50878163fdbaba20c604d43b550a94ba049f32bc313c84e8ed595717d0f3d6d2e5cfdd7d1c1259bff2892da161579950db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b47c8203e880a0d0b296bd1e5e6bef684d34119b74fda569295323195d1ce461c4df62bc71d74d88e7d9570e3dd5719df90141f9013e8001844750f79294095e7baea6a6c7c4c2dfeb977efac326af552d87842f319ca2b8d87f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f81106e9d739b9e608e8b9c8308977c1ba079b84ff497e763a0664ea3fea1459dea2d941fa248e34cca6f1fb968a5b9702ea006f8a71e43fa9d3d5de994514cf45748a2efe56bc2a96ff7a31e938b45cbf822c0",
                 "transactions" : [
                     {
                         "data" : "0x7f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f81106e9d739b9e608e8b9c8308977c",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f929243c759d118d4254d60c49e3bf72276b981374d6aba2cb447f81ea82f6d5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8d55e995f0a48a947700af166c769432a4d44b05e76326b4856f346b69a82da8",
+        "lastblockhash" : "0x08ec68a89e6208701727ffdfbc9f44795975e55d6b65cddb15caf4665991ad42",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest593BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest593BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest593BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb47c",
-                    "hash" : "0x1d0d93de7665cdbfc91bc5d8e75c628c6300727b13a9ec1f408ab4b4719b96a2",
-                    "mixHash" : "0x4a0bb4fee7753d37a27a11b18bb0a7cc278c905a8173d4f97947d15026583eb7",
-                    "nonce" : "0xe5801470057cce7b",
+                    "hash" : "0xfc61f46094cbfb96767b400d16c92f9460cf9feb6ed1714135606f08f0a6b740",
+                    "mixHash" : "0x2e1f8d388d503ff67861ecaea9325618e8003ea7e0b5ce2c30f439412dd4eb6b",
+                    "nonce" : "0x860204d0ea52f883",
                     "number" : "0x01",
                     "parentHash" : "0x8fdf477f53fcebff875e66f92b165dfbb5609f515b62f1c2782c06454715c8d6",
                     "receiptTrie" : "0x49f32bc313c84e8ed595717d0f3d6d2e5cfdd7d1c1259bff2892da161579950d",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0x9cb06d2ce88c48f00a56dfb313055a37d50878163fdbaba20c604d43b550a94b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca08fdf477f53fcebff875e66f92b165dfbb5609f515b62f1c2782c06454715c8d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03cea926a3f2c4be6a8a4e5dea916cb26d0aeaca36a9e785014d0da993f0a8898a09cb06d2ce88c48f00a56dfb313055a37d50878163fdbaba20c604d43b550a94ba049f32bc313c84e8ed595717d0f3d6d2e5cfdd7d1c1259bff2892da161579950db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b47c8203e880a04a0bb4fee7753d37a27a11b18bb0a7cc278c905a8173d4f97947d15026583eb788e5801470057cce7bf90141f9013e8001844750f79294095e7baea6a6c7c4c2dfeb977efac326af552d87842f319ca2b8d87f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f81106e9d739b9e608e8b9c8308977c1ba079b84ff497e763a0664ea3fea1459dea2d941fa248e34cca6f1fb968a5b9702ea006f8a71e43fa9d3d5de994514cf45748a2efe56bc2a96ff7a31e938b45cbf822c0",
+                "rlp" : "0xf90344f901fca08fdf477f53fcebff875e66f92b165dfbb5609f515b62f1c2782c06454715c8d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03cea926a3f2c4be6a8a4e5dea916cb26d0aeaca36a9e785014d0da993f0a8898a09cb06d2ce88c48f00a56dfb313055a37d50878163fdbaba20c604d43b550a94ba049f32bc313c84e8ed595717d0f3d6d2e5cfdd7d1c1259bff2892da161579950db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b47c8203e880a02e1f8d388d503ff67861ecaea9325618e8003ea7e0b5ce2c30f439412dd4eb6b88860204d0ea52f883f90141f9013e8001844750f79294095e7baea6a6c7c4c2dfeb977efac326af552d87842f319ca2b8d87f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f81106e9d739b9e608e8b9c8308977c1ba079b84ff497e763a0664ea3fea1459dea2d941fa248e34cca6f1fb968a5b9702ea006f8a71e43fa9d3d5de994514cf45748a2efe56bc2a96ff7a31e938b45cbf822c0",
                 "transactions" : [
                     {
                         "data" : "0x7f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f81106e9d739b9e608e8b9c8308977c",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f929243c759d118d4254d60c49e3bf72276b981374d6aba2cb447f81ea82f6d5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1d0d93de7665cdbfc91bc5d8e75c628c6300727b13a9ec1f408ab4b4719b96a2",
+        "lastblockhash" : "0xfc61f46094cbfb96767b400d16c92f9460cf9feb6ed1714135606f08f0a6b740",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest593BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest593BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest593BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb47c",
-                    "hash" : "0xb0c0704d95e66d0813f379a91b1de3afa69cbc1e5a461edc96bedfa03f08e6eb",
-                    "mixHash" : "0x260b772c342ece5cef9367f7e8db6ed59e73d6ae71af64ac319bd1a2815f35ca",
-                    "nonce" : "0x43b5281619629288",
+                    "hash" : "0xbfa55c20e841ce291d6bb8af3fea0627f5eeeb29c58e3d76393cac1e2483c24d",
+                    "mixHash" : "0xd4ce665a149e9945d58c2aeb7e041763c914f6e72821f324b056a861f956566b",
+                    "nonce" : "0x59f9b3c459943fba",
                     "number" : "0x01",
                     "parentHash" : "0x8fdf477f53fcebff875e66f92b165dfbb5609f515b62f1c2782c06454715c8d6",
                     "receiptTrie" : "0x49f32bc313c84e8ed595717d0f3d6d2e5cfdd7d1c1259bff2892da161579950d",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0x9cb06d2ce88c48f00a56dfb313055a37d50878163fdbaba20c604d43b550a94b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca08fdf477f53fcebff875e66f92b165dfbb5609f515b62f1c2782c06454715c8d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03cea926a3f2c4be6a8a4e5dea916cb26d0aeaca36a9e785014d0da993f0a8898a09cb06d2ce88c48f00a56dfb313055a37d50878163fdbaba20c604d43b550a94ba049f32bc313c84e8ed595717d0f3d6d2e5cfdd7d1c1259bff2892da161579950db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b47c8203e880a0260b772c342ece5cef9367f7e8db6ed59e73d6ae71af64ac319bd1a2815f35ca8843b5281619629288f90141f9013e8001844750f79294095e7baea6a6c7c4c2dfeb977efac326af552d87842f319ca2b8d87f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f81106e9d739b9e608e8b9c8308977c1ba079b84ff497e763a0664ea3fea1459dea2d941fa248e34cca6f1fb968a5b9702ea006f8a71e43fa9d3d5de994514cf45748a2efe56bc2a96ff7a31e938b45cbf822c0",
+                "rlp" : "0xf90344f901fca08fdf477f53fcebff875e66f92b165dfbb5609f515b62f1c2782c06454715c8d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03cea926a3f2c4be6a8a4e5dea916cb26d0aeaca36a9e785014d0da993f0a8898a09cb06d2ce88c48f00a56dfb313055a37d50878163fdbaba20c604d43b550a94ba049f32bc313c84e8ed595717d0f3d6d2e5cfdd7d1c1259bff2892da161579950db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b47c8203e880a0d4ce665a149e9945d58c2aeb7e041763c914f6e72821f324b056a861f956566b8859f9b3c459943fbaf90141f9013e8001844750f79294095e7baea6a6c7c4c2dfeb977efac326af552d87842f319ca2b8d87f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f81106e9d739b9e608e8b9c8308977c1ba079b84ff497e763a0664ea3fea1459dea2d941fa248e34cca6f1fb968a5b9702ea006f8a71e43fa9d3d5de994514cf45748a2efe56bc2a96ff7a31e938b45cbf822c0",
                 "transactions" : [
                     {
                         "data" : "0x7f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f81106e9d739b9e608e8b9c8308977c",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f929243c759d118d4254d60c49e3bf72276b981374d6aba2cb447f81ea82f6d5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb0c0704d95e66d0813f379a91b1de3afa69cbc1e5a461edc96bedfa03f08e6eb",
+        "lastblockhash" : "0xbfa55c20e841ce291d6bb8af3fea0627f5eeeb29c58e3d76393cac1e2483c24d",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest595BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest595BC.json
index cce30ce87..42b5798c6 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest595BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest595BC.json
@@ -2,8 +2,8 @@
     "randomStatetest595BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest595BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest595BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x7f35",
-                    "hash" : "0x08aa1cba644684426215675092e527a9ff475a9eacdca28a0543cd64bc77f886",
-                    "mixHash" : "0xd74b9208f2ad8f1754f0c4374bd6ad75fda82e7492688327a06f35ea86c1c36b",
-                    "nonce" : "0x1910f44fda1b5154",
+                    "hash" : "0xc7c024014e786ba3df274c09e869dd90d97a69cf10464f3b4531712dace293c0",
+                    "mixHash" : "0x97e97dca3a5581ac6dea986664cbf8b64830413a7bb3ca4ecbeb8cc2805fe3aa",
+                    "nonce" : "0xa2cffdc832766d2d",
                     "number" : "0x01",
                     "parentHash" : "0xfc87809d054353e1aa3872f553b876a1cb5dd9af048c1071d5f26cb05ff0ab39",
                     "receiptTrie" : "0xf5bba5884a99ecdaf6c7d09d0ba9cd940710c2e314517e1faa4f2b39034f8039",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x5768801d1606cc06a31586808396b3e183252dee47d7f9c9b3b1d06a27ed94b0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90356f901fca0fc87809d054353e1aa3872f553b876a1cb5dd9af048c1071d5f26cb05ff0ab39a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a075d0661e3a2584b84415ae9c9baebe901c60ed8400e512e41b3e058f74875a62a05768801d1606cc06a31586808396b3e183252dee47d7f9c9b3b1d06a27ed94b0a0f5bba5884a99ecdaf6c7d09d0ba9cd940710c2e314517e1faa4f2b39034f8039b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff827f358203e880a0d74b9208f2ad8f1754f0c4374bd6ad75fda82e7492688327a06f35ea86c1c36b881910f44fda1b5154f90153f901508001841ed473b994095e7baea6a6c7c4c2dfeb977efac326af552d87842eb7a769b8ea7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03091ca07262b0bbd37edc750619c4f896f2783d0663397773439d1d1e22f35e92f707cba07794da0fd635ef6f114651318cf7f48f6281a6337ae7c8c77b0e7996280f6ac0c0",
+                "rlp" : "0xf90356f901fca0fc87809d054353e1aa3872f553b876a1cb5dd9af048c1071d5f26cb05ff0ab39a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a075d0661e3a2584b84415ae9c9baebe901c60ed8400e512e41b3e058f74875a62a05768801d1606cc06a31586808396b3e183252dee47d7f9c9b3b1d06a27ed94b0a0f5bba5884a99ecdaf6c7d09d0ba9cd940710c2e314517e1faa4f2b39034f8039b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff827f358203e880a097e97dca3a5581ac6dea986664cbf8b64830413a7bb3ca4ecbeb8cc2805fe3aa88a2cffdc832766d2df90153f901508001841ed473b994095e7baea6a6c7c4c2dfeb977efac326af552d87842eb7a769b8ea7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03091ca07262b0bbd37edc750619c4f896f2783d0663397773439d1d1e22f35e92f707cba07794da0fd635ef6f114651318cf7f48f6281a6337ae7c8c77b0e7996280f6ac0c0",
                 "transactions" : [
                     {
                         "data" : "0x7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0309",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a004127390c5abd2332dfff87b78c973377e88d1494fa8592baf41706457bf235fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x08aa1cba644684426215675092e527a9ff475a9eacdca28a0543cd64bc77f886",
+        "lastblockhash" : "0xc7c024014e786ba3df274c09e869dd90d97a69cf10464f3b4531712dace293c0",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest595BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest595BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest595BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8241",
-                    "hash" : "0x1c64adb8741d3a4de57f82997e98fd80138d5f32e2077017dbc028fb342d0dbf",
-                    "mixHash" : "0x32523b1142a69db0fa33175bc1458e91573a85a93d71d700a315613d6a12706f",
-                    "nonce" : "0x7c41ee4de24ec1d9",
+                    "hash" : "0x13ca0cf9b7ffea468ab3043b4731fac61b61010610e881726f8a5f5cee47d912",
+                    "mixHash" : "0x0e6292b06372560f239bfa1ee6fe003dd765df2a16445fdbfd921a74721284d1",
+                    "nonce" : "0x998a9f73c10e0049",
                     "number" : "0x01",
                     "parentHash" : "0xfc87809d054353e1aa3872f553b876a1cb5dd9af048c1071d5f26cb05ff0ab39",
                     "receiptTrie" : "0x4e46b4c84a0ffd0a83e0e70e8360ca7b637702b7d36bff472538fa617eb57a4a",
-                    "stateRoot" : "0xeae6092fadbea050b0ba81358a357af7fbe32bfa8076cc676e78671b8d282e58",
+                    "stateRoot" : "0xef9ae49184671716e901e9b9b3a1964f58df40ce4b9c0338e6387b5de78aea8b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5768801d1606cc06a31586808396b3e183252dee47d7f9c9b3b1d06a27ed94b0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90356f901fca0fc87809d054353e1aa3872f553b876a1cb5dd9af048c1071d5f26cb05ff0ab39a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0eae6092fadbea050b0ba81358a357af7fbe32bfa8076cc676e78671b8d282e58a05768801d1606cc06a31586808396b3e183252dee47d7f9c9b3b1d06a27ed94b0a04e46b4c84a0ffd0a83e0e70e8360ca7b637702b7d36bff472538fa617eb57a4ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8282418203e880a032523b1142a69db0fa33175bc1458e91573a85a93d71d700a315613d6a12706f887c41ee4de24ec1d9f90153f901508001841ed473b994095e7baea6a6c7c4c2dfeb977efac326af552d87842eb7a769b8ea7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03091ca07262b0bbd37edc750619c4f896f2783d0663397773439d1d1e22f35e92f707cba07794da0fd635ef6f114651318cf7f48f6281a6337ae7c8c77b0e7996280f6ac0c0",
+                "rlp" : "0xf90356f901fca0fc87809d054353e1aa3872f553b876a1cb5dd9af048c1071d5f26cb05ff0ab39a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ef9ae49184671716e901e9b9b3a1964f58df40ce4b9c0338e6387b5de78aea8ba05768801d1606cc06a31586808396b3e183252dee47d7f9c9b3b1d06a27ed94b0a04e46b4c84a0ffd0a83e0e70e8360ca7b637702b7d36bff472538fa617eb57a4ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8282418203e880a00e6292b06372560f239bfa1ee6fe003dd765df2a16445fdbfd921a74721284d188998a9f73c10e0049f90153f901508001841ed473b994095e7baea6a6c7c4c2dfeb977efac326af552d87842eb7a769b8ea7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03091ca07262b0bbd37edc750619c4f896f2783d0663397773439d1d1e22f35e92f707cba07794da0fd635ef6f114651318cf7f48f6281a6337ae7c8c77b0e7996280f6ac0c0",
                 "transactions" : [
                     {
                         "data" : "0x7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0309",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a004127390c5abd2332dfff87b78c973377e88d1494fa8592baf41706457bf235fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1c64adb8741d3a4de57f82997e98fd80138d5f32e2077017dbc028fb342d0dbf",
+        "lastblockhash" : "0x13ca0cf9b7ffea468ab3043b4731fac61b61010610e881726f8a5f5cee47d912",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x2eb7a769",
                 "code" : "0x7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe030960005155",
@@ -233,8 +226,8 @@
     "randomStatetest595BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest595BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest595BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x7f35",
-                    "hash" : "0xf97abe182c2dece471c0c3c99dd1cc8ee5ec78a745c907704e240b6f7ce9a412",
-                    "mixHash" : "0x96a57733e94d52e75a0d067fe053af72d81b2db1d556b9e98e70d73f0070b9b7",
-                    "nonce" : "0x39f6c99d4469d7c1",
+                    "hash" : "0x9f639d1fc1a241b7d5ada587a25767a3ebdedddcc038653f050bae44520648ea",
+                    "mixHash" : "0x228783e9602f81db050f1460fb735ef70dc3aee5894c6c907527113aa3af9f81",
+                    "nonce" : "0x8e75094ccde0d079",
                     "number" : "0x01",
                     "parentHash" : "0xfc87809d054353e1aa3872f553b876a1cb5dd9af048c1071d5f26cb05ff0ab39",
                     "receiptTrie" : "0xa098ba63be095028957c1f2a6c3bfe35eafdd6f55fc982cd88b55c6c669574d5",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0x5768801d1606cc06a31586808396b3e183252dee47d7f9c9b3b1d06a27ed94b0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90356f901fca0fc87809d054353e1aa3872f553b876a1cb5dd9af048c1071d5f26cb05ff0ab39a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fceaf8c664ea5eb152e651efc4f1fe8e3c015364104791fe0ac8037f4a0df7cba05768801d1606cc06a31586808396b3e183252dee47d7f9c9b3b1d06a27ed94b0a0a098ba63be095028957c1f2a6c3bfe35eafdd6f55fc982cd88b55c6c669574d5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff827f358203e880a096a57733e94d52e75a0d067fe053af72d81b2db1d556b9e98e70d73f0070b9b78839f6c99d4469d7c1f90153f901508001841ed473b994095e7baea6a6c7c4c2dfeb977efac326af552d87842eb7a769b8ea7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03091ca07262b0bbd37edc750619c4f896f2783d0663397773439d1d1e22f35e92f707cba07794da0fd635ef6f114651318cf7f48f6281a6337ae7c8c77b0e7996280f6ac0c0",
+                "rlp" : "0xf90356f901fca0fc87809d054353e1aa3872f553b876a1cb5dd9af048c1071d5f26cb05ff0ab39a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fceaf8c664ea5eb152e651efc4f1fe8e3c015364104791fe0ac8037f4a0df7cba05768801d1606cc06a31586808396b3e183252dee47d7f9c9b3b1d06a27ed94b0a0a098ba63be095028957c1f2a6c3bfe35eafdd6f55fc982cd88b55c6c669574d5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff827f358203e880a0228783e9602f81db050f1460fb735ef70dc3aee5894c6c907527113aa3af9f81888e75094ccde0d079f90153f901508001841ed473b994095e7baea6a6c7c4c2dfeb977efac326af552d87842eb7a769b8ea7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03091ca07262b0bbd37edc750619c4f896f2783d0663397773439d1d1e22f35e92f707cba07794da0fd635ef6f114651318cf7f48f6281a6337ae7c8c77b0e7996280f6ac0c0",
                 "transactions" : [
                     {
                         "data" : "0x7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0309",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a004127390c5abd2332dfff87b78c973377e88d1494fa8592baf41706457bf235fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf97abe182c2dece471c0c3c99dd1cc8ee5ec78a745c907704e240b6f7ce9a412",
+        "lastblockhash" : "0x9f639d1fc1a241b7d5ada587a25767a3ebdedddcc038653f050bae44520648ea",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest595BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest595BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest595BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x7f35",
-                    "hash" : "0xe98aa56b7594720ef2ac79d0d2de7272a88dde041f20c983a742c1b742aa7370",
-                    "mixHash" : "0xf378ffffe37181c916e03c115fb8e8fe1c7c28ec152e0001455c3f0457ad6c3c",
-                    "nonce" : "0x978900439b6a6d85",
+                    "hash" : "0x7793d938747f938b8afe467d0a881b07c87411219bd5c5b3457a834ab4eca020",
+                    "mixHash" : "0x33a2c9858fb80af484cbd5399dde46aa3c0c0e2eb8f7284f383e008dfeeeee5f",
+                    "nonce" : "0x329454ff303e9b4e",
                     "number" : "0x01",
                     "parentHash" : "0xfc87809d054353e1aa3872f553b876a1cb5dd9af048c1071d5f26cb05ff0ab39",
                     "receiptTrie" : "0xa098ba63be095028957c1f2a6c3bfe35eafdd6f55fc982cd88b55c6c669574d5",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0x5768801d1606cc06a31586808396b3e183252dee47d7f9c9b3b1d06a27ed94b0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90356f901fca0fc87809d054353e1aa3872f553b876a1cb5dd9af048c1071d5f26cb05ff0ab39a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fceaf8c664ea5eb152e651efc4f1fe8e3c015364104791fe0ac8037f4a0df7cba05768801d1606cc06a31586808396b3e183252dee47d7f9c9b3b1d06a27ed94b0a0a098ba63be095028957c1f2a6c3bfe35eafdd6f55fc982cd88b55c6c669574d5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff827f358203e880a0f378ffffe37181c916e03c115fb8e8fe1c7c28ec152e0001455c3f0457ad6c3c88978900439b6a6d85f90153f901508001841ed473b994095e7baea6a6c7c4c2dfeb977efac326af552d87842eb7a769b8ea7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03091ca07262b0bbd37edc750619c4f896f2783d0663397773439d1d1e22f35e92f707cba07794da0fd635ef6f114651318cf7f48f6281a6337ae7c8c77b0e7996280f6ac0c0",
+                "rlp" : "0xf90356f901fca0fc87809d054353e1aa3872f553b876a1cb5dd9af048c1071d5f26cb05ff0ab39a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fceaf8c664ea5eb152e651efc4f1fe8e3c015364104791fe0ac8037f4a0df7cba05768801d1606cc06a31586808396b3e183252dee47d7f9c9b3b1d06a27ed94b0a0a098ba63be095028957c1f2a6c3bfe35eafdd6f55fc982cd88b55c6c669574d5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff827f358203e880a033a2c9858fb80af484cbd5399dde46aa3c0c0e2eb8f7284f383e008dfeeeee5f88329454ff303e9b4ef90153f901508001841ed473b994095e7baea6a6c7c4c2dfeb977efac326af552d87842eb7a769b8ea7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03091ca07262b0bbd37edc750619c4f896f2783d0663397773439d1d1e22f35e92f707cba07794da0fd635ef6f114651318cf7f48f6281a6337ae7c8c77b0e7996280f6ac0c0",
                 "transactions" : [
                     {
                         "data" : "0x7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0309",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a004127390c5abd2332dfff87b78c973377e88d1494fa8592baf41706457bf235fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe98aa56b7594720ef2ac79d0d2de7272a88dde041f20c983a742c1b742aa7370",
+        "lastblockhash" : "0x7793d938747f938b8afe467d0a881b07c87411219bd5c5b3457a834ab4eca020",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest595BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest595BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest595BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x7f35",
-                    "hash" : "0x27959fca7312b03340b2e3cdb2feb054465a39b25f849bebe08c77e61282cf0a",
-                    "mixHash" : "0xd49d52f377f02dc44c8360c6a74496e3c3ec33c550c1f67ecb69f98d88280c8d",
-                    "nonce" : "0x2937417de61aa280",
+                    "hash" : "0x652677c8adc3e0be4ce94a4d3f7d934fe3cfc80cbf0f632df6891d87755e1faa",
+                    "mixHash" : "0xfa0fea746abe5160c85c62ff04d1dbfa40e81e817416ad5340735c143650f7e4",
+                    "nonce" : "0x87177484cea61a79",
                     "number" : "0x01",
                     "parentHash" : "0xfc87809d054353e1aa3872f553b876a1cb5dd9af048c1071d5f26cb05ff0ab39",
                     "receiptTrie" : "0xa098ba63be095028957c1f2a6c3bfe35eafdd6f55fc982cd88b55c6c669574d5",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0x5768801d1606cc06a31586808396b3e183252dee47d7f9c9b3b1d06a27ed94b0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90356f901fca0fc87809d054353e1aa3872f553b876a1cb5dd9af048c1071d5f26cb05ff0ab39a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fceaf8c664ea5eb152e651efc4f1fe8e3c015364104791fe0ac8037f4a0df7cba05768801d1606cc06a31586808396b3e183252dee47d7f9c9b3b1d06a27ed94b0a0a098ba63be095028957c1f2a6c3bfe35eafdd6f55fc982cd88b55c6c669574d5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff827f358203e880a0d49d52f377f02dc44c8360c6a74496e3c3ec33c550c1f67ecb69f98d88280c8d882937417de61aa280f90153f901508001841ed473b994095e7baea6a6c7c4c2dfeb977efac326af552d87842eb7a769b8ea7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03091ca07262b0bbd37edc750619c4f896f2783d0663397773439d1d1e22f35e92f707cba07794da0fd635ef6f114651318cf7f48f6281a6337ae7c8c77b0e7996280f6ac0c0",
+                "rlp" : "0xf90356f901fca0fc87809d054353e1aa3872f553b876a1cb5dd9af048c1071d5f26cb05ff0ab39a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fceaf8c664ea5eb152e651efc4f1fe8e3c015364104791fe0ac8037f4a0df7cba05768801d1606cc06a31586808396b3e183252dee47d7f9c9b3b1d06a27ed94b0a0a098ba63be095028957c1f2a6c3bfe35eafdd6f55fc982cd88b55c6c669574d5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff827f358203e880a0fa0fea746abe5160c85c62ff04d1dbfa40e81e817416ad5340735c143650f7e48887177484cea61a79f90153f901508001841ed473b994095e7baea6a6c7c4c2dfeb977efac326af552d87842eb7a769b8ea7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03091ca07262b0bbd37edc750619c4f896f2783d0663397773439d1d1e22f35e92f707cba07794da0fd635ef6f114651318cf7f48f6281a6337ae7c8c77b0e7996280f6ac0c0",
                 "transactions" : [
                     {
                         "data" : "0x7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0309",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a004127390c5abd2332dfff87b78c973377e88d1494fa8592baf41706457bf235fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x27959fca7312b03340b2e3cdb2feb054465a39b25f849bebe08c77e61282cf0a",
+        "lastblockhash" : "0x652677c8adc3e0be4ce94a4d3f7d934fe3cfc80cbf0f632df6891d87755e1faa",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest595BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest595BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest595BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x7f35",
-                    "hash" : "0x105ca9db37f8f6c23a35f0237718999fdd51ae7cea707d0d26ecd8db760937db",
-                    "mixHash" : "0x56d37f06e8fe55fca6f91426d5b7c0527f63bb5ef46eb458d84eb3c3fe20a587",
-                    "nonce" : "0x4a0db9765ac6d2aa",
+                    "hash" : "0x6d632d65bf5c115d2d3ee533b7b82facaae8764e3de99fa883c7f73640bca24a",
+                    "mixHash" : "0xed2ad1093e8dce707560843a6d6d253582b437964e54f3e8b747a30580c69c69",
+                    "nonce" : "0xdeb0830cad87624a",
                     "number" : "0x01",
                     "parentHash" : "0xfc87809d054353e1aa3872f553b876a1cb5dd9af048c1071d5f26cb05ff0ab39",
                     "receiptTrie" : "0xa098ba63be095028957c1f2a6c3bfe35eafdd6f55fc982cd88b55c6c669574d5",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0x5768801d1606cc06a31586808396b3e183252dee47d7f9c9b3b1d06a27ed94b0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90356f901fca0fc87809d054353e1aa3872f553b876a1cb5dd9af048c1071d5f26cb05ff0ab39a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fceaf8c664ea5eb152e651efc4f1fe8e3c015364104791fe0ac8037f4a0df7cba05768801d1606cc06a31586808396b3e183252dee47d7f9c9b3b1d06a27ed94b0a0a098ba63be095028957c1f2a6c3bfe35eafdd6f55fc982cd88b55c6c669574d5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff827f358203e880a056d37f06e8fe55fca6f91426d5b7c0527f63bb5ef46eb458d84eb3c3fe20a587884a0db9765ac6d2aaf90153f901508001841ed473b994095e7baea6a6c7c4c2dfeb977efac326af552d87842eb7a769b8ea7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03091ca07262b0bbd37edc750619c4f896f2783d0663397773439d1d1e22f35e92f707cba07794da0fd635ef6f114651318cf7f48f6281a6337ae7c8c77b0e7996280f6ac0c0",
+                "rlp" : "0xf90356f901fca0fc87809d054353e1aa3872f553b876a1cb5dd9af048c1071d5f26cb05ff0ab39a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fceaf8c664ea5eb152e651efc4f1fe8e3c015364104791fe0ac8037f4a0df7cba05768801d1606cc06a31586808396b3e183252dee47d7f9c9b3b1d06a27ed94b0a0a098ba63be095028957c1f2a6c3bfe35eafdd6f55fc982cd88b55c6c669574d5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff827f358203e880a0ed2ad1093e8dce707560843a6d6d253582b437964e54f3e8b747a30580c69c6988deb0830cad87624af90153f901508001841ed473b994095e7baea6a6c7c4c2dfeb977efac326af552d87842eb7a769b8ea7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03091ca07262b0bbd37edc750619c4f896f2783d0663397773439d1d1e22f35e92f707cba07794da0fd635ef6f114651318cf7f48f6281a6337ae7c8c77b0e7996280f6ac0c0",
                 "transactions" : [
                     {
                         "data" : "0x7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0309",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a004127390c5abd2332dfff87b78c973377e88d1494fa8592baf41706457bf235fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x105ca9db37f8f6c23a35f0237718999fdd51ae7cea707d0d26ecd8db760937db",
+        "lastblockhash" : "0x6d632d65bf5c115d2d3ee533b7b82facaae8764e3de99fa883c7f73640bca24a",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest598BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest598BC.json
index b840d2f50..fdab209ef 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest598BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest598BC.json
@@ -2,8 +2,8 @@
     "randomStatetest598BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest598BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest598BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb53d",
-                    "hash" : "0xad1d6afcbeb7109fe12ea621558cc60b3f1d2e98e7c467099b9fab8f0e685418",
-                    "mixHash" : "0xc5f515d8d6081057b4bf28ac604ea796e8cd3904d8180c2410ae519227f7f822",
-                    "nonce" : "0xccfe7eef3fcf1063",
+                    "hash" : "0xdb90ed352b4aea791335aa77ab52d3ecceaf9998563dd722a8f4b0251fca40dd",
+                    "mixHash" : "0x7a150a9456971d9d4976569b24e4ebea76542b5cb5f7297e3469a37f98fe7242",
+                    "nonce" : "0x4971c79c0823ea42",
                     "number" : "0x01",
                     "parentHash" : "0x231198673c12f5b8b2fc4043a204b0e245a3d8ad99bb650c644a52245722be9f",
                     "receiptTrie" : "0x55d26c51fb1bbb693c4dd5650ae56a0adc33b805e720b69956b08040623c2890",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xd4e5ef1965581b403a65b0ef4de6d9eb2588ad37024e8ff723e79684ea0787c7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90364f901fca0231198673c12f5b8b2fc4043a204b0e245a3d8ad99bb650c644a52245722be9fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a027f732d1f77275ba32d937153699a5bec098e528268d61b1f200705bdbef1e2aa0d4e5ef1965581b403a65b0ef4de6d9eb2588ad37024e8ff723e79684ea0787c7a055d26c51fb1bbb693c4dd5650ae56a0adc33b805e720b69956b08040623c2890b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b53d8203e880a0c5f515d8d6081057b4bf28ac604ea796e8cd3904d8180c2410ae519227f7f82288ccfe7eef3fcf1063f90161f9015e80018444d2487294095e7baea6a6c7c4c2dfeb977efac326af552d87845a7529bfb8f87f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f48069f886d448a696184f3659803301ca013ea0c0f30fd55b5e74279926ef79db501105d1ce60b5cb53646fb1b0a75d957a050f8cd1ba5478f1e990c00f86eb1b216b7ca60a6ada6f7c05848276d301535bdc0",
+                "rlp" : "0xf90364f901fca0231198673c12f5b8b2fc4043a204b0e245a3d8ad99bb650c644a52245722be9fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a027f732d1f77275ba32d937153699a5bec098e528268d61b1f200705bdbef1e2aa0d4e5ef1965581b403a65b0ef4de6d9eb2588ad37024e8ff723e79684ea0787c7a055d26c51fb1bbb693c4dd5650ae56a0adc33b805e720b69956b08040623c2890b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b53d8203e880a07a150a9456971d9d4976569b24e4ebea76542b5cb5f7297e3469a37f98fe7242884971c79c0823ea42f90161f9015e80018444d2487294095e7baea6a6c7c4c2dfeb977efac326af552d87845a7529bfb8f87f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f48069f886d448a696184f3659803301ca013ea0c0f30fd55b5e74279926ef79db501105d1ce60b5cb53646fb1b0a75d957a050f8cd1ba5478f1e990c00f86eb1b216b7ca60a6ada6f7c05848276d301535bdc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f48069f886d448a696184f365980330",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03f62caa6ecbfb7c3354dbd660fd90c8d5f1f0592c84fe2cdfa53e38c3fbc14fea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xad1d6afcbeb7109fe12ea621558cc60b3f1d2e98e7c467099b9fab8f0e685418",
+        "lastblockhash" : "0xdb90ed352b4aea791335aa77ab52d3ecceaf9998563dd722a8f4b0251fca40dd",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest598BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest598BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest598BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb849",
-                    "hash" : "0x804e5f6fbe413712d23daaabefc65292ef43bcd77db665fac6a35652adc23e67",
-                    "mixHash" : "0x85f92ebe629296063c0a6b9c8fd7e2f07fe8eff6707727f0a59d1e3b0c4dd783",
-                    "nonce" : "0xbb56657f7b99ce80",
+                    "hash" : "0x985c5bc6e8dd331666250301810883533aa5a4887148df0a84e0ae1a7732e88b",
+                    "mixHash" : "0xb183b89ff819a3eb4a7f4e40198e20259c6e515c39fe5601297c89fb4edb9d65",
+                    "nonce" : "0x40cdf97cb025d03a",
                     "number" : "0x01",
                     "parentHash" : "0x231198673c12f5b8b2fc4043a204b0e245a3d8ad99bb650c644a52245722be9f",
                     "receiptTrie" : "0x4ae167c2282a293a4ba04e6c523b97c57c33e2474bd3050955b676e5ae01b657",
-                    "stateRoot" : "0xe6b16e6f13bea2798ac43fa5bdf67ae2f1d8fd404cdcd2f09f2c7b4924e76f02",
+                    "stateRoot" : "0x81a5a26fa837cc24111c5db2050fe7172f9568c234ebb96d9939526011db274e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd4e5ef1965581b403a65b0ef4de6d9eb2588ad37024e8ff723e79684ea0787c7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90364f901fca0231198673c12f5b8b2fc4043a204b0e245a3d8ad99bb650c644a52245722be9fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e6b16e6f13bea2798ac43fa5bdf67ae2f1d8fd404cdcd2f09f2c7b4924e76f02a0d4e5ef1965581b403a65b0ef4de6d9eb2588ad37024e8ff723e79684ea0787c7a04ae167c2282a293a4ba04e6c523b97c57c33e2474bd3050955b676e5ae01b657b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b8498203e880a085f92ebe629296063c0a6b9c8fd7e2f07fe8eff6707727f0a59d1e3b0c4dd78388bb56657f7b99ce80f90161f9015e80018444d2487294095e7baea6a6c7c4c2dfeb977efac326af552d87845a7529bfb8f87f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f48069f886d448a696184f3659803301ca013ea0c0f30fd55b5e74279926ef79db501105d1ce60b5cb53646fb1b0a75d957a050f8cd1ba5478f1e990c00f86eb1b216b7ca60a6ada6f7c05848276d301535bdc0",
+                "rlp" : "0xf90364f901fca0231198673c12f5b8b2fc4043a204b0e245a3d8ad99bb650c644a52245722be9fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a081a5a26fa837cc24111c5db2050fe7172f9568c234ebb96d9939526011db274ea0d4e5ef1965581b403a65b0ef4de6d9eb2588ad37024e8ff723e79684ea0787c7a04ae167c2282a293a4ba04e6c523b97c57c33e2474bd3050955b676e5ae01b657b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b8498203e880a0b183b89ff819a3eb4a7f4e40198e20259c6e515c39fe5601297c89fb4edb9d658840cdf97cb025d03af90161f9015e80018444d2487294095e7baea6a6c7c4c2dfeb977efac326af552d87845a7529bfb8f87f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f48069f886d448a696184f3659803301ca013ea0c0f30fd55b5e74279926ef79db501105d1ce60b5cb53646fb1b0a75d957a050f8cd1ba5478f1e990c00f86eb1b216b7ca60a6ada6f7c05848276d301535bdc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f48069f886d448a696184f365980330",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03f62caa6ecbfb7c3354dbd660fd90c8d5f1f0592c84fe2cdfa53e38c3fbc14fea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x804e5f6fbe413712d23daaabefc65292ef43bcd77db665fac6a35652adc23e67",
+        "lastblockhash" : "0x985c5bc6e8dd331666250301810883533aa5a4887148df0a84e0ae1a7732e88b",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x5a7529bf",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f48069f886d448a696184f3659803305560005155",
@@ -235,8 +228,8 @@
     "randomStatetest598BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest598BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest598BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb53d",
-                    "hash" : "0x19d91d0d109cfc9d2d1de597b3f081f6f25228e55c48fa8312e2085a1d0567cb",
-                    "mixHash" : "0x36aa1e8ded3585f0795a578ba6f36099c9f38531d7d19cada63e2b8bb4a6e858",
-                    "nonce" : "0x9176e4fdcaa6f995",
+                    "hash" : "0xe450effa7893d44bfd98af24dda946d4dcf098bd3e8eae3654ffd81594c79b54",
+                    "mixHash" : "0xe8abf5346f2cf194c0f5da06bcfee1ee5bfb5f439c6279fefe1320600ac7d6d1",
+                    "nonce" : "0x22d36354a8b6f7c6",
                     "number" : "0x01",
                     "parentHash" : "0x231198673c12f5b8b2fc4043a204b0e245a3d8ad99bb650c644a52245722be9f",
                     "receiptTrie" : "0x0f96c5653b4d808190191b4eb24e150c71ea8a785547080f76ebf838dede270c",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xd4e5ef1965581b403a65b0ef4de6d9eb2588ad37024e8ff723e79684ea0787c7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90364f901fca0231198673c12f5b8b2fc4043a204b0e245a3d8ad99bb650c644a52245722be9fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a6444e6c8142f5741808ec77dae09e26fff712652fd9def69785f8e87715181aa0d4e5ef1965581b403a65b0ef4de6d9eb2588ad37024e8ff723e79684ea0787c7a00f96c5653b4d808190191b4eb24e150c71ea8a785547080f76ebf838dede270cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b53d8203e880a036aa1e8ded3585f0795a578ba6f36099c9f38531d7d19cada63e2b8bb4a6e858889176e4fdcaa6f995f90161f9015e80018444d2487294095e7baea6a6c7c4c2dfeb977efac326af552d87845a7529bfb8f87f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f48069f886d448a696184f3659803301ca013ea0c0f30fd55b5e74279926ef79db501105d1ce60b5cb53646fb1b0a75d957a050f8cd1ba5478f1e990c00f86eb1b216b7ca60a6ada6f7c05848276d301535bdc0",
+                "rlp" : "0xf90364f901fca0231198673c12f5b8b2fc4043a204b0e245a3d8ad99bb650c644a52245722be9fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a6444e6c8142f5741808ec77dae09e26fff712652fd9def69785f8e87715181aa0d4e5ef1965581b403a65b0ef4de6d9eb2588ad37024e8ff723e79684ea0787c7a00f96c5653b4d808190191b4eb24e150c71ea8a785547080f76ebf838dede270cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b53d8203e880a0e8abf5346f2cf194c0f5da06bcfee1ee5bfb5f439c6279fefe1320600ac7d6d18822d36354a8b6f7c6f90161f9015e80018444d2487294095e7baea6a6c7c4c2dfeb977efac326af552d87845a7529bfb8f87f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f48069f886d448a696184f3659803301ca013ea0c0f30fd55b5e74279926ef79db501105d1ce60b5cb53646fb1b0a75d957a050f8cd1ba5478f1e990c00f86eb1b216b7ca60a6ada6f7c05848276d301535bdc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f48069f886d448a696184f365980330",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03f62caa6ecbfb7c3354dbd660fd90c8d5f1f0592c84fe2cdfa53e38c3fbc14fea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x19d91d0d109cfc9d2d1de597b3f081f6f25228e55c48fa8312e2085a1d0567cb",
+        "lastblockhash" : "0xe450effa7893d44bfd98af24dda946d4dcf098bd3e8eae3654ffd81594c79b54",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest598BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest598BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest598BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb53d",
-                    "hash" : "0x996ed40d8faa5e62674e835f28f7f8e1634d3e45fc6ef88190a0325952685bd2",
-                    "mixHash" : "0x6222948703540e1c11991903fffd0cc97dec6c2468f03f8617ad3fcba009566e",
-                    "nonce" : "0xf4d7ad6fe906c815",
+                    "hash" : "0x3834a6f9e85f1e4b11dfe7e1b5ea1d2f1e18f748753bd9933b65cb7bf706e4a3",
+                    "mixHash" : "0x3b1f6440fa1ca4f7bdae0433774451a5a282d7d9a017b12fd3bb909ca7e8d886",
+                    "nonce" : "0x119d8a4a5b4f5c59",
                     "number" : "0x01",
                     "parentHash" : "0x231198673c12f5b8b2fc4043a204b0e245a3d8ad99bb650c644a52245722be9f",
                     "receiptTrie" : "0x0f96c5653b4d808190191b4eb24e150c71ea8a785547080f76ebf838dede270c",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xd4e5ef1965581b403a65b0ef4de6d9eb2588ad37024e8ff723e79684ea0787c7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90364f901fca0231198673c12f5b8b2fc4043a204b0e245a3d8ad99bb650c644a52245722be9fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a6444e6c8142f5741808ec77dae09e26fff712652fd9def69785f8e87715181aa0d4e5ef1965581b403a65b0ef4de6d9eb2588ad37024e8ff723e79684ea0787c7a00f96c5653b4d808190191b4eb24e150c71ea8a785547080f76ebf838dede270cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b53d8203e880a06222948703540e1c11991903fffd0cc97dec6c2468f03f8617ad3fcba009566e88f4d7ad6fe906c815f90161f9015e80018444d2487294095e7baea6a6c7c4c2dfeb977efac326af552d87845a7529bfb8f87f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f48069f886d448a696184f3659803301ca013ea0c0f30fd55b5e74279926ef79db501105d1ce60b5cb53646fb1b0a75d957a050f8cd1ba5478f1e990c00f86eb1b216b7ca60a6ada6f7c05848276d301535bdc0",
+                "rlp" : "0xf90364f901fca0231198673c12f5b8b2fc4043a204b0e245a3d8ad99bb650c644a52245722be9fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a6444e6c8142f5741808ec77dae09e26fff712652fd9def69785f8e87715181aa0d4e5ef1965581b403a65b0ef4de6d9eb2588ad37024e8ff723e79684ea0787c7a00f96c5653b4d808190191b4eb24e150c71ea8a785547080f76ebf838dede270cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b53d8203e880a03b1f6440fa1ca4f7bdae0433774451a5a282d7d9a017b12fd3bb909ca7e8d88688119d8a4a5b4f5c59f90161f9015e80018444d2487294095e7baea6a6c7c4c2dfeb977efac326af552d87845a7529bfb8f87f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f48069f886d448a696184f3659803301ca013ea0c0f30fd55b5e74279926ef79db501105d1ce60b5cb53646fb1b0a75d957a050f8cd1ba5478f1e990c00f86eb1b216b7ca60a6ada6f7c05848276d301535bdc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f48069f886d448a696184f365980330",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03f62caa6ecbfb7c3354dbd660fd90c8d5f1f0592c84fe2cdfa53e38c3fbc14fea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x996ed40d8faa5e62674e835f28f7f8e1634d3e45fc6ef88190a0325952685bd2",
+        "lastblockhash" : "0x3834a6f9e85f1e4b11dfe7e1b5ea1d2f1e18f748753bd9933b65cb7bf706e4a3",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest598BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest598BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest598BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb53d",
-                    "hash" : "0x6faa11d4cf85d95fb27cf1640f8ef283945d8d35e8722178d8b0d0396330e864",
-                    "mixHash" : "0xb724664e14a2ee0257cfdc39837e9960a4d71eb27a26a3ce64bc5750da61ac9b",
-                    "nonce" : "0x6980b83f7234f125",
+                    "hash" : "0xf155b8d8770ef36455d1a621d9b005a40b0774c6dada37b1bbf89f05fe3720e3",
+                    "mixHash" : "0xa4f18677894ce587a5c0fad8d14ecb8219046d128feb24ef615cf5a92000a54d",
+                    "nonce" : "0x9cc25c3fb80be6e8",
                     "number" : "0x01",
                     "parentHash" : "0x231198673c12f5b8b2fc4043a204b0e245a3d8ad99bb650c644a52245722be9f",
                     "receiptTrie" : "0x0f96c5653b4d808190191b4eb24e150c71ea8a785547080f76ebf838dede270c",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xd4e5ef1965581b403a65b0ef4de6d9eb2588ad37024e8ff723e79684ea0787c7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90364f901fca0231198673c12f5b8b2fc4043a204b0e245a3d8ad99bb650c644a52245722be9fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a6444e6c8142f5741808ec77dae09e26fff712652fd9def69785f8e87715181aa0d4e5ef1965581b403a65b0ef4de6d9eb2588ad37024e8ff723e79684ea0787c7a00f96c5653b4d808190191b4eb24e150c71ea8a785547080f76ebf838dede270cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b53d8203e880a0b724664e14a2ee0257cfdc39837e9960a4d71eb27a26a3ce64bc5750da61ac9b886980b83f7234f125f90161f9015e80018444d2487294095e7baea6a6c7c4c2dfeb977efac326af552d87845a7529bfb8f87f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f48069f886d448a696184f3659803301ca013ea0c0f30fd55b5e74279926ef79db501105d1ce60b5cb53646fb1b0a75d957a050f8cd1ba5478f1e990c00f86eb1b216b7ca60a6ada6f7c05848276d301535bdc0",
+                "rlp" : "0xf90364f901fca0231198673c12f5b8b2fc4043a204b0e245a3d8ad99bb650c644a52245722be9fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a6444e6c8142f5741808ec77dae09e26fff712652fd9def69785f8e87715181aa0d4e5ef1965581b403a65b0ef4de6d9eb2588ad37024e8ff723e79684ea0787c7a00f96c5653b4d808190191b4eb24e150c71ea8a785547080f76ebf838dede270cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b53d8203e880a0a4f18677894ce587a5c0fad8d14ecb8219046d128feb24ef615cf5a92000a54d889cc25c3fb80be6e8f90161f9015e80018444d2487294095e7baea6a6c7c4c2dfeb977efac326af552d87845a7529bfb8f87f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f48069f886d448a696184f3659803301ca013ea0c0f30fd55b5e74279926ef79db501105d1ce60b5cb53646fb1b0a75d957a050f8cd1ba5478f1e990c00f86eb1b216b7ca60a6ada6f7c05848276d301535bdc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f48069f886d448a696184f365980330",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03f62caa6ecbfb7c3354dbd660fd90c8d5f1f0592c84fe2cdfa53e38c3fbc14fea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6faa11d4cf85d95fb27cf1640f8ef283945d8d35e8722178d8b0d0396330e864",
+        "lastblockhash" : "0xf155b8d8770ef36455d1a621d9b005a40b0774c6dada37b1bbf89f05fe3720e3",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest598BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest598BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest598BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb53d",
-                    "hash" : "0xae88a6d4aa6445be3e5dd0296c90379268c4164d622d3681ebb967f74111bcac",
-                    "mixHash" : "0x1340f84e13c472c659e41059f8486e0f5809067f906d2d79e7156ab4417838ad",
-                    "nonce" : "0x3fd64fbf63aec767",
+                    "hash" : "0x61808fe4b84b13c8fe39eef2625d5680e8c98dde315f70c03556e4763ba2ab69",
+                    "mixHash" : "0xf30c452257f4bb4efa28f40c7666c454b09f507600ed7ee8c679724eb5772937",
+                    "nonce" : "0x1ce12ab07c950bde",
                     "number" : "0x01",
                     "parentHash" : "0x231198673c12f5b8b2fc4043a204b0e245a3d8ad99bb650c644a52245722be9f",
                     "receiptTrie" : "0x0f96c5653b4d808190191b4eb24e150c71ea8a785547080f76ebf838dede270c",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xd4e5ef1965581b403a65b0ef4de6d9eb2588ad37024e8ff723e79684ea0787c7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90364f901fca0231198673c12f5b8b2fc4043a204b0e245a3d8ad99bb650c644a52245722be9fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a6444e6c8142f5741808ec77dae09e26fff712652fd9def69785f8e87715181aa0d4e5ef1965581b403a65b0ef4de6d9eb2588ad37024e8ff723e79684ea0787c7a00f96c5653b4d808190191b4eb24e150c71ea8a785547080f76ebf838dede270cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b53d8203e880a01340f84e13c472c659e41059f8486e0f5809067f906d2d79e7156ab4417838ad883fd64fbf63aec767f90161f9015e80018444d2487294095e7baea6a6c7c4c2dfeb977efac326af552d87845a7529bfb8f87f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f48069f886d448a696184f3659803301ca013ea0c0f30fd55b5e74279926ef79db501105d1ce60b5cb53646fb1b0a75d957a050f8cd1ba5478f1e990c00f86eb1b216b7ca60a6ada6f7c05848276d301535bdc0",
+                "rlp" : "0xf90364f901fca0231198673c12f5b8b2fc4043a204b0e245a3d8ad99bb650c644a52245722be9fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a6444e6c8142f5741808ec77dae09e26fff712652fd9def69785f8e87715181aa0d4e5ef1965581b403a65b0ef4de6d9eb2588ad37024e8ff723e79684ea0787c7a00f96c5653b4d808190191b4eb24e150c71ea8a785547080f76ebf838dede270cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b53d8203e880a0f30c452257f4bb4efa28f40c7666c454b09f507600ed7ee8c679724eb5772937881ce12ab07c950bdef90161f9015e80018444d2487294095e7baea6a6c7c4c2dfeb977efac326af552d87845a7529bfb8f87f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f48069f886d448a696184f3659803301ca013ea0c0f30fd55b5e74279926ef79db501105d1ce60b5cb53646fb1b0a75d957a050f8cd1ba5478f1e990c00f86eb1b216b7ca60a6ada6f7c05848276d301535bdc0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f48069f886d448a696184f365980330",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03f62caa6ecbfb7c3354dbd660fd90c8d5f1f0592c84fe2cdfa53e38c3fbc14fea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xae88a6d4aa6445be3e5dd0296c90379268c4164d622d3681ebb967f74111bcac",
+        "lastblockhash" : "0x61808fe4b84b13c8fe39eef2625d5680e8c98dde315f70c03556e4763ba2ab69",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest606BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest606BC.json
index 3610d1d76..dd1ad3022 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest606BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest606BC.json
@@ -2,8 +2,8 @@
     "randomStatetest606BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest606BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest606BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8b96",
-                    "hash" : "0x42203dedd5d7c2b2efc74f691e10bb41c2e8f4f423ac25bf7e2469e93bbc3314",
-                    "mixHash" : "0x7e7c05d9450e08369878a2bcee474e28f66ba4bddf75fd234ac6b4d22df4894a",
-                    "nonce" : "0xc2d3f52ea85f7b23",
+                    "hash" : "0x5cf08f267b2a4a8facdb5de979309b11f855f2f69aa442e12879e9e9f8415c43",
+                    "mixHash" : "0x92f7279bc1ede7b4d304b5d9e89b66239ff71a82bad55ef9003ee7830cc0e9dd",
+                    "nonce" : "0x46b1558ef33950c8",
                     "number" : "0x01",
                     "parentHash" : "0xbf58e21ac02253cfcba703209378759b2f3c66fa718364b634ec8d627beb797b",
                     "receiptTrie" : "0xbafa8a80818dc8319a205f86836056510d9819f5dd4cdfd63eb7baa54ff2f2b0",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xb8a7152c9c0bb83a692af1ad691b61761217b50190bd6f4c8008c213a152f0d1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90322f901fca0bf58e21ac02253cfcba703209378759b2f3c66fa718364b634ec8d627beb797ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0129bfaaa7aee6de5995de27ddc7e77f0929601634701e30f528d00c051626cc0a0b8a7152c9c0bb83a692af1ad691b61761217b50190bd6f4c8008c213a152f0d1a0bafa8a80818dc8319a205f86836056510d9819f5dd4cdfd63eb7baa54ff2f2b0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828b968203e880a07e7c05d9450e08369878a2bcee474e28f66ba4bddf75fd234ac6b4d22df4894a88c2d3f52ea85f7b23f9011ff9011c8001841d7057a694095e7baea6a6c7c4c2dfeb977efac326af552d878441570179b8b67f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff40557cf03c31a361388d89ea8065866f1ba0d3b553fc888996d5841fb16d5bbc5da7dbb3e49e8e01ccae982e86e0c965ce24a0262e3133937e012df3aba5be6c0b5bd847ec8674e4471951c25a857a33ec3648c0",
+                "rlp" : "0xf90322f901fca0bf58e21ac02253cfcba703209378759b2f3c66fa718364b634ec8d627beb797ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0129bfaaa7aee6de5995de27ddc7e77f0929601634701e30f528d00c051626cc0a0b8a7152c9c0bb83a692af1ad691b61761217b50190bd6f4c8008c213a152f0d1a0bafa8a80818dc8319a205f86836056510d9819f5dd4cdfd63eb7baa54ff2f2b0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828b968203e880a092f7279bc1ede7b4d304b5d9e89b66239ff71a82bad55ef9003ee7830cc0e9dd8846b1558ef33950c8f9011ff9011c8001841d7057a694095e7baea6a6c7c4c2dfeb977efac326af552d878441570179b8b67f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff40557cf03c31a361388d89ea8065866f1ba0d3b553fc888996d5841fb16d5bbc5da7dbb3e49e8e01ccae982e86e0c965ce24a0262e3133937e012df3aba5be6c0b5bd847ec8674e4471951c25a857a33ec3648c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff40557cf03c31a361388d89ea8065866f",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03e3afcd6e18f1dfa11c1693a7bdeffbfad54aa243d6f568d8cb0813b7866278aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x42203dedd5d7c2b2efc74f691e10bb41c2e8f4f423ac25bf7e2469e93bbc3314",
+        "lastblockhash" : "0x5cf08f267b2a4a8facdb5de979309b11f855f2f69aa442e12879e9e9f8415c43",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest606BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest606BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest606BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8ea2",
-                    "hash" : "0x5c1d4e59d4b404f412e25b7439eb725a632e256366d774bdc461597c530d94c3",
-                    "mixHash" : "0x4cb0f45b81de6914d22a61b6ab62c4c844763f6c64c0f21315ee0c691d6f7ba6",
-                    "nonce" : "0x60f72b5c9b1fb757",
+                    "hash" : "0xbc4c77690e2a1ff37b6f5a2ebe8803b845e82964433d21759e9ec88b778c30e1",
+                    "mixHash" : "0x690221adb6fdc7dfcb10f60f266825afe3d6478955e4040cfae8a593f91e70c3",
+                    "nonce" : "0x444464790a3dbc67",
                     "number" : "0x01",
                     "parentHash" : "0xbf58e21ac02253cfcba703209378759b2f3c66fa718364b634ec8d627beb797b",
                     "receiptTrie" : "0x0b4c86aa8b134db492c7be07c3e914a3cd523c4d8d9d37138b434f0411245da6",
-                    "stateRoot" : "0x26bf0444520719f112ed1b1a75f9ef4c8ea000ead6912ae487ecb0d2e1094024",
+                    "stateRoot" : "0x4dd579dd6add18b8cb5c5db68724866c2a0e96b23c028ad1d7e4d92e3ca68964",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb8a7152c9c0bb83a692af1ad691b61761217b50190bd6f4c8008c213a152f0d1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90322f901fca0bf58e21ac02253cfcba703209378759b2f3c66fa718364b634ec8d627beb797ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a026bf0444520719f112ed1b1a75f9ef4c8ea000ead6912ae487ecb0d2e1094024a0b8a7152c9c0bb83a692af1ad691b61761217b50190bd6f4c8008c213a152f0d1a00b4c86aa8b134db492c7be07c3e914a3cd523c4d8d9d37138b434f0411245da6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828ea28203e880a04cb0f45b81de6914d22a61b6ab62c4c844763f6c64c0f21315ee0c691d6f7ba68860f72b5c9b1fb757f9011ff9011c8001841d7057a694095e7baea6a6c7c4c2dfeb977efac326af552d878441570179b8b67f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff40557cf03c31a361388d89ea8065866f1ba0d3b553fc888996d5841fb16d5bbc5da7dbb3e49e8e01ccae982e86e0c965ce24a0262e3133937e012df3aba5be6c0b5bd847ec8674e4471951c25a857a33ec3648c0",
+                "rlp" : "0xf90322f901fca0bf58e21ac02253cfcba703209378759b2f3c66fa718364b634ec8d627beb797ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04dd579dd6add18b8cb5c5db68724866c2a0e96b23c028ad1d7e4d92e3ca68964a0b8a7152c9c0bb83a692af1ad691b61761217b50190bd6f4c8008c213a152f0d1a00b4c86aa8b134db492c7be07c3e914a3cd523c4d8d9d37138b434f0411245da6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828ea28203e880a0690221adb6fdc7dfcb10f60f266825afe3d6478955e4040cfae8a593f91e70c388444464790a3dbc67f9011ff9011c8001841d7057a694095e7baea6a6c7c4c2dfeb977efac326af552d878441570179b8b67f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff40557cf03c31a361388d89ea8065866f1ba0d3b553fc888996d5841fb16d5bbc5da7dbb3e49e8e01ccae982e86e0c965ce24a0262e3133937e012df3aba5be6c0b5bd847ec8674e4471951c25a857a33ec3648c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff40557cf03c31a361388d89ea8065866f",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03e3afcd6e18f1dfa11c1693a7bdeffbfad54aa243d6f568d8cb0813b7866278aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5c1d4e59d4b404f412e25b7439eb725a632e256366d774bdc461597c530d94c3",
+        "lastblockhash" : "0xbc4c77690e2a1ff37b6f5a2ebe8803b845e82964433d21759e9ec88b778c30e1",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x41570179",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff40557cf03c31a361388d89ea8065866f",
@@ -233,8 +226,8 @@
     "randomStatetest606BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest606BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest606BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8b96",
-                    "hash" : "0x2b432566eb7211e01708c944c55eb6ed32c2836e2a8462f3e6e283dfa4a1a12d",
-                    "mixHash" : "0x2b1dec6d6c8dc07a06c71cb02111c3f930b7e51754a6aed5d0a936fe50a3193b",
-                    "nonce" : "0x059a660f2f87dba3",
+                    "hash" : "0xfe0a80b9db550691791d30a88813e68c55f154cbd4720aeb763d853afe476b0b",
+                    "mixHash" : "0xdc2c6ae9d52e412ab3bcbafe66d739e3cad98eac72c993434a29235d8ef053fc",
+                    "nonce" : "0x1f69572aea7cfa52",
                     "number" : "0x01",
                     "parentHash" : "0xbf58e21ac02253cfcba703209378759b2f3c66fa718364b634ec8d627beb797b",
                     "receiptTrie" : "0x22aa8a5c024ee640ee1a9b16f85a4cc79c0080395348b5d271ae433c3c619fda",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0xb8a7152c9c0bb83a692af1ad691b61761217b50190bd6f4c8008c213a152f0d1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90322f901fca0bf58e21ac02253cfcba703209378759b2f3c66fa718364b634ec8d627beb797ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0bd6e3e3af4dd533dbfe7829b706f8ca0114ac2a16006620e845992875090ac33a0b8a7152c9c0bb83a692af1ad691b61761217b50190bd6f4c8008c213a152f0d1a022aa8a5c024ee640ee1a9b16f85a4cc79c0080395348b5d271ae433c3c619fdab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828b968203e880a02b1dec6d6c8dc07a06c71cb02111c3f930b7e51754a6aed5d0a936fe50a3193b88059a660f2f87dba3f9011ff9011c8001841d7057a694095e7baea6a6c7c4c2dfeb977efac326af552d878441570179b8b67f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff40557cf03c31a361388d89ea8065866f1ba0d3b553fc888996d5841fb16d5bbc5da7dbb3e49e8e01ccae982e86e0c965ce24a0262e3133937e012df3aba5be6c0b5bd847ec8674e4471951c25a857a33ec3648c0",
+                "rlp" : "0xf90322f901fca0bf58e21ac02253cfcba703209378759b2f3c66fa718364b634ec8d627beb797ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0bd6e3e3af4dd533dbfe7829b706f8ca0114ac2a16006620e845992875090ac33a0b8a7152c9c0bb83a692af1ad691b61761217b50190bd6f4c8008c213a152f0d1a022aa8a5c024ee640ee1a9b16f85a4cc79c0080395348b5d271ae433c3c619fdab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828b968203e880a0dc2c6ae9d52e412ab3bcbafe66d739e3cad98eac72c993434a29235d8ef053fc881f69572aea7cfa52f9011ff9011c8001841d7057a694095e7baea6a6c7c4c2dfeb977efac326af552d878441570179b8b67f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff40557cf03c31a361388d89ea8065866f1ba0d3b553fc888996d5841fb16d5bbc5da7dbb3e49e8e01ccae982e86e0c965ce24a0262e3133937e012df3aba5be6c0b5bd847ec8674e4471951c25a857a33ec3648c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff40557cf03c31a361388d89ea8065866f",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03e3afcd6e18f1dfa11c1693a7bdeffbfad54aa243d6f568d8cb0813b7866278aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2b432566eb7211e01708c944c55eb6ed32c2836e2a8462f3e6e283dfa4a1a12d",
+        "lastblockhash" : "0xfe0a80b9db550691791d30a88813e68c55f154cbd4720aeb763d853afe476b0b",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest606BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest606BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest606BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8b96",
-                    "hash" : "0x17e3e18c13567dacae1853fda1329e9fabbc9953529116952e0ca689f98a10b9",
-                    "mixHash" : "0xde040e9148c9a70b0ec6ad83b1de5cc95ba7a9966492675b1098e86257a55564",
-                    "nonce" : "0xa73642e230f4815f",
+                    "hash" : "0x421d31118e74b8ca22c4941f457ae195c70ac0a5d86ff4ff9ac060a142403c5d",
+                    "mixHash" : "0x47c5bd648100a0ff909866b1e543233c1b7aff5a66c6b328ca908708926a44a0",
+                    "nonce" : "0xb98baed51f24599f",
                     "number" : "0x01",
                     "parentHash" : "0xbf58e21ac02253cfcba703209378759b2f3c66fa718364b634ec8d627beb797b",
                     "receiptTrie" : "0x22aa8a5c024ee640ee1a9b16f85a4cc79c0080395348b5d271ae433c3c619fda",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0xb8a7152c9c0bb83a692af1ad691b61761217b50190bd6f4c8008c213a152f0d1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90322f901fca0bf58e21ac02253cfcba703209378759b2f3c66fa718364b634ec8d627beb797ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0bd6e3e3af4dd533dbfe7829b706f8ca0114ac2a16006620e845992875090ac33a0b8a7152c9c0bb83a692af1ad691b61761217b50190bd6f4c8008c213a152f0d1a022aa8a5c024ee640ee1a9b16f85a4cc79c0080395348b5d271ae433c3c619fdab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828b968203e880a0de040e9148c9a70b0ec6ad83b1de5cc95ba7a9966492675b1098e86257a5556488a73642e230f4815ff9011ff9011c8001841d7057a694095e7baea6a6c7c4c2dfeb977efac326af552d878441570179b8b67f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff40557cf03c31a361388d89ea8065866f1ba0d3b553fc888996d5841fb16d5bbc5da7dbb3e49e8e01ccae982e86e0c965ce24a0262e3133937e012df3aba5be6c0b5bd847ec8674e4471951c25a857a33ec3648c0",
+                "rlp" : "0xf90322f901fca0bf58e21ac02253cfcba703209378759b2f3c66fa718364b634ec8d627beb797ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0bd6e3e3af4dd533dbfe7829b706f8ca0114ac2a16006620e845992875090ac33a0b8a7152c9c0bb83a692af1ad691b61761217b50190bd6f4c8008c213a152f0d1a022aa8a5c024ee640ee1a9b16f85a4cc79c0080395348b5d271ae433c3c619fdab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828b968203e880a047c5bd648100a0ff909866b1e543233c1b7aff5a66c6b328ca908708926a44a088b98baed51f24599ff9011ff9011c8001841d7057a694095e7baea6a6c7c4c2dfeb977efac326af552d878441570179b8b67f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff40557cf03c31a361388d89ea8065866f1ba0d3b553fc888996d5841fb16d5bbc5da7dbb3e49e8e01ccae982e86e0c965ce24a0262e3133937e012df3aba5be6c0b5bd847ec8674e4471951c25a857a33ec3648c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff40557cf03c31a361388d89ea8065866f",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03e3afcd6e18f1dfa11c1693a7bdeffbfad54aa243d6f568d8cb0813b7866278aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x17e3e18c13567dacae1853fda1329e9fabbc9953529116952e0ca689f98a10b9",
+        "lastblockhash" : "0x421d31118e74b8ca22c4941f457ae195c70ac0a5d86ff4ff9ac060a142403c5d",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest606BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest606BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest606BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8b96",
-                    "hash" : "0x1f9dbb63ca28d6f98bd4fe4aa3b0815311c0b9b84b7ede6bceb6d630dee79cb1",
-                    "mixHash" : "0x92f74964cbeebe88dc92a8ff638a540348a387ab0df1cbddd2b6f983f46597aa",
-                    "nonce" : "0x942f5f56c5e929ce",
+                    "hash" : "0x96bec0d1bfda2592e576659576f683151457d166032b980ea073fda454c45a08",
+                    "mixHash" : "0x385a143f3eb4899103b57c4f286d35ee720b04b32e09d13cb45de5f887f4017e",
+                    "nonce" : "0xf7d4111d9530368c",
                     "number" : "0x01",
                     "parentHash" : "0xbf58e21ac02253cfcba703209378759b2f3c66fa718364b634ec8d627beb797b",
                     "receiptTrie" : "0x22aa8a5c024ee640ee1a9b16f85a4cc79c0080395348b5d271ae433c3c619fda",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0xb8a7152c9c0bb83a692af1ad691b61761217b50190bd6f4c8008c213a152f0d1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90322f901fca0bf58e21ac02253cfcba703209378759b2f3c66fa718364b634ec8d627beb797ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0bd6e3e3af4dd533dbfe7829b706f8ca0114ac2a16006620e845992875090ac33a0b8a7152c9c0bb83a692af1ad691b61761217b50190bd6f4c8008c213a152f0d1a022aa8a5c024ee640ee1a9b16f85a4cc79c0080395348b5d271ae433c3c619fdab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828b968203e880a092f74964cbeebe88dc92a8ff638a540348a387ab0df1cbddd2b6f983f46597aa88942f5f56c5e929cef9011ff9011c8001841d7057a694095e7baea6a6c7c4c2dfeb977efac326af552d878441570179b8b67f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff40557cf03c31a361388d89ea8065866f1ba0d3b553fc888996d5841fb16d5bbc5da7dbb3e49e8e01ccae982e86e0c965ce24a0262e3133937e012df3aba5be6c0b5bd847ec8674e4471951c25a857a33ec3648c0",
+                "rlp" : "0xf90322f901fca0bf58e21ac02253cfcba703209378759b2f3c66fa718364b634ec8d627beb797ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0bd6e3e3af4dd533dbfe7829b706f8ca0114ac2a16006620e845992875090ac33a0b8a7152c9c0bb83a692af1ad691b61761217b50190bd6f4c8008c213a152f0d1a022aa8a5c024ee640ee1a9b16f85a4cc79c0080395348b5d271ae433c3c619fdab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828b968203e880a0385a143f3eb4899103b57c4f286d35ee720b04b32e09d13cb45de5f887f4017e88f7d4111d9530368cf9011ff9011c8001841d7057a694095e7baea6a6c7c4c2dfeb977efac326af552d878441570179b8b67f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff40557cf03c31a361388d89ea8065866f1ba0d3b553fc888996d5841fb16d5bbc5da7dbb3e49e8e01ccae982e86e0c965ce24a0262e3133937e012df3aba5be6c0b5bd847ec8674e4471951c25a857a33ec3648c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff40557cf03c31a361388d89ea8065866f",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03e3afcd6e18f1dfa11c1693a7bdeffbfad54aa243d6f568d8cb0813b7866278aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1f9dbb63ca28d6f98bd4fe4aa3b0815311c0b9b84b7ede6bceb6d630dee79cb1",
+        "lastblockhash" : "0x96bec0d1bfda2592e576659576f683151457d166032b980ea073fda454c45a08",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest606BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest606BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest606BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8b96",
-                    "hash" : "0xe260f4ca53468b8b5f5b48a8801bfd8ee6407cba9acbba8a13e080629212e929",
-                    "mixHash" : "0xb9a032fec16cc27a858b2d8f8fe3ec8d8cb6a07fdb198a053af8c94e6ab70a13",
-                    "nonce" : "0xed3389216c474dbd",
+                    "hash" : "0xe1488b9cddc2c8166d617fb3fb4b3d6c09e2ae5e9a9df7879ffefd5c54089177",
+                    "mixHash" : "0x5511af9c9947005c584a0bb7da68b4a3dd2059ccbe4db012ae28f4a1b8afcf90",
+                    "nonce" : "0xc9f00eb362e50b89",
                     "number" : "0x01",
                     "parentHash" : "0xbf58e21ac02253cfcba703209378759b2f3c66fa718364b634ec8d627beb797b",
                     "receiptTrie" : "0x22aa8a5c024ee640ee1a9b16f85a4cc79c0080395348b5d271ae433c3c619fda",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0xb8a7152c9c0bb83a692af1ad691b61761217b50190bd6f4c8008c213a152f0d1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90322f901fca0bf58e21ac02253cfcba703209378759b2f3c66fa718364b634ec8d627beb797ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0bd6e3e3af4dd533dbfe7829b706f8ca0114ac2a16006620e845992875090ac33a0b8a7152c9c0bb83a692af1ad691b61761217b50190bd6f4c8008c213a152f0d1a022aa8a5c024ee640ee1a9b16f85a4cc79c0080395348b5d271ae433c3c619fdab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828b968203e880a0b9a032fec16cc27a858b2d8f8fe3ec8d8cb6a07fdb198a053af8c94e6ab70a1388ed3389216c474dbdf9011ff9011c8001841d7057a694095e7baea6a6c7c4c2dfeb977efac326af552d878441570179b8b67f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff40557cf03c31a361388d89ea8065866f1ba0d3b553fc888996d5841fb16d5bbc5da7dbb3e49e8e01ccae982e86e0c965ce24a0262e3133937e012df3aba5be6c0b5bd847ec8674e4471951c25a857a33ec3648c0",
+                "rlp" : "0xf90322f901fca0bf58e21ac02253cfcba703209378759b2f3c66fa718364b634ec8d627beb797ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0bd6e3e3af4dd533dbfe7829b706f8ca0114ac2a16006620e845992875090ac33a0b8a7152c9c0bb83a692af1ad691b61761217b50190bd6f4c8008c213a152f0d1a022aa8a5c024ee640ee1a9b16f85a4cc79c0080395348b5d271ae433c3c619fdab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828b968203e880a05511af9c9947005c584a0bb7da68b4a3dd2059ccbe4db012ae28f4a1b8afcf9088c9f00eb362e50b89f9011ff9011c8001841d7057a694095e7baea6a6c7c4c2dfeb977efac326af552d878441570179b8b67f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff40557cf03c31a361388d89ea8065866f1ba0d3b553fc888996d5841fb16d5bbc5da7dbb3e49e8e01ccae982e86e0c965ce24a0262e3133937e012df3aba5be6c0b5bd847ec8674e4471951c25a857a33ec3648c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff40557cf03c31a361388d89ea8065866f",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03e3afcd6e18f1dfa11c1693a7bdeffbfad54aa243d6f568d8cb0813b7866278aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe260f4ca53468b8b5f5b48a8801bfd8ee6407cba9acbba8a13e080629212e929",
+        "lastblockhash" : "0xe1488b9cddc2c8166d617fb3fb4b3d6c09e2ae5e9a9df7879ffefd5c54089177",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest613BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest613BC.json
index 7386df52b..8eb367736 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest613BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest613BC.json
@@ -2,8 +2,8 @@
     "randomStatetest613BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest613BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest613BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa096",
-                    "hash" : "0x4f02312de6ad0061d94acd357274c585cd1f3d238ad206681c75a83d1ab0f937",
-                    "mixHash" : "0xc054076801e33b1b45540b3c2773469ce660886889abb3ab1a3f37c06f20f9bb",
-                    "nonce" : "0x2278bc4265f99ea4",
+                    "hash" : "0x6583d204179f46bd085e76240c622a5f78884ba579efeea5e69d4a7f104cb584",
+                    "mixHash" : "0xa47ee77b1f275fcf2ae29f6c20d86a69f8cbfb0f7f540c346515b65ca8093ab8",
+                    "nonce" : "0xd21392b44855ea86",
                     "number" : "0x01",
                     "parentHash" : "0x194428a402934719ec092ef8c1c85f28dbf54860b469b4dfbb00e018ec96ca5a",
                     "receiptTrie" : "0x8a53e9ab087a9a9694f2b26a3cffce7b0c860614f89cc48d27b72b0cb3128c0a",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0194428a402934719ec092ef8c1c85f28dbf54860b469b4dfbb00e018ec96ca5aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a003a4e4f1e69074e56cf7374d988fbd2ee09be7ef8b2e413eb894cde1167d8b86a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa08a53e9ab087a9a9694f2b26a3cffce7b0c860614f89cc48d27b72b0cb3128c0ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0968203e880a0c054076801e33b1b45540b3c2773469ce660886889abb3ab1a3f37c06f20f9bb882278bc4265f99ea4f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0194428a402934719ec092ef8c1c85f28dbf54860b469b4dfbb00e018ec96ca5aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a003a4e4f1e69074e56cf7374d988fbd2ee09be7ef8b2e413eb894cde1167d8b86a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa08a53e9ab087a9a9694f2b26a3cffce7b0c860614f89cc48d27b72b0cb3128c0ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0968203e880a0a47ee77b1f275fcf2ae29f6c20d86a69f8cbfb0f7f540c346515b65ca8093ab888d21392b44855ea86f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00c88e4ce3d594e9177510d78469e8d3a2bb9d85c9c7ec40fd04c26f917b1ac71a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4f02312de6ad0061d94acd357274c585cd1f3d238ad206681c75a83d1ab0f937",
+        "lastblockhash" : "0x6583d204179f46bd085e76240c622a5f78884ba579efeea5e69d4a7f104cb584",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest613BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest613BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest613BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa3a2",
-                    "hash" : "0xa918d15265d4d4426216c6183ae4112e9d4929c9c189cf783b2b255e76a50132",
-                    "mixHash" : "0x093f23b32016f4b985f7b62eae97d942d1fede82f6d854d75e57deb104cb6047",
-                    "nonce" : "0x9275064eda9e0743",
+                    "hash" : "0xc674618ecc5ad9ee45589ee9f7a3b6bd805ba0afc08ded47219cd045646e959c",
+                    "mixHash" : "0x2a1d2efc5294b90bf12b0e2f65c02ee2dad0efacfb40222e0a78be41961510c2",
+                    "nonce" : "0xdede681421fc92c7",
                     "number" : "0x01",
                     "parentHash" : "0x194428a402934719ec092ef8c1c85f28dbf54860b469b4dfbb00e018ec96ca5a",
                     "receiptTrie" : "0xf0e54a5f3c88a2e5f836165884b2c32945a0c1c8c94bd3cde7ea67bf5b5a67e9",
-                    "stateRoot" : "0x5b5e6acff73c2362a6b08c63dbaca0e9decce3480bb464bd7eacdf3fffee7562",
+                    "stateRoot" : "0x756b289c6e3be1e084cede47313defe5b40eff91235c18a91956b5050d2b7d81",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0194428a402934719ec092ef8c1c85f28dbf54860b469b4dfbb00e018ec96ca5aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05b5e6acff73c2362a6b08c63dbaca0e9decce3480bb464bd7eacdf3fffee7562a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f0e54a5f3c88a2e5f836165884b2c32945a0c1c8c94bd3cde7ea67bf5b5a67e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a3a28203e880a0093f23b32016f4b985f7b62eae97d942d1fede82f6d854d75e57deb104cb6047889275064eda9e0743f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0194428a402934719ec092ef8c1c85f28dbf54860b469b4dfbb00e018ec96ca5aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0756b289c6e3be1e084cede47313defe5b40eff91235c18a91956b5050d2b7d81a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f0e54a5f3c88a2e5f836165884b2c32945a0c1c8c94bd3cde7ea67bf5b5a67e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a3a28203e880a02a1d2efc5294b90bf12b0e2f65c02ee2dad0efacfb40222e0a78be41961510c288dede681421fc92c7f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00c88e4ce3d594e9177510d78469e8d3a2bb9d85c9c7ec40fd04c26f917b1ac71a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa918d15265d4d4426216c6183ae4112e9d4929c9c189cf783b2b255e76a50132",
+        "lastblockhash" : "0xc674618ecc5ad9ee45589ee9f7a3b6bd805ba0afc08ded47219cd045646e959c",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x43414043454445450855",
@@ -235,8 +228,8 @@
     "randomStatetest613BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest613BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest613BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa096",
-                    "hash" : "0xb4c140ea92097b591f2dc16a3fa639b1cbff70faad4a1f4752592f1367d9b856",
-                    "mixHash" : "0x4632fc2d0a48d1ff0e6a80df037c64a719a0a0a24f85926ee17275d7f530f313",
-                    "nonce" : "0xeb0e88b33103a232",
+                    "hash" : "0x05e1270dbebebccd19a1b173a1dc3478eedb1fc4cdc3e51ee013d15d20ec5dbd",
+                    "mixHash" : "0x9b3f7ce2a9eeeee7d08c0f175e71bc6aff4e10a8c68581527cc688c4334a3e41",
+                    "nonce" : "0xb9fc77a1f0748470",
                     "number" : "0x01",
                     "parentHash" : "0x194428a402934719ec092ef8c1c85f28dbf54860b469b4dfbb00e018ec96ca5a",
                     "receiptTrie" : "0x3fdd59e5ad4d362f22aaeadba03a055e4c5f35782be77f1f4414dc95a79fd416",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0194428a402934719ec092ef8c1c85f28dbf54860b469b4dfbb00e018ec96ca5aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a064cbf99d61aefc9adf6854aef2f7cac8c832490a3a9de7f20eda90394da7d34da0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa03fdd59e5ad4d362f22aaeadba03a055e4c5f35782be77f1f4414dc95a79fd416b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0968203e880a04632fc2d0a48d1ff0e6a80df037c64a719a0a0a24f85926ee17275d7f530f31388eb0e88b33103a232f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0194428a402934719ec092ef8c1c85f28dbf54860b469b4dfbb00e018ec96ca5aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a064cbf99d61aefc9adf6854aef2f7cac8c832490a3a9de7f20eda90394da7d34da0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa03fdd59e5ad4d362f22aaeadba03a055e4c5f35782be77f1f4414dc95a79fd416b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0968203e880a09b3f7ce2a9eeeee7d08c0f175e71bc6aff4e10a8c68581527cc688c4334a3e4188b9fc77a1f0748470f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00c88e4ce3d594e9177510d78469e8d3a2bb9d85c9c7ec40fd04c26f917b1ac71a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb4c140ea92097b591f2dc16a3fa639b1cbff70faad4a1f4752592f1367d9b856",
+        "lastblockhash" : "0x05e1270dbebebccd19a1b173a1dc3478eedb1fc4cdc3e51ee013d15d20ec5dbd",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest613BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest613BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest613BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa096",
-                    "hash" : "0xff7e58d824393450ef3cd15673aae3ada388d698008adc967f8694938831c147",
-                    "mixHash" : "0xba58858d608ead65df1dc0d350c468c7b7e5acd4b41ff2249eacb2538cd7bb0b",
-                    "nonce" : "0xfd004af17f2aacc3",
+                    "hash" : "0x0e08cae33128e1f9fae920cd08aea25d7e9004bcb015796736a17a62680d1af3",
+                    "mixHash" : "0x1fcbe3bdc3d435c07254f10f33c8724512326620a8969bb92ffabb46c7426c48",
+                    "nonce" : "0x851656956cc1b335",
                     "number" : "0x01",
                     "parentHash" : "0x194428a402934719ec092ef8c1c85f28dbf54860b469b4dfbb00e018ec96ca5a",
                     "receiptTrie" : "0x3fdd59e5ad4d362f22aaeadba03a055e4c5f35782be77f1f4414dc95a79fd416",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0194428a402934719ec092ef8c1c85f28dbf54860b469b4dfbb00e018ec96ca5aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a064cbf99d61aefc9adf6854aef2f7cac8c832490a3a9de7f20eda90394da7d34da0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa03fdd59e5ad4d362f22aaeadba03a055e4c5f35782be77f1f4414dc95a79fd416b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0968203e880a0ba58858d608ead65df1dc0d350c468c7b7e5acd4b41ff2249eacb2538cd7bb0b88fd004af17f2aacc3f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0194428a402934719ec092ef8c1c85f28dbf54860b469b4dfbb00e018ec96ca5aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a064cbf99d61aefc9adf6854aef2f7cac8c832490a3a9de7f20eda90394da7d34da0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa03fdd59e5ad4d362f22aaeadba03a055e4c5f35782be77f1f4414dc95a79fd416b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0968203e880a01fcbe3bdc3d435c07254f10f33c8724512326620a8969bb92ffabb46c7426c4888851656956cc1b335f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00c88e4ce3d594e9177510d78469e8d3a2bb9d85c9c7ec40fd04c26f917b1ac71a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xff7e58d824393450ef3cd15673aae3ada388d698008adc967f8694938831c147",
+        "lastblockhash" : "0x0e08cae33128e1f9fae920cd08aea25d7e9004bcb015796736a17a62680d1af3",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest613BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest613BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest613BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa096",
-                    "hash" : "0xd982ac5d31b1e41a0d16316d5a26ea49c90befd1fb996441eb7552d29baf3a97",
-                    "mixHash" : "0x5708eef600d230382bcbd68bb85df69b5a45125d5fbc0807d80e543cd31a3936",
-                    "nonce" : "0xb6710cc8db7e1702",
+                    "hash" : "0x18208ab099e16948f28dc1582c98f8397889ab20523bd379351aa2f07d075850",
+                    "mixHash" : "0x7fcf9960cf3f9a16efd330586deddf5edebcddfffa6c65eb6d7af9d91f217380",
+                    "nonce" : "0x14ff842c88347456",
                     "number" : "0x01",
                     "parentHash" : "0x194428a402934719ec092ef8c1c85f28dbf54860b469b4dfbb00e018ec96ca5a",
                     "receiptTrie" : "0x3fdd59e5ad4d362f22aaeadba03a055e4c5f35782be77f1f4414dc95a79fd416",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0194428a402934719ec092ef8c1c85f28dbf54860b469b4dfbb00e018ec96ca5aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a064cbf99d61aefc9adf6854aef2f7cac8c832490a3a9de7f20eda90394da7d34da0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa03fdd59e5ad4d362f22aaeadba03a055e4c5f35782be77f1f4414dc95a79fd416b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0968203e880a05708eef600d230382bcbd68bb85df69b5a45125d5fbc0807d80e543cd31a393688b6710cc8db7e1702f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0194428a402934719ec092ef8c1c85f28dbf54860b469b4dfbb00e018ec96ca5aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a064cbf99d61aefc9adf6854aef2f7cac8c832490a3a9de7f20eda90394da7d34da0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa03fdd59e5ad4d362f22aaeadba03a055e4c5f35782be77f1f4414dc95a79fd416b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0968203e880a07fcf9960cf3f9a16efd330586deddf5edebcddfffa6c65eb6d7af9d91f2173808814ff842c88347456f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00c88e4ce3d594e9177510d78469e8d3a2bb9d85c9c7ec40fd04c26f917b1ac71a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd982ac5d31b1e41a0d16316d5a26ea49c90befd1fb996441eb7552d29baf3a97",
+        "lastblockhash" : "0x18208ab099e16948f28dc1582c98f8397889ab20523bd379351aa2f07d075850",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest613BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest613BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest613BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa096",
-                    "hash" : "0x938499ae673c84bb86120f9a21b803baee33816627aa7aab939a08f9a883fc13",
-                    "mixHash" : "0x7733ce2d54bff93145b2b60096a04de88ebff86c67adde1ad402c09a95dd7505",
-                    "nonce" : "0xbebccfff5bf50174",
+                    "hash" : "0x27c4d06a7e371ed0842331b6d16741aff3002b3147618f926c42e6717ef0bb9a",
+                    "mixHash" : "0xa7ee6defd3242062f227c7040e4f9e091bcf88cd3ebf6235bf2e53d88774de86",
+                    "nonce" : "0xa5c961a3deab521c",
                     "number" : "0x01",
                     "parentHash" : "0x194428a402934719ec092ef8c1c85f28dbf54860b469b4dfbb00e018ec96ca5a",
                     "receiptTrie" : "0x3fdd59e5ad4d362f22aaeadba03a055e4c5f35782be77f1f4414dc95a79fd416",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0194428a402934719ec092ef8c1c85f28dbf54860b469b4dfbb00e018ec96ca5aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a064cbf99d61aefc9adf6854aef2f7cac8c832490a3a9de7f20eda90394da7d34da0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa03fdd59e5ad4d362f22aaeadba03a055e4c5f35782be77f1f4414dc95a79fd416b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0968203e880a07733ce2d54bff93145b2b60096a04de88ebff86c67adde1ad402c09a95dd750588bebccfff5bf50174f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0194428a402934719ec092ef8c1c85f28dbf54860b469b4dfbb00e018ec96ca5aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a064cbf99d61aefc9adf6854aef2f7cac8c832490a3a9de7f20eda90394da7d34da0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa03fdd59e5ad4d362f22aaeadba03a055e4c5f35782be77f1f4414dc95a79fd416b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0968203e880a0a7ee6defd3242062f227c7040e4f9e091bcf88cd3ebf6235bf2e53d88774de8688a5c961a3deab521cf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00c88e4ce3d594e9177510d78469e8d3a2bb9d85c9c7ec40fd04c26f917b1ac71a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x938499ae673c84bb86120f9a21b803baee33816627aa7aab939a08f9a883fc13",
+        "lastblockhash" : "0x27c4d06a7e371ed0842331b6d16741aff3002b3147618f926c42e6717ef0bb9a",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest614BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest614BC.json
index 4f8261410..02f12f3b0 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest614BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest614BC.json
@@ -2,8 +2,8 @@
     "randomStatetest614BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest614BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest614BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x70ef",
-                    "hash" : "0x0fbf6526a579419f59d87769d13adfe1f8f29d0596bfe154eb3c0c3cfa33c08f",
-                    "mixHash" : "0xa32e0181aedca4f38053301cc537a6ea7162cfb89e72477c691e76dca160c10d",
-                    "nonce" : "0x3d06e027e9edffae",
+                    "hash" : "0x17c64bb2b576c46a792ebbe333e150557893338bac92ce1514b64586acdf2b02",
+                    "mixHash" : "0xfc808682e38ea1a599c8c03a1476379f1ad9a26359fc66ca425275330d6fea08",
+                    "nonce" : "0xe9db11dc8e32085e",
                     "number" : "0x01",
                     "parentHash" : "0x3b279236e0740a68bcb2e0e997454ff7dea41e136efa2006b0756ed5d185ff00",
                     "receiptTrie" : "0xf161cf0afeddc65bb1d7f11c871c39932270380385b91081d3c0188c1952b155",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca03b279236e0740a68bcb2e0e997454ff7dea41e136efa2006b0756ed5d185ff00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0faa5c2c7675f4b099bad5f2b5a9f235c041936f388c83abe6bcff9525dd8f9eaa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f161cf0afeddc65bb1d7f11c871c39932270380385b91081d3c0188c1952b155b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8270ef8203e880a0a32e0181aedca4f38053301cc537a6ea7162cfb89e72477c691e76dca160c10d883d06e027e9edffaef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca03b279236e0740a68bcb2e0e997454ff7dea41e136efa2006b0756ed5d185ff00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0faa5c2c7675f4b099bad5f2b5a9f235c041936f388c83abe6bcff9525dd8f9eaa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f161cf0afeddc65bb1d7f11c871c39932270380385b91081d3c0188c1952b155b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8270ef8203e880a0fc808682e38ea1a599c8c03a1476379f1ad9a26359fc66ca425275330d6fea0888e9db11dc8e32085ef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01dfe099ae82e9a8d78aa5619736e2399c60dfbde2b6c0d8295be702c7ecc6937a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0fbf6526a579419f59d87769d13adfe1f8f29d0596bfe154eb3c0c3cfa33c08f",
+        "lastblockhash" : "0x17c64bb2b576c46a792ebbe333e150557893338bac92ce1514b64586acdf2b02",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest614BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest614BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest614BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x73fb",
-                    "hash" : "0xcb92428014a39d98f4bec918e418db17cc426b8db6e1ccf3070ff08c3a8988ec",
-                    "mixHash" : "0x61ac66a5c17729fc3a5d909145f21d610d94362f84d733e838ccd2fc2d2ccec5",
-                    "nonce" : "0x2e6a19de3017ee43",
+                    "hash" : "0x53e06542559d5d48e18e4941cb4afde77579cfda84077a1b595ee24eaaa04f32",
+                    "mixHash" : "0x7d75bcb1d892a10a77989e223606fb3fc6051d76866e7d91143dac8254dc399c",
+                    "nonce" : "0x5387e5c43dae3401",
                     "number" : "0x01",
                     "parentHash" : "0x3b279236e0740a68bcb2e0e997454ff7dea41e136efa2006b0756ed5d185ff00",
                     "receiptTrie" : "0xb63be4a68532e4807b1bd5345e3031f82f96073fec003e6536b7101e81e045e4",
-                    "stateRoot" : "0xd994b1a2339f48fa72c8f6fa11a2db6520ac955eb3d2826915c82d7934ea38ec",
+                    "stateRoot" : "0xcdb5a517aa7f9e81b88cf1a18a48745e00719091711fae78376892b9bb83c623",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca03b279236e0740a68bcb2e0e997454ff7dea41e136efa2006b0756ed5d185ff00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d994b1a2339f48fa72c8f6fa11a2db6520ac955eb3d2826915c82d7934ea38eca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0b63be4a68532e4807b1bd5345e3031f82f96073fec003e6536b7101e81e045e4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8273fb8203e880a061ac66a5c17729fc3a5d909145f21d610d94362f84d733e838ccd2fc2d2ccec5882e6a19de3017ee43f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca03b279236e0740a68bcb2e0e997454ff7dea41e136efa2006b0756ed5d185ff00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cdb5a517aa7f9e81b88cf1a18a48745e00719091711fae78376892b9bb83c623a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0b63be4a68532e4807b1bd5345e3031f82f96073fec003e6536b7101e81e045e4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8273fb8203e880a07d75bcb1d892a10a77989e223606fb3fc6051d76866e7d91143dac8254dc399c885387e5c43dae3401f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01dfe099ae82e9a8d78aa5619736e2399c60dfbde2b6c0d8295be702c7ecc6937a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcb92428014a39d98f4bec918e418db17cc426b8db6e1ccf3070ff08c3a8988ec",
+        "lastblockhash" : "0x53e06542559d5d48e18e4941cb4afde77579cfda84077a1b595ee24eaaa04f32",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x42314441404342428595f25966869e4255",
@@ -233,8 +226,8 @@
     "randomStatetest614BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest614BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest614BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x70ef",
-                    "hash" : "0x5ebd97600eba1313ece746937d33021efaafa15ee302bdf5aa244c96526f454e",
-                    "mixHash" : "0xe54f8dd9f2e93456216fb35671f160ba783608bfa07bfb22750f7650a909b29d",
-                    "nonce" : "0xb66949d04d3c79be",
+                    "hash" : "0xdcb2dfed1155781eb2a428c143621353d959c63e73ab8ef57ac0952709c7e7d0",
+                    "mixHash" : "0x80eca3a8dee99b36ffe8282b726ba9983bc5f4239cf6d15f35f2c24817bea96a",
+                    "nonce" : "0x961065a789e3257a",
                     "number" : "0x01",
                     "parentHash" : "0x3b279236e0740a68bcb2e0e997454ff7dea41e136efa2006b0756ed5d185ff00",
                     "receiptTrie" : "0x436921bdacb0c2ead4660eb81d7e4082a69e5cb35325094a50b3517e306d05ba",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca03b279236e0740a68bcb2e0e997454ff7dea41e136efa2006b0756ed5d185ff00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c62cdf684b17692c95cc264a80a1716b187e1d777ff8d1a2a98a1b2e2922a24aa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0436921bdacb0c2ead4660eb81d7e4082a69e5cb35325094a50b3517e306d05bab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8270ef8203e880a0e54f8dd9f2e93456216fb35671f160ba783608bfa07bfb22750f7650a909b29d88b66949d04d3c79bef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca03b279236e0740a68bcb2e0e997454ff7dea41e136efa2006b0756ed5d185ff00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c62cdf684b17692c95cc264a80a1716b187e1d777ff8d1a2a98a1b2e2922a24aa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0436921bdacb0c2ead4660eb81d7e4082a69e5cb35325094a50b3517e306d05bab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8270ef8203e880a080eca3a8dee99b36ffe8282b726ba9983bc5f4239cf6d15f35f2c24817bea96a88961065a789e3257af865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01dfe099ae82e9a8d78aa5619736e2399c60dfbde2b6c0d8295be702c7ecc6937a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5ebd97600eba1313ece746937d33021efaafa15ee302bdf5aa244c96526f454e",
+        "lastblockhash" : "0xdcb2dfed1155781eb2a428c143621353d959c63e73ab8ef57ac0952709c7e7d0",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest614BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest614BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest614BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x70ef",
-                    "hash" : "0xbcf1e895356a43739efef252a1392d0fea200dfba825afd551af129caa3ab532",
-                    "mixHash" : "0x40e02650d8215bb3b88cb31bbda5ba81359076e7c02d4d2caea225b839d2fc19",
-                    "nonce" : "0x189224da1b06e33d",
+                    "hash" : "0xaeafc2406067793e0e72a1918075b0bf437791efb5c290c48a55f5efba3f265e",
+                    "mixHash" : "0x65ab65182896ddfcd179ab719a596a1605c3db5695adcf395bb0a13ce46ba082",
+                    "nonce" : "0xc88c1d1c02ff02cd",
                     "number" : "0x01",
                     "parentHash" : "0x3b279236e0740a68bcb2e0e997454ff7dea41e136efa2006b0756ed5d185ff00",
                     "receiptTrie" : "0x436921bdacb0c2ead4660eb81d7e4082a69e5cb35325094a50b3517e306d05ba",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca03b279236e0740a68bcb2e0e997454ff7dea41e136efa2006b0756ed5d185ff00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c62cdf684b17692c95cc264a80a1716b187e1d777ff8d1a2a98a1b2e2922a24aa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0436921bdacb0c2ead4660eb81d7e4082a69e5cb35325094a50b3517e306d05bab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8270ef8203e880a040e02650d8215bb3b88cb31bbda5ba81359076e7c02d4d2caea225b839d2fc1988189224da1b06e33df865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca03b279236e0740a68bcb2e0e997454ff7dea41e136efa2006b0756ed5d185ff00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c62cdf684b17692c95cc264a80a1716b187e1d777ff8d1a2a98a1b2e2922a24aa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0436921bdacb0c2ead4660eb81d7e4082a69e5cb35325094a50b3517e306d05bab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8270ef8203e880a065ab65182896ddfcd179ab719a596a1605c3db5695adcf395bb0a13ce46ba08288c88c1d1c02ff02cdf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01dfe099ae82e9a8d78aa5619736e2399c60dfbde2b6c0d8295be702c7ecc6937a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbcf1e895356a43739efef252a1392d0fea200dfba825afd551af129caa3ab532",
+        "lastblockhash" : "0xaeafc2406067793e0e72a1918075b0bf437791efb5c290c48a55f5efba3f265e",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest614BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest614BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest614BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6cdf",
-                    "hash" : "0x1e0dd112f79e24a60cc1e8edad2e42939c8542519e720f48f2f9c393723a3075",
-                    "mixHash" : "0x75f4e41fcf46b3bda98e47962cb1d7f2d02ab3327c060f9b6f13a166198862fa",
-                    "nonce" : "0x9dcc5f7f98005071",
+                    "hash" : "0x397b33c2d9154d57b084bfb336ef03f906d0141d1b9f0858458fe6a16f890196",
+                    "mixHash" : "0x437fbad911f37948781ac955af2f2341e3b3b647e2ba55023f3e0836b875a88b",
+                    "nonce" : "0x10b6efa6159cdb98",
                     "number" : "0x01",
                     "parentHash" : "0x3b279236e0740a68bcb2e0e997454ff7dea41e136efa2006b0756ed5d185ff00",
                     "receiptTrie" : "0x99eabde9c0834db7d8fc09f73ebaa95c73f0e70ea023acbb36120545d579b336",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca03b279236e0740a68bcb2e0e997454ff7dea41e136efa2006b0756ed5d185ff00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08dd2b84e56d8bd92faa104b16cd651c4896b7b97337af61922ac38a5b167f186a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa099eabde9c0834db7d8fc09f73ebaa95c73f0e70ea023acbb36120545d579b336b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826cdf8203e880a075f4e41fcf46b3bda98e47962cb1d7f2d02ab3327c060f9b6f13a166198862fa889dcc5f7f98005071f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca03b279236e0740a68bcb2e0e997454ff7dea41e136efa2006b0756ed5d185ff00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08dd2b84e56d8bd92faa104b16cd651c4896b7b97337af61922ac38a5b167f186a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa099eabde9c0834db7d8fc09f73ebaa95c73f0e70ea023acbb36120545d579b336b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826cdf8203e880a0437fbad911f37948781ac955af2f2341e3b3b647e2ba55023f3e0836b875a88b8810b6efa6159cdb98f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01dfe099ae82e9a8d78aa5619736e2399c60dfbde2b6c0d8295be702c7ecc6937a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1e0dd112f79e24a60cc1e8edad2e42939c8542519e720f48f2f9c393723a3075",
+        "lastblockhash" : "0x397b33c2d9154d57b084bfb336ef03f906d0141d1b9f0858458fe6a16f890196",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest614BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest614BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest614BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6cdf",
-                    "hash" : "0xc20b8068ef00e921396d88761edeb832d56809f374b67fc127a9c484f9e28be6",
-                    "mixHash" : "0xb1d1ddf1bedb9b7c1671dca524f5af556611384144456f3dbf2eb1fac640cc95",
-                    "nonce" : "0x4611c7832ab34442",
+                    "hash" : "0x5b9a2df8f38b842585a79df45071616975e2a620bc5259c60141cbce20c0ca1a",
+                    "mixHash" : "0x662200ef08b019bc791c65f50b5292623e1293cdd0fa733ed58b0342248aaa42",
+                    "nonce" : "0x659375519b13e935",
                     "number" : "0x01",
                     "parentHash" : "0x3b279236e0740a68bcb2e0e997454ff7dea41e136efa2006b0756ed5d185ff00",
                     "receiptTrie" : "0x99eabde9c0834db7d8fc09f73ebaa95c73f0e70ea023acbb36120545d579b336",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca03b279236e0740a68bcb2e0e997454ff7dea41e136efa2006b0756ed5d185ff00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08dd2b84e56d8bd92faa104b16cd651c4896b7b97337af61922ac38a5b167f186a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa099eabde9c0834db7d8fc09f73ebaa95c73f0e70ea023acbb36120545d579b336b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826cdf8203e880a0b1d1ddf1bedb9b7c1671dca524f5af556611384144456f3dbf2eb1fac640cc95884611c7832ab34442f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca03b279236e0740a68bcb2e0e997454ff7dea41e136efa2006b0756ed5d185ff00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08dd2b84e56d8bd92faa104b16cd651c4896b7b97337af61922ac38a5b167f186a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa099eabde9c0834db7d8fc09f73ebaa95c73f0e70ea023acbb36120545d579b336b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826cdf8203e880a0662200ef08b019bc791c65f50b5292623e1293cdd0fa733ed58b0342248aaa4288659375519b13e935f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01dfe099ae82e9a8d78aa5619736e2399c60dfbde2b6c0d8295be702c7ecc6937a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc20b8068ef00e921396d88761edeb832d56809f374b67fc127a9c484f9e28be6",
+        "lastblockhash" : "0x5b9a2df8f38b842585a79df45071616975e2a620bc5259c60141cbce20c0ca1a",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest617BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest617BC.json
index 199ac26a3..4396da85a 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest617BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest617BC.json
@@ -2,8 +2,8 @@
     "randomStatetest617BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest617BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest617BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x591c",
-                    "hash" : "0x15fc41a4e4166f973193267c397d52f26164368e741c95b5a62795aab6e0266c",
-                    "mixHash" : "0x84b4eebe7ac3889c88b336bef9b886edde3d69a0e094ed03c59597894e0920e3",
-                    "nonce" : "0x2f21fe40a1d3df20",
+                    "hash" : "0xd67add821e02318d955882b156f29fcd0c8bb6b03100222c27d1befa404defcf",
+                    "mixHash" : "0x09067281cc9c6ea7e787327765081315bd443f5edccb336b07b39bee179f9a4c",
+                    "nonce" : "0x487e3077921e488e",
                     "number" : "0x01",
                     "parentHash" : "0x765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8",
                     "receiptTrie" : "0xe70697c97a69fe55110c858f0511ce66711a35ac982833c9f631ec42fc4230fa",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07c7aace76c3fd5237e4a71b449bff360d483fb3106e1b23e5cbefb6940c70203a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e70697c97a69fe55110c858f0511ce66711a35ac982833c9f631ec42fc4230fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82591c8203e880a084b4eebe7ac3889c88b336bef9b886edde3d69a0e094ed03c59597894e0920e3882f21fe40a1d3df20f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07c7aace76c3fd5237e4a71b449bff360d483fb3106e1b23e5cbefb6940c70203a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e70697c97a69fe55110c858f0511ce66711a35ac982833c9f631ec42fc4230fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82591c8203e880a009067281cc9c6ea7e787327765081315bd443f5edccb336b07b39bee179f9a4c88487e3077921e488ef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05fed97df9bc7018718cbf29f6c2e76f0038587800b0e17d8d6496fce93741e06a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x15fc41a4e4166f973193267c397d52f26164368e741c95b5a62795aab6e0266c",
+        "lastblockhash" : "0xd67add821e02318d955882b156f29fcd0c8bb6b03100222c27d1befa404defcf",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest617BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest617BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest617BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5c28",
-                    "hash" : "0xf2a3c9954a5230c1e03f7ce05ebca12698257b530c089fb6a82df27357a6b0b1",
-                    "mixHash" : "0x5838af33ab7d6f65f989790736556f4a2d7f1275dced8ba883af5c57aba0041c",
-                    "nonce" : "0xd83ac48bd02411c6",
+                    "hash" : "0xc2360991e57455d6ce0f6e5dff1353f19454a425962646084c276149b7b0c1a3",
+                    "mixHash" : "0x763b412709030f3b1acebb33f11901306a16dfa8f2cff695e522d154255f96d4",
+                    "nonce" : "0xc3f908d6ca86f913",
                     "number" : "0x01",
                     "parentHash" : "0x765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8",
                     "receiptTrie" : "0xd02630f7dbb3efc9505d206c9ade76aab9df754e67c12768a5a81fbcbc0b5ed8",
-                    "stateRoot" : "0xfc2e8c610e11fbe85a1582d51549a41c20d3c91a7f3a3db0a168441f239262ff",
+                    "stateRoot" : "0xcb6e87a942c2226adc763370d4e88f61b74b5c0fdd3c4378c44206247c1806ec",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fc2e8c610e11fbe85a1582d51549a41c20d3c91a7f3a3db0a168441f239262ffa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d02630f7dbb3efc9505d206c9ade76aab9df754e67c12768a5a81fbcbc0b5ed8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff825c288203e880a05838af33ab7d6f65f989790736556f4a2d7f1275dced8ba883af5c57aba0041c88d83ac48bd02411c6f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cb6e87a942c2226adc763370d4e88f61b74b5c0fdd3c4378c44206247c1806eca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d02630f7dbb3efc9505d206c9ade76aab9df754e67c12768a5a81fbcbc0b5ed8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff825c288203e880a0763b412709030f3b1acebb33f11901306a16dfa8f2cff695e522d154255f96d488c3f908d6ca86f913f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05fed97df9bc7018718cbf29f6c2e76f0038587800b0e17d8d6496fce93741e06a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf2a3c9954a5230c1e03f7ce05ebca12698257b530c089fb6a82df27357a6b0b1",
+        "lastblockhash" : "0xc2360991e57455d6ce0f6e5dff1353f19454a425962646084c276149b7b0c1a3",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x4343404443434144133642f2",
@@ -233,8 +226,8 @@
     "randomStatetest617BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest617BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest617BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x591c",
-                    "hash" : "0x33e3e78941bfdc422d2eaad6b2b47ed847de427d0e1bfa7423f0f78896430091",
-                    "mixHash" : "0xbc69b0c07b02e78529aa35c66365ae14db82e21564822c29c7c7a44fe55bd19e",
-                    "nonce" : "0x98e0d1477457b639",
+                    "hash" : "0x48d1263f0d4d0aee07121cf185fcc7651ee2607d66b6536ffdc4a3e33902f496",
+                    "mixHash" : "0xc6da0bf68f4d5e9a2be254ab606dd27acbf96ff2a7504166e12afa272c961bec",
+                    "nonce" : "0x1850eccf0948e3d7",
                     "number" : "0x01",
                     "parentHash" : "0x765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8",
                     "receiptTrie" : "0xe46cd282d3dcab9c2626583b6a33ea1959b00210037abc060f7491ee7064c12f",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09b45c55968f312d5b6753d9e5c4645fd5d28a36f8ffc882a00c6234ba2979505a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e46cd282d3dcab9c2626583b6a33ea1959b00210037abc060f7491ee7064c12fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82591c8203e880a0bc69b0c07b02e78529aa35c66365ae14db82e21564822c29c7c7a44fe55bd19e8898e0d1477457b639f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09b45c55968f312d5b6753d9e5c4645fd5d28a36f8ffc882a00c6234ba2979505a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e46cd282d3dcab9c2626583b6a33ea1959b00210037abc060f7491ee7064c12fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82591c8203e880a0c6da0bf68f4d5e9a2be254ab606dd27acbf96ff2a7504166e12afa272c961bec881850eccf0948e3d7f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05fed97df9bc7018718cbf29f6c2e76f0038587800b0e17d8d6496fce93741e06a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x33e3e78941bfdc422d2eaad6b2b47ed847de427d0e1bfa7423f0f78896430091",
+        "lastblockhash" : "0x48d1263f0d4d0aee07121cf185fcc7651ee2607d66b6536ffdc4a3e33902f496",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest617BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest617BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest617BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x591c",
-                    "hash" : "0x72c071d1a9115b63180c8415f48686864d920410434e8d5929243af3bd70f98f",
-                    "mixHash" : "0xd38702ce5ea0fd6e383547d6bacb91dfded7753eef3fadd6cf39bb6c53f786a2",
-                    "nonce" : "0x7b70cdb1bfb59934",
+                    "hash" : "0xc40b47771510b93217119bfbadf96a780d38de52386410d20224278b8db5d699",
+                    "mixHash" : "0x2e05c990754d795bcafa6df92f5faf879d745b3ce8000e317b14f9977659b8d0",
+                    "nonce" : "0xa9b05c8acd42e4e7",
                     "number" : "0x01",
                     "parentHash" : "0x765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8",
                     "receiptTrie" : "0xe46cd282d3dcab9c2626583b6a33ea1959b00210037abc060f7491ee7064c12f",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09b45c55968f312d5b6753d9e5c4645fd5d28a36f8ffc882a00c6234ba2979505a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e46cd282d3dcab9c2626583b6a33ea1959b00210037abc060f7491ee7064c12fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82591c8203e880a0d38702ce5ea0fd6e383547d6bacb91dfded7753eef3fadd6cf39bb6c53f786a2887b70cdb1bfb59934f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09b45c55968f312d5b6753d9e5c4645fd5d28a36f8ffc882a00c6234ba2979505a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e46cd282d3dcab9c2626583b6a33ea1959b00210037abc060f7491ee7064c12fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82591c8203e880a02e05c990754d795bcafa6df92f5faf879d745b3ce8000e317b14f9977659b8d088a9b05c8acd42e4e7f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05fed97df9bc7018718cbf29f6c2e76f0038587800b0e17d8d6496fce93741e06a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x72c071d1a9115b63180c8415f48686864d920410434e8d5929243af3bd70f98f",
+        "lastblockhash" : "0xc40b47771510b93217119bfbadf96a780d38de52386410d20224278b8db5d699",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest617BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest617BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest617BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5688",
-                    "hash" : "0x808a53a612758217df42ae49146b6c0c6526398db6d433844bbbc78ed2d8a507",
-                    "mixHash" : "0x91a489073698ecb2cab9845ae86683b2efaffc09d0656ea4e0d052576d66b96d",
-                    "nonce" : "0x31e94d7b6f83f871",
+                    "hash" : "0x5f453ec01fce1779b13d5cbf5e2daf737e3391219afcc7c5258c60724a9f053b",
+                    "mixHash" : "0x88186e353268b8bd770c13648b4a813a0a8fe49be1a1b6d117907fb46e1942f0",
+                    "nonce" : "0xca9d1eca015fe443",
                     "number" : "0x01",
                     "parentHash" : "0x765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8",
                     "receiptTrie" : "0xccb5f5c462a9e5f438b77996df85e2a84f7dc63075273475f8b985206eb4a726",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00a4ab7f6929cea37c5a694fee1eb2d7a234db2447c3749eaa676ef4f26e9704fa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0ccb5f5c462a9e5f438b77996df85e2a84f7dc63075273475f8b985206eb4a726b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8256888203e880a091a489073698ecb2cab9845ae86683b2efaffc09d0656ea4e0d052576d66b96d8831e94d7b6f83f871f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00a4ab7f6929cea37c5a694fee1eb2d7a234db2447c3749eaa676ef4f26e9704fa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0ccb5f5c462a9e5f438b77996df85e2a84f7dc63075273475f8b985206eb4a726b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8256888203e880a088186e353268b8bd770c13648b4a813a0a8fe49be1a1b6d117907fb46e1942f088ca9d1eca015fe443f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05fed97df9bc7018718cbf29f6c2e76f0038587800b0e17d8d6496fce93741e06a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x808a53a612758217df42ae49146b6c0c6526398db6d433844bbbc78ed2d8a507",
+        "lastblockhash" : "0x5f453ec01fce1779b13d5cbf5e2daf737e3391219afcc7c5258c60724a9f053b",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest617BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest617BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest617BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5688",
-                    "hash" : "0x0d695dfd2b978772225eb184d35b209378c44e351e1e0a47b41c1a23cff1c0a0",
-                    "mixHash" : "0x45b9b3e37dd32db7cdbf9f68de29ec3a1a0dba32f35b2370f3dbacb0df62cbdc",
-                    "nonce" : "0x5230364fba1827a9",
+                    "hash" : "0x84b8ce1c1551654f5c8ea4fc45490abf3ce97055220b51a172706bb965eda469",
+                    "mixHash" : "0x70f442bfc151eda4a5d46b91b38c7779c19998ef37e82d1a7881518effd1bb60",
+                    "nonce" : "0x3784bef0129a3983",
                     "number" : "0x01",
                     "parentHash" : "0x765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8",
                     "receiptTrie" : "0xccb5f5c462a9e5f438b77996df85e2a84f7dc63075273475f8b985206eb4a726",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00a4ab7f6929cea37c5a694fee1eb2d7a234db2447c3749eaa676ef4f26e9704fa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0ccb5f5c462a9e5f438b77996df85e2a84f7dc63075273475f8b985206eb4a726b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8256888203e880a045b9b3e37dd32db7cdbf9f68de29ec3a1a0dba32f35b2370f3dbacb0df62cbdc885230364fba1827a9f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00a4ab7f6929cea37c5a694fee1eb2d7a234db2447c3749eaa676ef4f26e9704fa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0ccb5f5c462a9e5f438b77996df85e2a84f7dc63075273475f8b985206eb4a726b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8256888203e880a070f442bfc151eda4a5d46b91b38c7779c19998ef37e82d1a7881518effd1bb60883784bef0129a3983f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05fed97df9bc7018718cbf29f6c2e76f0038587800b0e17d8d6496fce93741e06a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0d695dfd2b978772225eb184d35b209378c44e351e1e0a47b41c1a23cff1c0a0",
+        "lastblockhash" : "0x84b8ce1c1551654f5c8ea4fc45490abf3ce97055220b51a172706bb965eda469",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest61BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest61BC.json
index d379502ea..e29b9af1d 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest61BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest61BC.json
@@ -2,8 +2,8 @@
     "randomStatetest61BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest61BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest61BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6d34",
-                    "hash" : "0xf8e9f0520919ed09ea19c4116718f47f0558461f792254984ac2d510e7c89e25",
-                    "mixHash" : "0x1965b8567cb5da3fc63a93a4c0914b41f6687b4b3ce6360c071366217a8df04d",
-                    "nonce" : "0x0f77d9a4f90ae24f",
+                    "hash" : "0x09e90a95ca494358c05c620033d4972248399926087b1122e7a9f72ab5517042",
+                    "mixHash" : "0x9b6e509dd8efab733199f170594c012fbfcf5eaaaf721b74edf4f40b000639cd",
+                    "nonce" : "0xa1f448c590e3b071",
                     "number" : "0x01",
                     "parentHash" : "0x755a90b35eea17c4352d5c1dfc411980202e70237c2e1fd225157b3bb683b361",
                     "receiptTrie" : "0xdd9176e427c40cffe57b4847ce4afe10577cd702095b73c3160258d7f40afb00",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x2ad97ba4e5308b672fe93b205fbcb77c8ac803e9acf2419e654d04e813f3c84a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9035cf901fca0755a90b35eea17c4352d5c1dfc411980202e70237c2e1fd225157b3bb683b361a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a062074f54a6a429fdf5e7ae6b79c433f4d6b12ab519efc3c8b508cc248dab8b27a02ad97ba4e5308b672fe93b205fbcb77c8ac803e9acf2419e654d04e813f3c84aa0dd9176e427c40cffe57b4847ce4afe10577cd702095b73c3160258d7f40afb00b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826d348203e880a01965b8567cb5da3fc63a93a4c0914b41f6687b4b3ce6360c071366217a8df04d880f77d9a4f90ae24ff90159f9015680018449bfbdd594095e7baea6a6c7c4c2dfeb977efac326af552d87846899bd45b8f07f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f00000000000000000000000100000000000000000000000000000000000000006b39427d917416721ba0f6cb5bfe7d65cbfcc22709673c6f88d5b10121265b52192b1779d8a4cfacd338a00187221c58f9848922362455a12729acd3ce9da209b796b3d4fd8a9ce8dfe314c0",
+                "rlp" : "0xf9035cf901fca0755a90b35eea17c4352d5c1dfc411980202e70237c2e1fd225157b3bb683b361a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a062074f54a6a429fdf5e7ae6b79c433f4d6b12ab519efc3c8b508cc248dab8b27a02ad97ba4e5308b672fe93b205fbcb77c8ac803e9acf2419e654d04e813f3c84aa0dd9176e427c40cffe57b4847ce4afe10577cd702095b73c3160258d7f40afb00b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826d348203e880a09b6e509dd8efab733199f170594c012fbfcf5eaaaf721b74edf4f40b000639cd88a1f448c590e3b071f90159f9015680018449bfbdd594095e7baea6a6c7c4c2dfeb977efac326af552d87846899bd45b8f07f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f00000000000000000000000100000000000000000000000000000000000000006b39427d917416721ba0f6cb5bfe7d65cbfcc22709673c6f88d5b10121265b52192b1779d8a4cfacd338a00187221c58f9848922362455a12729acd3ce9da209b796b3d4fd8a9ce8dfe314c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f00000000000000000000000100000000000000000000000000000000000000006b39427d91741672",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ec8cab4170da9066850feacd6487932c46bed7e4510546ab98fda6dfe4fa6119a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf8e9f0520919ed09ea19c4116718f47f0558461f792254984ac2d510e7c89e25",
+        "lastblockhash" : "0x09e90a95ca494358c05c620033d4972248399926087b1122e7a9f72ab5517042",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest61BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest61BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest61BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x7040",
-                    "hash" : "0x9cfc92fb36ebb5764d6d2e9b6387c3289a690c2bc4a57508d4f9d7843f65edf0",
-                    "mixHash" : "0x9f1e7dea403ae434c4cf72c698473f09943a6ed8e90cf8a1b21308f4ce384337",
-                    "nonce" : "0xd40350038a54fe7f",
+                    "hash" : "0x62ab30cc519f731c208103db234a288b4b13d7fe7d6ada569bae513ce416cbda",
+                    "mixHash" : "0x1b6c247571fd911aba9609f0f763eac7c535893fbe474b7c814c2cf3a8376120",
+                    "nonce" : "0x055a43e2ecb8046d",
                     "number" : "0x01",
                     "parentHash" : "0x755a90b35eea17c4352d5c1dfc411980202e70237c2e1fd225157b3bb683b361",
                     "receiptTrie" : "0xc6d302feac063098f04b4688561b47082bae0329a0d5168628751b64838c2afe",
-                    "stateRoot" : "0x05ee552235278f99213be2a887453cac9ccc9b7459e3f08e17d80659d24626d7",
+                    "stateRoot" : "0xd2c17c280dd8e824511997a502304313ec233bc5a44b0524bcc9adc1097ea1bd",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2ad97ba4e5308b672fe93b205fbcb77c8ac803e9acf2419e654d04e813f3c84a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9035cf901fca0755a90b35eea17c4352d5c1dfc411980202e70237c2e1fd225157b3bb683b361a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a005ee552235278f99213be2a887453cac9ccc9b7459e3f08e17d80659d24626d7a02ad97ba4e5308b672fe93b205fbcb77c8ac803e9acf2419e654d04e813f3c84aa0c6d302feac063098f04b4688561b47082bae0329a0d5168628751b64838c2afeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8270408203e880a09f1e7dea403ae434c4cf72c698473f09943a6ed8e90cf8a1b21308f4ce38433788d40350038a54fe7ff90159f9015680018449bfbdd594095e7baea6a6c7c4c2dfeb977efac326af552d87846899bd45b8f07f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f00000000000000000000000100000000000000000000000000000000000000006b39427d917416721ba0f6cb5bfe7d65cbfcc22709673c6f88d5b10121265b52192b1779d8a4cfacd338a00187221c58f9848922362455a12729acd3ce9da209b796b3d4fd8a9ce8dfe314c0",
+                "rlp" : "0xf9035cf901fca0755a90b35eea17c4352d5c1dfc411980202e70237c2e1fd225157b3bb683b361a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d2c17c280dd8e824511997a502304313ec233bc5a44b0524bcc9adc1097ea1bda02ad97ba4e5308b672fe93b205fbcb77c8ac803e9acf2419e654d04e813f3c84aa0c6d302feac063098f04b4688561b47082bae0329a0d5168628751b64838c2afeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8270408203e880a01b6c247571fd911aba9609f0f763eac7c535893fbe474b7c814c2cf3a837612088055a43e2ecb8046df90159f9015680018449bfbdd594095e7baea6a6c7c4c2dfeb977efac326af552d87846899bd45b8f07f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f00000000000000000000000100000000000000000000000000000000000000006b39427d917416721ba0f6cb5bfe7d65cbfcc22709673c6f88d5b10121265b52192b1779d8a4cfacd338a00187221c58f9848922362455a12729acd3ce9da209b796b3d4fd8a9ce8dfe314c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f00000000000000000000000100000000000000000000000000000000000000006b39427d91741672",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ec8cab4170da9066850feacd6487932c46bed7e4510546ab98fda6dfe4fa6119a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9cfc92fb36ebb5764d6d2e9b6387c3289a690c2bc4a57508d4f9d7843f65edf0",
+        "lastblockhash" : "0x62ab30cc519f731c208103db234a288b4b13d7fe7d6ada569bae513ce416cbda",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x6899bd45",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f00000000000000000000000100000000000000000000000000000000000000006b39427d9174167255",
@@ -233,8 +226,8 @@
     "randomStatetest61BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest61BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest61BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6d34",
-                    "hash" : "0x1b6408cb80155735eb290eb2028bd8c5f4de88840723c6b44c9178a2a1c3f464",
-                    "mixHash" : "0xc4b6063c3f37a94e3ae290b8d0f616df9ac1584a8fa135dd7e9dec9ae356f90d",
-                    "nonce" : "0x86a1282a867229a2",
+                    "hash" : "0xc8ca914c347280e704f89411fd297a6ee0cffe8223a36638616bf900e2a733f3",
+                    "mixHash" : "0xf3da13dc88bf51cbe9ce355264246a8690c997c008adbf15a3695fe02df4908d",
+                    "nonce" : "0x302f93c98d9ae2dd",
                     "number" : "0x01",
                     "parentHash" : "0x755a90b35eea17c4352d5c1dfc411980202e70237c2e1fd225157b3bb683b361",
                     "receiptTrie" : "0x396982f005e8b24509d290cbe28d210f6ceae2242bb99b46023c49097eb09c3b",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0x2ad97ba4e5308b672fe93b205fbcb77c8ac803e9acf2419e654d04e813f3c84a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9035cf901fca0755a90b35eea17c4352d5c1dfc411980202e70237c2e1fd225157b3bb683b361a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0adaffd583f21a9048c1c486fcf6c4214d95d30cb47a37930d724eef948b2da11a02ad97ba4e5308b672fe93b205fbcb77c8ac803e9acf2419e654d04e813f3c84aa0396982f005e8b24509d290cbe28d210f6ceae2242bb99b46023c49097eb09c3bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826d348203e880a0c4b6063c3f37a94e3ae290b8d0f616df9ac1584a8fa135dd7e9dec9ae356f90d8886a1282a867229a2f90159f9015680018449bfbdd594095e7baea6a6c7c4c2dfeb977efac326af552d87846899bd45b8f07f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f00000000000000000000000100000000000000000000000000000000000000006b39427d917416721ba0f6cb5bfe7d65cbfcc22709673c6f88d5b10121265b52192b1779d8a4cfacd338a00187221c58f9848922362455a12729acd3ce9da209b796b3d4fd8a9ce8dfe314c0",
+                "rlp" : "0xf9035cf901fca0755a90b35eea17c4352d5c1dfc411980202e70237c2e1fd225157b3bb683b361a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0adaffd583f21a9048c1c486fcf6c4214d95d30cb47a37930d724eef948b2da11a02ad97ba4e5308b672fe93b205fbcb77c8ac803e9acf2419e654d04e813f3c84aa0396982f005e8b24509d290cbe28d210f6ceae2242bb99b46023c49097eb09c3bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826d348203e880a0f3da13dc88bf51cbe9ce355264246a8690c997c008adbf15a3695fe02df4908d88302f93c98d9ae2ddf90159f9015680018449bfbdd594095e7baea6a6c7c4c2dfeb977efac326af552d87846899bd45b8f07f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f00000000000000000000000100000000000000000000000000000000000000006b39427d917416721ba0f6cb5bfe7d65cbfcc22709673c6f88d5b10121265b52192b1779d8a4cfacd338a00187221c58f9848922362455a12729acd3ce9da209b796b3d4fd8a9ce8dfe314c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f00000000000000000000000100000000000000000000000000000000000000006b39427d91741672",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ec8cab4170da9066850feacd6487932c46bed7e4510546ab98fda6dfe4fa6119a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1b6408cb80155735eb290eb2028bd8c5f4de88840723c6b44c9178a2a1c3f464",
+        "lastblockhash" : "0xc8ca914c347280e704f89411fd297a6ee0cffe8223a36638616bf900e2a733f3",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest61BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest61BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest61BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6d34",
-                    "hash" : "0x3827f5fb51b0a1c00b8ed872d7f4232c9262b92f4e7e334894e650062608f947",
-                    "mixHash" : "0x05a4b7b5a0e603223e9eefa329c5ed37bbefd87e6ac10486fb75e386e0305e8c",
-                    "nonce" : "0x263b487e2a351f43",
+                    "hash" : "0xb882c5133f3770f3df99ef98ca931f08df242456310fd7df090850301e8b6d6a",
+                    "mixHash" : "0x01fe591f596f5fb661c0650006f4f0c09c64941b70d51b2fa8c4b56706160284",
+                    "nonce" : "0xc4c55d09506db993",
                     "number" : "0x01",
                     "parentHash" : "0x755a90b35eea17c4352d5c1dfc411980202e70237c2e1fd225157b3bb683b361",
                     "receiptTrie" : "0x396982f005e8b24509d290cbe28d210f6ceae2242bb99b46023c49097eb09c3b",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0x2ad97ba4e5308b672fe93b205fbcb77c8ac803e9acf2419e654d04e813f3c84a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9035cf901fca0755a90b35eea17c4352d5c1dfc411980202e70237c2e1fd225157b3bb683b361a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0adaffd583f21a9048c1c486fcf6c4214d95d30cb47a37930d724eef948b2da11a02ad97ba4e5308b672fe93b205fbcb77c8ac803e9acf2419e654d04e813f3c84aa0396982f005e8b24509d290cbe28d210f6ceae2242bb99b46023c49097eb09c3bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826d348203e880a005a4b7b5a0e603223e9eefa329c5ed37bbefd87e6ac10486fb75e386e0305e8c88263b487e2a351f43f90159f9015680018449bfbdd594095e7baea6a6c7c4c2dfeb977efac326af552d87846899bd45b8f07f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f00000000000000000000000100000000000000000000000000000000000000006b39427d917416721ba0f6cb5bfe7d65cbfcc22709673c6f88d5b10121265b52192b1779d8a4cfacd338a00187221c58f9848922362455a12729acd3ce9da209b796b3d4fd8a9ce8dfe314c0",
+                "rlp" : "0xf9035cf901fca0755a90b35eea17c4352d5c1dfc411980202e70237c2e1fd225157b3bb683b361a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0adaffd583f21a9048c1c486fcf6c4214d95d30cb47a37930d724eef948b2da11a02ad97ba4e5308b672fe93b205fbcb77c8ac803e9acf2419e654d04e813f3c84aa0396982f005e8b24509d290cbe28d210f6ceae2242bb99b46023c49097eb09c3bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826d348203e880a001fe591f596f5fb661c0650006f4f0c09c64941b70d51b2fa8c4b5670616028488c4c55d09506db993f90159f9015680018449bfbdd594095e7baea6a6c7c4c2dfeb977efac326af552d87846899bd45b8f07f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f00000000000000000000000100000000000000000000000000000000000000006b39427d917416721ba0f6cb5bfe7d65cbfcc22709673c6f88d5b10121265b52192b1779d8a4cfacd338a00187221c58f9848922362455a12729acd3ce9da209b796b3d4fd8a9ce8dfe314c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f00000000000000000000000100000000000000000000000000000000000000006b39427d91741672",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ec8cab4170da9066850feacd6487932c46bed7e4510546ab98fda6dfe4fa6119a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3827f5fb51b0a1c00b8ed872d7f4232c9262b92f4e7e334894e650062608f947",
+        "lastblockhash" : "0xb882c5133f3770f3df99ef98ca931f08df242456310fd7df090850301e8b6d6a",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest61BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest61BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest61BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6d34",
-                    "hash" : "0x74ba9d3692fbb4a5b765c1fd81365795623a919269d35edee29c4e946c52781d",
-                    "mixHash" : "0xe1e593467372399c841b9b3ba1951c0d863c0580b9fc03023f02d6db5bb39876",
-                    "nonce" : "0xe3a681ae0d07f9fc",
+                    "hash" : "0x7e9e9e35ee3b771191c4d4532d46d8e5f58ef6ddbd2ca6895dd6b59e2371f4c2",
+                    "mixHash" : "0x31f11bff9b2e7db07b66fbf0bdf08c1998b4966047dbdbf8543e160afa33bca3",
+                    "nonce" : "0x4ed8d9e594605b84",
                     "number" : "0x01",
                     "parentHash" : "0x755a90b35eea17c4352d5c1dfc411980202e70237c2e1fd225157b3bb683b361",
                     "receiptTrie" : "0x396982f005e8b24509d290cbe28d210f6ceae2242bb99b46023c49097eb09c3b",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0x2ad97ba4e5308b672fe93b205fbcb77c8ac803e9acf2419e654d04e813f3c84a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9035cf901fca0755a90b35eea17c4352d5c1dfc411980202e70237c2e1fd225157b3bb683b361a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0adaffd583f21a9048c1c486fcf6c4214d95d30cb47a37930d724eef948b2da11a02ad97ba4e5308b672fe93b205fbcb77c8ac803e9acf2419e654d04e813f3c84aa0396982f005e8b24509d290cbe28d210f6ceae2242bb99b46023c49097eb09c3bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826d348203e880a0e1e593467372399c841b9b3ba1951c0d863c0580b9fc03023f02d6db5bb3987688e3a681ae0d07f9fcf90159f9015680018449bfbdd594095e7baea6a6c7c4c2dfeb977efac326af552d87846899bd45b8f07f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f00000000000000000000000100000000000000000000000000000000000000006b39427d917416721ba0f6cb5bfe7d65cbfcc22709673c6f88d5b10121265b52192b1779d8a4cfacd338a00187221c58f9848922362455a12729acd3ce9da209b796b3d4fd8a9ce8dfe314c0",
+                "rlp" : "0xf9035cf901fca0755a90b35eea17c4352d5c1dfc411980202e70237c2e1fd225157b3bb683b361a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0adaffd583f21a9048c1c486fcf6c4214d95d30cb47a37930d724eef948b2da11a02ad97ba4e5308b672fe93b205fbcb77c8ac803e9acf2419e654d04e813f3c84aa0396982f005e8b24509d290cbe28d210f6ceae2242bb99b46023c49097eb09c3bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826d348203e880a031f11bff9b2e7db07b66fbf0bdf08c1998b4966047dbdbf8543e160afa33bca3884ed8d9e594605b84f90159f9015680018449bfbdd594095e7baea6a6c7c4c2dfeb977efac326af552d87846899bd45b8f07f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f00000000000000000000000100000000000000000000000000000000000000006b39427d917416721ba0f6cb5bfe7d65cbfcc22709673c6f88d5b10121265b52192b1779d8a4cfacd338a00187221c58f9848922362455a12729acd3ce9da209b796b3d4fd8a9ce8dfe314c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f00000000000000000000000100000000000000000000000000000000000000006b39427d91741672",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ec8cab4170da9066850feacd6487932c46bed7e4510546ab98fda6dfe4fa6119a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x74ba9d3692fbb4a5b765c1fd81365795623a919269d35edee29c4e946c52781d",
+        "lastblockhash" : "0x7e9e9e35ee3b771191c4d4532d46d8e5f58ef6ddbd2ca6895dd6b59e2371f4c2",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest61BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest61BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest61BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6d34",
-                    "hash" : "0x938923098545376ac9dc06bfe1cbd1c4bc6bbf11d46cc517f026d61ce3aa7885",
-                    "mixHash" : "0x12fd962a4c5ee04f7e5b8bb24150b1622849d0526642dd480d662821babd17f1",
-                    "nonce" : "0xbdbd00e52e5bc4aa",
+                    "hash" : "0x08b4e21f633642ef9bb03e549ced019d638d2c213800903a2f977016cb663ce6",
+                    "mixHash" : "0x3eb5abf162cc203c4b54a4744f9006459b8548c96b3f77c9269eeb5e54dc2206",
+                    "nonce" : "0x2ff14b963cf2781e",
                     "number" : "0x01",
                     "parentHash" : "0x755a90b35eea17c4352d5c1dfc411980202e70237c2e1fd225157b3bb683b361",
                     "receiptTrie" : "0x396982f005e8b24509d290cbe28d210f6ceae2242bb99b46023c49097eb09c3b",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0x2ad97ba4e5308b672fe93b205fbcb77c8ac803e9acf2419e654d04e813f3c84a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9035cf901fca0755a90b35eea17c4352d5c1dfc411980202e70237c2e1fd225157b3bb683b361a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0adaffd583f21a9048c1c486fcf6c4214d95d30cb47a37930d724eef948b2da11a02ad97ba4e5308b672fe93b205fbcb77c8ac803e9acf2419e654d04e813f3c84aa0396982f005e8b24509d290cbe28d210f6ceae2242bb99b46023c49097eb09c3bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826d348203e880a012fd962a4c5ee04f7e5b8bb24150b1622849d0526642dd480d662821babd17f188bdbd00e52e5bc4aaf90159f9015680018449bfbdd594095e7baea6a6c7c4c2dfeb977efac326af552d87846899bd45b8f07f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f00000000000000000000000100000000000000000000000000000000000000006b39427d917416721ba0f6cb5bfe7d65cbfcc22709673c6f88d5b10121265b52192b1779d8a4cfacd338a00187221c58f9848922362455a12729acd3ce9da209b796b3d4fd8a9ce8dfe314c0",
+                "rlp" : "0xf9035cf901fca0755a90b35eea17c4352d5c1dfc411980202e70237c2e1fd225157b3bb683b361a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0adaffd583f21a9048c1c486fcf6c4214d95d30cb47a37930d724eef948b2da11a02ad97ba4e5308b672fe93b205fbcb77c8ac803e9acf2419e654d04e813f3c84aa0396982f005e8b24509d290cbe28d210f6ceae2242bb99b46023c49097eb09c3bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826d348203e880a03eb5abf162cc203c4b54a4744f9006459b8548c96b3f77c9269eeb5e54dc2206882ff14b963cf2781ef90159f9015680018449bfbdd594095e7baea6a6c7c4c2dfeb977efac326af552d87846899bd45b8f07f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f00000000000000000000000100000000000000000000000000000000000000006b39427d917416721ba0f6cb5bfe7d65cbfcc22709673c6f88d5b10121265b52192b1779d8a4cfacd338a00187221c58f9848922362455a12729acd3ce9da209b796b3d4fd8a9ce8dfe314c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f00000000000000000000000100000000000000000000000000000000000000006b39427d91741672",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ec8cab4170da9066850feacd6487932c46bed7e4510546ab98fda6dfe4fa6119a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x938923098545376ac9dc06bfe1cbd1c4bc6bbf11d46cc517f026d61ce3aa7885",
+        "lastblockhash" : "0x08b4e21f633642ef9bb03e549ced019d638d2c213800903a2f977016cb663ce6",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest622BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest622BC.json
index eb2353989..0fcd63f38 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest622BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest622BC.json
@@ -2,8 +2,8 @@
     "randomStatetest622BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest622BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest622BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x68b6",
-                    "hash" : "0x0583895b7c46696c8bbe846385f4f70c4f5d5c87c9dcb6cdbc3e0f95da2842c4",
-                    "mixHash" : "0x03a88d7c829cefeac192c72815d07554d723ea6313873a37a6969c123e834d5f",
-                    "nonce" : "0x14447f9e2ac61b6b",
+                    "hash" : "0x77f0c7f897c9237fcfb8af95b6c6573aecc192355ac2ac80f0187994e098673d",
+                    "mixHash" : "0xa4366c14fb9ad0001f17f7be774fd37a314595560fe25a0844a817cfc3fa8279",
+                    "nonce" : "0xd422c23dba0fe41f",
                     "number" : "0x01",
                     "parentHash" : "0xa469cd7eebcc23943f494a5c9b18bd50239f310febd286a52075721983c584bf",
                     "receiptTrie" : "0xdca598e89efa841a958431b21f70a7ae2d309b37f3cf8e75b26bebdb0ffdc8d7",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x31715639eba1aa1c89d74d34afb86b9d0c50f50e1eac146cd949970c6ddeeacd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90322f901fca0a469cd7eebcc23943f494a5c9b18bd50239f310febd286a52075721983c584bfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c2666bff922eb85496efee612f71a260c5ae1840782437084dc0d0e8b92c4fbca031715639eba1aa1c89d74d34afb86b9d0c50f50e1eac146cd949970c6ddeeacda0dca598e89efa841a958431b21f70a7ae2d309b37f3cf8e75b26bebdb0ffdc8d7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8268b68203e880a003a88d7c829cefeac192c72815d07554d723ea6313873a37a6969c123e834d5f8814447f9e2ac61b6bf9011ff9011c800184386bbd5694095e7baea6a6c7c4c2dfeb977efac326af552d87845d5f5bf2b8b67f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40357f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540070b040a72f00494659e899510ff1ba017e6c26ddae2a81d14b078380584ada5479cc2c586fb893f04f3638d23fab090a032138d0bd2d23a1c9d6598d5d866c5686345d5a6997f3a9983e39b82e1fa57a4c0",
+                "rlp" : "0xf90322f901fca0a469cd7eebcc23943f494a5c9b18bd50239f310febd286a52075721983c584bfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c2666bff922eb85496efee612f71a260c5ae1840782437084dc0d0e8b92c4fbca031715639eba1aa1c89d74d34afb86b9d0c50f50e1eac146cd949970c6ddeeacda0dca598e89efa841a958431b21f70a7ae2d309b37f3cf8e75b26bebdb0ffdc8d7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8268b68203e880a0a4366c14fb9ad0001f17f7be774fd37a314595560fe25a0844a817cfc3fa827988d422c23dba0fe41ff9011ff9011c800184386bbd5694095e7baea6a6c7c4c2dfeb977efac326af552d87845d5f5bf2b8b67f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40357f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540070b040a72f00494659e899510ff1ba017e6c26ddae2a81d14b078380584ada5479cc2c586fb893f04f3638d23fab090a032138d0bd2d23a1c9d6598d5d866c5686345d5a6997f3a9983e39b82e1fa57a4c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40357f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540070b040a72f00494659e899510ff",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b1dd813308d05aecca653f4023d73963a4b94e86201fd70fa4370dd808a65f0fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0583895b7c46696c8bbe846385f4f70c4f5d5c87c9dcb6cdbc3e0f95da2842c4",
+        "lastblockhash" : "0x77f0c7f897c9237fcfb8af95b6c6573aecc192355ac2ac80f0187994e098673d",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest622BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest622BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest622BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6ece",
-                    "hash" : "0x7bc1a58a4cc1a90f2e8e3f2f5e7320d7f709d9d5499d25bed0e83d9f0cdfb8f6",
-                    "mixHash" : "0x5da8c7a821af91e6cf495548db821e4002973523fce473b5ca0fe6b4782f622f",
-                    "nonce" : "0x101f090f79d38843",
+                    "hash" : "0x320e3d235b0dce51b15af996274052f04726e126d8aa02ca026f1fbc4e1ae3cd",
+                    "mixHash" : "0xfb9435ef61f03bc5cb29bb2f697f69ac73649a9f11d60759cbe0ceb4e3bf288b",
+                    "nonce" : "0xfdf66763dbfa11f2",
                     "number" : "0x01",
                     "parentHash" : "0xa469cd7eebcc23943f494a5c9b18bd50239f310febd286a52075721983c584bf",
                     "receiptTrie" : "0xaadf8c4f5032691015341ce66abb864972471c2809976e0403ff74ad0914efac",
-                    "stateRoot" : "0x2bdd63e210d522a929b7df892ea9e79a801cf9db743d252dfd8c6c9c2080b6a9",
+                    "stateRoot" : "0xc63644f189d6b0f25cfb59d43e3313ad60e74b88cf8b72dc7d8208d26e17d87a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x31715639eba1aa1c89d74d34afb86b9d0c50f50e1eac146cd949970c6ddeeacd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90322f901fca0a469cd7eebcc23943f494a5c9b18bd50239f310febd286a52075721983c584bfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02bdd63e210d522a929b7df892ea9e79a801cf9db743d252dfd8c6c9c2080b6a9a031715639eba1aa1c89d74d34afb86b9d0c50f50e1eac146cd949970c6ddeeacda0aadf8c4f5032691015341ce66abb864972471c2809976e0403ff74ad0914efacb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826ece8203e880a05da8c7a821af91e6cf495548db821e4002973523fce473b5ca0fe6b4782f622f88101f090f79d38843f9011ff9011c800184386bbd5694095e7baea6a6c7c4c2dfeb977efac326af552d87845d5f5bf2b8b67f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40357f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540070b040a72f00494659e899510ff1ba017e6c26ddae2a81d14b078380584ada5479cc2c586fb893f04f3638d23fab090a032138d0bd2d23a1c9d6598d5d866c5686345d5a6997f3a9983e39b82e1fa57a4c0",
+                "rlp" : "0xf90322f901fca0a469cd7eebcc23943f494a5c9b18bd50239f310febd286a52075721983c584bfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c63644f189d6b0f25cfb59d43e3313ad60e74b88cf8b72dc7d8208d26e17d87aa031715639eba1aa1c89d74d34afb86b9d0c50f50e1eac146cd949970c6ddeeacda0aadf8c4f5032691015341ce66abb864972471c2809976e0403ff74ad0914efacb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff826ece8203e880a0fb9435ef61f03bc5cb29bb2f697f69ac73649a9f11d60759cbe0ceb4e3bf288b88fdf66763dbfa11f2f9011ff9011c800184386bbd5694095e7baea6a6c7c4c2dfeb977efac326af552d87845d5f5bf2b8b67f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40357f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540070b040a72f00494659e899510ff1ba017e6c26ddae2a81d14b078380584ada5479cc2c586fb893f04f3638d23fab090a032138d0bd2d23a1c9d6598d5d866c5686345d5a6997f3a9983e39b82e1fa57a4c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40357f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540070b040a72f00494659e899510ff",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b1dd813308d05aecca653f4023d73963a4b94e86201fd70fa4370dd808a65f0fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7bc1a58a4cc1a90f2e8e3f2f5e7320d7f709d9d5499d25bed0e83d9f0cdfb8f6",
+        "lastblockhash" : "0x320e3d235b0dce51b15af996274052f04726e126d8aa02ca026f1fbc4e1ae3cd",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x5d5f5bf2",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40357f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540070b040a72f00494659e899510ff",
@@ -233,8 +226,8 @@
     "randomStatetest622BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest622BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest622BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x68b6",
-                    "hash" : "0x59f82b372a61f036503cb177aefdf602b62577112417c9ca3cf14a8951701308",
-                    "mixHash" : "0xf1830b2a04e799a3618cd08081ffc14a13df0b8bdabc36d28e2bd0816dd45255",
-                    "nonce" : "0x4cf043a96140d532",
+                    "hash" : "0x1644c8c257df5c81c4310bc992898b84e4a4ab09805d7bbd108f8f5f618af21e",
+                    "mixHash" : "0xd8b96329b7e0d17e3fbb8d1d1ba0e42401e00471c17e5ceb76e3172ea7a797ec",
+                    "nonce" : "0x6bc6b4da56d52072",
                     "number" : "0x01",
                     "parentHash" : "0xa469cd7eebcc23943f494a5c9b18bd50239f310febd286a52075721983c584bf",
                     "receiptTrie" : "0x33602c002adb23ccce54c2a9e1afde93e2a6cb90fe404dfb2bbfc6923f59f65b",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0x31715639eba1aa1c89d74d34afb86b9d0c50f50e1eac146cd949970c6ddeeacd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90322f901fca0a469cd7eebcc23943f494a5c9b18bd50239f310febd286a52075721983c584bfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04a543e8a6283d45050b0187080d6bb9b6f23ccf7b2da0177d595a740c074bc36a031715639eba1aa1c89d74d34afb86b9d0c50f50e1eac146cd949970c6ddeeacda033602c002adb23ccce54c2a9e1afde93e2a6cb90fe404dfb2bbfc6923f59f65bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8268b68203e880a0f1830b2a04e799a3618cd08081ffc14a13df0b8bdabc36d28e2bd0816dd45255884cf043a96140d532f9011ff9011c800184386bbd5694095e7baea6a6c7c4c2dfeb977efac326af552d87845d5f5bf2b8b67f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40357f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540070b040a72f00494659e899510ff1ba017e6c26ddae2a81d14b078380584ada5479cc2c586fb893f04f3638d23fab090a032138d0bd2d23a1c9d6598d5d866c5686345d5a6997f3a9983e39b82e1fa57a4c0",
+                "rlp" : "0xf90322f901fca0a469cd7eebcc23943f494a5c9b18bd50239f310febd286a52075721983c584bfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04a543e8a6283d45050b0187080d6bb9b6f23ccf7b2da0177d595a740c074bc36a031715639eba1aa1c89d74d34afb86b9d0c50f50e1eac146cd949970c6ddeeacda033602c002adb23ccce54c2a9e1afde93e2a6cb90fe404dfb2bbfc6923f59f65bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8268b68203e880a0d8b96329b7e0d17e3fbb8d1d1ba0e42401e00471c17e5ceb76e3172ea7a797ec886bc6b4da56d52072f9011ff9011c800184386bbd5694095e7baea6a6c7c4c2dfeb977efac326af552d87845d5f5bf2b8b67f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40357f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540070b040a72f00494659e899510ff1ba017e6c26ddae2a81d14b078380584ada5479cc2c586fb893f04f3638d23fab090a032138d0bd2d23a1c9d6598d5d866c5686345d5a6997f3a9983e39b82e1fa57a4c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40357f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540070b040a72f00494659e899510ff",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b1dd813308d05aecca653f4023d73963a4b94e86201fd70fa4370dd808a65f0fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x59f82b372a61f036503cb177aefdf602b62577112417c9ca3cf14a8951701308",
+        "lastblockhash" : "0x1644c8c257df5c81c4310bc992898b84e4a4ab09805d7bbd108f8f5f618af21e",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest622BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest622BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest622BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x68b6",
-                    "hash" : "0x9bc48c35bddf21d8a05acd6c8ed71f6cfb9ee838676f12f066335905f47c8c75",
-                    "mixHash" : "0xf4ffe6db8ff87fc2908cb145429edee6ad58f26fb1b4814d4725ccd5c0431b64",
-                    "nonce" : "0xecd5ac30ce8f7700",
+                    "hash" : "0x8fa7302563a89069c34bc2c571365acf0ca067e11ab0de51c1832e78c94ff1a8",
+                    "mixHash" : "0xcf818dd38c92d5cada1d9a4193a19fcfba201d164799b6885e1e8e8f0022c85a",
+                    "nonce" : "0x1b9d6b6e8e31411d",
                     "number" : "0x01",
                     "parentHash" : "0xa469cd7eebcc23943f494a5c9b18bd50239f310febd286a52075721983c584bf",
                     "receiptTrie" : "0x33602c002adb23ccce54c2a9e1afde93e2a6cb90fe404dfb2bbfc6923f59f65b",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0x31715639eba1aa1c89d74d34afb86b9d0c50f50e1eac146cd949970c6ddeeacd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90322f901fca0a469cd7eebcc23943f494a5c9b18bd50239f310febd286a52075721983c584bfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04a543e8a6283d45050b0187080d6bb9b6f23ccf7b2da0177d595a740c074bc36a031715639eba1aa1c89d74d34afb86b9d0c50f50e1eac146cd949970c6ddeeacda033602c002adb23ccce54c2a9e1afde93e2a6cb90fe404dfb2bbfc6923f59f65bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8268b68203e880a0f4ffe6db8ff87fc2908cb145429edee6ad58f26fb1b4814d4725ccd5c0431b6488ecd5ac30ce8f7700f9011ff9011c800184386bbd5694095e7baea6a6c7c4c2dfeb977efac326af552d87845d5f5bf2b8b67f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40357f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540070b040a72f00494659e899510ff1ba017e6c26ddae2a81d14b078380584ada5479cc2c586fb893f04f3638d23fab090a032138d0bd2d23a1c9d6598d5d866c5686345d5a6997f3a9983e39b82e1fa57a4c0",
+                "rlp" : "0xf90322f901fca0a469cd7eebcc23943f494a5c9b18bd50239f310febd286a52075721983c584bfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04a543e8a6283d45050b0187080d6bb9b6f23ccf7b2da0177d595a740c074bc36a031715639eba1aa1c89d74d34afb86b9d0c50f50e1eac146cd949970c6ddeeacda033602c002adb23ccce54c2a9e1afde93e2a6cb90fe404dfb2bbfc6923f59f65bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8268b68203e880a0cf818dd38c92d5cada1d9a4193a19fcfba201d164799b6885e1e8e8f0022c85a881b9d6b6e8e31411df9011ff9011c800184386bbd5694095e7baea6a6c7c4c2dfeb977efac326af552d87845d5f5bf2b8b67f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40357f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540070b040a72f00494659e899510ff1ba017e6c26ddae2a81d14b078380584ada5479cc2c586fb893f04f3638d23fab090a032138d0bd2d23a1c9d6598d5d866c5686345d5a6997f3a9983e39b82e1fa57a4c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40357f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540070b040a72f00494659e899510ff",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b1dd813308d05aecca653f4023d73963a4b94e86201fd70fa4370dd808a65f0fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9bc48c35bddf21d8a05acd6c8ed71f6cfb9ee838676f12f066335905f47c8c75",
+        "lastblockhash" : "0x8fa7302563a89069c34bc2c571365acf0ca067e11ab0de51c1832e78c94ff1a8",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest622BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest622BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest622BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x68b6",
-                    "hash" : "0xcc5809c4da6c9fd9d93ee2c30969834373b302eb11d38cb7adcf4c0b47a01a22",
-                    "mixHash" : "0x3439763c14c99df177ee6baca9f35f90046a041a5a62402bc989eb4008303449",
-                    "nonce" : "0xaa977ece0b2fbea8",
+                    "hash" : "0x1f59fb26383dc9b517bb3f72493498162be82c996f0052b16efdc36026c801f8",
+                    "mixHash" : "0x40fb3ec8b471e9aa29c3926a8e3565dfc8de95c7b173ed0a488dc8b00c8f81cc",
+                    "nonce" : "0x7ed72642afb326f0",
                     "number" : "0x01",
                     "parentHash" : "0xa469cd7eebcc23943f494a5c9b18bd50239f310febd286a52075721983c584bf",
                     "receiptTrie" : "0x33602c002adb23ccce54c2a9e1afde93e2a6cb90fe404dfb2bbfc6923f59f65b",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0x31715639eba1aa1c89d74d34afb86b9d0c50f50e1eac146cd949970c6ddeeacd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90322f901fca0a469cd7eebcc23943f494a5c9b18bd50239f310febd286a52075721983c584bfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04a543e8a6283d45050b0187080d6bb9b6f23ccf7b2da0177d595a740c074bc36a031715639eba1aa1c89d74d34afb86b9d0c50f50e1eac146cd949970c6ddeeacda033602c002adb23ccce54c2a9e1afde93e2a6cb90fe404dfb2bbfc6923f59f65bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8268b68203e880a03439763c14c99df177ee6baca9f35f90046a041a5a62402bc989eb400830344988aa977ece0b2fbea8f9011ff9011c800184386bbd5694095e7baea6a6c7c4c2dfeb977efac326af552d87845d5f5bf2b8b67f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40357f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540070b040a72f00494659e899510ff1ba017e6c26ddae2a81d14b078380584ada5479cc2c586fb893f04f3638d23fab090a032138d0bd2d23a1c9d6598d5d866c5686345d5a6997f3a9983e39b82e1fa57a4c0",
+                "rlp" : "0xf90322f901fca0a469cd7eebcc23943f494a5c9b18bd50239f310febd286a52075721983c584bfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04a543e8a6283d45050b0187080d6bb9b6f23ccf7b2da0177d595a740c074bc36a031715639eba1aa1c89d74d34afb86b9d0c50f50e1eac146cd949970c6ddeeacda033602c002adb23ccce54c2a9e1afde93e2a6cb90fe404dfb2bbfc6923f59f65bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8268b68203e880a040fb3ec8b471e9aa29c3926a8e3565dfc8de95c7b173ed0a488dc8b00c8f81cc887ed72642afb326f0f9011ff9011c800184386bbd5694095e7baea6a6c7c4c2dfeb977efac326af552d87845d5f5bf2b8b67f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40357f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540070b040a72f00494659e899510ff1ba017e6c26ddae2a81d14b078380584ada5479cc2c586fb893f04f3638d23fab090a032138d0bd2d23a1c9d6598d5d866c5686345d5a6997f3a9983e39b82e1fa57a4c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40357f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540070b040a72f00494659e899510ff",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b1dd813308d05aecca653f4023d73963a4b94e86201fd70fa4370dd808a65f0fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcc5809c4da6c9fd9d93ee2c30969834373b302eb11d38cb7adcf4c0b47a01a22",
+        "lastblockhash" : "0x1f59fb26383dc9b517bb3f72493498162be82c996f0052b16efdc36026c801f8",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest622BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest622BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest622BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x68b6",
-                    "hash" : "0xfc1d9239b7e26622d93ae2045ad73cbd8dd7c9bb13ebbfde3f50091d53043595",
-                    "mixHash" : "0x97e89d5a251ad131ff1dcf5cf485ac123db4e7c9f1ad363a394a1f12499085d5",
-                    "nonce" : "0x78d9ad26fc40eefa",
+                    "hash" : "0x3d30af7533e99f3533ad9e06d1de676c6c95412ca481397949e28630569e4c4b",
+                    "mixHash" : "0xb6e1798d4a86f31060a44d0ea7af78ea73b2544f09914dd7654a815191557159",
+                    "nonce" : "0xfe6b04a68b6eaba9",
                     "number" : "0x01",
                     "parentHash" : "0xa469cd7eebcc23943f494a5c9b18bd50239f310febd286a52075721983c584bf",
                     "receiptTrie" : "0x33602c002adb23ccce54c2a9e1afde93e2a6cb90fe404dfb2bbfc6923f59f65b",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0x31715639eba1aa1c89d74d34afb86b9d0c50f50e1eac146cd949970c6ddeeacd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90322f901fca0a469cd7eebcc23943f494a5c9b18bd50239f310febd286a52075721983c584bfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04a543e8a6283d45050b0187080d6bb9b6f23ccf7b2da0177d595a740c074bc36a031715639eba1aa1c89d74d34afb86b9d0c50f50e1eac146cd949970c6ddeeacda033602c002adb23ccce54c2a9e1afde93e2a6cb90fe404dfb2bbfc6923f59f65bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8268b68203e880a097e89d5a251ad131ff1dcf5cf485ac123db4e7c9f1ad363a394a1f12499085d58878d9ad26fc40eefaf9011ff9011c800184386bbd5694095e7baea6a6c7c4c2dfeb977efac326af552d87845d5f5bf2b8b67f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40357f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540070b040a72f00494659e899510ff1ba017e6c26ddae2a81d14b078380584ada5479cc2c586fb893f04f3638d23fab090a032138d0bd2d23a1c9d6598d5d866c5686345d5a6997f3a9983e39b82e1fa57a4c0",
+                "rlp" : "0xf90322f901fca0a469cd7eebcc23943f494a5c9b18bd50239f310febd286a52075721983c584bfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04a543e8a6283d45050b0187080d6bb9b6f23ccf7b2da0177d595a740c074bc36a031715639eba1aa1c89d74d34afb86b9d0c50f50e1eac146cd949970c6ddeeacda033602c002adb23ccce54c2a9e1afde93e2a6cb90fe404dfb2bbfc6923f59f65bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8268b68203e880a0b6e1798d4a86f31060a44d0ea7af78ea73b2544f09914dd7654a81519155715988fe6b04a68b6eaba9f9011ff9011c800184386bbd5694095e7baea6a6c7c4c2dfeb977efac326af552d87845d5f5bf2b8b67f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40357f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540070b040a72f00494659e899510ff1ba017e6c26ddae2a81d14b078380584ada5479cc2c586fb893f04f3638d23fab090a032138d0bd2d23a1c9d6598d5d866c5686345d5a6997f3a9983e39b82e1fa57a4c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40357f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540070b040a72f00494659e899510ff",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b1dd813308d05aecca653f4023d73963a4b94e86201fd70fa4370dd808a65f0fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfc1d9239b7e26622d93ae2045ad73cbd8dd7c9bb13ebbfde3f50091d53043595",
+        "lastblockhash" : "0x3d30af7533e99f3533ad9e06d1de676c6c95412ca481397949e28630569e4c4b",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest623BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest623BC.json
index 3ba037c8a..d5e762054 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest623BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest623BC.json
@@ -2,8 +2,8 @@
     "randomStatetest623BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest623BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest623BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa1cc",
-                    "hash" : "0x84bdb92cc45964d041277e250d551e4ec258c518f7e3dcc5ebf246da4ed3cf84",
-                    "mixHash" : "0xb0a7449173750244d8f436f783bac4778983504287e840ce061ce64c03e4037a",
-                    "nonce" : "0xea5fbf023b631015",
+                    "hash" : "0x204159b466597692db15543c5a8e6686fdbc73f2b26d288e7f7bb4e70b6c12f3",
+                    "mixHash" : "0xebce359c291bc1db6fecbec4f1b694cbd837004364a91281405d5780cd75d6f4",
+                    "nonce" : "0x290499e7467e6976",
                     "number" : "0x01",
                     "parentHash" : "0x5de4c39693792aa84debd70e3d7ebfa9add9b8417e58760608ca86e8d79f6142",
                     "receiptTrie" : "0x72be5412d6aee94120579c992ea4896dc9e5aa2235706222d2c09fc4e761e686",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca05de4c39693792aa84debd70e3d7ebfa9add9b8417e58760608ca86e8d79f6142a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e2b1b679a52ad60ca7eb4cb021ef0fbf72d2d2f9c0ed9ad92f398f255737266fa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa072be5412d6aee94120579c992ea4896dc9e5aa2235706222d2c09fc4e761e686b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1cc8203e880a0b0a7449173750244d8f436f783bac4778983504287e840ce061ce64c03e4037a88ea5fbf023b631015f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca05de4c39693792aa84debd70e3d7ebfa9add9b8417e58760608ca86e8d79f6142a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e2b1b679a52ad60ca7eb4cb021ef0fbf72d2d2f9c0ed9ad92f398f255737266fa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa072be5412d6aee94120579c992ea4896dc9e5aa2235706222d2c09fc4e761e686b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1cc8203e880a0ebce359c291bc1db6fecbec4f1b694cbd837004364a91281405d5780cd75d6f488290499e7467e6976f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00faa4b28863eea50a68ee4a1180a78383fd735d79e7aaca0120b41580e2e8b47a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x84bdb92cc45964d041277e250d551e4ec258c518f7e3dcc5ebf246da4ed3cf84",
+        "lastblockhash" : "0x204159b466597692db15543c5a8e6686fdbc73f2b26d288e7f7bb4e70b6c12f3",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest623BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest623BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest623BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa4d8",
-                    "hash" : "0x1356bcf521b994faa48dea944c078b0dc2626c888952c79972b093672b97e819",
-                    "mixHash" : "0x5b0b272f72e34bddfb5a8f134281cc17e2b595f8bc2b180280f82d6a198eb044",
-                    "nonce" : "0xfbf038e36f515488",
+                    "hash" : "0x3290027a3c00c1917af4910020706914a56db3238622b4b244842582eef2b959",
+                    "mixHash" : "0x829884369807e2ad3248d34a56b016f70854636dc00b5f00cc6fdfb04325033b",
+                    "nonce" : "0x0f53736bf86b0549",
                     "number" : "0x01",
                     "parentHash" : "0x5de4c39693792aa84debd70e3d7ebfa9add9b8417e58760608ca86e8d79f6142",
                     "receiptTrie" : "0x9773b864ef323e62b09a35ef9471f733e0f57626662a09121276e035be471606",
-                    "stateRoot" : "0x37d3951f936703caf48511e17b2709a87c91d093d5b220459f5942809dac4e32",
+                    "stateRoot" : "0xc90d65a75dcbc282a71d12d56167eb8a0f1bf6ed1ed207bbf4965f4ed4aa611d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca05de4c39693792aa84debd70e3d7ebfa9add9b8417e58760608ca86e8d79f6142a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a037d3951f936703caf48511e17b2709a87c91d093d5b220459f5942809dac4e32a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa09773b864ef323e62b09a35ef9471f733e0f57626662a09121276e035be471606b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a4d88203e880a05b0b272f72e34bddfb5a8f134281cc17e2b595f8bc2b180280f82d6a198eb04488fbf038e36f515488f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca05de4c39693792aa84debd70e3d7ebfa9add9b8417e58760608ca86e8d79f6142a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c90d65a75dcbc282a71d12d56167eb8a0f1bf6ed1ed207bbf4965f4ed4aa611da0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa09773b864ef323e62b09a35ef9471f733e0f57626662a09121276e035be471606b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a4d88203e880a0829884369807e2ad3248d34a56b016f70854636dc00b5f00cc6fdfb04325033b880f53736bf86b0549f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00faa4b28863eea50a68ee4a1180a78383fd735d79e7aaca0120b41580e2e8b47a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1356bcf521b994faa48dea944c078b0dc2626c888952c79972b093672b97e819",
+        "lastblockhash" : "0x3290027a3c00c1917af4910020706914a56db3238622b4b244842582eef2b959",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x434542454244402055",
@@ -235,8 +228,8 @@
     "randomStatetest623BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest623BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest623BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa1cc",
-                    "hash" : "0x0737f8ce27eba9a17b48a7b6d175c4653042dafe7c7fbaba6579e4326f98312a",
-                    "mixHash" : "0x750734f1c0d29f5d5169d13bfe70e8d103ae1c32830dc6af54234cbfb515b3c7",
-                    "nonce" : "0xb3710a64e88f093c",
+                    "hash" : "0xb86c2288f9c78e0c24e0357e3aa570beb9208227a7e9bfe89e6df972a2fd74a4",
+                    "mixHash" : "0xa7595d100279887afbdaa6a2c93139662c523112b89ff3fcbde9461223fc5b7a",
+                    "nonce" : "0x51900c488e435885",
                     "number" : "0x01",
                     "parentHash" : "0x5de4c39693792aa84debd70e3d7ebfa9add9b8417e58760608ca86e8d79f6142",
                     "receiptTrie" : "0xb19fabd48838e9afc107f550fe9a1bddcc1ad3ad92a40c6b978f593b050c9882",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca05de4c39693792aa84debd70e3d7ebfa9add9b8417e58760608ca86e8d79f6142a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fbf19b64351b0f7844aaa59644e8132da33de60f2605731b7e3d022772ff7f66a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0b19fabd48838e9afc107f550fe9a1bddcc1ad3ad92a40c6b978f593b050c9882b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1cc8203e880a0750734f1c0d29f5d5169d13bfe70e8d103ae1c32830dc6af54234cbfb515b3c788b3710a64e88f093cf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca05de4c39693792aa84debd70e3d7ebfa9add9b8417e58760608ca86e8d79f6142a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fbf19b64351b0f7844aaa59644e8132da33de60f2605731b7e3d022772ff7f66a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0b19fabd48838e9afc107f550fe9a1bddcc1ad3ad92a40c6b978f593b050c9882b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1cc8203e880a0a7595d100279887afbdaa6a2c93139662c523112b89ff3fcbde9461223fc5b7a8851900c488e435885f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00faa4b28863eea50a68ee4a1180a78383fd735d79e7aaca0120b41580e2e8b47a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0737f8ce27eba9a17b48a7b6d175c4653042dafe7c7fbaba6579e4326f98312a",
+        "lastblockhash" : "0xb86c2288f9c78e0c24e0357e3aa570beb9208227a7e9bfe89e6df972a2fd74a4",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest623BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest623BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest623BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa1cc",
-                    "hash" : "0x2457374fed0ef26f4ce5c9cd50935c8c38bd3b096ee8498525db9c0c44a12eff",
-                    "mixHash" : "0x353828a933484c2be18a1937d43c2199e3e7aca6eb2a8bc7f843958bb6fe0f48",
-                    "nonce" : "0x167323b605152752",
+                    "hash" : "0x46e9d2b8e0196ff74ff9cedeb59196d246539080683025409bc08206255d15d3",
+                    "mixHash" : "0xcd17a1eff2a6aefb3f0c66df49805077dd6a3fbc8acd45461b611b02c0e3ada9",
+                    "nonce" : "0x6f1da5531ebe246e",
                     "number" : "0x01",
                     "parentHash" : "0x5de4c39693792aa84debd70e3d7ebfa9add9b8417e58760608ca86e8d79f6142",
                     "receiptTrie" : "0xb19fabd48838e9afc107f550fe9a1bddcc1ad3ad92a40c6b978f593b050c9882",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca05de4c39693792aa84debd70e3d7ebfa9add9b8417e58760608ca86e8d79f6142a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fbf19b64351b0f7844aaa59644e8132da33de60f2605731b7e3d022772ff7f66a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0b19fabd48838e9afc107f550fe9a1bddcc1ad3ad92a40c6b978f593b050c9882b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1cc8203e880a0353828a933484c2be18a1937d43c2199e3e7aca6eb2a8bc7f843958bb6fe0f4888167323b605152752f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca05de4c39693792aa84debd70e3d7ebfa9add9b8417e58760608ca86e8d79f6142a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fbf19b64351b0f7844aaa59644e8132da33de60f2605731b7e3d022772ff7f66a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0b19fabd48838e9afc107f550fe9a1bddcc1ad3ad92a40c6b978f593b050c9882b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1cc8203e880a0cd17a1eff2a6aefb3f0c66df49805077dd6a3fbc8acd45461b611b02c0e3ada9886f1da5531ebe246ef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00faa4b28863eea50a68ee4a1180a78383fd735d79e7aaca0120b41580e2e8b47a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2457374fed0ef26f4ce5c9cd50935c8c38bd3b096ee8498525db9c0c44a12eff",
+        "lastblockhash" : "0x46e9d2b8e0196ff74ff9cedeb59196d246539080683025409bc08206255d15d3",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest623BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest623BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest623BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa1cc",
-                    "hash" : "0x113eb322856b4c80b1dd25b356426bc974fbb8ba4e1023114dbfd91e8f9ce33e",
-                    "mixHash" : "0xb83242673fccdf4c88929ca6cf1dff4d483650790197940b48ba0010f05e2539",
-                    "nonce" : "0xc0dc16bcab5d1bde",
+                    "hash" : "0x4c3c44d40bac95ef12f25e1b4533606c8550ddb7f0fbd84993e180d90df0f30b",
+                    "mixHash" : "0x1c9c3a80b9838663130a0ff295e3ee2556bc0dba165348e6c883b585927a2307",
+                    "nonce" : "0xc20e6aa464d8270c",
                     "number" : "0x01",
                     "parentHash" : "0x5de4c39693792aa84debd70e3d7ebfa9add9b8417e58760608ca86e8d79f6142",
                     "receiptTrie" : "0xb19fabd48838e9afc107f550fe9a1bddcc1ad3ad92a40c6b978f593b050c9882",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca05de4c39693792aa84debd70e3d7ebfa9add9b8417e58760608ca86e8d79f6142a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fbf19b64351b0f7844aaa59644e8132da33de60f2605731b7e3d022772ff7f66a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0b19fabd48838e9afc107f550fe9a1bddcc1ad3ad92a40c6b978f593b050c9882b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1cc8203e880a0b83242673fccdf4c88929ca6cf1dff4d483650790197940b48ba0010f05e253988c0dc16bcab5d1bdef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca05de4c39693792aa84debd70e3d7ebfa9add9b8417e58760608ca86e8d79f6142a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fbf19b64351b0f7844aaa59644e8132da33de60f2605731b7e3d022772ff7f66a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0b19fabd48838e9afc107f550fe9a1bddcc1ad3ad92a40c6b978f593b050c9882b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1cc8203e880a01c9c3a80b9838663130a0ff295e3ee2556bc0dba165348e6c883b585927a230788c20e6aa464d8270cf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00faa4b28863eea50a68ee4a1180a78383fd735d79e7aaca0120b41580e2e8b47a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x113eb322856b4c80b1dd25b356426bc974fbb8ba4e1023114dbfd91e8f9ce33e",
+        "lastblockhash" : "0x4c3c44d40bac95ef12f25e1b4533606c8550ddb7f0fbd84993e180d90df0f30b",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest623BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest623BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest623BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa1cc",
-                    "hash" : "0xfc21ebadd83eab6c01cf0d9f8c51d62d10a8cd6368f14e82c787dd563ff1fd8e",
-                    "mixHash" : "0xce31e2a5d55d07fc7c6b13e0fb6c619e81fbdde999a58fd2f897f50c891a73a6",
-                    "nonce" : "0xe9a14eac20442b34",
+                    "hash" : "0x6221bc6c99e79183b13b81c652d341de0cb435f9d19084465dbd9cbc3fd090fe",
+                    "mixHash" : "0xaa5b8a7063c53375281faa0bb2e9477f375a3069aaf701cbe0a1a95bf95579b4",
+                    "nonce" : "0x2f5ef42479c92451",
                     "number" : "0x01",
                     "parentHash" : "0x5de4c39693792aa84debd70e3d7ebfa9add9b8417e58760608ca86e8d79f6142",
                     "receiptTrie" : "0xb19fabd48838e9afc107f550fe9a1bddcc1ad3ad92a40c6b978f593b050c9882",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca05de4c39693792aa84debd70e3d7ebfa9add9b8417e58760608ca86e8d79f6142a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fbf19b64351b0f7844aaa59644e8132da33de60f2605731b7e3d022772ff7f66a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0b19fabd48838e9afc107f550fe9a1bddcc1ad3ad92a40c6b978f593b050c9882b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1cc8203e880a0ce31e2a5d55d07fc7c6b13e0fb6c619e81fbdde999a58fd2f897f50c891a73a688e9a14eac20442b34f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca05de4c39693792aa84debd70e3d7ebfa9add9b8417e58760608ca86e8d79f6142a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fbf19b64351b0f7844aaa59644e8132da33de60f2605731b7e3d022772ff7f66a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0b19fabd48838e9afc107f550fe9a1bddcc1ad3ad92a40c6b978f593b050c9882b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a1cc8203e880a0aa5b8a7063c53375281faa0bb2e9477f375a3069aaf701cbe0a1a95bf95579b4882f5ef42479c92451f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00faa4b28863eea50a68ee4a1180a78383fd735d79e7aaca0120b41580e2e8b47a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfc21ebadd83eab6c01cf0d9f8c51d62d10a8cd6368f14e82c787dd563ff1fd8e",
+        "lastblockhash" : "0x6221bc6c99e79183b13b81c652d341de0cb435f9d19084465dbd9cbc3fd090fe",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest631BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest631BC.json
index 57d0b8f3f..9dd3f445a 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest631BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest631BC.json
@@ -2,8 +2,8 @@
     "randomStatetest631BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest631BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest631BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8b50",
-                    "hash" : "0xe006b44027a1fe53ff2efeb7d5b9b42a57ef85354d521ae2ade14c355fb43b84",
-                    "mixHash" : "0xda05478b18bf28c3984ec4af27808d00db5f35f7f99a529b4d9367859b884eae",
-                    "nonce" : "0xf80ee6d377f305ea",
+                    "hash" : "0xc52c0a323890338436bf202db00cea7d511eff1c2233fccafc7ff2ce17a78536",
+                    "mixHash" : "0x4dfcf8bd65df5aef146f8545086c9d4b02834c670db55641727e7a702f0187e4",
+                    "nonce" : "0x6c90ae420ee8ecbf",
                     "number" : "0x01",
                     "parentHash" : "0xc581f4d7d897eadc885b5c6ee099183038338bcb923241011ddc317e8c03bd57",
                     "receiptTrie" : "0x762ee90565ef1da33649b5f7ff824f5add802715125c8c646bfb62ee0106006b",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x1c181c1bd4a6dddac9f4ee71402a59105d1db669fad873571976fbf0da562f6b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9033ef901fca0c581f4d7d897eadc885b5c6ee099183038338bcb923241011ddc317e8c03bd57a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09aa1c0957c29c3e212923aa1928df06534b1a457f5116611fc03395bb0bdcfd5a01c181c1bd4a6dddac9f4ee71402a59105d1db669fad873571976fbf0da562f6ba0762ee90565ef1da33649b5f7ff824f5add802715125c8c646bfb62ee0106006bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828b508203e880a0da05478b18bf28c3984ec4af27808d00db5f35f7f99a529b4d9367859b884eae88f80ee6d377f305eaf9013bf901388001845d99671294095e7baea6a6c7c4c2dfeb977efac326af552d87846b8beb66b8d2447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350383709658551993b76091ca06f309d3d721a2bb3e97dee0c5089497743aebd1badc98bb4b3abbbde7de94b67a01786ba6068d9250ea046e0cbdb2a061dd3e420b19097abeadfcf54640de13574c0",
+                "rlp" : "0xf9033ef901fca0c581f4d7d897eadc885b5c6ee099183038338bcb923241011ddc317e8c03bd57a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09aa1c0957c29c3e212923aa1928df06534b1a457f5116611fc03395bb0bdcfd5a01c181c1bd4a6dddac9f4ee71402a59105d1db669fad873571976fbf0da562f6ba0762ee90565ef1da33649b5f7ff824f5add802715125c8c646bfb62ee0106006bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828b508203e880a04dfcf8bd65df5aef146f8545086c9d4b02834c670db55641727e7a702f0187e4886c90ae420ee8ecbff9013bf901388001845d99671294095e7baea6a6c7c4c2dfeb977efac326af552d87846b8beb66b8d2447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350383709658551993b76091ca06f309d3d721a2bb3e97dee0c5089497743aebd1badc98bb4b3abbbde7de94b67a01786ba6068d9250ea046e0cbdb2a061dd3e420b19097abeadfcf54640de13574c0",
                 "transactions" : [
                     {
                         "data" : "0x447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350383709658551993b7609",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03114e1c7ba6c1a40c7f87bfb0ae172a2db9dbace99e045637ca5cc9b3c98667fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe006b44027a1fe53ff2efeb7d5b9b42a57ef85354d521ae2ade14c355fb43b84",
+        "lastblockhash" : "0xc52c0a323890338436bf202db00cea7d511eff1c2233fccafc7ff2ce17a78536",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest631BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest631BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest631BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8e5c",
-                    "hash" : "0xf25a257b69a7c8de3a7a2a3c390277cc34aef5fe0ee7948c681f5a1ac8b8bbd6",
-                    "mixHash" : "0x0d1cb9f58a4fee16fb797ad9577d05b7ccd7c2a6e96f0edf2606c601b513d9a5",
-                    "nonce" : "0xb24c4f443c870c6c",
+                    "hash" : "0x5e10da54a8d85b96a5dd0644e336b4e47edc5cfa9e5ecec7a5ed9baa33d83612",
+                    "mixHash" : "0xddc0ffd52983043311f85c39771aa6883baa6f5693970d2f7ac4ed0953276493",
+                    "nonce" : "0x7f62c3ee7292cc10",
                     "number" : "0x01",
                     "parentHash" : "0xc581f4d7d897eadc885b5c6ee099183038338bcb923241011ddc317e8c03bd57",
                     "receiptTrie" : "0xec6b22ac444e47e0667f2fcb919ba248de1c9e50bd763baa76ac81eda4a915a6",
-                    "stateRoot" : "0xb4b8b6f34524d45f27dec16f662a952add8ce28bdf7a3a2456ef3fbcce757e10",
+                    "stateRoot" : "0x775895e49f1d9c1c8da0c0ef670a846b6e595c8fce2b2bd6c907a015ab5bf48c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1c181c1bd4a6dddac9f4ee71402a59105d1db669fad873571976fbf0da562f6b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9033ef901fca0c581f4d7d897eadc885b5c6ee099183038338bcb923241011ddc317e8c03bd57a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b4b8b6f34524d45f27dec16f662a952add8ce28bdf7a3a2456ef3fbcce757e10a01c181c1bd4a6dddac9f4ee71402a59105d1db669fad873571976fbf0da562f6ba0ec6b22ac444e47e0667f2fcb919ba248de1c9e50bd763baa76ac81eda4a915a6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828e5c8203e880a00d1cb9f58a4fee16fb797ad9577d05b7ccd7c2a6e96f0edf2606c601b513d9a588b24c4f443c870c6cf9013bf901388001845d99671294095e7baea6a6c7c4c2dfeb977efac326af552d87846b8beb66b8d2447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350383709658551993b76091ca06f309d3d721a2bb3e97dee0c5089497743aebd1badc98bb4b3abbbde7de94b67a01786ba6068d9250ea046e0cbdb2a061dd3e420b19097abeadfcf54640de13574c0",
+                "rlp" : "0xf9033ef901fca0c581f4d7d897eadc885b5c6ee099183038338bcb923241011ddc317e8c03bd57a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0775895e49f1d9c1c8da0c0ef670a846b6e595c8fce2b2bd6c907a015ab5bf48ca01c181c1bd4a6dddac9f4ee71402a59105d1db669fad873571976fbf0da562f6ba0ec6b22ac444e47e0667f2fcb919ba248de1c9e50bd763baa76ac81eda4a915a6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828e5c8203e880a0ddc0ffd52983043311f85c39771aa6883baa6f5693970d2f7ac4ed0953276493887f62c3ee7292cc10f9013bf901388001845d99671294095e7baea6a6c7c4c2dfeb977efac326af552d87846b8beb66b8d2447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350383709658551993b76091ca06f309d3d721a2bb3e97dee0c5089497743aebd1badc98bb4b3abbbde7de94b67a01786ba6068d9250ea046e0cbdb2a061dd3e420b19097abeadfcf54640de13574c0",
                 "transactions" : [
                     {
                         "data" : "0x447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350383709658551993b7609",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03114e1c7ba6c1a40c7f87bfb0ae172a2db9dbace99e045637ca5cc9b3c98667fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf25a257b69a7c8de3a7a2a3c390277cc34aef5fe0ee7948c681f5a1ac8b8bbd6",
+        "lastblockhash" : "0x5e10da54a8d85b96a5dd0644e336b4e47edc5cfa9e5ecec7a5ed9baa33d83612",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x6b8beb66",
                 "code" : "0x447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350383709658551993b760955",
@@ -233,8 +226,8 @@
     "randomStatetest631BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest631BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest631BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8b50",
-                    "hash" : "0x0140fe961cf45606568e1d3723de7b4dddb09e07fd5e3db55ab2872129a8c6cf",
-                    "mixHash" : "0xc777429c9f64849945499d3bd1c2d6be9262366261262fdfd6046dd51438a240",
-                    "nonce" : "0x323e7a6c1be2795b",
+                    "hash" : "0x65b7bc2a73508a4b3496c67ca6a8a30ecdb36205db7b54f917e3eb4842c1b9a4",
+                    "mixHash" : "0x4026964e5126e594b68e5077161063a786d842fc61006860f8bfafed4ebb21ca",
+                    "nonce" : "0xc575cbf124b4f5ae",
                     "number" : "0x01",
                     "parentHash" : "0xc581f4d7d897eadc885b5c6ee099183038338bcb923241011ddc317e8c03bd57",
                     "receiptTrie" : "0x21ec8021ad2ec58f89adf10674ea8e1f81b7869eabe05bd5515908b23ecec932",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0x1c181c1bd4a6dddac9f4ee71402a59105d1db669fad873571976fbf0da562f6b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9033ef901fca0c581f4d7d897eadc885b5c6ee099183038338bcb923241011ddc317e8c03bd57a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0174aad03ebe28c58454e67ff793f5049564de519a5187d3eeff315171fc521d6a01c181c1bd4a6dddac9f4ee71402a59105d1db669fad873571976fbf0da562f6ba021ec8021ad2ec58f89adf10674ea8e1f81b7869eabe05bd5515908b23ecec932b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828b508203e880a0c777429c9f64849945499d3bd1c2d6be9262366261262fdfd6046dd51438a24088323e7a6c1be2795bf9013bf901388001845d99671294095e7baea6a6c7c4c2dfeb977efac326af552d87846b8beb66b8d2447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350383709658551993b76091ca06f309d3d721a2bb3e97dee0c5089497743aebd1badc98bb4b3abbbde7de94b67a01786ba6068d9250ea046e0cbdb2a061dd3e420b19097abeadfcf54640de13574c0",
+                "rlp" : "0xf9033ef901fca0c581f4d7d897eadc885b5c6ee099183038338bcb923241011ddc317e8c03bd57a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0174aad03ebe28c58454e67ff793f5049564de519a5187d3eeff315171fc521d6a01c181c1bd4a6dddac9f4ee71402a59105d1db669fad873571976fbf0da562f6ba021ec8021ad2ec58f89adf10674ea8e1f81b7869eabe05bd5515908b23ecec932b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828b508203e880a04026964e5126e594b68e5077161063a786d842fc61006860f8bfafed4ebb21ca88c575cbf124b4f5aef9013bf901388001845d99671294095e7baea6a6c7c4c2dfeb977efac326af552d87846b8beb66b8d2447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350383709658551993b76091ca06f309d3d721a2bb3e97dee0c5089497743aebd1badc98bb4b3abbbde7de94b67a01786ba6068d9250ea046e0cbdb2a061dd3e420b19097abeadfcf54640de13574c0",
                 "transactions" : [
                     {
                         "data" : "0x447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350383709658551993b7609",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03114e1c7ba6c1a40c7f87bfb0ae172a2db9dbace99e045637ca5cc9b3c98667fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0140fe961cf45606568e1d3723de7b4dddb09e07fd5e3db55ab2872129a8c6cf",
+        "lastblockhash" : "0x65b7bc2a73508a4b3496c67ca6a8a30ecdb36205db7b54f917e3eb4842c1b9a4",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest631BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest631BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest631BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8b50",
-                    "hash" : "0x4579aa36c43887ec352f9f316152d5b72aa793b7e0907546ba7619cb41d336ff",
-                    "mixHash" : "0xfd755384a817962bcbeb504585ec0ca1d356ab044e451094cfda5e6cd7914932",
-                    "nonce" : "0x0aa485a22a05b835",
+                    "hash" : "0xbe0ea171c2f45384306504e6c0cab23a2dc2fa24fb567e7c12d2f01a96e9dc9d",
+                    "mixHash" : "0x48243417e8aa7b376c0f57be1ffe28d1748ee9edc829fdee01b6502bfbec037d",
+                    "nonce" : "0xde24fe0cfb90b1d6",
                     "number" : "0x01",
                     "parentHash" : "0xc581f4d7d897eadc885b5c6ee099183038338bcb923241011ddc317e8c03bd57",
                     "receiptTrie" : "0x21ec8021ad2ec58f89adf10674ea8e1f81b7869eabe05bd5515908b23ecec932",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0x1c181c1bd4a6dddac9f4ee71402a59105d1db669fad873571976fbf0da562f6b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9033ef901fca0c581f4d7d897eadc885b5c6ee099183038338bcb923241011ddc317e8c03bd57a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0174aad03ebe28c58454e67ff793f5049564de519a5187d3eeff315171fc521d6a01c181c1bd4a6dddac9f4ee71402a59105d1db669fad873571976fbf0da562f6ba021ec8021ad2ec58f89adf10674ea8e1f81b7869eabe05bd5515908b23ecec932b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828b508203e880a0fd755384a817962bcbeb504585ec0ca1d356ab044e451094cfda5e6cd7914932880aa485a22a05b835f9013bf901388001845d99671294095e7baea6a6c7c4c2dfeb977efac326af552d87846b8beb66b8d2447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350383709658551993b76091ca06f309d3d721a2bb3e97dee0c5089497743aebd1badc98bb4b3abbbde7de94b67a01786ba6068d9250ea046e0cbdb2a061dd3e420b19097abeadfcf54640de13574c0",
+                "rlp" : "0xf9033ef901fca0c581f4d7d897eadc885b5c6ee099183038338bcb923241011ddc317e8c03bd57a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0174aad03ebe28c58454e67ff793f5049564de519a5187d3eeff315171fc521d6a01c181c1bd4a6dddac9f4ee71402a59105d1db669fad873571976fbf0da562f6ba021ec8021ad2ec58f89adf10674ea8e1f81b7869eabe05bd5515908b23ecec932b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828b508203e880a048243417e8aa7b376c0f57be1ffe28d1748ee9edc829fdee01b6502bfbec037d88de24fe0cfb90b1d6f9013bf901388001845d99671294095e7baea6a6c7c4c2dfeb977efac326af552d87846b8beb66b8d2447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350383709658551993b76091ca06f309d3d721a2bb3e97dee0c5089497743aebd1badc98bb4b3abbbde7de94b67a01786ba6068d9250ea046e0cbdb2a061dd3e420b19097abeadfcf54640de13574c0",
                 "transactions" : [
                     {
                         "data" : "0x447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350383709658551993b7609",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03114e1c7ba6c1a40c7f87bfb0ae172a2db9dbace99e045637ca5cc9b3c98667fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4579aa36c43887ec352f9f316152d5b72aa793b7e0907546ba7619cb41d336ff",
+        "lastblockhash" : "0xbe0ea171c2f45384306504e6c0cab23a2dc2fa24fb567e7c12d2f01a96e9dc9d",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest631BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest631BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest631BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8b50",
-                    "hash" : "0x5bfe24c549d038bf5878b19da84391b312f62a2bb82465cd6a3b2381d6697d20",
-                    "mixHash" : "0x6680092cbefc118790aee8deb133b4d0485dd858faf7816ea59c783ebc786871",
-                    "nonce" : "0xc94df8d17b6a5d49",
+                    "hash" : "0x2269acb14ed9f6f3c486c0a481e6f4b3b2ff6b23a703c56962397df00578e4da",
+                    "mixHash" : "0x9aa9672e2ab2531c8c314f7ecfd274147f5b9beb8b6109331f5c46fb387ebd61",
+                    "nonce" : "0xc1d7dca5e1306aa9",
                     "number" : "0x01",
                     "parentHash" : "0xc581f4d7d897eadc885b5c6ee099183038338bcb923241011ddc317e8c03bd57",
                     "receiptTrie" : "0x21ec8021ad2ec58f89adf10674ea8e1f81b7869eabe05bd5515908b23ecec932",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0x1c181c1bd4a6dddac9f4ee71402a59105d1db669fad873571976fbf0da562f6b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9033ef901fca0c581f4d7d897eadc885b5c6ee099183038338bcb923241011ddc317e8c03bd57a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0174aad03ebe28c58454e67ff793f5049564de519a5187d3eeff315171fc521d6a01c181c1bd4a6dddac9f4ee71402a59105d1db669fad873571976fbf0da562f6ba021ec8021ad2ec58f89adf10674ea8e1f81b7869eabe05bd5515908b23ecec932b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828b508203e880a06680092cbefc118790aee8deb133b4d0485dd858faf7816ea59c783ebc78687188c94df8d17b6a5d49f9013bf901388001845d99671294095e7baea6a6c7c4c2dfeb977efac326af552d87846b8beb66b8d2447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350383709658551993b76091ca06f309d3d721a2bb3e97dee0c5089497743aebd1badc98bb4b3abbbde7de94b67a01786ba6068d9250ea046e0cbdb2a061dd3e420b19097abeadfcf54640de13574c0",
+                "rlp" : "0xf9033ef901fca0c581f4d7d897eadc885b5c6ee099183038338bcb923241011ddc317e8c03bd57a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0174aad03ebe28c58454e67ff793f5049564de519a5187d3eeff315171fc521d6a01c181c1bd4a6dddac9f4ee71402a59105d1db669fad873571976fbf0da562f6ba021ec8021ad2ec58f89adf10674ea8e1f81b7869eabe05bd5515908b23ecec932b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828b508203e880a09aa9672e2ab2531c8c314f7ecfd274147f5b9beb8b6109331f5c46fb387ebd6188c1d7dca5e1306aa9f9013bf901388001845d99671294095e7baea6a6c7c4c2dfeb977efac326af552d87846b8beb66b8d2447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350383709658551993b76091ca06f309d3d721a2bb3e97dee0c5089497743aebd1badc98bb4b3abbbde7de94b67a01786ba6068d9250ea046e0cbdb2a061dd3e420b19097abeadfcf54640de13574c0",
                 "transactions" : [
                     {
                         "data" : "0x447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350383709658551993b7609",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03114e1c7ba6c1a40c7f87bfb0ae172a2db9dbace99e045637ca5cc9b3c98667fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5bfe24c549d038bf5878b19da84391b312f62a2bb82465cd6a3b2381d6697d20",
+        "lastblockhash" : "0x2269acb14ed9f6f3c486c0a481e6f4b3b2ff6b23a703c56962397df00578e4da",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest631BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest631BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest631BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8b50",
-                    "hash" : "0xb9264e7f6ea06f63597b5077f47aca2e112741a1dc0075a1d4b03202dea6a33b",
-                    "mixHash" : "0x13e547173dd278d3d0e73fc96380910291c15aac04a59ec6123925c46a6e73cf",
-                    "nonce" : "0x8223a2e49a2eef03",
+                    "hash" : "0x3e0865736c33644f100a68d9d852e638f748298cac329e84ff6326eb0e1cb634",
+                    "mixHash" : "0xf835ba625e438bd90e551119dd2a65e7ffba3b9dac6e0d67fe4d7252c499c5f2",
+                    "nonce" : "0xb03119a4bf0639f7",
                     "number" : "0x01",
                     "parentHash" : "0xc581f4d7d897eadc885b5c6ee099183038338bcb923241011ddc317e8c03bd57",
                     "receiptTrie" : "0x21ec8021ad2ec58f89adf10674ea8e1f81b7869eabe05bd5515908b23ecec932",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0x1c181c1bd4a6dddac9f4ee71402a59105d1db669fad873571976fbf0da562f6b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9033ef901fca0c581f4d7d897eadc885b5c6ee099183038338bcb923241011ddc317e8c03bd57a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0174aad03ebe28c58454e67ff793f5049564de519a5187d3eeff315171fc521d6a01c181c1bd4a6dddac9f4ee71402a59105d1db669fad873571976fbf0da562f6ba021ec8021ad2ec58f89adf10674ea8e1f81b7869eabe05bd5515908b23ecec932b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828b508203e880a013e547173dd278d3d0e73fc96380910291c15aac04a59ec6123925c46a6e73cf888223a2e49a2eef03f9013bf901388001845d99671294095e7baea6a6c7c4c2dfeb977efac326af552d87846b8beb66b8d2447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350383709658551993b76091ca06f309d3d721a2bb3e97dee0c5089497743aebd1badc98bb4b3abbbde7de94b67a01786ba6068d9250ea046e0cbdb2a061dd3e420b19097abeadfcf54640de13574c0",
+                "rlp" : "0xf9033ef901fca0c581f4d7d897eadc885b5c6ee099183038338bcb923241011ddc317e8c03bd57a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0174aad03ebe28c58454e67ff793f5049564de519a5187d3eeff315171fc521d6a01c181c1bd4a6dddac9f4ee71402a59105d1db669fad873571976fbf0da562f6ba021ec8021ad2ec58f89adf10674ea8e1f81b7869eabe05bd5515908b23ecec932b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828b508203e880a0f835ba625e438bd90e551119dd2a65e7ffba3b9dac6e0d67fe4d7252c499c5f288b03119a4bf0639f7f9013bf901388001845d99671294095e7baea6a6c7c4c2dfeb977efac326af552d87846b8beb66b8d2447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350383709658551993b76091ca06f309d3d721a2bb3e97dee0c5089497743aebd1badc98bb4b3abbbde7de94b67a01786ba6068d9250ea046e0cbdb2a061dd3e420b19097abeadfcf54640de13574c0",
                 "transactions" : [
                     {
                         "data" : "0x447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350383709658551993b7609",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03114e1c7ba6c1a40c7f87bfb0ae172a2db9dbace99e045637ca5cc9b3c98667fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb9264e7f6ea06f63597b5077f47aca2e112741a1dc0075a1d4b03202dea6a33b",
+        "lastblockhash" : "0x3e0865736c33644f100a68d9d852e638f748298cac329e84ff6326eb0e1cb634",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest634BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest634BC.json
index c7f058a50..310c24350 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest634BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest634BC.json
@@ -2,8 +2,8 @@
     "randomStatetest634BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest634BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest634BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc19f",
-                    "hash" : "0xf8144fd612d703a8a6711f046d9105fcbd0e559df03cac45a03d9e269e32a1f3",
-                    "mixHash" : "0xd0200346472e0be8a9269d8bc7abc6cf11ac6627481127142dc657b708282283",
-                    "nonce" : "0xba53a6c275dd59db",
+                    "hash" : "0x138fd87dbbbc6fe3947aa93a2ce2ee7337a9fc3261a97c01d95a318ae4f9a7bd",
+                    "mixHash" : "0x12a31468fc583c96089bd6357884337a633e58651c6a9d8a1a0d283344d8f235",
+                    "nonce" : "0x71d961adeb54f984",
                     "number" : "0x01",
                     "parentHash" : "0xb22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8",
                     "receiptTrie" : "0x668176971739a6b6ee545fea5cdb4ead8061ef3c2ba1baf02594f35f2efbddf2",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0b22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05e5b8ad0f6c63a968e0050b38c47730d99deff7f327443d776d962e26403eb55a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0668176971739a6b6ee545fea5cdb4ead8061ef3c2ba1baf02594f35f2efbddf2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c19f8203e880a0d0200346472e0be8a9269d8bc7abc6cf11ac6627481127142dc657b70828228388ba53a6c275dd59dbf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0b22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05e5b8ad0f6c63a968e0050b38c47730d99deff7f327443d776d962e26403eb55a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0668176971739a6b6ee545fea5cdb4ead8061ef3c2ba1baf02594f35f2efbddf2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c19f8203e880a012a31468fc583c96089bd6357884337a633e58651c6a9d8a1a0d283344d8f2358871d961adeb54f984f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07bdffb0b784e5325c83550e57bb1aad7f5af30e6fbfb0f7e4d6380675ad83ca6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf8144fd612d703a8a6711f046d9105fcbd0e559df03cac45a03d9e269e32a1f3",
+        "lastblockhash" : "0x138fd87dbbbc6fe3947aa93a2ce2ee7337a9fc3261a97c01d95a318ae4f9a7bd",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest634BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest634BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest634BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc4ab",
-                    "hash" : "0x08ef2fe860f8abdc6615ca0c5e722ebe0e3299ed0556984b76014961f7b5f682",
-                    "mixHash" : "0xb5a50e9f03639a67d885d88609cd6ee8daec35eb8ab3636fe48573e819825618",
-                    "nonce" : "0x585832665300c0c7",
+                    "hash" : "0xcbb099f3c4a792e5828a35e69b4599237614ce283fee1385829e18a6826af7a7",
+                    "mixHash" : "0x0a87e473e09634145d317355b2c8843c415c1d9b741af3a2e7638dc7cdc6fb93",
+                    "nonce" : "0x99893eced624bfa0",
                     "number" : "0x01",
                     "parentHash" : "0xb22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8",
                     "receiptTrie" : "0x8f64eb7428fee66246213557edac96623b44750c7960fc4eda9f074959c8bbfc",
-                    "stateRoot" : "0x20a1c0d730646bb1c63a8838cc4d7bda165c98740b584bb441d2955ec6f6a9d8",
+                    "stateRoot" : "0xdac39339f87d6da547345926856cf4df6a4d7dcac1195f1da2a47b57aeeeeed6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0b22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a020a1c0d730646bb1c63a8838cc4d7bda165c98740b584bb441d2955ec6f6a9d8a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa08f64eb7428fee66246213557edac96623b44750c7960fc4eda9f074959c8bbfcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c4ab8203e880a0b5a50e9f03639a67d885d88609cd6ee8daec35eb8ab3636fe48573e81982561888585832665300c0c7f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0b22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dac39339f87d6da547345926856cf4df6a4d7dcac1195f1da2a47b57aeeeeed6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa08f64eb7428fee66246213557edac96623b44750c7960fc4eda9f074959c8bbfcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c4ab8203e880a00a87e473e09634145d317355b2c8843c415c1d9b741af3a2e7638dc7cdc6fb938899893eced624bfa0f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07bdffb0b784e5325c83550e57bb1aad7f5af30e6fbfb0f7e4d6380675ad83ca6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x08ef2fe860f8abdc6615ca0c5e722ebe0e3299ed0556984b76014961f7b5f682",
+        "lastblockhash" : "0xcbb099f3c4a792e5828a35e69b4599237614ce283fee1385829e18a6826af7a7",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x43424044454245343af399e4a4734555",
@@ -233,8 +226,8 @@
     "randomStatetest634BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest634BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest634BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc19f",
-                    "hash" : "0x2bce5d07eacdd2270b6d1c1caf0ba8d92a0eaddae001585534b76b0b0e83ada4",
-                    "mixHash" : "0x53186223537959d96ad8628554ab356d983d5a3f22f5c690f2b4983c1d09d581",
-                    "nonce" : "0xa4271c9287f5e63b",
+                    "hash" : "0x1308de51122200298bebb4609fdbd8828c95516bebad95cf491e6513932689bf",
+                    "mixHash" : "0x3a14df75addd464cea76f8adee4c6765f6277753ec75b40b82e462edc44fde6e",
+                    "nonce" : "0xcf836cdad3289b6e",
                     "number" : "0x01",
                     "parentHash" : "0xb22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8",
                     "receiptTrie" : "0x2053d4e3f9213d2e922a19fe2750bfeeda59520e767ef1cf46fffc4416064a27",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0b22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0abb705527b25bb7f690ae3d8fc1402fe4d6d7228baa146f75316577c231a4083a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02053d4e3f9213d2e922a19fe2750bfeeda59520e767ef1cf46fffc4416064a27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c19f8203e880a053186223537959d96ad8628554ab356d983d5a3f22f5c690f2b4983c1d09d58188a4271c9287f5e63bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0b22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0abb705527b25bb7f690ae3d8fc1402fe4d6d7228baa146f75316577c231a4083a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02053d4e3f9213d2e922a19fe2750bfeeda59520e767ef1cf46fffc4416064a27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c19f8203e880a03a14df75addd464cea76f8adee4c6765f6277753ec75b40b82e462edc44fde6e88cf836cdad3289b6ef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07bdffb0b784e5325c83550e57bb1aad7f5af30e6fbfb0f7e4d6380675ad83ca6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2bce5d07eacdd2270b6d1c1caf0ba8d92a0eaddae001585534b76b0b0e83ada4",
+        "lastblockhash" : "0x1308de51122200298bebb4609fdbd8828c95516bebad95cf491e6513932689bf",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest634BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest634BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest634BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc19f",
-                    "hash" : "0x9f93fea804faeb2132a1d8896389671b11ab27d2826d464f521db3fb57c5cf1d",
-                    "mixHash" : "0x0f8e02882537cf93633ba2f2fc76cd94f624c3901adaffc1c904bc92c98c6d31",
-                    "nonce" : "0x9fd48058584776dc",
+                    "hash" : "0x9c0e5070a94180ccfc5704cbb027114cbd850e99ea3004327566d868da8713e6",
+                    "mixHash" : "0x08759815e9eb13e0d216b9a05b5b3b00ed81d2ac2884a4c0e51563a55faa2a6f",
+                    "nonce" : "0x4f8986bba7392ba8",
                     "number" : "0x01",
                     "parentHash" : "0xb22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8",
                     "receiptTrie" : "0x2053d4e3f9213d2e922a19fe2750bfeeda59520e767ef1cf46fffc4416064a27",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0b22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0abb705527b25bb7f690ae3d8fc1402fe4d6d7228baa146f75316577c231a4083a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02053d4e3f9213d2e922a19fe2750bfeeda59520e767ef1cf46fffc4416064a27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c19f8203e880a00f8e02882537cf93633ba2f2fc76cd94f624c3901adaffc1c904bc92c98c6d31889fd48058584776dcf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0b22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0abb705527b25bb7f690ae3d8fc1402fe4d6d7228baa146f75316577c231a4083a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02053d4e3f9213d2e922a19fe2750bfeeda59520e767ef1cf46fffc4416064a27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c19f8203e880a008759815e9eb13e0d216b9a05b5b3b00ed81d2ac2884a4c0e51563a55faa2a6f884f8986bba7392ba8f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07bdffb0b784e5325c83550e57bb1aad7f5af30e6fbfb0f7e4d6380675ad83ca6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9f93fea804faeb2132a1d8896389671b11ab27d2826d464f521db3fb57c5cf1d",
+        "lastblockhash" : "0x9c0e5070a94180ccfc5704cbb027114cbd850e99ea3004327566d868da8713e6",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest634BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest634BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest634BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc19f",
-                    "hash" : "0xb1abc2ef67823c1db8bc8bfa54f7ca537977e8e5f1cfc6d2614edfa597a8294b",
-                    "mixHash" : "0x086e9d360e407e222738f46c51da169f3a977968fe6319bd57ba5229d0e4ee14",
-                    "nonce" : "0x5e253038eaa28568",
+                    "hash" : "0x28c1dac54bb95f3ef5ae4bcb2f7b2588bbb0ac6f2db0e9cf65752d6f81af17d2",
+                    "mixHash" : "0x869dd997850d223df7d0106a143c2894fabdb9d5e912398061a8739b57ca2706",
+                    "nonce" : "0x2a8e14c95e158d50",
                     "number" : "0x01",
                     "parentHash" : "0xb22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8",
                     "receiptTrie" : "0x2053d4e3f9213d2e922a19fe2750bfeeda59520e767ef1cf46fffc4416064a27",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0b22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0abb705527b25bb7f690ae3d8fc1402fe4d6d7228baa146f75316577c231a4083a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02053d4e3f9213d2e922a19fe2750bfeeda59520e767ef1cf46fffc4416064a27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c19f8203e880a0086e9d360e407e222738f46c51da169f3a977968fe6319bd57ba5229d0e4ee14885e253038eaa28568f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0b22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0abb705527b25bb7f690ae3d8fc1402fe4d6d7228baa146f75316577c231a4083a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02053d4e3f9213d2e922a19fe2750bfeeda59520e767ef1cf46fffc4416064a27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c19f8203e880a0869dd997850d223df7d0106a143c2894fabdb9d5e912398061a8739b57ca2706882a8e14c95e158d50f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07bdffb0b784e5325c83550e57bb1aad7f5af30e6fbfb0f7e4d6380675ad83ca6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb1abc2ef67823c1db8bc8bfa54f7ca537977e8e5f1cfc6d2614edfa597a8294b",
+        "lastblockhash" : "0x28c1dac54bb95f3ef5ae4bcb2f7b2588bbb0ac6f2db0e9cf65752d6f81af17d2",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest634BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest634BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest634BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc19f",
-                    "hash" : "0xcbf5a88b496c6829243249c232b4cfa7107524c4360b7f62df75b56079ac43e5",
-                    "mixHash" : "0xa21d9e514447a55b2545e3e95347e5f28a4de8847345acf9bd98a1a6eb5ef392",
-                    "nonce" : "0xc934e775c6dee52b",
+                    "hash" : "0xb129f4e532cfc2d448e99fcabcd19b8cb1a123d9947c237295b382ec64963f24",
+                    "mixHash" : "0xa338b7462bbbe6786d90e30946e05343af3c3e47df422819baf3df00eb5cadce",
+                    "nonce" : "0x5131c624dfee7073",
                     "number" : "0x01",
                     "parentHash" : "0xb22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8",
                     "receiptTrie" : "0x2053d4e3f9213d2e922a19fe2750bfeeda59520e767ef1cf46fffc4416064a27",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0b22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0abb705527b25bb7f690ae3d8fc1402fe4d6d7228baa146f75316577c231a4083a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02053d4e3f9213d2e922a19fe2750bfeeda59520e767ef1cf46fffc4416064a27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c19f8203e880a0a21d9e514447a55b2545e3e95347e5f28a4de8847345acf9bd98a1a6eb5ef39288c934e775c6dee52bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0b22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0abb705527b25bb7f690ae3d8fc1402fe4d6d7228baa146f75316577c231a4083a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02053d4e3f9213d2e922a19fe2750bfeeda59520e767ef1cf46fffc4416064a27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c19f8203e880a0a338b7462bbbe6786d90e30946e05343af3c3e47df422819baf3df00eb5cadce885131c624dfee7073f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07bdffb0b784e5325c83550e57bb1aad7f5af30e6fbfb0f7e4d6380675ad83ca6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcbf5a88b496c6829243249c232b4cfa7107524c4360b7f62df75b56079ac43e5",
+        "lastblockhash" : "0xb129f4e532cfc2d448e99fcabcd19b8cb1a123d9947c237295b382ec64963f24",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest65BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest65BC.json
index 75f381993..e73330c8e 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest65BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest65BC.json
@@ -2,8 +2,8 @@
     "randomStatetest65BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest65BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest65BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x011f83",
-                    "hash" : "0x72afd61d55ed54c42aba63df657b46ab4cece57d7225df6b96e651afb5d5f9fe",
-                    "mixHash" : "0x793f0ff841d0b109e3829f333087149e2db801319112651e7b4e33c9c6a64661",
-                    "nonce" : "0x705fa8800d77c27d",
+                    "hash" : "0xcc21b8ebaf44b646cc4e66ecb12e2b2f489c6e9e27c8dc9ae313341c7053c873",
+                    "mixHash" : "0x9630dc9047335a5de0a344a80e7e83689475089c4be9a0bca836afb4c2261305",
+                    "nonce" : "0x0136953f31515a85",
                     "number" : "0x01",
                     "parentHash" : "0x73e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcc",
                     "receiptTrie" : "0xa873d6ddeabad24fe5a57203ce0222095108b8c747ebb9faa0323f1429bdc8ea",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda073e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f98d5a871035135951c852d944526c5cb5c820a5d7384fcce2bf3aec0380c67ea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0a873d6ddeabad24fe5a57203ce0222095108b8c747ebb9faa0323f1429bdc8eab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011f838203e880a0793f0ff841d0b109e3829f333087149e2db801319112651e7b4e33c9c6a6466188705fa8800d77c27df865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda073e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f98d5a871035135951c852d944526c5cb5c820a5d7384fcce2bf3aec0380c67ea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0a873d6ddeabad24fe5a57203ce0222095108b8c747ebb9faa0323f1429bdc8eab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011f838203e880a09630dc9047335a5de0a344a80e7e83689475089c4be9a0bca836afb4c2261305880136953f31515a85f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fcdb6d0f9f0f4bb006a8e3dd75e88dbbb5866b5047a14aa4ff3e47dcfbd8a61ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x72afd61d55ed54c42aba63df657b46ab4cece57d7225df6b96e651afb5d5f9fe",
+        "lastblockhash" : "0xcc21b8ebaf44b646cc4e66ecb12e2b2f489c6e9e27c8dc9ae313341c7053c873",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest65BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest65BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest65BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x01259b",
-                    "hash" : "0x5baf1223da33d35ec32a723e5532a2bd44fbe140b889f550c796e78feaa6c11e",
-                    "mixHash" : "0xd9baebac2b864e86e07a8fdbad11ce21ff9548da186a94bcfd7399976be9db2c",
-                    "nonce" : "0x8ab887fd4f1bfdae",
+                    "hash" : "0x56af82ec019b6e9d9af584107e4b6abf0c7b558174c2767b8a6a5e78b3eb21ce",
+                    "mixHash" : "0xc1cf50b3afacc6714caf3bf7b180f197415d69b0e8079941efb8ffb49b604811",
+                    "nonce" : "0x16bf8579fa8d09df",
                     "number" : "0x01",
                     "parentHash" : "0x73e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcc",
                     "receiptTrie" : "0xbeb81e7a56a4742ff0b10e5f9049c7bd5eb348c3e1d037fc15bd4687d07b3ce9",
-                    "stateRoot" : "0x08841d194a544228b072b8ae114bef922985c3b61775a2ce8a64733ece2ffbb1",
+                    "stateRoot" : "0xe71866f73c01aa5af05ad50fb281def25348b762464c2988915555fcc818631b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda073e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a008841d194a544228b072b8ae114bef922985c3b61775a2ce8a64733ece2ffbb1a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0beb81e7a56a4742ff0b10e5f9049c7bd5eb348c3e1d037fc15bd4687d07b3ce9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301259b8203e880a0d9baebac2b864e86e07a8fdbad11ce21ff9548da186a94bcfd7399976be9db2c888ab887fd4f1bfdaef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda073e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e71866f73c01aa5af05ad50fb281def25348b762464c2988915555fcc818631ba0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0beb81e7a56a4742ff0b10e5f9049c7bd5eb348c3e1d037fc15bd4687d07b3ce9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301259b8203e880a0c1cf50b3afacc6714caf3bf7b180f197415d69b0e8079941efb8ffb49b6048118816bf8579fa8d09dff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fcdb6d0f9f0f4bb006a8e3dd75e88dbbb5866b5047a14aa4ff3e47dcfbd8a61ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5baf1223da33d35ec32a723e5532a2bd44fbe140b889f550c796e78feaa6c11e",
+        "lastblockhash" : "0x56af82ec019b6e9d9af584107e4b6abf0c7b558174c2767b8a6a5e78b3eb21ce",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x45404043424344444286f26355",
@@ -233,8 +226,8 @@
     "randomStatetest65BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest65BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest65BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x011f83",
-                    "hash" : "0x2dbe7bf704c2e6321fa92643d09c07920288c450a9d5dd549884651b02ade5c4",
-                    "mixHash" : "0x9c19fb0b626f0ac8beae9f97b4d34a32d2af013930e203fc200d0b86d51b81ff",
-                    "nonce" : "0x8c7e22cef4b6c2dc",
+                    "hash" : "0xf8d6a22ce21fefe6c033d03ccefc16e16ff92d278ac27167b6f599a501f7b3be",
+                    "mixHash" : "0xb91986d905d8a8c07fc1d22a7fac58445406e423db3db6f14424849ebcd93e67",
+                    "nonce" : "0x6417c872b184c0a5",
                     "number" : "0x01",
                     "parentHash" : "0x73e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcc",
                     "receiptTrie" : "0xe8c41f46a52b4f08011d53cbba023a9c8654db85e80d7f9f3ba6414ea58dd412",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda073e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05b0f70454ee793c504625f545cf6e1699db49d446dedb6ab038f15ddb243d011a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e8c41f46a52b4f08011d53cbba023a9c8654db85e80d7f9f3ba6414ea58dd412b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011f838203e880a09c19fb0b626f0ac8beae9f97b4d34a32d2af013930e203fc200d0b86d51b81ff888c7e22cef4b6c2dcf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda073e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05b0f70454ee793c504625f545cf6e1699db49d446dedb6ab038f15ddb243d011a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e8c41f46a52b4f08011d53cbba023a9c8654db85e80d7f9f3ba6414ea58dd412b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011f838203e880a0b91986d905d8a8c07fc1d22a7fac58445406e423db3db6f14424849ebcd93e67886417c872b184c0a5f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fcdb6d0f9f0f4bb006a8e3dd75e88dbbb5866b5047a14aa4ff3e47dcfbd8a61ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2dbe7bf704c2e6321fa92643d09c07920288c450a9d5dd549884651b02ade5c4",
+        "lastblockhash" : "0xf8d6a22ce21fefe6c033d03ccefc16e16ff92d278ac27167b6f599a501f7b3be",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest65BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest65BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest65BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x011f83",
-                    "hash" : "0x3f8b4e248b151d007715b0205f2a3d8fddcefe2d8630764136222bda5f802a70",
-                    "mixHash" : "0xc0d42595c06ad2603bae341bbf5a085fb529a97300ee786ad349ccf7cf9566f8",
-                    "nonce" : "0x9807b2a786dcfc9c",
+                    "hash" : "0x792a058a76fa0182e3c4eac16200f56d482c3a7d2521f0b52dc3d133f85c986c",
+                    "mixHash" : "0x837dc64b6c1bba5f682d347990ac036675b368b5ed62812007eb2eff6588f905",
+                    "nonce" : "0x331e9077179889ee",
                     "number" : "0x01",
                     "parentHash" : "0x73e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcc",
                     "receiptTrie" : "0xe8c41f46a52b4f08011d53cbba023a9c8654db85e80d7f9f3ba6414ea58dd412",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda073e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05b0f70454ee793c504625f545cf6e1699db49d446dedb6ab038f15ddb243d011a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e8c41f46a52b4f08011d53cbba023a9c8654db85e80d7f9f3ba6414ea58dd412b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011f838203e880a0c0d42595c06ad2603bae341bbf5a085fb529a97300ee786ad349ccf7cf9566f8889807b2a786dcfc9cf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda073e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05b0f70454ee793c504625f545cf6e1699db49d446dedb6ab038f15ddb243d011a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e8c41f46a52b4f08011d53cbba023a9c8654db85e80d7f9f3ba6414ea58dd412b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011f838203e880a0837dc64b6c1bba5f682d347990ac036675b368b5ed62812007eb2eff6588f90588331e9077179889eef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fcdb6d0f9f0f4bb006a8e3dd75e88dbbb5866b5047a14aa4ff3e47dcfbd8a61ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3f8b4e248b151d007715b0205f2a3d8fddcefe2d8630764136222bda5f802a70",
+        "lastblockhash" : "0x792a058a76fa0182e3c4eac16200f56d482c3a7d2521f0b52dc3d133f85c986c",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest65BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest65BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest65BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x793653ed7f35065a025ba5639d3f3c72854204b4c3b5162c732dbb05c7e86622",
-                    "mixHash" : "0x4da1d434b13d465845af691c836144b686746013eb76c57d13141cc59fdcb4ce",
-                    "nonce" : "0x98b88373c2780f54",
+                    "hash" : "0x5effea19283594340c8471b50620d1d055ff5ea20092916cdeaec5601f6de32c",
+                    "mixHash" : "0xd28b5ca54b85f2ac4d9c6f2c4aa27dceeaf98392aeb08882b0e322672e77f169",
+                    "nonce" : "0x8ffcc4170f96e2f7",
                     "number" : "0x01",
                     "parentHash" : "0x73e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcc",
                     "receiptTrie" : "0xf75c1d8561848e212331aacacd3915e367097426010dcead544414fb4a9a9573",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda073e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ebea85aa2dcd576c647802ecd03f84be6c2a9696844a1760927e0edcfc6ea84ea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f75c1d8561848e212331aacacd3915e367097426010dcead544414fb4a9a9573b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83061a808203e880a04da1d434b13d465845af691c836144b686746013eb76c57d13141cc59fdcb4ce8898b88373c2780f54f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda073e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ebea85aa2dcd576c647802ecd03f84be6c2a9696844a1760927e0edcfc6ea84ea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f75c1d8561848e212331aacacd3915e367097426010dcead544414fb4a9a9573b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83061a808203e880a0d28b5ca54b85f2ac4d9c6f2c4aa27dceeaf98392aeb08882b0e322672e77f169888ffcc4170f96e2f7f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fcdb6d0f9f0f4bb006a8e3dd75e88dbbb5866b5047a14aa4ff3e47dcfbd8a61ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x793653ed7f35065a025ba5639d3f3c72854204b4c3b5162c732dbb05c7e86622",
+        "lastblockhash" : "0x5effea19283594340c8471b50620d1d055ff5ea20092916cdeaec5601f6de32c",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest65BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest65BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest65BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x2d419839e186fbbc080c735c4c8b17460725cd3c5995b4ec6757137a031c601f",
-                    "mixHash" : "0x6083b446e33f18291f111f9c20746c27bd12f362c8d4d4c628611b03b9124cb9",
-                    "nonce" : "0xe455f905f275f81a",
+                    "hash" : "0x1f53a92a7dec634a91005989e66ec3a9e53e78b97fabdbfbfb8dcabf1f9653ac",
+                    "mixHash" : "0xbb4a0c2ad86153d02286f324926fefc7f5a4617fdb4b6b5ebcf7ca2d28bce5f8",
+                    "nonce" : "0x7a6f7b2bd1b05c69",
                     "number" : "0x01",
                     "parentHash" : "0x73e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcc",
                     "receiptTrie" : "0xf75c1d8561848e212331aacacd3915e367097426010dcead544414fb4a9a9573",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda073e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ebea85aa2dcd576c647802ecd03f84be6c2a9696844a1760927e0edcfc6ea84ea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f75c1d8561848e212331aacacd3915e367097426010dcead544414fb4a9a9573b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83061a808203e880a06083b446e33f18291f111f9c20746c27bd12f362c8d4d4c628611b03b9124cb988e455f905f275f81af865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda073e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ebea85aa2dcd576c647802ecd03f84be6c2a9696844a1760927e0edcfc6ea84ea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f75c1d8561848e212331aacacd3915e367097426010dcead544414fb4a9a9573b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83061a808203e880a0bb4a0c2ad86153d02286f324926fefc7f5a4617fdb4b6b5ebcf7ca2d28bce5f8887a6f7b2bd1b05c69f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fcdb6d0f9f0f4bb006a8e3dd75e88dbbb5866b5047a14aa4ff3e47dcfbd8a61ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2d419839e186fbbc080c735c4c8b17460725cd3c5995b4ec6757137a031c601f",
+        "lastblockhash" : "0x1f53a92a7dec634a91005989e66ec3a9e53e78b97fabdbfbfb8dcabf1f9653ac",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest68BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest68BC.json
index 09ae4f2ba..68419821d 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest68BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest68BC.json
@@ -2,8 +2,8 @@
     "randomStatetest68BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest68BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest68BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5283",
-                    "hash" : "0x262e70174f2b1615515414397a779d7410b39afa9c6b87986a760cdb247b6f6d",
-                    "mixHash" : "0x189d63df069c8552c756bc5d65311dab4e169faab3ea1e7f75b9f52efa94715e",
-                    "nonce" : "0xc48358ca851a8cd9",
+                    "hash" : "0x5ab557c7cc73e3570cff3b843b38a1303ec93d31a45d7ea04fe511ba307f6b46",
+                    "mixHash" : "0x6cdfeb4ab90fabbf011ccf4a7d8767384f683e5fe475f48f3dc2b111c5abf886",
+                    "nonce" : "0x6cdefa0b721cab2e",
                     "number" : "0x01",
                     "parentHash" : "0xbbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9b",
                     "receiptTrie" : "0xe081f85f3da326d42a31d4e0142ced2d116948fdc6b61ad96d48f8081347819a",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0bbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a078de4697b5d59fe33599a2b312cb81c498b6110f5867c0283350f50dd9e3a55da0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e081f85f3da326d42a31d4e0142ced2d116948fdc6b61ad96d48f8081347819ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252838203e880a0189d63df069c8552c756bc5d65311dab4e169faab3ea1e7f75b9f52efa94715e88c48358ca851a8cd9f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0bbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a078de4697b5d59fe33599a2b312cb81c498b6110f5867c0283350f50dd9e3a55da0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e081f85f3da326d42a31d4e0142ced2d116948fdc6b61ad96d48f8081347819ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252838203e880a06cdfeb4ab90fabbf011ccf4a7d8767384f683e5fe475f48f3dc2b111c5abf886886cdefa0b721cab2ef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06b232324474420bccaff3547a4ee398639c929fa80911a4d7b7ca6b4ecb17963a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x262e70174f2b1615515414397a779d7410b39afa9c6b87986a760cdb247b6f6d",
+        "lastblockhash" : "0x5ab557c7cc73e3570cff3b843b38a1303ec93d31a45d7ea04fe511ba307f6b46",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest68BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest68BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest68BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x589b",
-                    "hash" : "0x3cf1ead79d955a118ed2dd64a2a8a49d4ca33c7513e29cc88c6a08554bda0cc7",
-                    "mixHash" : "0x6d80c2e31b56315c7b507c3c2e2a35169a559eaded127c8a34b514e473fc75f9",
-                    "nonce" : "0x8e60e9773474fc27",
+                    "hash" : "0x34caf1453b4bd05ce740e1a0d834642adfcf3846429cab286dd41e5de244510b",
+                    "mixHash" : "0xcae2c5498471402dc70e896ba08d920b58515c25f0243e3bf2a3fb0b3e272da2",
+                    "nonce" : "0x3b6c0770e724c70d",
                     "number" : "0x01",
                     "parentHash" : "0xbbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9b",
                     "receiptTrie" : "0x5dd555e7146cff22d08c22c322ce3f7e7b30e28bf1f360ae251de03266818ec9",
-                    "stateRoot" : "0x509ffb8fb6376bb91c208dd1a9e7d8a41ef8ff79fce3366ec43e5984db950737",
+                    "stateRoot" : "0x676b208b6a6996a761ff313b19309d2b59c55d529e83416336671d079b6ac154",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0bbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0509ffb8fb6376bb91c208dd1a9e7d8a41ef8ff79fce3366ec43e5984db950737a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa05dd555e7146cff22d08c22c322ce3f7e7b30e28bf1f360ae251de03266818ec9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82589b8203e880a06d80c2e31b56315c7b507c3c2e2a35169a559eaded127c8a34b514e473fc75f9888e60e9773474fc27f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0bbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0676b208b6a6996a761ff313b19309d2b59c55d529e83416336671d079b6ac154a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa05dd555e7146cff22d08c22c322ce3f7e7b30e28bf1f360ae251de03266818ec9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82589b8203e880a0cae2c5498471402dc70e896ba08d920b58515c25f0243e3bf2a3fb0b3e272da2883b6c0770e724c70df865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06b232324474420bccaff3547a4ee398639c929fa80911a4d7b7ca6b4ecb17963a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3cf1ead79d955a118ed2dd64a2a8a49d4ca33c7513e29cc88c6a08554bda0cc7",
+        "lastblockhash" : "0x34caf1453b4bd05ce740e1a0d834642adfcf3846429cab286dd41e5de244510b",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x45424043404545456b689f9b7055",
@@ -233,8 +226,8 @@
     "randomStatetest68BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest68BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest68BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5283",
-                    "hash" : "0x4258e41da304fffc5db2e561555843fc11a14ca142e1c13604342ec550653578",
-                    "mixHash" : "0xefb041a7ee6624306be516ffe902cc74a3290be3337479921d283986a27571c1",
-                    "nonce" : "0xdf9ef11fa7c16f34",
+                    "hash" : "0x3ae8fa0decd224aec1dfb67cb5238352c5b8b26f99bc4c3159db9d9e29e14f44",
+                    "mixHash" : "0xadc25ac6babfaa4e9faf2d17facf5bd672f7c49e392eda955d2c0e8b41d1da5a",
+                    "nonce" : "0x847cbcd284b76870",
                     "number" : "0x01",
                     "parentHash" : "0xbbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9b",
                     "receiptTrie" : "0xf031fb988ec6617493598e6ea4198b3e42501916d2f10b85baba9760d8ee1a05",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0bbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ffd19f09bed2b726caf58633d9b331d9bc1cb47298ed30183fb6ac23a6be1c82a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f031fb988ec6617493598e6ea4198b3e42501916d2f10b85baba9760d8ee1a05b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252838203e880a0efb041a7ee6624306be516ffe902cc74a3290be3337479921d283986a27571c188df9ef11fa7c16f34f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0bbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ffd19f09bed2b726caf58633d9b331d9bc1cb47298ed30183fb6ac23a6be1c82a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f031fb988ec6617493598e6ea4198b3e42501916d2f10b85baba9760d8ee1a05b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252838203e880a0adc25ac6babfaa4e9faf2d17facf5bd672f7c49e392eda955d2c0e8b41d1da5a88847cbcd284b76870f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06b232324474420bccaff3547a4ee398639c929fa80911a4d7b7ca6b4ecb17963a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4258e41da304fffc5db2e561555843fc11a14ca142e1c13604342ec550653578",
+        "lastblockhash" : "0x3ae8fa0decd224aec1dfb67cb5238352c5b8b26f99bc4c3159db9d9e29e14f44",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest68BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest68BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest68BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5283",
-                    "hash" : "0xfb848eddf16624ca3b109a1f9f2c8c15f8cf436fb782121d72197065ae3344ee",
-                    "mixHash" : "0x21ea03422c30334cda204b2cc16a3a1a15ed34c85d8df9436cc0b42be220179e",
-                    "nonce" : "0x16af21defaabba28",
+                    "hash" : "0xe4455055f6c2cdf2b6af18bc1e2bb0a2faa1e15ab2ac7b09e22ec06bd95c1816",
+                    "mixHash" : "0xa0ced00acc9bbca11207734cfabf6dc025f4bbaf40e47f4007a0f9f878d1c479",
+                    "nonce" : "0xa2fbf36766b438c7",
                     "number" : "0x01",
                     "parentHash" : "0xbbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9b",
                     "receiptTrie" : "0xf031fb988ec6617493598e6ea4198b3e42501916d2f10b85baba9760d8ee1a05",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0bbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ffd19f09bed2b726caf58633d9b331d9bc1cb47298ed30183fb6ac23a6be1c82a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f031fb988ec6617493598e6ea4198b3e42501916d2f10b85baba9760d8ee1a05b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252838203e880a021ea03422c30334cda204b2cc16a3a1a15ed34c85d8df9436cc0b42be220179e8816af21defaabba28f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0bbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ffd19f09bed2b726caf58633d9b331d9bc1cb47298ed30183fb6ac23a6be1c82a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f031fb988ec6617493598e6ea4198b3e42501916d2f10b85baba9760d8ee1a05b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252838203e880a0a0ced00acc9bbca11207734cfabf6dc025f4bbaf40e47f4007a0f9f878d1c47988a2fbf36766b438c7f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06b232324474420bccaff3547a4ee398639c929fa80911a4d7b7ca6b4ecb17963a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfb848eddf16624ca3b109a1f9f2c8c15f8cf436fb782121d72197065ae3344ee",
+        "lastblockhash" : "0xe4455055f6c2cdf2b6af18bc1e2bb0a2faa1e15ab2ac7b09e22ec06bd95c1816",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest68BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest68BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest68BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5283",
-                    "hash" : "0xe650ec0f3f78714f70f0d3d09ab2c84b4109f9c0ae159380487d70f55876294e",
-                    "mixHash" : "0x0cb9d6f6622632add40a9cb107ea2bdaeeb13a861406e4dbea9193fe7d7845f7",
-                    "nonce" : "0x644b3d38f1ac1d2a",
+                    "hash" : "0x2ffe401c41490b74c4cfe1e4a4d6ef059f1f7c8ba0e3b8df7fa9c117415cd726",
+                    "mixHash" : "0x2c28f7e24715eda1d1a282d3b42efba66c039209a6a5f20ee1b8a9e628721be3",
+                    "nonce" : "0x8ebb5d05cb97b098",
                     "number" : "0x01",
                     "parentHash" : "0xbbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9b",
                     "receiptTrie" : "0xf031fb988ec6617493598e6ea4198b3e42501916d2f10b85baba9760d8ee1a05",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0bbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ffd19f09bed2b726caf58633d9b331d9bc1cb47298ed30183fb6ac23a6be1c82a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f031fb988ec6617493598e6ea4198b3e42501916d2f10b85baba9760d8ee1a05b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252838203e880a00cb9d6f6622632add40a9cb107ea2bdaeeb13a861406e4dbea9193fe7d7845f788644b3d38f1ac1d2af865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0bbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ffd19f09bed2b726caf58633d9b331d9bc1cb47298ed30183fb6ac23a6be1c82a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f031fb988ec6617493598e6ea4198b3e42501916d2f10b85baba9760d8ee1a05b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252838203e880a02c28f7e24715eda1d1a282d3b42efba66c039209a6a5f20ee1b8a9e628721be3888ebb5d05cb97b098f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06b232324474420bccaff3547a4ee398639c929fa80911a4d7b7ca6b4ecb17963a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe650ec0f3f78714f70f0d3d09ab2c84b4109f9c0ae159380487d70f55876294e",
+        "lastblockhash" : "0x2ffe401c41490b74c4cfe1e4a4d6ef059f1f7c8ba0e3b8df7fa9c117415cd726",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest68BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest68BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest68BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5283",
-                    "hash" : "0x6f7b43f5ce6dfd07c26489c9465032476ae3f5d0ed77c07c29aaefd19d4a00cc",
-                    "mixHash" : "0x6d34d28162d610aac4dbf583d54a39c5439e6cae9d460a738dbec5742d4dfd08",
-                    "nonce" : "0x4cd741093970cf5a",
+                    "hash" : "0x9226d3c18035ea6a861e796682b7060dd1926eaed371c09e543f54119537f926",
+                    "mixHash" : "0xf90c3eb8cb6d2d17e623deddc052c9445c28b70a21b10ea036cb2be1d086b50c",
+                    "nonce" : "0x7028030423b96a00",
                     "number" : "0x01",
                     "parentHash" : "0xbbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9b",
                     "receiptTrie" : "0xf031fb988ec6617493598e6ea4198b3e42501916d2f10b85baba9760d8ee1a05",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0bbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ffd19f09bed2b726caf58633d9b331d9bc1cb47298ed30183fb6ac23a6be1c82a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f031fb988ec6617493598e6ea4198b3e42501916d2f10b85baba9760d8ee1a05b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252838203e880a06d34d28162d610aac4dbf583d54a39c5439e6cae9d460a738dbec5742d4dfd08884cd741093970cf5af865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0bbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ffd19f09bed2b726caf58633d9b331d9bc1cb47298ed30183fb6ac23a6be1c82a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f031fb988ec6617493598e6ea4198b3e42501916d2f10b85baba9760d8ee1a05b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252838203e880a0f90c3eb8cb6d2d17e623deddc052c9445c28b70a21b10ea036cb2be1d086b50c887028030423b96a00f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06b232324474420bccaff3547a4ee398639c929fa80911a4d7b7ca6b4ecb17963a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6f7b43f5ce6dfd07c26489c9465032476ae3f5d0ed77c07c29aaefd19d4a00cc",
+        "lastblockhash" : "0x9226d3c18035ea6a861e796682b7060dd1926eaed371c09e543f54119537f926",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest70BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest70BC.json
index 1b2b1bae1..02d2252aa 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest70BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest70BC.json
@@ -2,8 +2,8 @@
     "randomStatetest70BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest70BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest70BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc19f",
-                    "hash" : "0x522b878c6beceffe93f4a3375c934ba64c3d4dd36b1fac6627183dfa9d500e2f",
-                    "mixHash" : "0x2608605008c9f231c2044c075e0b7965f0e22b6dd0d5de93db737bc05687228d",
-                    "nonce" : "0x7c7d855a5d318428",
+                    "hash" : "0x7eb07b2cbde54b7302b3e3ebed9daeb761a45469a56f82ddb84b241dcd4ee4f3",
+                    "mixHash" : "0x58e30c159d995cea147e72bdae5b17eab5eeb6539e9c4569968ae8063ee3298b",
+                    "nonce" : "0xc885b6faa341e901",
                     "number" : "0x01",
                     "parentHash" : "0xb22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8",
                     "receiptTrie" : "0x668176971739a6b6ee545fea5cdb4ead8061ef3c2ba1baf02594f35f2efbddf2",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0b22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05e5b8ad0f6c63a968e0050b38c47730d99deff7f327443d776d962e26403eb55a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0668176971739a6b6ee545fea5cdb4ead8061ef3c2ba1baf02594f35f2efbddf2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c19f8203e880a02608605008c9f231c2044c075e0b7965f0e22b6dd0d5de93db737bc05687228d887c7d855a5d318428f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0b22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05e5b8ad0f6c63a968e0050b38c47730d99deff7f327443d776d962e26403eb55a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0668176971739a6b6ee545fea5cdb4ead8061ef3c2ba1baf02594f35f2efbddf2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c19f8203e880a058e30c159d995cea147e72bdae5b17eab5eeb6539e9c4569968ae8063ee3298b88c885b6faa341e901f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07bdffb0b784e5325c83550e57bb1aad7f5af30e6fbfb0f7e4d6380675ad83ca6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x522b878c6beceffe93f4a3375c934ba64c3d4dd36b1fac6627183dfa9d500e2f",
+        "lastblockhash" : "0x7eb07b2cbde54b7302b3e3ebed9daeb761a45469a56f82ddb84b241dcd4ee4f3",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest70BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest70BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest70BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc4ab",
-                    "hash" : "0xcae8b36f62b26ae384c3ccac476e5ee1381dfd01dc94d23da5f0a936e031a8d1",
-                    "mixHash" : "0x4667d8f963b0b008242fbca015401f83bbd052df3df6580cf317ac7e296140f0",
-                    "nonce" : "0xa46c54cf55654a42",
+                    "hash" : "0x12ac2567720a7cf210e887041e6d0db6eacdd4b7e777a2ae976f47c782e166d1",
+                    "mixHash" : "0x419f98f5169d0bb8be0a7f8cb359509ee99f3f513e97a13e834b68a760922b6f",
+                    "nonce" : "0xc0bf0db797f8732c",
                     "number" : "0x01",
                     "parentHash" : "0xb22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8",
                     "receiptTrie" : "0x8f64eb7428fee66246213557edac96623b44750c7960fc4eda9f074959c8bbfc",
-                    "stateRoot" : "0x20a1c0d730646bb1c63a8838cc4d7bda165c98740b584bb441d2955ec6f6a9d8",
+                    "stateRoot" : "0xdac39339f87d6da547345926856cf4df6a4d7dcac1195f1da2a47b57aeeeeed6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0b22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a020a1c0d730646bb1c63a8838cc4d7bda165c98740b584bb441d2955ec6f6a9d8a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa08f64eb7428fee66246213557edac96623b44750c7960fc4eda9f074959c8bbfcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c4ab8203e880a04667d8f963b0b008242fbca015401f83bbd052df3df6580cf317ac7e296140f088a46c54cf55654a42f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0b22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dac39339f87d6da547345926856cf4df6a4d7dcac1195f1da2a47b57aeeeeed6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa08f64eb7428fee66246213557edac96623b44750c7960fc4eda9f074959c8bbfcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c4ab8203e880a0419f98f5169d0bb8be0a7f8cb359509ee99f3f513e97a13e834b68a760922b6f88c0bf0db797f8732cf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07bdffb0b784e5325c83550e57bb1aad7f5af30e6fbfb0f7e4d6380675ad83ca6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcae8b36f62b26ae384c3ccac476e5ee1381dfd01dc94d23da5f0a936e031a8d1",
+        "lastblockhash" : "0x12ac2567720a7cf210e887041e6d0db6eacdd4b7e777a2ae976f47c782e166d1",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x43424044454245343af399e4a4734555",
@@ -233,8 +226,8 @@
     "randomStatetest70BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest70BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest70BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc19f",
-                    "hash" : "0x671aa58aa0830a1d1e8dca2ddff933c2ca985dfefde2d689dd2b440826aa0446",
-                    "mixHash" : "0x6322d76e065f03602a4ba19288979c9d33f2a19410df567466da9ba67607f2a2",
-                    "nonce" : "0x84b4ddfe2f940211",
+                    "hash" : "0x2c6314f07e56d694bb9ee355ee166dc2a7b3e9e8efd367196b260ee7ce401b52",
+                    "mixHash" : "0xd135ea1357634142dc5469c9a4a7e6ac185f1a701865581a1049d51b06cf9cfb",
+                    "nonce" : "0x877d4c244df6eb44",
                     "number" : "0x01",
                     "parentHash" : "0xb22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8",
                     "receiptTrie" : "0x2053d4e3f9213d2e922a19fe2750bfeeda59520e767ef1cf46fffc4416064a27",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0b22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0abb705527b25bb7f690ae3d8fc1402fe4d6d7228baa146f75316577c231a4083a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02053d4e3f9213d2e922a19fe2750bfeeda59520e767ef1cf46fffc4416064a27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c19f8203e880a06322d76e065f03602a4ba19288979c9d33f2a19410df567466da9ba67607f2a28884b4ddfe2f940211f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0b22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0abb705527b25bb7f690ae3d8fc1402fe4d6d7228baa146f75316577c231a4083a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02053d4e3f9213d2e922a19fe2750bfeeda59520e767ef1cf46fffc4416064a27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c19f8203e880a0d135ea1357634142dc5469c9a4a7e6ac185f1a701865581a1049d51b06cf9cfb88877d4c244df6eb44f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07bdffb0b784e5325c83550e57bb1aad7f5af30e6fbfb0f7e4d6380675ad83ca6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x671aa58aa0830a1d1e8dca2ddff933c2ca985dfefde2d689dd2b440826aa0446",
+        "lastblockhash" : "0x2c6314f07e56d694bb9ee355ee166dc2a7b3e9e8efd367196b260ee7ce401b52",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest70BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest70BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest70BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc19f",
-                    "hash" : "0x400249945dc884cee91f158dc0f53d7afdb9167d6dce43f0b6c9a71d5e097776",
-                    "mixHash" : "0x28172a627bef7d62b4be5ea057e6af9b51cbaa063065f7f1d69e0869ce155cda",
-                    "nonce" : "0xee6e370ea9654313",
+                    "hash" : "0x32eceb05836f300a4fbdee6c3b41f9ac5133f03180a723e2d4c6ed19ff95cfee",
+                    "mixHash" : "0xa430364fc68471e08c76459f1cb4c67043d33878c92fedec4a729adc4dc1f1c4",
+                    "nonce" : "0x636a60a32cb96eb0",
                     "number" : "0x01",
                     "parentHash" : "0xb22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8",
                     "receiptTrie" : "0x2053d4e3f9213d2e922a19fe2750bfeeda59520e767ef1cf46fffc4416064a27",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0b22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0abb705527b25bb7f690ae3d8fc1402fe4d6d7228baa146f75316577c231a4083a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02053d4e3f9213d2e922a19fe2750bfeeda59520e767ef1cf46fffc4416064a27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c19f8203e880a028172a627bef7d62b4be5ea057e6af9b51cbaa063065f7f1d69e0869ce155cda88ee6e370ea9654313f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0b22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0abb705527b25bb7f690ae3d8fc1402fe4d6d7228baa146f75316577c231a4083a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02053d4e3f9213d2e922a19fe2750bfeeda59520e767ef1cf46fffc4416064a27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c19f8203e880a0a430364fc68471e08c76459f1cb4c67043d33878c92fedec4a729adc4dc1f1c488636a60a32cb96eb0f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07bdffb0b784e5325c83550e57bb1aad7f5af30e6fbfb0f7e4d6380675ad83ca6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x400249945dc884cee91f158dc0f53d7afdb9167d6dce43f0b6c9a71d5e097776",
+        "lastblockhash" : "0x32eceb05836f300a4fbdee6c3b41f9ac5133f03180a723e2d4c6ed19ff95cfee",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest70BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest70BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest70BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc19f",
-                    "hash" : "0xb2152390c1257628023a20fbe1c2b03bd5eb374cd3fca1c0eaff1a4337261105",
-                    "mixHash" : "0xef869bbccb23318e96f534e778ef52b9abb44e4f6de99798389a54d33f418816",
-                    "nonce" : "0xd1b999347bbd0797",
+                    "hash" : "0xbf24177e9f4b7b8f755f5938a641971254fc17cb3f47fb25169fd9f31ec633da",
+                    "mixHash" : "0x350325c9ae9f924c542e20a8ad3ab9a0dd15eb8523d2d4dda4ad4a1b98063fe2",
+                    "nonce" : "0x1a6f910b9142fd2e",
                     "number" : "0x01",
                     "parentHash" : "0xb22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8",
                     "receiptTrie" : "0x2053d4e3f9213d2e922a19fe2750bfeeda59520e767ef1cf46fffc4416064a27",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0b22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0abb705527b25bb7f690ae3d8fc1402fe4d6d7228baa146f75316577c231a4083a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02053d4e3f9213d2e922a19fe2750bfeeda59520e767ef1cf46fffc4416064a27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c19f8203e880a0ef869bbccb23318e96f534e778ef52b9abb44e4f6de99798389a54d33f41881688d1b999347bbd0797f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0b22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0abb705527b25bb7f690ae3d8fc1402fe4d6d7228baa146f75316577c231a4083a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02053d4e3f9213d2e922a19fe2750bfeeda59520e767ef1cf46fffc4416064a27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c19f8203e880a0350325c9ae9f924c542e20a8ad3ab9a0dd15eb8523d2d4dda4ad4a1b98063fe2881a6f910b9142fd2ef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07bdffb0b784e5325c83550e57bb1aad7f5af30e6fbfb0f7e4d6380675ad83ca6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb2152390c1257628023a20fbe1c2b03bd5eb374cd3fca1c0eaff1a4337261105",
+        "lastblockhash" : "0xbf24177e9f4b7b8f755f5938a641971254fc17cb3f47fb25169fd9f31ec633da",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest70BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest70BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest70BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xc19f",
-                    "hash" : "0xecb587169bc03d3f8b54707be55f0b3aff83a67dbb30abd3fb0ee7413dcba71e",
-                    "mixHash" : "0x3a17fe919ac76b68e1f6fe9a69c942023742c7142209d26c2ef8ad56090d4b63",
-                    "nonce" : "0x5bae8a02d33d0c6a",
+                    "hash" : "0xeda819d868866288abd511820ac3c9362e127aa9509be92ea907c3952bb725fe",
+                    "mixHash" : "0xefaacd03be7c944263f834b76c7449af422a9cbd93114dad724feb8c12c19cbf",
+                    "nonce" : "0xdb1058d3a02d0b5c",
                     "number" : "0x01",
                     "parentHash" : "0xb22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8",
                     "receiptTrie" : "0x2053d4e3f9213d2e922a19fe2750bfeeda59520e767ef1cf46fffc4416064a27",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0b22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0abb705527b25bb7f690ae3d8fc1402fe4d6d7228baa146f75316577c231a4083a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02053d4e3f9213d2e922a19fe2750bfeeda59520e767ef1cf46fffc4416064a27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c19f8203e880a03a17fe919ac76b68e1f6fe9a69c942023742c7142209d26c2ef8ad56090d4b63885bae8a02d33d0c6af865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0b22cd8058d1b3cfebb7a1450beb0098b4cc269bb33201d9813531879166982c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0abb705527b25bb7f690ae3d8fc1402fe4d6d7228baa146f75316577c231a4083a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02053d4e3f9213d2e922a19fe2750bfeeda59520e767ef1cf46fffc4416064a27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82c19f8203e880a0efaacd03be7c944263f834b76c7449af422a9cbd93114dad724feb8c12c19cbf88db1058d3a02d0b5cf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07bdffb0b784e5325c83550e57bb1aad7f5af30e6fbfb0f7e4d6380675ad83ca6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xecb587169bc03d3f8b54707be55f0b3aff83a67dbb30abd3fb0ee7413dcba71e",
+        "lastblockhash" : "0xeda819d868866288abd511820ac3c9362e127aa9509be92ea907c3952bb725fe",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest71BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest71BC.json
index fe0e523ae..473cf8672 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest71BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest71BC.json
@@ -2,8 +2,8 @@
     "randomStatetest71BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest71BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest71BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050b36",
-                    "hash" : "0x6d444bef48205f074ad0f499bbdfec37b957514ce052d19069e55d98fd655e06",
-                    "mixHash" : "0xd12d2468892d8a7164a5f01c4de719194d9dcbb318fa7537d7a32535389b6b70",
-                    "nonce" : "0xfe98704072245873",
+                    "hash" : "0x990dd54a11f8e7b72934fc25f06705dccc4ad84c8b1cebe13c65b6e5bae45a0d",
+                    "mixHash" : "0x43784b07fb5a015102e2f34e986cdb5201a02686ba2224f131e695d2a632deb9",
+                    "nonce" : "0xa1d2b4f6e565ac03",
                     "number" : "0x01",
                     "parentHash" : "0x541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8",
                     "receiptTrie" : "0x2efadadc9ed165d01fe26152f14a20566f864eb6d88942c936ddb68b270e002f",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05cf04879eec16275f0457bd08b00f20b7ef5a0848dfbc9f29e47f554e33c4c6ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02efadadc9ed165d01fe26152f14a20566f864eb6d88942c936ddb68b270e002fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b368203e880a0d12d2468892d8a7164a5f01c4de719194d9dcbb318fa7537d7a32535389b6b7088fe98704072245873f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05cf04879eec16275f0457bd08b00f20b7ef5a0848dfbc9f29e47f554e33c4c6ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02efadadc9ed165d01fe26152f14a20566f864eb6d88942c936ddb68b270e002fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b368203e880a043784b07fb5a015102e2f34e986cdb5201a02686ba2224f131e695d2a632deb988a1d2b4f6e565ac03f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fa7dbc75f73526469655ae0b1e034d63c524995bd936ecd4a3ba005346d836caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6d444bef48205f074ad0f499bbdfec37b957514ce052d19069e55d98fd655e06",
+        "lastblockhash" : "0x990dd54a11f8e7b72934fc25f06705dccc4ad84c8b1cebe13c65b6e5bae45a0d",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest71BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest71BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest71BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x05114e",
-                    "hash" : "0xcf52aa1c0fc46775542bd890f493fa1b349c23fe62c614c15b2d52f145152ad7",
-                    "mixHash" : "0xa82477609242a9260e340790f964690da6d5c1c9f6b8c859bfa7459c41425886",
-                    "nonce" : "0x0402ed4c0cb77130",
+                    "hash" : "0x756e931d647441db5aa669494b1213b8dce154a13cc5394a2f4c6e2be12992e0",
+                    "mixHash" : "0x5a0a509fd01987816af5bb88e58ce5d7a9865968c6b8388fa69aed1f522a1df6",
+                    "nonce" : "0xeb10d3ef24efc61d",
                     "number" : "0x01",
                     "parentHash" : "0x541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8",
                     "receiptTrie" : "0x419a63641656551ec116adae1315b1ebafc9cd93e8c592edc3bf8e15f1e96973",
-                    "stateRoot" : "0x6968adc4838962092fadc23d3da89122133954745bb99298452482b494edbc09",
+                    "stateRoot" : "0xdc42574e0e35e3d2c036e015287e0aeab9b3bcb59e72baf431a4653b95bd4d7a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06968adc4838962092fadc23d3da89122133954745bb99298452482b494edbc09a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0419a63641656551ec116adae1315b1ebafc9cd93e8c592edc3bf8e15f1e96973b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8305114e8203e880a0a82477609242a9260e340790f964690da6d5c1c9f6b8c859bfa7459c41425886880402ed4c0cb77130f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0dc42574e0e35e3d2c036e015287e0aeab9b3bcb59e72baf431a4653b95bd4d7aa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0419a63641656551ec116adae1315b1ebafc9cd93e8c592edc3bf8e15f1e96973b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8305114e8203e880a05a0a509fd01987816af5bb88e58ce5d7a9865968c6b8388fa69aed1f522a1df688eb10d3ef24efc61df865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fa7dbc75f73526469655ae0b1e034d63c524995bd936ecd4a3ba005346d836caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcf52aa1c0fc46775542bd890f493fa1b349c23fe62c614c15b2d52f145152ad7",
+        "lastblockhash" : "0x756e931d647441db5aa669494b1213b8dce154a13cc5394a2f4c6e2be12992e0",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x45415a42409140435a53821af355",
@@ -233,8 +226,8 @@
     "randomStatetest71BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest71BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest71BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050b36",
-                    "hash" : "0xc59d275eb01b135d6a9ab83da1f01f5d6dd31367d8015f72f4a726b1ad6b02f3",
-                    "mixHash" : "0x0b7bfc39d8aed26ced1f9318ed826fd98ff6cdbe788bcf743473cced08b4ca24",
-                    "nonce" : "0x5c1efc23b12fdcbc",
+                    "hash" : "0x60f84acea90a6e5beeef875d1a15f151addfaed7a82c62c920b5b7a7e1c452f8",
+                    "mixHash" : "0x30de6c58dc4f81472b12ca1d817d0e2914af8ec6d294f469341f0adf7f007e56",
+                    "nonce" : "0x8bb098d1a33414c9",
                     "number" : "0x01",
                     "parentHash" : "0x541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8",
                     "receiptTrie" : "0x90a2de22cdc8341141cf8cbf9aeaa3247e9c3a048e71b743211eebed4df5fc2b",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ea2ae8e29e0fbb81a37df5c563501c28674837e3251c8885e2660b75a27743f1a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa090a2de22cdc8341141cf8cbf9aeaa3247e9c3a048e71b743211eebed4df5fc2bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b368203e880a00b7bfc39d8aed26ced1f9318ed826fd98ff6cdbe788bcf743473cced08b4ca24885c1efc23b12fdcbcf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ea2ae8e29e0fbb81a37df5c563501c28674837e3251c8885e2660b75a27743f1a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa090a2de22cdc8341141cf8cbf9aeaa3247e9c3a048e71b743211eebed4df5fc2bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b368203e880a030de6c58dc4f81472b12ca1d817d0e2914af8ec6d294f469341f0adf7f007e56888bb098d1a33414c9f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fa7dbc75f73526469655ae0b1e034d63c524995bd936ecd4a3ba005346d836caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc59d275eb01b135d6a9ab83da1f01f5d6dd31367d8015f72f4a726b1ad6b02f3",
+        "lastblockhash" : "0x60f84acea90a6e5beeef875d1a15f151addfaed7a82c62c920b5b7a7e1c452f8",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest71BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest71BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest71BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050b36",
-                    "hash" : "0xe5f077847c4a0f9ae5182639397b05dd3f8a987a5036e8dd2f7a48f7a4672c15",
-                    "mixHash" : "0x76676493b36ca79027fb2e0bc08b7b9b544fbff26fbe6c42a1ac76877ca4400b",
-                    "nonce" : "0xd671268715924f73",
+                    "hash" : "0x22f6912627c9f1005a7f8cdfc68ba331f2457df322fff45f5dbfe3c7ef87a9df",
+                    "mixHash" : "0xbce2d5717c718fd88666bed363f1025621c03e657ac5b871f5f04c886bdf582e",
+                    "nonce" : "0xdf10191bb39fe808",
                     "number" : "0x01",
                     "parentHash" : "0x541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8",
                     "receiptTrie" : "0x90a2de22cdc8341141cf8cbf9aeaa3247e9c3a048e71b743211eebed4df5fc2b",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ea2ae8e29e0fbb81a37df5c563501c28674837e3251c8885e2660b75a27743f1a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa090a2de22cdc8341141cf8cbf9aeaa3247e9c3a048e71b743211eebed4df5fc2bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b368203e880a076676493b36ca79027fb2e0bc08b7b9b544fbff26fbe6c42a1ac76877ca4400b88d671268715924f73f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ea2ae8e29e0fbb81a37df5c563501c28674837e3251c8885e2660b75a27743f1a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa090a2de22cdc8341141cf8cbf9aeaa3247e9c3a048e71b743211eebed4df5fc2bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b368203e880a0bce2d5717c718fd88666bed363f1025621c03e657ac5b871f5f04c886bdf582e88df10191bb39fe808f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fa7dbc75f73526469655ae0b1e034d63c524995bd936ecd4a3ba005346d836caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe5f077847c4a0f9ae5182639397b05dd3f8a987a5036e8dd2f7a48f7a4672c15",
+        "lastblockhash" : "0x22f6912627c9f1005a7f8cdfc68ba331f2457df322fff45f5dbfe3c7ef87a9df",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest71BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest71BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest71BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050b36",
-                    "hash" : "0xcffe26899baa7ec4e16d65029f09fd04a6086f7fbc88a36818a88b0f336e2ce3",
-                    "mixHash" : "0x84e8c2260be2fdb23ec9a194e96df3099153d3883c90aa12dffbfca2fd6edfa1",
-                    "nonce" : "0x117079dd4c757212",
+                    "hash" : "0x1f8c4807b8e43d8f0743d367ff29b41f2bb0892341707545c1d4e6bce1882d5c",
+                    "mixHash" : "0xf0563f1e2c44843a802471687672bfa5d75e1bad713e59e38fdfbb16e72b41cc",
+                    "nonce" : "0x5243174b2f0b4576",
                     "number" : "0x01",
                     "parentHash" : "0x541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8",
                     "receiptTrie" : "0x90a2de22cdc8341141cf8cbf9aeaa3247e9c3a048e71b743211eebed4df5fc2b",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ea2ae8e29e0fbb81a37df5c563501c28674837e3251c8885e2660b75a27743f1a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa090a2de22cdc8341141cf8cbf9aeaa3247e9c3a048e71b743211eebed4df5fc2bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b368203e880a084e8c2260be2fdb23ec9a194e96df3099153d3883c90aa12dffbfca2fd6edfa188117079dd4c757212f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ea2ae8e29e0fbb81a37df5c563501c28674837e3251c8885e2660b75a27743f1a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa090a2de22cdc8341141cf8cbf9aeaa3247e9c3a048e71b743211eebed4df5fc2bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b368203e880a0f0563f1e2c44843a802471687672bfa5d75e1bad713e59e38fdfbb16e72b41cc885243174b2f0b4576f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fa7dbc75f73526469655ae0b1e034d63c524995bd936ecd4a3ba005346d836caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcffe26899baa7ec4e16d65029f09fd04a6086f7fbc88a36818a88b0f336e2ce3",
+        "lastblockhash" : "0x1f8c4807b8e43d8f0743d367ff29b41f2bb0892341707545c1d4e6bce1882d5c",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest71BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest71BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest71BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050b36",
-                    "hash" : "0xe9fa832881423dc8535fbfc5e0b392b8310c1f7c8e289b4168bc59c9e3dd1c9a",
-                    "mixHash" : "0x415edb50d0ebaaea994c25b72d826d8a97eee2d2291eda61396d77decdd3066e",
-                    "nonce" : "0xdb5b4bfd2a5d3e9c",
+                    "hash" : "0x67857aab1bfd2d24f73c28efa714db9350b40ed87ba27009d8652f2930b4cc70",
+                    "mixHash" : "0xc7b671beb9eb54334538a093885c606d3439d48dc860da52281afac1b5836493",
+                    "nonce" : "0xfc6f4d1b5af4dfae",
                     "number" : "0x01",
                     "parentHash" : "0x541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8",
                     "receiptTrie" : "0x90a2de22cdc8341141cf8cbf9aeaa3247e9c3a048e71b743211eebed4df5fc2b",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ea2ae8e29e0fbb81a37df5c563501c28674837e3251c8885e2660b75a27743f1a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa090a2de22cdc8341141cf8cbf9aeaa3247e9c3a048e71b743211eebed4df5fc2bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b368203e880a0415edb50d0ebaaea994c25b72d826d8a97eee2d2291eda61396d77decdd3066e88db5b4bfd2a5d3e9cf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0541e108a01af3e1f1d068484dbbf9fb43c2d58643c283e460fcafab936b7f9c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ea2ae8e29e0fbb81a37df5c563501c28674837e3251c8885e2660b75a27743f1a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa090a2de22cdc8341141cf8cbf9aeaa3247e9c3a048e71b743211eebed4df5fc2bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b368203e880a0c7b671beb9eb54334538a093885c606d3439d48dc860da52281afac1b583649388fc6f4d1b5af4dfaef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fa7dbc75f73526469655ae0b1e034d63c524995bd936ecd4a3ba005346d836caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe9fa832881423dc8535fbfc5e0b392b8310c1f7c8e289b4168bc59c9e3dd1c9a",
+        "lastblockhash" : "0x67857aab1bfd2d24f73c28efa714db9350b40ed87ba27009d8652f2930b4cc70",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest76BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest76BC.json
index 730116616..001f1cc68 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest76BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest76BC.json
@@ -2,8 +2,8 @@
     "randomStatetest76BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest76BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest76BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x013c22",
-                    "hash" : "0x81d6e101d63c607757fdfc03a70d4ec3de71ac5e37e78b5672e3543060b39eeb",
-                    "mixHash" : "0x4d8e7779b03225289c7ebc1542b2309f3a5791dc4a8d9eaf254327616bda2be8",
-                    "nonce" : "0xdcb4df2cd11bcb38",
+                    "hash" : "0x2adfb04dda8face4f8294e0b74e1ded1610b70b9dcff5dac4b8ffd75daedaec0",
+                    "mixHash" : "0x379d1ad4c29bf3166e24e8a3693cb0e13012d0825adc35bfc217431496a2a806",
+                    "nonce" : "0x2ead417cf4982101",
                     "number" : "0x01",
                     "parentHash" : "0xfc086dd8989b4aed29462ab54e63c28dca1a511a4445865450178654946845c1",
                     "receiptTrie" : "0x680c679eb057d7e9a310409f1737868800971f97bf64da3063c26131cf65ece4",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x0788fee898e412f49a39297a9e9c08c58c92e24c48d13784e28b8dd080fccdf5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90336f901fda0fc086dd8989b4aed29462ab54e63c28dca1a511a4445865450178654946845c1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cc92c5c40a8534e40f494a57aae93da23fe45522cfe288ad1abee765f318e58aa00788fee898e412f49a39297a9e9c08c58c92e24c48d13784e28b8dd080fccdf5a0680c679eb057d7e9a310409f1737868800971f97bf64da3063c26131cf65ece4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83013c228203e880a04d8e7779b03225289c7ebc1542b2309f3a5791dc4a8d9eaf254327616bda2be888dcb4df2cd11bcb38f90132f9012f80018417f4263394095e7baea6a6c7c4c2dfeb977efac326af552d878469ca96edb8c9437f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001371ca0dbd4e25c74480db76ea06e2048c46e2037ff46d03f3d626094012d6fa84f7e44a042d99fb87eea3842bb414195b75f02179d3d63bfc0de6d502fc9ef9d3869251bc0",
+                "rlp" : "0xf90336f901fda0fc086dd8989b4aed29462ab54e63c28dca1a511a4445865450178654946845c1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cc92c5c40a8534e40f494a57aae93da23fe45522cfe288ad1abee765f318e58aa00788fee898e412f49a39297a9e9c08c58c92e24c48d13784e28b8dd080fccdf5a0680c679eb057d7e9a310409f1737868800971f97bf64da3063c26131cf65ece4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83013c228203e880a0379d1ad4c29bf3166e24e8a3693cb0e13012d0825adc35bfc217431496a2a806882ead417cf4982101f90132f9012f80018417f4263394095e7baea6a6c7c4c2dfeb977efac326af552d878469ca96edb8c9437f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001371ca0dbd4e25c74480db76ea06e2048c46e2037ff46d03f3d626094012d6fa84f7e44a042d99fb87eea3842bb414195b75f02179d3d63bfc0de6d502fc9ef9d3869251bc0",
                 "transactions" : [
                     {
                         "data" : "0x437f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000137",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0071dac67b007b9fe52f9f072ae342883c11c6f2f7b1ef1228cab154f8e1284e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x81d6e101d63c607757fdfc03a70d4ec3de71ac5e37e78b5672e3543060b39eeb",
+        "lastblockhash" : "0x2adfb04dda8face4f8294e0b74e1ded1610b70b9dcff5dac4b8ffd75daedaec0",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -116,8 +116,8 @@
     "randomStatetest76BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest76BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest76BCFiller.json"
         },
         "blocks" : [
             {
@@ -128,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x013f2e",
-                    "hash" : "0xfd20c3604fde341fd1cb47a2b16f7cc871d1b7777bd54f4c836d17dd250c3956",
-                    "mixHash" : "0xb855ac6c7579660dd68b0f3d7b90b6a0986700aba9c1050897a699f8a4a83ce8",
-                    "nonce" : "0x614847055c57b6b7",
+                    "hash" : "0x6de223e3e3f46a4f900e161a797da801bc9ff1e75ea48bfc06a555d9ce0a860e",
+                    "mixHash" : "0xa41dd12b8dbfb790d279c6dbd382bbfdcc9cef14777fc5d4aca052053a8653d8",
+                    "nonce" : "0xfc457cf03c00e26c",
                     "number" : "0x01",
                     "parentHash" : "0xfc086dd8989b4aed29462ab54e63c28dca1a511a4445865450178654946845c1",
                     "receiptTrie" : "0x88db3c6ac6eb3d01f8bd85d1442d2000b741780485f2100dcdcb620bb644e114",
-                    "stateRoot" : "0x988a458319de0d16c4c09efc1a111249096dfad2b34307c24b2b1ec8598d4cf6",
+                    "stateRoot" : "0x38b6a69ebc608f1f2d7fc1e87fe0d9d3b4776d9206bb74673dc38116468c6906",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0788fee898e412f49a39297a9e9c08c58c92e24c48d13784e28b8dd080fccdf5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90336f901fda0fc086dd8989b4aed29462ab54e63c28dca1a511a4445865450178654946845c1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0988a458319de0d16c4c09efc1a111249096dfad2b34307c24b2b1ec8598d4cf6a00788fee898e412f49a39297a9e9c08c58c92e24c48d13784e28b8dd080fccdf5a088db3c6ac6eb3d01f8bd85d1442d2000b741780485f2100dcdcb620bb644e114b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83013f2e8203e880a0b855ac6c7579660dd68b0f3d7b90b6a0986700aba9c1050897a699f8a4a83ce888614847055c57b6b7f90132f9012f80018417f4263394095e7baea6a6c7c4c2dfeb977efac326af552d878469ca96edb8c9437f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001371ca0dbd4e25c74480db76ea06e2048c46e2037ff46d03f3d626094012d6fa84f7e44a042d99fb87eea3842bb414195b75f02179d3d63bfc0de6d502fc9ef9d3869251bc0",
+                "rlp" : "0xf90336f901fda0fc086dd8989b4aed29462ab54e63c28dca1a511a4445865450178654946845c1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a038b6a69ebc608f1f2d7fc1e87fe0d9d3b4776d9206bb74673dc38116468c6906a00788fee898e412f49a39297a9e9c08c58c92e24c48d13784e28b8dd080fccdf5a088db3c6ac6eb3d01f8bd85d1442d2000b741780485f2100dcdcb620bb644e114b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83013f2e8203e880a0a41dd12b8dbfb790d279c6dbd382bbfdcc9cef14777fc5d4aca052053a8653d888fc457cf03c00e26cf90132f9012f80018417f4263394095e7baea6a6c7c4c2dfeb977efac326af552d878469ca96edb8c9437f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001371ca0dbd4e25c74480db76ea06e2048c46e2037ff46d03f3d626094012d6fa84f7e44a042d99fb87eea3842bb414195b75f02179d3d63bfc0de6d502fc9ef9d3869251bc0",
                 "transactions" : [
                     {
                         "data" : "0x437f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000137",
@@ -176,16 +176,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0071dac67b007b9fe52f9f072ae342883c11c6f2f7b1ef1228cab154f8e1284e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfd20c3604fde341fd1cb47a2b16f7cc871d1b7777bd54f4c836d17dd250c3956",
+        "lastblockhash" : "0x6de223e3e3f46a4f900e161a797da801bc9ff1e75ea48bfc06a555d9ce0a860e",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x69ca96ed",
                 "code" : "0x437f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001375560005155",
@@ -237,8 +230,8 @@
     "randomStatetest76BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest76BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest76BCFiller.json"
         },
         "blocks" : [
             {
@@ -249,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x013c22",
-                    "hash" : "0x16a415f4eb78c369d05ab45b284d39d169633d4e9ea3982490e6dbe34393d3f0",
-                    "mixHash" : "0x585236cfe71dacf4c00be56b56b098dc6b46380cab9eabdc206e8e8717ce81bd",
-                    "nonce" : "0x8db9e3059305f18a",
+                    "hash" : "0xc8202d335bf2e4642935f350025f0203a3e8040f59f239e735dcd67af2cfa60f",
+                    "mixHash" : "0x496bc6d0be0631ff1ce17f425903ef193b3879b852678d828ed95b83b3042f34",
+                    "nonce" : "0x7ab1e61d94a1f80e",
                     "number" : "0x01",
                     "parentHash" : "0xfc086dd8989b4aed29462ab54e63c28dca1a511a4445865450178654946845c1",
                     "receiptTrie" : "0x0415a69c016873e77a063f874aab98f3dde5138ceccfb619f83fc0684100ae22",
@@ -260,7 +253,7 @@
                     "transactionsTrie" : "0x0788fee898e412f49a39297a9e9c08c58c92e24c48d13784e28b8dd080fccdf5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90336f901fda0fc086dd8989b4aed29462ab54e63c28dca1a511a4445865450178654946845c1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0613d6b47df86d9e00b7b605dcee5ffe20b2a7ba351d0da1d95fdb4afcb4050c7a00788fee898e412f49a39297a9e9c08c58c92e24c48d13784e28b8dd080fccdf5a00415a69c016873e77a063f874aab98f3dde5138ceccfb619f83fc0684100ae22b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83013c228203e880a0585236cfe71dacf4c00be56b56b098dc6b46380cab9eabdc206e8e8717ce81bd888db9e3059305f18af90132f9012f80018417f4263394095e7baea6a6c7c4c2dfeb977efac326af552d878469ca96edb8c9437f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001371ca0dbd4e25c74480db76ea06e2048c46e2037ff46d03f3d626094012d6fa84f7e44a042d99fb87eea3842bb414195b75f02179d3d63bfc0de6d502fc9ef9d3869251bc0",
+                "rlp" : "0xf90336f901fda0fc086dd8989b4aed29462ab54e63c28dca1a511a4445865450178654946845c1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0613d6b47df86d9e00b7b605dcee5ffe20b2a7ba351d0da1d95fdb4afcb4050c7a00788fee898e412f49a39297a9e9c08c58c92e24c48d13784e28b8dd080fccdf5a00415a69c016873e77a063f874aab98f3dde5138ceccfb619f83fc0684100ae22b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83013c228203e880a0496bc6d0be0631ff1ce17f425903ef193b3879b852678d828ed95b83b3042f34887ab1e61d94a1f80ef90132f9012f80018417f4263394095e7baea6a6c7c4c2dfeb977efac326af552d878469ca96edb8c9437f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001371ca0dbd4e25c74480db76ea06e2048c46e2037ff46d03f3d626094012d6fa84f7e44a042d99fb87eea3842bb414195b75f02179d3d63bfc0de6d502fc9ef9d3869251bc0",
                 "transactions" : [
                     {
                         "data" : "0x437f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000137",
@@ -297,7 +290,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0071dac67b007b9fe52f9f072ae342883c11c6f2f7b1ef1228cab154f8e1284e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x16a415f4eb78c369d05ab45b284d39d169633d4e9ea3982490e6dbe34393d3f0",
+        "lastblockhash" : "0xc8202d335bf2e4642935f350025f0203a3e8040f59f239e735dcd67af2cfa60f",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -351,8 +344,8 @@
     "randomStatetest76BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest76BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest76BCFiller.json"
         },
         "blocks" : [
             {
@@ -363,9 +356,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x013c22",
-                    "hash" : "0xbe18e6bc94d6a8c21ee8d9e7c6fc71480666285dfec8a6b448d2c586d845faef",
-                    "mixHash" : "0x75daaa7c989d18ee93df0abed1a6134a62a50edfe798b52a965fa47814a95e07",
-                    "nonce" : "0x822170847bca7e60",
+                    "hash" : "0xfe7bf4002e5a3ba2755eed8f6a0c69a1562261cd14ac71313326d06e19d956fb",
+                    "mixHash" : "0xd67ee2a2bcf07f58f59f66b897b2c400bbc53ba7371d8078f4be3d9d20c995fa",
+                    "nonce" : "0x74b1b65ca97e160f",
                     "number" : "0x01",
                     "parentHash" : "0xfc086dd8989b4aed29462ab54e63c28dca1a511a4445865450178654946845c1",
                     "receiptTrie" : "0x0415a69c016873e77a063f874aab98f3dde5138ceccfb619f83fc0684100ae22",
@@ -374,7 +367,7 @@
                     "transactionsTrie" : "0x0788fee898e412f49a39297a9e9c08c58c92e24c48d13784e28b8dd080fccdf5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90336f901fda0fc086dd8989b4aed29462ab54e63c28dca1a511a4445865450178654946845c1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0613d6b47df86d9e00b7b605dcee5ffe20b2a7ba351d0da1d95fdb4afcb4050c7a00788fee898e412f49a39297a9e9c08c58c92e24c48d13784e28b8dd080fccdf5a00415a69c016873e77a063f874aab98f3dde5138ceccfb619f83fc0684100ae22b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83013c228203e880a075daaa7c989d18ee93df0abed1a6134a62a50edfe798b52a965fa47814a95e0788822170847bca7e60f90132f9012f80018417f4263394095e7baea6a6c7c4c2dfeb977efac326af552d878469ca96edb8c9437f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001371ca0dbd4e25c74480db76ea06e2048c46e2037ff46d03f3d626094012d6fa84f7e44a042d99fb87eea3842bb414195b75f02179d3d63bfc0de6d502fc9ef9d3869251bc0",
+                "rlp" : "0xf90336f901fda0fc086dd8989b4aed29462ab54e63c28dca1a511a4445865450178654946845c1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0613d6b47df86d9e00b7b605dcee5ffe20b2a7ba351d0da1d95fdb4afcb4050c7a00788fee898e412f49a39297a9e9c08c58c92e24c48d13784e28b8dd080fccdf5a00415a69c016873e77a063f874aab98f3dde5138ceccfb619f83fc0684100ae22b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83013c228203e880a0d67ee2a2bcf07f58f59f66b897b2c400bbc53ba7371d8078f4be3d9d20c995fa8874b1b65ca97e160ff90132f9012f80018417f4263394095e7baea6a6c7c4c2dfeb977efac326af552d878469ca96edb8c9437f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001371ca0dbd4e25c74480db76ea06e2048c46e2037ff46d03f3d626094012d6fa84f7e44a042d99fb87eea3842bb414195b75f02179d3d63bfc0de6d502fc9ef9d3869251bc0",
                 "transactions" : [
                     {
                         "data" : "0x437f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000137",
@@ -411,7 +404,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0071dac67b007b9fe52f9f072ae342883c11c6f2f7b1ef1228cab154f8e1284e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbe18e6bc94d6a8c21ee8d9e7c6fc71480666285dfec8a6b448d2c586d845faef",
+        "lastblockhash" : "0xfe7bf4002e5a3ba2755eed8f6a0c69a1562261cd14ac71313326d06e19d956fb",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -465,8 +458,8 @@
     "randomStatetest76BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest76BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest76BCFiller.json"
         },
         "blocks" : [
             {
@@ -477,9 +470,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x013c22",
-                    "hash" : "0x56f736a5fedab4c11adec5e41437c0e2a687f41569401a2d5659ac0adbedf5d1",
-                    "mixHash" : "0xfe0368f9247860cfa829219c056a0bce9b50dbc54974b651af91fc50760c896e",
-                    "nonce" : "0xffa970b7420101fb",
+                    "hash" : "0x47c919a42a467359f803fec19b51fd2fee701e44dacefee3bc2712c70d6c5d62",
+                    "mixHash" : "0x43e5cc420c3a190855fbfd5f5fba390548e1c20699c27782bd22a2f7df07c0d2",
+                    "nonce" : "0x1cf9fa11b6b6c18c",
                     "number" : "0x01",
                     "parentHash" : "0xfc086dd8989b4aed29462ab54e63c28dca1a511a4445865450178654946845c1",
                     "receiptTrie" : "0x0415a69c016873e77a063f874aab98f3dde5138ceccfb619f83fc0684100ae22",
@@ -488,7 +481,7 @@
                     "transactionsTrie" : "0x0788fee898e412f49a39297a9e9c08c58c92e24c48d13784e28b8dd080fccdf5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90336f901fda0fc086dd8989b4aed29462ab54e63c28dca1a511a4445865450178654946845c1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0613d6b47df86d9e00b7b605dcee5ffe20b2a7ba351d0da1d95fdb4afcb4050c7a00788fee898e412f49a39297a9e9c08c58c92e24c48d13784e28b8dd080fccdf5a00415a69c016873e77a063f874aab98f3dde5138ceccfb619f83fc0684100ae22b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83013c228203e880a0fe0368f9247860cfa829219c056a0bce9b50dbc54974b651af91fc50760c896e88ffa970b7420101fbf90132f9012f80018417f4263394095e7baea6a6c7c4c2dfeb977efac326af552d878469ca96edb8c9437f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001371ca0dbd4e25c74480db76ea06e2048c46e2037ff46d03f3d626094012d6fa84f7e44a042d99fb87eea3842bb414195b75f02179d3d63bfc0de6d502fc9ef9d3869251bc0",
+                "rlp" : "0xf90336f901fda0fc086dd8989b4aed29462ab54e63c28dca1a511a4445865450178654946845c1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0613d6b47df86d9e00b7b605dcee5ffe20b2a7ba351d0da1d95fdb4afcb4050c7a00788fee898e412f49a39297a9e9c08c58c92e24c48d13784e28b8dd080fccdf5a00415a69c016873e77a063f874aab98f3dde5138ceccfb619f83fc0684100ae22b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83013c228203e880a043e5cc420c3a190855fbfd5f5fba390548e1c20699c27782bd22a2f7df07c0d2881cf9fa11b6b6c18cf90132f9012f80018417f4263394095e7baea6a6c7c4c2dfeb977efac326af552d878469ca96edb8c9437f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001371ca0dbd4e25c74480db76ea06e2048c46e2037ff46d03f3d626094012d6fa84f7e44a042d99fb87eea3842bb414195b75f02179d3d63bfc0de6d502fc9ef9d3869251bc0",
                 "transactions" : [
                     {
                         "data" : "0x437f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000137",
@@ -525,7 +518,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0071dac67b007b9fe52f9f072ae342883c11c6f2f7b1ef1228cab154f8e1284e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x56f736a5fedab4c11adec5e41437c0e2a687f41569401a2d5659ac0adbedf5d1",
+        "lastblockhash" : "0x47c919a42a467359f803fec19b51fd2fee701e44dacefee3bc2712c70d6c5d62",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -579,8 +572,8 @@
     "randomStatetest76BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest76BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest76BCFiller.json"
         },
         "blocks" : [
             {
@@ -591,9 +584,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x013c22",
-                    "hash" : "0x3705b6d8150cc131c820dbbd7d8bf7e0df54e40befb02e68d9c411696e1d1a7b",
-                    "mixHash" : "0xa47f1963ab168ea582846f3c41923888b183b9183e2df827b17dcdfd2029b5f3",
-                    "nonce" : "0x1b5ef5e562153a5b",
+                    "hash" : "0x5f770aa13431e7a1a22a45812d2cff6b3070da545a30cf644debe6ff8830a950",
+                    "mixHash" : "0xac8a0f6fe645f8078780f29ae205d42d1b8f8cffe267f7fd45c686e62758bd7e",
+                    "nonce" : "0xf4ac937e84e2d9bc",
                     "number" : "0x01",
                     "parentHash" : "0xfc086dd8989b4aed29462ab54e63c28dca1a511a4445865450178654946845c1",
                     "receiptTrie" : "0x0415a69c016873e77a063f874aab98f3dde5138ceccfb619f83fc0684100ae22",
@@ -602,7 +595,7 @@
                     "transactionsTrie" : "0x0788fee898e412f49a39297a9e9c08c58c92e24c48d13784e28b8dd080fccdf5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90336f901fda0fc086dd8989b4aed29462ab54e63c28dca1a511a4445865450178654946845c1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0613d6b47df86d9e00b7b605dcee5ffe20b2a7ba351d0da1d95fdb4afcb4050c7a00788fee898e412f49a39297a9e9c08c58c92e24c48d13784e28b8dd080fccdf5a00415a69c016873e77a063f874aab98f3dde5138ceccfb619f83fc0684100ae22b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83013c228203e880a0a47f1963ab168ea582846f3c41923888b183b9183e2df827b17dcdfd2029b5f3881b5ef5e562153a5bf90132f9012f80018417f4263394095e7baea6a6c7c4c2dfeb977efac326af552d878469ca96edb8c9437f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001371ca0dbd4e25c74480db76ea06e2048c46e2037ff46d03f3d626094012d6fa84f7e44a042d99fb87eea3842bb414195b75f02179d3d63bfc0de6d502fc9ef9d3869251bc0",
+                "rlp" : "0xf90336f901fda0fc086dd8989b4aed29462ab54e63c28dca1a511a4445865450178654946845c1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0613d6b47df86d9e00b7b605dcee5ffe20b2a7ba351d0da1d95fdb4afcb4050c7a00788fee898e412f49a39297a9e9c08c58c92e24c48d13784e28b8dd080fccdf5a00415a69c016873e77a063f874aab98f3dde5138ceccfb619f83fc0684100ae22b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83013c228203e880a0ac8a0f6fe645f8078780f29ae205d42d1b8f8cffe267f7fd45c686e62758bd7e88f4ac937e84e2d9bcf90132f9012f80018417f4263394095e7baea6a6c7c4c2dfeb977efac326af552d878469ca96edb8c9437f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001371ca0dbd4e25c74480db76ea06e2048c46e2037ff46d03f3d626094012d6fa84f7e44a042d99fb87eea3842bb414195b75f02179d3d63bfc0de6d502fc9ef9d3869251bc0",
                 "transactions" : [
                     {
                         "data" : "0x437f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000137",
@@ -639,7 +632,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0071dac67b007b9fe52f9f072ae342883c11c6f2f7b1ef1228cab154f8e1284e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3705b6d8150cc131c820dbbd7d8bf7e0df54e40befb02e68d9c411696e1d1a7b",
+        "lastblockhash" : "0x5f770aa13431e7a1a22a45812d2cff6b3070da545a30cf644debe6ff8830a950",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest79BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest79BC.json
index ce245980e..0847ddbd4 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest79BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest79BC.json
@@ -2,8 +2,8 @@
     "randomStatetest79BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest79BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest79BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xbabc",
-                    "hash" : "0x052d6ebb47b3010d55560bb19601e00ff62c36a420bad304dd1e7af46dabd78c",
-                    "mixHash" : "0x4521ccc4db5c1f0c860a73b11925732683a101c9d4a284a9fb368a133fd97c24",
-                    "nonce" : "0xb6b1eeb4f74ac4ea",
+                    "hash" : "0x58c536ba23e363c912301019883601303296dcffc9e7c9eb06d594b896c1a89d",
+                    "mixHash" : "0x34e1aefef7e3c5b8e277e107fd1938027d8948a4d9a6bf6c1b6ac45c2a3b415b",
+                    "nonce" : "0x016187f9988f134e",
                     "number" : "0x01",
                     "parentHash" : "0x19b1f3053923f0fe808033abe2f50d20898b9062eb986c700aad58f0cee015ee",
                     "receiptTrie" : "0x18afb18a3ca42f0fc0ac1c150811d77b3afc223e2ebe1cb666ce37e2069c6029",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x58d564b759473f9d56bd6000a28e62ea54b67c89246f927fe8adad66165a0ed2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca019b1f3053923f0fe808033abe2f50d20898b9062eb986c700aad58f0cee015eea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00d6ead5692c69cccfad00a9c3c3327564fe443ac6083a11787d498472e738958a058d564b759473f9d56bd6000a28e62ea54b67c89246f927fe8adad66165a0ed2a018afb18a3ca42f0fc0ac1c150811d77b3afc223e2ebe1cb666ce37e2069c6029b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82babc8203e880a04521ccc4db5c1f0c860a73b11925732683a101c9d4a284a9fb368a133fd97c2488b6b1eeb4f74ac4eaf90141f9013e8001845ed0901894095e7baea6a6c7c4c2dfeb977efac326af552d87841571e2aeb8d87f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f6b0656903a860a0242881274078b431ba077659cada0e8a2fdad887c998382f9f9c9096b98fbda59bdec93a08c94d3558aa0595f3143badafcbb5189621ee00feaa05f04ed7e9b199d006da4ff38b761532bc0",
+                "rlp" : "0xf90344f901fca019b1f3053923f0fe808033abe2f50d20898b9062eb986c700aad58f0cee015eea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00d6ead5692c69cccfad00a9c3c3327564fe443ac6083a11787d498472e738958a058d564b759473f9d56bd6000a28e62ea54b67c89246f927fe8adad66165a0ed2a018afb18a3ca42f0fc0ac1c150811d77b3afc223e2ebe1cb666ce37e2069c6029b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82babc8203e880a034e1aefef7e3c5b8e277e107fd1938027d8948a4d9a6bf6c1b6ac45c2a3b415b88016187f9988f134ef90141f9013e8001845ed0901894095e7baea6a6c7c4c2dfeb977efac326af552d87841571e2aeb8d87f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f6b0656903a860a0242881274078b431ba077659cada0e8a2fdad887c998382f9f9c9096b98fbda59bdec93a08c94d3558aa0595f3143badafcbb5189621ee00feaa05f04ed7e9b199d006da4ff38b761532bc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f6b0656903a860a0242881274078b43",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0bac09daf1e0657c35f119803e67df96c18628e45685165b3174f9e913df86fcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x052d6ebb47b3010d55560bb19601e00ff62c36a420bad304dd1e7af46dabd78c",
+        "lastblockhash" : "0x58c536ba23e363c912301019883601303296dcffc9e7c9eb06d594b896c1a89d",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest79BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest79BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest79BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xbdc8",
-                    "hash" : "0x3b65798b9b262dbb8b8d1b668ebf62702d202d1e869c89fb19a357cd4e9c86f2",
-                    "mixHash" : "0x0dca344dcb2c2bfd00dbf346079ed300ce5febce48b7bade7a5e1f026b540c5b",
-                    "nonce" : "0x6c5eabc80b60a642",
+                    "hash" : "0xd983d7f83664e44a0587421376f078d34e7f408b446f45949d1da323eaa930c4",
+                    "mixHash" : "0xde486f8f827c3ad7864f6709aa66452c5f7d611e4459834311fa96a5346f3677",
+                    "nonce" : "0xb049e66472cce721",
                     "number" : "0x01",
                     "parentHash" : "0x19b1f3053923f0fe808033abe2f50d20898b9062eb986c700aad58f0cee015ee",
                     "receiptTrie" : "0x9426f830f750b227e0f534b0e7a4544ba7d1e53d9c67d4ae3d82523ce5b7ba49",
-                    "stateRoot" : "0xafd5cce76c1111c3529d597c917d9a69ba0f5b2148e6d8ab07fa39fbe720f9c0",
+                    "stateRoot" : "0x5b7856e15b69e38fd3a50437a995b4e5d742ff8f5d8ef34be99768226986c253",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x58d564b759473f9d56bd6000a28e62ea54b67c89246f927fe8adad66165a0ed2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca019b1f3053923f0fe808033abe2f50d20898b9062eb986c700aad58f0cee015eea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0afd5cce76c1111c3529d597c917d9a69ba0f5b2148e6d8ab07fa39fbe720f9c0a058d564b759473f9d56bd6000a28e62ea54b67c89246f927fe8adad66165a0ed2a09426f830f750b227e0f534b0e7a4544ba7d1e53d9c67d4ae3d82523ce5b7ba49b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bdc88203e880a00dca344dcb2c2bfd00dbf346079ed300ce5febce48b7bade7a5e1f026b540c5b886c5eabc80b60a642f90141f9013e8001845ed0901894095e7baea6a6c7c4c2dfeb977efac326af552d87841571e2aeb8d87f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f6b0656903a860a0242881274078b431ba077659cada0e8a2fdad887c998382f9f9c9096b98fbda59bdec93a08c94d3558aa0595f3143badafcbb5189621ee00feaa05f04ed7e9b199d006da4ff38b761532bc0",
+                "rlp" : "0xf90344f901fca019b1f3053923f0fe808033abe2f50d20898b9062eb986c700aad58f0cee015eea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05b7856e15b69e38fd3a50437a995b4e5d742ff8f5d8ef34be99768226986c253a058d564b759473f9d56bd6000a28e62ea54b67c89246f927fe8adad66165a0ed2a09426f830f750b227e0f534b0e7a4544ba7d1e53d9c67d4ae3d82523ce5b7ba49b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bdc88203e880a0de486f8f827c3ad7864f6709aa66452c5f7d611e4459834311fa96a5346f367788b049e66472cce721f90141f9013e8001845ed0901894095e7baea6a6c7c4c2dfeb977efac326af552d87841571e2aeb8d87f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f6b0656903a860a0242881274078b431ba077659cada0e8a2fdad887c998382f9f9c9096b98fbda59bdec93a08c94d3558aa0595f3143badafcbb5189621ee00feaa05f04ed7e9b199d006da4ff38b761532bc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f6b0656903a860a0242881274078b43",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0bac09daf1e0657c35f119803e67df96c18628e45685165b3174f9e913df86fcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3b65798b9b262dbb8b8d1b668ebf62702d202d1e869c89fb19a357cd4e9c86f2",
+        "lastblockhash" : "0xd983d7f83664e44a0587421376f078d34e7f408b446f45949d1da323eaa930c4",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1571e2ae",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f6b0656903a860a0242881274078b435560005155",
@@ -235,8 +228,8 @@
     "randomStatetest79BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest79BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest79BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xbabc",
-                    "hash" : "0xfdfcddbd29dcf1c51b34e5bc03bca4e979f96c81e0884a1e70ccdd1f835ecefb",
-                    "mixHash" : "0xaf4a9eb2ec94aae80c991e11971c05bdd8915f2181c78ea02261a0bd194509a2",
-                    "nonce" : "0x55c7ad03fb4740c1",
+                    "hash" : "0x70e709dc3fe90a20f3c9dc02591ec22d8a42faa4f031299959bfa279cf409bb4",
+                    "mixHash" : "0x1eaabeee52f619ff184275bd821b4e99c8d472ce7f3620aa36a8ebe194a6c950",
+                    "nonce" : "0xe48deb4dc4a30060",
                     "number" : "0x01",
                     "parentHash" : "0x19b1f3053923f0fe808033abe2f50d20898b9062eb986c700aad58f0cee015ee",
                     "receiptTrie" : "0x861051d122bade3feb7512d49695b8ae7ce481b1bba19f8221f34abd5335e7e4",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0x58d564b759473f9d56bd6000a28e62ea54b67c89246f927fe8adad66165a0ed2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca019b1f3053923f0fe808033abe2f50d20898b9062eb986c700aad58f0cee015eea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09fd0cec80800653671f81678c19ae4236e553d9782920989a275c71393aed7cba058d564b759473f9d56bd6000a28e62ea54b67c89246f927fe8adad66165a0ed2a0861051d122bade3feb7512d49695b8ae7ce481b1bba19f8221f34abd5335e7e4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82babc8203e880a0af4a9eb2ec94aae80c991e11971c05bdd8915f2181c78ea02261a0bd194509a28855c7ad03fb4740c1f90141f9013e8001845ed0901894095e7baea6a6c7c4c2dfeb977efac326af552d87841571e2aeb8d87f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f6b0656903a860a0242881274078b431ba077659cada0e8a2fdad887c998382f9f9c9096b98fbda59bdec93a08c94d3558aa0595f3143badafcbb5189621ee00feaa05f04ed7e9b199d006da4ff38b761532bc0",
+                "rlp" : "0xf90344f901fca019b1f3053923f0fe808033abe2f50d20898b9062eb986c700aad58f0cee015eea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09fd0cec80800653671f81678c19ae4236e553d9782920989a275c71393aed7cba058d564b759473f9d56bd6000a28e62ea54b67c89246f927fe8adad66165a0ed2a0861051d122bade3feb7512d49695b8ae7ce481b1bba19f8221f34abd5335e7e4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82babc8203e880a01eaabeee52f619ff184275bd821b4e99c8d472ce7f3620aa36a8ebe194a6c95088e48deb4dc4a30060f90141f9013e8001845ed0901894095e7baea6a6c7c4c2dfeb977efac326af552d87841571e2aeb8d87f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f6b0656903a860a0242881274078b431ba077659cada0e8a2fdad887c998382f9f9c9096b98fbda59bdec93a08c94d3558aa0595f3143badafcbb5189621ee00feaa05f04ed7e9b199d006da4ff38b761532bc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f6b0656903a860a0242881274078b43",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0bac09daf1e0657c35f119803e67df96c18628e45685165b3174f9e913df86fcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfdfcddbd29dcf1c51b34e5bc03bca4e979f96c81e0884a1e70ccdd1f835ecefb",
+        "lastblockhash" : "0x70e709dc3fe90a20f3c9dc02591ec22d8a42faa4f031299959bfa279cf409bb4",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest79BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest79BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest79BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xbabc",
-                    "hash" : "0xf780d7f888d20dafdacb69326e031bbfd2183faef7c8099e070fa47300384228",
-                    "mixHash" : "0xc100342877690578643fb63cf40f6a81d80a7c0a18e65cc5c02d93a79d2409b9",
-                    "nonce" : "0xd982201f6551a9f7",
+                    "hash" : "0xb399f8685034f098e23b1af049eefb99094696e3eff33af6e0a9523b77d40b2f",
+                    "mixHash" : "0x53e08bf97c1fbd6b54f59105bd8b01fd14b1c6a255895030ad04bbf7aae20ece",
+                    "nonce" : "0x934041f9ad593f65",
                     "number" : "0x01",
                     "parentHash" : "0x19b1f3053923f0fe808033abe2f50d20898b9062eb986c700aad58f0cee015ee",
                     "receiptTrie" : "0x861051d122bade3feb7512d49695b8ae7ce481b1bba19f8221f34abd5335e7e4",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0x58d564b759473f9d56bd6000a28e62ea54b67c89246f927fe8adad66165a0ed2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca019b1f3053923f0fe808033abe2f50d20898b9062eb986c700aad58f0cee015eea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09fd0cec80800653671f81678c19ae4236e553d9782920989a275c71393aed7cba058d564b759473f9d56bd6000a28e62ea54b67c89246f927fe8adad66165a0ed2a0861051d122bade3feb7512d49695b8ae7ce481b1bba19f8221f34abd5335e7e4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82babc8203e880a0c100342877690578643fb63cf40f6a81d80a7c0a18e65cc5c02d93a79d2409b988d982201f6551a9f7f90141f9013e8001845ed0901894095e7baea6a6c7c4c2dfeb977efac326af552d87841571e2aeb8d87f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f6b0656903a860a0242881274078b431ba077659cada0e8a2fdad887c998382f9f9c9096b98fbda59bdec93a08c94d3558aa0595f3143badafcbb5189621ee00feaa05f04ed7e9b199d006da4ff38b761532bc0",
+                "rlp" : "0xf90344f901fca019b1f3053923f0fe808033abe2f50d20898b9062eb986c700aad58f0cee015eea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09fd0cec80800653671f81678c19ae4236e553d9782920989a275c71393aed7cba058d564b759473f9d56bd6000a28e62ea54b67c89246f927fe8adad66165a0ed2a0861051d122bade3feb7512d49695b8ae7ce481b1bba19f8221f34abd5335e7e4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82babc8203e880a053e08bf97c1fbd6b54f59105bd8b01fd14b1c6a255895030ad04bbf7aae20ece88934041f9ad593f65f90141f9013e8001845ed0901894095e7baea6a6c7c4c2dfeb977efac326af552d87841571e2aeb8d87f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f6b0656903a860a0242881274078b431ba077659cada0e8a2fdad887c998382f9f9c9096b98fbda59bdec93a08c94d3558aa0595f3143badafcbb5189621ee00feaa05f04ed7e9b199d006da4ff38b761532bc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f6b0656903a860a0242881274078b43",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0bac09daf1e0657c35f119803e67df96c18628e45685165b3174f9e913df86fcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf780d7f888d20dafdacb69326e031bbfd2183faef7c8099e070fa47300384228",
+        "lastblockhash" : "0xb399f8685034f098e23b1af049eefb99094696e3eff33af6e0a9523b77d40b2f",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest79BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest79BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest79BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xbabc",
-                    "hash" : "0xa94cc69fd62b4df72cb028436932bd2da289c0a66f7ad1ff6f85022b456ba6a9",
-                    "mixHash" : "0xd37d16d3858fe10de87f06d1ffcedd51682153ebf5b8b2956f35cd8658cb06c8",
-                    "nonce" : "0xb6b6aa1c125ae117",
+                    "hash" : "0x963bd6a77ed4f6740ab9d10bea63498027382965198c75e45cf6ef8154297dee",
+                    "mixHash" : "0xeb5f2268cbc836c76387467b071b42fba44d286a1f5445d82737f24e78c5ebf0",
+                    "nonce" : "0x5ce05f730860e313",
                     "number" : "0x01",
                     "parentHash" : "0x19b1f3053923f0fe808033abe2f50d20898b9062eb986c700aad58f0cee015ee",
                     "receiptTrie" : "0x861051d122bade3feb7512d49695b8ae7ce481b1bba19f8221f34abd5335e7e4",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0x58d564b759473f9d56bd6000a28e62ea54b67c89246f927fe8adad66165a0ed2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca019b1f3053923f0fe808033abe2f50d20898b9062eb986c700aad58f0cee015eea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09fd0cec80800653671f81678c19ae4236e553d9782920989a275c71393aed7cba058d564b759473f9d56bd6000a28e62ea54b67c89246f927fe8adad66165a0ed2a0861051d122bade3feb7512d49695b8ae7ce481b1bba19f8221f34abd5335e7e4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82babc8203e880a0d37d16d3858fe10de87f06d1ffcedd51682153ebf5b8b2956f35cd8658cb06c888b6b6aa1c125ae117f90141f9013e8001845ed0901894095e7baea6a6c7c4c2dfeb977efac326af552d87841571e2aeb8d87f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f6b0656903a860a0242881274078b431ba077659cada0e8a2fdad887c998382f9f9c9096b98fbda59bdec93a08c94d3558aa0595f3143badafcbb5189621ee00feaa05f04ed7e9b199d006da4ff38b761532bc0",
+                "rlp" : "0xf90344f901fca019b1f3053923f0fe808033abe2f50d20898b9062eb986c700aad58f0cee015eea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09fd0cec80800653671f81678c19ae4236e553d9782920989a275c71393aed7cba058d564b759473f9d56bd6000a28e62ea54b67c89246f927fe8adad66165a0ed2a0861051d122bade3feb7512d49695b8ae7ce481b1bba19f8221f34abd5335e7e4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82babc8203e880a0eb5f2268cbc836c76387467b071b42fba44d286a1f5445d82737f24e78c5ebf0885ce05f730860e313f90141f9013e8001845ed0901894095e7baea6a6c7c4c2dfeb977efac326af552d87841571e2aeb8d87f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f6b0656903a860a0242881274078b431ba077659cada0e8a2fdad887c998382f9f9c9096b98fbda59bdec93a08c94d3558aa0595f3143badafcbb5189621ee00feaa05f04ed7e9b199d006da4ff38b761532bc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f6b0656903a860a0242881274078b43",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0bac09daf1e0657c35f119803e67df96c18628e45685165b3174f9e913df86fcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa94cc69fd62b4df72cb028436932bd2da289c0a66f7ad1ff6f85022b456ba6a9",
+        "lastblockhash" : "0x963bd6a77ed4f6740ab9d10bea63498027382965198c75e45cf6ef8154297dee",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest79BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest79BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest79BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xbabc",
-                    "hash" : "0x3526bb6ccc5d08208afc26a2eae59815b2c9fdb8efa16732c582c378703497b8",
-                    "mixHash" : "0x9644b101e37c3e8b136b47651ca77b4a7f24350b38824b866278acfc574261f9",
-                    "nonce" : "0x3f0df0c6b2458da6",
+                    "hash" : "0x31df3f48d2e260efccf1f42b266c9d42299b217268dc4db3305a320636e18f7c",
+                    "mixHash" : "0x05b5368505e6b88e438212f20b4c8756992fe31baf53bef22f339c7e6f05dd7f",
+                    "nonce" : "0xdd6e36a8e8a46df8",
                     "number" : "0x01",
                     "parentHash" : "0x19b1f3053923f0fe808033abe2f50d20898b9062eb986c700aad58f0cee015ee",
                     "receiptTrie" : "0x861051d122bade3feb7512d49695b8ae7ce481b1bba19f8221f34abd5335e7e4",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0x58d564b759473f9d56bd6000a28e62ea54b67c89246f927fe8adad66165a0ed2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90344f901fca019b1f3053923f0fe808033abe2f50d20898b9062eb986c700aad58f0cee015eea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09fd0cec80800653671f81678c19ae4236e553d9782920989a275c71393aed7cba058d564b759473f9d56bd6000a28e62ea54b67c89246f927fe8adad66165a0ed2a0861051d122bade3feb7512d49695b8ae7ce481b1bba19f8221f34abd5335e7e4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82babc8203e880a09644b101e37c3e8b136b47651ca77b4a7f24350b38824b866278acfc574261f9883f0df0c6b2458da6f90141f9013e8001845ed0901894095e7baea6a6c7c4c2dfeb977efac326af552d87841571e2aeb8d87f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f6b0656903a860a0242881274078b431ba077659cada0e8a2fdad887c998382f9f9c9096b98fbda59bdec93a08c94d3558aa0595f3143badafcbb5189621ee00feaa05f04ed7e9b199d006da4ff38b761532bc0",
+                "rlp" : "0xf90344f901fca019b1f3053923f0fe808033abe2f50d20898b9062eb986c700aad58f0cee015eea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09fd0cec80800653671f81678c19ae4236e553d9782920989a275c71393aed7cba058d564b759473f9d56bd6000a28e62ea54b67c89246f927fe8adad66165a0ed2a0861051d122bade3feb7512d49695b8ae7ce481b1bba19f8221f34abd5335e7e4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82babc8203e880a005b5368505e6b88e438212f20b4c8756992fe31baf53bef22f339c7e6f05dd7f88dd6e36a8e8a46df8f90141f9013e8001845ed0901894095e7baea6a6c7c4c2dfeb977efac326af552d87841571e2aeb8d87f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f6b0656903a860a0242881274078b431ba077659cada0e8a2fdad887c998382f9f9c9096b98fbda59bdec93a08c94d3558aa0595f3143badafcbb5189621ee00feaa05f04ed7e9b199d006da4ff38b761532bc0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f6b0656903a860a0242881274078b43",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0bac09daf1e0657c35f119803e67df96c18628e45685165b3174f9e913df86fcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3526bb6ccc5d08208afc26a2eae59815b2c9fdb8efa16732c582c378703497b8",
+        "lastblockhash" : "0x31df3f48d2e260efccf1f42b266c9d42299b217268dc4db3305a320636e18f7c",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest86BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest86BC.json
index fe40f34d5..b22011f4c 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest86BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest86BC.json
@@ -2,8 +2,8 @@
     "randomStatetest86BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest86BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest86BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8eb5",
-                    "hash" : "0x55864062aba414899c04252ab929de61fb2872817baa3aa850e79837e0ed86fd",
-                    "mixHash" : "0x2b8ae684771c0babe73b7fb5e0fb4f2d71844f4e39ba62b5b5e13a3c8ec0c5ca",
-                    "nonce" : "0x64bff665f1ffa495",
+                    "hash" : "0x6deb42820795feff441fd4732f12fe54aadaa81da4d860ed55e272e48f1a9931",
+                    "mixHash" : "0xe300198645155492eb439ce910188e0acb8b4be246574f0a7753447445afcc43",
+                    "nonce" : "0x972ecca62b74e54a",
                     "number" : "0x01",
                     "parentHash" : "0x61a614dae889fbe4ebcf01048f4187256d892ef7fea9b004fe2727b2ad32607d",
                     "receiptTrie" : "0x316deca408949dfd5d2dc506810803ab58dcc74f6ad7a0dbdec2a795344731a5",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x7e1b608b6f1ab94ad23a160860bb1d5c95eb8211bc7402f904630e68ae0f7776",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90356f901fca061a614dae889fbe4ebcf01048f4187256d892ef7fea9b004fe2727b2ad32607da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e6af69733b46459437e049dee2c8e769b44a3739ce85ddd3a005229c28556e2ca07e1b608b6f1ab94ad23a160860bb1d5c95eb8211bc7402f904630e68ae0f7776a0316deca408949dfd5d2dc506810803ab58dcc74f6ad7a0dbdec2a795344731a5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828eb58203e880a02b8ae684771c0babe73b7fb5e0fb4f2d71844f4e39ba62b5b5e13a3c8ec0c5ca8864bff665f1ffa495f90153f9015080018463921ae494095e7baea6a6c7c4c2dfeb977efac326af552d87843aecace0b8ea7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09181ba0beb8d86dcd47dced2db96e3bb36d3d4d61cdcbdf51749d19d2e98ef1ac6edcf0a011056460833ef964a03305437b562bd60519fba8697fcad30a54a4ed426c3febc0",
+                "rlp" : "0xf90356f901fca061a614dae889fbe4ebcf01048f4187256d892ef7fea9b004fe2727b2ad32607da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e6af69733b46459437e049dee2c8e769b44a3739ce85ddd3a005229c28556e2ca07e1b608b6f1ab94ad23a160860bb1d5c95eb8211bc7402f904630e68ae0f7776a0316deca408949dfd5d2dc506810803ab58dcc74f6ad7a0dbdec2a795344731a5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828eb58203e880a0e300198645155492eb439ce910188e0acb8b4be246574f0a7753447445afcc4388972ecca62b74e54af90153f9015080018463921ae494095e7baea6a6c7c4c2dfeb977efac326af552d87843aecace0b8ea7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09181ba0beb8d86dcd47dced2db96e3bb36d3d4d61cdcbdf51749d19d2e98ef1ac6edcf0a011056460833ef964a03305437b562bd60519fba8697fcad30a54a4ed426c3febc0",
                 "transactions" : [
                     {
                         "data" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0918",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04b896f764201d10e4f7435af645dbade3047cf1ced377dba1ed9004e2937f02ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x55864062aba414899c04252ab929de61fb2872817baa3aa850e79837e0ed86fd",
+        "lastblockhash" : "0x6deb42820795feff441fd4732f12fe54aadaa81da4d860ed55e272e48f1a9931",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest86BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest86BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest86BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x91c1",
-                    "hash" : "0x963bc5ad8f33fa3981e605d9a0f82843fe9aff6a90fe5b33120d4e19ae4529b3",
-                    "mixHash" : "0xc4adae99a96d48251ab7dac324d64e97f97404dc23de6916b6e779950b144b94",
-                    "nonce" : "0xa32c47be8f18a8da",
+                    "hash" : "0x8f0c02acd92ba01ae457587506afdcdee2ae9bc69c0777e051f69fee57ee3311",
+                    "mixHash" : "0x39d79890e4ecec2ef24c82c3c4ed71a920b232881ac27019f1e6719e92a885ba",
+                    "nonce" : "0xf1cedc1f9bc68aa4",
                     "number" : "0x01",
                     "parentHash" : "0x61a614dae889fbe4ebcf01048f4187256d892ef7fea9b004fe2727b2ad32607d",
                     "receiptTrie" : "0x90279c3c23ae898144ec266122266373af2b68d19c59b954501825906f592452",
-                    "stateRoot" : "0x68513a841005ddbe295622f6f464973359fbc288b33bc59bb29c966c280c9100",
+                    "stateRoot" : "0xcfe65a9c2c385c10c7e3e830b714ae0cd0370ae9b0690e7e4e507ba4b323dea9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7e1b608b6f1ab94ad23a160860bb1d5c95eb8211bc7402f904630e68ae0f7776",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90356f901fca061a614dae889fbe4ebcf01048f4187256d892ef7fea9b004fe2727b2ad32607da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a068513a841005ddbe295622f6f464973359fbc288b33bc59bb29c966c280c9100a07e1b608b6f1ab94ad23a160860bb1d5c95eb8211bc7402f904630e68ae0f7776a090279c3c23ae898144ec266122266373af2b68d19c59b954501825906f592452b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8291c18203e880a0c4adae99a96d48251ab7dac324d64e97f97404dc23de6916b6e779950b144b9488a32c47be8f18a8daf90153f9015080018463921ae494095e7baea6a6c7c4c2dfeb977efac326af552d87843aecace0b8ea7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09181ba0beb8d86dcd47dced2db96e3bb36d3d4d61cdcbdf51749d19d2e98ef1ac6edcf0a011056460833ef964a03305437b562bd60519fba8697fcad30a54a4ed426c3febc0",
+                "rlp" : "0xf90356f901fca061a614dae889fbe4ebcf01048f4187256d892ef7fea9b004fe2727b2ad32607da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cfe65a9c2c385c10c7e3e830b714ae0cd0370ae9b0690e7e4e507ba4b323dea9a07e1b608b6f1ab94ad23a160860bb1d5c95eb8211bc7402f904630e68ae0f7776a090279c3c23ae898144ec266122266373af2b68d19c59b954501825906f592452b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8291c18203e880a039d79890e4ecec2ef24c82c3c4ed71a920b232881ac27019f1e6719e92a885ba88f1cedc1f9bc68aa4f90153f9015080018463921ae494095e7baea6a6c7c4c2dfeb977efac326af552d87843aecace0b8ea7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09181ba0beb8d86dcd47dced2db96e3bb36d3d4d61cdcbdf51749d19d2e98ef1ac6edcf0a011056460833ef964a03305437b562bd60519fba8697fcad30a54a4ed426c3febc0",
                 "transactions" : [
                     {
                         "data" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0918",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04b896f764201d10e4f7435af645dbade3047cf1ced377dba1ed9004e2937f02ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x963bc5ad8f33fa3981e605d9a0f82843fe9aff6a90fe5b33120d4e19ae4529b3",
+        "lastblockhash" : "0x8f0c02acd92ba01ae457587506afdcdee2ae9bc69c0777e051f69fee57ee3311",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x3aecace0",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff091860005155",
@@ -233,8 +226,8 @@
     "randomStatetest86BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest86BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest86BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8eb5",
-                    "hash" : "0xf7b2e6acda5af51f50bbfff2910490e4442a2344f2058982f557cbe5edb1cc49",
-                    "mixHash" : "0x5ed1c082e0d8b2eebac84bb0e6a5014c727d4597231b246b9b313a975efab928",
-                    "nonce" : "0x53cd6ebd871534c6",
+                    "hash" : "0xf44c85631d17382ad84f9ba8e63bc1c1f690a1dccadb2f4d88b7733f64690a7b",
+                    "mixHash" : "0x4af8f6802699c0622c12900a7d743a556fb5166e32f5b99d0ab792e136d4e18d",
+                    "nonce" : "0x3f619eeb0ffae5e3",
                     "number" : "0x01",
                     "parentHash" : "0x61a614dae889fbe4ebcf01048f4187256d892ef7fea9b004fe2727b2ad32607d",
                     "receiptTrie" : "0x25bf707aa28110e0b75085e657afc49c65cb0d6eaf2e5c41c43c2651f1e7e0e6",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0x7e1b608b6f1ab94ad23a160860bb1d5c95eb8211bc7402f904630e68ae0f7776",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90356f901fca061a614dae889fbe4ebcf01048f4187256d892ef7fea9b004fe2727b2ad32607da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a058b4575dd9b16b5192c56c82b2db687f0ca9415bcabc515c2704d28208c6baeda07e1b608b6f1ab94ad23a160860bb1d5c95eb8211bc7402f904630e68ae0f7776a025bf707aa28110e0b75085e657afc49c65cb0d6eaf2e5c41c43c2651f1e7e0e6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828eb58203e880a05ed1c082e0d8b2eebac84bb0e6a5014c727d4597231b246b9b313a975efab9288853cd6ebd871534c6f90153f9015080018463921ae494095e7baea6a6c7c4c2dfeb977efac326af552d87843aecace0b8ea7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09181ba0beb8d86dcd47dced2db96e3bb36d3d4d61cdcbdf51749d19d2e98ef1ac6edcf0a011056460833ef964a03305437b562bd60519fba8697fcad30a54a4ed426c3febc0",
+                "rlp" : "0xf90356f901fca061a614dae889fbe4ebcf01048f4187256d892ef7fea9b004fe2727b2ad32607da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a058b4575dd9b16b5192c56c82b2db687f0ca9415bcabc515c2704d28208c6baeda07e1b608b6f1ab94ad23a160860bb1d5c95eb8211bc7402f904630e68ae0f7776a025bf707aa28110e0b75085e657afc49c65cb0d6eaf2e5c41c43c2651f1e7e0e6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828eb58203e880a04af8f6802699c0622c12900a7d743a556fb5166e32f5b99d0ab792e136d4e18d883f619eeb0ffae5e3f90153f9015080018463921ae494095e7baea6a6c7c4c2dfeb977efac326af552d87843aecace0b8ea7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09181ba0beb8d86dcd47dced2db96e3bb36d3d4d61cdcbdf51749d19d2e98ef1ac6edcf0a011056460833ef964a03305437b562bd60519fba8697fcad30a54a4ed426c3febc0",
                 "transactions" : [
                     {
                         "data" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0918",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04b896f764201d10e4f7435af645dbade3047cf1ced377dba1ed9004e2937f02ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf7b2e6acda5af51f50bbfff2910490e4442a2344f2058982f557cbe5edb1cc49",
+        "lastblockhash" : "0xf44c85631d17382ad84f9ba8e63bc1c1f690a1dccadb2f4d88b7733f64690a7b",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest86BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest86BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest86BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8eb5",
-                    "hash" : "0x6f75695e7dc9aad74cbf956f6d9c38ff1654a87a04511eba6d64b36fec63c89b",
-                    "mixHash" : "0x07321729e9ea78109514d8662b9d311cc9f560e2116a02c6e5161cc90dccba61",
-                    "nonce" : "0xd16102043a48fd44",
+                    "hash" : "0x63e0176686695e7574e16bce811a81b89aef4365951917daa2ff303007fdd105",
+                    "mixHash" : "0x739ca317b4c929d16a186c5c9b16a008c538a65105b427a037719f1c91b4dc73",
+                    "nonce" : "0x5fe277f64c735bdb",
                     "number" : "0x01",
                     "parentHash" : "0x61a614dae889fbe4ebcf01048f4187256d892ef7fea9b004fe2727b2ad32607d",
                     "receiptTrie" : "0x25bf707aa28110e0b75085e657afc49c65cb0d6eaf2e5c41c43c2651f1e7e0e6",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0x7e1b608b6f1ab94ad23a160860bb1d5c95eb8211bc7402f904630e68ae0f7776",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90356f901fca061a614dae889fbe4ebcf01048f4187256d892ef7fea9b004fe2727b2ad32607da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a058b4575dd9b16b5192c56c82b2db687f0ca9415bcabc515c2704d28208c6baeda07e1b608b6f1ab94ad23a160860bb1d5c95eb8211bc7402f904630e68ae0f7776a025bf707aa28110e0b75085e657afc49c65cb0d6eaf2e5c41c43c2651f1e7e0e6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828eb58203e880a007321729e9ea78109514d8662b9d311cc9f560e2116a02c6e5161cc90dccba6188d16102043a48fd44f90153f9015080018463921ae494095e7baea6a6c7c4c2dfeb977efac326af552d87843aecace0b8ea7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09181ba0beb8d86dcd47dced2db96e3bb36d3d4d61cdcbdf51749d19d2e98ef1ac6edcf0a011056460833ef964a03305437b562bd60519fba8697fcad30a54a4ed426c3febc0",
+                "rlp" : "0xf90356f901fca061a614dae889fbe4ebcf01048f4187256d892ef7fea9b004fe2727b2ad32607da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a058b4575dd9b16b5192c56c82b2db687f0ca9415bcabc515c2704d28208c6baeda07e1b608b6f1ab94ad23a160860bb1d5c95eb8211bc7402f904630e68ae0f7776a025bf707aa28110e0b75085e657afc49c65cb0d6eaf2e5c41c43c2651f1e7e0e6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828eb58203e880a0739ca317b4c929d16a186c5c9b16a008c538a65105b427a037719f1c91b4dc73885fe277f64c735bdbf90153f9015080018463921ae494095e7baea6a6c7c4c2dfeb977efac326af552d87843aecace0b8ea7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09181ba0beb8d86dcd47dced2db96e3bb36d3d4d61cdcbdf51749d19d2e98ef1ac6edcf0a011056460833ef964a03305437b562bd60519fba8697fcad30a54a4ed426c3febc0",
                 "transactions" : [
                     {
                         "data" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0918",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04b896f764201d10e4f7435af645dbade3047cf1ced377dba1ed9004e2937f02ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6f75695e7dc9aad74cbf956f6d9c38ff1654a87a04511eba6d64b36fec63c89b",
+        "lastblockhash" : "0x63e0176686695e7574e16bce811a81b89aef4365951917daa2ff303007fdd105",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest86BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest86BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest86BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8eb5",
-                    "hash" : "0x6bd11d2c3c6c53051d8d24a5cbe5d4db55063499a639b9105cf0e49d7c4774af",
-                    "mixHash" : "0xfa8de12df72bb098dbfacadc462521710659de792f834d46c0b3f82942d74c8d",
-                    "nonce" : "0x01373b18ad18c879",
+                    "hash" : "0x29d258cad47f7efb49e648dea0f17f337117265bb538726c0963b3177766cea8",
+                    "mixHash" : "0x462688ea20e6f9e24055ed82feb5be40923497cc19738c2818ca8be07600e62e",
+                    "nonce" : "0x428ce4d53a924e97",
                     "number" : "0x01",
                     "parentHash" : "0x61a614dae889fbe4ebcf01048f4187256d892ef7fea9b004fe2727b2ad32607d",
                     "receiptTrie" : "0x25bf707aa28110e0b75085e657afc49c65cb0d6eaf2e5c41c43c2651f1e7e0e6",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0x7e1b608b6f1ab94ad23a160860bb1d5c95eb8211bc7402f904630e68ae0f7776",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90356f901fca061a614dae889fbe4ebcf01048f4187256d892ef7fea9b004fe2727b2ad32607da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a058b4575dd9b16b5192c56c82b2db687f0ca9415bcabc515c2704d28208c6baeda07e1b608b6f1ab94ad23a160860bb1d5c95eb8211bc7402f904630e68ae0f7776a025bf707aa28110e0b75085e657afc49c65cb0d6eaf2e5c41c43c2651f1e7e0e6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828eb58203e880a0fa8de12df72bb098dbfacadc462521710659de792f834d46c0b3f82942d74c8d8801373b18ad18c879f90153f9015080018463921ae494095e7baea6a6c7c4c2dfeb977efac326af552d87843aecace0b8ea7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09181ba0beb8d86dcd47dced2db96e3bb36d3d4d61cdcbdf51749d19d2e98ef1ac6edcf0a011056460833ef964a03305437b562bd60519fba8697fcad30a54a4ed426c3febc0",
+                "rlp" : "0xf90356f901fca061a614dae889fbe4ebcf01048f4187256d892ef7fea9b004fe2727b2ad32607da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a058b4575dd9b16b5192c56c82b2db687f0ca9415bcabc515c2704d28208c6baeda07e1b608b6f1ab94ad23a160860bb1d5c95eb8211bc7402f904630e68ae0f7776a025bf707aa28110e0b75085e657afc49c65cb0d6eaf2e5c41c43c2651f1e7e0e6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828eb58203e880a0462688ea20e6f9e24055ed82feb5be40923497cc19738c2818ca8be07600e62e88428ce4d53a924e97f90153f9015080018463921ae494095e7baea6a6c7c4c2dfeb977efac326af552d87843aecace0b8ea7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09181ba0beb8d86dcd47dced2db96e3bb36d3d4d61cdcbdf51749d19d2e98ef1ac6edcf0a011056460833ef964a03305437b562bd60519fba8697fcad30a54a4ed426c3febc0",
                 "transactions" : [
                     {
                         "data" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0918",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04b896f764201d10e4f7435af645dbade3047cf1ced377dba1ed9004e2937f02ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6bd11d2c3c6c53051d8d24a5cbe5d4db55063499a639b9105cf0e49d7c4774af",
+        "lastblockhash" : "0x29d258cad47f7efb49e648dea0f17f337117265bb538726c0963b3177766cea8",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest86BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest86BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest86BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x8eb5",
-                    "hash" : "0xc259a6f8f3af5549e0e95c209da9ac62c7f0ff5eb04f736d3bebcb827a327c8b",
-                    "mixHash" : "0x9dac7a0f5f3fd9027d07931278792525a55736ec0045d6667aa664f51706cf77",
-                    "nonce" : "0x96395d20048ca688",
+                    "hash" : "0x2f3a48d987d846fdbe89421d67d925a07ea1cad7ba58018a26b1472c018d92a8",
+                    "mixHash" : "0xa1f909ae23955064f82dcb6048b1c818e1c9613805c8b12927280de8358395d0",
+                    "nonce" : "0x8351a27205c2dbf0",
                     "number" : "0x01",
                     "parentHash" : "0x61a614dae889fbe4ebcf01048f4187256d892ef7fea9b004fe2727b2ad32607d",
                     "receiptTrie" : "0x25bf707aa28110e0b75085e657afc49c65cb0d6eaf2e5c41c43c2651f1e7e0e6",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0x7e1b608b6f1ab94ad23a160860bb1d5c95eb8211bc7402f904630e68ae0f7776",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90356f901fca061a614dae889fbe4ebcf01048f4187256d892ef7fea9b004fe2727b2ad32607da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a058b4575dd9b16b5192c56c82b2db687f0ca9415bcabc515c2704d28208c6baeda07e1b608b6f1ab94ad23a160860bb1d5c95eb8211bc7402f904630e68ae0f7776a025bf707aa28110e0b75085e657afc49c65cb0d6eaf2e5c41c43c2651f1e7e0e6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828eb58203e880a09dac7a0f5f3fd9027d07931278792525a55736ec0045d6667aa664f51706cf778896395d20048ca688f90153f9015080018463921ae494095e7baea6a6c7c4c2dfeb977efac326af552d87843aecace0b8ea7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09181ba0beb8d86dcd47dced2db96e3bb36d3d4d61cdcbdf51749d19d2e98ef1ac6edcf0a011056460833ef964a03305437b562bd60519fba8697fcad30a54a4ed426c3febc0",
+                "rlp" : "0xf90356f901fca061a614dae889fbe4ebcf01048f4187256d892ef7fea9b004fe2727b2ad32607da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a058b4575dd9b16b5192c56c82b2db687f0ca9415bcabc515c2704d28208c6baeda07e1b608b6f1ab94ad23a160860bb1d5c95eb8211bc7402f904630e68ae0f7776a025bf707aa28110e0b75085e657afc49c65cb0d6eaf2e5c41c43c2651f1e7e0e6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff828eb58203e880a0a1f909ae23955064f82dcb6048b1c818e1c9613805c8b12927280de8358395d0888351a27205c2dbf0f90153f9015080018463921ae494095e7baea6a6c7c4c2dfeb977efac326af552d87843aecace0b8ea7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09181ba0beb8d86dcd47dced2db96e3bb36d3d4d61cdcbdf51749d19d2e98ef1ac6edcf0a011056460833ef964a03305437b562bd60519fba8697fcad30a54a4ed426c3febc0",
                 "transactions" : [
                     {
                         "data" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0918",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04b896f764201d10e4f7435af645dbade3047cf1ced377dba1ed9004e2937f02ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc259a6f8f3af5549e0e95c209da9ac62c7f0ff5eb04f736d3bebcb827a327c8b",
+        "lastblockhash" : "0x2f3a48d987d846fdbe89421d67d925a07ea1cad7ba58018a26b1472c018d92a8",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest8BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest8BC.json
index ed6bb7cd7..ae1a26dae 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest8BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest8BC.json
@@ -2,8 +2,8 @@
     "randomStatetest8BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest8BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest8BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5311",
-                    "hash" : "0x398ad7bee4281ef3a7afe49480cec2767c4f0642c5b2c8be15d8a6b4ada31a4f",
-                    "mixHash" : "0xb664e2fd7412c797b57931c8a95431829869a00f6f25e3dcaf96e069c349687d",
-                    "nonce" : "0x74eff7fe4b1bdaea",
+                    "hash" : "0x96fe1b3c24972154d80fa5620822e8eae30f2cd2ee8ee2903b3488fde0f207bb",
+                    "mixHash" : "0xf859c757fbc9e06f82f9bc5fc643ab87bb58bc6ead55af12ffe99024fb411755",
+                    "nonce" : "0x26cbe002074f423f",
                     "number" : "0x01",
                     "parentHash" : "0x17f885716e9dd802a11393bfd3c35662c72d3eee36f2ec9da187ccd02a87753c",
                     "receiptTrie" : "0xabe9467283879d552ff5204e4805dacf41a8ed8bddfaa852e48af8bdb2a874d4",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca017f885716e9dd802a11393bfd3c35662c72d3eee36f2ec9da187ccd02a87753ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b252777a6b9a5d56afa45446e549746dd42d3fe72850cbde5b045eb3c8c2d8f2a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0abe9467283879d552ff5204e4805dacf41a8ed8bddfaa852e48af8bdb2a874d4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8253118203e880a0b664e2fd7412c797b57931c8a95431829869a00f6f25e3dcaf96e069c349687d8874eff7fe4b1bdaeaf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca017f885716e9dd802a11393bfd3c35662c72d3eee36f2ec9da187ccd02a87753ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b252777a6b9a5d56afa45446e549746dd42d3fe72850cbde5b045eb3c8c2d8f2a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0abe9467283879d552ff5204e4805dacf41a8ed8bddfaa852e48af8bdb2a874d4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8253118203e880a0f859c757fbc9e06f82f9bc5fc643ab87bb58bc6ead55af12ffe99024fb4117558826cbe002074f423ff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a7d0bfc5b286e72f11da6f93641b8726a3a6bb20ce2e6832cf77ea8796debdf7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x398ad7bee4281ef3a7afe49480cec2767c4f0642c5b2c8be15d8a6b4ada31a4f",
+        "lastblockhash" : "0x96fe1b3c24972154d80fa5620822e8eae30f2cd2ee8ee2903b3488fde0f207bb",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest8BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest8BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest8BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x561d",
-                    "hash" : "0xcd7aabf68bc5d68b5e2e9939ef6f7ab384eced21eeeef46ea29270693e5ac105",
-                    "mixHash" : "0x38ff7499ce0bb3c7ca42c7b5971859ee7302338b032186a0e213a87250f3a0fc",
-                    "nonce" : "0x2f7e3b970c57e396",
+                    "hash" : "0x799ec78c1b31bf416e13af0257fa5cc0ce61cede64cd278a186e45433827ccae",
+                    "mixHash" : "0xc5f79d4dcfc8196ec3e4da10f88c9dde7f49869b8fe9f46602322368d5a24e5b",
+                    "nonce" : "0x68c96367fc07e5dc",
                     "number" : "0x01",
                     "parentHash" : "0x17f885716e9dd802a11393bfd3c35662c72d3eee36f2ec9da187ccd02a87753c",
                     "receiptTrie" : "0xe886314f20a71de1d26b5825f9ca71cd71d2d92237f206ebecb996adca4760ad",
-                    "stateRoot" : "0xaf8507bd8e447bbeae56ee1d86ca49e25e4bbd42982be3cfe71a50d0bdd43f78",
+                    "stateRoot" : "0xe72beb952d4fab063e235d847ec87a3f172c14a4b916e97559aea3272875ced6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca017f885716e9dd802a11393bfd3c35662c72d3eee36f2ec9da187ccd02a87753ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0af8507bd8e447bbeae56ee1d86ca49e25e4bbd42982be3cfe71a50d0bdd43f78a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e886314f20a71de1d26b5825f9ca71cd71d2d92237f206ebecb996adca4760adb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82561d8203e880a038ff7499ce0bb3c7ca42c7b5971859ee7302338b032186a0e213a87250f3a0fc882f7e3b970c57e396f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca017f885716e9dd802a11393bfd3c35662c72d3eee36f2ec9da187ccd02a87753ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e72beb952d4fab063e235d847ec87a3f172c14a4b916e97559aea3272875ced6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e886314f20a71de1d26b5825f9ca71cd71d2d92237f206ebecb996adca4760adb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82561d8203e880a0c5f79d4dcfc8196ec3e4da10f88c9dde7f49869b8fe9f46602322368d5a24e5b8868c96367fc07e5dcf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a7d0bfc5b286e72f11da6f93641b8726a3a6bb20ce2e6832cf77ea8796debdf7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcd7aabf68bc5d68b5e2e9939ef6f7ab384eced21eeeef46ea29270693e5ac105",
+        "lastblockhash" : "0x799ec78c1b31bf416e13af0257fa5cc0ce61cede64cd278a186e45433827ccae",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x45454041444344330a78066e6da197ff",
@@ -233,8 +226,8 @@
     "randomStatetest8BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest8BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest8BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5299",
-                    "hash" : "0x6950043afef8f1e90850963495ac84622d4296170240231520656cf901aa0dcf",
-                    "mixHash" : "0xeae26bb030e5e4b194a1fa9bcd02bca0528528de745b2c7bd5f0402f0f1cc619",
-                    "nonce" : "0xe5065f45ef943aaa",
+                    "hash" : "0x1c3aacabea977d6db802cffdbb194efe1ba95bf5076adf670c094100267050b7",
+                    "mixHash" : "0x862a4de9a10c0a3e99ee81f4289e80985affd94e5bbc881a9afc739e0ec8661f",
+                    "nonce" : "0x2e46b47ba3b3d1e7",
                     "number" : "0x01",
                     "parentHash" : "0x17f885716e9dd802a11393bfd3c35662c72d3eee36f2ec9da187ccd02a87753c",
                     "receiptTrie" : "0x5c927ce0f774e6abe45db03563c7977b220ec5b7f67a04b9ac97060d888fa831",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca017f885716e9dd802a11393bfd3c35662c72d3eee36f2ec9da187ccd02a87753ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a6a07f7a73a7dd3ef3bbc7cef7f8b5dcbab265c912a5688fef53f1fe4f20ff38a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa05c927ce0f774e6abe45db03563c7977b220ec5b7f67a04b9ac97060d888fa831b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252998203e880a0eae26bb030e5e4b194a1fa9bcd02bca0528528de745b2c7bd5f0402f0f1cc61988e5065f45ef943aaaf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca017f885716e9dd802a11393bfd3c35662c72d3eee36f2ec9da187ccd02a87753ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a6a07f7a73a7dd3ef3bbc7cef7f8b5dcbab265c912a5688fef53f1fe4f20ff38a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa05c927ce0f774e6abe45db03563c7977b220ec5b7f67a04b9ac97060d888fa831b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252998203e880a0862a4de9a10c0a3e99ee81f4289e80985affd94e5bbc881a9afc739e0ec8661f882e46b47ba3b3d1e7f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a7d0bfc5b286e72f11da6f93641b8726a3a6bb20ce2e6832cf77ea8796debdf7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6950043afef8f1e90850963495ac84622d4296170240231520656cf901aa0dcf",
+        "lastblockhash" : "0x1c3aacabea977d6db802cffdbb194efe1ba95bf5076adf670c094100267050b7",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest8BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest8BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest8BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5311",
-                    "hash" : "0x9642964bfef9450673d2641251a12eb789ccfbd16fe9cc1710d7f9a87f9475ad",
-                    "mixHash" : "0x1ec4a024c7eb3dfabd1561aebc5743843e578e2a0f3be97cd2c795f6585a5e11",
-                    "nonce" : "0xf6f9cf9f388f46cc",
+                    "hash" : "0x806f126735a71067f24f1267c5faa11788cceb0437f2b0216c1f3e658958a088",
+                    "mixHash" : "0x6648cc79f72d458aefeec157a3b1f755bc28b1926f866fc0e61bf52618bd0f11",
+                    "nonce" : "0x1d05b33072ccf69d",
                     "number" : "0x01",
                     "parentHash" : "0x17f885716e9dd802a11393bfd3c35662c72d3eee36f2ec9da187ccd02a87753c",
                     "receiptTrie" : "0xbc99682c7ef8e786e34f932372a55c48ae3e1c6d9ac4b5e90c54726d5c7edc28",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca017f885716e9dd802a11393bfd3c35662c72d3eee36f2ec9da187ccd02a87753ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0799a37243647f6bec5829631519622fc30b6a87e3268ad43693cd6c634c3de81a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0bc99682c7ef8e786e34f932372a55c48ae3e1c6d9ac4b5e90c54726d5c7edc28b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8253118203e880a01ec4a024c7eb3dfabd1561aebc5743843e578e2a0f3be97cd2c795f6585a5e1188f6f9cf9f388f46ccf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca017f885716e9dd802a11393bfd3c35662c72d3eee36f2ec9da187ccd02a87753ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0799a37243647f6bec5829631519622fc30b6a87e3268ad43693cd6c634c3de81a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0bc99682c7ef8e786e34f932372a55c48ae3e1c6d9ac4b5e90c54726d5c7edc28b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8253118203e880a06648cc79f72d458aefeec157a3b1f755bc28b1926f866fc0e61bf52618bd0f11881d05b33072ccf69df865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a7d0bfc5b286e72f11da6f93641b8726a3a6bb20ce2e6832cf77ea8796debdf7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9642964bfef9450673d2641251a12eb789ccfbd16fe9cc1710d7f9a87f9475ad",
+        "lastblockhash" : "0x806f126735a71067f24f1267c5faa11788cceb0437f2b0216c1f3e658958a088",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest8BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest8BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest8BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5299",
-                    "hash" : "0xc2d3ec0fc5665deba9d2e8b7555d90ba4480b5587c56da10cf5aa19c5c5eaa4e",
-                    "mixHash" : "0x00f980abcb1797cb71070fcb7934da074e8efb79b252a232a45837eb834fd041",
-                    "nonce" : "0x9fdb000e98dc91bb",
+                    "hash" : "0xfe30f9ee96f115938f52355fe23268e57ca2623b941869c377e984be22372792",
+                    "mixHash" : "0x2fb52c510693e97322778d5ad2f83cc72dc1c05d19c3bdaa89f464aaf8866aec",
+                    "nonce" : "0x4db3d35967b0ab42",
                     "number" : "0x01",
                     "parentHash" : "0x17f885716e9dd802a11393bfd3c35662c72d3eee36f2ec9da187ccd02a87753c",
                     "receiptTrie" : "0x5c927ce0f774e6abe45db03563c7977b220ec5b7f67a04b9ac97060d888fa831",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca017f885716e9dd802a11393bfd3c35662c72d3eee36f2ec9da187ccd02a87753ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a6a07f7a73a7dd3ef3bbc7cef7f8b5dcbab265c912a5688fef53f1fe4f20ff38a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa05c927ce0f774e6abe45db03563c7977b220ec5b7f67a04b9ac97060d888fa831b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252998203e880a000f980abcb1797cb71070fcb7934da074e8efb79b252a232a45837eb834fd041889fdb000e98dc91bbf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca017f885716e9dd802a11393bfd3c35662c72d3eee36f2ec9da187ccd02a87753ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a6a07f7a73a7dd3ef3bbc7cef7f8b5dcbab265c912a5688fef53f1fe4f20ff38a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa05c927ce0f774e6abe45db03563c7977b220ec5b7f67a04b9ac97060d888fa831b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252998203e880a02fb52c510693e97322778d5ad2f83cc72dc1c05d19c3bdaa89f464aaf8866aec884db3d35967b0ab42f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a7d0bfc5b286e72f11da6f93641b8726a3a6bb20ce2e6832cf77ea8796debdf7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc2d3ec0fc5665deba9d2e8b7555d90ba4480b5587c56da10cf5aa19c5c5eaa4e",
+        "lastblockhash" : "0xfe30f9ee96f115938f52355fe23268e57ca2623b941869c377e984be22372792",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest8BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest8BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest8BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5299",
-                    "hash" : "0x1bf8761166dd4e29b31a16fdb1ff4d3020236258445ea82737aa18a1fd4eecbe",
-                    "mixHash" : "0x17b13b53ddbb5cc4de3ccc460cef8a075364cca2d36e1f000bcf9f1c8af1e5f4",
-                    "nonce" : "0xe61e554aa506628a",
+                    "hash" : "0x01b6deb9c9aaa318f0d6eca635a1ca32c4f18d514c03e0eccda02486f33cbddc",
+                    "mixHash" : "0x241bcfa90bf3c112aa4ebe20673baaf492fbe2041e22ebf95c122f74f1fc4cb1",
+                    "nonce" : "0xc424516f279755b7",
                     "number" : "0x01",
                     "parentHash" : "0x17f885716e9dd802a11393bfd3c35662c72d3eee36f2ec9da187ccd02a87753c",
                     "receiptTrie" : "0x5c927ce0f774e6abe45db03563c7977b220ec5b7f67a04b9ac97060d888fa831",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca017f885716e9dd802a11393bfd3c35662c72d3eee36f2ec9da187ccd02a87753ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a6a07f7a73a7dd3ef3bbc7cef7f8b5dcbab265c912a5688fef53f1fe4f20ff38a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa05c927ce0f774e6abe45db03563c7977b220ec5b7f67a04b9ac97060d888fa831b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252998203e880a017b13b53ddbb5cc4de3ccc460cef8a075364cca2d36e1f000bcf9f1c8af1e5f488e61e554aa506628af865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca017f885716e9dd802a11393bfd3c35662c72d3eee36f2ec9da187ccd02a87753ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a6a07f7a73a7dd3ef3bbc7cef7f8b5dcbab265c912a5688fef53f1fe4f20ff38a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa05c927ce0f774e6abe45db03563c7977b220ec5b7f67a04b9ac97060d888fa831b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252998203e880a0241bcfa90bf3c112aa4ebe20673baaf492fbe2041e22ebf95c122f74f1fc4cb188c424516f279755b7f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a7d0bfc5b286e72f11da6f93641b8726a3a6bb20ce2e6832cf77ea8796debdf7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1bf8761166dd4e29b31a16fdb1ff4d3020236258445ea82737aa18a1fd4eecbe",
+        "lastblockhash" : "0x01b6deb9c9aaa318f0d6eca635a1ca32c4f18d514c03e0eccda02486f33cbddc",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest91BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest91BC.json
index b5a911afa..64d8547c4 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest91BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest91BC.json
@@ -2,8 +2,8 @@
     "randomStatetest91BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest91BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest91BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xaf7b",
-                    "hash" : "0xb241ce859665c2e46fd65fb19f09836ed6162b02e3feb0d3cf221153d268779c",
-                    "mixHash" : "0x7a7c3f0d102cf38165b7118058d747246219af243b83b4f65827bf1c25e127a8",
-                    "nonce" : "0x777f76ebc4e83841",
+                    "hash" : "0x05ccf4a08e2aef92a07070cf47ac6361d202f23a39cdf64c9a4bb90cefe42428",
+                    "mixHash" : "0x43d9acf7e82c87075bd8ccea304a31f727f65538bc3d52bf552cfe7e8ea34a33",
+                    "nonce" : "0x6a97a40185ae93c9",
                     "number" : "0x01",
                     "parentHash" : "0xc6d2eb7d48055d6088b426ea4ac2e0fd80b1c351ab9b7dc87c4981e4c376e708",
                     "receiptTrie" : "0x2d656cd39b2bf343a124e9474a31dafb414e1ff7a5b6064140f605ddfc755681",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xa1a8c9005086046d31b492d556a1dca992deb348022aec36b92539d0dce3ef95",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca0c6d2eb7d48055d6088b426ea4ac2e0fd80b1c351ab9b7dc87c4981e4c376e708a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0bd7c4a0590d749322fda72fbea3c6afe431ab371704f3cbdc80112e6f5a91036a0a1a8c9005086046d31b492d556a1dca992deb348022aec36b92539d0dce3ef95a02d656cd39b2bf343a124e9474a31dafb414e1ff7a5b6064140f605ddfc755681b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82af7b8203e880a07a7c3f0d102cf38165b7118058d747246219af243b83b4f65827bf1c25e127a888777f76ebc4e83841f90121f9011e8001845465b41894095e7baea6a6c7c4c2dfeb977efac326af552d87847bcee261b8b87f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000001000000000000000000000000000000000000000045407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350447f00000000000000000000000100000000000000000000000000000000000000006f8b0b688d7b410a45178f6f956454f31ca06129e9da7bb7c03bac1b1db26c907b3a18ec336f607be4b9c5cb3090ab51bce1a023d59dccdc8a9b2551f5c375db36e0985076d68f468d01338c8be9a67dd1a907c0",
+                "rlp" : "0xf90324f901fca0c6d2eb7d48055d6088b426ea4ac2e0fd80b1c351ab9b7dc87c4981e4c376e708a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0bd7c4a0590d749322fda72fbea3c6afe431ab371704f3cbdc80112e6f5a91036a0a1a8c9005086046d31b492d556a1dca992deb348022aec36b92539d0dce3ef95a02d656cd39b2bf343a124e9474a31dafb414e1ff7a5b6064140f605ddfc755681b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82af7b8203e880a043d9acf7e82c87075bd8ccea304a31f727f65538bc3d52bf552cfe7e8ea34a33886a97a40185ae93c9f90121f9011e8001845465b41894095e7baea6a6c7c4c2dfeb977efac326af552d87847bcee261b8b87f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000001000000000000000000000000000000000000000045407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350447f00000000000000000000000100000000000000000000000000000000000000006f8b0b688d7b410a45178f6f956454f31ca06129e9da7bb7c03bac1b1db26c907b3a18ec336f607be4b9c5cb3090ab51bce1a023d59dccdc8a9b2551f5c375db36e0985076d68f468d01338c8be9a67dd1a907c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000001000000000000000000000000000000000000000045407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350447f00000000000000000000000100000000000000000000000000000000000000006f8b0b688d7b410a45178f6f956454f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f5fb4160482fb04f85616efdcc018ea0c75cf9e2cf8b846489edc1776670b8aaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb241ce859665c2e46fd65fb19f09836ed6162b02e3feb0d3cf221153d268779c",
+        "lastblockhash" : "0x05ccf4a08e2aef92a07070cf47ac6361d202f23a39cdf64c9a4bb90cefe42428",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest91BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest91BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest91BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xb287",
-                    "hash" : "0x6c7fd1641dae040b9d5e0627ffcdaba251270fbfc9d2b3c0d779e594c975433a",
-                    "mixHash" : "0x0480d35b043a072c1188871fedd3fc8ae4911b83edf499d695d58a9d7b63d9fd",
-                    "nonce" : "0xaa6386ce5f61bf2b",
+                    "hash" : "0xb1fdce14ba94ecf73f3ea7eafc8d981013369eabe86b73da1a8407c2dd3386f7",
+                    "mixHash" : "0x57059f5036ab14016ad6a52ba09c7bd435c4269c69632ef532dd3bc7ed86876a",
+                    "nonce" : "0x9c7363f804edc302",
                     "number" : "0x01",
                     "parentHash" : "0xc6d2eb7d48055d6088b426ea4ac2e0fd80b1c351ab9b7dc87c4981e4c376e708",
                     "receiptTrie" : "0xab4cb03145c4c901d6edb52cb86aa6795b5f057eced1c2c9ee556c5c3faf1ed7",
-                    "stateRoot" : "0x8ad4c7f571606d29af891fd96c9022a8c7c896cca17776ba15c0d5cdb56c3062",
+                    "stateRoot" : "0xe78b95eb3c15a30863eb2dc387f60871725bebe03ebef80923fc607c6a9e2efe",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa1a8c9005086046d31b492d556a1dca992deb348022aec36b92539d0dce3ef95",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca0c6d2eb7d48055d6088b426ea4ac2e0fd80b1c351ab9b7dc87c4981e4c376e708a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08ad4c7f571606d29af891fd96c9022a8c7c896cca17776ba15c0d5cdb56c3062a0a1a8c9005086046d31b492d556a1dca992deb348022aec36b92539d0dce3ef95a0ab4cb03145c4c901d6edb52cb86aa6795b5f057eced1c2c9ee556c5c3faf1ed7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b2878203e880a00480d35b043a072c1188871fedd3fc8ae4911b83edf499d695d58a9d7b63d9fd88aa6386ce5f61bf2bf90121f9011e8001845465b41894095e7baea6a6c7c4c2dfeb977efac326af552d87847bcee261b8b87f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000001000000000000000000000000000000000000000045407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350447f00000000000000000000000100000000000000000000000000000000000000006f8b0b688d7b410a45178f6f956454f31ca06129e9da7bb7c03bac1b1db26c907b3a18ec336f607be4b9c5cb3090ab51bce1a023d59dccdc8a9b2551f5c375db36e0985076d68f468d01338c8be9a67dd1a907c0",
+                "rlp" : "0xf90324f901fca0c6d2eb7d48055d6088b426ea4ac2e0fd80b1c351ab9b7dc87c4981e4c376e708a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e78b95eb3c15a30863eb2dc387f60871725bebe03ebef80923fc607c6a9e2efea0a1a8c9005086046d31b492d556a1dca992deb348022aec36b92539d0dce3ef95a0ab4cb03145c4c901d6edb52cb86aa6795b5f057eced1c2c9ee556c5c3faf1ed7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82b2878203e880a057059f5036ab14016ad6a52ba09c7bd435c4269c69632ef532dd3bc7ed86876a889c7363f804edc302f90121f9011e8001845465b41894095e7baea6a6c7c4c2dfeb977efac326af552d87847bcee261b8b87f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000001000000000000000000000000000000000000000045407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350447f00000000000000000000000100000000000000000000000000000000000000006f8b0b688d7b410a45178f6f956454f31ca06129e9da7bb7c03bac1b1db26c907b3a18ec336f607be4b9c5cb3090ab51bce1a023d59dccdc8a9b2551f5c375db36e0985076d68f468d01338c8be9a67dd1a907c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000001000000000000000000000000000000000000000045407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350447f00000000000000000000000100000000000000000000000000000000000000006f8b0b688d7b410a45178f6f956454f3",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f5fb4160482fb04f85616efdcc018ea0c75cf9e2cf8b846489edc1776670b8aaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6c7fd1641dae040b9d5e0627ffcdaba251270fbfc9d2b3c0d779e594c975433a",
+        "lastblockhash" : "0xb1fdce14ba94ecf73f3ea7eafc8d981013369eabe86b73da1a8407c2dd3386f7",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x7bcee261",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000001000000000000000000000000000000000000000045407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350447f00000000000000000000000100000000000000000000000000000000000000006f8b0b688d7b410a45178f6f956454f35560005155",
@@ -235,8 +228,8 @@
     "randomStatetest91BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest91BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest91BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xaf7b",
-                    "hash" : "0xc9e1ace3071d6e8354a52e1956bcfd0416c2a81a8518216e10f990b6db64977b",
-                    "mixHash" : "0x9af3d58eee86031b09a55de264236fc67f38767c56d74a96674a987c9d26d871",
-                    "nonce" : "0xac8c47df6341fa8c",
+                    "hash" : "0xac7eb3ad1121946b6a888060128de6c118a17c9a2b241e25543b7db8b5dbb3b8",
+                    "mixHash" : "0x51bcbec0fcaeed2b0350ad57ce77f867e8c2ae314aff7f0e7fe72150259b5044",
+                    "nonce" : "0x510c81d70cfe58d9",
                     "number" : "0x01",
                     "parentHash" : "0xc6d2eb7d48055d6088b426ea4ac2e0fd80b1c351ab9b7dc87c4981e4c376e708",
                     "receiptTrie" : "0xef70972b56e2ca8baed6aa0b6af1b7d4ed93cea05ddb0af4359be433993e04cc",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0xa1a8c9005086046d31b492d556a1dca992deb348022aec36b92539d0dce3ef95",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca0c6d2eb7d48055d6088b426ea4ac2e0fd80b1c351ab9b7dc87c4981e4c376e708a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c1014ccc60abba7b6dde061c3d2b6fb94456ec208f14299db9114c215cf63f4aa0a1a8c9005086046d31b492d556a1dca992deb348022aec36b92539d0dce3ef95a0ef70972b56e2ca8baed6aa0b6af1b7d4ed93cea05ddb0af4359be433993e04ccb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82af7b8203e880a09af3d58eee86031b09a55de264236fc67f38767c56d74a96674a987c9d26d87188ac8c47df6341fa8cf90121f9011e8001845465b41894095e7baea6a6c7c4c2dfeb977efac326af552d87847bcee261b8b87f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000001000000000000000000000000000000000000000045407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350447f00000000000000000000000100000000000000000000000000000000000000006f8b0b688d7b410a45178f6f956454f31ca06129e9da7bb7c03bac1b1db26c907b3a18ec336f607be4b9c5cb3090ab51bce1a023d59dccdc8a9b2551f5c375db36e0985076d68f468d01338c8be9a67dd1a907c0",
+                "rlp" : "0xf90324f901fca0c6d2eb7d48055d6088b426ea4ac2e0fd80b1c351ab9b7dc87c4981e4c376e708a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c1014ccc60abba7b6dde061c3d2b6fb94456ec208f14299db9114c215cf63f4aa0a1a8c9005086046d31b492d556a1dca992deb348022aec36b92539d0dce3ef95a0ef70972b56e2ca8baed6aa0b6af1b7d4ed93cea05ddb0af4359be433993e04ccb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82af7b8203e880a051bcbec0fcaeed2b0350ad57ce77f867e8c2ae314aff7f0e7fe72150259b504488510c81d70cfe58d9f90121f9011e8001845465b41894095e7baea6a6c7c4c2dfeb977efac326af552d87847bcee261b8b87f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000001000000000000000000000000000000000000000045407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350447f00000000000000000000000100000000000000000000000000000000000000006f8b0b688d7b410a45178f6f956454f31ca06129e9da7bb7c03bac1b1db26c907b3a18ec336f607be4b9c5cb3090ab51bce1a023d59dccdc8a9b2551f5c375db36e0985076d68f468d01338c8be9a67dd1a907c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000001000000000000000000000000000000000000000045407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350447f00000000000000000000000100000000000000000000000000000000000000006f8b0b688d7b410a45178f6f956454f3",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f5fb4160482fb04f85616efdcc018ea0c75cf9e2cf8b846489edc1776670b8aaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc9e1ace3071d6e8354a52e1956bcfd0416c2a81a8518216e10f990b6db64977b",
+        "lastblockhash" : "0xac7eb3ad1121946b6a888060128de6c118a17c9a2b241e25543b7db8b5dbb3b8",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest91BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest91BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest91BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xaf7b",
-                    "hash" : "0xffc7b505166ddfc30b361a3904adfd2d1de7ae32201f762e092282a601723da3",
-                    "mixHash" : "0x1d51d4b093595932076adc5e9197c72a7deb1adc77cebab90f58862894874a0e",
-                    "nonce" : "0x3ecefce109dfe8d3",
+                    "hash" : "0x0820e814758f7c6a3d5eb880fa009af721aeb3d0fe75c8d4742bae610413d311",
+                    "mixHash" : "0x24607a9ab11d4fbf3bb94d64439a645d8fe8b25a2599b1a9026b06d5d4e1a9ef",
+                    "nonce" : "0x407f5ca12a2ac11f",
                     "number" : "0x01",
                     "parentHash" : "0xc6d2eb7d48055d6088b426ea4ac2e0fd80b1c351ab9b7dc87c4981e4c376e708",
                     "receiptTrie" : "0xef70972b56e2ca8baed6aa0b6af1b7d4ed93cea05ddb0af4359be433993e04cc",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0xa1a8c9005086046d31b492d556a1dca992deb348022aec36b92539d0dce3ef95",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca0c6d2eb7d48055d6088b426ea4ac2e0fd80b1c351ab9b7dc87c4981e4c376e708a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c1014ccc60abba7b6dde061c3d2b6fb94456ec208f14299db9114c215cf63f4aa0a1a8c9005086046d31b492d556a1dca992deb348022aec36b92539d0dce3ef95a0ef70972b56e2ca8baed6aa0b6af1b7d4ed93cea05ddb0af4359be433993e04ccb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82af7b8203e880a01d51d4b093595932076adc5e9197c72a7deb1adc77cebab90f58862894874a0e883ecefce109dfe8d3f90121f9011e8001845465b41894095e7baea6a6c7c4c2dfeb977efac326af552d87847bcee261b8b87f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000001000000000000000000000000000000000000000045407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350447f00000000000000000000000100000000000000000000000000000000000000006f8b0b688d7b410a45178f6f956454f31ca06129e9da7bb7c03bac1b1db26c907b3a18ec336f607be4b9c5cb3090ab51bce1a023d59dccdc8a9b2551f5c375db36e0985076d68f468d01338c8be9a67dd1a907c0",
+                "rlp" : "0xf90324f901fca0c6d2eb7d48055d6088b426ea4ac2e0fd80b1c351ab9b7dc87c4981e4c376e708a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c1014ccc60abba7b6dde061c3d2b6fb94456ec208f14299db9114c215cf63f4aa0a1a8c9005086046d31b492d556a1dca992deb348022aec36b92539d0dce3ef95a0ef70972b56e2ca8baed6aa0b6af1b7d4ed93cea05ddb0af4359be433993e04ccb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82af7b8203e880a024607a9ab11d4fbf3bb94d64439a645d8fe8b25a2599b1a9026b06d5d4e1a9ef88407f5ca12a2ac11ff90121f9011e8001845465b41894095e7baea6a6c7c4c2dfeb977efac326af552d87847bcee261b8b87f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000001000000000000000000000000000000000000000045407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350447f00000000000000000000000100000000000000000000000000000000000000006f8b0b688d7b410a45178f6f956454f31ca06129e9da7bb7c03bac1b1db26c907b3a18ec336f607be4b9c5cb3090ab51bce1a023d59dccdc8a9b2551f5c375db36e0985076d68f468d01338c8be9a67dd1a907c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000001000000000000000000000000000000000000000045407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350447f00000000000000000000000100000000000000000000000000000000000000006f8b0b688d7b410a45178f6f956454f3",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f5fb4160482fb04f85616efdcc018ea0c75cf9e2cf8b846489edc1776670b8aaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xffc7b505166ddfc30b361a3904adfd2d1de7ae32201f762e092282a601723da3",
+        "lastblockhash" : "0x0820e814758f7c6a3d5eb880fa009af721aeb3d0fe75c8d4742bae610413d311",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest91BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest91BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest91BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xaf7b",
-                    "hash" : "0xa1365f0c62468c035b07a2734f48e9be5b4f9010259ddc14016053921b3eb2c9",
-                    "mixHash" : "0x09c794399ace7bcd6c0658fc6c9cc9a88726b1aad4d8313ccda411cf4e201001",
-                    "nonce" : "0x9971a59d97425b22",
+                    "hash" : "0x7dd31faaeb0991dda16a695f875df0f41b8e8605c7950da481d20043c4af465c",
+                    "mixHash" : "0x49ccd35f342c42d1fd32f894e37ab687c7bacef72daf179bb4854a795354ed6b",
+                    "nonce" : "0x12c51517be9ab227",
                     "number" : "0x01",
                     "parentHash" : "0xc6d2eb7d48055d6088b426ea4ac2e0fd80b1c351ab9b7dc87c4981e4c376e708",
                     "receiptTrie" : "0xef70972b56e2ca8baed6aa0b6af1b7d4ed93cea05ddb0af4359be433993e04cc",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0xa1a8c9005086046d31b492d556a1dca992deb348022aec36b92539d0dce3ef95",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca0c6d2eb7d48055d6088b426ea4ac2e0fd80b1c351ab9b7dc87c4981e4c376e708a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c1014ccc60abba7b6dde061c3d2b6fb94456ec208f14299db9114c215cf63f4aa0a1a8c9005086046d31b492d556a1dca992deb348022aec36b92539d0dce3ef95a0ef70972b56e2ca8baed6aa0b6af1b7d4ed93cea05ddb0af4359be433993e04ccb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82af7b8203e880a009c794399ace7bcd6c0658fc6c9cc9a88726b1aad4d8313ccda411cf4e201001889971a59d97425b22f90121f9011e8001845465b41894095e7baea6a6c7c4c2dfeb977efac326af552d87847bcee261b8b87f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000001000000000000000000000000000000000000000045407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350447f00000000000000000000000100000000000000000000000000000000000000006f8b0b688d7b410a45178f6f956454f31ca06129e9da7bb7c03bac1b1db26c907b3a18ec336f607be4b9c5cb3090ab51bce1a023d59dccdc8a9b2551f5c375db36e0985076d68f468d01338c8be9a67dd1a907c0",
+                "rlp" : "0xf90324f901fca0c6d2eb7d48055d6088b426ea4ac2e0fd80b1c351ab9b7dc87c4981e4c376e708a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c1014ccc60abba7b6dde061c3d2b6fb94456ec208f14299db9114c215cf63f4aa0a1a8c9005086046d31b492d556a1dca992deb348022aec36b92539d0dce3ef95a0ef70972b56e2ca8baed6aa0b6af1b7d4ed93cea05ddb0af4359be433993e04ccb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82af7b8203e880a049ccd35f342c42d1fd32f894e37ab687c7bacef72daf179bb4854a795354ed6b8812c51517be9ab227f90121f9011e8001845465b41894095e7baea6a6c7c4c2dfeb977efac326af552d87847bcee261b8b87f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000001000000000000000000000000000000000000000045407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350447f00000000000000000000000100000000000000000000000000000000000000006f8b0b688d7b410a45178f6f956454f31ca06129e9da7bb7c03bac1b1db26c907b3a18ec336f607be4b9c5cb3090ab51bce1a023d59dccdc8a9b2551f5c375db36e0985076d68f468d01338c8be9a67dd1a907c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000001000000000000000000000000000000000000000045407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350447f00000000000000000000000100000000000000000000000000000000000000006f8b0b688d7b410a45178f6f956454f3",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f5fb4160482fb04f85616efdcc018ea0c75cf9e2cf8b846489edc1776670b8aaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa1365f0c62468c035b07a2734f48e9be5b4f9010259ddc14016053921b3eb2c9",
+        "lastblockhash" : "0x7dd31faaeb0991dda16a695f875df0f41b8e8605c7950da481d20043c4af465c",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest91BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest91BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest91BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xaf7b",
-                    "hash" : "0xcacd9c809739609b6525f0c89772b04874e95b3d8f40f9e980b7e3cdccd42e63",
-                    "mixHash" : "0x149603a7407b2f9d575102c63976d540111e87c38f6ba4f7634aaf8e86095e71",
-                    "nonce" : "0xd355cc1845a0cc74",
+                    "hash" : "0xb0257b317dff68010cb4cfb03a3611a91f03d289df2654c4e156eedae886a266",
+                    "mixHash" : "0xa23dd9651e1c9e2fc2c8c03a0890ad8c7ad39e03ace89feac02a5d723d349de1",
+                    "nonce" : "0xbdeb571a79afe4fb",
                     "number" : "0x01",
                     "parentHash" : "0xc6d2eb7d48055d6088b426ea4ac2e0fd80b1c351ab9b7dc87c4981e4c376e708",
                     "receiptTrie" : "0xef70972b56e2ca8baed6aa0b6af1b7d4ed93cea05ddb0af4359be433993e04cc",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0xa1a8c9005086046d31b492d556a1dca992deb348022aec36b92539d0dce3ef95",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90324f901fca0c6d2eb7d48055d6088b426ea4ac2e0fd80b1c351ab9b7dc87c4981e4c376e708a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c1014ccc60abba7b6dde061c3d2b6fb94456ec208f14299db9114c215cf63f4aa0a1a8c9005086046d31b492d556a1dca992deb348022aec36b92539d0dce3ef95a0ef70972b56e2ca8baed6aa0b6af1b7d4ed93cea05ddb0af4359be433993e04ccb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82af7b8203e880a0149603a7407b2f9d575102c63976d540111e87c38f6ba4f7634aaf8e86095e7188d355cc1845a0cc74f90121f9011e8001845465b41894095e7baea6a6c7c4c2dfeb977efac326af552d87847bcee261b8b87f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000001000000000000000000000000000000000000000045407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350447f00000000000000000000000100000000000000000000000000000000000000006f8b0b688d7b410a45178f6f956454f31ca06129e9da7bb7c03bac1b1db26c907b3a18ec336f607be4b9c5cb3090ab51bce1a023d59dccdc8a9b2551f5c375db36e0985076d68f468d01338c8be9a67dd1a907c0",
+                "rlp" : "0xf90324f901fca0c6d2eb7d48055d6088b426ea4ac2e0fd80b1c351ab9b7dc87c4981e4c376e708a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c1014ccc60abba7b6dde061c3d2b6fb94456ec208f14299db9114c215cf63f4aa0a1a8c9005086046d31b492d556a1dca992deb348022aec36b92539d0dce3ef95a0ef70972b56e2ca8baed6aa0b6af1b7d4ed93cea05ddb0af4359be433993e04ccb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82af7b8203e880a0a23dd9651e1c9e2fc2c8c03a0890ad8c7ad39e03ace89feac02a5d723d349de188bdeb571a79afe4fbf90121f9011e8001845465b41894095e7baea6a6c7c4c2dfeb977efac326af552d87847bcee261b8b87f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000001000000000000000000000000000000000000000045407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350447f00000000000000000000000100000000000000000000000000000000000000006f8b0b688d7b410a45178f6f956454f31ca06129e9da7bb7c03bac1b1db26c907b3a18ec336f607be4b9c5cb3090ab51bce1a023d59dccdc8a9b2551f5c375db36e0985076d68f468d01338c8be9a67dd1a907c0",
                 "transactions" : [
                     {
                         "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000001000000000000000000000000000000000000000045407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350447f00000000000000000000000100000000000000000000000000000000000000006f8b0b688d7b410a45178f6f956454f3",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f5fb4160482fb04f85616efdcc018ea0c75cf9e2cf8b846489edc1776670b8aaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcacd9c809739609b6525f0c89772b04874e95b3d8f40f9e980b7e3cdccd42e63",
+        "lastblockhash" : "0xb0257b317dff68010cb4cfb03a3611a91f03d289df2654c4e156eedae886a266",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest93BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest93BC.json
index 5909ad936..fb3561d8a 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest93BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest93BC.json
@@ -2,8 +2,8 @@
     "randomStatetest93BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest93BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest93BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5283",
-                    "hash" : "0xa731c4ebee60b740b90838f7156b11f6f68eb8973a0bcb16c4cb9fe6cf71e0f1",
-                    "mixHash" : "0x0c5dc257e18bb3bae4a844d4d6da50e2d3ea397f16a25b6f9946c4368337f5d5",
-                    "nonce" : "0x48bce81d9d238963",
+                    "hash" : "0x57b164eeb1670e7ae4b0cc7cde0dc03aa6068a3350da4801677bf37f9fd37adb",
+                    "mixHash" : "0x012e9e504d2d1828538fea776d77d631d55308495a0df0d6dd1657ddd3e41cd3",
+                    "nonce" : "0xbd109c7a16f75f39",
                     "number" : "0x01",
                     "parentHash" : "0x633e792ca925dd0f4832b7c731e32bf22b3c4b03d53405ced8238a6fe3d2f1de",
                     "receiptTrie" : "0xe081f85f3da326d42a31d4e0142ced2d116948fdc6b61ad96d48f8081347819a",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0633e792ca925dd0f4832b7c731e32bf22b3c4b03d53405ced8238a6fe3d2f1dea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0903fb303b0db7898014ada2b9eaa1361766b87807fd822ec6c901d84bfd0a81ea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e081f85f3da326d42a31d4e0142ced2d116948fdc6b61ad96d48f8081347819ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252838203e880a00c5dc257e18bb3bae4a844d4d6da50e2d3ea397f16a25b6f9946c4368337f5d58848bce81d9d238963f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0633e792ca925dd0f4832b7c731e32bf22b3c4b03d53405ced8238a6fe3d2f1dea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0903fb303b0db7898014ada2b9eaa1361766b87807fd822ec6c901d84bfd0a81ea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e081f85f3da326d42a31d4e0142ced2d116948fdc6b61ad96d48f8081347819ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252838203e880a0012e9e504d2d1828538fea776d77d631d55308495a0df0d6dd1657ddd3e41cd388bd109c7a16f75f39f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09e3bd2642ad5f31acf4a60500928446c0ff46b0d4f143bfe47dcc58702e1b902a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa731c4ebee60b740b90838f7156b11f6f68eb8973a0bcb16c4cb9fe6cf71e0f1",
+        "lastblockhash" : "0x57b164eeb1670e7ae4b0cc7cde0dc03aa6068a3350da4801677bf37f9fd37adb",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -114,8 +114,8 @@
     "randomStatetest93BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest93BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest93BCFiller.json"
         },
         "blocks" : [
             {
@@ -126,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x589b",
-                    "hash" : "0x18fffb75b64b345fd2a12747d1691b340ecc89c0e47f7cc6a2b3fd319eaa6987",
-                    "mixHash" : "0xe91ae046903a67204455308647d4b8d9d7ffd01f0645d4ee2dadffa30ab36c26",
-                    "nonce" : "0x831a32dc826b5f38",
+                    "hash" : "0xd7f8c65760063b1e11435064579655533fea6602c5fd848bfd3f52f1da130988",
+                    "mixHash" : "0xc2e689f84236cc6871c9cb6860d09944d43e6608e454fd466e56c83cb6e728d6",
+                    "nonce" : "0xd1ecc8906cd40310",
                     "number" : "0x01",
                     "parentHash" : "0x633e792ca925dd0f4832b7c731e32bf22b3c4b03d53405ced8238a6fe3d2f1de",
                     "receiptTrie" : "0x5dd555e7146cff22d08c22c322ce3f7e7b30e28bf1f360ae251de03266818ec9",
-                    "stateRoot" : "0x1c0bb0fa3e4ec63a71acddc77f6ba543304a440b01e744ee90dd085e5f97ce65",
+                    "stateRoot" : "0x9f54b9933e1d71bd6cf68167343fa0978132630c3a3c54a1a6ea57a742313566",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0633e792ca925dd0f4832b7c731e32bf22b3c4b03d53405ced8238a6fe3d2f1dea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01c0bb0fa3e4ec63a71acddc77f6ba543304a440b01e744ee90dd085e5f97ce65a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa05dd555e7146cff22d08c22c322ce3f7e7b30e28bf1f360ae251de03266818ec9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82589b8203e880a0e91ae046903a67204455308647d4b8d9d7ffd01f0645d4ee2dadffa30ab36c2688831a32dc826b5f38f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0633e792ca925dd0f4832b7c731e32bf22b3c4b03d53405ced8238a6fe3d2f1dea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09f54b9933e1d71bd6cf68167343fa0978132630c3a3c54a1a6ea57a742313566a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa05dd555e7146cff22d08c22c322ce3f7e7b30e28bf1f360ae251de03266818ec9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82589b8203e880a0c2e689f84236cc6871c9cb6860d09944d43e6608e454fd466e56c83cb6e728d688d1ecc8906cd40310f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -174,16 +174,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09e3bd2642ad5f31acf4a60500928446c0ff46b0d4f143bfe47dcc58702e1b902a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x18fffb75b64b345fd2a12747d1691b340ecc89c0e47f7cc6a2b3fd319eaa6987",
+        "lastblockhash" : "0xd7f8c65760063b1e11435064579655533fea6602c5fd848bfd3f52f1da130988",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x44404340434136437b0703709768f36855",
@@ -233,8 +226,8 @@
     "randomStatetest93BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest93BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest93BCFiller.json"
         },
         "blocks" : [
             {
@@ -245,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5283",
-                    "hash" : "0x3861c27dbf4b67f416a64f3b9df9c9a6cb3e7aed0c48210cd50e52a8538713ed",
-                    "mixHash" : "0x44a249f0ac79643687e9b917f9ed2409e0a88152cd267058639abd8b6952d9e2",
-                    "nonce" : "0x34a552c484f0344d",
+                    "hash" : "0xdb42524910f05948a65129042bdc21c96e8ac7ea306a182aca8aae5853aff7e4",
+                    "mixHash" : "0x8503eb9554f8ecd4a9f47cf2ec2631064c7b53742f4c32334f60b66e32a697c6",
+                    "nonce" : "0x03d4f3442c01b94f",
                     "number" : "0x01",
                     "parentHash" : "0x633e792ca925dd0f4832b7c731e32bf22b3c4b03d53405ced8238a6fe3d2f1de",
                     "receiptTrie" : "0xeaaf10059ad50534cff6c2496f4a67716b4ab1cf43e3f8de979bf6503f5391a6",
@@ -256,7 +249,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0633e792ca925dd0f4832b7c731e32bf22b3c4b03d53405ced8238a6fe3d2f1dea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f3cde26e26facfa1f7ebb3b5b100bee383f687de3ddc4f694127fd6a2429555ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0eaaf10059ad50534cff6c2496f4a67716b4ab1cf43e3f8de979bf6503f5391a6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252838203e880a044a249f0ac79643687e9b917f9ed2409e0a88152cd267058639abd8b6952d9e28834a552c484f0344df865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0633e792ca925dd0f4832b7c731e32bf22b3c4b03d53405ced8238a6fe3d2f1dea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f3cde26e26facfa1f7ebb3b5b100bee383f687de3ddc4f694127fd6a2429555ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0eaaf10059ad50534cff6c2496f4a67716b4ab1cf43e3f8de979bf6503f5391a6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252838203e880a08503eb9554f8ecd4a9f47cf2ec2631064c7b53742f4c32334f60b66e32a697c68803d4f3442c01b94ff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -293,7 +286,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09e3bd2642ad5f31acf4a60500928446c0ff46b0d4f143bfe47dcc58702e1b902a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3861c27dbf4b67f416a64f3b9df9c9a6cb3e7aed0c48210cd50e52a8538713ed",
+        "lastblockhash" : "0xdb42524910f05948a65129042bdc21c96e8ac7ea306a182aca8aae5853aff7e4",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -345,8 +338,8 @@
     "randomStatetest93BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest93BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest93BCFiller.json"
         },
         "blocks" : [
             {
@@ -357,9 +350,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5283",
-                    "hash" : "0x3d8aaf3973f7472446cbd1787d87ed782207771655c8a73d8c6e5303aa7c0b75",
-                    "mixHash" : "0x175de920e0490d07aa5d5460975a38e8f834a50414162b213d99b8728e03bf0f",
-                    "nonce" : "0xde69c3dd83f0014d",
+                    "hash" : "0xd46e87d3144f40390a58dccb1c29bab78cbf008d39a5d8edc9e78d57f0d94418",
+                    "mixHash" : "0xaaee9d7ffb0d0b4231230f88c0a13a9770487d67f6aa64feffd2e166cbbd802a",
+                    "nonce" : "0xca9fc4159821386b",
                     "number" : "0x01",
                     "parentHash" : "0x633e792ca925dd0f4832b7c731e32bf22b3c4b03d53405ced8238a6fe3d2f1de",
                     "receiptTrie" : "0xeaaf10059ad50534cff6c2496f4a67716b4ab1cf43e3f8de979bf6503f5391a6",
@@ -368,7 +361,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0633e792ca925dd0f4832b7c731e32bf22b3c4b03d53405ced8238a6fe3d2f1dea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f3cde26e26facfa1f7ebb3b5b100bee383f687de3ddc4f694127fd6a2429555ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0eaaf10059ad50534cff6c2496f4a67716b4ab1cf43e3f8de979bf6503f5391a6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252838203e880a0175de920e0490d07aa5d5460975a38e8f834a50414162b213d99b8728e03bf0f88de69c3dd83f0014df865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0633e792ca925dd0f4832b7c731e32bf22b3c4b03d53405ced8238a6fe3d2f1dea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f3cde26e26facfa1f7ebb3b5b100bee383f687de3ddc4f694127fd6a2429555ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0eaaf10059ad50534cff6c2496f4a67716b4ab1cf43e3f8de979bf6503f5391a6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252838203e880a0aaee9d7ffb0d0b4231230f88c0a13a9770487d67f6aa64feffd2e166cbbd802a88ca9fc4159821386bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -405,7 +398,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09e3bd2642ad5f31acf4a60500928446c0ff46b0d4f143bfe47dcc58702e1b902a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3d8aaf3973f7472446cbd1787d87ed782207771655c8a73d8c6e5303aa7c0b75",
+        "lastblockhash" : "0xd46e87d3144f40390a58dccb1c29bab78cbf008d39a5d8edc9e78d57f0d94418",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -457,8 +450,8 @@
     "randomStatetest93BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest93BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest93BCFiller.json"
         },
         "blocks" : [
             {
@@ -469,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5283",
-                    "hash" : "0xf431cd1dad25a58b5061ee6613c81c9204b8d09c752fa0aa9e87537535ac13ac",
-                    "mixHash" : "0x6e96136327bc6cf06f3bbed4956816cc18cffd3c77218eab6a4d95f275017162",
-                    "nonce" : "0xaec78bc165c4fa82",
+                    "hash" : "0xc4a5d0f18da7637f9234f4bc14fee0fe86abb043a9e732dfd072283357efb595",
+                    "mixHash" : "0xee1bbbd95bbf14b14350e98fd4437048b56b785ba2111335f0ae83628601c4c9",
+                    "nonce" : "0x47b5c7393d03bef2",
                     "number" : "0x01",
                     "parentHash" : "0x633e792ca925dd0f4832b7c731e32bf22b3c4b03d53405ced8238a6fe3d2f1de",
                     "receiptTrie" : "0xeaaf10059ad50534cff6c2496f4a67716b4ab1cf43e3f8de979bf6503f5391a6",
@@ -480,7 +473,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0633e792ca925dd0f4832b7c731e32bf22b3c4b03d53405ced8238a6fe3d2f1dea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f3cde26e26facfa1f7ebb3b5b100bee383f687de3ddc4f694127fd6a2429555ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0eaaf10059ad50534cff6c2496f4a67716b4ab1cf43e3f8de979bf6503f5391a6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252838203e880a06e96136327bc6cf06f3bbed4956816cc18cffd3c77218eab6a4d95f27501716288aec78bc165c4fa82f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0633e792ca925dd0f4832b7c731e32bf22b3c4b03d53405ced8238a6fe3d2f1dea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f3cde26e26facfa1f7ebb3b5b100bee383f687de3ddc4f694127fd6a2429555ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0eaaf10059ad50534cff6c2496f4a67716b4ab1cf43e3f8de979bf6503f5391a6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252838203e880a0ee1bbbd95bbf14b14350e98fd4437048b56b785ba2111335f0ae83628601c4c98847b5c7393d03bef2f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -517,7 +510,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09e3bd2642ad5f31acf4a60500928446c0ff46b0d4f143bfe47dcc58702e1b902a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf431cd1dad25a58b5061ee6613c81c9204b8d09c752fa0aa9e87537535ac13ac",
+        "lastblockhash" : "0xc4a5d0f18da7637f9234f4bc14fee0fe86abb043a9e732dfd072283357efb595",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -569,8 +562,8 @@
     "randomStatetest93BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6d07823d.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest93BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest93BCFiller.json"
         },
         "blocks" : [
             {
@@ -581,9 +574,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5283",
-                    "hash" : "0xe4a3db3541b42b7bf0f79e37a49094eef6a9eb6a9a34e2a63376b5f5daf9514a",
-                    "mixHash" : "0xc46881ffa471dbc60ead9aa3e66b88a949bd8f584fe38ea55ffe86af7edaada2",
-                    "nonce" : "0x7704abfddb9d24ee",
+                    "hash" : "0x71cbb651f0573cd08a6b7fe679f6e6ff66f9e675c7fb11efca27a794e0a7e72c",
+                    "mixHash" : "0x9d68f4b85f4d893067735c1f70e41c58ce1c13a2452439f4cf7bf8dca7eabe1d",
+                    "nonce" : "0x259b051b51de03b3",
                     "number" : "0x01",
                     "parentHash" : "0x633e792ca925dd0f4832b7c731e32bf22b3c4b03d53405ced8238a6fe3d2f1de",
                     "receiptTrie" : "0xeaaf10059ad50534cff6c2496f4a67716b4ab1cf43e3f8de979bf6503f5391a6",
@@ -592,7 +585,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0633e792ca925dd0f4832b7c731e32bf22b3c4b03d53405ced8238a6fe3d2f1dea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f3cde26e26facfa1f7ebb3b5b100bee383f687de3ddc4f694127fd6a2429555ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0eaaf10059ad50534cff6c2496f4a67716b4ab1cf43e3f8de979bf6503f5391a6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252838203e880a0c46881ffa471dbc60ead9aa3e66b88a949bd8f584fe38ea55ffe86af7edaada2887704abfddb9d24eef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0633e792ca925dd0f4832b7c731e32bf22b3c4b03d53405ced8238a6fe3d2f1dea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f3cde26e26facfa1f7ebb3b5b100bee383f687de3ddc4f694127fd6a2429555ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0eaaf10059ad50534cff6c2496f4a67716b4ab1cf43e3f8de979bf6503f5391a6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252838203e880a09d68f4b85f4d893067735c1f70e41c58ce1c13a2452439f4cf7bf8dca7eabe1d88259b051b51de03b3f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -629,7 +622,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09e3bd2642ad5f31acf4a60500928446c0ff46b0d4f143bfe47dcc58702e1b902a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe4a3db3541b42b7bf0f79e37a49094eef6a9eb6a9a34e2a63376b5f5daf9514a",
+        "lastblockhash" : "0x71cbb651f0573cd08a6b7fe679f6e6ff66f9e675c7fb11efca27a794e0a7e72c",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest99BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest99BC.json
index 6aa1b6e7f..0ce814cc7 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest99BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest99BC.json
@@ -2,8 +2,8 @@
     "randomStatetest99BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest99BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest99BCFiller.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xf610",
-                    "hash" : "0x1115a044b9ff6f09e5ef34db4fad14fb22623858c822f2d24f0d2647f28b37a5",
-                    "mixHash" : "0x684a374fb4d26e370cb0b9ce3521aa0eefdb5200ec0f259294cc517f0e398165",
-                    "nonce" : "0xeec0bc1747c3aaf1",
+                    "hash" : "0xc5dc4857cefe5f57f22c93b04ae8508de3600eb4fc42a08f47b9278973833d60",
+                    "mixHash" : "0xfc1e5a42ee568151f7f44f82b4e983fa33185c8b0e0be8398c158e31ac1024f6",
+                    "nonce" : "0x819dc150ede48d68",
                     "number" : "0x01",
                     "parentHash" : "0x49eb74899506219ae6a5bd3fe7aaf9a40cc00566a3e71fb87e30c51509ca1035",
                     "receiptTrie" : "0xba0ba1acde9c534f6edc37af5d0ba553d823f6967824c49cf107d770152abfb3",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x6b80fb606743393dc2636b129059815ebf225f30c1caf90c8d7239656648c0f7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90357f901fca049eb74899506219ae6a5bd3fe7aaf9a40cc00566a3e71fb87e30c51509ca1035a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ab16263d431a40701149046eb2c7fb54a0ff3dd88a063b969db6287fb1342e00a06b80fb606743393dc2636b129059815ebf225f30c1caf90c8d7239656648c0f7a0ba0ba1acde9c534f6edc37af5d0ba553d823f6967824c49cf107d770152abfb3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82f6108203e880a0684a374fb4d26e370cb0b9ce3521aa0eefdb5200ec0f259294cc517f0e39816588eec0bc1747c3aaf1f90154f901518001845ba848b794095e7baea6a6c7c4c2dfeb977efac326af552d87845887b108b8eb7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4039031ca07d9ee19e1cf9663eb45288d2eb725282cb1c7bde5f4a73cc8202e078e569502aa00e8c2fc0a85cbbd0bb51dae2823bd9e3fc75ef0622c97776611ff192599ee3b6c0",
+                "rlp" : "0xf90357f901fca049eb74899506219ae6a5bd3fe7aaf9a40cc00566a3e71fb87e30c51509ca1035a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ab16263d431a40701149046eb2c7fb54a0ff3dd88a063b969db6287fb1342e00a06b80fb606743393dc2636b129059815ebf225f30c1caf90c8d7239656648c0f7a0ba0ba1acde9c534f6edc37af5d0ba553d823f6967824c49cf107d770152abfb3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82f6108203e880a0fc1e5a42ee568151f7f44f82b4e983fa33185c8b0e0be8398c158e31ac1024f688819dc150ede48d68f90154f901518001845ba848b794095e7baea6a6c7c4c2dfeb977efac326af552d87845887b108b8eb7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4039031ca07d9ee19e1cf9663eb45288d2eb725282cb1c7bde5f4a73cc8202e078e569502aa00e8c2fc0a85cbbd0bb51dae2823bd9e3fc75ef0622c97776611ff192599ee3b6c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff403903",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a096d96f1bf2c05b4f99081d5f1f31b09b53ee4a8062c925a9a331b1920f01e2b2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1115a044b9ff6f09e5ef34db4fad14fb22623858c822f2d24f0d2647f28b37a5",
+        "lastblockhash" : "0xc5dc4857cefe5f57f22c93b04ae8508de3600eb4fc42a08f47b9278973833d60",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -115,8 +115,8 @@
     "randomStatetest99BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest99BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest99BCFiller.json"
         },
         "blocks" : [
             {
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xf91c",
-                    "hash" : "0x7869d75ade279f93a231a52515c495def2053c67e1ad0ac1131ff102308120ce",
-                    "mixHash" : "0xb483edfa24c155e888b4e6ffed91071d8f6d1d07eda856b1d46c0eebc4695935",
-                    "nonce" : "0x952da7380d1e8e84",
+                    "hash" : "0xa4d48dedc556acb4648468846389c38e425f59c244e465bfc3d83a24c3bb0e33",
+                    "mixHash" : "0xd8879e6c8fd84565ac86edf61fa9cd08f96728e624123bcd9558484ce79d4a1b",
+                    "nonce" : "0x1b6738d20828e0e8",
                     "number" : "0x01",
                     "parentHash" : "0x49eb74899506219ae6a5bd3fe7aaf9a40cc00566a3e71fb87e30c51509ca1035",
                     "receiptTrie" : "0x02c8f02e7d5fe718cb9c7e1f1e2b507c262e09843b3768e853b99027c0d47c74",
-                    "stateRoot" : "0xefd19da9035e60407a4252cdfc1a89fd141c15c015e71c5fbcfffa625c0c8e1a",
+                    "stateRoot" : "0x3343640f956b50c5a45a4a00926797eaa622ff5e5b34a30783b5c525d32defbe",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6b80fb606743393dc2636b129059815ebf225f30c1caf90c8d7239656648c0f7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90357f901fca049eb74899506219ae6a5bd3fe7aaf9a40cc00566a3e71fb87e30c51509ca1035a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0efd19da9035e60407a4252cdfc1a89fd141c15c015e71c5fbcfffa625c0c8e1aa06b80fb606743393dc2636b129059815ebf225f30c1caf90c8d7239656648c0f7a002c8f02e7d5fe718cb9c7e1f1e2b507c262e09843b3768e853b99027c0d47c74b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82f91c8203e880a0b483edfa24c155e888b4e6ffed91071d8f6d1d07eda856b1d46c0eebc469593588952da7380d1e8e84f90154f901518001845ba848b794095e7baea6a6c7c4c2dfeb977efac326af552d87845887b108b8eb7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4039031ca07d9ee19e1cf9663eb45288d2eb725282cb1c7bde5f4a73cc8202e078e569502aa00e8c2fc0a85cbbd0bb51dae2823bd9e3fc75ef0622c97776611ff192599ee3b6c0",
+                "rlp" : "0xf90357f901fca049eb74899506219ae6a5bd3fe7aaf9a40cc00566a3e71fb87e30c51509ca1035a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03343640f956b50c5a45a4a00926797eaa622ff5e5b34a30783b5c525d32defbea06b80fb606743393dc2636b129059815ebf225f30c1caf90c8d7239656648c0f7a002c8f02e7d5fe718cb9c7e1f1e2b507c262e09843b3768e853b99027c0d47c74b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82f91c8203e880a0d8879e6c8fd84565ac86edf61fa9cd08f96728e624123bcd9558484ce79d4a1b881b6738d20828e0e8f90154f901518001845ba848b794095e7baea6a6c7c4c2dfeb977efac326af552d87845887b108b8eb7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4039031ca07d9ee19e1cf9663eb45288d2eb725282cb1c7bde5f4a73cc8202e078e569502aa00e8c2fc0a85cbbd0bb51dae2823bd9e3fc75ef0622c97776611ff192599ee3b6c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff403903",
@@ -175,16 +175,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a096d96f1bf2c05b4f99081d5f1f31b09b53ee4a8062c925a9a331b1920f01e2b2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7869d75ade279f93a231a52515c495def2053c67e1ad0ac1131ff102308120ce",
+        "lastblockhash" : "0xa4d48dedc556acb4648468846389c38e425f59c244e465bfc3d83a24c3bb0e33",
         "network" : "Constantinople",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x5887b108",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff40390360005155",
@@ -235,8 +228,8 @@
     "randomStatetest99BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest99BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest99BCFiller.json"
         },
         "blocks" : [
             {
@@ -247,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xf610",
-                    "hash" : "0x833937cfe083c9c089e29c7ac7679bcd0a354e03c3db97f1a063d4a0b9fe60b3",
-                    "mixHash" : "0x117be5d189fee79777aec8fcff714640a9e5046684a3739b892a3bd86a9bb167",
-                    "nonce" : "0x72b6a052187a71f0",
+                    "hash" : "0x6f507d5340bc8c439b4d14203b6d4f0123caa96f85d4cb166e7b2ff9f883c247",
+                    "mixHash" : "0x4f38af513e7f32d00d7943c105ad08c33340ba24dd979f486ee65ab28cfe128a",
+                    "nonce" : "0xe69782e902fe8852",
                     "number" : "0x01",
                     "parentHash" : "0x49eb74899506219ae6a5bd3fe7aaf9a40cc00566a3e71fb87e30c51509ca1035",
                     "receiptTrie" : "0x042c6804422d374fcdf3435b880393f15c426558c1ecbb106c669b4bc2e4d9bf",
@@ -258,7 +251,7 @@
                     "transactionsTrie" : "0x6b80fb606743393dc2636b129059815ebf225f30c1caf90c8d7239656648c0f7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90357f901fca049eb74899506219ae6a5bd3fe7aaf9a40cc00566a3e71fb87e30c51509ca1035a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0810868d23abd090e00be4b341e6b200adde963746a11177f370b3e8e20d75d64a06b80fb606743393dc2636b129059815ebf225f30c1caf90c8d7239656648c0f7a0042c6804422d374fcdf3435b880393f15c426558c1ecbb106c669b4bc2e4d9bfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82f6108203e880a0117be5d189fee79777aec8fcff714640a9e5046684a3739b892a3bd86a9bb1678872b6a052187a71f0f90154f901518001845ba848b794095e7baea6a6c7c4c2dfeb977efac326af552d87845887b108b8eb7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4039031ca07d9ee19e1cf9663eb45288d2eb725282cb1c7bde5f4a73cc8202e078e569502aa00e8c2fc0a85cbbd0bb51dae2823bd9e3fc75ef0622c97776611ff192599ee3b6c0",
+                "rlp" : "0xf90357f901fca049eb74899506219ae6a5bd3fe7aaf9a40cc00566a3e71fb87e30c51509ca1035a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0810868d23abd090e00be4b341e6b200adde963746a11177f370b3e8e20d75d64a06b80fb606743393dc2636b129059815ebf225f30c1caf90c8d7239656648c0f7a0042c6804422d374fcdf3435b880393f15c426558c1ecbb106c669b4bc2e4d9bfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82f6108203e880a04f38af513e7f32d00d7943c105ad08c33340ba24dd979f486ee65ab28cfe128a88e69782e902fe8852f90154f901518001845ba848b794095e7baea6a6c7c4c2dfeb977efac326af552d87845887b108b8eb7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4039031ca07d9ee19e1cf9663eb45288d2eb725282cb1c7bde5f4a73cc8202e078e569502aa00e8c2fc0a85cbbd0bb51dae2823bd9e3fc75ef0622c97776611ff192599ee3b6c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff403903",
@@ -295,7 +288,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a096d96f1bf2c05b4f99081d5f1f31b09b53ee4a8062c925a9a331b1920f01e2b2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x833937cfe083c9c089e29c7ac7679bcd0a354e03c3db97f1a063d4a0b9fe60b3",
+        "lastblockhash" : "0x6f507d5340bc8c439b4d14203b6d4f0123caa96f85d4cb166e7b2ff9f883c247",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -348,8 +341,8 @@
     "randomStatetest99BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest99BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest99BCFiller.json"
         },
         "blocks" : [
             {
@@ -360,9 +353,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xf610",
-                    "hash" : "0x3e67983b8a12c66f6ea4ca585181efbedcf64655f5f207639e44657706d4e144",
-                    "mixHash" : "0xe45baeb5ffc17dd4b2241326adb4c6bbe160e647fd2c1490f037f14dfc8ff169",
-                    "nonce" : "0x7cf803d9c86b8fac",
+                    "hash" : "0xa254249ea2b61565b30d9183ed8ae8f35d6d927c0672ecb827c14ba659769b9b",
+                    "mixHash" : "0x61dcc0b390db26fbc9cb7c9a206d5d9ccd33e030db36528dca37221f17c60045",
+                    "nonce" : "0x8f689fc5ee6e0099",
                     "number" : "0x01",
                     "parentHash" : "0x49eb74899506219ae6a5bd3fe7aaf9a40cc00566a3e71fb87e30c51509ca1035",
                     "receiptTrie" : "0x042c6804422d374fcdf3435b880393f15c426558c1ecbb106c669b4bc2e4d9bf",
@@ -371,7 +364,7 @@
                     "transactionsTrie" : "0x6b80fb606743393dc2636b129059815ebf225f30c1caf90c8d7239656648c0f7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90357f901fca049eb74899506219ae6a5bd3fe7aaf9a40cc00566a3e71fb87e30c51509ca1035a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0810868d23abd090e00be4b341e6b200adde963746a11177f370b3e8e20d75d64a06b80fb606743393dc2636b129059815ebf225f30c1caf90c8d7239656648c0f7a0042c6804422d374fcdf3435b880393f15c426558c1ecbb106c669b4bc2e4d9bfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82f6108203e880a0e45baeb5ffc17dd4b2241326adb4c6bbe160e647fd2c1490f037f14dfc8ff169887cf803d9c86b8facf90154f901518001845ba848b794095e7baea6a6c7c4c2dfeb977efac326af552d87845887b108b8eb7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4039031ca07d9ee19e1cf9663eb45288d2eb725282cb1c7bde5f4a73cc8202e078e569502aa00e8c2fc0a85cbbd0bb51dae2823bd9e3fc75ef0622c97776611ff192599ee3b6c0",
+                "rlp" : "0xf90357f901fca049eb74899506219ae6a5bd3fe7aaf9a40cc00566a3e71fb87e30c51509ca1035a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0810868d23abd090e00be4b341e6b200adde963746a11177f370b3e8e20d75d64a06b80fb606743393dc2636b129059815ebf225f30c1caf90c8d7239656648c0f7a0042c6804422d374fcdf3435b880393f15c426558c1ecbb106c669b4bc2e4d9bfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82f6108203e880a061dcc0b390db26fbc9cb7c9a206d5d9ccd33e030db36528dca37221f17c60045888f689fc5ee6e0099f90154f901518001845ba848b794095e7baea6a6c7c4c2dfeb977efac326af552d87845887b108b8eb7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4039031ca07d9ee19e1cf9663eb45288d2eb725282cb1c7bde5f4a73cc8202e078e569502aa00e8c2fc0a85cbbd0bb51dae2823bd9e3fc75ef0622c97776611ff192599ee3b6c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff403903",
@@ -408,7 +401,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a096d96f1bf2c05b4f99081d5f1f31b09b53ee4a8062c925a9a331b1920f01e2b2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3e67983b8a12c66f6ea4ca585181efbedcf64655f5f207639e44657706d4e144",
+        "lastblockhash" : "0xa254249ea2b61565b30d9183ed8ae8f35d6d927c0672ecb827c14ba659769b9b",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -461,8 +454,8 @@
     "randomStatetest99BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest99BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest99BCFiller.json"
         },
         "blocks" : [
             {
@@ -473,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xf610",
-                    "hash" : "0x63a6026834de8c7a1aa63c9225d74f5fc2ca06f992ce5fb0abb0f90ae81c9f10",
-                    "mixHash" : "0x55ce9d37e754dbce86dc133c9d4d7fe24d817c155cac4dc3d9dd41e3b679db96",
-                    "nonce" : "0x6c6ab6657a96eb26",
+                    "hash" : "0xf416b35498434312850a499d02e3f8fd0bf41b310bfe18207c33a68891f13308",
+                    "mixHash" : "0x205840c4778248c62c246151a92a6ba36c22b6e7298d4d96865a1f09dde597a0",
+                    "nonce" : "0x12d68bbd6f1c469b",
                     "number" : "0x01",
                     "parentHash" : "0x49eb74899506219ae6a5bd3fe7aaf9a40cc00566a3e71fb87e30c51509ca1035",
                     "receiptTrie" : "0x042c6804422d374fcdf3435b880393f15c426558c1ecbb106c669b4bc2e4d9bf",
@@ -484,7 +477,7 @@
                     "transactionsTrie" : "0x6b80fb606743393dc2636b129059815ebf225f30c1caf90c8d7239656648c0f7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90357f901fca049eb74899506219ae6a5bd3fe7aaf9a40cc00566a3e71fb87e30c51509ca1035a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0810868d23abd090e00be4b341e6b200adde963746a11177f370b3e8e20d75d64a06b80fb606743393dc2636b129059815ebf225f30c1caf90c8d7239656648c0f7a0042c6804422d374fcdf3435b880393f15c426558c1ecbb106c669b4bc2e4d9bfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82f6108203e880a055ce9d37e754dbce86dc133c9d4d7fe24d817c155cac4dc3d9dd41e3b679db96886c6ab6657a96eb26f90154f901518001845ba848b794095e7baea6a6c7c4c2dfeb977efac326af552d87845887b108b8eb7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4039031ca07d9ee19e1cf9663eb45288d2eb725282cb1c7bde5f4a73cc8202e078e569502aa00e8c2fc0a85cbbd0bb51dae2823bd9e3fc75ef0622c97776611ff192599ee3b6c0",
+                "rlp" : "0xf90357f901fca049eb74899506219ae6a5bd3fe7aaf9a40cc00566a3e71fb87e30c51509ca1035a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0810868d23abd090e00be4b341e6b200adde963746a11177f370b3e8e20d75d64a06b80fb606743393dc2636b129059815ebf225f30c1caf90c8d7239656648c0f7a0042c6804422d374fcdf3435b880393f15c426558c1ecbb106c669b4bc2e4d9bfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82f6108203e880a0205840c4778248c62c246151a92a6ba36c22b6e7298d4d96865a1f09dde597a08812d68bbd6f1c469bf90154f901518001845ba848b794095e7baea6a6c7c4c2dfeb977efac326af552d87845887b108b8eb7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4039031ca07d9ee19e1cf9663eb45288d2eb725282cb1c7bde5f4a73cc8202e078e569502aa00e8c2fc0a85cbbd0bb51dae2823bd9e3fc75ef0622c97776611ff192599ee3b6c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff403903",
@@ -521,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a096d96f1bf2c05b4f99081d5f1f31b09b53ee4a8062c925a9a331b1920f01e2b2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x63a6026834de8c7a1aa63c9225d74f5fc2ca06f992ce5fb0abb0f90ae81c9f10",
+        "lastblockhash" : "0xf416b35498434312850a499d02e3f8fd0bf41b310bfe18207c33a68891f13308",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -574,8 +567,8 @@
     "randomStatetest99BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.68be406a.Linux.g++",
-            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest99BCFiller.json"
+            "filledwith" : "cpp-1.3.0+commit.70e7d177.Linux.g++",
+            "source" : "../../tests/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest99BCFiller.json"
         },
         "blocks" : [
             {
@@ -586,9 +579,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xf610",
-                    "hash" : "0x9923a06bf5c97b573f672e5a61e47558bd0dda6ebb6322fe4a221243765d0496",
-                    "mixHash" : "0xb5d653404260e7a8b72f60be3b17b57dcac9a01a8ee2664c6b937e0db75b237a",
-                    "nonce" : "0x20a12805b176215c",
+                    "hash" : "0x7d1039f964d1b78d98c621212262c140663779da20ea54fac9de36e4284cb13a",
+                    "mixHash" : "0x7f8f188705a34d7af391d3659d1bd6a358ef94e9339c5c38f02cc446097795bf",
+                    "nonce" : "0x7578ff85fdb018a9",
                     "number" : "0x01",
                     "parentHash" : "0x49eb74899506219ae6a5bd3fe7aaf9a40cc00566a3e71fb87e30c51509ca1035",
                     "receiptTrie" : "0x042c6804422d374fcdf3435b880393f15c426558c1ecbb106c669b4bc2e4d9bf",
@@ -597,7 +590,7 @@
                     "transactionsTrie" : "0x6b80fb606743393dc2636b129059815ebf225f30c1caf90c8d7239656648c0f7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90357f901fca049eb74899506219ae6a5bd3fe7aaf9a40cc00566a3e71fb87e30c51509ca1035a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0810868d23abd090e00be4b341e6b200adde963746a11177f370b3e8e20d75d64a06b80fb606743393dc2636b129059815ebf225f30c1caf90c8d7239656648c0f7a0042c6804422d374fcdf3435b880393f15c426558c1ecbb106c669b4bc2e4d9bfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82f6108203e880a0b5d653404260e7a8b72f60be3b17b57dcac9a01a8ee2664c6b937e0db75b237a8820a12805b176215cf90154f901518001845ba848b794095e7baea6a6c7c4c2dfeb977efac326af552d87845887b108b8eb7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4039031ca07d9ee19e1cf9663eb45288d2eb725282cb1c7bde5f4a73cc8202e078e569502aa00e8c2fc0a85cbbd0bb51dae2823bd9e3fc75ef0622c97776611ff192599ee3b6c0",
+                "rlp" : "0xf90357f901fca049eb74899506219ae6a5bd3fe7aaf9a40cc00566a3e71fb87e30c51509ca1035a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0810868d23abd090e00be4b341e6b200adde963746a11177f370b3e8e20d75d64a06b80fb606743393dc2636b129059815ebf225f30c1caf90c8d7239656648c0f7a0042c6804422d374fcdf3435b880393f15c426558c1ecbb106c669b4bc2e4d9bfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82f6108203e880a07f8f188705a34d7af391d3659d1bd6a358ef94e9339c5c38f02cc446097795bf887578ff85fdb018a9f90154f901518001845ba848b794095e7baea6a6c7c4c2dfeb977efac326af552d87845887b108b8eb7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4039031ca07d9ee19e1cf9663eb45288d2eb725282cb1c7bde5f4a73cc8202e078e569502aa00e8c2fc0a85cbbd0bb51dae2823bd9e3fc75ef0622c97776611ff192599ee3b6c0",
                 "transactions" : [
                     {
                         "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff403903",
@@ -634,7 +627,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a096d96f1bf2c05b4f99081d5f1f31b09b53ee4a8062c925a9a331b1920f01e2b2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9923a06bf5c97b573f672e5a61e47558bd0dda6ebb6322fe4a221243765d0496",
+        "lastblockhash" : "0x7d1039f964d1b78d98c621212262c140663779da20ea54fac9de36e4284cb13a",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {